[PATCH xserver] xwayland: Update axis notifications to follow protocol

Scott Moreau oreaus at gmail.com
Sat Feb 23 10:23:03 PST 2013


---
 hw/xfree86/xwayland/xwayland-input.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/hw/xfree86/xwayland/xwayland-input.c b/hw/xfree86/xwayland/xwayland-input.c
index 39a487d..84afccc 100644
--- a/hw/xfree86/xwayland/xwayland-input.c
+++ b/hw/xfree86/xwayland/xwayland-input.c
@@ -380,10 +380,13 @@ pointer_handle_axis(void *data, struct wl_pointer *pointer,
     int index;
     int val = wl_fixed_to_int(value);
 
+    if (axis != WL_POINTER_AXIS_VERTICAL_SCROLL)
+	return;
+
     /* FIXME: Need to do proper smooth scrolling here! */
-    if (val == 1)
+    if (val <= -1)
         index = 4;
-    else if (val == -1)
+    else if (val >= 1)
         index = 5;
     else
         return;
-- 
1.7.10.4



More information about the wayland-devel mailing list