Die XTESTEXT1, die!

8 files changed, 3 insertions, 246 deletions

diff --git a/hw/kdrive/src/kdrive.c b/hw/kdrive/src/kdrive.c
index bb8f79fef..52e56e90b 100644
--- a/hw/kdrive/src/kdrive.c
+++ b/hw/kdrive/src/kdrive.c
@@ -1466,32 +1466,6 @@ KdInitOutput (ScreenInfo    *pScreenInfo,
 	    KdAddScreen (pScreenInfo, screen, argc, argv);
 }
 
-#ifdef XTESTEXT1
-void
-XTestGenerateEvent(dev_type, keycode, keystate, mousex, mousey)
-	int	dev_type;
-	int	keycode;
-	int	keystate;
-	int	mousex;
-	int	mousey;
-{
-}
-
-void
-XTestGetPointerPos(fmousex, fmousey)
-	short *fmousex, *fmousey;
-{
-}
-
-void
-XTestJumpPointer(jx, jy, dev_type)
-	int	jx;
-	int	jy;
-	int	dev_type;
-{
-}
-#endif
-
 #ifdef DPMSExtension
 void
 DPMSSet(int level)
diff --git a/hw/vfb/InitInput.c b/hw/vfb/InitInput.c
index 57f466444..23d404df5 100644
--- a/hw/vfb/InitInput.c
+++ b/hw/vfb/InitInput.c
@@ -323,22 +323,3 @@ InitInput(int argc, char *argv[])
     miRegisterPointerDevice(screenInfo.screens[0], p);
     (void)mieqInit ((DevicePtr) k, (DevicePtr) p);
 }
-
-#ifdef XTESTEXT1
-void
-XTestGenerateEvent(int dev_type, int keycode, int keystate, int mousex,
-		   int mousey)
-{
-}
-
-void
-XTestGetPointerPos(short *fmousex, short *fmousey)
-{
-}
-
-void
-XTestJumpPointer(int jx, int jy, int dev_type)
-{
-}
-#endif
-
diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c
index 44ac68878..daf1e2b80 100644
--- a/hw/xfree86/common/xf86Events.c
+++ b/hw/xfree86/common/xf86Events.c
@@ -49,7 +49,7 @@
  */
 
 /* $XConsortium: xf86Events.c /main/46 1996/10/25 11:36:30 kaleb $ */
-/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86Events.c,v 1.21 2005/11/08 06:33:28 jkj Exp $ */
+/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86Events.c,v 1.22 2006/03/25 19:52:03 ajax Exp $ */
 
 /* [JCH-96/01/21] Extended std reverse map to four buttons. */
 
@@ -120,31 +120,11 @@ extern Bool noXkbExtension;
     xf86UnblockSIGIO(__sigstate); \
 }
 
-#ifdef XTESTEXT1
-
-#define	XTestSERVER_SIDE
-#include <X11/extensions/xtestext1.h>
-extern short xtest_mousex;
-extern short xtest_mousey;
-extern int   on_steal_input;          
-extern Bool  XTestStealKeyData();
-extern void  XTestStealMotionData();
-#define ENQUEUE(ev, code, direction, dev_type) \
-  (ev)->u.u.detail = (code); \
-  (ev)->u.u.type   = (direction); \
-  if (!on_steal_input ||  \
-      XTestStealKeyData((ev)->u.u.detail, (ev)->u.u.type, dev_type, \
-			xtest_mousex, xtest_mousey)) \
-  EqEnqueue((ev))
-#else /* ! XTESTEXT1 */
-
 #define ENQUEUE(ev, code, direction, dev_type) \
   (ev)->u.u.detail = (code); \
   (ev)->u.u.type   = (direction); \
   EqEnqueue((ev))
 
-#endif
-
 /*
  * The first of many hacks to get VT switching to work under
  * Solaris 2.1 for x86. The basic problem is that Solaris is supposed
@@ -1773,49 +1753,6 @@ xf86EnableVTSwitch(Bool new)
     return old;
 }
 
-#ifdef XTESTEXT1
-
-void
-XTestGetPointerPos(short *fmousex, short *fmousey)
-{
-  int x,y;
-
-  miPointerPosition(&x, &y);
-  *fmousex = x;
-  *fmousey = y;
-}
-
-
-
-void
-XTestJumpPointer(int jx, int jy, int dev_type)
-{
-  miPointerAbsoluteCursor(jx, jy, GetTimeInMillis() );
-}
-
-void
-XTestGenerateEvent(int dev_type, int keycode, int keystate, int mousex,
-		   int mousey)
-{
-  xEvent tevent;
-  
-  tevent.u.u.type = (dev_type == XE_POINTER) ?
-    (keystate == XTestKEY_UP) ? ButtonRelease : ButtonPress :
-      (keystate == XTestKEY_UP) ? KeyRelease : KeyPress;
-  tevent.u.u.detail = keycode;
-  tevent.u.keyButtonPointer.rootX = mousex;
-  tevent.u.keyButtonPointer.rootY = mousey;
-  tevent.u.keyButtonPointer.time = xf86Info.lastEventTime = GetTimeInMillis();
-#ifdef XINPUT
-  xf86eqEnqueue(&tevent);
-#else
-  mieqEnqueue(&tevent);
-#endif
-  xf86Info.inputPending = TRUE;               /* virtual event */
-}
-
-#endif /* XTESTEXT1 */
-
 void
 xf86ReloadInputDevs(int sig)
 {
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 5f05e4fe9..1381cd3ae 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -1,5 +1,5 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Init.c,v 3.212 2004/01/27 01:31:45 dawes Exp $ */
-/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86Init.c,v 1.34 2006/04/04 14:17:04 ajax Exp $ */
+/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86Init.c,v 1.35 2006/05/09 18:04:29 ajax Exp $ */
 
 /*
  * Loosely based on code bearing the following copyright:
@@ -93,11 +93,6 @@
 
 #include "globals.h"
 
-#ifdef XTESTEXT1
-#include "atKeynames.h"
-extern int xtest_command_key;
-#endif /* XTESTEXT1 */
-
 #ifdef DPMSExtension
 #define DPMS_SERVER
 #include <X11/extensions/dpms.h>
@@ -1038,9 +1033,6 @@ InitInput(argc, argv)
 
     xf86Info.vtRequestsPending = FALSE;
     xf86Info.inputPending = FALSE;
-#ifdef XTESTEXT1
-    xtest_command_key = KEY_Begin + MIN_KEYCODE;
-#endif /* XTESTEXT1 */
 
     if (serverGeneration == 1) {
 	/* Call the PreInit function for each input device instance. */
diff --git a/hw/xfree86/os-support/solaris/sun_kbdEv.c b/hw/xfree86/os-support/solaris/sun_kbdEv.c
index fa2a0f109..8eee962ef 100644
--- a/hw/xfree86/os-support/solaris/sun_kbdEv.c
+++ b/hw/xfree86/os-support/solaris/sun_kbdEv.c
@@ -23,7 +23,7 @@
  */
 
 /* [JCH-96/01/21] Extended std reverse map to four buttons. */
-/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_kbdEv.c,v 1.5 2005/05/21 07:46:37 alanc Exp $ */
+/* $XdotOrg: xserver/xorg/hw/xfree86/os-support/solaris/sun_kbdEv.c,v 1.10 2005/12/12 23:33:55 alanc Exp $ */
 
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
@@ -52,50 +52,18 @@ extern Bool noXkbExtension;
 #define XE_POINTER  1
 #define XE_KEYBOARD 2
 
-#ifdef XTESTEXT1
-
-#define	XTestSERVER_SIDE
-#include <X11/extensions/xtestext1.h>
-extern short xtest_mousex;
-extern short xtest_mousey;
-extern int   on_steal_input;
-extern Bool  XTestStealKeyData();
-extern void  XTestStealMotionData();
-
 #ifdef XINPUT
 #define ENQUEUE(ev, code, direction, dev_type) \
   (ev)->u.u.detail = (code); \
   (ev)->u.u.type   = (direction); \
-  if (!on_steal_input ||  \
-      XTestStealKeyData((ev)->u.u.detail, (ev)->u.u.type, dev_type, \
-			xtest_mousex, xtest_mousey)) \
   xf86eqEnqueue((ev))
 #else
 #define ENQUEUE(ev, code, direction, dev_type) \
   (ev)->u.u.detail = (code); \
   (ev)->u.u.type   = (direction); \
-  if (!on_steal_input ||  \
-      XTestStealKeyData((ev)->u.u.detail, (ev)->u.u.type, dev_type, \
-			xtest_mousex, xtest_mousey)) \
   mieqEnqueue((ev))
 #endif
 
-#else /* ! XTESTEXT1 */
-
-#ifdef XINPUT
-#define ENQUEUE(ev, code, direction, dev_type) \
-  (ev)->u.u.detail = (code); \
-  (ev)->u.u.type   = (direction); \
-  xf86eqEnqueue((ev))
-#else
-#define ENQUEUE(ev, code, direction, dev_type) \
-  (ev)->u.u.detail = (code); \
-  (ev)->u.u.type   = (direction); \
-  mieqEnqueue((ev))
-#endif
-
-#endif
-
 static void startautorepeat(long keycode);
 static CARD32 processautorepeat(OsTimerPtr timer, CARD32 now, pointer arg);
 
diff --git a/hw/xnest/Makefile.am b/hw/xnest/Makefile.am
index 76d0a57a5..67a2e981c 100644
--- a/hw/xnest/Makefile.am
+++ b/hw/xnest/Makefile.am
@@ -26,7 +26,6 @@ SRCS =	Args.c \
 	Pointer.h \
 	Screen.c \
 	Screen.h \
-	TestExt.c \
 	Visual.c \
 	Visual.h \
 	Window.c \
diff --git a/hw/xnest/TestExt.c b/hw/xnest/TestExt.c
deleted file mode 100644
index 74446b050..000000000
--- a/hw/xnest/TestExt.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/* $Xorg: TestExt.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */
-/*
-
-Copyright 1993 by Davor Matic
-
-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.  Davor Matic makes no representations about
-the suitability of this software for any purpose.  It is provided "as
-is" without express or implied warranty.
-
-*/
-/* $XFree86: xc/programs/Xserver/hw/xnest/TestExt.c,v 3.5 2001/08/27 17:41:00 dawes Exp $ */
-
-#ifdef HAVE_XNEST_CONFIG_H
-#include <xnest-config.h>
-#endif
-
-#include <X11/X.h>
-#include <X11/Xproto.h>
-#include <X11/Xlib.h>
-#undef Bool
-#include "screenint.h"
-#include "input.h"
-#include "misc.h"
-#include "scrnintstr.h"
-#include "servermd.h"
-#include "mipointer.h"
-#define XTestSERVER_SIDE
-#include <X11/extensions/xtestext1.h>
-#include "xtest1dd.h"
-
-extern CARD32 lastEventTime;
-
-void
-XTestGetPointerPos(short *fmousex, short *fmousey)
-{
-  int x,y;
-  
-  miPointerPosition(&x, &y);
-  *fmousex = x;
-  *fmousey = y;
-}
-
-void
-XTestJumpPointer(int jx, int jy, int dev_type)
-{
-  miPointerAbsoluteCursor(jx, jy, GetTimeInMillis());
-}
-
-void
-XTestGenerateEvent(int dev_type, int keycode, int keystate, int mousex,
-		   int mousey)
-{
-/*
-  xEvent tevent;
-  
-  tevent.u.u.type = (dev_type == XE_POINTER) ?
-    (keystate == XTestKEY_UP) ? ButtonRelease : ButtonPress :
-      (keystate == XTestKEY_UP) ? KeyRelease : KeyPress;
-  tevent.u.u.detail = keycode;
-  tevent.u.keyButtonPointer.rootX = mousex;
-  tevent.u.keyButtonPointer.rootY = mousey;
-  tevent.u.keyButtonPointer.time = lastEventTime = GetTimeInMillis();
-  mieqEnqueue(&tevent);
-*/
-}
diff --git a/hw/xwin/InitInput.c b/hw/xwin/InitInput.c
index 8b72416ab..3be84efc6 100644
--- a/hw/xwin/InitInput.c
+++ b/hw/xwin/InitInput.c
@@ -177,28 +177,3 @@ InitInput (int argc, char *argv[])
   winDebug ("InitInput - returning\n");
 #endif
 }
-
-
-#ifdef XTESTEXT1
-void
-XTestGenerateEvent (int dev_type, int keycode, int keystate,
-		    int mousex, int mousey)
-{
-  ErrorF ("XTestGenerateEvent\n");
-}
-
-
-void
-XTestGetPointerPos (short *fmousex, short *fmousey)
-{
-  ErrorF ("XTestGetPointerPos\n");
-}
-
-
-void
-XTestJumpPointer (int jx, int jy, int dev_type)
-{
-  ErrorF ("XTestJumpPointer\n");
-}
-#endif
-