diff options
| author | Julien Cristau <jcristau@debian.org> | 2008-01-14 10:50:54 +1030 |
|---|---|---|
| committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-04-08 16:00:52 +0930 |
| commit | 01a4da993a2ecd0f017baef49b6e57b82c05316d (patch) | |
| tree | c43651c226925383e5b4b6156c767b29d3dd0b84 | |
| parent | 2823f7c3f3784a1a398b8d5a9157c2e5263b6285 (diff) | |
Don't crash with xserver 1.4
xf86IsCorePointer() is gone.
| -rw-r--r-- | src/xf86Fpit.c | 4 |
1 files changed, 3 insertions, 1 deletions
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); |