Merge lp:~oif-team/frame/trunk.properties into lp:frame

[Henrik Rydberg]

Here is the properties settings for utouch-frame, as needed to determine direct/indirect devices. The heuristic should be identical to the one used in current evdev.

[Chase Douglas (chasedouglas)]

This looks correct to me.

review: Approve

=== modified file 'src/frame-mtdev.c'
--- src/frame-mtdev.c	2010-12-30 19:23:24 +0000
+++ src/frame-mtdev.c	2011-02-08 18:38:51 +0000
@@ -25,6 +25,16 @@
 #include <errno.h>
 #include <math.h>
 
+static int is_pointer(const struct evemu_device *dev)
+{
+	return evemu_has_event(dev, EV_REL, REL_X) ||
+		evemu_has_event(dev, EV_KEY, BTN_TOOL_FINGER) ||
+		evemu_has_event(dev, EV_KEY, BTN_TOOL_PEN) ||
+		evemu_has_event(dev, EV_KEY, BTN_STYLUS) ||
+		evemu_has_event(dev, EV_KEY, BTN_MOUSE) ||
+		evemu_has_event(dev, EV_KEY, BTN_LEFT);
+}
+
 int utouch_frame_is_supported_mtdev(const struct evemu_device *dev)
 {
 
@@ -52,11 +62,22 @@
 	if (!utouch_frame_is_supported_mtdev(dev))
 		return -ENODEV;
 
+	if (is_pointer(dev)) {
+		s->needs_pointer = 1;
+		s->is_direct = 0;
+	} else {
+		s->needs_pointer = 0;
+		s->is_direct = 1;
+	}
+
+	s->is_buttonpad = 0;
+	s->is_semi_mt = 0;
+
 #ifdef INPUT_PROP_POINTER
-	s->needs_pointer = evemu_has_prop(dev, INPUT_PROP_POINTER);
-	s->is_direct = evemu_has_prop(dev, INPUT_PROP_DIRECT);
-	s->is_buttonpad = evemu_has_prop(dev, INPUT_PROP_BUTTONPAD);
-	s->is_semi_mt = evemu_has_prop(dev, INPUT_PROP_SEMI_MT);
+	s->needs_pointer |= evemu_has_prop(dev, INPUT_PROP_POINTER);
+	s->is_direct |= evemu_has_prop(dev, INPUT_PROP_DIRECT);
+	s->is_buttonpad |= evemu_has_prop(dev, INPUT_PROP_BUTTONPAD);
+	s->is_semi_mt |= evemu_has_prop(dev, INPUT_PROP_SEMI_MT);
 #endif
 	s->use_touch_major = evemu_has_event(dev, EV_ABS, ABS_MT_TOUCH_MAJOR);
 	s->use_touch_minor = evemu_has_event(dev, EV_ABS, ABS_MT_TOUCH_MINOR);

=== modified file 'tools/utouch-frame-test-mtdev.c'
--- tools/utouch-frame-test-mtdev.c	2010-12-30 19:23:24 +0000
+++ tools/utouch-frame-test-mtdev.c	2011-02-08 18:38:51 +0000
@@ -115,41 +115,30 @@
 
 static void report_device_caps(struct frame_test *test)
 {
-#ifdef INPUT_PROP_POINTER
+	struct utouch_surface *s = utouch_frame_get_surface(test->fh);
 	fprintf(stderr, "device props:\n");
-	if (evemu_has_prop(test->evemu, INPUT_PROP_POINTER))
+	if (s->needs_pointer)
 		fprintf(stderr, "\tpointer\n");
-	if (evemu_has_prop(test->evemu, INPUT_PROP_DIRECT))
+	if (s->is_direct)
 		fprintf(stderr, "\tdirect\n");
-	if (evemu_has_prop(test->evemu, INPUT_PROP_BUTTONPAD))
+	if (s->is_buttonpad)
 		fprintf(stderr, "\tbuttonpad\n");
-	if (evemu_has_prop(test->evemu, INPUT_PROP_SEMI_MT))
+	if (s->is_semi_mt)
 		fprintf(stderr, "\tsemi_mt\n");
-#endif
 	fprintf(stderr, "device mt events:\n");
-	if (evemu_has_event(test->evemu, EV_ABS, ABS_MT_SLOT))
-		fprintf(stderr, "\tslot\n");
-	if (evemu_has_event(test->evemu, EV_ABS, ABS_MT_TOUCH_MAJOR))
+	if (s->use_touch_major)
 		fprintf(stderr, "\ttouch_major\n");
-	if (evemu_has_event(test->evemu, EV_ABS, ABS_MT_TOUCH_MINOR))
+	if (s->use_touch_minor)
 		fprintf(stderr, "\ttouch_minor\n");
-	if (evemu_has_event(test->evemu, EV_ABS, ABS_MT_WIDTH_MAJOR))
+	if (s->use_width_major)
 		fprintf(stderr, "\twidth_major\n");
-	if (evemu_has_event(test->evemu, EV_ABS, ABS_MT_WIDTH_MINOR))
+	if (s->use_width_minor)
 		fprintf(stderr, "\twidth_minor\n");
-	if (evemu_has_event(test->evemu, EV_ABS, ABS_MT_ORIENTATION))
+	if (s->use_orientation)
 		fprintf(stderr, "\torientation\n");
-	if (evemu_has_event(test->evemu, EV_ABS, ABS_MT_POSITION_X))
-		fprintf(stderr, "\tposition_x\n");
-	if (evemu_has_event(test->evemu, EV_ABS, ABS_MT_POSITION_Y))
-		fprintf(stderr, "\tposition_y\n");
-	if (evemu_has_event(test->evemu, EV_ABS, ABS_MT_TOOL_TYPE))
-		fprintf(stderr, "\tposition_y\n");
-	if (evemu_has_event(test->evemu, EV_ABS, ABS_MT_TRACKING_ID))
-		fprintf(stderr, "\ttracking_id\n");
-	if (evemu_has_event(test->evemu, EV_ABS, ABS_MT_PRESSURE))
+	if (s->use_pressure)
 		fprintf(stderr, "\tpressure\n");
-	if (evemu_has_event(test->evemu, EV_ABS, ABS_MT_DISTANCE))
+	if (s->use_distance)
 		fprintf(stderr, "\tdistance\n");
 }