diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2014-09-16 16:22:36 +0200 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2014-09-18 13:29:42 +1000 |
| commit | 7e932ed33ffe707fb1c3d4bf8543be6c53549f11 (patch) | |
| tree | 3a21e2630d7b2f43a2068b8ec7d7d0559eac0955 /test | |
| parent | 0f112646ceb24501058708489febed8854444349 (diff) | |
| download | libinput-7e932ed33ffe707fb1c3d4bf8543be6c53549f11.tar.gz | |
evdev: Add middle button scrolling for trackpoints
Most trackpoint users want to be able to scroll using the trackpoint with
the middle button pressed, add support for this.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'test')
| -rw-r--r-- | test/litest-trackpoint.c | 2 | ||||
| -rw-r--r-- | test/pointer.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/test/litest-trackpoint.c b/test/litest-trackpoint.c index 25a377c4..40b9ed07 100644 --- a/test/litest-trackpoint.c +++ b/test/litest-trackpoint.c @@ -49,6 +49,8 @@ static int events[] = { EV_KEY, BTN_MIDDLE, EV_REL, REL_X, EV_REL, REL_Y, + INPUT_PROP_MAX, INPUT_PROP_POINTER, + INPUT_PROP_MAX, INPUT_PROP_POINTING_STICK, -1, -1, }; diff --git a/test/pointer.c b/test/pointer.c index 82c52459..f704372e 100644 --- a/test/pointer.c +++ b/test/pointer.c @@ -132,7 +132,9 @@ START_TEST(pointer_button) test_button_event(dev, BTN_RIGHT, 0); } - if (libevdev_has_event_code(dev->evdev, EV_KEY, BTN_MIDDLE)) { + /* Skip middle button test on trackpoints (used for scrolling) */ + if (!libevdev_has_property(dev->evdev, INPUT_PROP_POINTING_STICK) && + libevdev_has_event_code(dev->evdev, EV_KEY, BTN_MIDDLE)) { test_button_event(dev, BTN_MIDDLE, 1); test_button_event(dev, BTN_MIDDLE, 0); } |