Merge lp:~bregma/geis/lp-740311 into lp:geis

[Stephen M. Webb]

Removes the requirement of choosing a default in client code.

This change can not rationally be tested using automated unit testing. The program examples/geis2.c was modified to remove the back end init argument to geis_init() and run manually. The program correctly used the XCB back end, confirming the effect of the change.

[Henrik Rydberg (rydberg)]

Does geis_new() require a NULL argument now?

review: Needs Information

[Stephen M. Webb (bregma)]

> Does geis_new() require a NULL argument now?

The function geis_new() still requires a NULL argument to terminate the list of initializers, even if that list is empty. Only the requirement to specify the back end to use has been removed from the code, bringing the code into line with the C bindings specification.

[Henrik Rydberg (rydberg)]

Thank you - I was reading the function declaration of an old version.

review: Approve

[Chase Douglas (chasedouglas)]

Looks good to me.

review: Approve

=== modified file 'ChangeLog'
--- ChangeLog	2011-03-22 16:35:35 +0000
+++ ChangeLog	2011-03-23 02:02:26 +0000
@@ -1,5 +1,13 @@
 2011-03-22  Stephen M. Webb  <[e-mail]>
 
+  Added a default back end (LP: #740311).
+
+  * examples/geis2.c (dump_gesture_event): dumped more info
+    (main): removed GEIS_INIT_UTOUCH_XCB from geis_new call
+  * libutouch-geis/geis.c (geis_new): added GEIS_INIT_UTOUCH_XCB as default
+
[phone]  Stephen M. Webb  <[e-mail]>
+
   Passed the correct gesture_id to GEIS v1 callbacks (LP: #740284).
 
   * libutouch-geis/backend/xcb/geis_xcb_backend.c (_dispatch_gesture):

=== modified file 'examples/geis2.c'
--- examples/geis2.c	2011-03-17 04:06:04 +0000
+++ examples/geis2.c	2011-03-23 02:02:26 +0000
@@ -87,6 +87,7 @@
   {
     GeisSize j;
     GeisGroup group = geis_groupset_group(groupset, i);
+    printf("+group %u\n", geis_group_id(group));
 
     for (j=0; j < geis_group_frame_count(group); ++j)
     {
@@ -94,6 +95,7 @@
       GeisFrame frame = geis_group_frame(group, j);
       GeisSize attr_count = geis_frame_attr_count(frame);
 
+      printf("+frame %u\n", geis_frame_id(frame));
       for (k = 0; k < attr_count; ++k)
       {
 	print_attr(geis_frame_attr(frame, k));
@@ -124,8 +126,7 @@
   GeisFilter filter;
   int        fd;
 
-  geis = geis_new(GEIS_INIT_UTOUCH_XCB,
-                  GEIS_INIT_TRACK_DEVICES,
+  geis = geis_new(GEIS_INIT_TRACK_DEVICES,
                   NULL);
   subscription = geis_subscription_new(geis, "example", GEIS_SUBSCRIPTION_CONT);
   filter = geis_filter_new(geis, "filter");

=== modified file 'libutouch-geis/geis.c'
--- libutouch-geis/geis.c	2011-03-11 18:53:40 +0000
+++ libutouch-geis/geis.c	2011-03-23 02:02:26 +0000
@@ -374,10 +374,16 @@
   }
   else
   {
+    geis_warning("back end not specified, defaulting to XCB");
+    geis->backend = geis_xcb_backend_new(geis, track_devices, track_classes);
+  }
+  if (!geis->backend)
+  {
     geis_error_push(NULL, GEIS_STATUS_UNKNOWN_ERROR);
-    geis_error("back end required but not specified");
+    geis_error("can not create back end");
     status = GEIS_FALSE;
   }
+
   return status;
 }