summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac2
-rw-r--r--randr.h4
-rw-r--r--randrproto.h13
-rw-r--r--randrproto.txt4
4 files changed, 11 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac
index 2842ccf..ac3a617 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.57])
-AC_INIT([RandrProto], [1.1.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([RandrProto], [1.2.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
XORG_RELEASE_VERSION
diff --git a/randr.h b/randr.h
index 6d9369f..43a616d 100644
--- a/randr.h
+++ b/randr.h
@@ -31,11 +31,11 @@
typedef unsigned short Rotation;
typedef unsigned short SizeID;
typedef unsigned short SubpixelOrder;
+typedef unsigned short Connection;
typedef unsigned short XRandrRotation;
typedef unsigned short XRandrSizeID;
typedef unsigned short XRandrSubpixelOrder;
-typedef unsigned short XRandrModeID;
-typedef unsigned short XRandrMonitor;
+typedef unsigned long XRandrModeFlags;
#define RANDR_NAME "RANDR"
#define RANDR_MAJOR 1
diff --git a/randrproto.h b/randrproto.h
index 05327c4..cc78e6d 100644
--- a/randrproto.h
+++ b/randrproto.h
@@ -192,9 +192,10 @@ typedef struct _xRRModeInfo {
CARD16 vSyncStart B16;
CARD16 vSyncEnd B16;
CARD16 vTotal B16;
- CARD16 nameLength B32;
+ CARD16 nameLength B16;
RRModeFlags modeFlags B32;
} xRRModeInfo;
+#define sz_xRRModeInfo 40
typedef struct {
CARD8 reqType;
@@ -251,9 +252,8 @@ typedef struct {
CARD16 nOutputs B16;
CARD16 nModes B16;
CARD16 nbytesNames B16;
- CARD16 pad1 B16;
+ CARD32 pad1 B32;
CARD32 pad2 B32;
- CARD32 pad3 B32;
} xRRGetScreenResourcesReply;
#define sz_xRRGetScreenResourcesReply 32
@@ -294,7 +294,7 @@ typedef struct {
typedef struct {
BYTE type;
- CARD8 status;
+ CARD8 nProperties;
CARD16 sequenceNumber B16;
CARD32 length B32;
CARD16 nAtoms B16;
@@ -347,7 +347,7 @@ typedef struct {
typedef struct {
BYTE type;
- CARD8 status;
+ CARD8 format;
CARD16 sequenceNumber B16;
CARD32 length B32;
Atom propertyType B32;
@@ -422,6 +422,7 @@ typedef struct {
CARD8 status;
CARD16 sequenceNumber B16;
CARD32 length B32;
+ Time timestamp B32;
INT16 x B16;
INT16 y B16;
CARD16 width B16;
@@ -431,8 +432,6 @@ typedef struct {
Rotation rotations B16;
CARD16 nOutput B16;
CARD16 nPossibleOutput B16;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
} xRRGetCrtcInfoReply;
#define sz_xRRGetCrtcInfoReply 32
diff --git a/randrproto.txt b/randrproto.txt
index c8d77a2..f0ec5e1 100644
--- a/randrproto.txt
+++ b/randrproto.txt
@@ -1312,7 +1312,7 @@ A.2.1 Protocol Requests added with version 1.2
2 o number of outputs
2 m number of modeinfos
2 b total bytes in mode names
- 10 unused
+ 8 unused
4c LISTofCRTC crtcs
4o LISTofOUTPUT outputs
40m LISTofMODEINFO modeinfos
@@ -1476,6 +1476,7 @@ A.2.1 Protocol Requests added with version 1.2
1 RRCONFIGSTATUS status
2 CARD16 sequence number
4 o+p reply length
+ 4 TIMESTATMP timestamp
2 INT16 x
2 INT16 y
2 CARD16 width
@@ -1485,7 +1486,6 @@ A.2.1 Protocol Requests added with version 1.2
2 ROTATION set of possible rotations
2 o number of outputs
2 p number of possible outputs
- 4 unused
4o LISTofOUTPUT outputs
4p LISTofOUTPUT possible outputs
└───