touchpad: s/config/config_natural/

To avoid confusion with scroll mode configuration.

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>
This commit is contained in:
Hans de Goede 2014-11-04 09:54:07 +01:00 committed by Peter Hutterer
parent ebe34d1c18
commit 35143dbbd1
2 changed files with 6 additions and 6 deletions

View file

@ -949,12 +949,12 @@ 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.config_natural.has = tp_scroll_config_natural_has;
tp->scroll.config_natural.set_enabled = tp_scroll_config_natural_set;
tp->scroll.config_natural.get_enabled = tp_scroll_config_natural_get;
tp->scroll.config_natural.get_default_enabled = tp_scroll_config_natural_get_default;
tp->scroll.natural_scrolling_enabled = false;
tp->device->base.config.natural_scroll = &tp->scroll.config;
tp->device->base.config.natural_scroll = &tp->scroll.config_natural;
/* In mm for touchpads with valid resolution, see tp_init_accel() */
tp->device->scroll.threshold = 5.0;

View file

@ -202,7 +202,7 @@ struct tp_dispatch {
} buttons; /* physical buttons */
struct {
struct libinput_device_config_natural_scroll config;
struct libinput_device_config_natural_scroll config_natural;
bool natural_scrolling_enabled;
} scroll;