winex11: Use XIAllDevices to select for XI_RawMotion.

Instead of selecting for XI2 events for every slave device individually, do it for XIAllDevices, and store the current device's relative X/Y valuators so they can be quickly looked up in the XI_RawMotion events received. Signed-off-by: Carlos Garnacho <carlosg@gnome.org> Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

winex11: Use XIAllDevices to select for XI_RawMotion.
448433ae · Carlos Garnacho · Alexandre Julliard · 7073e27f · 448433ae · 448433ae
Commit 448433ae authored Feb 08, 2017 by Carlos Garnacho Committed by Alexandre Julliard Feb 09, 2017
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 137 additions and 58 deletions

mouse.c dlls/winex11.drv/mouse.c +127 -58

x11drv.h dlls/winex11.drv/x11drv.h +10 -0

No files found.
--- a/dlls/winex11.drv/mouse.c
+++ b/dlls/winex11.drv/mouse.c
--- a/dlls/winex11.drv/x11drv.h
+++ b/dlls/winex11.drv/x11drv.h
@@ -309,6 +309,13 @@ struct x11drv_escape_flush_gl_drawable
 * X11 USER driver
 */

+struct x11drv_valuator_data
+{
+    double min;
+    double max;
+    int number;
+};
+
 struct x11drv_thread_data
 {
    Display *display;
@@ -327,7 +334,10 @@ struct x11drv_thread_data
    enum { xi_unavailable = -1, xi_unknown, xi_disabled, xi_enabled } xi2_state; /* XInput2 state */
    void    *xi2_devices;          /* list of XInput2 devices (valid when state is enabled) */
    int      xi2_device_count;
+    struct x11drv_valuator_data x_rel_valuator;
+    struct x11drv_valuator_data y_rel_valuator;
    int      xi2_core_pointer;     /* XInput2 core pointer id */
+    int      xi2_current_slave;    /* Current slave driving the Core pointer */
 };

 extern struct x11drv_thread_data *x11drv_init_thread_data(void) DECLSPEC_HIDDEN;