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

[Stephen M. Webb]

Implements multi-touch device enumeration in the GEIS v1 and v2 APIs through the XCB back end.

Includes an extension to the geistest tool for verification. Unit tests are not possible since this change is an integration with an external data source, although existing unit tests for the API still apply.

[lp:~bregma/geis/lp-733296]

122. By Stephen M. Webb on 2011-03-13

Initialized an uninitialized variable.

[Chase Douglas (chasedouglas)]

We will probably want a 5th device type: multi-finger devices. These devices are like partial multitouch devices, but they don't even give us a bounding box.

I think we should also make a comment in the header that partial devices may only report drag, pinch, and tap (no rotate), and that multi-finger devices may only report drag and tap (no pinch nor rotate). Both of these devices can still report the current and max number of touches (will usually be a max of 3 for these devices). The comments for these devices should also note that they are a subclass of dependent devices.

A comment should be made that if GEIS_DEVICE_ATTRIBUTE_TOUCHES == 0, then the maximum number of touches is unknown.

Other than the issues above, and any changes that need to be taken to support them, I'm happy about the additions! In the interest of time and because multi-finger/partial-mt devices won't actually be supported in Natty, it would be good enough to add them to the header files for now and leave the implemenation of the class additions to later.

review: Needs Fixing

[Henrik Rydberg (rydberg)]

Concurring with previous speaker, otherwise looks OK.

[Chase Douglas (chasedouglas)]

I should clarify one point. While multi-finger devices won't be supported in Natty, partial-mt devices should be. In fact, they already work today. We should do whatever fixups are needed for them.

[lp:~bregma/geis/lp-733296]

123. By Stephen M. Webb on 2011-03-16

Refined input device class handling.

[Stephen M. Webb (bregma)]

I believe I have addressed all the concerns with the latest commit to this merge request. Please take another look-see and check if this meets you approval(s).

[Henrik Rydberg (rydberg)]

What about tablets, in the old meaning? Those are direct in terms of representing a screen, but still dependent in that they need a pointer to operate. From the kernel, we get DIRECT, POINTER, ABS_MT and SEMI_MT, basically. From DIRECT and POINTER, we can form three types (touchscreen, touchpad, tablet), and then we have ABS_MT and SEMI_MT to give multitouch, semi-mt or just multi-finger.

review: Needs Information

[lp:~bregma/geis/lp-733296]

124. By Stephen M. Webb on 2011-03-16

Replaced device class with explicit attributes.

[Chase Douglas (chasedouglas)]

I'm ok with this proposal. It drops the semi-multitouch and multi-finger properties, but we can add them in if/when we find someone who really wants to know. Comments:

1. I'd like to see an either/or comment in the header file, like "True if device is a direct touch device (e.g. a touchscreen), false if device is an indirect touch device (e.g. a touchpad)." This makes it clearer what it means when the attribute is false.

2. All attributes should be set at all times. The independent pointer attribute isn't set when it's false.

Thanks for proposing the change!

review: Needs Fixing

[lp:~bregma/geis/lp-733296]

125. By Stephen M. Webb on 2011-03-16

Set new device attrs to false always when they're not true.

[Chase Douglas (chasedouglas)]

Stephen said on irc that he'll fix the header comments up in a further patchset. I'm good now :).

review: Approve

=== modified file 'ChangeLog'
--- ChangeLog	2011-03-09 19:46:45 +0000
+++ ChangeLog	2011-03-16 22:13:52 +0000
@@ -1,3 +1,88 @@
[phone]  Stephen M. Webb  <[e-mail]>
+
+  Replaced device class with explicit attributes.
+
+  * include/geis/geis.h (GEIS_DEVICE_CLASS_*) removed
+    (GEIS_DEVICE_ATTRIBUTE_DIRECT_TOUCH): added 
+    (GEIS_DEVICE_ATTRIBUTE_INDEPENDENT_TOUCH): added 
+  * libutouch-geis/backend/xcb/geis_xcb_backend.c:
+    (_map_xi2_mode_to_geis_device_attrs): replaced function
+    _map_xi2_mode_to_geis_device_class
+  * testsuite/geis2/check_device.c: added checks for new attributes
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+  Refinement of input device class handling.
+
+  * include/geis/geis.h (GEIS_DEVICE_CLASS_UNKNOWN): new device class
+    (GEIS_DEVICE_CLASS_TOUCH_MULTIFINGER): new device class
+  * libutouch-geis/backend/xcb/geis_xcb_backend.c
+    (_map_xi2_mode_to_geis_device_class): new function
+    (_report_an_xcb_device): used it
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+  Initialized an uninitialized variable.
+
+  * libutouch-geis/geis_v1.c (_v1_input_callback): initialized device_id 
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+  Added spcifying devices to geistest.
+
+  * libutouch-geis/backend/xcb/geis_xcb_backend.c: added -d swicth
+  * doc/geistest.1: documented its use
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+  Added proper device ID filtering for GEIS v1.
+
+  * libutouch-geis/geis_v1.c (_subscribe_device): Added filter for device ID.
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+  Implement device enumeration (LP: #733296)
+
+  * libutouch-geis/backend/xcb/geis_xcb_backend.c (_report_an_xcb_device): new
+    (_report_xcb_devices): imlemented
+  * libutouch-geis/geis_device.c (geis_device_new): made "id" an attr
+    (geis_device_id): same
+    (geis_device_add_attr): implemented missing function
+  * libutouch-geis/geis_v1.c (_v1_input_callback): new function
+    (geis_input_devices): implemented
+  * testsuite/geis1/check_gesture_attrs.c: removed debug message
+  * testsuite/geistest/geistest.c (input_device_added): added a dump
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+  Fix a lifetime issue with string attrs.
+
+  * libutouch_ges/geis_attr.c (geis_attr_new): dup all strings
+    (geis_attr_delete): free strings
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+  Added new device symbolic constants due to a change in the GEIS spec.
+
+  * include/geis/geis.h (GEIS_DEVICE_ATTRIBUTE_CLASS): new constant
+    (GEIS_DEVICE_ATTRIBUTE_TOUCHES): new constant
+    (GEIS_DEVICE_CLASS_TOUCH_DIRECT): new constant
+    (GEIS_DEVICE_CLASS_TOUCH_DEPENDENT): new constant
+    (GEIS_DEVICE_CLASS_TOUCH_INDEPENDENT): new constant
+    (GEIS_DEVICE_CLASS_TOUCH_PARTIAL): new constant
+  * testsuite/geis2/check_device.c: added tests for the above
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+  Added a required symbolic constant for device events.
+
+  * include/geis/geis.h (GEIS_EVENT_ATTRIBUTE_DEVICE): new symbol
+    (GEIS_DEVICE_ATTRIBUTE_ID): new symbol
+  * libutouch-geis/backend/test_fixture/geis_backend_test_fixture.c: used them
+  * libutouch-geis/geis.c: used them
+  * testsuite/geis2/check_device.c (geis_device_types): checked them
+  * testsuite/geis2/check_subscription.c: used them
+
 2011-03-08  Stephen M. Webb  <[e-mail]>
 
   Released utouch-geis v2.0.3.

=== modified file 'doc/Doxyfile'
--- doc/Doxyfile	2010-12-01 12:23:29 +0000
+++ doc/Doxyfile	2011-03-16 22:13:52 +0000
@@ -1398,7 +1398,7 @@
 # undefined via #undef or recursively expanded use the := operator 
 # instead of the = operator.
 
-PREDEFINED             = GEIS_API=
+PREDEFINED             = GEIS_API=""
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
 # this tag can be used to specify a list of macro names that should be expanded. 

=== modified file 'doc/geistest.1'
--- doc/geistest.1	2011-02-28 17:40:46 +0000
+++ doc/geistest.1	2011-03-16 22:13:52 +0000
@@ -8,6 +8,10 @@
 .B -w 
 .I windowid
 .B ]
+.B [ 
+.B -d 
+.I deviceid
+.B ]
 .br
 
 .SH DESCRIPTION
@@ -23,13 +27,26 @@
 .I windowId
 of a specific window to associate with gestures.
 Particularly useful with touchscreens.
+If this argument is not set, the default action is to read gestures on all
+windows.
 
 The
 .I windowId
 can be determined using the program
 .BR xwininfo .
 
-If this argument is not set, the default action is to read gestures on all windows.
+.IP -d
+Specifies the
+.I deviceId
+of a specific input device to be tested for multi-touch gestural input.
+If this argument is not set, the default action is to listen to multi-touch
+input on all devices.  This argument may be used more than once to specify
+multiple input devices.
+
+The
+.I deviceId
+can be determined using the program
+.BR xinput .
 
 .SH ENVIRONMENT
 .IP GEIS_DEBUG

=== modified file 'include/geis/geis.h'
--- include/geis/geis.h	2011-02-21 14:23:43 +0000
+++ include/geis/geis.h	2011-03-16 22:13:52 +0000
@@ -128,8 +128,6 @@
 #define GEIS_TOUCH_ATTRIBUTE_X                  "touch x"
 #define GEIS_TOUCH_ATTRIBUTE_Y                  "touch y"
 
-#define GEIS_DEVICE_ATTRIBUTE_NAME              "device name"
-
 #define GEIS_REGION_ATTRIBUTE_WINDOWID          "windowid"
 
 #define GEIS_FALSE 0
@@ -855,8 +853,36 @@
  * @defgroup geis2_device Gesture Input Devices (GEIS v2.0)
  * @{
  */
-
-/**
+#define GEIS_EVENT_ATTRIBUTE_DEVICE             "device"
+
+/**
+ * @def GEIS_DEVICE_ATTRIBUTE_NAME
+ * The name of the input device.  Not guaranteed unique.
+ *
+ * @def GEIS_DEVICE_ATTRIBUTE_ID
+ * The unique integer ID of the device.  Guaranteed unique within a Geis
+ * instance.
+ *
+ * @def GEIS_DEVICE_ATTRIBUTE_TOUCHES
+ * The simultaneous number of touches the device claims to be able to detect if
+ * it is a multi-touch device.  A value of zero indicates the maximum number of
+ * touches can not be determined.
+ *
+ * @def GEIS_DEVICE_ATTRIBUTE_DIRECT_TOUCH
+ * Indicates if this is a direct touch device (eg. touchscreen).
+ *
+ * @def GEIS_DEVICE_ATTRIBUTE_INDEPENDENT_TOUCH
+ * Indicates if this is an independent touch device (eg. Apple MagicMouse).
+ */
+#define GEIS_DEVICE_ATTRIBUTE_NAME              "device name"
+#define GEIS_DEVICE_ATTRIBUTE_ID                "device id"
+#define GEIS_DEVICE_ATTRIBUTE_TOUCHES           "device touches"
+#define GEIS_DEVICE_ATTRIBUTE_DIRECT_TOUCH      "direct touch"
+#define GEIS_DEVICE_ATTRIBUTE_INDEPENDENT_TOUCH "independent touch"
+
+
+/**
+ * @class GeisDevice
  * An opaque pointer type representing a gesture-capable input device.
  *
  * GeisDevice objects are created by the GEIS API and are reference counted.
@@ -869,6 +895,7 @@
 
 /**
  * Adds a reference count to a device.
+ * @public @memberof GeisDevice
  *
  * @param[in] device The device.
  *
@@ -880,6 +907,7 @@
 
 /**
  * Removes a reference count from a device.
+ * @public @memberof GeisDevice
  *
  * @param[in] device The device.
  *
@@ -890,6 +918,7 @@
 
 /**
  * Gets the name of the input device.
+ * @memberof GeisDevice
  *
  * @param[in] device The device.
  */
@@ -897,6 +926,7 @@
 
 /**
  * Gets the system identifier of the iput device.
+ * @memberof GeisDevice
  *
  * @param[in] device The device.
  *
@@ -907,6 +937,7 @@
 
 /**
  * Gets the number of attributes of the device.
+ * @memberof GeisDevice
  *
  * @param[in] device The device.
  */
@@ -914,6 +945,7 @@
 
 /**
  * Gets the indicated attribute of the device.
+ * @memberof GeisDevice
  *
  * @param[in] device The device.
  */

=== modified file 'libutouch-geis/backend/test_fixture/geis_backend_test_fixture.c'
--- libutouch-geis/backend/test_fixture/geis_backend_test_fixture.c	2011-03-09 18:59:00 +0000
+++ libutouch-geis/backend/test_fixture/geis_backend_test_fixture.c	2011-03-16 22:13:52 +0000
@@ -137,7 +137,9 @@
 {
   GeisDevice device = geis_device_new("abs-test-device", 0);
   GeisEvent  event = geis_event_new(GEIS_EVENT_DEVICE_AVAILABLE);
-  GeisAttr   attr = geis_attr_new("geis-device", GEIS_ATTR_TYPE_POINTER, device);
+  GeisAttr   attr = geis_attr_new(GEIS_EVENT_ATTRIBUTE_DEVICE,
+                                  GEIS_ATTR_TYPE_POINTER,
+                                  device);
   geis_event_add_attr(event, attr);
   geis_post_event(tf->tf_geis, event);
 }

=== modified file 'libutouch-geis/backend/xcb/geis_xcb_backend.c'
--- libutouch-geis/backend/xcb/geis_xcb_backend.c	2011-02-27 21:41:00 +0000
+++ libutouch-geis/backend/xcb/geis_xcb_backend.c	2011-03-16 22:13:52 +0000
@@ -23,6 +23,7 @@
 #include "geis_attr.h"
 #include "geis_backend_protected.h"
 #include "geis_class.h"
+#include "geis_device.h"
 #include "geis_event.h"
 #include "geis_frame.h"
 #include "geis_filter.h"
@@ -33,8 +34,10 @@
 #include "grail_gestures.h"
 #include <grail.h>
 #include <grail-types.h>
+#include <stdio.h>
 #include <string.h>
 #include "xcb_gesture.h"
+#include <X11/extensions/XInput2.h>
 #include <X11/X.h>
 #include <X11/Xlib-xcb.h>
 #include <xcb/xcb.h>
@@ -100,6 +103,45 @@
 };
 
 
+static void
+_map_xi2_mode_to_geis_device_attrs(int xi2_mode, GeisDevice geis_device)
+{
+  GeisAttr device_attr;
+  GeisBoolean is_direct = GEIS_FALSE;
+  GeisBoolean is_independent = GEIS_FALSE;
+
+  if (xi2_mode == XIDirectTouch)
+    is_direct = GEIS_TRUE;
+
+  device_attr = geis_attr_new(GEIS_DEVICE_ATTRIBUTE_DIRECT_TOUCH,
+                              GEIS_ATTR_TYPE_BOOLEAN,
+                              &is_direct);
+  if (!device_attr)
+  {
+    geis_error("failed to create device attr");
+  }
+  else
+  {
+    geis_device_add_attr(geis_device, device_attr);
+  }
+
+  if (xi2_mode == XIIndependentPointer)
+    is_independent = GEIS_TRUE;
+
+  device_attr = geis_attr_new(GEIS_DEVICE_ATTRIBUTE_INDEPENDENT_TOUCH,
+                              GEIS_ATTR_TYPE_BOOLEAN,
+                              &is_independent);
+  if (!device_attr)
+  {
+    geis_error("failed to create device attr");
+  }
+  else
+  {
+    geis_device_add_attr(geis_device, device_attr);
+  }
+}
+
+
 static int
 _verify_xcb_version(xcb_connection_t *xcb_connection)
 {
@@ -348,8 +390,8 @@
   GeisString          name = geis_attr_name(attr);
   GeisFilterOperation op   = geis_filter_term_operation(term);
 
-  if (0 == strcmp(name, GEIS_DEVICE_ATTRIBUTE_NAME)
-      && op == GEIS_FILTER_OP_EQ)
+  if (0 == strcmp(name, GEIS_DEVICE_ATTRIBUTE_ID)
+       && op == GEIS_FILTER_OP_EQ)
   {
     if (*device_count >= MAX_NUM_DEVICES)
     {
@@ -637,7 +679,7 @@
  * Tears down an XCB-specific subscription instance.
  */
 static GeisStatus 
-_unsubscribe(GeisBackend be, GeisSubscription sub)
+_unsubscribe(GeisBackend be __attribute__((unused)), GeisSubscription sub)
 {
   GeisStatus status = GEIS_STATUS_SUCCESS;
   XcbGestureSub xsub = geis_subscription_pdata(sub);
@@ -646,10 +688,155 @@
 }
 
 
-/** @todo implement this */
+/*
+ * Report a gesture-capable device.
+ */
+static void
+_report_an_xcb_device(GeisXcbBackend be,  XIDeviceInfo *xcb_device)
+{
+  int        class_index;
+  GeisDevice geis_device;
+  GeisAttr   device_attr;
+  GeisEvent  device_event;
+
+  device_event = geis_event_new(GEIS_EVENT_DEVICE_AVAILABLE);
+  if (!device_event)
+  {
+    geis_error("failed to create device-available event");
+    goto final_exit;
+  }
+
+  geis_device = geis_device_new(xcb_device->name, xcb_device->deviceid);
+  if (!geis_device)
+  {
+    geis_error("failed to create device");
+    goto unroll_event;
+  }
+
+  device_attr = geis_attr_new(GEIS_EVENT_ATTRIBUTE_DEVICE,
+                              GEIS_ATTR_TYPE_POINTER,
+                              geis_device);
+  if (!device_attr)
+  {
+    geis_error("failed to create device attr");
+    goto unroll_device;
+  }
+  geis_event_add_attr(device_event, device_attr);
+
+  for (class_index = 0; class_index < xcb_device->num_classes; ++class_index)
+  {
+    XIAnyClassInfo *any = xcb_device->classes[class_index];
+    if (any->type == XITouchClass)
+    {
+      XITouchClassInfo *v = (XITouchClassInfo *)any;
+      _map_xi2_mode_to_geis_device_attrs(v->mode, geis_device);
+      geis_debug("touch class for device %d \"%s\": mode %d num_touches %d",
+		 xcb_device->deviceid, xcb_device->name,
+		 v->mode, v->num_touches);
+
+      device_attr = geis_attr_new(GEIS_DEVICE_ATTRIBUTE_TOUCHES,
+                                  GEIS_ATTR_TYPE_INTEGER,
+                                  &v->num_touches);
+      if (!device_attr)
+      {
+	geis_error("failed to create device attr");
+      }
+      else
+      {
+	geis_device_add_attr(geis_device, device_attr);
+      }
+    }
+    else if (any->type == XITouchValuatorClass)
+    {
+      char name[64];
+      GeisFloat f;
+      GeisInteger i;
+      XITouchValuatorClassInfo *v = (XITouchValuatorClassInfo *)any;
+      char *label = v->label ? XGetAtomName(be->x11_display, v->label) : "";
+      sprintf(name, "%.48s %d min", label, v->number);
+      f = v->min;
+      geis_debug("touch valuator for device %d \"%s\": label \"%s\" %g",
+                 xcb_device->deviceid, xcb_device->name, name, f);
+      device_attr = geis_attr_new(name, GEIS_ATTR_TYPE_FLOAT, &f);
+      if (!device_attr)
+      {
+	geis_error("failed to create device attr");
+      }
+      else
+      {
+	geis_device_add_attr(geis_device, device_attr);
+      }
+
+      sprintf(name, "%.48s %d max", label, v->number);
+      f = v->max;
+      geis_debug("touch valuator for device %d \"%s\": label \"%s\" %g",
+                 xcb_device->deviceid, xcb_device->name, name, v->max);
+      device_attr = geis_attr_new(name, GEIS_ATTR_TYPE_FLOAT, &f);
+      if (!device_attr)
+      {
+	geis_error("failed to create device attr");
+      }
+      else
+      {
+	geis_device_add_attr(geis_device, device_attr);
+      }
+
+      sprintf(name, "%.48s %d resolution", label, v->number);
+      i = v->resolution;
+      geis_debug("touch valuator for device %d \"%s\": label \"%s\" %d",
+                 xcb_device->deviceid, xcb_device->name, name, i);
+      device_attr = geis_attr_new(name, GEIS_ATTR_TYPE_INTEGER, &i);
+      if (!device_attr)
+      {
+	geis_error("failed to create device attr");
+      }
+      else
+      {
+	geis_device_add_attr(geis_device, device_attr);
+      }
+    }
+  }
+  geis_post_event(be->geis, device_event);
+  goto final_exit;
+
+unroll_device:
+  geis_device_unref(geis_device);
+unroll_event:
+  geis_event_delete(device_event);
+final_exit:
+  return;
+}
+
+
+/*
+ * Enumerates all input devices known to the X server and reports those that may
+ * give gestural input.
+ */
 static void
 _report_xcb_devices(GeisXcbBackend be)
 {
+  XIDeviceInfo *devices;
+  int           device_index;
+  int           num_devices;
+
+  devices = XIQueryDevice(be->x11_display, XIAllDevices, &num_devices);
+  for (device_index = 0; device_index < num_devices; ++device_index)
+  {
+    int class_index;
+    for (class_index = 0;
+         class_index < devices[device_index].num_classes;
+         ++class_index)
+    {
+      XIAnyClassInfo *any = devices[device_index].classes[class_index];
+      if (any->type == XITouchClass)
+      {
+	_report_an_xcb_device(be, &devices[device_index]);
+	break;
+      }
+    }
+  }
+
+  XIFreeDeviceInfo(devices);
 }
 
 

=== modified file 'libutouch-geis/geis.c'
--- libutouch-geis/geis.c	2011-02-27 21:41:00 +0000
+++ libutouch-geis/geis.c	2011-03-16 22:13:52 +0000
@@ -80,7 +80,7 @@
 _device_event_handler(Geis geis, GeisEvent event)
 {
   GeisBoolean handled = GEIS_FALSE;
-  GeisAttr attr = geis_event_attr_by_name(event, "geis-device");
+  GeisAttr attr = geis_event_attr_by_name(event, GEIS_EVENT_ATTRIBUTE_DEVICE);
   if (!attr)
   {
     geis_warning("invalid device event received from back end.");

=== modified file 'libutouch-geis/geis_attr.c'
--- libutouch-geis/geis_attr.c	2011-02-28 17:37:00 +0000
+++ libutouch-geis/geis_attr.c	2011-03-16 22:13:52 +0000
@@ -185,7 +185,7 @@
 	break;
 
       case GEIS_ATTR_TYPE_STRING:
-	attr->attr_value.s = (GeisString)attr_value;
+	attr->attr_value.s = (GeisString)strdup(attr_value);
 	break;
 
       default:
@@ -203,6 +203,10 @@
   {
     attr->attr_destructor(attr->attr_value.p);
   }
+  else if (attr->attr_type == GEIS_ATTR_TYPE_STRING)
+  {
+    free((char *)attr->attr_value.s);
+  }
   free((void *)attr->attr_name);
   free(attr);
 }

=== modified file 'libutouch-geis/geis_device.c'
--- libutouch-geis/geis_device.c	2011-02-17 15:06:21 +0000
+++ libutouch-geis/geis_device.c	2011-03-16 22:13:52 +0000
@@ -31,7 +31,6 @@
 struct _GeisDevice
 {
   GeisRefCount ref_count;
-  GeisInteger  id;
   GeisAttrBag  attr_bag;
 };
 
@@ -163,6 +162,7 @@
 GeisDevice
 geis_device_new(GeisString name, GeisInteger id)
 {
+  GeisAttr attr;
   GeisDevice device = calloc(1, sizeof(struct _GeisDevice));
   if (!device)
   {
@@ -177,17 +177,26 @@
     goto unwind_device;
   }
 
-  GeisAttr name_attr = geis_attr_new(GEIS_DEVICE_ATTRIBUTE_NAME,
-                                     GEIS_ATTR_TYPE_STRING,
-                                     (void *)name);
-  if (!name_attr)
-  {
-    geis_debug("error allocating device name");
-    goto unwind_attrs;
-  }
-  geis_attr_bag_insert(device->attr_bag, name_attr);
-
-  device->id = id;
+  attr = geis_attr_new(GEIS_DEVICE_ATTRIBUTE_NAME,
+                       GEIS_ATTR_TYPE_STRING,
+                       (void *)name);
+  if (!attr)
+  {
+    geis_debug("error allocating device name attr");
+    goto unwind_attrs;
+  }
+  geis_attr_bag_insert(device->attr_bag, attr);
+
+  attr = geis_attr_new(GEIS_DEVICE_ATTRIBUTE_ID,
+                       GEIS_ATTR_TYPE_INTEGER,
+                       &id);
+  if (!attr)
+  {
+    geis_debug("error allocating device id attr");
+    goto unwind_attrs;
+  }
+  geis_attr_bag_insert(device->attr_bag, attr);
+
   geis_device_ref(device);
   goto final_exit;
 
@@ -258,7 +267,13 @@
 GeisInteger
 geis_device_id(GeisDevice device)
 {
-  return device->id;
+  GeisInteger device_id = -1;
+  GeisAttr attr = geis_attr_bag_find(device->attr_bag, GEIS_DEVICE_ATTRIBUTE_ID);
+  if (attr)
+  {
+    device_id = geis_attr_value_to_integer(attr);
+  }
+  return device_id;
 }
 
 
@@ -273,6 +288,16 @@
 
 
 /*
+ * Inserts an attr into a device.
+ */
+void
+geis_device_add_attr(GeisDevice device, GeisAttr attr)
+{
+  geis_attr_bag_insert(device->attr_bag, attr);
+}
+
+
+/*
  * Gets the indicated attribute of the device.
  */
 GeisAttr

=== modified file 'libutouch-geis/geis_v1.c'
--- libutouch-geis/geis_v1.c	2011-03-09 19:02:53 +0000
+++ libutouch-geis/geis_v1.c	2011-03-16 22:13:52 +0000
@@ -37,6 +37,8 @@
 {
   GeisSubscription  subscription;
   GeisFilter        window_filter;
+  GeisInputFuncs   *input_funcs;
+  GeisPointer       input_context;
   GeisGestureFuncs *gesture_funcs;
   GeisPointer       gesture_cookie;
 };
@@ -541,6 +543,15 @@
     const char **g;
 
     geis_debug("subscribing device %d for the following gestures:", device_id);
+    result = geis_filter_add_term(instance->window_filter,
+                        GEIS_FILTER_DEVICE,
+                        GEIS_DEVICE_ATTRIBUTE_ID, GEIS_FILTER_OP_EQ, device_id,
+                        NULL);
+    if (result != GEIS_STATUS_SUCCESS)
+    {
+      geis_error("error adding device filter term");
+    }
+
     for (g = gesture_list; *g; ++g)
     {
       GeisV1AttrMap v1attr;
@@ -681,12 +692,101 @@
 }
 
 
+static void
+_v1_input_callback(Geis geis, GeisEvent event, void *context)
+{
+  GeisInstance v1_instance = (GeisInstance)context;
+  GeisDevice device;
+  GeisAttr attr;
+  GeisSize i;
+  GeisInputDeviceId device_id = 0;
+
+  attr = geis_event_attr_by_name(event, GEIS_EVENT_ATTRIBUTE_DEVICE);
+  if (!attr)
+  {
+    geis_error("no touchset for gesture event");
+    goto final_exit;
+  }
+
+  device = geis_attr_value_to_pointer(attr);
+  if (!device)
+  {
+    geis_warning("can not convert attr to device");
+    goto final_exit;
+  }
+
+  GeisGestureAttr *attrs = calloc(geis_device_attr_count(device) + 1,
+                                  sizeof(GeisGestureAttr));
+  if (!attrs)
+  {
+    geis_error("can not allocate device attrs");
+    goto final_exit;
+  }
+
+  for (i = 0; i < geis_device_attr_count(device); ++i)
+  {
+    attr = geis_device_attr(device, i);
+    if (0 == strcmp(geis_attr_name(attr), GEIS_DEVICE_ATTRIBUTE_ID))
+    {
+      device_id = geis_attr_value_to_integer(attr);
+    }
+    attrs[i].name        = geis_attr_name(attr);
+    attrs[i].type        = geis_attr_type(attr);
+    switch (attrs[i].type)
+    {
+      case GEIS_ATTR_TYPE_BOOLEAN:
+	attrs[i].boolean_val = geis_attr_value_to_boolean(attr);
+	break;
+      case GEIS_ATTR_TYPE_FLOAT:
+	attrs[i].float_val = geis_attr_value_to_float(attr);
+	break;
+      case GEIS_ATTR_TYPE_INTEGER:
+	attrs[i].integer_val = geis_attr_value_to_integer(attr);
+	break;
+      case GEIS_ATTR_TYPE_STRING:
+	attrs[i].string_val = geis_attr_value_to_string(attr);
+	break;
+      default:
+	break;
+    }
+  }
+
+  switch (geis_event_type(event))
+  {
+    case GEIS_EVENT_DEVICE_AVAILABLE:
+      v1_instance->input_funcs->added(v1_instance->input_context,
+                                      device_id,
+                                      attrs);
+      break;
+    case GEIS_EVENT_DEVICE_UNAVAILABLE:
+      v1_instance->input_funcs->removed(v1_instance->input_context,
+                                        device_id,
+                                        attrs);
+      break;
+    default:
+      geis_debug("-- event ignored --");
+      break;
+  }
+
+  free(attrs);
+
+final_exit:
+  geis_event_delete(event);
+}
+
+
 GeisStatus
-geis_input_devices(GeisInstance    geis_instance __attribute__((unused)),
-                   GeisInputFuncs *func,
-                   void           *cookie)
+geis_input_devices(GeisInstance    instance,
+                   GeisInputFuncs *funcs,
+                   void           *context)
 {
-  geis_debug("ends");
-  return GEIS_STATUS_SUCCESS;
+  GeisStatus result = GEIS_STATUS_SUCCESS;
+
+  instance->input_funcs = funcs;
+  instance->input_context = context;
+
+  geis_register_device_callback(g_geis, _v1_input_callback, instance);
+
+  return result;
 }
 

=== modified file 'testsuite/geis1/check_gesture_attrs.c'
--- testsuite/geis1/check_gesture_attrs.c	2011-03-09 18:59:00 +0000
+++ testsuite/geis1/check_gesture_attrs.c	2011-03-16 22:13:52 +0000
@@ -74,7 +74,6 @@
 
   for (i = 0; i < attr_count; ++i)
   {
-    fprintf(stderr, "==smw> attr[%lu].name=\"%s\"\n", i, attrs[i].name);
     if (0 == strcmp(attrs[i].name, GEIS_GESTURE_ATTRIBUTE_FOCUS_X)
      && fabs(attrs[i].float_val - 123.456) < 0.01)
     {

=== modified file 'testsuite/geis2/check_device.c'
--- testsuite/geis2/check_device.c	2011-02-20 15:45:00 +0000
+++ testsuite/geis2/check_device.c	2011-03-16 22:13:52 +0000
@@ -23,10 +23,24 @@
 }
 
 
-/* Compile-time test to ensure types are defined */
+/* Compile-time test to ensure types and constants are defined */
 START_TEST(geis_device_types)
 {
+  GeisString  attr_name;
+  GeisInteger attr_ivalue;
+
+  /* Types */
   GeisEventType type CK_ATTRIBUTE_UNUSED;
+
+  /* 5.3 Events */
+  attr_name = GEIS_EVENT_ATTRIBUTE_DEVICE;
+
+  /* 5.1.2 Device Attributes */
+  attr_name = GEIS_DEVICE_ATTRIBUTE_NAME;
+  attr_name = GEIS_DEVICE_ATTRIBUTE_ID;
+  attr_name = GEIS_DEVICE_ATTRIBUTE_DIRECT_TOUCH;
+  attr_name = GEIS_DEVICE_ATTRIBUTE_INDEPENDENT_TOUCH;
+  attr_name = GEIS_DEVICE_ATTRIBUTE_TOUCHES;
 }
 END_TEST
 

=== modified file 'testsuite/geis2/check_subscription.c'
--- testsuite/geis2/check_subscription.c	2011-02-17 17:40:49 +0000
+++ testsuite/geis2/check_subscription.c	2011-03-16 22:13:52 +0000
@@ -99,7 +99,7 @@
       GeisFilter filter;
       GeisStatus fs;
 
-      attr = geis_event_attr_by_name(event, "geis-device");
+      attr = geis_event_attr_by_name(event, GEIS_EVENT_ATTRIBUTE_DEVICE);
       fail_if (!attr, "geis-device attr not found in device event");
 
       device = geis_attr_value_to_pointer(attr);

=== modified file 'testsuite/geistest/geistest.c'
--- testsuite/geistest/geistest.c	2011-02-28 17:40:46 +0000
+++ testsuite/geistest/geistest.c	2011-03-16 22:13:52 +0000
@@ -36,10 +36,14 @@
   NULL
 };
 
+GeisSize           g_device_count = 0;
+GeisInputDeviceId *g_devices = GEIS_ALL_INPUT_DEVICES;
+
+
 static void
 print_attr(GeisGestureAttr *attr)
 {
-  fprintf(stdout, "\tattr %s=", attr->name);
+  fprintf(stdout, "\tattr \"%s\" = ", attr->name);
   switch (attr->type)
   {
     case GEIS_ATTR_TYPE_BOOLEAN:
@@ -64,6 +68,12 @@
 static void
 input_device_added(void *cookie, GeisInputDeviceId device_id, void *attrs)
 {
+  GeisGestureAttr *a;
+  fprintf(stdout, "Device %d added\n", device_id);
+  for (a = attrs; a->name; ++a)
+  {
+    print_attr(a);
+  }
 }
 
 
@@ -160,12 +170,28 @@
 };
 
 
+static void
+_add_device_id(GeisInteger id)
+{
+  GeisInputDeviceId *d = realloc(g_devices, g_device_count + 2);
+  if (!d)
+  {
+    fprintf(stderr, "error allocating device list.\n");
+    exit(1);
+  }
+  g_devices = d;
+  g_devices[g_device_count] = id;
+  g_devices[g_device_count+1]   = 0;
+  ++g_device_count;
+}
+
+
 int
 parse_opts(int argc, char* argv[], uint32_t *window_id)
 {
   int opt;
 
-  while ((opt = getopt(argc, argv, "w:")) != -1)
+  while ((opt = getopt(argc, argv, "w:d:")) != -1)
   {
     switch (opt)
     {
@@ -173,8 +199,20 @@
 	*window_id = strtol(optarg, NULL, 0);
 	break;
 
+      case 'd':
+	{
+	  GeisInteger id = strtol(optarg, NULL, 0);
+	  if (0 == id)
+	  {
+	    fprintf(stderr, "invalid device id '%s'\n'", optarg);
+	    return 0;
+	  }
+	  _add_device_id(id);
+	}
+	break;
+
       default:
-      	return 0;
+	return 0;
     }
   }
 
@@ -212,7 +250,7 @@
   }
 
   status = geis_subscribe(instance,
-                          GEIS_ALL_INPUT_DEVICES,
+                          g_devices,
                           s_gestures,
                           &gesture_funcs,
                           NULL);