[PATCH] [weston, v2] weston.ini: Add natural scroll support to weston.ini

[Jiayi Zhao]

This adds support for enabling/disabling natural scrolling
via a boolean in weston.ini:

[libinput]
enable_natural_scroll=true

CHANGES:
 - natural_scroll option has been changed to enable_natural_scroll
 - libinput_device_config_scroll_has_natural_scroll() is not longer compared to != 0

Signed-off-by: Jiayi Zhao <jeff.no.zhao at gmail.com>
---
 compositor/main.c | 13 +++++++++++++
 weston.ini.in     |  1 +
 2 files changed, 14 insertions(+)

diff --git a/compositor/main.c b/compositor/main.c
index 080aa61..a077a98 100644
--- a/compositor/main.c
+++ b/compositor/main.c
@@ -1095,6 +1095,8 @@ configure_input_device(struct weston_compositor *compositor,
 	struct weston_config *config = wet_get_config(compositor);
 	int enable_tap;
 	int enable_tap_default;
+	int natural_scroll;
+	int natural_scroll_default;
 
 	s = weston_config_get_section(config,
 				      "libinput", NULL, NULL);
@@ -1109,6 +1111,17 @@ configure_input_device(struct weston_compositor *compositor,
 		libinput_device_config_tap_set_enabled(device,
 						       enable_tap);
 	}
+
+	if (libinput_device_config_scroll_has_natural_scroll(device)) {
+		natural_scroll_default =
+			libinput_device_config_scroll_get_default_natural_scroll_enabled(
+				device);
+		weston_config_section_get_bool(s, "enable_natural_scroll",
+					       &natural_scroll,
+					       natural_scroll_default);
+		libinput_device_config_scroll_set_natural_scroll_enabled(device,
+						       natural_scroll);
+	}
 }
 
 static void
diff --git a/weston.ini.in b/weston.ini.in
index d837fb5..c590eb9 100644
--- a/weston.ini.in
+++ b/weston.ini.in
@@ -60,6 +60,7 @@ path=@libexecdir@/weston-keyboard
 
 #[libinput]
 #enable_tap=true
+#enable_natural_scroll=false
 
 #[touchpad]
 #constant_accel_factor = 50
-- 
2.7.3