diff options
| author | Cyril Brulebois <kibi@debian.org> | 2011-06-03 15:59:16 +0200 |
|---|---|---|
| committer | Cyril Brulebois <kibi@debian.org> | 2011-06-03 15:59:16 +0200 |
| commit | 9385ae905aca9e679e698f0491e0bf7e30a35092 (patch) | |
| tree | db3fd076314c9232301167fcb2fff6c85ad8213c /src | |
| parent | 21f7f1705d2c0b46ce19367d5ac8a4c225d755ef (diff) | |
Remove pointless checks on is_core_pointer.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/acecad.c | 39 |
1 files changed, 17 insertions, 22 deletions
diff --git a/src/acecad.c b/src/acecad.c index de2577e..ad6d793 100644 --- a/src/acecad.c +++ b/src/acecad.c @@ -729,7 +729,7 @@ ReadInput (InputInfoPtr local) { int x, y, z; int prox, buttons; - int is_core_pointer = 0, is_absolute; + int is_absolute; AceCadPrivatePtr priv = (AceCadPrivatePtr) (local->private); /*xf86Msg(X_INFO, "ACECAD Tablet Read Input\n");*/ @@ -772,11 +772,10 @@ ReadInput (InputInfoPtr local) if (prox) { if (!(priv->acecadOldProximity)) - if (!is_core_pointer) - { - /*xf86Msg(X_INFO, "ACECAD Tablet ProxIN %d %d %d\n",x, y, z);*/ - xf86PostProximityEvent(local->dev, 1, 0, 3 , x, y, z); - } + { + /*xf86Msg(X_INFO, "ACECAD Tablet ProxIN %d %d %d\n",x, y, z);*/ + xf86PostProximityEvent(local->dev, 1, 0, 3 , x, y, z); + } if ((is_absolute && ((priv->acecadOldX != x) || (priv->acecadOldY != y) || (priv->acecadOldZ != z))) || (!is_absolute && (x || y))) @@ -809,12 +808,11 @@ ReadInput (InputInfoPtr local) } else { - if (!is_core_pointer) - if (priv->acecadOldProximity) - { - /*xf86Msg(X_INFO, "ACECAD Tablet ProxOUT %d %d %d\n",x, y, z);*/ - xf86PostProximityEvent(local->dev, 0, 0, 3, x,y,z); - } + if (priv->acecadOldProximity) + { + /*xf86Msg(X_INFO, "ACECAD Tablet ProxOUT %d %d %d\n",x, y, z);*/ + xf86PostProximityEvent(local->dev, 0, 0, 3, x,y,z); + } priv->acecadOldProximity = 0; } } @@ -836,7 +834,6 @@ USBReadInput (InputInfoPtr local) int report_x = 0, report_y = 0; int prox = priv->acecadOldProximity; int buttons = priv->acecadOldButtons; - int is_core_pointer = 0; /* Is autodev active? */ int autodev = priv->flags & AUTODEV_FLAG; /* Was the device available last time we checked? */ @@ -935,10 +932,9 @@ USBReadInput (InputInfoPtr local) report_y = y; #endif if (!(priv->acecadOldProximity)) - if (!is_core_pointer) - { - xf86PostProximityEvent(local->dev, 1, 0, 3 , report_x, report_y, z); - } + { + xf86PostProximityEvent(local->dev, 1, 0, 3 , report_x, report_y, z); + } xf86PostMotionEvent(local->dev, 1, 0, 3, report_x, report_y, z); @@ -957,11 +953,10 @@ USBReadInput (InputInfoPtr local) } else { - if (!is_core_pointer) - if (priv->acecadOldProximity) - { - xf86PostProximityEvent(local->dev, 0, 0, 3, report_x, report_y, z); - } + if (priv->acecadOldProximity) + { + xf86PostProximityEvent(local->dev, 0, 0, 3, report_x, report_y, z); + } priv->acecadOldProximity = 0; } |