From 576720fd9767e579d79e7dbf933ef819de8e1a5e Mon Sep 17 00:00:00 2001 From: Matt Brubeck Date: Mon, 24 Aug 2015 15:42:10 -0700 Subject: Read scroll axis info from all devices When multiple scrolling devices are attached, XIAllMasterDevices does not include the scroll axes for all hardware devices. --- src/api/x11/input.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/api/x11/input.rs b/src/api/x11/input.rs index 75939e9..388b651 100644 --- a/src/api/x11/input.rs +++ b/src/api/x11/input.rs @@ -268,10 +268,9 @@ fn read_input_axis_info(display: &Arc) -> Vec { let mut axis_list = Vec::new(); let mut device_count = 0; - // only get events from the master devices which are 'attached' - // to the keyboard or cursor + // Check all input devices for scroll axes. let devices = unsafe{ - (display.xinput2.XIQueryDevice)(display.display, ffi::XIAllMasterDevices, &mut device_count) + (display.xinput2.XIQueryDevice)(display.display, ffi::XIAllDevices, &mut device_count) }; for i in 0..device_count { let device = unsafe { *(devices.offset(i as isize)) }; -- cgit v1.2.3