diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2021-04-14 16:26:21 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2021-04-21 00:15:42 +0000 |
| commit | 16d5d78a4d369286ec0136e0a4310ab0f4536add (patch) | |
| tree | ec4e98706bb7f9fbf6b27b07b64cdff814b2d047 | |
| parent | f92a388c7aefa8fc5f8b065dd6e291f04fc4c036 (diff) | |
touchpad: use some helper variables to make the code easier to read
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | src/evdev-mt-touchpad-buttons.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/evdev-mt-touchpad-buttons.c b/src/evdev-mt-touchpad-buttons.c index 7d8933fe..d7f075c0 100644 --- a/src/evdev-mt-touchpad-buttons.c +++ b/src/evdev-mt-touchpad-buttons.c @@ -939,15 +939,18 @@ static bool tp_guess_clickpad(const struct tp_dispatch *tp, struct evdev_device *device) { bool is_clickpad; + bool has_left = libevdev_has_event_code(device->evdev, EV_KEY, BTN_LEFT), + has_middle = libevdev_has_event_code(device->evdev, EV_KEY, BTN_MIDDLE), + has_right = libevdev_has_event_code(device->evdev, EV_KEY, BTN_RIGHT); + is_clickpad = libevdev_has_property(device->evdev, INPUT_PROP_BUTTONPAD); - if (libevdev_has_event_code(device->evdev, EV_KEY, BTN_MIDDLE) || - libevdev_has_event_code(device->evdev, EV_KEY, BTN_RIGHT)) { + if (has_middle || has_right) { if (is_clickpad) evdev_log_bug_kernel(device, "clickpad advertising right button\n"); - } else if (libevdev_has_event_code(device->evdev, EV_KEY, BTN_LEFT) && + } else if (has_left & !is_clickpad && libevdev_get_id_vendor(device->evdev) != VENDOR_ID_APPLE) { evdev_log_bug_kernel(device, |