Merge lp:~oif-team/geis/v2.0.1 into lp:geis

[Stephen M. Webb]

Fixes two shipstoppers.

(1) Re-added GEIS v1 symbols that were accidentally left out in the rewrite on top of GEIS v2. Ubuntu packaging fails without these.

(2) Fixed a segfault when running libgrip test app 'grip-test'.

[lp:~oif-team/geis/v2.0.1]

111. By Stephen M. Webb on 2011-02-22

Used standardized LGPL-v3 license text.

112. By Stephen M. Webb on 2011-02-22

Released version 2.0.1.

[Chase Douglas (chasedouglas)]

Looks ok to me.

review: Approve

[Mohamed IKBEL Boulabiar (boulabiar)]

Looks fine.

review: Approve

=== modified file 'COPYING'
--- COPYING	2010-08-16 21:16:38 +0000
+++ COPYING	2011-02-22 03:31:37 +0000
@@ -1,5 +1,3 @@
-Copyright (C) 2010 Canonical, Ltd. All rights reserved.
-
 		   GNU LESSER GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 

=== modified file 'ChangeLog'
--- ChangeLog	2011-02-21 16:08:50 +0000
+++ ChangeLog	2011-02-22 03:31:37 +0000
@@ -1,5 +1,27 @@
 2011-02-22  Stephen M. Webb  <[e-mail]>
 
+  Released version 2.0.1.
+
+  * configure.ac (AC_INIT): bumped package version to 2.0.1
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+  Used standardized LGPL-v3 license text.
+
+  * COPYING: refreshed with standardized text.
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+  Restored missing GEIS v1 symbols and fixed a segfault in libgrip.
+
+  * libutouch-geis/geis_v1.c (struct _GeisInstance): added window_filter field
+    (geis_init): initialized window_filter field
+    (_subscribe_device): used window_filter field from instance
+    (geis_configuration_set_value): added missing GEIS v1 function
+    (geis_unsubscribe): added missing GEIS v1 function
+
[phone]  Stephen M. Webb  <[e-mail]>
+
   Release version 2.0.0
 
   * configure.ac (AC_INIT): bumped package version to 2.0.0

=== modified file 'configure.ac'
--- configure.ac	2011-02-21 16:08:50 +0000
+++ configure.ac	2011-02-22 03:31:37 +0000
@@ -20,7 +20,7 @@
 #
 
 AC_PREREQ(2.65)
-AC_INIT([utouch-geis],[2.0.0],
+AC_INIT([utouch-geis],[2.0.1],
 	[[e-mail]],,
 	[https://launchpad.net/utouch-geis])
 AC_CONFIG_HEADERS([geis_config.h])

=== modified file 'libutouch-geis/geis_v1.c'
--- libutouch-geis/geis_v1.c	2011-02-21 14:23:43 +0000
+++ libutouch-geis/geis_v1.c	2011-02-22 03:31:37 +0000
@@ -36,6 +36,7 @@
 struct _GeisInstance
 {
   GeisSubscription  subscription;
+  GeisFilter        window_filter;
   GeisGestureFuncs *gesture_funcs;
   GeisPointer       gesture_cookie;
 };
@@ -375,10 +376,10 @@
   GeisStatus status = GEIS_STATUS_UNKNOWN_ERROR;
   GeisXcbWinInfo *xcb_win_info = (GeisXcbWinInfo*)win_info->win_info;
   GeisInteger window = (GeisInteger)(xcb_win_info->window_id);
-  GeisFilter filter;
+  GeisInstance instance;
 
-  *geis_instance = calloc(1, sizeof(struct _GeisInstance));
-  if (!*geis_instance)
+  instance = calloc(1, sizeof(struct _GeisInstance));
+  if (!instance)
   {
     geis_error("error allocating GEIS API instance.");
     goto final_exit;
@@ -394,27 +395,30 @@
     {
       goto unwind_instance;
     }
-    geis_register_event_callback(g_geis, _v1_event_callback, *geis_instance);
+    geis_register_event_callback(g_geis, _v1_event_callback, instance);
   }
   ++g_geis_refcount;
 
-  (*geis_instance)->subscription = geis_subscription_new(g_geis,
+  instance->subscription = geis_subscription_new(g_geis,
                           _generate_subscription_name(xcb_win_info),
                           GEIS_SUBSCRIPTION_CONT);
-  filter = geis_filter_new(g_geis, WINDOW_FILTER);
-  geis_filter_add_term(filter, GEIS_FILTER_REGION,
+  instance->window_filter = geis_filter_new(g_geis, WINDOW_FILTER);
+  geis_filter_add_term(instance->window_filter,
+                       GEIS_FILTER_REGION,
                        GEIS_REGION_ATTRIBUTE_WINDOWID, GEIS_FILTER_OP_EQ, window,
                        NULL);
-  status = geis_subscription_add_filter((*geis_instance)->subscription, filter);
+  status = geis_subscription_add_filter(instance->subscription,
+                                        instance->window_filter);
 
   /* pump the geis event queue to force device and class events to be picked up */
   while (GEIS_STATUS_CONTINUE == geis_dispatch_events(g_geis))
     ;
 
+  *geis_instance = instance;
   goto final_exit;
 
 unwind_instance:
-  free(*geis_instance);
+  free(instance);
 final_exit:
   geis_debug("ends");
   return status;
@@ -480,6 +484,29 @@
 }
 
 
+/*
+ * Sets a feature configuration value.
+ */
+GeisStatus
+geis_configuration_set_value(GeisInstance geis_instance __attribute__((unused)),
+                             int          configuration_item, 
+                             void         *value)
+{
+  GeisStatus status = GEIS_STATUS_NOT_SUPPORTED;
+  if (!value)
+  {
+    return GEIS_BAD_ARGUMENT;
+  }
+
+  switch (configuration_item)
+  {
+    default:
+      break;
+  }
+  return status;
+}
+
+
 GeisStatus
 geis_event_dispatch(GeisInstance geis_instance __attribute__((unused)))
 {
@@ -500,18 +527,9 @@
   }
   else
   {
-    GeisFilter proto_filter;
     const char **g;
 
     geis_debug("subscribing device %d for the following gestures:", device_id);
-    proto_filter = geis_subscription_filter_by_name(instance->subscription,
-                                                    WINDOW_FILTER);
-    if (!proto_filter)
-    {
-      geis_error("can not find V1 window filter");
-      return result;
-    }
-
     for (g = gesture_list; *g; ++g)
     {
       GeisV1AttrMap v1attr;
@@ -528,7 +546,7 @@
       {
 	if (0 == strcmp(*g, v1attr->v1_type))
 	{
-	  GeisFilter filter = geis_filter_clone(proto_filter, *g);
+	  GeisFilter filter = geis_filter_clone(instance->window_filter, *g);
 	  if (!filter)
 	  {
 	    geis_error("error creating new filter");
@@ -551,10 +569,11 @@
     }
 
     /* remove the window-id-only filter since it allows ALL gesture classes */
-    result = geis_subscription_remove_filter(instance->subscription, proto_filter);
+    result = geis_subscription_remove_filter(instance->subscription, 
+                                             instance->window_filter);
     if (result != GEIS_STATUS_SUCCESS)
     {
-      geis_error("error removing V1 window filter");
+      geis_warning("error removing V1 window filter");
     }
   }
   return result;
@@ -594,6 +613,53 @@
 }
 
 
+/*
+ * Unsubscribes from one or more gestures.
+ *
+ * Note the evil wicked dirty case from GeisGestureType* to const char**:
+ * it turns out the API should have used const char** and apps using the API
+ * seem to cast GeisGestureType* to const char**, but they would fail to build
+ * from source if the API changed now and would crash and burn if the
+ * functionality was changed, hence the brutish method here.
+ *
+ * My advice:  move to GEIS v2.0 and avoid the whole problem.
+ */
+GeisStatus
+geis_unsubscribe(GeisInstance     instance,
+                 GeisGestureType *gesture_list)
+{
+  GeisStatus status = GEIS_STATUS_NOT_SUPPORTED;
+  if (gesture_list == GEIS_ALL_GESTURES)
+  {
+    status = geis_subscription_deactivate(instance->subscription);
+  }
+  else
+  {
+    const char **gesture_name_list = (const char **)gesture_list;
+    const char **g;
+
+    status = geis_subscription_deactivate(instance->subscription);
+    for (g = gesture_name_list; *g; ++g)
+    {
+      GeisFilter filter;
+
+      filter = geis_subscription_filter_by_name(instance->subscription, *g);
+      if (filter)
+      {
+	geis_subscription_remove_filter(instance->subscription, filter);
+      }
+    }
+
+    if (geis_subscription_filter_count(instance->subscription))
+    {
+      status = geis_subscription_activate(instance->subscription);
+    }
+  }
+
+  return status;
+}
+
+
 GeisStatus
 geis_input_devices(GeisInstance    geis_instance __attribute__((unused)),
                    GeisInputFuncs *func,