[PATCH recordproto 2/2] Remove xlib headers, rename record.h to recordconst.h.
Peter Hutterer
peter.hutterer at who-t.net
Sun Aug 16 20:49:42 PDT 2009
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 at who-t.net>
---
Makefile.am | 2 +-
record.h | 206 ---------------------------------------------------------
recordconst.h | 54 +++++++++++++++
recordstr.h | 10 +---
4 files changed, 56 insertions(+), 216 deletions(-)
delete mode 100644 record.h
create mode 100644 recordconst.h
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
+#define RECORD_LOWEST_MAJOR_VERSION 1
+#define RECORD_LOWEST_MINOR_VERSION 12
+
+#define XRecordBadContext 0 /* Not a valid RC */
+
+#define RecordNumErrors (XRecordBadContext + 1)
+#define RecordNumEvents 0L
+
+/*
+ * 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
+
+
+#endif /* _RECORD_H_ */
diff --git a/recordstr.h b/recordstr.h
index 556fbb2..b9d2382 100644
--- a/recordstr.h
+++ b/recordstr.h
@@ -21,13 +21,8 @@
#ifndef _RECORDSTR_H_
#define _RECORDSTR_H_
-#include <X11/extensions/record.h>
+#include <X11/extensions/recordconst.h>
-#define RECORD_NAME "RECORD"
-#define RECORD_MAJOR_VERSION 1
-#define RECORD_MINOR_VERSION 13
-#define RECORD_LOWEST_MAJOR_VERSION 1
-#define RECORD_LOWEST_MINOR_VERSION 12
/* only difference between 1.12 and 1.13 is byte order of device events,
which the library doesn't deal with. */
@@ -45,9 +40,6 @@
#define X_RecordDisableContext 6 /* Disable interception and reporting */
#define X_RecordFreeContext 7 /* Free client RC */
-#define RecordNumErrors (XRecordBadContext + 1)
-#define RecordNumEvents 0L
-
#define sz_XRecordRange 32
#define sz_XRecordClientInfo 12
#define sz_XRecordState 16
--
1.6.3.rc1.2.g0164.dirty
More information about the xorg-devel
mailing list