Remove SBC, use CompleteNotify for both Region and NotifyMSC

SBC is entire a client-side notion, so remove it from the protocol.
No need to have two events with the same content, but we do need to
tell which request generated the event so stick a new field in some
spare bytes

Signed-off-by: Keith Packard <keithp@keithp.com>

1 files changed, 4 insertions, 5 deletions

diff --git a/presentproto.h b/presentproto.h
index 44dc96c..3e2c0bb 100644
--- a/presentproto.h
+++ b/presentproto.h
@@ -132,16 +132,15 @@ typedef struct {
     CARD16 sequenceNumber B16;
     CARD32 length;
     CARD16 evtype B16;
-    CARD16 pad2 B16;
+    CARD16 kind B16;
     CARD32 eid B32;
     Window window B32;
     CARD32 serial B32;
     CARD64 ust;
+
     CARD64 msc;
-    CARD64 sbc;
-} xPresentCompleteNotify, xPresentMSCNotify;
-#define sz_xPresentCompleteNotify 48
-#define sz_xPresentMSCNotify 48
+} xPresentCompleteNotify;
+#define sz_xPresentCompleteNotify 40
 
 typedef struct {
     CARD8 type;