fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2026-02-03 19:20:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

evdev: Enable natural scrolling by default on Apple

Browse source 
As suggested by the comment itself. I think most users expect this.

Signed-off-by: Hector Martin <marcan@marcan.st>
This commit is contained in:
Hector Martin 2022-12-10 19:40:07 +09:00
parent 7ae3713a77
commit d61d385951
4 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/evdev-mt-touchpad.c
View file

@ -3137,12 +3137,24 @@ tp_scroll_config_scroll_method_get_default_method(struct libinput_device *device
return tp_scroll_get_default_method(tp);
}
static int
tp_scroll_config_natural_get_default(struct libinput_device *device)
{
struct evdev_device *dev = evdev_device(device);
return (evdev_device_has_model_quirk(dev, QUIRK_MODEL_APPLE_TOUCHPAD) ||
evdev_device_has_model_quirk(dev, QUIRK_MODEL_APPLE_TOUCHPAD_ONEBUTTON));
}
static void
tp_init_scroll(struct tp_dispatch *tp, struct evdev_device *device)
{
tp_edge_scroll_init(tp, device);
evdev_init_natural_scroll(device);
/* Override natural scroll config for Apple touchpads */
device->scroll.config_natural.get_default_enabled = tp_scroll_config_natural_get_default;
device->scroll.natural_scrolling_enabled = tp_scroll_config_natural_get_default(&device->base);
tp->scroll.config_method.get_methods = tp_scroll_config_scroll_method_get_methods;
tp->scroll.config_method.set_method = tp_scroll_config_scroll_method_set_method;

3
src/evdev.c
View file

@ -957,8 +957,7 @@ evdev_scroll_config_natural_get(struct libinput_device *device)
static int
evdev_scroll_config_natural_get_default(struct libinput_device *device)
{
/* could enable this on Apple touchpads. could do that, could
* very well do that... */
/* Overridden in evdev-mt-touchpad.c for Apple touchpads. */
return 0;
}

4
test/litest.h
View file

@ -1064,6 +1064,8 @@ litest_enable_2fg_scroll(struct litest_device *dev)
expected = LIBINPUT_CONFIG_STATUS_SUCCESS;
litest_assert_int_eq(status, expected);
libinput_device_config_scroll_set_natural_scroll_enabled(device, 0);
}
static inline void
@ -1077,6 +1079,8 @@ litest_enable_edge_scroll(struct litest_device *dev)
expected = LIBINPUT_CONFIG_STATUS_SUCCESS;
litest_assert_int_eq(status, expected);
libinput_device_config_scroll_set_natural_scroll_enabled(device, 0);
}
static inline bool

6
test/test-touchpad.c
View file

@ -611,9 +611,11 @@ START_TEST(touchpad_scroll_natural_defaults)
{
struct litest_device *dev = litest_current_device();
int enabled = libevdev_get_id_vendor(dev->evdev) == VENDOR_ID_APPLE;
ck_assert_int_ge(libinput_device_config_scroll_has_natural_scroll(dev->libinput_device), 1);
ck_assert_int_eq(libinput_device_config_scroll_get_natural_scroll_enabled(dev->libinput_device), 0);
ck_assert_int_eq(libinput_device_config_scroll_get_default_natural_scroll_enabled(dev->libinput_device), 0);
ck_assert_int_eq(libinput_device_config_scroll_get_natural_scroll_enabled(dev->libinput_device), enabled);
ck_assert_int_eq(libinput_device_config_scroll_get_default_natural_scroll_enabled(dev->libinput_device), enabled);
}
END_TEST