fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2026-02-18 17:30:37 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

touchpad: hook up natural scrolling configuration

Browse source 
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
Peter Hutterer 2014-09-18 15:51:53 +10:00
parent c481b47f17
commit 9e29cda72b
2 changed files with 69 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -492,6 +492,12 @@ tp_post_twofinger_scroll(struct tp_dispatch *tp, uint64_t time)
dy /= nchanged;
tp_filter_motion(tp, &dx, &dy, time);
if (tp->scroll.natural_scrolling_enabled) {
dx = -dx;
dy = -dy;
}
evdev_post_scroll(tp->device, time, dx, dy);
}
@ -848,6 +854,61 @@ tp_init_accel(struct tp_dispatch *tp, double diagonal)
return 0;
}
static int
tp_scroll_config_natural_has(struct libinput_device *device)
{
return 1;
}
static enum libinput_config_status
tp_scroll_config_natural_set(struct libinput_device *device,
int enabled)
{
struct evdev_dispatch *dispatch;
struct tp_dispatch *tp = NULL;
dispatch = ((struct evdev_device *) device)->dispatch;
tp = container_of(dispatch, tp, base);
tp->scroll.natural_scrolling_enabled = enabled ? true : false;
return LIBINPUT_CONFIG_STATUS_SUCCESS;
}
static int
tp_scroll_config_natural_get(struct libinput_device *device)
{
struct evdev_dispatch *dispatch;
struct tp_dispatch *tp = NULL;
dispatch = ((struct evdev_device *) device)->dispatch;
tp = container_of(dispatch, tp, base);
return tp->scroll.natural_scrolling_enabled ? 1 : 0;
}
static int
tp_scroll_config_natural_get_default(struct libinput_device *device)
{
/* could enable this on Apple touchpads. could do that, could
* very well do that... */
return 0;
}
static int
tp_init_scroll(struct tp_dispatch *tp)
{
tp->scroll.config.has = tp_scroll_config_natural_has;
tp->scroll.config.set_enabled = tp_scroll_config_natural_set;
tp->scroll.config.get_enabled = tp_scroll_config_natural_get;
tp->scroll.config.get_default_enabled = tp_scroll_config_natural_get_default;
tp->scroll.natural_scrolling_enabled = false;
tp->device->base.config.natural_scroll = &tp->scroll.config;
return 0;
}
static int
tp_init_palmdetect(struct tp_dispatch *tp,
struct evdev_device *device)
@ -903,6 +964,9 @@ tp_init(struct tp_dispatch *tp,
tp->hysteresis.margin_y =
diagonal / DEFAULT_HYSTERESIS_MARGIN_DENOMINATOR;
if (tp_init_scroll(tp) != 0)
return -1;
if (tp_init_accel(tp, diagonal) != 0)
return -1;

5
src/evdev-mt-touchpad.h
View file

@ -201,6 +201,11 @@ struct tp_dispatch {
struct evdev_device *trackpoint;
} buttons; /* physical buttons */
struct {
struct libinput_device_config_natural_scroll config;
bool natural_scrolling_enabled;
} scroll;
enum touchpad_event queued;
struct {