[gtk+/wip/garnacho/touchpad-gestures: 89/105] gtkmain: Handle rewriting of event fields during grabs for touchpad events
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/garnacho/touchpad-gestures: 89/105] gtkmain: Handle rewriting of event fields during grabs for touchpad events
- Date: Mon, 3 Aug 2015 17:03:28 +0000 (UTC)
commit d413a1a2422c3f5eaef326e8a97181426b38da73
Author: Carlos Garnacho <carlosg gnome org>
Date: Thu Jul 9 18:47:02 2015 +0200
gtkmain: Handle rewriting of event fields during grabs for touchpad events
The window/coordinates will need translation in the case of touchpad gesture
events, same than with other pointer events.
gtk/gtkmain.c | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
---
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 6e5188b..4edce6a 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -1400,6 +1400,18 @@ rewrite_event_for_window (GdkEvent *event,
new_window,
&event->touch.x, &event->touch.y);
break;
+ case GDK_TOUCHPAD_SWIPE:
+ rewrite_events_translate (event->any.window,
+ new_window,
+ &event->touchpad_swipe.x,
+ &event->touchpad_swipe.y);
+ break;
+ case GDK_TOUCHPAD_PINCH:
+ rewrite_events_translate (event->any.window,
+ new_window,
+ &event->touchpad_pinch.x,
+ &event->touchpad_pinch.y);
+ break;
case GDK_KEY_PRESS:
case GDK_KEY_RELEASE:
case GDK_PROXIMITY_IN:
@@ -1449,6 +1461,8 @@ rewrite_event_for_grabs (GdkEvent *event)
case GDK_TOUCH_UPDATE:
case GDK_TOUCH_END:
case GDK_TOUCH_CANCEL:
+ case GDK_TOUCHPAD_SWIPE:
+ case GDK_TOUCHPAD_PINCH:
display = gdk_window_get_display (event->any.window);
device = gdk_event_get_device (event);
@@ -1803,6 +1817,8 @@ gtk_main_do_event (GdkEvent *event)
case GDK_TOUCH_UPDATE:
case GDK_TOUCH_END:
case GDK_TOUCH_CANCEL:
+ case GDK_TOUCHPAD_SWIPE:
+ case GDK_TOUCHPAD_PINCH:
if (!_gtk_propagate_captured_event (grab_widget, event, topmost_widget))
gtk_propagate_event (grab_widget, event);
break;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]