[PATCH 05/18] XTest: remove XTest.h, split into xtestconst.h
Peter Hutterer
peter.hutterer at who-t.net
Wed Jun 24 22:26:29 PDT 2009
---
Makefile.am | 2 +-
XTest.h | 164 ----------------------------------------------------------
xtestconst.h | 43 +++++++++++++++
xteststr.h | 5 ++-
4 files changed, 48 insertions(+), 166 deletions(-)
delete mode 100644 XTest.h
create mode 100644 xtestconst.h
diff --git a/Makefile.am b/Makefile.am
index f9054c7..d6a627a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,7 +36,7 @@ xext_HEADERS = \
XEVIstr.h \
Xext.h \
xtestext1.h \
- XTest.h \
+ xtestconst.h \
xteststr.h
pkgconfigdir = $(libdir)/pkgconfig
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 <X11/Xfuncproto.h>
-
-#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 <X11/extensions/XInput.h>
-
-_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/xtestconst.h b/xtestconst.h
new file mode 100644
index 0000000..0a6169c
--- /dev/null
+++ b/xtestconst.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 _XTESTCONST_H_
+#define _XTESTCONST_H_
+
+#define XTestNumberEvents 0
+
+#define XTestNumberErrors 0
+
+#define XTestCurrentCursor ((Cursor)1)
+
+#define XTestMajorVersion 2
+#define XTestMinorVersion 2
+
+#define XTestExtensionName "XTEST"
+
+#endif
diff --git a/xteststr.h b/xteststr.h
index a196b77..ab94e9b 100644
--- a/xteststr.h
+++ b/xteststr.h
@@ -32,7 +32,10 @@ in this Software without prior written authorization from The Open Group.
#define Time CARD32
#define Cursor CARD32
-#define XTestCurrentCursor ((Cursor)1)
+#define X_XTestGetVersion 0
+#define X_XTestCompareCursor 1
+#define X_XTestFakeInput 2
+#define X_XTestGrabControl 3
typedef struct {
CARD8 reqType; /* always XTestReqCode */
--
1.6.3.rc1.2.g0164.dirty
More information about the xorg-devel
mailing list