summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-11-02 13:57:18 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-11-20 11:17:41 +1000
commit7c3c7f83d02c611d9660a6f6ef4201b71017d42d (patch)
tree38e4841dbba3aa085ccf0bfd4977089b56efb909
parentaa6399fdb9ec970e205b1efb336338ac870d2bcf (diff)
Fix drag-lock property handler for multiple draglock buttons.
Parsing of the values was wrong. Given an input of 1 2 3 4, button 1 sets the lock for button 2 and button 3 sets the lock for button 4. This also means we need to return BadMatch if the property isn't a multiple of 2. Red Hat Bug 524428 <https://bugzilla.redhat.com/show_bug.cgi?id=524428> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 11669d82790fd7c94c44c0d487d3fa5e203528e9)
-rw-r--r--src/draglock.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/draglock.c b/src/draglock.c
index a8bf079..6157cae 100644
--- a/src/draglock.c
+++ b/src/draglock.c
@@ -256,7 +256,7 @@ EvdevDragLockSetProperty(DeviceIntPtr dev, Atom atom, XIPropertyValuePtr val,
pEvdev->dragLock.meta = meta;
memset(pEvdev->dragLock.lock_pair, 0, sizeof(pEvdev->dragLock.lock_pair));
}
- } else
+ } else if ((val->size % 2) == 0)
{
CARD8* vals = (CARD8*)val->data;
@@ -269,10 +269,11 @@ EvdevDragLockSetProperty(DeviceIntPtr dev, Atom atom, XIPropertyValuePtr val,
pEvdev->dragLock.meta = 0;
memset(pEvdev->dragLock.lock_pair, 0, sizeof(pEvdev->dragLock.lock_pair));
- for (i = 0; i < val->size && i < EVDEV_MAXBUTTONS; i++)
- pEvdev->dragLock.lock_pair[i] = vals[i];
+ for (i = 0; i < val->size && i < EVDEV_MAXBUTTONS; i += 2)
+ pEvdev->dragLock.lock_pair[vals[i] - 1] = vals[i + 1];
}
- }
+ } else
+ return BadMatch;
}
return Success;