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

[Peter Hutterer]

sorry, I'm getting lost here, which one is the most recent patch now? there
are two labelled v2

Cheers,
   Peter

On Sat, Oct 22, 2016 at 01:31:28PM -0400, Jiayi Zhao wrote:
> This adds support for enabling/disabling natural scrolling
> via a boolean in weston.ini:
> 
> [libinput]
> natural_scroll=true
> 
> CHANGES:
>  - 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..abfb55b 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, "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..c7b8b98 100644
> --- a/weston.ini.in
> +++ b/weston.ini.in
> @@ -60,6 +60,7 @@ path=@libexecdir@/weston-keyboard
>  
>  #[libinput]
>  #enable_tap=true
> +#natural_scroll=false
>  
>  #[touchpad]
>  #constant_accel_factor = 50
> -- 
> 2.7.3
> 
> _______________________________________________
> wayland-devel mailing list
> wayland-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/wayland-devel
>