x11proto-record: Changes to 'upstream-unstable'
.gitignore | 4
ChangeLog | 4
Makefile.am | 15 ++
configure.ac | 8 +
record.h | 211 -------------------------------------
recordconst.h | 54 +++++++++
recordproto.h | 306 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
recordstr.h | 326 ----------------------------------------------------------
8 files changed, 387 insertions(+), 541 deletions(-)
New commits:
commit 38fd3772f3a5a107fa6e9d94e0be7bd276f771b6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Oct 1 19:38:36 2009 +1000
recordproto 1.14
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index 21d84aa..1709ce6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.57])
-AC_INIT([RecordProto], [1.13.99.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([RecordProto], [1.14], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
# Require xorg-macros: XORG_DEFAULT_OPTIONS
commit fd428befaa8a76b216d5e42e63b688d4d55fdbc5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Oct 1 19:38:12 2009 +1000
Require macros 1.3 for XORG_DEFAULT_OPTIONS
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index 4debcb3..21d84aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,11 +2,11 @@ AC_PREREQ([2.57])
AC_INIT([RecordProto], [1.13.99.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
-# Require xorg-macros: XORG_CHANGELOG
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.2)
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
+
+XORG_DEFAULT_OPTIONS
AC_OUTPUT([Makefile
recordproto.pc])
commit 379a691a45f4a637b8b7bbea9d3c7c2454f5cde6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sat Aug 15 21:47:26 2009 +1000
Bump to 1.13.99.1
diff --git a/configure.ac b/configure.ac
index eeb62cf..4debcb3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.57])
-AC_INIT([RecordProto], [1.13.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([RecordProto], [1.13.99.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
# Require xorg-macros: XORG_CHANGELOG
commit a7419fc173ccb949e6b20e1608bdcb816157a17f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 18 11:08:27 2009 +1000
Rename recordstr.h to recordproto.h, provide a stub instead.
Renaming for consistency with other protocol packages. recordstr.h is a
simple stub warning against the use of this header.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/Makefile.am b/Makefile.am
index 28950ee..dd0b028 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,7 @@
recorddir = $(includedir)/X11/extensions
record_HEADERS = \
recordconst.h \
+ recordproto.h \
recordstr.h
pkgconfigdir = $(libdir)/pkgconfig
diff --git a/recordproto.h b/recordproto.h
new file mode 100644
index 0000000..01bc952
--- /dev/null
+++ b/recordproto.h
@@ -0,0 +1,306 @@
+/***************************************************************************
+ * Copyright 1995 Network Computing Devices
+ *
+ * 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 Network Computing Devices
+ * not be used in advertising or publicity pertaining to distribution
+ * of the software without specific, written prior permission.
+ *
+ * NETWORK COMPUTING DEVICES DISCLAIMs ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL NETWORK COMPUTING DEVICES 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.
+ **************************************************************************/
+
+#ifndef _RECORDPROTO_H_
+#define _RECORDPROTO_H_
+
+#include <X11/extensions/recordconst.h>
+
+/* only difference between 1.12 and 1.13 is byte order of device events,
+ which the library doesn't deal with. */
+
+/*********************************************************
+ *
+ * Protocol request constants
+ *
+ */
+#define X_RecordQueryVersion 0 /* First request from client */
+#define X_RecordCreateContext 1 /* Create client RC */
+#define X_RecordRegisterClients 2 /* Add to client RC */
+#define X_RecordUnregisterClients 3 /* Delete from client RC */
+#define X_RecordGetContext 4 /* Query client RC */
+#define X_RecordEnableContext 5 /* Enable interception and reporting */
+#define X_RecordDisableContext 6 /* Disable interception and reporting */
+#define X_RecordFreeContext 7 /* Free client RC */
+
+#define sz_XRecordRange 32
+#define sz_XRecordClientInfo 12
+#define sz_XRecordState 16
+#define sz_XRecordDatum 32
+
+
+#define XRecordGlobaldef
+#define XRecordGlobalref extern
+
+#define RecordMaxEvent (128L-1L)
+#define RecordMinDeviceEvent (2L)
+#define RecordMaxDeviceEvent (6L)
+#define RecordMaxError (256L-1L)
+#define RecordMaxCoreRequest (128L-1L)
+#define RecordMaxExtRequest (256L-1L)
+#define RecordMinExtRequest (129L-1L)
+
+#define RECORD_RC CARD32
+#define RECORD_XIDBASE CARD32
+#define RECORD_CLIENTSPEC CARD32
+#define RECORD_ELEMENT_HEADER CARD8
+
+typedef RECORD_CLIENTSPEC RecordClientSpec, *RecordClientSpecPtr;
+
+typedef struct
+{
+ CARD8 first;
+ CARD8 last;
+} RECORD_RANGE8;
+
+typedef struct
+{
+ CARD16 first B16;
+ CARD16 last B16;
+} RECORD_RANGE16;
+
+typedef struct
+{
+ RECORD_RANGE8 majorCode;
+ RECORD_RANGE16 minorCode;
+} RECORD_EXTRANGE;
+
+typedef struct
+{
+ RECORD_RANGE8 coreRequests;
+ RECORD_RANGE8 coreReplies;
+ RECORD_EXTRANGE extRequests;
+ RECORD_EXTRANGE extReplies;
+ RECORD_RANGE8 deliveredEvents;
+ RECORD_RANGE8 deviceEvents;
+ RECORD_RANGE8 errors;
+ BOOL clientStarted;
+ BOOL clientDied;
+} RECORDRANGE;
+#define sz_RECORDRANGE 24
+
+/* typedef RECORDRANGE xRecordRange, *xRecordRangePtr;
+#define sz_xRecordRange 24 */
+
+/* Cannot have structures within structures going over the wire */
+typedef struct
+{
+ CARD8 coreRequestsFirst;
+ CARD8 coreRequestsLast;
+ CARD8 coreRepliesFirst;
+ CARD8 coreRepliesLast;
+ CARD8 extRequestsMajorFirst;
+ CARD8 extRequestsMajorLast;
+ CARD16 extRequestsMinorFirst B16;
+ CARD16 extRequestsMinorLast B16;
+ CARD8 extRepliesMajorFirst;
+ CARD8 extRepliesMajorLast;
+ CARD16 extRepliesMinorFirst B16;
+ CARD16 extRepliesMinorLast B16;
+ CARD8 deliveredEventsFirst;
+ CARD8 deliveredEventsLast;
+ CARD8 deviceEventsFirst;
+ CARD8 deviceEventsLast;
+ CARD8 errorsFirst;
+ CARD8 errorsLast;
+ BOOL clientStarted;
+ BOOL clientDied;
+} xRecordRange;
+#define sz_xRecordRange 24
+
+typedef struct
+{
+ RECORD_CLIENTSPEC clientResource B32;
+ CARD32 nRanges B32;
+/* LISTofRECORDRANGE */
+} RECORD_CLIENT_INFO;
+
+typedef RECORD_CLIENT_INFO xRecordClientInfo;
+
+/*
+ * Initialize
+ */
+typedef struct {
+ CARD8 reqType;
+ CARD8 recordReqType;
+ CARD16 length B16;
+ CARD16 majorVersion B16;
+ CARD16 minorVersion B16;
+} xRecordQueryVersionReq;
+#define sz_xRecordQueryVersionReq 8
+
+typedef struct
+{
+ CARD8 type;
+ CARD8 pad0;
+ CARD16 sequenceNumber B16;
+ CARD32 length B32;
+ CARD16 majorVersion B16;
+ CARD16 minorVersion B16;
+ CARD32 pad1 B32;
+ CARD32 pad2 B32;
+ CARD32 pad3 B32;
+ CARD32 pad4 B32;
+ CARD32 pad5 B32;
+ } xRecordQueryVersionReply;
+#define sz_xRecordQueryVersionReply 32
+
+/*
+ * Create RC
+ */
+typedef struct
+{
+ CARD8 reqType;
+ CARD8 recordReqType;
+ CARD16 length B16;
+ RECORD_RC context B32;
+ RECORD_ELEMENT_HEADER elementHeader;
+ CARD8 pad;
+ CARD16 pad0 B16;
+ CARD32 nClients B32;
+ CARD32 nRanges B32;
+/* LISTofRECORD_CLIENTSPEC */
+/* LISTofRECORDRANGE */
+} xRecordCreateContextReq;
+#define sz_xRecordCreateContextReq 20
+
+/*
+ * Add to RC
+ */
+typedef struct
+{
+ CARD8 reqType;
+ CARD8 recordReqType;
+ CARD16 length B16;
+ RECORD_RC context B32;
+ RECORD_ELEMENT_HEADER elementHeader;
+ CARD8 pad;
+ CARD16 pad0 B16;
+ CARD32 nClients B32;
+ CARD32 nRanges B32;
+/* LISTofRECORD_CLIENTSPEC */
+/* LISTofRECORDRANGE */
+} xRecordRegisterClientsReq;
+#define sz_xRecordRegisterClientsReq 20
+
+/*
+ * Delete from RC
+ */
+typedef struct
+{
+ CARD8 reqType;
+ CARD8 recordReqType;
+ CARD16 length B16;
+ RECORD_RC context B32;
+ CARD32 nClients B32;
+/* LISTofRECORD_CLIENTSPEC */
+} xRecordUnregisterClientsReq;
+#define sz_xRecordUnregisterClientsReq 12
+
+/*
+ * Query RC
+ */
+typedef struct
+{
+ CARD8 reqType;
+ CARD8 recordReqType;
+ CARD16 length B16;
+ RECORD_RC context B32;
+} xRecordGetContextReq;
+#define sz_xRecordGetContextReq 8
+
+typedef struct
+{
+ CARD8 type;
+ BOOL enabled;
+ CARD16 sequenceNumber B16;
+ CARD32 length B32;
+ RECORD_ELEMENT_HEADER elementHeader;
+ CARD8 pad;
+ CARD16 pad0 B16;
+ CARD32 nClients B32;
+ CARD32 pad1 B32;
+ CARD32 pad2 B32;
+ CARD32 pad3 B32;
+ CARD32 pad4 B32;
+/* LISTofCLIENT_INFO */ /* intercepted-clients */
+} xRecordGetContextReply;
+#define sz_xRecordGetContextReply 32
+
+/*
+ * Enable data interception
+ */
+typedef struct
+{
+ CARD8 reqType;
+ CARD8 recordReqType;
+ CARD16 length B16;
+ RECORD_RC context B32;
+} xRecordEnableContextReq;
+#define sz_xRecordEnableContextReq 8
+
+typedef struct
+{
+ CARD8 type;
+ CARD8 category;
+ CARD16 sequenceNumber B16;
+ CARD32 length B32;
+ RECORD_ELEMENT_HEADER elementHeader;
+ BOOL clientSwapped;
+ CARD16 pad1 B16;
+ RECORD_XIDBASE idBase B32;
+ CARD32 serverTime B32;
+ CARD32 recordedSequenceNumber B32;
+ CARD32 pad3 B32;
+ CARD32 pad4 B32;
+ /* BYTE data; */
+} xRecordEnableContextReply;
+#define sz_xRecordEnableContextReply 32
+
+/*
+ * Disable data interception
+ */
+typedef struct
+{
+ CARD8 reqType;
+ CARD8 recordReqType;
+ CARD16 length B16;
+ RECORD_RC context B32;
+} xRecordDisableContextReq;
+#define sz_xRecordDisableContextReq 8
+
+/*
+ * Free RC
+ */
+typedef struct
+{
+ CARD8 reqType;
+ CARD8 recordReqType;
+ CARD16 length B16;
+ RECORD_RC context B32;
+} xRecordFreeContextReq;
+#define sz_xRecordFreeContextReq 8
+
+#undef RECORD_RC
+#undef RECORD_XIDBASE
+#undef RECORD_ELEMENT_HEADER
+#undef RECORD_CLIENTSPEC
+
+#endif
diff --git a/recordstr.h b/recordstr.h
index b9d2382..7f269b7 100644
--- a/recordstr.h
+++ b/recordstr.h
@@ -1,306 +1,4 @@
-/***************************************************************************
- * Copyright 1995 Network Computing Devices
- *
- * 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 Network Computing Devices
- * not be used in advertising or publicity pertaining to distribution
- * of the software without specific, written prior permission.
- *
- * NETWORK COMPUTING DEVICES DISCLAIMs ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL NETWORK COMPUTING DEVICES 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.
- **************************************************************************/
-
-#ifndef _RECORDSTR_H_
-#define _RECORDSTR_H_
-
-#include <X11/extensions/recordconst.h>
-
-/* only difference between 1.12 and 1.13 is byte order of device events,
- which the library doesn't deal with. */
-
-/*********************************************************
- *
- * Protocol request constants
- *
- */
-#define X_RecordQueryVersion 0 /* First request from client */
-#define X_RecordCreateContext 1 /* Create client RC */
-#define X_RecordRegisterClients 2 /* Add to client RC */
-#define X_RecordUnregisterClients 3 /* Delete from client RC */
-#define X_RecordGetContext 4 /* Query client RC */
-#define X_RecordEnableContext 5 /* Enable interception and reporting */
-#define X_RecordDisableContext 6 /* Disable interception and reporting */
-#define X_RecordFreeContext 7 /* Free client RC */
-
-#define sz_XRecordRange 32
-#define sz_XRecordClientInfo 12
-#define sz_XRecordState 16
-#define sz_XRecordDatum 32
-
-
-#define XRecordGlobaldef
-#define XRecordGlobalref extern
-
-#define RecordMaxEvent (128L-1L)
-#define RecordMinDeviceEvent (2L)
-#define RecordMaxDeviceEvent (6L)
-#define RecordMaxError (256L-1L)
-#define RecordMaxCoreRequest (128L-1L)
-#define RecordMaxExtRequest (256L-1L)
-#define RecordMinExtRequest (129L-1L)
-
-#define RECORD_RC CARD32
-#define RECORD_XIDBASE CARD32
-#define RECORD_CLIENTSPEC CARD32
-#define RECORD_ELEMENT_HEADER CARD8
-
-typedef RECORD_CLIENTSPEC RecordClientSpec, *RecordClientSpecPtr;
-
-typedef struct
-{
- CARD8 first;
- CARD8 last;
-} RECORD_RANGE8;
-
-typedef struct
-{
- CARD16 first B16;
- CARD16 last B16;
-} RECORD_RANGE16;
-
-typedef struct
-{
- RECORD_RANGE8 majorCode;
- RECORD_RANGE16 minorCode;
-} RECORD_EXTRANGE;
-
-typedef struct
-{
- RECORD_RANGE8 coreRequests;
- RECORD_RANGE8 coreReplies;
- RECORD_EXTRANGE extRequests;
- RECORD_EXTRANGE extReplies;
- RECORD_RANGE8 deliveredEvents;
- RECORD_RANGE8 deviceEvents;
- RECORD_RANGE8 errors;
- BOOL clientStarted;
- BOOL clientDied;
-} RECORDRANGE;
-#define sz_RECORDRANGE 24
-
-/* typedef RECORDRANGE xRecordRange, *xRecordRangePtr;
-#define sz_xRecordRange 24 */
-
-/* Cannot have structures within structures going over the wire */
-typedef struct
-{
- CARD8 coreRequestsFirst;
- CARD8 coreRequestsLast;
- CARD8 coreRepliesFirst;
- CARD8 coreRepliesLast;
- CARD8 extRequestsMajorFirst;
- CARD8 extRequestsMajorLast;
- CARD16 extRequestsMinorFirst B16;
- CARD16 extRequestsMinorLast B16;
- CARD8 extRepliesMajorFirst;
- CARD8 extRepliesMajorLast;
- CARD16 extRepliesMinorFirst B16;
- CARD16 extRepliesMinorLast B16;
- CARD8 deliveredEventsFirst;
- CARD8 deliveredEventsLast;
- CARD8 deviceEventsFirst;
- CARD8 deviceEventsLast;
- CARD8 errorsFirst;
- CARD8 errorsLast;
- BOOL clientStarted;
- BOOL clientDied;
-} xRecordRange;
-#define sz_xRecordRange 24
-
-typedef struct
-{
- RECORD_CLIENTSPEC clientResource B32;
- CARD32 nRanges B32;
-/* LISTofRECORDRANGE */
-} RECORD_CLIENT_INFO;
-
-typedef RECORD_CLIENT_INFO xRecordClientInfo;
-
-/*
- * Initialize
- */
-typedef struct {
- CARD8 reqType;
- CARD8 recordReqType;
- CARD16 length B16;
- CARD16 majorVersion B16;
- CARD16 minorVersion B16;
-} xRecordQueryVersionReq;
-#define sz_xRecordQueryVersionReq 8
-
-typedef struct
-{
- CARD8 type;
- CARD8 pad0;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 majorVersion B16;
- CARD16 minorVersion B16;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- } xRecordQueryVersionReply;
-#define sz_xRecordQueryVersionReply 32
-
-/*
- * Create RC
- */
-typedef struct
-{
- CARD8 reqType;
- CARD8 recordReqType;
- CARD16 length B16;
- RECORD_RC context B32;
- RECORD_ELEMENT_HEADER elementHeader;
- CARD8 pad;
- CARD16 pad0 B16;
- CARD32 nClients B32;
- CARD32 nRanges B32;
-/* LISTofRECORD_CLIENTSPEC */
-/* LISTofRECORDRANGE */
-} xRecordCreateContextReq;
-#define sz_xRecordCreateContextReq 20
-
-/*
- * Add to RC
- */
-typedef struct
-{
- CARD8 reqType;
- CARD8 recordReqType;
- CARD16 length B16;
- RECORD_RC context B32;
- RECORD_ELEMENT_HEADER elementHeader;
- CARD8 pad;
- CARD16 pad0 B16;
- CARD32 nClients B32;
- CARD32 nRanges B32;
-/* LISTofRECORD_CLIENTSPEC */
-/* LISTofRECORDRANGE */
-} xRecordRegisterClientsReq;
-#define sz_xRecordRegisterClientsReq 20
-
-/*
- * Delete from RC
- */
-typedef struct
-{
- CARD8 reqType;
- CARD8 recordReqType;
- CARD16 length B16;
- RECORD_RC context B32;
- CARD32 nClients B32;
-/* LISTofRECORD_CLIENTSPEC */
-} xRecordUnregisterClientsReq;
-#define sz_xRecordUnregisterClientsReq 12
-
-/*
- * Query RC
- */
-typedef struct
-{
- CARD8 reqType;
- CARD8 recordReqType;
- CARD16 length B16;
- RECORD_RC context B32;
-} xRecordGetContextReq;
-#define sz_xRecordGetContextReq 8
-
-typedef struct
-{
- CARD8 type;
- BOOL enabled;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- RECORD_ELEMENT_HEADER elementHeader;
- CARD8 pad;
- CARD16 pad0 B16;
- CARD32 nClients B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
-/* LISTofCLIENT_INFO */ /* intercepted-clients */
-} xRecordGetContextReply;
-#define sz_xRecordGetContextReply 32
-
-/*
- * Enable data interception
- */
-typedef struct
-{
- CARD8 reqType;
- CARD8 recordReqType;
- CARD16 length B16;
- RECORD_RC context B32;
-} xRecordEnableContextReq;
-#define sz_xRecordEnableContextReq 8
-
-typedef struct
-{
- CARD8 type;
- CARD8 category;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- RECORD_ELEMENT_HEADER elementHeader;
- BOOL clientSwapped;
- CARD16 pad1 B16;
- RECORD_XIDBASE idBase B32;
- CARD32 serverTime B32;
- CARD32 recordedSequenceNumber B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- /* BYTE data; */
-} xRecordEnableContextReply;
-#define sz_xRecordEnableContextReply 32
-
-/*
- * Disable data interception
- */
-typedef struct
-{
- CARD8 reqType;
- CARD8 recordReqType;
- CARD16 length B16;
- RECORD_RC context B32;
-} xRecordDisableContextReq;
-#define sz_xRecordDisableContextReq 8
-
-/*
- * Free RC
- */
-typedef struct
-{
- CARD8 reqType;
- CARD8 recordReqType;
- CARD16 length B16;
- RECORD_RC context B32;
-} xRecordFreeContextReq;
-#define sz_xRecordFreeContextReq 8
-
-#undef RECORD_RC
-#undef RECORD_XIDBASE
-#undef RECORD_ELEMENT_HEADER
-#undef RECORD_CLIENTSPEC
-
-#endif
+#warning "recordstr.h is obsolete and may be removed in the future."
+#warning "include <X11/extensions/record.h> for the library interfaces."
+#warning "include <X11/extensions/recordproto.h> for the protocol defines."
+#include <X11/extensions/recordproto.h>
commit 5e35e18e81da8a6a891bc73ac828d45eae91c53c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 14 13:34:52 2009 +1000
Remove xlib headers, rename record.h to recordconst.h.
Xlib headers moved to libXtst.
This patch also moves some defines from recordstr.h into recordconst.h.
These defines are the ones possibly used by clients (e.g. RECORD_NAME).
Clients should never need to include recordstr.h.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/Makefile.am b/Makefile.am
index 3b7dd31..28950ee 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
recorddir = $(includedir)/X11/extensions
record_HEADERS = \
- record.h \
+ recordconst.h \
recordstr.h
pkgconfigdir = $(libdir)/pkgconfig
diff --git a/record.h b/record.h
deleted file mode 100644
index c32cc7a..0000000
--- a/record.h
+++ /dev/null
@@ -1,206 +0,0 @@
-/***************************************************************************
- * Copyright 1995 Network Computing Devices
- *
- * 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 Network Computing Devices
- * not be used in advertising or publicity pertaining to distribution
- * of the software without specific, written prior permission.
- *
- * NETWORK COMPUTING DEVICES DISCLAIMs ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL NETWORK COMPUTING DEVICES 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.
- **************************************************************************/
-
-#ifndef _RECORD_H_
-#define _RECORD_H_
-
-#define XRecordBadContext 0 /* Not a valid RC */
-
-/*
- * Constants for arguments of various requests
- */
-#define XRecordFromServerTime 0x01
-#define XRecordFromClientTime 0x02
-#define XRecordFromClientSequence 0x04
-
-#define XRecordCurrentClients 1
-#define XRecordFutureClients 2
-#define XRecordAllClients 3
-
-#define XRecordFromServer 0
-#define XRecordFromClient 1
-#define XRecordClientStarted 2
-#define XRecordClientDied 3
-#define XRecordStartOfData 4
-#define XRecordEndOfData 5
-
-typedef unsigned long XRecordClientSpec;
-
-#ifndef _XRECORD_SERVER_
-
-typedef unsigned long XRecordContext;
-
-typedef struct
-{
- unsigned char first;
- unsigned char last;
-} XRecordRange8;
-
-typedef struct
-{
- unsigned short first;
- unsigned short last;
-} XRecordRange16;
-
-typedef struct
-{
- XRecordRange8 ext_major;
- XRecordRange16 ext_minor;
-} XRecordExtRange;
-
-typedef struct
-{
- XRecordRange8 core_requests; /* core X requests */
- XRecordRange8 core_replies; /* core X replies */
- XRecordExtRange ext_requests; /* extension requests */
- XRecordExtRange ext_replies; /* extension replies */
- XRecordRange8 delivered_events; /* delivered core and ext events */
- XRecordRange8 device_events; /* all core and ext device events */
- XRecordRange8 errors; /* core X and ext errors */
- Bool client_started; /* connection setup reply */
- Bool client_died; /* notice of client disconnect */
-} XRecordRange;
-
-typedef struct
-{
- XRecordClientSpec client;
- unsigned long nranges;
- XRecordRange **ranges;
-} XRecordClientInfo;
-
-typedef struct
-{
- Bool enabled;
- int datum_flags;
- unsigned long nclients;
- XRecordClientInfo **client_info;
-} XRecordState;
-
-typedef struct
-{
- XID id_base;
- Time server_time;
- unsigned long client_seq;
- int category;
- Bool client_swapped;
- unsigned char *data;
- unsigned long data_len; /* in 4-byte units */
-} XRecordInterceptData;
-
-_XFUNCPROTOBEGIN
-
-/*********************************************************
- *
- * Prototypes
- *
- */
-
-XID XRecordIdBaseMask(
- Display *dpy
-);
-
-extern Status XRecordQueryVersion(
- Display* /* dpy */,
- int* /* cmajor_return */,
- int* /* cminor_return */
-);
-
-extern XRecordContext XRecordCreateContext(
- Display* /* dpy */,
- int /* datum_flags */,
- XRecordClientSpec* /* clients */,
- int /* nclients */,
- XRecordRange** /* ranges */,
- int /* nranges */
-);
-
-extern XRecordRange *XRecordAllocRange(
- void
-);
-
-extern Status XRecordRegisterClients(
- Display* /* dpy */,
- XRecordContext /* context */,
- int /* datum_flags */,
- XRecordClientSpec* /* clients */,
- int /* nclients */,
- XRecordRange** /* ranges */,
- int /* nranges */
-);
-
-extern Status XRecordUnregisterClients(
- Display* /* dpy */,
- XRecordContext /* context */,
- XRecordClientSpec* /* clients */,
- int /* nclients */
-);
-
-extern Status XRecordGetContext(
- Display* /* dpy */,
- XRecordContext /* context */,
- XRecordState** /* state_return */
-);
-
-extern void XRecordFreeState(
-XRecordState* /* state */
-);
-
-typedef void (*XRecordInterceptProc) (
- XPointer /* closure */,
- XRecordInterceptData* /* recorded_data */
-);
-
-extern Status XRecordEnableContext(
- Display* /* dpy */,
- XRecordContext /* context */,
- XRecordInterceptProc /* callback */,
- XPointer /* closure */
-);
-
-extern Status XRecordEnableContextAsync(
- Display* /* dpy */,
- XRecordContext /* context */,
- XRecordInterceptProc /* callback */,
- XPointer /* closure */
-);
-
-extern void XRecordProcessReplies(
- Display* /* dpy */
-);
-
-extern void XRecordFreeData(
-XRecordInterceptData* /* data */
-);
-
-extern Status XRecordDisableContext(
- Display* /* dpy */,
- XRecordContext /* context */
-);
-
-extern Status XRecordFreeContext(
- Display* /* dpy */,
- XRecordContext /* context */
-);
-
-_XFUNCPROTOEND
-
-#endif /* _XRECORD_SERVER_ */
-
-#endif /* _RECORD_H_ */
diff --git a/recordconst.h b/recordconst.h
new file mode 100644
index 0000000..4819de7
--- /dev/null
+++ b/recordconst.h
@@ -0,0 +1,54 @@
+/***************************************************************************
+ * Copyright 1995 Network Computing Devices
+ *
+ * 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 Network Computing Devices
+ * not be used in advertising or publicity pertaining to distribution
+ * of the software without specific, written prior permission.
+ *
+ * NETWORK COMPUTING DEVICES DISCLAIMs ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL NETWORK COMPUTING DEVICES 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.
+ **************************************************************************/
+
+#ifndef _RECORDCONST_H_
+#define _RECORDCONST_H_
+
+#define RECORD_NAME "RECORD"
+#define RECORD_MAJOR_VERSION 1
+#define RECORD_MINOR_VERSION 13
Reply to: