proto/randrproto: Branch 'master'

Keith Packard keithp at kemper.freedesktop.org
Thu Nov 30 23:25:39 EET 2006


 randrproto.h   |    8 ++++----
 randrproto.txt |    2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

New commits:
diff-tree 335639ba8f0df1364a6807187ba17eeae5b187e4 (from 504556a9f886c84798ae8e0e46896a7c74b95c61)
Author: Keith Packard <keithp at neko.keithp.com>
Date:   Thu Nov 30 13:25:35 2006 -0800

    More bugs found by Ian Osgood during the XCB work.
    
    ListOutputProperties has no nProperties field.
    Pad fields not mentioned in Gamma requests.
    sz_xRROUtputChangeNotifyEvent -> sz_xRROutputChangeNotifyEvent

diff --git a/randrproto.h b/randrproto.h
index 97ad28b..02680d9 100644
--- a/randrproto.h
+++ b/randrproto.h
@@ -293,7 +293,7 @@ typedef struct {
 
 typedef struct {
     BYTE	type;
-    CARD8	nProperties;
+    CARD8	pad0;
     CARD16	sequenceNumber B16;
     CARD32	length B32;
     CARD16	nAtoms B16;
@@ -407,7 +407,7 @@ typedef struct {
 
 typedef struct {
     BYTE	type;
-    CARD8	status;
+    CARD8	pad0;
     CARD16	sequenceNumber B16;
     CARD32	length B32;
     RRMode	mode B32;
@@ -608,7 +608,7 @@ typedef struct {
     CARD8 connection;			/* connection status */
     CARD8 subpixelOrder;		/* subpixel order */
 } xRROutputChangeNotifyEvent;
-#define sz_xRROUtputChangeNotifyEvent	32
+#define sz_xRROutputChangeNotifyEvent	32
 
 typedef struct {
     CARD8 type;				/* always evBase + RRNotify */
@@ -624,7 +624,7 @@ typedef struct {
     CARD32 pad3 B32;
     CARD32 pad4 B32;
 } xRROutputPropertyNotifyEvent;
-#define sz_xRROUtputPropertyNotifyEvent	32
+#define sz_xRROutputPropertyNotifyEvent	32
 
 #undef RRModeFlags
 #undef RRCrtc
diff --git a/randrproto.txt b/randrproto.txt
index bde1fdf..cf15159 100644
--- a/randrproto.txt
+++ b/randrproto.txt
@@ -1664,6 +1664,7 @@ A.2.1 Protocol Requests added with versi
 	2n	LISTofCARD16		red
 	2n	LISTofCARD16		green
 	2n	LISTofCARD16		blue
+	p				unused, p=pad(6n)
 └───
 ┌───
     RRSetCrtcGamma
@@ -1676,6 +1677,7 @@ A.2.1 Protocol Requests added with versi
 	2n	LISTofCARD16		red
 	2n	LISTofCARD16		green
 	2n	LISTofCARD16		blue
+	p				unused, p=pad(6n)
 └───
 
 A.3 Protocol Events



More information about the xorg-commit mailing list