diff options
author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-07-20 13:19:04 +1000 |
---|---|---|
committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-07-20 15:04:05 +1000 |
commit | dbc6ca9306f0f683419aca737e0d98243475bc0d (patch) | |
tree | 3a3020ee0c367bfd697cc22f7e1bb57fd4159929 | |
parent | 1d1860f31f673f9cf2efb6dc59fdcf8fe625736f (diff) |
Remove XTest header, belongs to libXtst.
All prototypes declared in XTest.h are defined in libXtst/src/XTest.c, not
here.
This removes the circular dependency between libXi and libXext.
Reported-by: Colin Guthrie
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r-- | include/X11/extensions/XTest.h | 146 | ||||
-rw-r--r-- | src/Makefile.am | 1 | ||||
-rw-r--r-- | src/XTestExt1.c | 1 |
3 files changed, 0 insertions, 148 deletions
diff --git a/include/X11/extensions/XTest.h b/include/X11/extensions/XTest.h deleted file mode 100644 index f27407a..0000000 --- a/include/X11/extensions/XTest.h +++ /dev/null @@ -1,146 +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> -#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 27b29aa..6a7d379 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -46,7 +46,6 @@ libXextinclude_HEADERS = $(top_srcdir)/include/X11/extensions/dpms.h \ $(top_srcdir)/include/X11/extensions/Xge.h \ $(top_srcdir)/include/X11/extensions/XLbx.h \ $(top_srcdir)/include/X11/extensions/XShm.h \ - $(top_srcdir)/include/X11/extensions/XTest.h \ $(top_srcdir)/include/X11/extensions/xtestext1.h if LINT diff --git a/src/XTestExt1.c b/src/XTestExt1.c index 993837a..c9d48d7 100644 --- a/src/XTestExt1.c +++ b/src/XTestExt1.c @@ -68,7 +68,6 @@ University of California. #include <X11/Xlibint.h> #include <X11/extensions/xtestext1.h> #include <X11/extensions/xtestext1proto.h> -#include <X11/extensions/XTest.h> /****************************************************************************** * variables |