From d348eb8ce78640363c159e1a4fdbfa9b596fa5bb Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu, 23 Oct 2008 13:22:17 +1030
Subject: MB emulation timeout is stored as Time, make the property 32-bit too.

---
 include/evdev-properties.h | 2 +-
 src/emuMB.c                | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/evdev-properties.h b/include/evdev-properties.h
index b2b3f4b..89f25f1 100644
--- a/include/evdev-properties.h
+++ b/include/evdev-properties.h
@@ -31,7 +31,7 @@
 /* Middle mouse button emulation */
 /* BOOL */
 #define EVDEV_PROP_MIDBUTTON "Evdev Middle Button Emulation"
-/* CARD16 */
+/* CARD32 */
 #define EVDEV_PROP_MIDBUTTON_TIMEOUT "Evdev Middle Button Timeout"
 
 /* Wheel emulation */
diff --git a/src/emuMB.c b/src/emuMB.c
index ab6dae9..8a3967c 100644
--- a/src/emuMB.c
+++ b/src/emuMB.c
@@ -358,11 +358,11 @@ EvdevMBEmuSetProperty(DeviceIntPtr dev, Atom atom, XIPropertyValuePtr val,
             pEvdev->emulateMB.enabled = *((BOOL*)val->data);
     } else if (atom == prop_mbtimeout)
     {
-        if (val->format != 16 || val->size != 1 || val->type != XA_INTEGER)
+        if (val->format != 32 || val->size != 1 || val->type != XA_INTEGER)
             return BadMatch;
 
         if (!checkonly)
-            pEvdev->emulateMB.timeout = *((INT16*)val->data);
+            pEvdev->emulateMB.timeout = *((CARD32*)val->data);
     }
 
     return Success;
@@ -393,7 +393,7 @@ EvdevMBEmuInitProperty(DeviceIntPtr dev)
     prop_mbtimeout = MakeAtom(EVDEV_PROP_MIDBUTTON_TIMEOUT,
                               strlen(EVDEV_PROP_MIDBUTTON_TIMEOUT),
                               TRUE);
-    rc = XIChangeDeviceProperty(dev, prop_mbtimeout, XA_INTEGER, 16, PropModeReplace, 1,
+    rc = XIChangeDeviceProperty(dev, prop_mbtimeout, XA_INTEGER, 32, PropModeReplace, 1,
                                 &pEvdev->emulateMB.timeout, FALSE);
 
     if (rc != Success)
-- 
cgit v1.2.3