diff options
| author | Peter Hutterer <peter.hutterer@redhat.com> | 2008-10-23 13:22:17 +1030 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@redhat.com> | 2008-10-23 17:15:30 +1030 |
| commit | fa18a4a38d3cdf9ab94dcc5586cade3016a97616 (patch) | |
| tree | c9edbf86b1ec29dc2ffb2363046e19650b8ff171 /src | |
| parent | 172523d74557f4c82209f9dd4869d7735944c9e7 (diff) | |
MB emulation timeout is stored as Time, make the property 32-bit too.
(cherry picked from commit d348eb8ce78640363c159e1a4fdbfa9b596fa5bb)
Diffstat (limited to 'src')
| -rw-r--r-- | src/emuMB.c | 6 |
1 files changed, 3 insertions, 3 deletions
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) |