proto/randrproto: Branch 'get-set-primary' - 2 commits

[Adam Jackson]

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

New commits:
commit ec0e4a251dab62c9692b9a79ecf6a2d26a3741f8
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Dec 8 16:56:22 2008 -0500

    SetOutputPrimary: document another error path
    
    Need to name a window so you can set the primary output to None,
    but that means you need to check that they're on the same screen.

diff --git a/randrproto.txt b/randrproto.txt
index ee32728..bb2b15e 100644
--- a/randrproto.txt
+++ b/randrproto.txt
@@ -1075,8 +1075,9 @@ new pending transform has been set since the last call to RRSetCrtcConfig.
 	desktop environments to mark the screen that should hold the primary
 	menu bar or panel.
 
-	If the named output is not connected to any CRTC, BadMatch is
-	generated.
+	If the named output is not connected to any CRTC, or if the Window
+	and Output are not attached to the same screen, BadMatch is generated.
+	In the latter case, errorValue will be the Window, not the Output.
 
 	As this changes the logical layout of the screen, ConfigureNotify
 	and RRScreenChangeNotify will be generated on the appropriate root
commit 692f4a466cd706041ce98d7c5cd7bf5fcca01df9
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Dec 8 16:53:45 2008 -0500

    Remove useless length from GetOutputProperty reply

diff --git a/randrproto.h b/randrproto.h
index b65677f..018dbe3 100644
--- a/randrproto.h
+++ b/randrproto.h
@@ -652,13 +652,13 @@ typedef struct {
     BYTE	type;
     CARD8	pad;
     CARD16	sequenceNumber B16;
-    CARD32	length B32;
     RROutput	output B32;
     CARD32	pad1 B32;
     CARD32	pad2 B32;
     CARD32	pad3 B32;
     CARD32	pad4 B32;
     CARD32	pad5 B32;
+    CARD32	pad6 B32;
 } xRRGetOutputPrimaryReply;
 #define sz_xRRGetOutputPrimaryReply	32