diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-05-20 11:57:01 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-07-30 09:44:33 +1000 |
| commit | b8519930e415043545e87ea660f6f0b3109537bf (patch) | |
| tree | 34ae556bf8f936a58198a23837a9448fe2dc37e2 | |
| parent | 6d43a45b99e07325c74cbe1d20b04094ba99950d (diff) | |
| download | xorg-driver-xf86-input-evdev-b8519930e415043545e87ea660f6f0b3109537bf.tar.gz | |
Ensure enough buttons are advertised to pass the button mapping.
Some buttons are mapped to higher button numbers. For example, BTN_0 is
posted as button 8 if BTN_LEFT is present. On top of that, the
driver-specific button mapping may map the button to something else again.
We need to take these mappings into account when counting the number of
buttons on the device.
Example: A device with BTN_LEFT and BTN_0 and a mapping from 1 -> 7 and 8 ->
2.
BTN_LEFT is mapped to 1. 1 is mapped to 7. num_buttons is 7.
BTN_0 is mapped to 8. 8 is mapped to 2. num_buttons remains 7.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit b358f1eb3a4ef8fdee099114d6c70d6ea06eba95)
| -rw-r--r-- | src/evdev.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/evdev.c b/src/evdev.c index 80ba276..a9e1d27 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -1466,8 +1466,14 @@ EvdevProbe(InputInfoPtr pInfo) /* count all buttons */ for (i = BTN_MISC; i < BTN_JOYSTICK; i++) { + int mapping = 0; if (TestBit(i, pEvdev->key_bitmask)) - num_buttons++; + { + mapping = + pEvdev->btnmap[EvdevUtilButtonEventToButtonNumber(pEvdev, i)]; + if (mapping > num_buttons) + num_buttons = mapping; + } } if (num_buttons) |