diff --git a/hw/kdrive/fbdev/fbdev.c b/hw/kdrive/fbdev/fbdev.c index baac67168..54d3c9c14 100644 --- a/hw/kdrive/fbdev/fbdev.c +++ b/hw/kdrive/fbdev/fbdev.c @@ -21,7 +21,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/kdrive/fbdev/fbdev.c,v 1.11 2001/03/30 02:15:20 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/kdrive/fbdev/fbdev.c,v 1.12 2001/05/23 08:56:08 alanh Exp $ */ #include "fbdev.h" @@ -295,7 +295,9 @@ fbdevUpdateFake24 (ScreenPtr pScreen, } #endif /* FAKE24_ON_16 */ +#ifdef TOUCHSCREEN int TsFbdev = -1; +#endif Bool fbdevInitScreen (ScreenPtr pScreen) @@ -306,7 +308,9 @@ fbdevInitScreen (ScreenPtr pScreen) ShadowUpdateProc update; ShadowWindowProc window; +#ifdef TOUCHSCREEN TsFbdev = pScreen->myNum; +#endif if (scrpriv->shadow) { diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c index 2636b8c11..28c5ef2ef 100644 --- a/hw/kdrive/src/kinput.c +++ b/hw/kdrive/src/kinput.c @@ -21,7 +21,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/kdrive/kinput.c,v 1.13 2001/03/30 02:15:20 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/kdrive/kinput.c,v 1.14 2001/05/23 08:56:08 alanh Exp $ */ #include "kdrive.h" #include "inputstr.h" @@ -1453,14 +1453,18 @@ KdCrossScreen(ScreenPtr pScreen, Bool entering) #endif } +#ifdef TOUCHSCREEN /* HACK! */ extern int TsScreen; +#endif static void KdWarpCursor (ScreenPtr pScreen, int x, int y) { KdBlockSigio (); +#ifdef TOUCHSCREEN TsScreen = pScreen->myNum; +#endif miPointerWarpCursor (pScreen, x, y); KdUnblockSigio (); }