From 8cb2568c4a7df1eb0482009bf9150912e98969e6 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 25 Jun 2009 10:54:21 +1000 Subject: XTest: remove XTest.h, split into xtest.h and xtestproto.h To avoid conflicts, xtest.h uses a XTEST_CONST_H include barrier. --- Makefile.am | 4 +- XTest.h | 164 ----------------------------------------------------------- xtest.h | 43 ++++++++++++++++ xtestproto.h | 125 +++++++++++++++++++++++++++++++++++++++++++++ xteststr.h | 120 ------------------------------------------- 5 files changed, 170 insertions(+), 286 deletions(-) delete mode 100644 XTest.h create mode 100644 xtest.h create mode 100644 xtestproto.h delete mode 100644 xteststr.h diff --git a/Makefile.am b/Makefile.am index 0b5d7c9..14e7ff1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -30,8 +30,8 @@ xext_HEADERS = \ EVIproto.h \ Xext.h \ xtestext1.h \ - XTest.h \ - xteststr.h + xtest.h \ + xtestproto.h pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xextproto.pc diff --git a/XTest.h b/XTest.h deleted file mode 100644 index afb1849..0000000 --- a/XTest.h +++ /dev/null @@ -1,164 +0,0 @@ -/* $Xorg: XTest.h,v 1.5 2001/02/09 02:03:24 xorgcvs Exp $ */ -/* - -Copyright 1992, 1998 The Open Group - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appear in all copies and that both that -copyright notice and this permission notice appear in supporting -documentation. - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of The Open Group shall not be -used in advertising or otherwise to promote the sale, use or other dealings -in this Software without prior written authorization from The Open Group. - -*/ -/* $XFree86: xc/include/extensions/XTest.h,v 3.3 2001/12/14 19:53:28 dawes Exp $ */ - -#ifndef _XTEST_H_ -#define _XTEST_H_ - -#include - -#define X_XTestGetVersion 0 -#define X_XTestCompareCursor 1 -#define X_XTestFakeInput 2 -#define X_XTestGrabControl 3 - -#define XTestNumberEvents 0 - -#define XTestNumberErrors 0 - -#define XTestMajorVersion 2 -#define XTestMinorVersion 2 - -#define XTestExtensionName "XTEST" - -#ifndef _XTEST_SERVER_ - -#include - -_XFUNCPROTOBEGIN - -Bool XTestQueryExtension( - Display* /* dpy */, - int* /* event_basep */, - int* /* error_basep */, - int* /* majorp */, - int* /* minorp */ -); - -Bool XTestCompareCursorWithWindow( - Display* /* dpy */, - Window /* window */, - Cursor /* cursor */ -); - -Bool XTestCompareCurrentCursorWithWindow( - Display* /* dpy */, - Window /* window */ -); - -extern int XTestFakeKeyEvent( - Display* /* dpy */, - unsigned int /* keycode */, - Bool /* is_press */, - unsigned long /* delay */ -); - -extern int XTestFakeButtonEvent( - Display* /* dpy */, - unsigned int /* button */, - Bool /* is_press */, - unsigned long /* delay */ -); - -extern int XTestFakeMotionEvent( - Display* /* dpy */, - int /* screen */, - int /* x */, - int /* y */, - unsigned long /* delay */ -); - -extern int XTestFakeRelativeMotionEvent( - Display* /* dpy */, - int /* x */, - int /* y */, - unsigned long /* delay */ -); - -extern int XTestFakeDeviceKeyEvent( - Display* /* dpy */, - XDevice* /* dev */, - unsigned int /* keycode */, - Bool /* is_press */, - int* /* axes */, - int /* n_axes */, - unsigned long /* delay */ -); - -extern int XTestFakeDeviceButtonEvent( - Display* /* dpy */, - XDevice* /* dev */, - unsigned int /* button */, - Bool /* is_press */, - int* /* axes */, - int /* n_axes */, - unsigned long /* delay */ -); - -extern int XTestFakeProximityEvent( - Display* /* dpy */, - XDevice* /* dev */, - Bool /* in_prox */, - int* /* axes */, - int /* n_axes */, - unsigned long /* delay */ -); - -extern int XTestFakeDeviceMotionEvent( - Display* /* dpy */, - XDevice* /* dev */, - Bool /* is_relative */, - int /* first_axis */, - int* /* axes */, - int /* n_axes */, - unsigned long /* delay */ -); - -extern int XTestGrabControl( - Display* /* dpy */, - Bool /* impervious */ -); - -void XTestSetGContextOfGC( - GC /* gc */, - GContext /* gid */ -); - -void XTestSetVisualIDOfVisual( - Visual* /* visual */, - VisualID /* visualid */ -); - -Status XTestDiscard( - Display* /* dpy */ -); - -_XFUNCPROTOEND - -#endif /* _XTEST_SERVER_ */ - -#endif diff --git a/xtest.h b/xtest.h new file mode 100644 index 0000000..10404f4 --- /dev/null +++ b/xtest.h @@ -0,0 +1,43 @@ +/* $Xorg: XTest.h,v 1.5 2001/02/09 02:03:24 xorgcvs Exp $ */ +/* + +Copyright 1992, 1998 The Open Group + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of The Open Group shall not be +used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from The Open Group. + +*/ +/* $XFree86: xc/include/extensions/XTest.h,v 3.3 2001/12/14 19:53:28 dawes Exp $ */ + +#ifndef _XTEST_CONST_H_ +#define _XTEST_CONST_H_ + +#define XTestNumberEvents 0 + +#define XTestNumberErrors 0 + +#define XTestCurrentCursor ((Cursor)1) + +#define XTestMajorVersion 2 +#define XTestMinorVersion 2 + +#define XTestExtensionName "XTEST" + +#endif diff --git a/xtestproto.h b/xtestproto.h new file mode 100644 index 0000000..a8eadda --- /dev/null +++ b/xtestproto.h @@ -0,0 +1,125 @@ +/* $Xorg: xteststr.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */ +/* + +Copyright 1992, 1998 The Open Group + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of The Open Group shall not be +used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from The Open Group. + +*/ + +#ifndef _XTESTPROTO_H_ +#define _XTESTPROTO_H_ + +#include + +#define Window CARD32 +#define Time CARD32 +#define Cursor CARD32 + +#define X_XTestGetVersion 0 +#define X_XTestCompareCursor 1 +#define X_XTestFakeInput 2 +#define X_XTestGrabControl 3 + +typedef struct { + CARD8 reqType; /* always XTestReqCode */ + CARD8 xtReqType; /* always X_XTestGetVersion */ + CARD16 length B16; + CARD8 majorVersion; + CARD8 pad; + CARD16 minorVersion B16; +} xXTestGetVersionReq; +#define sz_xXTestGetVersionReq 8 + +typedef struct { + BYTE type; /* X_Reply */ + CARD8 majorVersion; + CARD16 sequenceNumber B16; + CARD32 length B32; + CARD16 minorVersion B16; + CARD16 pad0 B16; + CARD32 pad1 B32; + CARD32 pad2 B32; + CARD32 pad3 B32; + CARD32 pad4 B32; + CARD32 pad5 B32; +} xXTestGetVersionReply; +#define sz_xXTestGetVersionReply 32 + +typedef struct { + CARD8 reqType; /* always XTestReqCode */ + CARD8 xtReqType; /* always X_XTestCompareCursor */ + CARD16 length B16; + Window window B32; + Cursor cursor B32; +} xXTestCompareCursorReq; +#define sz_xXTestCompareCursorReq 12 + +typedef struct { + BYTE type; /* X_Reply */ + BOOL same; + CARD16 sequenceNumber B16; + CARD32 length B32; + CARD32 pad0 B32; + CARD32 pad1 B32; + CARD32 pad2 B32; + CARD32 pad3 B32; + CARD32 pad4 B32; + CARD32 pad5 B32; +} xXTestCompareCursorReply; +#define sz_xXTestCompareCursorReply 32 + +/* used only on the client side */ +typedef struct { + CARD8 reqType; /* always XTestReqCode */ + CARD8 xtReqType; /* always X_XTestFakeInput */ + CARD16 length B16; + BYTE type; + BYTE detail; + CARD16 pad0 B16; + Time time B32; + Window root B32; + CARD32 pad1 B32; + CARD32 pad2 B32; + INT16 rootX B16, rootY B16; + CARD32 pad3 B32; + CARD16 pad4 B16; + CARD8 pad5; + CARD8 deviceid; +} xXTestFakeInputReq; +#define sz_xXTestFakeInputReq 36 + +typedef struct { + CARD8 reqType; /* always XTestReqCode */ + CARD8 xtReqType; /* always X_XTestGrabControl */ + CARD16 length B16; + BOOL impervious; + CARD8 pad0; + CARD8 pad1; + CARD8 pad2; +} xXTestGrabControlReq; +#define sz_xXTestGrabControlReq 8 + +#undef Window +#undef Time +#undef Cursor + +#endif /* _XTESTPROTO_H_ */ diff --git a/xteststr.h b/xteststr.h deleted file mode 100644 index a196b77..0000000 --- a/xteststr.h +++ /dev/null @@ -1,120 +0,0 @@ -/* $Xorg: xteststr.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */ -/* - -Copyright 1992, 1998 The Open Group - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appear in all copies and that both that -copyright notice and this permission notice appear in supporting -documentation. - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of The Open Group shall not be -used in advertising or otherwise to promote the sale, use or other dealings -in this Software without prior written authorization from The Open Group. - -*/ - -#ifndef _XTESTSTR_H_ -#define _XTESTSTR_H_ - -#define Window CARD32 -#define Time CARD32 -#define Cursor CARD32 - -#define XTestCurrentCursor ((Cursor)1) - -typedef struct { - CARD8 reqType; /* always XTestReqCode */ - CARD8 xtReqType; /* always X_XTestGetVersion */ - CARD16 length B16; - CARD8 majorVersion; - CARD8 pad; - CARD16 minorVersion B16; -} xXTestGetVersionReq; -#define sz_xXTestGetVersionReq 8 - -typedef struct { - BYTE type; /* X_Reply */ - CARD8 majorVersion; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 minorVersion B16; - CARD16 pad0 B16; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; -} xXTestGetVersionReply; -#define sz_xXTestGetVersionReply 32 - -typedef struct { - CARD8 reqType; /* always XTestReqCode */ - CARD8 xtReqType; /* always X_XTestCompareCursor */ - CARD16 length B16; - Window window B32; - Cursor cursor B32; -} xXTestCompareCursorReq; -#define sz_xXTestCompareCursorReq 12 - -typedef struct { - BYTE type; /* X_Reply */ - BOOL same; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 pad0 B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; -} xXTestCompareCursorReply; -#define sz_xXTestCompareCursorReply 32 - -/* used only on the client side */ -typedef struct { - CARD8 reqType; /* always XTestReqCode */ - CARD8 xtReqType; /* always X_XTestFakeInput */ - CARD16 length B16; - BYTE type; - BYTE detail; - CARD16 pad0 B16; - Time time B32; - Window root B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - INT16 rootX B16, rootY B16; - CARD32 pad3 B32; - CARD16 pad4 B16; - CARD8 pad5; - CARD8 deviceid; -} xXTestFakeInputReq; -#define sz_xXTestFakeInputReq 36 - -typedef struct { - CARD8 reqType; /* always XTestReqCode */ - CARD8 xtReqType; /* always X_XTestGrabControl */ - CARD16 length B16; - BOOL impervious; - CARD8 pad0; - CARD8 pad1; - CARD8 pad2; -} xXTestGrabControlReq; -#define sz_xXTestGrabControlReq 8 - -#undef Window -#undef Time -#undef Cursor - -#endif /* _XTESTSTR_H_ */ -- cgit v1.2.1