Move XTest.h header from xextproto/libXext to here.

XTest.h was in xextproto until xextproto-7.1 and did a short but whoefully
misguided visit to libXext during the cleanup of the xextproto headers.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

diff --git a/include/X11/extensions/XTest.h b/include/X11/extensions/XTest.h
new file mode 100644 (file)
index 0000000..f27407a
--- /dev/null
+++ b/include/X11/extensions/XTest.h
@@ -0,0 +1,146 @@
+/* $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>
+#include <X11/extensions/xtest.h>
+#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

diff --git a/src/Makefile.am b/src/Makefile.am
index 7e3a901..e8594c7 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,10 +5,17 @@ libXtst_la_SOURCES = \
          XTest.c
 
 libXtst_la_LIBADD = @XTST_LIBS@
-AM_CFLAGS = @XTST_CFLAGS@
+
+AM_CFLAGS=\
+          -I$(top_srcdir)/include \
+          -I$(top_srcdir)/include/X11/extensions\
+          @XTST_CFLAGS@
 
 libXtst_la_LDFLAGS = -version-number 6:1:0 -no-undefined
 
+libXtstincludedir = $(includedir)/X11/extensions
+libXtstinclude_HEADERS = $(top_srcdir)/include/X11/extensions/XTest.h
+
 if LINT
 ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
               $(AM_CPPFLAGS) $(CPPFLAGS)