Bug#457722: xserver-xorg-input-fpit: using touchscreen kills x

[Julien Cristau <jcristau@debian.org>]

On Mon, Dec 24, 2007 at 22:57:30 +0000, TreeBoy wrote:

> If I connect from another PC, I get an error along the lines of "Undefined
> function IsCorePointer"
> 
Hi, can you rebuild the fpit driver with the attached patch, and tell me
if it works for you?

Thanks,
Julien

commit e4495f76e30bb66cdb5974e915fc4f85cd74674b
Author: Julien Cristau <jcristau@debian.org>
Date:   Tue Dec 25 02:14:56 2007 +0100

    Don't crash with xserver 1.4
    
    xf86IsCorePointer() is gone.

diff --git a/src/xf86Fpit.c b/src/xf86Fpit.c
index b7a9a60..f80a1df 100644
--- a/src/xf86Fpit.c
+++ b/src/xf86Fpit.c
@@ -182,7 +182,7 @@ static void xf86FpitReadInput(LocalDevicePtr local)
 {
 	FpitPrivatePtr priv = (FpitPrivatePtr) local->private;
 	int len, loop;
-	int is_core_pointer;
+	int is_core_pointer = 1;
 	int x, y, buttons, prox;
 	DeviceIntPtr device;
 	int conv_x, conv_y;
@@ -251,7 +251,9 @@ static void xf86FpitReadInput(LocalDevicePtr local)
 		prox = (priv->fpitData[loop] & PROXIMITY_BIT) ? 0 : 1;
 		buttons = (priv->fpitData[loop] & BUTTON_BITS);
 		device = local->dev;
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
 		is_core_pointer = xf86IsCorePointer(device);
+#endif
 
 		xf86FpitConvert(local, 0, 2, x, y, 0, 0, 0, 0, &conv_x, &conv_y);
 		xf86XInputSetScreen(local, priv->screen_no, conv_x, conv_y);