Merge lp:~fboucault/unity-2d/fix_geis_gesture_names into lp:unity-2d/3.0

[Florian Boucault]

[touch] Fixed multitouch gestures handling that broke due to an API change in utouch-geis.

Since an unknown new version of utouch-geis, that has landed in Ubuntu Natty, geis gestures's GEIS_GESTURE_ATTRIBUTE_GESTURE_NAME has changed slightly to include the number of fingers. Example:

Before: "Tap"
After: "Tap,touch=4"

[Olivier Tilloy (osomon)]

My testing abilities are limited because I’m not running Natty natively on my macbook yet, therefore the trackpad doesn’t work in a virtual machine. So I’ll take your word for it that it fixes touch support on Natty.

However I did as many sanity checks as possible on your changes, and they look sane and complete. The code compiles both on Maverick and Natty, but it (silently) breaks touch support on Maverick: this change should *not* be backported to Maverick, unless the corresponding version of libutouch-geis is backported too.

review: Approve

=== modified file 'launcher/app/gesturehandler.cpp'
--- launcher/app/gesturehandler.cpp	2011-03-04 10:23:26 +0000
+++ launcher/app/gesturehandler.cpp	2011-03-12 15:20:00 +0000
@@ -193,9 +193,8 @@
                                   QHash<QString, GeisGestureAttr> attributes)
 {
     QString gestureName = attributes[GEIS_GESTURE_ATTRIBUTE_GESTURE_NAME].string_val;
-    int touches = attributes[GEIS_GESTURE_ATTRIBUTE_TOUCHES].integer_val;
 
-    if (gestureName == GEIS_GESTURE_PINCH && touches == 3) {
+    if (gestureName == GEIS_GESTURE_TYPE_PINCH3) {
         /* 3 fingers pinch inwards shows the workspace switcher (zoom out showing all workspaces)
            3 fingers pinch outwards (also called 'spread' by designers) hides the workspace switcher (zoom in a workspace)
          */
@@ -208,7 +207,7 @@
 
         m_pinchPreviousRadius = attributes[GEIS_GESTURE_ATTRIBUTE_RADIUS].float_val;
         m_pinchPreviousTimestamp = attributes[GEIS_GESTURE_ATTRIBUTE_TIMESTAMP].integer_val;
-    } else if (gestureName == GEIS_GESTURE_DRAG && touches == 4) {
+    } else if (gestureName == GEIS_GESTURE_TYPE_DRAG4) {
         /* 4 fingers drag reveals the launcher progressively; if the drag goes far
            enough, the launcher is then locked in place and does not autohide anymore */
         /* FIXME: only supports the launcher positioned on the left edge of the screen */
@@ -222,12 +221,11 @@
                                    QHash<QString, GeisGestureAttr> attributes)
 {
     QString gestureName = attributes[GEIS_GESTURE_ATTRIBUTE_GESTURE_NAME].string_val;
-    int touches = attributes[GEIS_GESTURE_ATTRIBUTE_TOUCHES].integer_val;
 
-    if (gestureName == GEIS_GESTURE_TAP && touches == 4) {
+    if (gestureName == GEIS_GESTURE_TYPE_TAP4) {
         /* 4 fingers tap toggles the dash on and off */
         toggleDash();
-    } else if (gestureName == GEIS_GESTURE_PINCH && touches == 3) {
+    } else if (gestureName == GEIS_GESTURE_TYPE_PINCH3) {
         /* Continuing a 3 fingers pinch inwards/outwards shows/hides the workspace switcher. */
         int timestamp = attributes[GEIS_GESTURE_ATTRIBUTE_TIMESTAMP].integer_val;
         float radius = attributes[GEIS_GESTURE_ATTRIBUTE_RADIUS].float_val;
@@ -256,7 +254,7 @@
             m_pinchPreviousRadius = radius;
             m_pinchPreviousTimestamp = timestamp;
         }
-    } else if (gestureName == GEIS_GESTURE_DRAG && touches == 4) {
+    } else if (gestureName == GEIS_GESTURE_TYPE_DRAG4) {
         /* FIXME: only supports the launcher positioned on the left edge of the screen */
         m_dragDelta += attributes[GEIS_GESTURE_ATTRIBUTE_DELTA_X].float_val;
         m_launcher->setDelta(m_dragDelta);
@@ -276,9 +274,8 @@
                                    QHash<QString, GeisGestureAttr> attributes)
 {
     QString gestureName = attributes[GEIS_GESTURE_ATTRIBUTE_GESTURE_NAME].string_val;
-    int touches = attributes[GEIS_GESTURE_ATTRIBUTE_TOUCHES].integer_val;
 
-    if (gestureName == GEIS_GESTURE_DRAG && touches == 4) {
+    if (gestureName == GEIS_GESTURE_TYPE_DRAG4) {
         m_dragDelta += attributes[GEIS_GESTURE_ATTRIBUTE_DELTA_X].float_val;
         m_launcher->setDelta(m_dragDelta);
         m_launcher->setManualSliding(false);