x11proto-xext: Changes to 'upstream-unstable'
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 <peter.hutterer@who-t.net>
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 <peter.hutterer@redhat.com>
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
- peter@cs.unisa.edu.au
+ peter.hutterer@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
- BYTE type
- 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 the clients responsibility to ensure that the server
+ supports a version which is compatible with its expectations.
-_____________________________________________________________________________
-5. Usage from other extensions - client side
-None. The event conversion rules of the extension however should be able to
-handle events of type GenericEvent as well.
-
-Internally, when an extension is initialized, it needs to call XExtAddDisplay
-and provide a set of hooks that are to be called for events conversion and
-other stuff. XGE hooks into XExtAddDisplay and stores the hooks provided by
-the extension. Should a GenericEvent come along, XGE receives it but relays
-the call to the real extension to handle it.
+ As of version 1.0, no other requests are provided by this extension.
+_____________________________________________________________________________
+3. Extension Events
+GE defines a single event, to be used by all extensions. The event's structure
+is similar to a reply.
+
+┌───
+ GenericEvent
+ type: BYTE; always GenericEvent
+ 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 is the actual opcode of the event.
+ The length field specifies the number of 4-byte blocks after the
+ initial 32 bytes. If length is 0, the event is 32 bytes long.
_____________________________________________________________________________
-6. Notes
+4. Notes
Although the wire event is of arbitrary length, the actual size of an XEvent
is restricted to sizeof(XEvent) [96 bytes, see Xlib.h]. If an extension
converts a wire event to an XEvent > 96 bytes, it will overwrite the space
-acllocated for the event. See struct _XSQEvent in Xlibint.h for details.
+allocated for the event. See struct _XSQEvent in Xlibint.h for details.
Extensions need to malloc additional data and fill the XEvent structure with
pointers to the malloc'd data. The client then needs to free the data, only
the XEvent structure will be released by Xlib.
+
+The server must not send GenericEvents longer than 32 bytes until it has
+verified that the client is able to interpret these events. If a long event is
+sent to a client unable to process GenericEvents, future interpretation of
+replies and events by this client will fail.
commit b0080664e432f8ee569ce099a536c0232dd64d3e
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Mon Dec 1 15:41:16 2008 +1000
geproto: remote trailing whitespaces.
diff --git a/geproto.h b/geproto.h
index 54107df..c8860dd 100644
--- a/geproto.h
+++ b/geproto.h
@@ -42,7 +42,7 @@
/*********************************************************
*
- * XGE protocol requests/replies
+ * XGE protocol requests/replies
*
*/
@@ -56,9 +56,9 @@ typedef struct {
/* QueryVersion */
typedef struct {
- CARD8 reqType; /* input extension major code */
- CARD8 ReqType; /* always X_GEQueryVersion */
- CARD16 length B16;
+ CARD8 reqType; /* input extension major code */
+ CARD8 ReqType; /* always X_GEQueryVersion */
+ CARD16 length B16;
CARD16 majorVersion B16;
CARD16 minorVersion B16;
} xGEQueryVersionReq;
@@ -66,17 +66,17 @@ typedef struct {
#define sz_xGEQueryVersionReq 8
typedef struct {
- CARD8 repType; /* X_Reply */
- CARD8 RepType; /* always X_GEQueryVersion */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 majorVersion B16;
- CARD16 minorVersion B16;
- CARD32 pad00 B32;
- CARD32 pad01 B32;
- CARD32 pad02 B32;
- CARD32 pad03 B32;
- CARD32 pad04 B32;
+ CARD8 repType; /* X_Reply */
+ CARD8 RepType; /* always X_GEQueryVersion */
+ CARD16 sequenceNumber B16;
+ CARD32 length B32;
+ CARD16 majorVersion B16;
+ CARD16 minorVersion B16;
+ CARD32 pad00 B32;
+ CARD32 pad01 B32;
+ CARD32 pad02 B32;
+ CARD32 pad03 B32;
+ CARD32 pad04 B32;
} xGEQueryVersionReply;
#define sz_xGEQueryVersionReply 32
commit f7e5f23e37e62cc0a981d9b002b69d90b8a7daa9
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Sep 26 14:54:19 2008 +0930
Xge.h: include Xmd.h for CARD8
diff --git a/Xge.h b/Xge.h
index 84fa250..cc03ece 100644
--- a/Xge.h
+++ b/Xge.h
@@ -30,6 +30,7 @@
#ifndef _XGE_H_
#define _XGE_H_
+#include <X11/Xmd.h>
#include <X11/Xlib.h>
#include <X11/Xfuncproto.h>
Reply to: