x11proto-randr: Changes to 'upstream-experimental'
Makefile.am | 5 ++++-
configure.ac | 25 ++++++++++++++++++++++++-
randrproto.h | 30 +++++++++++++++---------------
randrproto.txt | 4 +++-
4 files changed, 46 insertions(+), 18 deletions(-)
New commits:
commit aada204b1fc9ba6461efad3fe6bd032ee98536e1
Author: Keith Packard <keithp@neko.keithp.com>
Date: Sun Feb 18 21:02:30 2007 -0800
Bump version to 1.2.1.
And add copyright to configure.ac file
diff --git a/configure.ac b/configure.ac
index ac3a617..6c338f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,28 @@
+dnl
+dnl Copyright © 2003 Keith Packard
+dnl
+dnl Permission to use, copy, modify, distribute, and sell this software and its
+dnl documentation for any purpose is hereby granted without fee, provided that
+dnl the above copyright notice appear in all copies and that both that
+dnl copyright notice and this permission notice appear in supporting
+dnl documentation, and that the name of Keith Packard not be used in
+dnl advertising or publicity pertaining to distribution of the software without
+dnl specific, written prior permission. Keith Packard makes no
+dnl representations about the suitability of this software for any purpose. It
+dnl is provided "as is" without express or implied warranty.
+dnl
+dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+dnl PERFORMANCE OF THIS SOFTWARE.
+dnl
+dnl Process this file with autoconf to create configure.
+
AC_PREREQ([2.57])
-AC_INIT([RandrProto], [1.2.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([RandrProto], [1.2.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
XORG_RELEASE_VERSION
commit 0e689cecd65f420ec175046e4bb2b5386bf7b7c5
Author: Keith Packard <keithp@neko.keithp.com>
Date: Sun Feb 18 21:02:10 2007 -0800
Fix wording about requesting ConfigureNotify events.
diff --git a/randrproto.txt b/randrproto.txt
index cf15159..345ef4e 100644
--- a/randrproto.txt
+++ b/randrproto.txt
@@ -974,7 +974,7 @@ dynamic changes in the display environme
Clients MAY select for ConfigureNotify on the root window to be
informed of screen changes. This may be advantageous if all your
-clients need to know is the size of the root window, as it avoids
+client needs to know is the size of the root window, as it avoids
round trips to set up the extension.
RRScreenChangeNotify is sent if RRSelectInput has requested it
commit 34ebf25a88972afdc561f4525d02b3fe41ac84bf
Author: Eric Anholt <eric@anholt.net>
Date: Thu Feb 1 15:08:10 2007 -0800
Fix the size of the padding fields of xRRGetCrtcGamma.
diff --git a/randrproto.h b/randrproto.h
index 02680d9..abca369 100644
--- a/randrproto.h
+++ b/randrproto.h
@@ -539,11 +539,11 @@ typedef struct {
CARD32 length B32;
CARD16 size B16;
CARD16 pad1 B16;
- CARD16 pad2 B32;
- CARD16 pad3 B32;
- CARD16 pad4 B32;
- CARD16 pad5 B32;
- CARD16 pad6 B32;
+ CARD32 pad2 B32;
+ CARD32 pad3 B32;
+ CARD32 pad4 B32;
+ CARD32 pad5 B32;
+ CARD32 pad6 B32;
} xRRGetCrtcGammaReply;
#define sz_xRRGetCrtcGammaReply 32
commit 615f8077c55593a2001ca4c84ff3ede5c2c2842a
Author: Eric Anholt <eric@anholt.net>
Date: Tue Jan 9 09:40:47 2007 -0800
Install the randr protocol description.
diff --git a/Makefile.am b/Makefile.am
index e741694..be38f92 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,4 +6,7 @@ randr_HEADERS = \
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = randrproto.pc
-EXTRA_DIST = autogen.sh randrproto.pc.in randrproto.txt
+randrdocdir = $(datadir)/doc/$(PACKAGE)
+randrdoc_DATA = randrproto.txt
+
+EXTRA_DIST = autogen.sh randrproto.pc.in $(randrdoc_DATA)
commit 335639ba8f0df1364a6807187ba17eeae5b187e4
Author: Keith Packard <keithp@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 @@ #define sz_xRRListOutputPropertiesReq 8
typedef struct {
BYTE type;
- CARD8 nProperties;
+ CARD8 pad0;
CARD16 sequenceNumber B16;
CARD32 length B32;
CARD16 nAtoms B16;
@@ -407,7 +407,7 @@ #define sz_xRRCreateModeReq 40
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
commit 3d521b3d38d10c5ec660d13514ef3e626bef90fa
Author: Keith Packard <keithp@neko.keithp.com>
Date: Thu Nov 30 09:43:10 2006 -0800
Fix padding bugs discovered in XCB work
diff --git a/randrproto.h b/randrproto.h
index fe40c0e..97ad28b 100644
--- a/randrproto.h
+++ b/randrproto.h
@@ -324,7 +324,7 @@ typedef struct {
BOOL range;
BOOL immutable;
BYTE pad1;
- CARD16 pad2 B16;
+ CARD32 pad2 B32;
CARD32 pad3 B32;
CARD32 pad4 B32;
CARD32 pad5 B32;
@@ -516,11 +516,11 @@ typedef struct {
CARD32 length B32;
CARD16 size B16;
CARD16 pad1 B16;
- CARD16 pad2 B32;
- CARD16 pad3 B32;
- CARD16 pad4 B32;
- CARD16 pad5 B32;
- CARD16 pad6 B32;
+ CARD32 pad2 B32;
+ CARD32 pad3 B32;
+ CARD32 pad4 B32;
+ CARD32 pad5 B32;
+ CARD32 pad6 B32;
} xRRGetCrtcGammaSizeReply;
#define sz_xRRGetCrtcGammaSizeReply 32
Reply to: