diff options
author | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-04-08 16:00:36 +0930 |
---|---|---|
committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-04-08 16:00:36 +0930 |
commit | 2823f7c3f3784a1a398b8d5a9157c2e5263b6285 (patch) | |
tree | 52acadc27d8d07d090761745637bd8cb1f6da9c6 | |
parent | 164eb7570b10add2087ce293995319798ca3c345 (diff) |
Revert "Don't call xf86IsCorePointer."
This reverts commit 9ea880913d5775454311b0257bbaebf773cd4285.
-rw-r--r-- | src/xf86Fpit.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/xf86Fpit.c b/src/xf86Fpit.c index 0378e37..531b0bd 100644 --- a/src/xf86Fpit.c +++ b/src/xf86Fpit.c @@ -231,6 +231,7 @@ static void xf86FpitReadInput(LocalDevicePtr local) { FpitPrivatePtr priv = (FpitPrivatePtr) local->private; int len, loop; + int is_core_pointer; int x, y, buttons, prox; DeviceIntPtr device; int conv_x, conv_y; @@ -318,18 +319,15 @@ static void xf86FpitReadInput(LocalDevicePtr local) prox = (priv->fpitData[loop] & PROXIMITY_BIT) ? 0 : 1; buttons = (priv->fpitData[loop] & BUTTON_BITS); device = local->dev; + is_core_pointer = xf86IsCorePointer(device); xf86FpitConvert(local, 0, 2, x, y, 0, 0, 0, 0, &conv_x, &conv_y); xf86XInputSetScreen(local, priv->screen_no, conv_x, conv_y); /* coordinates are ready we can send events */ - if (prox!=priv->fpitOldProximity) { /* proximity changed */ -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 - if (xf86IsCorePointer(device) == 0) -#endif - xf86PostProximityEvent(device, prox, 0, 2, x, y); - } + if (prox!=priv->fpitOldProximity) /* proximity changed */ + if (!is_core_pointer) xf86PostProximityEvent(device, prox, 0, 2, x, y); if (priv->fpitOldX != x || priv->fpitOldY != y) /* position changed */ xf86PostMotionEvent(device, 1, 0, 2, x, y); |