From 5220e7d7dfa64d95918b6f5ad52089fe87540b61 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Tue, 27 Jun 2006 22:38:32 +0200 Subject: Swizzle protocol contents to fix errors discovered while implementing X server piece --- randrproto.h | 5 +++-- randrproto.txt | 13 ++++++++++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/randrproto.h b/randrproto.h index a9d5a01..015df9a 100644 --- a/randrproto.h +++ b/randrproto.h @@ -347,11 +347,12 @@ typedef struct { Time configTimestamp B32; /* time config data was changed */ Window root B32; /* root window */ Window window B32; /* window requesting notification */ + CARD16 monitor B16; /* monitor index */ ModeID modeID B16; /* mode ID */ + Rotation rotation B16; /* rotation/reflection */ + SubpixelOrder subpixelOrder B16; /* new subpixel order */ INT16 x B16; /* x */ INT16 y B16; /* y */ - Rotation rotation B16; /* rotation/reflection */ - CARD16 pad B16; } xRRMonitorChangeNotifyEvent; #define sz_xRRMonitorChangeNotifyEvent 32 diff --git a/randrproto.txt b/randrproto.txt index d85796c..5508e62 100644 --- a/randrproto.txt +++ b/randrproto.txt @@ -622,7 +622,6 @@ RRScreenChangeNotify RRMonitorChangeNotify - rotation: ROTATION; new rotation sequenceNumber: CARD16 low 16 bits of request's seq. number timestamp: TIMESTAMP time monitor was changed configTimestamp: TIMESTAMP time config data was changed @@ -630,6 +629,7 @@ RRMonitorChangeNotify window: WINDOW window requesting notification monitor-index: MONITOR monitor which changed mode: MODEID new mode + rotation: ROTATION; new rotation subpixelOrder: SUBPIXELORDER order of subpixels x: INT16 x position of monitor within screen y: INT16 y position of monitor within screen @@ -777,6 +777,13 @@ A.1 Common Types 2 CARD16 name length (n) 4 SETofMODEFLAG mode flags + A monitor mode specifies the complete CRTC timings for + a specfic mode. The vertical and horizontal synchronization rates + can be computed given the dot clock and the h total/v total + values. If the dot clock is zero, then all of the timing + parameters and flags are not used, and must be zero as this + indicates that the timings are unknown or otherwise unused. + The location of the name in the encoding is specified separately A.2 Protocol Requests @@ -1015,10 +1022,10 @@ A.3.1 Protocol Events added with version 1.2 4 WINDOW request window 2 MONITOR monitor index 2 MODEID mode ID + 2 ROTATION new rotation and reflection + 2 SUBPIXELORDER new subpixel order 2 INT16 x 2 INT16 y - 2 ROTATION new rotation and reflection - 2 unused Bibliography -- cgit v1.2.1