Merge lp:~jpakkane/libgrip/type_separation into lp:libgrip

[Jussi Pakkanen]

This branch finalises the work for subscribing to events based on device type.

[lp:~jpakkane/libgrip/type_separation]

58. By Jussi Pakkanen on 2011-07-07

Update Geis dependency info.

59. By Jussi Pakkanen on 2011-07-08

Drop libgrip element from pkg-config file.

[Chase Douglas (chasedouglas)]

At a high level everything looks good! I tested it out with a few tweaks to eog to test, and the results were good.

Lets merge this in and release!

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2011-06-14 17:20:34 +0000
+++ configure.ac	2011-07-08 08:28:31 +0000
@@ -75,7 +75,7 @@
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
 
-PKG_CHECK_MODULES(GEIS, libutouch-geis >= 0.3)
+PKG_CHECK_MODULES(GEIS, libutouch-geis >= 2.1.1)
 AC_SUBST(GEIS_CFLAGS)
 AC_SUBST(GEIS_LIBS)
 

=== modified file 'examples/rectangle-mover/gesture.c'
--- examples/rectangle-mover/gesture.c	2011-06-20 07:31:18 +0000
+++ examples/rectangle-mover/gesture.c	2011-07-08 08:28:31 +0000
@@ -109,6 +109,9 @@
   return (GtkTreeModel *)gtk_list_store_new (1, G_TYPE_STRING);
 }
 
+/* Change this to suit your needs. */
+#define DEVICE_TYPE GRIP_DEVICE_ALL
+
 static void
 subscribe_gestures(GripGestureManager *manager, GtkWidget *window,
     GtkWidget *da)
@@ -116,7 +119,7 @@
   grip_gesture_manager_register_window (manager,
                                         da,
                                         GRIP_GESTURE_PINCH,
-                                        GRIP_DEVICE_ALL,
+                                        DEVICE_TYPE,
                                         2,
                                         gesture_callback,
                                         NULL, NULL);
@@ -124,7 +127,7 @@
   grip_gesture_manager_register_window (manager,
                                         da,
                                         GRIP_GESTURE_ROTATE,
-                                        GRIP_DEVICE_ALL,
+                                        DEVICE_TYPE,
                                         2,
                                         gesture_callback,
                                         NULL, NULL);
@@ -132,7 +135,7 @@
   grip_gesture_manager_register_window (manager,
                                         da,
                                         GRIP_GESTURE_DRAG,
-                                        GRIP_DEVICE_ALL,
+                                        DEVICE_TYPE,
                                         2,
                                         gesture_callback,
                                         NULL, NULL);
@@ -140,7 +143,7 @@
   grip_gesture_manager_register_window (manager,
                                         da,
                                         GRIP_GESTURE_TAP,
-                                        GRIP_DEVICE_ALL,
+                                        DEVICE_TYPE,
                                         2,
                                         gesture_callback,
                                         NULL, NULL);

=== modified file 'libgrip.pc.in'
--- libgrip.pc.in	2011-06-14 17:39:10 +0000
+++ libgrip.pc.in	2011-07-08 08:28:31 +0000
@@ -7,5 +7,5 @@
 Description: Multitouch gesture library
 Version: @VERSION@
 Libs: -L${libdir} -lgrip
-Cflags: -I${includedir}/libgrip
+Cflags: -I${includedir}
 Requires: gtk+-3.0

=== modified file 'src/gripgesturemanager.c'
--- src/gripgesturemanager.c	2011-06-17 11:37:17 +0000
+++ src/gripgesturemanager.c	2011-07-08 08:28:31 +0000
@@ -38,6 +38,12 @@
   GArray *independent;
 } GripDevices;
 
+struct Registrations {
+  GripGestureRegistration *touchscreen;
+  GripGestureRegistration *touchpad;
+  GripGestureRegistration *independent;
+};
+
 struct _GripGestureManagerPrivate
 {
   GHashTable *registered_windows;
@@ -146,8 +152,8 @@
 {
   GripDevices *devices = (GripDevices *) cookie;
   GeisGestureAttr *a;
-  gboolean direct;
-  gboolean independent;
+  gboolean direct = FALSE;
+  gboolean independent = FALSE;
   
   for (a = attrs; a->name; a++)
     {
@@ -225,6 +231,9 @@
 {
   GList *tmp = NULL;
 
+  if (!reg)
+    return;
+
   geis_unsubscribe (reg->instance,
       (GeisGestureType*)reg->gesture_list->pdata);
 
@@ -246,8 +255,10 @@
                    gpointer value,
                    gpointer user_data)
 {
-  GripGestureRegistration *reg = (GripGestureRegistration *)value;
-  free_registration(reg);
+  struct Registrations *regs = (struct Registrations *)value;
+  free_registration(regs->touchscreen);
+  free_registration(regs->touchpad);
+  free_registration(regs->independent);
 }
 
 static void
@@ -763,12 +774,8 @@
 }
 
 static void
-window_destroyed_cb (GtkWidget *object,
-                     gpointer   user_data)
+destroy_registration(GripGestureRegistration *reg)
 {
-  GripGestureManager *manager = (GripGestureManager *)user_data;
-  GripGestureManagerPrivate *priv = manager->priv;
-  GripGestureRegistration *reg = g_hash_table_lookup (priv->registered_windows, object);
   GList *list;
 
   for (list = reg->bindings; list != NULL; list = list->next)
@@ -786,10 +793,21 @@
     }
 
   g_list_free (reg->bindings);
-
   g_io_channel_shutdown (reg->iochannel, TRUE, NULL);
-
   geis_finish (reg->instance);
+}
+
+static void
+window_destroyed_cb (GtkWidget *object,
+                     gpointer   user_data)
+{
+  GripGestureManager *manager = (GripGestureManager *)user_data;
+  GripGestureManagerPrivate *priv = manager->priv;
+  struct Registrations *reg = g_hash_table_lookup (priv->registered_windows, object);
+
+  destroy_registration(reg->touchpad);
+  destroy_registration(reg->touchscreen);
+  destroy_registration(reg->independent);
 
   g_hash_table_remove (priv->registered_windows, object);
   g_free (reg);
@@ -847,110 +865,107 @@
     }
 }
 
+static GripGestureRegistration* new_window_registration(GripGestureManager *manager,
+    GtkWidget *toplevel)
+{
+  GripGestureRegistration *reg;
+  GeisInstance  instance;
+  GIOChannel   *iochannel;
+  gint fd = -1;
+  GeisXcbWinInfo xcb_win_info = {
+    .display_name = NULL,
+    .screenp      = NULL,
+    .window_id    = GDK_WINDOW_XID (gtk_widget_get_window(toplevel))
+  };
+  GeisWinInfo win_info = {
+    GEIS_XCB_FULL_WINDOW,
+    &xcb_win_info
+  };
+
+  if (geis_init (&win_info, &instance) != GEIS_STATUS_SUCCESS)
+    {
+      g_warning ("Failed to initialize gesture manager.");
+      return NULL;
+    }
+
+  if (geis_configuration_supported (instance,
+                                    GEIS_CONFIG_UNIX_FD) != GEIS_STATUS_SUCCESS)
+    {
+      g_warning ("Gesture manager does not support UNIX fd.");
+      return NULL;
+    }
+
+  if (geis_configuration_get_value (instance,
+                                    GEIS_CONFIG_UNIX_FD,
+                                    &fd) != GEIS_STATUS_SUCCESS)
+    {
+      g_error ("Gesture manager failed to obtain UNIX fd.");
+      return NULL;
+    }
+
+  reg = g_new0 (GripGestureRegistration, 1);
+
+  reg->window   = GTK_WINDOW (toplevel);
+  reg->instance = instance;
+
+  g_signal_connect (toplevel,
+                    "destroy",
+                    G_CALLBACK (window_destroyed_cb),
+                    manager);
+
+  iochannel = g_io_channel_unix_new (fd);
+  g_io_add_watch (iochannel,
+                  G_IO_IN,
+                  io_callback,
+                  reg);
+
+  reg->iochannel = iochannel;
+
+  reg->gesture_list = g_ptr_array_new ();
+
+  return reg;
+}
+
 static void
-register_internal (GripGestureManager *manager,
-                   GtkWidget          *widget,
-                   GripGestureType     gesture_type,
-                   GripDeviceType      device_type,
-                   gint                touch_points,
-                   GripGestureCallback callback,
-                   gpointer            user_data,
-                   GDestroyNotify      destroy)
+bind_registration(GripGestureManager *manager,
+    GripGestureRegistration *reg,
+    GtkWidget               *widget,
+    GripGestureType         gesture_type,
+    GripDeviceType          device_type,
+    gint                    touch_points,
+    GripGestureCallback     callback,
+    gpointer                user_data,
+    GDestroyNotify          destroy)
 {
   GripGestureManagerPrivate *priv;
-  GripGestureRegistration *reg;
   GripGestureBinding *binding;
-  GtkWidget *toplevel;
   GArray *devices;
 
-  g_return_if_fail (GRIP_IS_GESTURE_MANAGER (manager));
-  g_return_if_fail (GTK_IS_WIDGET (widget));
-
-  toplevel = gtk_widget_get_toplevel (widget);
-
-  g_return_if_fail (GTK_IS_WINDOW (toplevel));
-
   priv = manager->priv;
 
-  if (!(reg = g_hash_table_lookup (priv->registered_windows, toplevel)))
-    {
-      GeisInstance  instance;
-      GIOChannel   *iochannel;
-      gint fd = -1;
-      GeisXcbWinInfo xcb_win_info = {
-        .display_name = NULL,
-        .screenp      = NULL,
-        .window_id    = GDK_WINDOW_XID (gtk_widget_get_window(toplevel))
-      };
-      GeisWinInfo win_info = {
-        GEIS_XCB_FULL_WINDOW,
-        &xcb_win_info
-      };
-
-      if (geis_init (&win_info, &instance) != GEIS_STATUS_SUCCESS)
-        {
-          g_warning ("Failed to initialize gesture manager.");
-          return;
-        }
-
-      if (geis_configuration_supported (instance,
-                                        GEIS_CONFIG_UNIX_FD) != GEIS_STATUS_SUCCESS)
-        {
-          g_warning ("Gesture manager does not support UNIX fd.");
-          return;
-        }
-
-      if (geis_configuration_get_value (instance,
-                                        GEIS_CONFIG_UNIX_FD,
-                                        &fd) != GEIS_STATUS_SUCCESS)
-        {
-          g_error ("Gesture manager failed to obtain UNIX fd.");
-          return;
-        }
-
-      reg = g_new0 (GripGestureRegistration, 1);
-
-      reg->window   = GTK_WINDOW (toplevel);
-      reg->instance = instance;
-
-      g_signal_connect (toplevel,
-                        "destroy",
-                        G_CALLBACK (window_destroyed_cb),
-                        manager);
-
-      iochannel = g_io_channel_unix_new (fd);
-      g_io_add_watch (iochannel,
-                      G_IO_IN,
-                      io_callback,
-                      reg);
-
-      reg->iochannel = iochannel;
-
-      reg->gesture_list = g_ptr_array_new ();
-    }
-  else
-    {
-      geis_unsubscribe (reg->instance,
-			(GeisGestureType*)reg->gesture_list->pdata);
-    }
 
   if (reg->gesture_list->len)
     g_ptr_array_remove_index (reg->gesture_list,
-			      reg->gesture_list->len - 1);
-
-  g_ptr_array_add (reg->gesture_list,
-		   (gchar *)grip_type_to_geis_type (gesture_type, touch_points));
-  g_ptr_array_add (reg->gesture_list,
-		   NULL);
+                              reg->gesture_list->len - 1);
 
   devices = g_array_new (TRUE, FALSE, sizeof(GeisInputDeviceId));
   grip_devices_for_type(device_type, devices, &priv->devices);
+  if (devices->len == 0) {
+      g_array_free(devices, TRUE);
+      return;
+  }
+
+  g_ptr_array_add (reg->gesture_list,
+                   (gchar *)grip_type_to_geis_type (gesture_type, touch_points));
+  g_ptr_array_add (reg->gesture_list,
+                   NULL);
+
 
   geis_subscribe (reg->instance,
-		  (GeisInputDeviceId *)devices->data,
-		  (const char**)reg->gesture_list->pdata,
-		  &gesture_funcs,
-		  reg);
+                  (GeisInputDeviceId *)devices->data,
+                  (const char**)reg->gesture_list->pdata,
+                  &gesture_funcs,
+                  reg);
 
   g_array_unref (devices);
 
@@ -966,9 +981,69 @@
 
   reg->bindings = g_list_append (reg->bindings, binding);
 
+}
+
+static void
+register_internal (GripGestureManager *manager,
+                   GtkWidget          *widget,
+                   GripGestureType     gesture_type,
+                   GripDeviceType      device_type,
+                   gint                touch_points,
+                   GripGestureCallback callback,
+                   gpointer            user_data,
+                   GDestroyNotify      destroy)
+{
+  GripGestureManagerPrivate *priv;
+  GtkWidget *toplevel;
+  struct Registrations *registrations;
+
+  g_return_if_fail (GRIP_IS_GESTURE_MANAGER (manager));
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
+  toplevel = gtk_widget_get_toplevel (widget);
+
+  g_return_if_fail (GTK_IS_WINDOW (toplevel));
+
+  priv = manager->priv;
+
+  if (!(registrations = g_hash_table_lookup (priv->registered_windows, toplevel)))
+    {
+      registrations = g_new(struct Registrations, 1);
+      registrations->touchscreen = new_window_registration(manager, toplevel);
+      registrations->touchpad = new_window_registration(manager, toplevel);
+      registrations->independent = new_window_registration(manager, toplevel);
+
+      if (registrations->touchscreen == NULL ||
+          registrations->touchpad == NULL ||
+          registrations->independent == NULL)
+        return;
+    }
+  else
+    {
+      geis_unsubscribe (registrations->touchscreen->instance,
+          (GeisGestureType*)registrations->touchscreen->gesture_list->pdata);
+      geis_unsubscribe (registrations->touchpad->instance,
+          (GeisGestureType*)registrations->touchpad->gesture_list->pdata);
+      geis_unsubscribe (registrations->independent->instance,
+          (GeisGestureType*)registrations->independent->gesture_list->pdata);
+    }
+
+  if (device_type & GRIP_DEVICE_TOUCHSCREEN)
+    bind_registration(manager,
+        registrations->touchscreen, widget, gesture_type, GRIP_DEVICE_TOUCHSCREEN, touch_points,
+        callback, user_data, destroy);
+
+  if (device_type & GRIP_DEVICE_TOUCHPAD)
+    bind_registration(manager,
+        registrations->touchpad, widget, gesture_type, GRIP_DEVICE_TOUCHPAD, touch_points,
+        callback, user_data, destroy);
+  if (device_type & GRIP_DEVICE_INDEPENDENT)
+    bind_registration(manager,
+        registrations->independent, widget, gesture_type, GRIP_DEVICE_INDEPENDENT, touch_points,
+        callback, user_data, destroy);
   g_hash_table_insert (priv->registered_windows,
                        toplevel,
-                       reg);
+                       registrations);
 }
 
 static void
@@ -1185,26 +1260,36 @@
     }
 }
 
+static void
+shutdown_registration(GripGestureRegistration *reg)
+{
+  free_registration(reg);
+  geis_finish(reg->instance);
+  reg->instance = NULL;
+  g_free(reg);
+}
+
 void
 grip_gesture_manager_unregister_window (GripGestureManager  *manager,
                                         GtkWidget           *toplevel)
 {
   GripGestureManagerPrivate *priv = manager->priv;
-  GripGestureRegistration *reg;
+  struct Registrations *registrations;
 
   g_return_if_fail (GRIP_IS_GESTURE_MANAGER (manager));
   g_return_if_fail (GTK_IS_WINDOW (toplevel));
 
   /* Currently only allow unsubscribing after the window has been shown. */
   g_return_if_fail (gtk_widget_get_mapped (GTK_WIDGET (toplevel)));
-  reg = g_hash_table_lookup (priv->registered_windows, toplevel);
-  if (!reg) {
+  registrations = g_hash_table_lookup (priv->registered_windows, toplevel);
+  if (!registrations) {
       return;
   }
-  free_registration(reg);
-  geis_finish(reg->instance);
-  reg->instance = NULL;
-  g_free(reg);
+
+  shutdown_registration(registrations->touchscreen);
+  shutdown_registration(registrations->touchpad);
+  shutdown_registration(registrations->independent);
+  g_free(registrations);
   g_hash_table_remove(priv->registered_windows, toplevel);
 
 }