From 5891b79405209d51d5fcf20ff562cf7120c3017f Mon Sep 17 00:00:00 2001 From: Kaleb Keithley Date: Fri, 14 Nov 2003 15:54:35 +0000 Subject: R6.6 is the Xorg base-line --- record.h | 239 +++++++++++++++++++++++++++++++++++++++++++++ recordstr.h | 318 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 557 insertions(+) create mode 100644 record.h create mode 100644 recordstr.h diff --git a/record.h b/record.h new file mode 100644 index 0000000..9234404 --- /dev/null +++ b/record.h @@ -0,0 +1,239 @@ +/* +$Xorg: record.h,v 1.3 2000/08/18 04:05:46 coskrey Exp $ +*/ + +/*************************************************************************** + * 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( +#if NeedFunctionPrototypes + Display *dpy +#endif +); + +extern Status XRecordQueryVersion( +#if NeedFunctionPrototypes + Display* /* dpy */, + int* /* cmajor_return */, + int* /* cminor_return */ +#endif +); + +extern XRecordContext XRecordCreateContext( +#if NeedFunctionPrototypes + Display* /* dpy */, + int /* datum_flags */, + XRecordClientSpec* /* clients */, + int /* nclients */, + XRecordRange** /* ranges */, + int /* nranges */ +#endif +); + +extern XRecordRange *XRecordAllocRange( +#if NeedFunctionPrototypes + void +#endif +); + +extern Status XRecordRegisterClients( +#if NeedFunctionPrototypes + Display* /* dpy */, + XRecordContext /* context */, + int /* datum_flags */, + XRecordClientSpec* /* clients */, + int /* nclients */, + XRecordRange** /* ranges */, + int /* nranges */ +#endif +); + +extern Status XRecordUnregisterClients( +#if NeedFunctionPrototypes + Display* /* dpy */, + XRecordContext /* context */, + XRecordClientSpec* /* clients */, + int /* nclients */ +#endif +); + +extern Status XRecordGetContext( +#if NeedFunctionPrototypes + Display* /* dpy */, + XRecordContext /* context */, + XRecordState** /* state_return */ +#endif +); + +extern void XRecordFreeState( +#if NeedFunctionPrototypes +XRecordState* /* state */ +#endif +); + +typedef void (*XRecordInterceptProc) ( +#if NeedFunctionPrototypes + XPointer /* closure */, + XRecordInterceptData* /* recorded_data */ +#endif +); + +extern Status XRecordEnableContext( +#if NeedFunctionPrototypes + Display* /* dpy */, + XRecordContext /* context */, + XRecordInterceptProc /* callback */, + XPointer /* closure */ +#endif +); + +extern Status XRecordEnableContextAsync( +#if NeedFunctionPrototypes + Display* /* dpy */, + XRecordContext /* context */, + XRecordInterceptProc /* callback */, + XPointer /* closure */ +#endif +); + +extern void XRecordProcessReplies( +#if NeedFunctionPrototypes + Display* /* dpy */ +#endif +); + +extern void XRecordFreeData( +#if NeedFunctionPrototypes +XRecordInterceptData* /* data */ +#endif +); + +extern Status XRecordDisableContext( +#if NeedFunctionPrototypes + Display* /* dpy */, + XRecordContext /* context */ +#endif +); + +extern Status XRecordFreeContext( +#if NeedFunctionPrototypes + Display* /* dpy */, + XRecordContext /* context */ +#endif +); + +_XFUNCPROTOEND + +#endif /* _XRECORD_SERVER_ */ + +#endif /* _RECORD_H_ */ diff --git a/recordstr.h b/recordstr.h new file mode 100644 index 0000000..bfd3028 --- /dev/null +++ b/recordstr.h @@ -0,0 +1,318 @@ +/* +#ifndef lint +$Xorg: recordstr.h,v 1.3 2000/08/18 04:05:46 coskrey Exp $ +static char sccsid[ ] = "@(#) recordstr.h 1.5 6/5/95 12:37:44"; +#endif +*/ + +/*************************************************************************** + * 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. + **************************************************************************/ + +#include "record.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. */ + +/********************************************************* + * + * 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 RecordNumErrors (XRecordBadContext + 1) +#define RecordNumEvents 0L + +#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 + + -- cgit v1.2.3 From 3b9115eb4dd86b813ac3423f2d508535a2fcaf09 Mon Sep 17 00:00:00 2001 From: Kaleb Keithley Date: Fri, 14 Nov 2003 16:48:43 +0000 Subject: XFree86 4.3.0.1 --- recordstr.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/recordstr.h b/recordstr.h index bfd3028..37b5eec 100644 --- a/recordstr.h +++ b/recordstr.h @@ -24,8 +24,12 @@ static char sccsid[ ] = "@(#) recordstr.h 1.5 6/5/95 12:37:44"; * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. **************************************************************************/ +/* $XFree86: xc/include/extensions/recordstr.h,v 1.2 2001/08/01 00:44:35 tsi Exp $ */ -#include "record.h" +#ifndef _RECORDSTR_H_ +#define _RECORDSTR_H_ + +#include #define RECORD_NAME "RECORD" #define RECORD_MAJOR_VERSION 1 @@ -315,4 +319,4 @@ typedef struct #undef RECORD_ELEMENT_HEADER #undef RECORD_CLIENTSPEC - +#endif -- cgit v1.2.3 From 45626afe8e328c1c1deb32cb6e96914ba8923101 Mon Sep 17 00:00:00 2001 From: Kaleb Keithley Date: Tue, 25 Nov 2003 19:28:02 +0000 Subject: XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks --- record.h | 32 ++------------------------------ 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/record.h b/record.h index 9234404..bab5e4e 100644 --- a/record.h +++ b/record.h @@ -21,6 +21,8 @@ $Xorg: record.h,v 1.3 2000/08/18 04:05:46 coskrey Exp $ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. **************************************************************************/ +/* $XFree86: xc/include/extensions/record.h,v 1.2 2003/11/17 22:20:03 dawes Exp $ */ + #ifndef _RECORD_H_ #define _RECORD_H_ @@ -116,38 +118,29 @@ _XFUNCPROTOBEGIN */ XID XRecordIdBaseMask( -#if NeedFunctionPrototypes Display *dpy -#endif ); extern Status XRecordQueryVersion( -#if NeedFunctionPrototypes Display* /* dpy */, int* /* cmajor_return */, int* /* cminor_return */ -#endif ); extern XRecordContext XRecordCreateContext( -#if NeedFunctionPrototypes Display* /* dpy */, int /* datum_flags */, XRecordClientSpec* /* clients */, int /* nclients */, XRecordRange** /* ranges */, int /* nranges */ -#endif ); extern XRecordRange *XRecordAllocRange( -#if NeedFunctionPrototypes void -#endif ); extern Status XRecordRegisterClients( -#if NeedFunctionPrototypes Display* /* dpy */, XRecordContext /* context */, int /* datum_flags */, @@ -155,81 +148,60 @@ extern Status XRecordRegisterClients( int /* nclients */, XRecordRange** /* ranges */, int /* nranges */ -#endif ); extern Status XRecordUnregisterClients( -#if NeedFunctionPrototypes Display* /* dpy */, XRecordContext /* context */, XRecordClientSpec* /* clients */, int /* nclients */ -#endif ); extern Status XRecordGetContext( -#if NeedFunctionPrototypes Display* /* dpy */, XRecordContext /* context */, XRecordState** /* state_return */ -#endif ); extern void XRecordFreeState( -#if NeedFunctionPrototypes XRecordState* /* state */ -#endif ); typedef void (*XRecordInterceptProc) ( -#if NeedFunctionPrototypes XPointer /* closure */, XRecordInterceptData* /* recorded_data */ -#endif ); extern Status XRecordEnableContext( -#if NeedFunctionPrototypes Display* /* dpy */, XRecordContext /* context */, XRecordInterceptProc /* callback */, XPointer /* closure */ -#endif ); extern Status XRecordEnableContextAsync( -#if NeedFunctionPrototypes Display* /* dpy */, XRecordContext /* context */, XRecordInterceptProc /* callback */, XPointer /* closure */ -#endif ); extern void XRecordProcessReplies( -#if NeedFunctionPrototypes Display* /* dpy */ -#endif ); extern void XRecordFreeData( -#if NeedFunctionPrototypes XRecordInterceptData* /* data */ -#endif ); extern Status XRecordDisableContext( -#if NeedFunctionPrototypes Display* /* dpy */, XRecordContext /* context */ -#endif ); extern Status XRecordFreeContext( -#if NeedFunctionPrototypes Display* /* dpy */, XRecordContext /* context */ -#endif ); _XFUNCPROTOEND -- cgit v1.2.3 From c435e3cc568e9d690f7b1291084e676ae3376d54 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Thu, 26 Feb 2004 09:22:28 +0000 Subject: Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004 --- record.h | 2 +- recordstr.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/record.h b/record.h index bab5e4e..d88be99 100644 --- a/record.h +++ b/record.h @@ -21,7 +21,7 @@ $Xorg: record.h,v 1.3 2000/08/18 04:05:46 coskrey Exp $ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. **************************************************************************/ -/* $XFree86: xc/include/extensions/record.h,v 1.2 2003/11/17 22:20:03 dawes Exp $ */ +/* $XFree86$ */ #ifndef _RECORD_H_ #define _RECORD_H_ diff --git a/recordstr.h b/recordstr.h index 37b5eec..246d34f 100644 --- a/recordstr.h +++ b/recordstr.h @@ -24,7 +24,7 @@ static char sccsid[ ] = "@(#) recordstr.h 1.5 6/5/95 12:37:44"; * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. **************************************************************************/ -/* $XFree86: xc/include/extensions/recordstr.h,v 1.2 2001/08/01 00:44:35 tsi Exp $ */ +/* $XFree86$ */ #ifndef _RECORDSTR_H_ #define _RECORDSTR_H_ -- cgit v1.2.3 From 28f7d2358c7b2a07f08ea9b872aab5ee42440b56 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Thu, 26 Feb 2004 13:35:14 +0000 Subject: readding XFree86's cvs IDs --- record.h | 2 +- recordstr.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/record.h b/record.h index d88be99..bab5e4e 100644 --- a/record.h +++ b/record.h @@ -21,7 +21,7 @@ $Xorg: record.h,v 1.3 2000/08/18 04:05:46 coskrey Exp $ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. **************************************************************************/ -/* $XFree86$ */ +/* $XFree86: xc/include/extensions/record.h,v 1.2 2003/11/17 22:20:03 dawes Exp $ */ #ifndef _RECORD_H_ #define _RECORD_H_ diff --git a/recordstr.h b/recordstr.h index 246d34f..37b5eec 100644 --- a/recordstr.h +++ b/recordstr.h @@ -24,7 +24,7 @@ static char sccsid[ ] = "@(#) recordstr.h 1.5 6/5/95 12:37:44"; * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. **************************************************************************/ -/* $XFree86$ */ +/* $XFree86: xc/include/extensions/recordstr.h,v 1.2 2001/08/01 00:44:35 tsi Exp $ */ #ifndef _RECORDSTR_H_ #define _RECORDSTR_H_ -- cgit v1.2.3 From f6c0db4c6e249901109722da6d5bd7be3bde377c Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Wed, 3 Mar 2004 12:10:54 +0000 Subject: Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 --- record.h | 2 +- recordstr.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/record.h b/record.h index bab5e4e..d88be99 100644 --- a/record.h +++ b/record.h @@ -21,7 +21,7 @@ $Xorg: record.h,v 1.3 2000/08/18 04:05:46 coskrey Exp $ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. **************************************************************************/ -/* $XFree86: xc/include/extensions/record.h,v 1.2 2003/11/17 22:20:03 dawes Exp $ */ +/* $XFree86$ */ #ifndef _RECORD_H_ #define _RECORD_H_ diff --git a/recordstr.h b/recordstr.h index 37b5eec..246d34f 100644 --- a/recordstr.h +++ b/recordstr.h @@ -24,7 +24,7 @@ static char sccsid[ ] = "@(#) recordstr.h 1.5 6/5/95 12:37:44"; * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. **************************************************************************/ -/* $XFree86: xc/include/extensions/recordstr.h,v 1.2 2001/08/01 00:44:35 tsi Exp $ */ +/* $XFree86$ */ #ifndef _RECORDSTR_H_ #define _RECORDSTR_H_ -- cgit v1.2.3 From b62b2b4b4cd80f05e48c634d16e05bed76f80607 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Sun, 14 Mar 2004 08:31:36 +0000 Subject: Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 --- record.h | 2 +- recordstr.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/record.h b/record.h index d88be99..bab5e4e 100644 --- a/record.h +++ b/record.h @@ -21,7 +21,7 @@ $Xorg: record.h,v 1.3 2000/08/18 04:05:46 coskrey Exp $ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. **************************************************************************/ -/* $XFree86$ */ +/* $XFree86: xc/include/extensions/record.h,v 1.2 2003/11/17 22:20:03 dawes Exp $ */ #ifndef _RECORD_H_ #define _RECORD_H_ diff --git a/recordstr.h b/recordstr.h index 246d34f..37b5eec 100644 --- a/recordstr.h +++ b/recordstr.h @@ -24,7 +24,7 @@ static char sccsid[ ] = "@(#) recordstr.h 1.5 6/5/95 12:37:44"; * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. **************************************************************************/ -/* $XFree86$ */ +/* $XFree86: xc/include/extensions/recordstr.h,v 1.2 2001/08/01 00:44:35 tsi Exp $ */ #ifndef _RECORDSTR_H_ #define _RECORDSTR_H_ -- cgit v1.2.3 From c7dc29e5d64a7fc308874512321f43c194ac11e2 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 23 Apr 2004 18:43:06 +0000 Subject: Merging XORG-CURRENT into trunk --- record.h | 2 +- recordstr.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/record.h b/record.h index bab5e4e..d88be99 100644 --- a/record.h +++ b/record.h @@ -21,7 +21,7 @@ $Xorg: record.h,v 1.3 2000/08/18 04:05:46 coskrey Exp $ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. **************************************************************************/ -/* $XFree86: xc/include/extensions/record.h,v 1.2 2003/11/17 22:20:03 dawes Exp $ */ +/* $XFree86$ */ #ifndef _RECORD_H_ #define _RECORD_H_ diff --git a/recordstr.h b/recordstr.h index 37b5eec..246d34f 100644 --- a/recordstr.h +++ b/recordstr.h @@ -24,7 +24,7 @@ static char sccsid[ ] = "@(#) recordstr.h 1.5 6/5/95 12:37:44"; * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. **************************************************************************/ -/* $XFree86: xc/include/extensions/recordstr.h,v 1.2 2001/08/01 00:44:35 tsi Exp $ */ +/* $XFree86$ */ #ifndef _RECORDSTR_H_ #define _RECORDSTR_H_ -- cgit v1.2.3 From 81198a3b1bbff8109801c64c44f732bb26abcb89 Mon Sep 17 00:00:00 2001 From: Kevin E Martin Date: Fri, 6 May 2005 01:46:31 +0000 Subject: Initial build system files for proto module. --- Makefile.am | 9 +++++++++ autogen.sh | 12 ++++++++++++ configure.ac | 6 ++++++ recordext.pc.in | 9 +++++++++ 4 files changed, 36 insertions(+) create mode 100644 Makefile.am create mode 100755 autogen.sh create mode 100644 configure.ac create mode 100644 recordext.pc.in diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..22f63b8 --- /dev/null +++ b/Makefile.am @@ -0,0 +1,9 @@ +recorddir = $(includedir)/X11/extensions +record_HEADERS = \ + record.h \ + recordstr.h + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = recordext.pc + +EXTRA_DIST = autogen.sh recordext.pc.in diff --git a/autogen.sh b/autogen.sh new file mode 100755 index 0000000..904cd67 --- /dev/null +++ b/autogen.sh @@ -0,0 +1,12 @@ +#! /bin/sh + +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. + +ORIGDIR=`pwd` +cd $srcdir + +autoreconf -v --install || exit 1 +cd $ORIGDIR || exit $? + +$srcdir/configure --enable-maintainer-mode "$@" diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..75b89cf --- /dev/null +++ b/configure.ac @@ -0,0 +1,6 @@ +AC_PREREQ([2.57]) +AC_INIT([RecordExt], [7.0], [xorg@lists.freedesktop.org]) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) + +AC_OUTPUT([Makefile + recordext.pc]) diff --git a/recordext.pc.in b/recordext.pc.in new file mode 100644 index 0000000..19098ad --- /dev/null +++ b/recordext.pc.in @@ -0,0 +1,9 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: RecordExt +Description: Record extension headers +Version: @PACKAGE_VERSION@ +Cflags: -I${includedir} -- cgit v1.2.3 From 7bb7d5ca1396f83d81cc4164b975e5dc2597e678 Mon Sep 17 00:00:00 2001 From: Søren Sandmann Pedersen Date: Mon, 9 May 2005 18:20:06 +0000 Subject: Change all the protonames from Ext to Proto. --- Makefile.am | 4 ++-- configure.ac | 4 ++-- recordext.pc.in | 9 --------- recordproto.pc.in | 9 +++++++++ 4 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 recordext.pc.in create mode 100644 recordproto.pc.in diff --git a/Makefile.am b/Makefile.am index 22f63b8..c4aaee3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,6 +4,6 @@ record_HEADERS = \ recordstr.h pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = recordext.pc +pkgconfig_DATA = recordproto.pc -EXTRA_DIST = autogen.sh recordext.pc.in +EXTRA_DIST = autogen.sh recordproto.pc.in diff --git a/configure.ac b/configure.ac index 75b89cf..0bb6813 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ([2.57]) -AC_INIT([RecordExt], [7.0], [xorg@lists.freedesktop.org]) +AC_INIT([RecordProto], [7.0], [xorg@lists.freedesktop.org]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AC_OUTPUT([Makefile - recordext.pc]) + recordproto.pc]) diff --git a/recordext.pc.in b/recordext.pc.in deleted file mode 100644 index 19098ad..0000000 --- a/recordext.pc.in +++ /dev/null @@ -1,9 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: RecordExt -Description: Record extension headers -Version: @PACKAGE_VERSION@ -Cflags: -I${includedir} diff --git a/recordproto.pc.in b/recordproto.pc.in new file mode 100644 index 0000000..77cd38f --- /dev/null +++ b/recordproto.pc.in @@ -0,0 +1,9 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: RecordProto +Description: Record extension headers +Version: @PACKAGE_VERSION@ +Cflags: -I${includedir} -- cgit v1.2.3 From 3cb43fd0e261894865a8a86d598adb41eec0cc0e Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Tue, 17 May 2005 07:08:40 +0000 Subject: Add COPYING file for Record. --- COPYING | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 COPYING diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..ae25726 --- /dev/null +++ b/COPYING @@ -0,0 +1,17 @@ +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. -- cgit v1.2.3 From 8f287f8cfaeac5c28560fa94ca215244c1bb7776 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 19 May 2005 00:10:19 +0000 Subject: Require automake 1.7 in AM_INIT_AUTOMAKE --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 0bb6813..cd67e11 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ([2.57]) AC_INIT([RecordProto], [7.0], [xorg@lists.freedesktop.org]) -AM_INIT_AUTOMAKE([foreign dist-bzip2]) +AM_INIT_AUTOMAKE([1.7], [foreign dist-bzip2]) AC_OUTPUT([Makefile recordproto.pc]) -- cgit v1.2.3 From 3e7909df321b6969bc020d84a54bea6af31fc80c Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 19 May 2005 00:22:40 +0000 Subject: revert last change, didn't do right thing at all, sorry for the noise --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index cd67e11..0bb6813 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ([2.57]) AC_INIT([RecordProto], [7.0], [xorg@lists.freedesktop.org]) -AM_INIT_AUTOMAKE([1.7], [foreign dist-bzip2]) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) AC_OUTPUT([Makefile recordproto.pc]) -- cgit v1.2.3 From a895a7e1f18706d4a91a390f1266bbd4a46f8231 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Sat, 21 May 2005 04:15:05 +0000 Subject: Set version to 1.13. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 0bb6813..d55df5c 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.57]) -AC_INIT([RecordProto], [7.0], [xorg@lists.freedesktop.org]) +AC_INIT([RecordProto], [1.13], [xorg@lists.freedesktop.org]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AC_OUTPUT([Makefile -- cgit v1.2.3 From b9e116fe4b9970696029d79c63bb36a0960a7861 Mon Sep 17 00:00:00 2001 From: Kevin E Martin Date: Fri, 29 Jul 2005 21:22:56 +0000 Subject: 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 --- configure.ac | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index d55df5c..8e431b4 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,8 @@ AC_PREREQ([2.57]) -AC_INIT([RecordProto], [1.13], [xorg@lists.freedesktop.org]) +AC_INIT([RecordProto], [1.13], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) - + +XORG_RELEASE_VERSION + AC_OUTPUT([Makefile recordproto.pc]) -- cgit v1.2.3 From b298e441128e479b12615acab77df63a1ce516b1 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 2 Aug 2005 19:19:39 +0000 Subject: Add basic .cvsignore files for proto modules. --- .cvsignore | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .cvsignore diff --git a/.cvsignore b/.cvsignore new file mode 100644 index 0000000..42b38a9 --- /dev/null +++ b/.cvsignore @@ -0,0 +1,10 @@ +Makefile +Makefile.in +aclocal.m4 +autom4te.cache +config.log +config.status +configure +install-sh +missing +recordproto.pc -- cgit v1.2.3 From 6f8dbc14edcff010da66a1bf2d0f5e570f2d0812 Mon Sep 17 00:00:00 2001 From: Kevin E Martin Date: Wed, 19 Oct 2005 02:48:14 +0000 Subject: Update package version number for RC1 release. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 8e431b4..dd20a94 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.57]) -AC_INIT([RecordProto], [1.13], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([RecordProto], [1.13.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) XORG_RELEASE_VERSION -- cgit v1.2.3 From 18c27afa9a8a96bd8ba05ba6cd1e3bf0922601cb Mon Sep 17 00:00:00 2001 From: Kevin E Martin Date: Thu, 15 Dec 2005 00:24:38 +0000 Subject: Update package version number for final X11R7 release candidate. --- ChangeLog | 4 ++++ configure.ac | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 ChangeLog diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 0000000..c722b51 --- /dev/null +++ b/ChangeLog @@ -0,0 +1,4 @@ +2005-12-14 Kevin E. Martin + + * configure.ac: + Update package version number for final X11R7 release candidate. diff --git a/configure.ac b/configure.ac index dd20a94..4379c21 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.57]) -AC_INIT([RecordProto], [1.13.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([RecordProto], [1.13.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) XORG_RELEASE_VERSION -- cgit v1.2.3 From 400d7a5db8cb56464a2ff48b21a1b53e7cc5b295 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Fri, 14 Jul 2006 18:56:28 -0700 Subject: renamed: .cvsignore -> .gitignore --- .cvsignore | 10 ---------- .gitignore | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 .cvsignore create mode 100644 .gitignore diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 42b38a9..0000000 --- a/.cvsignore +++ /dev/null @@ -1,10 +0,0 @@ -Makefile -Makefile.in -aclocal.m4 -autom4te.cache -config.log -config.status -configure -install-sh -missing -recordproto.pc diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..42b38a9 --- /dev/null +++ b/.gitignore @@ -0,0 +1,10 @@ +Makefile +Makefile.in +aclocal.m4 +autom4te.cache +config.log +config.status +configure +install-sh +missing +recordproto.pc -- cgit v1.2.3 From ecaf1d1c89a1ce914c387c8d9722d6cdaa82a9e6 Mon Sep 17 00:00:00 2001 From: James Cloos Date: Mon, 3 Sep 2007 05:54:13 -0400 Subject: Add *~ to .gitignore to skip patch/emacs droppings --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 42b38a9..3613a4f 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ configure install-sh missing recordproto.pc +*~ -- cgit v1.2.3 From b38fe6228b369c7bf32e4003658395dd45352257 Mon Sep 17 00:00:00 2001 From: James Cloos Date: Thu, 6 Dec 2007 16:39:05 -0500 Subject: Replace static ChangeLog with dist-hook to generate from git log --- ChangeLog | 4 ---- Makefile.am | 10 ++++++++++ 2 files changed, 10 insertions(+), 4 deletions(-) delete mode 100644 ChangeLog diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index c722b51..0000000 --- a/ChangeLog +++ /dev/null @@ -1,4 +0,0 @@ -2005-12-14 Kevin E. Martin - - * configure.ac: - Update package version number for final X11R7 release candidate. diff --git a/Makefile.am b/Makefile.am index c4aaee3..45e57a7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,3 +7,13 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = recordproto.pc EXTRA_DIST = autogen.sh recordproto.pc.in + +EXTRA_DIST += ChangeLog +MAINTAINERCLEANFILES = ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + +dist-hook: ChangeLog -- cgit v1.2.3 From eb14a315478af94dc588e1ed29628830deef90e4 Mon Sep 17 00:00:00 2001 From: Paulo Cesar Pereira de Andrade Date: Tue, 27 Jan 2009 20:06:28 -0200 Subject: Janitor: Correct make distcheck and dont distribute autogen.sh --- .gitignore | 3 +++ Makefile.am | 4 ++-- configure.ac | 4 ++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3613a4f..d8d9904 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,6 @@ install-sh missing recordproto.pc *~ +recordproto-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index 45e57a7..3b7dd31 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,7 +6,7 @@ record_HEADERS = \ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = recordproto.pc -EXTRA_DIST = autogen.sh recordproto.pc.in +EXTRA_DIST = recordproto.pc.in EXTRA_DIST += ChangeLog MAINTAINERCLEANFILES = ChangeLog @@ -14,6 +14,6 @@ MAINTAINERCLEANFILES = ChangeLog .PHONY: ChangeLog ChangeLog: - (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + $(CHANGELOG_CMD) dist-hook: ChangeLog diff --git a/configure.ac b/configure.ac index 4379c21..eeb62cf 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,11 @@ AC_PREREQ([2.57]) AC_INIT([RecordProto], [1.13.2], [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 AC_OUTPUT([Makefile recordproto.pc]) -- cgit v1.2.3 From 59c7795cb8cf932c5c5942bb07278854c89a6a67 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 14 Aug 2009 13:29:13 +1000 Subject: remove RCS tags Signed-off-by: Peter Hutterer --- record.h | 5 ----- recordstr.h | 8 -------- 2 files changed, 13 deletions(-) diff --git a/record.h b/record.h index d88be99..c32cc7a 100644 --- a/record.h +++ b/record.h @@ -1,7 +1,3 @@ -/* -$Xorg: record.h,v 1.3 2000/08/18 04:05:46 coskrey Exp $ -*/ - /*************************************************************************** * Copyright 1995 Network Computing Devices * @@ -21,7 +17,6 @@ $Xorg: record.h,v 1.3 2000/08/18 04:05:46 coskrey Exp $ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. **************************************************************************/ -/* $XFree86$ */ #ifndef _RECORD_H_ #define _RECORD_H_ diff --git a/recordstr.h b/recordstr.h index 246d34f..556fbb2 100644 --- a/recordstr.h +++ b/recordstr.h @@ -1,10 +1,3 @@ -/* -#ifndef lint -$Xorg: recordstr.h,v 1.3 2000/08/18 04:05:46 coskrey Exp $ -static char sccsid[ ] = "@(#) recordstr.h 1.5 6/5/95 12:37:44"; -#endif -*/ - /*************************************************************************** * Copyright 1995 Network Computing Devices * @@ -24,7 +17,6 @@ static char sccsid[ ] = "@(#) recordstr.h 1.5 6/5/95 12:37:44"; * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. **************************************************************************/ -/* $XFree86$ */ #ifndef _RECORDSTR_H_ #define _RECORDSTR_H_ -- cgit v1.2.3 From 5e35e18e81da8a6a891bc73ac828d45eae91c53c Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 14 Aug 2009 13:34:52 +1000 Subject: 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 --- 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 +#include -#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 -- cgit v1.2.3 From a7419fc173ccb949e6b20e1608bdcb816157a17f Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 18 Aug 2009 11:08:27 +1000 Subject: 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 --- Makefile.am | 1 + recordproto.h | 306 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ recordstr.h | 310 +--------------------------------------------------------- 3 files changed, 311 insertions(+), 306 deletions(-) create mode 100644 recordproto.h 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 + +/* 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 - -/* 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 for the library interfaces." +#warning "include for the protocol defines." +#include -- cgit v1.2.3 From 379a691a45f4a637b8b7bbea9d3c7c2454f5cde6 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Sat, 15 Aug 2009 21:47:26 +1000 Subject: Bump to 1.13.99.1 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3 From fd428befaa8a76b216d5e42e63b688d4d55fdbc5 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 1 Oct 2009 19:38:12 +1000 Subject: Require macros 1.3 for XORG_DEFAULT_OPTIONS Signed-off-by: Peter Hutterer --- configure.ac | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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]) -- cgit v1.2.3 From 38fd3772f3a5a107fa6e9d94e0be7bd276f771b6 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 1 Oct 2009 19:38:36 +1000 Subject: recordproto 1.14 Signed-off-by: Peter Hutterer --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3 From aa0ab0118100ab6d6fb5628c6d2fabc1d750defc Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sat, 14 Nov 2009 18:26:47 -0500 Subject: .gitignore: use common defaults with custom section # 24239 Using common defaults will reduce errors and maintenance. Only the very small or inexistent custom section need periodic maintenance when the structure of the component changes. Do not edit defaults. --- .gitignore | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 71 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index d8d9904..e4e5185 100644 --- a/.gitignore +++ b/.gitignore @@ -1,14 +1,78 @@ -Makefile -Makefile.in +# +# X.Org module default exclusion patterns +# The next section if for module specific patterns +# +# Do not edit the following section +# GNU Build System (Autotools) aclocal.m4 -autom4te.cache +autom4te.cache/ +autoscan.log +ChangeLog +compile +config.guess +config.h +config.h.in config.log +config-ml.in +config.py config.status +config.status.lineno +config.sub configure +configure.scan +depcomp +.deps/ +INSTALL install-sh +.libs/ +libtool +libtool.m4 +ltmain.sh +lt~obsolete.m4 +ltoptions.m4 +ltsugar.m4 +ltversion.m4 +Makefile +Makefile.in +mdate-sh missing -recordproto.pc +mkinstalldirs +*.pc +py-compile +stamp-h? +symlink-tree +texinfo.tex +ylwrap + +# Do not edit the following section +# Edit Compile Debug Document Distribute *~ -recordproto-*.tar.* -ChangeLog -tags +*.[0-9] +*.[0-9]x +*.bak +*.bin +core +*.dll +*.exe +*-ISO*.bdf +*-JIS*.bdf +*-KOI8*.bdf +*.kld +*.ko +*.ko.cmd +*.lai +*.l[oa] +*.[oa] +*.obj +*.patch +*.so +*.pcf.gz +*.pdb +*.tar.bz2 +*.tar.gz +# +# Add & Override patterns for recordproto +# +# Edit the following section as needed +# For example, !report.pc overrides *.pc. See 'man gitignore' +# -- cgit v1.2.3 From d9d22eeed75505c28b8e8934bec27960bc1407b7 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sun, 15 Nov 2009 13:55:25 -0500 Subject: configure.ac: AM_MAINTAINER_MODE missing #24238 This turns off maintainer mode build rules in tarballs. Works in conjunction with autogen.sh --enable-maintainer-mode --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index 1709ce6..ab6d5cd 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,7 @@ AC_PREREQ([2.57]) AC_INIT([RecordProto], [1.14], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) +AM_MAINTAINER_MODE # 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])]) -- cgit v1.2.3 From 29df99549d157a0d96607cc55e9789d194356f08 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sun, 15 Nov 2009 18:11:36 -0500 Subject: configure.ac: deploy the new XORG_DEFAULT_OPTIONS #24242 This macro aggregate a number of existing macros that sets commmon X.Org components configuration options. It shields the configuration file from future changes. --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index ab6d5cd..ac36a7f 100644 --- a/configure.ac +++ b/configure.ac @@ -4,9 +4,9 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE # 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])]) +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) XORG_MACROS_VERSION(1.3) - XORG_DEFAULT_OPTIONS AC_OUTPUT([Makefile -- cgit v1.2.3 From 5ad105c41bc16d0ab149a8e77906af2b5498168e Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sun, 15 Nov 2009 18:31:29 -0500 Subject: Makefile.am: INSTALL file is missing or incorrect #24206 The standard GNU file on building/installing tarball is copied using the XORG_INSTALL macro contained in XORG_DEFAULT_OPTIONS Add INSTALL target --- Makefile.am | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index dd0b028..3895545 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,9 +12,12 @@ EXTRA_DIST = recordproto.pc.in EXTRA_DIST += ChangeLog MAINTAINERCLEANFILES = ChangeLog -.PHONY: ChangeLog +.PHONY: ChangeLog INSTALL + +INSTALL: + $(INSTALL_CMD) ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog +dist-hook: ChangeLog INSTALL -- cgit v1.2.3 From 20e71f110a5aabd44ad1e9a2c127a8e76da8d5a4 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sun, 15 Nov 2009 19:45:27 -0500 Subject: Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432 ChangeLog filename is known to Automake and requires no further coding in the makefile. --- Makefile.am | 3 --- 1 file changed, 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 3895545..724ab59 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,9 +9,6 @@ pkgconfig_DATA = recordproto.pc EXTRA_DIST = recordproto.pc.in -EXTRA_DIST += ChangeLog -MAINTAINERCLEANFILES = ChangeLog - .PHONY: ChangeLog INSTALL INSTALL: -- cgit v1.2.3 From 3030de0d0d3dbabda31c9cdeae025020253adfb6 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Mon, 16 Nov 2009 11:13:30 -0500 Subject: README: file created or updated #24206 Contains a set of URLs to freedesktop.org. --- README | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 README diff --git a/README b/README new file mode 100644 index 0000000..0800985 --- /dev/null +++ b/README @@ -0,0 +1,30 @@ + X Record Extension + +This extension defines a protocol for the recording and playback of user +actions in the X Window System. + +Extension name: RECORD + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +Please submit bug reports to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/proto/recordproto + + http://cgit.freedesktop.org/xorg/proto/recordproto + +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage + -- cgit v1.2.3 From 67bcebd15489d69705c563cd2b63366c59cb21aa Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sun, 22 Nov 2009 19:24:48 -0500 Subject: Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES Now that the INSTALL file is generated. Allows running make maintainer-clean. --- Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile.am b/Makefile.am index 724ab59..4146510 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,6 +9,8 @@ pkgconfig_DATA = recordproto.pc EXTRA_DIST = recordproto.pc.in +MAINTAINERCLEANFILES = ChangeLog INSTALL + .PHONY: ChangeLog INSTALL INSTALL: -- cgit v1.2.3 From cf80c95d1826c7ec5b701b361d5d39d650c414f3 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sun, 28 Mar 2010 19:00:31 -0400 Subject: config: remove the pkgconfig pc.in file from EXTRA_DIST Automake always includes it in the tarball. Signed-off-by: Gaetan Nadon --- Makefile.am | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 4146510..f9cc316 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,7 +7,6 @@ record_HEADERS = \ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = recordproto.pc -EXTRA_DIST = recordproto.pc.in MAINTAINERCLEANFILES = ChangeLog INSTALL -- cgit v1.2.3 From 1d5a3b11ff8810b0b0921337d85955150b67346a Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sun, 28 Mar 2010 19:25:52 -0400 Subject: config: update AC_PREREQ statement to 2.60 Unrelated to the previous patches, the new value simply reflects the reality that the minimum level for autoconf to configure all x.org modules is 2.60 dated June 2006. ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz Signed-off-by: Gaetan Nadon --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index ac36a7f..7993f59 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_PREREQ([2.57]) +AC_PREREQ([2.60]) AC_INIT([RecordProto], [1.14], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -- cgit v1.2.3 From 33687cbe700328210b9b961413d40689adb12059 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Tue, 6 Apr 2010 14:17:53 -0700 Subject: Move recordproto files to their sub-directory Signed-off-by: Keith Packard --- .gitignore | 78 ----------- COPYING | 17 --- Makefile.am | 21 --- README | 30 ----- autogen.sh | 12 -- configure.ac | 13 -- recordconst.h | 54 -------- recordproto.h | 306 ------------------------------------------ recordproto.pc.in | 9 -- recordproto/.gitignore | 78 +++++++++++ recordproto/COPYING | 17 +++ recordproto/Makefile.am | 21 +++ recordproto/README | 30 +++++ recordproto/autogen.sh | 12 ++ recordproto/configure.ac | 13 ++ recordproto/recordconst.h | 54 ++++++++ recordproto/recordproto.h | 306 ++++++++++++++++++++++++++++++++++++++++++ recordproto/recordproto.pc.in | 9 ++ recordproto/recordstr.h | 4 + recordstr.h | 4 - 20 files changed, 544 insertions(+), 544 deletions(-) delete mode 100644 .gitignore delete mode 100644 COPYING delete mode 100644 Makefile.am delete mode 100644 README delete mode 100755 autogen.sh delete mode 100644 configure.ac delete mode 100644 recordconst.h delete mode 100644 recordproto.h delete mode 100644 recordproto.pc.in create mode 100644 recordproto/.gitignore create mode 100644 recordproto/COPYING create mode 100644 recordproto/Makefile.am create mode 100644 recordproto/README create mode 100755 recordproto/autogen.sh create mode 100644 recordproto/configure.ac create mode 100644 recordproto/recordconst.h create mode 100644 recordproto/recordproto.h create mode 100644 recordproto/recordproto.pc.in create mode 100644 recordproto/recordstr.h delete mode 100644 recordstr.h diff --git a/.gitignore b/.gitignore deleted file mode 100644 index e4e5185..0000000 --- a/.gitignore +++ /dev/null @@ -1,78 +0,0 @@ -# -# X.Org module default exclusion patterns -# The next section if for module specific patterns -# -# Do not edit the following section -# GNU Build System (Autotools) -aclocal.m4 -autom4te.cache/ -autoscan.log -ChangeLog -compile -config.guess -config.h -config.h.in -config.log -config-ml.in -config.py -config.status -config.status.lineno -config.sub -configure -configure.scan -depcomp -.deps/ -INSTALL -install-sh -.libs/ -libtool -libtool.m4 -ltmain.sh -lt~obsolete.m4 -ltoptions.m4 -ltsugar.m4 -ltversion.m4 -Makefile -Makefile.in -mdate-sh -missing -mkinstalldirs -*.pc -py-compile -stamp-h? -symlink-tree -texinfo.tex -ylwrap - -# Do not edit the following section -# Edit Compile Debug Document Distribute -*~ -*.[0-9] -*.[0-9]x -*.bak -*.bin -core -*.dll -*.exe -*-ISO*.bdf -*-JIS*.bdf -*-KOI8*.bdf -*.kld -*.ko -*.ko.cmd -*.lai -*.l[oa] -*.[oa] -*.obj -*.patch -*.so -*.pcf.gz -*.pdb -*.tar.bz2 -*.tar.gz -# -# Add & Override patterns for recordproto -# -# Edit the following section as needed -# For example, !report.pc overrides *.pc. See 'man gitignore' -# diff --git a/COPYING b/COPYING deleted file mode 100644 index ae25726..0000000 --- a/COPYING +++ /dev/null @@ -1,17 +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. diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index f9cc316..0000000 --- a/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -recorddir = $(includedir)/X11/extensions -record_HEADERS = \ - recordconst.h \ - recordproto.h \ - recordstr.h - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = recordproto.pc - - -MAINTAINERCLEANFILES = ChangeLog INSTALL - -.PHONY: ChangeLog INSTALL - -INSTALL: - $(INSTALL_CMD) - -ChangeLog: - $(CHANGELOG_CMD) - -dist-hook: ChangeLog INSTALL diff --git a/README b/README deleted file mode 100644 index 0800985..0000000 --- a/README +++ /dev/null @@ -1,30 +0,0 @@ - X Record Extension - -This extension defines a protocol for the recording and playback of user -actions in the X Window System. - -Extension name: RECORD - -All questions regarding this software should be directed at the -Xorg mailing list: - - http://lists.freedesktop.org/mailman/listinfo/xorg - -Please submit bug reports to the Xorg bugzilla: - - https://bugs.freedesktop.org/enter_bug.cgi?product=xorg - -The master development code repository can be found at: - - git://anongit.freedesktop.org/git/xorg/proto/recordproto - - http://cgit.freedesktop.org/xorg/proto/recordproto - -For patch submission instructions, see: - - http://www.x.org/wiki/Development/Documentation/SubmittingPatches - -For more information on the git code manager, see: - - http://wiki.x.org/wiki/GitPage - diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index 904cd67..0000000 --- a/autogen.sh +++ /dev/null @@ -1,12 +0,0 @@ -#! /bin/sh - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -ORIGDIR=`pwd` -cd $srcdir - -autoreconf -v --install || exit 1 -cd $ORIGDIR || exit $? - -$srcdir/configure --enable-maintainer-mode "$@" diff --git a/configure.ac b/configure.ac deleted file mode 100644 index 7993f59..0000000 --- a/configure.ac +++ /dev/null @@ -1,13 +0,0 @@ -AC_PREREQ([2.60]) -AC_INIT([RecordProto], [1.14], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) -AM_INIT_AUTOMAKE([foreign dist-bzip2]) -AM_MAINTAINER_MODE - -# Require xorg-macros: XORG_DEFAULT_OPTIONS -m4_ifndef([XORG_MACROS_VERSION], - [m4_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]) diff --git a/recordconst.h b/recordconst.h deleted file mode 100644 index 4819de7..0000000 --- a/recordconst.h +++ /dev/null @@ -1,54 +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 _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/recordproto.h b/recordproto.h deleted file mode 100644 index 01bc952..0000000 --- a/recordproto.h +++ /dev/null @@ -1,306 +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 _RECORDPROTO_H_ -#define _RECORDPROTO_H_ - -#include - -/* 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/recordproto.pc.in b/recordproto.pc.in deleted file mode 100644 index 77cd38f..0000000 --- a/recordproto.pc.in +++ /dev/null @@ -1,9 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: RecordProto -Description: Record extension headers -Version: @PACKAGE_VERSION@ -Cflags: -I${includedir} diff --git a/recordproto/.gitignore b/recordproto/.gitignore new file mode 100644 index 0000000..e4e5185 --- /dev/null +++ b/recordproto/.gitignore @@ -0,0 +1,78 @@ +# +# X.Org module default exclusion patterns +# The next section if for module specific patterns +# +# Do not edit the following section +# GNU Build System (Autotools) +aclocal.m4 +autom4te.cache/ +autoscan.log +ChangeLog +compile +config.guess +config.h +config.h.in +config.log +config-ml.in +config.py +config.status +config.status.lineno +config.sub +configure +configure.scan +depcomp +.deps/ +INSTALL +install-sh +.libs/ +libtool +libtool.m4 +ltmain.sh +lt~obsolete.m4 +ltoptions.m4 +ltsugar.m4 +ltversion.m4 +Makefile +Makefile.in +mdate-sh +missing +mkinstalldirs +*.pc +py-compile +stamp-h? +symlink-tree +texinfo.tex +ylwrap + +# Do not edit the following section +# Edit Compile Debug Document Distribute +*~ +*.[0-9] +*.[0-9]x +*.bak +*.bin +core +*.dll +*.exe +*-ISO*.bdf +*-JIS*.bdf +*-KOI8*.bdf +*.kld +*.ko +*.ko.cmd +*.lai +*.l[oa] +*.[oa] +*.obj +*.patch +*.so +*.pcf.gz +*.pdb +*.tar.bz2 +*.tar.gz +# +# Add & Override patterns for recordproto +# +# Edit the following section as needed +# For example, !report.pc overrides *.pc. See 'man gitignore' +# diff --git a/recordproto/COPYING b/recordproto/COPYING new file mode 100644 index 0000000..ae25726 --- /dev/null +++ b/recordproto/COPYING @@ -0,0 +1,17 @@ +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. diff --git a/recordproto/Makefile.am b/recordproto/Makefile.am new file mode 100644 index 0000000..f9cc316 --- /dev/null +++ b/recordproto/Makefile.am @@ -0,0 +1,21 @@ +recorddir = $(includedir)/X11/extensions +record_HEADERS = \ + recordconst.h \ + recordproto.h \ + recordstr.h + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = recordproto.pc + + +MAINTAINERCLEANFILES = ChangeLog INSTALL + +.PHONY: ChangeLog INSTALL + +INSTALL: + $(INSTALL_CMD) + +ChangeLog: + $(CHANGELOG_CMD) + +dist-hook: ChangeLog INSTALL diff --git a/recordproto/README b/recordproto/README new file mode 100644 index 0000000..0800985 --- /dev/null +++ b/recordproto/README @@ -0,0 +1,30 @@ + X Record Extension + +This extension defines a protocol for the recording and playback of user +actions in the X Window System. + +Extension name: RECORD + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +Please submit bug reports to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/proto/recordproto + + http://cgit.freedesktop.org/xorg/proto/recordproto + +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage + diff --git a/recordproto/autogen.sh b/recordproto/autogen.sh new file mode 100755 index 0000000..904cd67 --- /dev/null +++ b/recordproto/autogen.sh @@ -0,0 +1,12 @@ +#! /bin/sh + +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. + +ORIGDIR=`pwd` +cd $srcdir + +autoreconf -v --install || exit 1 +cd $ORIGDIR || exit $? + +$srcdir/configure --enable-maintainer-mode "$@" diff --git a/recordproto/configure.ac b/recordproto/configure.ac new file mode 100644 index 0000000..7993f59 --- /dev/null +++ b/recordproto/configure.ac @@ -0,0 +1,13 @@ +AC_PREREQ([2.60]) +AC_INIT([RecordProto], [1.14], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) +AM_MAINTAINER_MODE + +# Require xorg-macros: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_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]) diff --git a/recordproto/recordconst.h b/recordproto/recordconst.h new file mode 100644 index 0000000..4819de7 --- /dev/null +++ b/recordproto/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/recordproto/recordproto.h b/recordproto/recordproto.h new file mode 100644 index 0000000..01bc952 --- /dev/null +++ b/recordproto/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 + +/* 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/recordproto/recordproto.pc.in b/recordproto/recordproto.pc.in new file mode 100644 index 0000000..77cd38f --- /dev/null +++ b/recordproto/recordproto.pc.in @@ -0,0 +1,9 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: RecordProto +Description: Record extension headers +Version: @PACKAGE_VERSION@ +Cflags: -I${includedir} diff --git a/recordproto/recordstr.h b/recordproto/recordstr.h new file mode 100644 index 0000000..7f269b7 --- /dev/null +++ b/recordproto/recordstr.h @@ -0,0 +1,4 @@ +#warning "recordstr.h is obsolete and may be removed in the future." +#warning "include for the library interfaces." +#warning "include for the protocol defines." +#include diff --git a/recordstr.h b/recordstr.h deleted file mode 100644 index 7f269b7..0000000 --- a/recordstr.h +++ /dev/null @@ -1,4 +0,0 @@ -#warning "recordstr.h is obsolete and may be removed in the future." -#warning "include for the library interfaces." -#warning "include for the protocol defines." -#include -- cgit v1.2.3