Merge lp:~bregma/libgrip/lp-1479353 into lp:libgrip

[Stephen M. Webb]

matched delivered gesture events up to a widget's top level window, then dispatched down to the appropriate widget

Match delivered gesture events up to a widget's top level window, then dispatch down to the appropriate widget.

This fixes the problem in which gesture events were missed because gesture subscriptions were against the top level window but checked against the widget window.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:102
http://jenkins.qa.ubuntu.com/job/libgrip-ci/22/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libgrip-wily-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libgrip-wily-armhf-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libgrip-wily-i386-ci/1

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/libgrip-ci/22/rebuild

review: Approve (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

=== modified file 'src/gripgesturemanager.c'
--- src/gripgesturemanager.c	2014-02-25 16:37:30 +0000
+++ src/gripgesturemanager.c	2015-07-29 16:03:15 +0000
@@ -535,8 +535,77 @@
 }
 
 
-static void
-process_gesture_events(GripGestureManager *manager, GeisEvent geis_event)
+/**
+ * Gets the extents of a widget in root window coordinates.
+ */
+static void
+get_absolute_widget_extents (GtkWidget *widget, gint *left, gint *right, gint *top, gint *bottom)
+{
+  GdkWindow* widget_window = gtk_widget_get_window (widget);
+
+  gdk_window_get_origin (widget_window, left, top);
+
+  gint window_width = gdk_window_get_width (widget_window);
+  gint window_height = gdk_window_get_height (widget_window);
+  gdk_window_get_root_coords (widget_window, window_width, window_height, right, bottom);
+}
+
+
+/**
+ * Gets the focus of a gesture frame in root window coordinates.
+ */
+static void
+get_absolute_frame_focus (GeisFrame frame, gint *x, gint *y)
+{
+  *x = 0;
+  *y = 0;
+
+  GeisAttr focus_x_attr = geis_frame_attr_by_name (frame, GEIS_GESTURE_ATTRIBUTE_FOCUS_X);
+  if (focus_x_attr)
+    {
+      *x = (int)geis_attr_value_to_float(focus_x_attr);
+    }
+
+  GeisAttr focus_y_attr = geis_frame_attr_by_name (frame, GEIS_GESTURE_ATTRIBUTE_FOCUS_Y);
+  if (focus_y_attr)
+    {
+      *y = (int)geis_attr_value_to_float(focus_y_attr);
+    }
+}
+
+
+/**
+ * Indicates if the focus of a gesture frame is inside a widget.
+ */
+static gboolean
+is_frame_focus_in_widget (GeisFrame frame, GtkWidget *widget)
+{
+  gboolean frame_focus_is_in_widget = FALSE;
+
+  GtkWidget *toplevel_widget = gtk_widget_get_toplevel (widget);
+  guint toplevel_widget_window_id = GDK_WINDOW_XID (gtk_widget_get_window (toplevel_widget));
+
+  GeisAttr window_attr = geis_frame_attr_by_name(frame, GEIS_GESTURE_ATTRIBUTE_EVENT_WINDOW_ID);
+  guint window_id = geis_attr_value_to_integer(window_attr);
+
+  if (window_id == toplevel_widget_window_id)
+    {
+      gint widget_left, widget_top, widget_right, widget_bottom;
+      get_absolute_widget_extents (widget, &widget_left, &widget_right, &widget_top, &widget_bottom);
+
+      gint focus_x, focus_y;
+      get_absolute_frame_focus (frame, &focus_x, &focus_y);
+
+      frame_focus_is_in_widget = (focus_x >= widget_left && focus_x <= widget_right
+                               && focus_y >= widget_top  && focus_y <= widget_bottom);
+    }
+
+  return frame_focus_is_in_widget;
+}
+
+
+static void
+process_gesture_events (GripGestureManager *manager, GeisEvent geis_event)
 {
   GripGestureManagerPrivate *priv = manager->priv;
 
@@ -564,9 +633,6 @@
           GeisFrame frame = geis_group_frame(group, j);
           g_return_if_fail (frame);
 
-          GeisAttr window_attr = geis_frame_attr_by_name(frame, GEIS_GESTURE_ATTRIBUTE_EVENT_WINDOW_ID);
-          guint window_id = geis_attr_value_to_integer(window_attr);
-
           GeisAttr device_attr = geis_frame_attr_by_name(frame, GEIS_GESTURE_ATTRIBUTE_DEVICE_ID);
           guint device_id = geis_attr_value_to_integer(device_attr);
           GripInputDevice *input_device = device_id_to_input_device (manager, device_id);
@@ -575,8 +641,7 @@
           for (l = priv->bindings; l != NULL; l = l->next)
             {
               GripGestureBinding *binding = (GripGestureBinding *)l->data;
-              guint widget_window_id = GDK_WINDOW_XID (gtk_widget_get_window (binding->widget));
-              if (widget_window_id == window_id)
+              if (is_frame_focus_in_widget(frame, binding->widget))
                 {
                   GList *class_list;
                   for (class_list = priv->classes; class_list != NULL; class_list = class_list->next)