Re: [PATCH xf86-input-libinput] Fix default scroll button number

2016-12-05 Thread Hans de Goede 

Hi,

On 05-12-16 05:35, Peter Hutterer wrote:

Was exposing the evdev code rather than the xorg code.

Signed-off-by: Peter Hutterer 



Patch LGTM:

Reviewed-by: Hans de Goede 

Regards,

Hans





---
 src/xf86libinput.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/xf86libinput.c b/src/xf86libinput.c
index 747e84b..b130a77 100644
--- a/src/xf86libinput.c
+++ b/src/xf86libinput.c
@@ -4386,6 +4386,7 @@ LibinputInitScrollMethodsProperty(DeviceIntPtr dev,
return;

scroll_button = 
libinput_device_config_scroll_get_default_button(device);
+   scroll_button = btn_linux2xorg(scroll_button);
prop_scroll_button_default = LibinputMakeProperty(dev,
  
LIBINPUT_PROP_SCROLL_BUTTON_DEFAULT,
  XA_CARDINAL, 
32,


___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

[PATCH xf86-input-libinput] Fix default scroll button number

2016-12-04 Thread Peter Hutterer 
Was exposing the evdev code rather than the xorg code.

Signed-off-by: Peter Hutterer 
---
 src/xf86libinput.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/xf86libinput.c b/src/xf86libinput.c
index 747e84b..b130a77 100644
--- a/src/xf86libinput.c
+++ b/src/xf86libinput.c
@@ -4386,6 +4386,7 @@ LibinputInitScrollMethodsProperty(DeviceIntPtr dev,
return;
 
scroll_button = 
libinput_device_config_scroll_get_default_button(device);
+   scroll_button = btn_linux2xorg(scroll_button);
prop_scroll_button_default = LibinputMakeProperty(dev,
  
LIBINPUT_PROP_SCROLL_BUTTON_DEFAULT,
  XA_CARDINAL, 
32,
-- 
2.9.3

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel