From bd592c2e7edb7cd3dd06dd6c13b559bd6c498596 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sun, 21 Jun 2015 18:12:11 +0200 Subject: library clean-up: Don't build libNX_Xtst anymore. Use system's libXtst shared library. (Fixes ArcticaProject/nx-libs#32). --- nx-X11/include/extensions/Imakefile | 2 +- nx-X11/include/extensions/XTest.h | 164 --------------------------------- nx-X11/include/extensions/xtestconst.h | 46 +++++++++ 3 files changed, 47 insertions(+), 165 deletions(-) delete mode 100644 nx-X11/include/extensions/XTest.h create mode 100644 nx-X11/include/extensions/xtestconst.h (limited to 'nx-X11/include') diff --git a/nx-X11/include/extensions/Imakefile b/nx-X11/include/extensions/Imakefile index 04c13cdb5..33e854058 100644 --- a/nx-X11/include/extensions/Imakefile +++ b/nx-X11/include/extensions/Imakefile @@ -91,7 +91,7 @@ HEADERS = Xext.h \ bigreqstr.h \ extutil.h \ XI.h XInput.h XIproto.h \ - XTest.h xtestext1.h xteststr.h \ + xtestconst.h xtestext1.h xteststr.h \ XKB.h XKBgeom.h XKBproto.h XKBstr.h XKBsrv.h \ Xdbe.h Xdbeproto.h \ Xag.h Xagstr.h Xagsrv.h \ diff --git a/nx-X11/include/extensions/XTest.h b/nx-X11/include/extensions/XTest.h deleted file mode 100644 index 4817ef132..000000000 --- a/nx-X11/include/extensions/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/nx-X11/include/extensions/xtestconst.h b/nx-X11/include/extensions/xtestconst.h new file mode 100644 index 000000000..4f69966a4 --- /dev/null +++ b/nx-X11/include/extensions/xtestconst.h @@ -0,0 +1,46 @@ +/* + +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 _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" + +#endif -- cgit v1.2.3