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

[Stephen M. Webb]

Fixes a regression by reporting the X and Y axis extent attributes (if available) for touch devices.

Fixes lp:987539, with test case.

[Daniel d'Andrada (dandrader)]

I think _geis_grail_add_device() function is getting way too long. It would be better put that code into a separate helper function[1] and call it from _geis_grail_add_device().

[1] - e.g. _gbe_add_device_axes_attributes(geis_device, frame_device)

-------

testsuite/geis2/gtest_devices.cpp:185

 * This test creates a devicve with known X and Y extents and verifies the

s/devicve/device
and probably (not a native speaker myself)
s/verifies/verifies that

review: Needs Fixing

[Daniel d'Andrada (dandrader)]

OBS: That particular test could "easily" (you would end up writing more code) use x11_mocks and therefore avoid being an integration test.
(couldn't resist doing some advertising...)

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

263. By Stephen M. Webb on 2012-04-27

Moved new code into a separate function.

[Stephen M. Webb (bregma)]

Function refactored as requested.

[Daniel d'Andrada (dandrader)]

Looks good.

review: Approve

=== modified file 'libutouch-geis/backend/grail/geis_grail_backend.c'
--- libutouch-geis/backend/grail/geis_grail_backend.c	2012-04-24 16:09:09 +0000
+++ libutouch-geis/backend/grail/geis_grail_backend.c	2012-04-27 16:09:20 +0000
@@ -773,6 +773,67 @@
 
 
 /**
+ * Adds the axis exten attributes for a device, if available.
+ */
+static void
+_gbe_add_device_axis_attributes(UFDevice frame_device, GeisDevice geis_device)
+{
+  UFStatus  status;
+  GeisFloat fval;
+
+  UFAxis x_axis;
+  status = frame_device_get_axis_by_type(frame_device, UFAxisTypeX, &x_axis);
+  if (status != UFStatusSuccess)
+  {
+    geis_warning("failed to get X axis property from device '%s'",
+                 geis_device_name(geis_device));
+  }
+  else
+  {
+    fval = frame_axis_get_minimum(x_axis);
+    geis_device_add_attr(geis_device, geis_attr_new(GEIS_DEVICE_ATTRIBUTE_MIN_X,
+                                                    GEIS_ATTR_TYPE_FLOAT,
+                                                    &fval));
+
+    fval = frame_axis_get_maximum(x_axis);
+    geis_device_add_attr(geis_device, geis_attr_new(GEIS_DEVICE_ATTRIBUTE_MAX_X,
+                                                    GEIS_ATTR_TYPE_FLOAT,
+                                                    &fval));
+
+    fval = frame_axis_get_resolution(x_axis);
+    geis_device_add_attr(geis_device, geis_attr_new(GEIS_DEVICE_ATTRIBUTE_RES_X,
+                                                    GEIS_ATTR_TYPE_FLOAT,
+                                                    &fval));
+  }
+
+  UFAxis y_axis;
+  status = frame_device_get_axis_by_type(frame_device, UFAxisTypeY, &y_axis);
+  if (status != UFStatusSuccess)
+  {
+    geis_warning("failed to get Y axis property from device '%s'",
+                 geis_device_name(geis_device));
+  }
+  else
+  {
+    fval = frame_axis_get_minimum(y_axis);
+    geis_device_add_attr(geis_device, geis_attr_new(GEIS_DEVICE_ATTRIBUTE_MIN_Y,
+                                                    GEIS_ATTR_TYPE_FLOAT,
+                                                    &fval));
+
+    fval = frame_axis_get_maximum(y_axis);
+    geis_device_add_attr(geis_device, geis_attr_new(GEIS_DEVICE_ATTRIBUTE_MAX_Y,
+                                                    GEIS_ATTR_TYPE_FLOAT,
+                                                    &fval));
+
+    fval = frame_axis_get_resolution(y_axis);
+    geis_device_add_attr(geis_device, geis_attr_new(GEIS_DEVICE_ATTRIBUTE_RES_Y,
+                                                    GEIS_ATTR_TYPE_FLOAT,
+                                                    &fval));
+  }
+}
+
+
+/**
  * Reports an X11 device to the front end as a GEIS device.
  */
 static void
@@ -859,6 +920,8 @@
     geis_device_add_attr(geis_device, attr);
   }
 
+  _gbe_add_device_axis_attributes(frame_device, geis_device);
+
   /* Report the device as a filterable entity. */
   static struct GeisFilterableAttribute attrs[] = {
     { GEIS_DEVICE_ATTRIBUTE_NAME,              GEIS_ATTR_TYPE_STRING,  0, NULL },
 
=== modified file 'testsuite/geis2/gtest_devices.cpp'
--- testsuite/geis2/gtest_devices.cpp	2012-04-27 16:09:20 +0000
+++ testsuite/geis2/gtest_devices.cpp	2012-04-27 16:09:20 +0000
@@ -179,4 +179,49 @@
 }
 
 
+/*
+ * Test case for lp:987539: report X and Y axis extents.
+ *
+ * This test creates a devicve with known X and Y extents and verifies the
+ * extent attributes are reported with the expected values.
+ */
+TEST_F(GeisDeviceTests, deviceAttrs)
+{
+  GeisBoolean off = GEIS_FALSE;
+  geis_set_configuration(geis_, GEIS_CONFIG_DISCARD_DEVICE_MESSAGES, &off);
+
+  Testsuite::EvemuDevice test_device(TEST_DEVICE_PROP_FILE);
+  set_geis_event_handler([&](Geis, GeisEvent event)
+  {
+    if (geis_event_type(event) == GEIS_EVENT_DEVICE_AVAILABLE)
+    {
+      GeisAttr attr = geis_event_attr_by_name(event, GEIS_EVENT_ATTRIBUTE_DEVICE);
+      EXPECT_TRUE(attr != NULL);
+      GeisDevice device = (GeisDevice)geis_attr_value_to_pointer(attr);
+      ASSERT_TRUE(test_device.name() == geis_device_name(device));
+
+      attr = geis_device_attr_by_name(device, GEIS_DEVICE_ATTRIBUTE_MIN_X);
+      ASSERT_TRUE(attr != NULL);
+      EXPECT_FLOAT_EQ(0.0f, geis_attr_value_to_float(attr));
+      attr = geis_device_attr_by_name(device, GEIS_DEVICE_ATTRIBUTE_MAX_X);
+      ASSERT_TRUE(attr != NULL);
+      EXPECT_FLOAT_EQ(9600.0f, geis_attr_value_to_float(attr));
+      attr = geis_device_attr_by_name(device, GEIS_DEVICE_ATTRIBUTE_RES_X);
+      ASSERT_TRUE(attr != NULL);
+      EXPECT_FLOAT_EQ(0.0f, geis_attr_value_to_float(attr));
+      attr = geis_device_attr_by_name(device, GEIS_DEVICE_ATTRIBUTE_MIN_Y);
+      ASSERT_TRUE(attr != NULL);
+      EXPECT_FLOAT_EQ(0.0f, geis_attr_value_to_float(attr));
+      attr = geis_device_attr_by_name(device, GEIS_DEVICE_ATTRIBUTE_MAX_Y);
+      ASSERT_TRUE(attr != NULL);
+      EXPECT_FLOAT_EQ(7200.0f, geis_attr_value_to_float(attr));
+      attr = geis_device_attr_by_name(device, GEIS_DEVICE_ATTRIBUTE_RES_Y);
+      ASSERT_TRUE(attr != NULL);
+      EXPECT_FLOAT_EQ(0.0f, geis_attr_value_to_float(attr));
+    }
+  });
+  geis_dispatch_loop();
+}
+
+
 } // anonymous namespace