[PATCH acecad 6/7] Use a local variable for history_size.

Peter Hutterer peter.hutterer at who-t.net
Thu Sep 9 17:56:40 PDT 2010


Field was removed from InputInfoRec in ABI and the server hasn't actually
accessed this field for quite a while.

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
CC: Giuseppe Bilotta <giuseppe.bilotta at gmail.org>
---
 src/acecad.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/acecad.c b/src/acecad.c
index fe4dd03..c76b641 100644
--- a/src/acecad.c
+++ b/src/acecad.c
@@ -616,6 +616,7 @@ DeviceInit (DeviceIntPtr dev)
     InputInfoPtr local = (InputInfoPtr) dev->public.devicePrivate;
     AceCadPrivatePtr priv = (AceCadPrivatePtr) (local->private);
     unsigned char map[] = {0, 1, 2, 3};
+    int history_size;
 #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
     Atom btn_labels[3];
     Atom axes_labels[3];
@@ -661,6 +662,7 @@ DeviceInit (DeviceIntPtr dev)
         return !Success;
     }
 
+    history_size = xf86SetIntOption(local->options , "HistorySize", 0);
 
     /* 3 axes */
     if (InitValuatorClassDeviceStruct (dev, 3,
@@ -670,7 +672,7 @@ DeviceInit (DeviceIntPtr dev)
 #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
                 xf86GetMotionEvents,
 #endif
-                local->history_size,
+                history_size,
                 ((priv->flags & ABSOLUTE_FLAG)? Absolute: Relative)|OutOfProximity)
             == FALSE)
     {
-- 
1.7.2.3



More information about the xorg-devel mailing list