[gtk+/wip/wayland-tablet: 1848/1865] x11: Set GdkDeviceTool on motion/button events



commit 03a0b7b002e9145c29f21ee6b62c17d958a1ec46
Author: Carlos Garnacho <carlosg gnome org>
Date:   Tue Jan 6 14:57:21 2015 +0100

    x11: Set GdkDeviceTool on motion/button events
    
    The last known tool from the device is used here. If no tool is known,
    the event will just have a NULL pointer there.

 gdk/x11/gdkdevicemanager-xi2.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/gdk/x11/gdkdevicemanager-xi2.c b/gdk/x11/gdkdevicemanager-xi2.c
index 86f0339..41377d0 100644
--- a/gdk/x11/gdkdevicemanager-xi2.c
+++ b/gdk/x11/gdkdevicemanager-xi2.c
@@ -1572,6 +1572,7 @@ gdk_x11_device_manager_xi2_translate_event (GdkEventTranslator *translator,
                                                  GUINT_TO_POINTER (xev->sourceid));
             gdk_event_set_source_device (event, source_device);
             gdk_event_set_seat (event, gdk_device_get_seat (device));
+            gdk_event_set_device_tool (event, source_device->last_tool);
 
             event->button.axes = translate_axes (event->button.device,
                                                  event->button.x,
@@ -1680,6 +1681,7 @@ gdk_x11_device_manager_xi2_translate_event (GdkEventTranslator *translator,
         event->motion.device = device;
         gdk_event_set_source_device (event, source_device);
         gdk_event_set_seat (event, gdk_device_get_seat (device));
+        gdk_event_set_device_tool (event, source_device->last_tool);
 
         event->motion.state = _gdk_x11_device_xi2_translate_state (&xev->mods, &xev->buttons, &xev->group);
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]