x11proto-xext: Changes to 'upstream-unstable'

2014-01-06 Thread Maarten Lankhorst
 autogen.sh   |4 +++-
 configure.ac |6 +++---
 shm.h|2 +-
 shmproto.h   |   42 ++
 4 files changed, 49 insertions(+), 5 deletions(-)

New commits:
commit 66afec3f49e8eb0d4c2e9af7088fc3116d4bafd7
Author: Keith Packard 
Date:   Fri Dec 27 10:13:42 2013 -0800

Bump release to 7.3

Signed-off-by: Keith Packard 

diff --git a/configure.ac b/configure.ac
index 5b7c285..dcacee8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.60])
-AC_INIT([XExtProto], [7.2.99.901],
+AC_INIT([XExtProto], [7.3.0],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 

commit 3f355f138d6df57e067458a20f47307883048adb
Author: Keith Packard 
Date:   Tue Nov 5 16:03:40 2013 -0800

Bump version to 7.2.99.901 (7.3 RC1)

Signed-off-by: Keith Packard 

diff --git a/configure.ac b/configure.ac
index 9a2ee35..5b7c285 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.60])
-AC_INIT([XExtProto], [7.2.1],
+AC_INIT([XExtProto], [7.2.99.901],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 

commit be1483563532b5dcaef6847c206d0a6f772c8bd4
Author: Keith Packard 
Date:   Thu Jan 17 13:48:15 2013 -0800

Adds MIT-SHM AttachFd and CreateSegment requests

Passes shared memory segments by file descriptor, AttachFd passes from
client to server, CreateSegment passes from server to client.

Signed-off-by: Keith Packard 

diff --git a/shm.h b/shm.h
index e076402..be49f5e 100644
--- a/shm.h
+++ b/shm.h
@@ -32,7 +32,7 @@ in this Software without prior written authorization from The 
Open Group.
 #define SHMNAME "MIT-SHM"
 
 #define SHM_MAJOR_VERSION  1   /* current version numbers */
-#define SHM_MINOR_VERSION  1
+#define SHM_MINOR_VERSION  2
 
 #define ShmCompletion  0
 #define ShmNumberEvents(ShmCompletion + 1)
diff --git a/shmproto.h b/shmproto.h
index e5de377..8136aa9 100644
--- a/shmproto.h
+++ b/shmproto.h
@@ -43,6 +43,8 @@ in this Software without prior written authorization from The 
Open Group.
 #define X_ShmPutImage  3
 #define X_ShmGetImage  4
 #define X_ShmCreatePixmap  5
+#define X_ShmAttachFd   6
+#define X_ShmCreateSegment  7
 
 typedef struct _ShmQueryVersion {
 CARD8  reqType;/* always ShmReqCode */
@@ -178,6 +180,46 @@ typedef struct _ShmCompletion {
 } xShmCompletionEvent;
 #define sz_xShmCompletionEvent 32
 
+/* Version 1.2 additions */
+typedef struct _ShmAttachFd {
+CARD8  reqType;/* always ShmReqCode */
+CARD8  shmReqType; /* always X_ShmAttachFd */
+CARD16 length B16;
+ShmSeg shmseg B32;
+BOOL   readOnly;
+BYTE   pad0;
+CARD16 pad1 B16;
+} xShmAttachFdReq;
+/* File descriptor is passed with this request */
+#define sz_xShmAttachFdReq 12
+
+typedef struct _ShmCreateSegment {
+CARD8  reqType;/* always ShmReqCode */
+CARD8  shmReqType; /* always X_ShmAttachFd */
+CARD16 length B16;
+ShmSeg shmseg B32;
+CARD32  size B32;
+BOOL   readOnly;
+BYTE   pad0;
+CARD16 pad1 B16;
+} xShmCreateSegmentReq;
+#define sz_xShmCreateSegmentReq 16
+
+typedef struct {
+CARD8  type;   /* must be X_Reply */
+CARD8  nfd;/* must be 1*/
+CARD16 sequenceNumber  B16;/* last sequence number */
+CARD32 length  B32;/* 0 */
+CARD32 pad2B32;/* unused */
+CARD32 pad3B32;/* unused */
+CARD32 pad4B32;/* unused */
+CARD32 pad5B32;/* unused */
+CARD32 pad6B32;/* unused */
+CARD32 pad7B32;/* unused */
+} xShmCreateSegmentReply;
+/* File descriptor is passed with this reply */
+#define sz_xShmCreateSegmentReply  32
+
 #undef ShmSeg
 #undef Drawable
 #undef VisualID

commit 18515392d35c1e07a5978876d4559012f5078f92
Author: Gaetan Nadon 
Date:   Sat Oct 26 09:42:05 2013 -0400

config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES

Fix Automake warning: AC_OUTPUT should be used without arguments.
www.gnu.org/software/autoconf/manual/autoconf.html#Configuration-Files

Signed-off-by: Gaetan Nadon 

diff --git a/configure.ac b/configure.ac
index d6924fe..9a2ee35 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,6 +14,7 @@ XORG_WITH_FOP
 XORG_WITH_XSLTPROC
 XORG_CHECK_SGML_DOCTOOLS(1.8)
 
-AC_OUTPUT([Makefile
+AC_CONFIG_FILES([Makefile
specs/Makefile
xextproto.pc])
+AC_OUTPUT

commit f27fcc99d1cf935cc289933326f7d3baacd5107a
Author: Colin Walters 
Date:   Wed Jan 4 17:37:06 2012 -0500

autogen.sh: Implement GNOME Build API
   

x11proto-xext: Changes to 'upstream-unstable'

2012-04-15 Thread Julien Cristau
 configure.ac   |   14 
 docbook.am |  105 +
 specs/.gitignore   |1 
 specs/Makefile.am  |   64 ---
 specs/appgrp.xml   |  219 +-
 specs/dbe.xml  |  248 ++--
 specs/dpms.xml |  115 +++--
 specs/evi.xml  |   72 +--
 specs/geproto.xml  |   43 +-
 specs/lbx.xml  | 1071 +++--
 specs/multibuf.xml |   59 +-
 specs/security.xml |  561 ---
 specs/shape.xml|  168 
 specs/shm.xml  |   61 +--
 specs/sync.xml |  171 
 specs/tog-cup.xml  |   58 +-
 specs/xtest.xml|  110 ++---
 17 files changed, 1642 insertions(+), 1498 deletions(-)

New commits:
commit dff1a34f49644b2ed9cfac321dce6d31aed868cf
Author: Alan Coopersmith 
Date:   Thu Mar 22 20:54:16 2012 -0700

xextproto 7.2.1

Signed-off-by: Alan Coopersmith 

diff --git a/configure.ac b/configure.ac
index 6c68248..4f80b94 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,6 @@
 AC_PREREQ([2.60])
-AC_INIT([XExtProto], [7.2.0], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([XExtProto], [7.2.1],
+[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 

commit 38c6d386637eecc105f6e6b03ff10e6299bd0002
Author: Matt Dew 
Date:   Mon Jan 16 13:18:50 2012 -0700

informaltable cleanup

On certain tables, add top and bottom borders to table
header and a bottom border to the table. This matches
what those tables in the old pdfs looked like.

the  prevents tables from
splitting across pages. Useful for tiny tables.

Converting the colwidth to a floating point,
IE, 1* -> 1.0* cleans up these build errors:
WARNING: table-layout="fixed" and column-width unspecified
=> falling back to proportional-column-width(1)

Signed-off-by: Matt Dew 

diff --git a/specs/appgrp.xml b/specs/appgrp.xml
index cf2c2d0..0f91e16 100644
--- a/specs/appgrp.xml
+++ b/specs/appgrp.xml
@@ -105,9 +105,10 @@ As a member of an Application Group, when an application 
creates and maps a wind
 
 AppGroupQueryVersion
 
-
-
-
+
+
+
+
 
   
 client_major_version: CARD16
@@ -135,9 +136,10 @@ If supplied, the client_major_version and 
client_minor_version indicate what ver
 
 AppGroupCreate
 
-
-
-
+
+
+
+
 
   
 app_group: APPGROUP
@@ -166,13 +168,14 @@ This request creates an Application Group using app_group 
as the Application Gro
 The value_mask and value_list specify attributes of the Application Group that 
are to be explicitly initialized. The attributes, their types, and the default 
values are:
 
 
-
-
-
-
-
+
+
+
+
+
+
 
-  
+  
   Attribute
   Type
   Default
@@ -257,9 +260,10 @@ If the application that created a non-embedded Application 
Group exits, and ther
 AppGroupGetAttr
 
 
-
-
-
+
+
+
+
 
   
 >app_group: APPGROUP
@@ -280,9 +284,10 @@ This request returns the application group attributes for 
app_group.
 
 AppGroupQuery
 
-
-
-
+
+
+
+
 
   
 resource: XID
@@ -303,9 +308,10 @@ This request returns the Application Group ID of the 
application that created re
 
 AppGroupCreateAssociation
 
-
-
-
+
+
+
+
 
   
 window: WINDOW
@@ -326,9 +332,10 @@ This request associates window with system_window. The 
window_type indicates the
 
 AppGroupDestroyAssociation
 
-
-
-
+
+
+
+
 
   
 window: WINDOW
@@ -647,25 +654,26 @@ VALUEs
 Library API
 
 
-
-
+
+
+
 
-  
+  
 
 Status XagQueryVersion ( xkb, 
keycode)  /* macro */
 
   
-  
+  
 
 Displaydpy;
 
   
-  
+  
 
 int *major_version_return;
 
   
-  
+  
 
 int *minor_version_return;
 
@@ -688,40 +696,41 @@ An embedding manager such as a web browser that intends 
to embed programs in an
 
 
 
-
-
+
+
+
 
-  
+  
 
 Status XagCreateEmbeddedApplicationGroup(
 
   
-  
+  
 
   Display*  dpy,
 
   
-  
+  
 
   VisualID  root_visual,
 
   
-  
+  
 
   Colormap  default_colormap,
 
   
-  
+  
 
   unsigned long  black_pixel,
 
   
-  
+  
 
   unsigned long  white_pixel,
 
   
-  
+  
 
   XAppGroup*  app_group_return);
 
@@ -744,20 +753,21 @@ A special font-path can be created by creating an 
Application Group, getting an
 
 
 
-
-
+
+
+
 
-  
+  
 
 Status XagCreateNonembeddedApplicationGroup(
 
   
-  
+  
 
   Display*  dpy,
 
   
-  
+  
 
   XAppGroup*  app_group_return);
 
@@ -775,20 +785,21 @@ To destroy an Application Group use 
XagDestroyApplicationGroup.
 
 
 
-
-
+
+
+
 
-  
+  
 
 Status XagDestroyApplicationGroup(
 
   
-  
+  
 
   Display*  dpy,
 
   
-  
+  
 
   XAppGroup  app_group);
 
@@ -808,25 +819,26 @@ To retrieve the attributes of an Application Group use 
XagGetApplicationGroupAtt
 
 
 
-
-
+
+
+
 
-  
+  
 
 Sta

x11proto-xext: Changes to 'upstream-unstable'

2011-04-28 Thread Julien Cristau
 configure.ac   |2 
 shmstr.h   |3 
 specs/.gitignore   |2 
 specs/Makefile.am  |   20 
 specs/appendix.xml |   61 
 specs/appgroup.xml |  248 --
 specs/appgrp.xml   | 1018 
 specs/dbe.xml  |4 
 specs/dpms.xml |   17 
 specs/evi.xml  |   29 
 specs/geproto.xml  |4 
 specs/lbx.xml  | 6291 +
 specs/multibuf.xml |   79 
 specs/security.xml |4 
 specs/shape.xml|   34 
 specs/shm.xml  |   23 
 specs/sync.xml |  239 +-
 specs/tog-cup.xml  |   30 
 specs/xtest.xml|   37 
 syncconst.h|6 
 syncproto.h|   96 
 syncstr.h  |2 
 22 files changed, 7827 insertions(+), 422 deletions(-)

New commits:
commit c593fd1000ceb83f0933361c5e7496d799233f7e
Author: Keith Packard 
Date:   Sat Feb 26 23:57:48 2011 -0800

Version 7.2.0

Signed-off-by: Keith Packard 

diff --git a/configure.ac b/configure.ac
index 41269a3..dd30292 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.60])
-AC_INIT([XExtProto], [7.1.99.0], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([XExtProto], [7.2.0], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 

commit a6a542841e85344115bbb6a1ba35c4f3487995e4
Author: Gaetan Nadon 
Date:   Fri Feb 25 08:53:55 2011 -0500

Docbook: change the book id to match the xml file basename

This is required for the up-coming external references support.

Signed-off-by: Gaetan Nadon 

diff --git a/specs/shm.xml b/specs/shm.xml
index 19d9309..127412c 100644
--- a/specs/shm.xml
+++ b/specs/shm.xml
@@ -4,7 +4,7 @@
 
 
 
-
+
 
 
MIT-SHM(The MIT Shared Memory Extension)

commit d16788e87438015d3e121ffb046bc6a4ce01da89
Author: Gaetan Nadon 
Date:   Fri Feb 25 08:51:47 2011 -0500

Docbook: change the book id to match the xml file basename

This is required for the up-coming external references support.

Signed-off-by: Gaetan Nadon 

diff --git a/specs/multibuf.xml b/specs/multibuf.xml
index eb01829..1c8e363 100644
--- a/specs/multibuf.xml
+++ b/specs/multibuf.xml
@@ -4,7 +4,7 @@
 
 
 
-
+
 
 
Extending X for Double-Buffering, Multi-Buffering, and Stereo

commit 8c6cc9ddb5776a2b32d42a41d27b3df56e62c44f
Author: Gaetan Nadon 
Date:   Thu Feb 24 20:44:00 2011 -0500

Docbook: change the book id to match the xml file basename

Rename appgroup.xml as it conflicts with 
xorg-docs/specs/Xserver/appgroup.xml
This is required for the up-coming external references support.

Signed-off-by: Gaetan Nadon 

diff --git a/specs/Makefile.am b/specs/Makefile.am
index 3792353..e689dff 100644
--- a/specs/Makefile.am
+++ b/specs/Makefile.am
@@ -23,7 +23,7 @@
 
 if ENABLE_SPECS
 doc_sources =  \
-   appgroup.xml\
+   appgrp.xml  \
dbe.xml \
dpms.xml\
evi.xml \
diff --git a/specs/appgroup.xml b/specs/appgroup.xml
deleted file mode 100644
index f506d86..000
--- a/specs/appgroup.xml
+++ /dev/null
@@ -1,1018 +0,0 @@
-
-http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd";>
-
-
-
-
-   Application Group Extension to the X Protocol
-   X Consortium Standard
-   
- 
-   Kaleb
-   S.
-   KEITHLEY
-   X Consortium, Inc
-   ka...@x.org
- 
-   
-   X Version 11, Release 6.4
-   27 September 1996
-
-
-
-Copyright © 1996 X Consortium, Inc. All Rights Reserved.
-
-
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM,
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
-OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
-OR THE USE OF OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-Except as contained in this notice, the name of the X Consortium shall not be 
used in advertising
-or otherwise to promote the sale, use or other dealings in this Software 
without prior written
-authorization from the X Consortium.
-
-
-
-
-
-The Application Group Extension to the X protocol is intended to provide a 
framework to allow
-more than one program to manage X applications on the desktop. The initial use 
of this extension
-will be to insert or embed the windows of X programs into the windows of 
another program, such
-as a web browser. This extension is not intended to address larger embedding 
issues that, for
-example, OpenDoc does, such as shared menu bars, etc.
-
-
-
-
-
-Purpose and Goals
-
-
-The Application Group Extension to the X protocol is intended to provide
-a framework to allow more than one program to manage X applications on
-the desktop. The initial use of this extension will be to insert or embed
-the windows of X programs into the windows of another program, such 

x11proto-xext: Changes to 'upstream-unstable'

2010-11-02 Thread Robert Hooker
 .gitignore |   78 ++
 Makefile.am|   22 
 README |   42 +
 configure.ac   |   20 
 ge.h   |4 
 geproto.txt|   83 --
 shapestr.h |8 
 shmstr.h   |   66 ++
 specs/.gitignore   |6 
 specs/Makefile.am  |   77 ++
 specs/appgroup.xml |  248 
 specs/dbe.xml  | 1061 ++
 specs/dpms.xml |  563 ++
 specs/evi.xml  |  518 
 specs/geproto.xml  |   97 +++
 specs/multibuf.xml | 1628 +
 specs/security.xml | 1532 +
 specs/shape.xml| 1236 
 specs/shm.xml  |  474 +++
 specs/sync.xml | 1062 ++
 specs/tog-cup.xml  |  562 ++
 specs/xtest.xml|  722 +++
 syncstr.h  |  184 +
 23 files changed, 10188 insertions(+), 105 deletions(-)

New commits:
commit 5daf9cff36df7423f6247fc8174b8e6c9443ed07
Author: Adam Jackson 
Date:   Tue Aug 10 10:24:51 2010 -0400

xextproto 7.1.2

Signed-off-by: Adam Jackson 

diff --git a/configure.ac b/configure.ac
index b7bc693..599651b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.60])
-AC_INIT([XExtProto], [7.1.1], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([XExtProto], [7.1.2], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 

commit 35741d9dc745532dc4af37cc07e256392e3880da
Author: Gaetan Nadon 
Date:   Tue Aug 3 11:03:49 2010 -0400

specs: convert protocol geproto.txt to DocBook XML

Signed-off-by: Gaetan Nadon 

diff --git a/specs/Makefile.am b/specs/Makefile.am
index a1acb2e..3e631a1 100644
--- a/specs/Makefile.am
+++ b/specs/Makefile.am
@@ -27,6 +27,7 @@ doc_sources = \
dbe.xml \
dpms.xml\
evi.xml \
+   geproto.xml \
multibuf.xml\
security.xml\
shape.xml   \
@@ -35,7 +36,7 @@ doc_sources = \
tog-cup.xml \
xtest.xml
 
-dist_doc_DATA = $(doc_sources) geproto.txt
+dist_doc_DATA = $(doc_sources)
 
 if HAVE_XMLTO
 doc_DATA = $(doc_sources:.xml=.html)
diff --git a/specs/geproto.txt b/specs/geproto.txt
deleted file mode 100644
index 1054def..000
--- a/specs/geproto.txt
+++ /dev/null
@@ -1,84 +0,0 @@
-X Generic Event Extension
-  Peter Hutterer
-  peter.hutte...@who-t.net
-
-
-1. Introduction
-2. Extension Initialization
-3. Events
-4. Notes
-
-_
-1. Introduction
-
-X was designed to provide 64 event opcodes for all extensions. These events
-are limited to 32 bytes.
-
-The Generic Event Extension provides a template event for extensions to re-use
-a single event opcode. GE only provide headers and the most basic
-functionality, leaving the extensions to interpret the events in their
-specific context.
-
-GenericEvents may be longer than 32 bytes. If so, the number of 4 byte units
-following the initial 32 bytes must be specified in the length field of the
-event.
-_
-2. Extension Initialization
-
-The name of this extension is "Generic Event Extension"
-
-┌───
-GEQueryVersion
-   client-major-version:   CARD16
-   client-minor-version:   CARD16
-  ▶
-   major-version:  CARD16
-   minor-version:  CARD16
-└───
-
-   The client sends the highest supported version to the server
-   and the server sends the highest version it supports, but no
-   higher than the requested version. Major versions changes can
-   introduce incompatibilities in existing functionality, minor
-   version changes introduce only backward compatible changes.
-   It is the clients responsibility to ensure that the server
-   supports a version which is compatible with its expectations.
-
-
-As of version 1.0, no other requests are provided by this extension.
-_
-3. Events
-
-GE defines a single event, to be used by all extensions. The event's structure
-is similar to a reply.  This is a core protocol event, ID 35, and is not itself
-an extension event.
-
-┌───
-GenericEvent
-   type: BYTE; always GenericEvent (35)
-   extension: CARD8;   extension offset
-   sequenceNumber: CARD16  low 16 bits of request seq. number
-   length: CARD32  length
-   evtype: CARD16  event type
-└───
-
-   The field 'extension' is to be set to the major opcode of the
-   extension. The 'evtype' field i

x11proto-xext: Changes to 'upstream-unstable'

2009-11-24 Thread Timo Aaltonen
 .gitignore   |3 
 COPYING  |   22 +
 EVI.h|   36 ++
 EVIproto.h   |   96 +
 MITMisc.h|   66 ---
 Makefile.am  |   68 +--
 XEVI.h   |   64 ---
 XEVIstr.h|   98 -
 XLbx.h   |  155 
 XShm.h   |  161 -
 XTest.h  |  164 -
 Xag.h|  114 --
 Xagstr.h |  182 --
 Xcup.h   |   69 ---
 Xcupstr.h|  109 --
 Xdbe.h   |  136 ---
 Xdbeproto.h  |  277 ---
 Xext.h   |   57 ---
 Xge.h|   55 ---
 ag.h |   52 ++
 agproto.h|  178 ++
 configure.ac |6 
 cup.h|   38 ++
 cupproto.h   |  105 +
 dbe.h|   57 +++
 dbeproto.h   |  224 
 dpms.h   |   67 ---
 dpmsconst.h  |   43 ++
 dpmsproto.h  |  175 +
 dpmsstr.h|  186 --
 extutil.h|  192 --
 lbx.h|   73 
 lbxbuf.h |   51 --
 lbxbufstr.h  |   45 --
 lbxdeltastr.h|  105 -
 lbximage.h   |  151 
 lbxopts.h|  133 ---
 lbxproto.h   |  975 +++
 lbxstr.h |  935 
 lbxzlib.h|   64 ---
 mitmiscconst.h   |   38 ++
 mitmiscproto.h   |   68 +++
 mitmiscstr.h |   70 ---
 multibuf.h   |  317 -
 multibufconst.h  |   83 
 multibufproto.h  |  295 
 multibufst.h |  609 --
 secur.h  |   61 +++
 security.h   |  111 --
 securproto.h |  110 ++
 securstr.h   |  116 --
 shape.h  |  180 --
 shapeconst.h |   55 +++
 shapeproto.h |  237 +
 shapestr.h   |  234 -
 shm.h|   44 ++
 shmproto.h   |  187 ++
 shmstr.h |  217 
 sync.h   |  469 --
 syncconst.h  |  179 ++
 syncproto.h  |  378 +
 syncstr.h|  494 ---
 xtestconst.h |   41 ++
 xtestext1.h  |  326 --
 xtestext1const.h |  160 +
 xtestext1proto.h |  221 
 xtestproto.h |  124 ++
 xteststr.h   |  120 --
 68 files changed, 4393 insertions(+), 6938 deletions(-)

New commits:
commit 987aeb9bd1915a655f31e250ee9c02d04927b150
Author: Peter Hutterer 
Date:   Tue Aug 25 09:30:15 2009 +1000

xextproto 7.1.1

diff --git a/configure.ac b/configure.ac
index 598403e..4931d3b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.57])
-AC_INIT([XExtProto], [7.1.0], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([XExtProto], [7.1.1], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
 # Require xorg-macros: XORG_CHANGELOG

commit 55a0bbdde9b27b8dbc6e75d41c51af3f92dea6e3
Author: Eduard Bagrov 
Date:   Fri Aug 21 18:48:19 2009 +0200

Fix XSyncValueSubtract typo

X.Org bug#23438 

Signed-off-by: Julien Cristau 

diff --git a/syncconst.h b/syncconst.h
index 2ad5db7..926b60c 100644
--- a/syncconst.h
+++ b/syncconst.h
@@ -113,7 +113,7 @@ PERFORMANCE OF THIS SOFTWARE.
Bool signb = XSyncValueIsNegative(b);\
((presult)->lo = (a).lo - (b).lo);\
((presult)->hi = (a).hi - (b).hi);\
-   if (t>(presult)->lo) (presult)->hi--;\
+   if (t<(presult)->lo) (presult)->hi--;\
*poverflow = ((signa == signb) && !(signa == 
XSyncValueIsNegative(*presult)));\
  }
 #define _XSyncMaxValue(pv) ((pv)->hi = 0x7fff, (pv)->lo = 0x)

commit 23ac4d5235862d51f0cfb080ad2118a9fb181673
Author: Peter Hutterer 
Date:   Wed Aug 5 15:09:11 2009 +1000

xextproto 7.1.0

diff --git a/configure.ac b/configure.ac
index 62b8db8..598403e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.57])
-AC_INIT([XExtProto], [7.0.99.3], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([XExtProto], [7.1.0], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
 # Require xorg-macros: XORG_CHANGELOG

commit 5ffa318ddb35308e3a87122bfb3944e3201532ba
Author: Peter Hutterer 
Date:   Wed Aug 5 15:06:52 2009 +1000

lbxproto: remove debug macro and definition of lbxDebug.

This should not be in the protocol headers.

Signed-off-by: Peter Hutterer 

diff --git a/lbxproto.h b/lbxproto.h
index d613d42..a1ae62b 100644
--- a/lbxproto.h
+++ b/lbxproto.h
@@ -959,14 +959,7 @@ typedef struct _LbxFreeCellsEvent {
 #define DBG_BLOCK  0x0020
 #define DBG_CLIENT 0x0040
 #define DBG_DELTA  0x0080
-
-extern int lbxDebug;
-
-#define DBG(n,m)if (lbxDebug & (n)) { fprintf m; } else
-#else
-#define DBG(n,m)
 #endif
-

x11proto-xext: Changes to 'upstream-unstable'

2009-02-15 Thread Julien Cristau
 Xge.h|1 
 configure.ac |2 
 geproto.h|   30 ++---
 geproto.txt  |  131 +--
 4 files changed, 73 insertions(+), 91 deletions(-)

New commits:
commit e1773d8ad7d36535f856dcb308be9a1b0601c1fc
Author: Peter Hutterer 
Date:   Thu Dec 18 10:10:42 2008 +1000

Bump to 7.0.4

diff --git a/configure.ac b/configure.ac
index 8f0c242..72205e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.57])
-AC_INIT([XExtProto], [7.0.3], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([XExtProto], [7.0.4], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
 XORG_RELEASE_VERSION

commit e7f0c4261c59da82da1c151dd1bd0d143a32906a
Author: Peter Hutterer 
Date:   Mon Dec 1 14:44:03 2008 +1000

Clean up XGE documentation.

diff --git a/geproto.txt b/geproto.txt
index e30a68d..654cd0f 100644
--- a/geproto.txt
+++ b/geproto.txt
@@ -1,102 +1,83 @@
 X Generic Event Extension
   Peter Hutterer
-  pe...@cs.unisa.edu.au
+  peter.hutte...@who-t.net
 
 
 1. Introduction
-2. Requests
-3. Events
-4. Usage from other extensions - server side
-5. Usage from other extensions - client side
-6. Notes
+2. Extension Initialization
+3. Extension Events
+4. Notes
 
 _
 1. Introduction
 
-X was designed to provide 64 event opcodes for all extensions. With the
-increasing number of extensions, event opcodes are running out and future
-extensions will not be able to send events to the client.
+X was designed to provide 64 event opcodes for all extensions. These events
+are limited to 32 bytes.
 
-The Generic Event Extension is a template for future extensions to re-use a
-single opcode. GE does not actually do much but provide headers and a few API
-calls. The majority of the work is still to be done in the extensions.
+The Generic Event Extension provides a template event for extensions to re-use
+a single event opcode. GE only provide headers and the most basic
+functionality, leaving the extensions to interpret the events in their
+specific context.
 
-Standard X events are limited to 32 bytes. GenericEvents have the same size
-restrictions as requests, with a minimum of 32 bytes, followed by an arbitrary
-amount of data specified in the length field (see Section 3.)
-
-_
-2. Requests
-
-GEQueryVersion:
-CARD8   reqType
-CARD8   ReqType X_GEQueryVersion
-CARD16  length
-CARD32  majorVersion
-CARD32  minorVersion
-
-GEQueryVersion reply:
-CARD8   repType
-CARD8   RepType X_GEQueryVersion
-CARD16  sequenceNumber
-CARD32  length
-CARD16  major_version
-CARD16  minor_version
+GenericEvents may be longer than 32 bytes. If so, the number of 4 byte units
+following the initial 32 bytes must be specified in the length field of the
+event.
 _
-3. Events
+2. Extension Initialization
 
-GE defines a single event, to be used by all extensions. The event's structure 
-is similar to a request.
-
-GenericEvent
-BYTEtype
-CARD8   extension
-CARD16  sequenceNumber
-CARD32  length;
-CARD16  evtype;
-CARD16  pad1;
-CARD32  pad2;
-CARD32  pad3;
-CARD32  pad4;
-CARD32  pad5;
-CARD32  pad6;
-
-The field 'extension' is to be set to the major opcode of the extension.
-The 'evtype' field is the actual opcode of the event. 
-This event is to be type-cast by an extension to it's real format.
-The length field specifies the number of 4-byte blocks after the initial 32
-bytes.
+The name of this extension is "Generic Event Extension"
 
-_
-4. Usage from other extensions - server side
+┌───
+GEQueryVersion
+   client-major-version:   CARD16
+   client-minor-version:   CARD16
+  ▶
+   major-version:  CARD16
+   minor-version:  CARD16
+└───
 
-GERegisterExtension(major_opcode, swap)
-An extension needs to register at the GE. This should be done after
-calling AddExtension(). 
-major_opcode is the major opcode for all extension requests.
-The swap function will be called when an event has to be converted for a
-client with different byte ordering.
+   The client sends the highest supported version to the server
+   and the server sends the highest version it supports, but no
+   higher than the requested version. Major versions changes can
+   introduce incompatibilities in existing functionality, minor
+   version changes introduce only backward compatible changes.
+   It is

x11proto-xext: Changes to 'upstream-unstable'

2008-12-09 Thread Timo Aaltonen
 .gitignore   |1 
 ChangeLog|   19 --
 Makefile.am  |   13 +++
 Xge.h|   54 +++
 configure.ac |2 -
 ge.h |   62 +++
 geproto.h|   85 +
 geproto.txt  |  102 +++
 8 files changed, 318 insertions(+), 20 deletions(-)

New commits:
commit db08133016b421ef12c65db9c4a2819078f01b06
Author: Peter Hutterer <[EMAIL PROTECTED]>
Date:   Wed May 28 17:18:14 2008 +0930

Bump to 7.0.3.

diff --git a/configure.ac b/configure.ac
index b08240e..8f0c242 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.57])
-AC_INIT([XExtProto], [7.0.2], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([XExtProto], [7.0.3], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
 XORG_RELEASE_VERSION

commit 801650f0d15b4497c63d056559ad98a8ca82f271
Author: Peter Hutterer <[EMAIL PROTECTED]>
Date:   Mon May 12 17:26:02 2008 +0930

Xge: replace copyrights with standard format from xserver COPYING.

diff --git a/Xge.h b/Xge.h
index 8b9fb3c..84fa250 100644
--- a/Xge.h
+++ b/Xge.h
@@ -1,23 +1,27 @@
 /*
- * Copyright � 2007 Peter Hutterer
+ * Copyright � 2007-2008 Peter Hutterer
  *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of the author not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  The author makes no
- * representations about the suitability of this software for any purpose.  It
- * is provided "as is" without express or implied warranty.
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Peter Hutterer, University of South Australia, NICTA
  *
- * THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
  */
 
 
diff --git a/ge.h b/ge.h
index 38652a0..6521698 100644
--- a/ge.h
+++ b/ge.h
@@ -1,30 +1,28 @@
-/* 
-
-Copyright 2007 Peter Hutterer <[EMAIL PROTECTED]>
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the author shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from the author.
-
-*/
+/*
+ * Copyright © 2007-2008 Peter Hutterer

x11proto-xext: Changes to 'upstream-unstable'

2007-01-15 Thread David Nusinow
New branch 'upstream-unstable' available with the following commits:
commit 88c24404b44def76a56f52a216a8cf2e0991c3e6
Author: Alan Coopersmith <[EMAIL PROTECTED]>
Date:   Fri Jul 14 18:56:41 2006 -0700

renamed: .cvsignore -> .gitignore

commit a63b4a9d7ebc5929ce9172b10743396cd36addb8
Author: Alan Coopersmith <[EMAIL PROTECTED]>
Date:   Tue Jun 27 16:25:22 2006 +

Remove Xserver API for appgroup extension [Will break Xorg server builds
prior to 2006-06-21 / git commit
77c947b900faf34f425eef1549d8210c475e093b]

commit 7bcd3400a8043dee6399680ddc6592747b30f599
Author: Alan Coopersmith <[EMAIL PROTECTED]>
Date:   Wed Jun 21 21:20:22 2006 +

Remove Xserver API for security extension (#ifdef _SECURITY_SERVER) [Will
break Xorg server builds prior to 2006-06-20 / git commit
d44b2a0a57fb89741173c31676af0ccc822387dc]

commit cb67dc36362b018f3a9faa5c4558ce99dbfb2334
Author: Kevin E Martin <[EMAIL PROTECTED]>
Date:   Thu Dec 15 00:24:39 2005 +

Update package version number for final X11R7 release candidate.

commit 9f8dd222022cfafe3ca6467e02232af7d4d7934b
Author: Kevin E Martin <[EMAIL PROTECTED]>
Date:   Wed Oct 19 02:48:15 2005 +

Update package version number for RC1 release.

commit cba4432f0d088517f2475881e93cf4dda96a7f94
Author: Eric Anholt <[EMAIL PROTECTED]>
Date:   Tue Aug 2 19:19:40 2005 +

Add basic .cvsignore files for proto modules.

commit 790de7da644c6f9114a715b99789253a9c79b0a5
Author: Kevin E Martin <[EMAIL PROTECTED]>
Date:   Fri Jul 29 21:22:57 2005 +

Various changes preparing packages for RC0:
- Verify and update package version numbers as needed
- Implement versioning scheme
- Change bug address to point to bugzilla bug entry form
- Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
reenable it)
- Fix makedepend to use pkgconfig and pass distcheck
- Update build script to build macros first
- Update modular Xorg version

commit cf67142f46ec2f754f2b3347b21139b66b7167cf
Author: Adam Jackson <[EMAIL PROTECTED]>
Date:   Fri Jun 10 04:01:14 2005 +

Bug #2799: Input shape. (Keith Packard)

commit b855e49cf845cf814fa1d8a9abcd65cb14356644
Author: Adam Jackson <[EMAIL PROTECTED]>
Date:   Thu May 19 00:22:40 2005 +

revert last change, didn't do right thing at all, sorry for the noise

commit 1e1659043f908d2e648d0ee73f7f33f5fc79813b
Author: Adam Jackson <[EMAIL PROTECTED]>
Date:   Thu May 19 00:10:19 2005 +

Require automake 1.7 in AM_INIT_AUTOMAKE

commit 1d316d39381cf0981b2f9687cd2f0200c92961ea
Author: Josh Triplett <[EMAIL PROTECTED]>
Date:   Wed May 18 08:09:13 2005 +

Add COPYING file for XExt. Note that there are several similar but
subtly-different licenses included; in particular, there are some
copyright holders with multiple slightly-different licenses included.

commit f3c7759e6dc671ab6db160e739d00133e9996296
Author: Søren Sandmann Pedersen <[EMAIL PROTECTED]>
Date:   Mon May 9 18:20:06 2005 +

Change all the protonames from Ext to Proto.

commit 474a31667a8addb29a0f115790df2910400c4081
Author: Kevin E Martin <[EMAIL PROTECTED]>
Date:   Fri May 6 01:46:32 2005 +

Initial build system files for proto module.

commit be09530f849ec1fc0575816030b7a5dde05c
Author: Roland Mainz <[EMAIL PROTECTED]>
Date:   Tue Dec 7 23:37:37 2004 +

//bugs.freedesktop.org/show_bug.cgi?id=830): Get DPMS header file
(include/extensions/dpms.h) working with C++ applications. Patch by
Kevin DeKorte <[EMAIL PROTECTED]> and Roland Mainz
<[EMAIL PROTECTED]>.

commit da24110547ed45c08d707dbffb2972f043dbc1b1
Author: Egbert Eich <[EMAIL PROTECTED]>
Date:   Fri Apr 23 18:43:06 2004 +

Merging XORG-CURRENT into trunk

commit 8fc2a0fd8ac1b777a35b01d65934ee100b304d20
Author: Egbert Eich <[EMAIL PROTECTED]>
Date:   Sun Mar 14 08:31:36 2004 +

Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004

commit e7af2a9e4c47a46b3a68a2efebb171dc7872c341
Author: Egbert Eich <[EMAIL PROTECTED]>
Date:   Wed Mar 3 12:10:54 2004 +

Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004

commit abb02cac08ca1d7d3a64b361df5d1be6f15c6440
Author: Egbert Eich <[EMAIL PROTECTED]>
Date:   Thu Feb 26 13:35:14 2004 +

readding XFree86's cvs IDs

commit c9d6200d559e57f4ca67291213cd282c7437c3c7
Author: Egbert Eich <[EMAIL PROTECTED]>
Date:   Thu Feb 26 09:22:28 2004 +

Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004

commit 023a09fe640f876478157e5b4cd9cfec1452da4b
Author: Kaleb Keithley <[EMAIL PROTECTED]>
Date:   Tue Nov 25 19:28:02 2003 +

XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks

commit 343e78e15048e6a25791449bfc7566c07ccddf28
Author: Kaleb Keithley <[EMAIL PROTECTED]>
Date:   Fri Nov 14 16:48:43 2003 +

XFree86 4.3.0.1

commit 9a41c9c6452753ac1911a585e59982e8e5186c6b
Author: Kaleb Keithley