From 7f22bdb90dcb1fd4077c64784bae182f84aca653 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 20 Sep 2007 08:06:23 +0930 Subject: Don't check if the device is a core device or not. Remove call to xf86IsCore (doesn't exist anymore anyway) and unconditionally try to generate ProximityEvents. The device should not bother whether it's a core event or not, it's all handled in the dix now. --- src/xf86HyperPen.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/xf86HyperPen.c b/src/xf86HyperPen.c index a40fb9c..c31526b 100644 --- a/src/xf86HyperPen.c +++ b/src/xf86HyperPen.c @@ -689,7 +689,7 @@ xf86HypReadInput(LocalDevicePtr local) { HyperPenDevicePtr priv = (HyperPenDevicePtr) local->private; int len, loop; - int is_core_pointer, is_absolute; + int is_absolute; int f_keys, f_key, tip; int x, y, bx, by, barrel, barrel1, prox, pressure, button, push; int hw_pressure; @@ -791,16 +791,10 @@ is_absolute = stylus; device = local->dev; - - - - is_core_pointer = xf86IsCorePointer(device); - /* coordonates are ready we can send events */ if ((prox) && !(f_keys)) { if (!(priv->hypOldProximity)) - if (!is_core_pointer) xf86PostProximityEvent(device, 1, 0, 3, x, y, pressure); if ((is_absolute && ((priv->hypOldX != x) || @@ -854,9 +848,8 @@ is_absolute = stylus; } else { /* !PROXIMITY */ /* Any changes in buttons are ignored when !proximity */ - if (!is_core_pointer) - if (priv->hypOldProximity) - xf86PostProximityEvent(device, 0, 0, 3, x, y, pressure); + if (priv->hypOldProximity) + xf86PostProximityEvent(device, 0, 0, 3, x, y, pressure); priv->hypOldProximity = 0; } } -- cgit v1.2.3