From 01a4da993a2ecd0f017baef49b6e57b82c05316d Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Mon, 14 Jan 2008 10:50:54 +1030 Subject: Don't crash with xserver 1.4 xf86IsCorePointer() is gone. --- src/xf86Fpit.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/xf86Fpit.c b/src/xf86Fpit.c index 531b0bd..81d70a1 100644 --- a/src/xf86Fpit.c +++ b/src/xf86Fpit.c @@ -231,7 +231,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; @@ -319,7 +319,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); -- cgit v1.2.3