diff options
| author | Peter Hutterer <peter.hutterer@redhat.com> | 2008-11-26 11:15:05 +1000 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2009-01-30 17:11:44 -0800 |
| commit | ebb3872925315d705e47e1ccd7f193ac90ac33dc (patch) | |
| tree | 9af96c47c63b8a5cf57511643c103eb13a4d1bb8 /dix | |
| parent | 50d80c25525a691472e3fc5859fb303a3ffe1ef2 (diff) | |
Xi: fix use of button->down - bitflags instead of int arrays.
The device's button down state array was changed to use DOWN_LENGTH and thus
bitflags for each button in cfcb3da7.
Update the DBSN events to copy this bit-wise state.
Update xkb and Xi to check for the bit flag instead of the array value.
Reported by ajax.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
(cherry picked from commit a85f0d6b98237d8a196de624207acf1983a1859a)
Diffstat (limited to 'dix')
| -rw-r--r-- | dix/devices.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dix/devices.c b/dix/devices.c index bf790247f..47e07f94f 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -1848,7 +1848,7 @@ DoSetPointerMapping(ClientPtr client, DeviceIntPtr device, BYTE *map, int n) if ((dev->coreEvents || dev == inputInfo.pointer) && dev->button) { for (i = 0; i < n; i++) { if ((device->button->map[i + 1] != map[i]) && - device->button->down[i + 1]) { + BitIsOn(device->button->down, i + 1)) { return MappingBusy; } } |