Merge lp:~dandrader/unity/lp940612 into lp:unity

[Daniel d'Andrada]

Fix the three-finger move for unity.

Fixes bug #940612.

Updated according to comments from previous proposal.

[Tim Penhey (thumper)]

Please keep the variable type and variable name separate:
  const CompWindowVector &client_list_stacking
should be
  CompWindowVector const& client_list_stacking
(or
  const CompWindowVector& client_list_stacking
   - but my preference is for the first)

> if (client_list_stacking.size() == 0)

can just be:

  if (client_list_stacking.empty())

> int pos_x = (int) fpos_x;

Please don't use C style casts. It isn't needed here (mostly
certain about that).

The do/while loop misses the first element of the vector if there
is more than one element.

A traditional for loop is more idiomatic and understandable.
Also, can remove the window and result temporaries from outside the loop.
And... if using the iterators, you don't need the empty check first
as the initial check makes sure of that too.

for (auto iter = client_list_stacking.rbegin(),
          end = client_list_stacking.rend();
     iter != end; ++iter)
{
    CompWindow* window = *iter;

    if (pos_x >= window->x() && pos_x <= (window->width() + window->x())
        &&
        pos_y >= window->y() && pos_y <= (window->height() + window->y()))
      return window;
}

return nullptr;

review: Needs Fixing

[Daniel d'Andrada (dandrader)]

Updated. The loop sure looks better now.

[Tim Penhey (thumper)]

You don't need this check in the method any more, because it is caught by rbegin() == rend().

171 + if (client_list_stacking.empty())
172 + return nullptr;

Once you push, you don't need to resubmit. Launchpad will just update the diff.

Do we have any tests for this?

Is there any way to "fake" utouch events?

review: Needs Fixing

[Daniel d'Andrada (dandrader)]

> You don't need this check in the method any more, because it is caught by
> rbegin() == rend().
>
> 171 + if (client_list_stacking.empty())
> 172 + return nullptr;

True. Line removed.

> Once you push, you don't need to resubmit. Launchpad will just update the
> diff.

Alright. I've pushed the updated version. Let's see.

> Do we have any tests for this?

No.

> Is there any way to "fake" utouch events?

Only if you do some mocking in a unity test.

But you can record and then replay multitouch events straight out of a /dev/input/eventX file using utouch-evemu-tools (for the recording) and libutouch-evemu1 in your test. But it would be a functional or integration test since several layers would be involved (events coming out of /dev/input/eventX into xserver and then sent as XInput2 events to compiz)

[Tim Penhey (thumper)]

Unless autopilot tests are trivial to add for this, I'd suggest we have a manual test for now.

There is a template in the manual-tests directory.

Code looks fine now.

review: Needs Fixing

[Daniel d'Andrada (dandrader)]

> Unless autopilot tests are trivial to add for this, I'd suggest we have a
> manual test for now.
> [...]

It now has unit tests.

[Tim Penhey (thumper)]

review: Approve

=== modified file 'plugins/unityshell/src/GeisAdapter.cpp'
--- plugins/unityshell/src/GeisAdapter.cpp	2011-12-22 17:52:55 +0000
+++ plugins/unityshell/src/GeisAdapter.cpp	2012-04-04 14:40:28 +0000
@@ -237,9 +237,9 @@
     else if (g_str_equal(attr.name, GEIS_GESTURE_ATTRIBUTE_TIMESTAMP))
       result->timestamp = attr.integer_val;
     else if (g_str_equal(attr.name, GEIS_GESTURE_ATTRIBUTE_FOCUS_X))
-      result->focus_x = attr.integer_val;
+      result->focus_x = attr.float_val;
     else if (g_str_equal(attr.name, GEIS_GESTURE_ATTRIBUTE_FOCUS_Y))
-      result->focus_y = attr.integer_val;
+      result->focus_y = attr.float_val;
     else if (g_str_equal (attr.name, GEIS_GESTURE_ATTRIBUTE_TOUCHES))
       result->touches = attr.integer_val;
     else if (g_str_equal(attr.name, GEIS_GESTURE_ATTRIBUTE_GESTURE_NAME))
@@ -289,9 +289,9 @@
     else if (g_str_equal(attr.name, GEIS_GESTURE_ATTRIBUTE_TIMESTAMP))
       result->timestamp = attr.integer_val;
     else if (g_str_equal(attr.name, GEIS_GESTURE_ATTRIBUTE_FOCUS_X))
-      result->focus_x = attr.integer_val;
+      result->focus_x = attr.float_val;
     else if (g_str_equal(attr.name, GEIS_GESTURE_ATTRIBUTE_FOCUS_Y))
-      result->focus_y = attr.integer_val;
+      result->focus_y = attr.float_val;
     else if (g_str_equal(attr.name, GEIS_GESTURE_ATTRIBUTE_TOUCHES))
       result->touches = attr.integer_val;
     else if (g_str_equal(attr.name, GEIS_GESTURE_ATTRIBUTE_BOUNDINGBOX_X1))
@@ -322,9 +322,9 @@
     else if (g_str_equal(attr.name, GEIS_GESTURE_ATTRIBUTE_TIMESTAMP))
       result->timestamp = attr.integer_val;
     else if (g_str_equal(attr.name, GEIS_GESTURE_ATTRIBUTE_FOCUS_X))
-      result->focus_x = attr.integer_val;
+      result->focus_x = attr.float_val;
     else if (g_str_equal(attr.name, GEIS_GESTURE_ATTRIBUTE_FOCUS_Y))
-      result->focus_y = attr.integer_val;
+      result->focus_y = attr.float_val;
     else if (g_str_equal(attr.name, GEIS_GESTURE_ATTRIBUTE_TOUCHES))
       result->touches = attr.integer_val;
     else if (g_str_equal(attr.name, GEIS_GESTURE_ATTRIBUTE_POSITION_X))
@@ -367,9 +367,9 @@
     else if (g_str_equal(attr.name, GEIS_GESTURE_ATTRIBUTE_TIMESTAMP))
       result->timestamp = attr.integer_val;
     else if (g_str_equal(attr.name, GEIS_GESTURE_ATTRIBUTE_FOCUS_X))
-      result->focus_x = attr.integer_val;
+      result->focus_x = attr.float_val;
     else if (g_str_equal(attr.name, GEIS_GESTURE_ATTRIBUTE_FOCUS_Y))
-      result->focus_y = attr.integer_val;
+      result->focus_y = attr.float_val;
     else if (g_str_equal(attr.name, GEIS_GESTURE_ATTRIBUTE_TOUCHES))
       result->touches = attr.integer_val;
     else if (g_str_equal(attr.name, GEIS_GESTURE_ATTRIBUTE_RADIUS))
@@ -406,9 +406,9 @@
     else if (g_str_equal(attr.name, GEIS_GESTURE_ATTRIBUTE_TIMESTAMP))
       result->timestamp = attr.integer_val;
     else if (g_str_equal(attr.name, GEIS_GESTURE_ATTRIBUTE_FOCUS_X))
-      result->focus_x = attr.integer_val;
+      result->focus_x = attr.float_val;
     else if (g_str_equal(attr.name, GEIS_GESTURE_ATTRIBUTE_FOCUS_Y))
-      result->focus_y = attr.integer_val;
+      result->focus_y = attr.float_val;
     else if (g_str_equal(attr.name, GEIS_GESTURE_ATTRIBUTE_TOUCHES))
       result->touches = attr.integer_val;
     else if (g_str_equal(attr.name, GEIS_GESTURE_ATTRIBUTE_ANGLE))

=== modified file 'plugins/unityshell/src/GeisAdapter.h'
--- plugins/unityshell/src/GeisAdapter.h	2011-08-29 23:36:21 +0000
+++ plugins/unityshell/src/GeisAdapter.h	2012-04-04 14:40:28 +0000
@@ -41,8 +41,8 @@
     Window window;
     int touches;
     int timestamp;
-    int focus_x;
-    int focus_y;
+    float focus_x;
+    float focus_y;
     int tap_length_ms;
     float position_x;
     float position_y;
@@ -59,8 +59,8 @@
     Window window;
     int touches;
     int timestamp;
-    int focus_x;
-    int focus_y;
+    float focus_x;
+    float focus_y;
     float delta_x;
     float delta_y;
     float velocity_x;
@@ -80,8 +80,8 @@
     Window window;
     int touches;
     int timestamp;
-    int focus_x;
-    int focus_y;
+    float focus_x;
+    float focus_y;
     float angle;
     float angle_delta;
     float angle_velocity;
@@ -98,8 +98,8 @@
     Window window;
     int touches;
     int timestamp;
-    int focus_x;
-    int focus_y;
+    float focus_x;
+    float focus_y;
     float radius;
     float radius_delta;
     float radius_velocity;
@@ -116,8 +116,8 @@
     Window window;
     int touches;
     int timestamp;
-    int focus_x;
-    int focus_y;
+    float focus_x;
+    float focus_y;
     float bound_x1;
     float bound_y1;
     float bound_x2;

=== modified file 'plugins/unityshell/src/GestureEngine.cpp'
--- plugins/unityshell/src/GestureEngine.cpp	2012-03-14 06:24:18 +0000
+++ plugins/unityshell/src/GestureEngine.cpp	2012-04-04 14:40:28 +0000
@@ -75,44 +75,26 @@
   }
 }
 
-CompWindow*
-GestureEngine::FindCompWindow(Window window)
+CompWindow* GestureEngine::FindCompWindowAtPos(float fpos_x, float fpos_y)
 {
-  CompWindow* result = _screen->findTopLevelWindow(window);
-
-  while (!result)
-  {
-    Window parent, root;
-    Window* children = NULL;
-    unsigned int nchildren;
-    Status status;
-
-    status = XQueryTree(_screen->dpy(), window, &root, &parent, &children, &nchildren);
-    if (status == 0)
-      break;
-
-    if (children)
-      XFree(children);
-
-    // parent will be zero when the window passed to this method is already the
-    // root one.
-    if (parent == root || parent == 0)
-      break;
-
-    window = parent;
-    result = _screen->findTopLevelWindow(window);
-  }
-
-  if (result)
-  {
-    if (!(result->type() & (CompWindowTypeUtilMask |
-                            CompWindowTypeNormalMask |
-                            CompWindowTypeDialogMask |
-                            CompWindowTypeModalDialogMask)))
-      result = 0;
-  }
-
-  return result;
+  const CompWindowVector& client_list_stacking = _screen->clientList(true);
+
+  int pos_x = fpos_x;
+  int pos_y = fpos_y;
+
+  for (auto iter = client_list_stacking.rbegin(),
+       end = client_list_stacking.rend();
+       iter != end; ++iter)
+  {
+    CompWindow* window = *iter;
+
+    if (pos_x >= window->x() && pos_x <= (window->width() + window->x())
+        &&
+        pos_y >= window->y() && pos_y <= (window->height() + window->y()))
+      return window;
+  }
+
+  return nullptr;
 }
 
 void
@@ -120,7 +102,7 @@
 {
   if (data->touches == 3)
   {
-    _drag_window = FindCompWindow(data->window);
+    _drag_window = FindCompWindowAtPos(data->focus_x, data->focus_y);
 
 
     if (!_drag_window)
@@ -222,7 +204,7 @@
 {
   if (data->touches == 3 && data->window != 0)
   {
-    CompWindow* result = FindCompWindow(data->window);
+    CompWindow* result = FindCompWindowAtPos(data->focus_x, data->focus_y);
 
     if (result)
     {
@@ -256,7 +238,7 @@
 {
   if (data->touches == 3)
   {
-    _pinch_window = FindCompWindow(data->window);
+    _pinch_window = FindCompWindowAtPos(data->focus_x, data->focus_y);
 
     if (!_pinch_window)
       return;

=== modified file 'plugins/unityshell/src/GestureEngine.h'
--- plugins/unityshell/src/GestureEngine.h	2011-09-28 14:31:35 +0000
+++ plugins/unityshell/src/GestureEngine.h	2012-04-04 14:40:28 +0000
@@ -23,7 +23,6 @@
 #include <core/core.h>
 
 #include <sigc++/sigc++.h>
-#include <Nux/Nux.h>
 #include "GeisAdapter.h"
 
 class GestureEngine : public sigc::trackable
@@ -52,7 +51,7 @@
 
   void EndDrag();
 private:
-  CompWindow* FindCompWindow(Window window);
+  CompWindow* FindCompWindowAtPos(float pos_x, float pos_y);
 
   CompScreen* _screen;
   CompWindow* _drag_window;

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2012-03-31 10:47:22 +0000
+++ tests/CMakeLists.txt	2012-04-04 14:40:28 +0000
@@ -34,7 +34,6 @@
 add_definitions (${CFLAGS})
 
 set (LIBS ${TEST_UNIT_DEPS_LIBRARIES} "-lunity-core-${UNITY_API_VERSION} -lm")
-link_libraries (${LIBS})
 
 set (LIB_PATHS ${TEST_UNIT_DEPS_LIBRARY_DIRS})
 link_directories (${CMAKE_BINARY_DIR}/UnityCore ${LIB_PATHS})
@@ -72,6 +71,7 @@
                 ${CMAKE_CURRENT_BINARY_DIR}/panel-marshal.c
                 ${UNITY_SRC}/ubus-server.cpp
                 )
+target_link_libraries (test-unit ${LIBS})
 add_dependencies (test-unit unity-core-${UNITY_API_VERSION})
 add_subdirectory (test-input-remover)
 add_subdirectory (test-minimize-window-handler)
@@ -110,6 +110,7 @@
                  test_service_main.c
                  test_service_model.c
                  test_service_model.h)
+  target_link_libraries(test-gtest-service ${LIBS})
   add_dependencies (test-gtest-service unity-core-${UNITY_API_VERSION} gtest)
 
 
@@ -166,7 +167,7 @@
                  ${CMAKE_SOURCE_DIR}/plugins/unity-mt-grab-handles/src/unity-mt-grab-handle-layout.cpp
                  ${CMAKE_SOURCE_DIR}/plugins/unity-mt-grab-handles/src/unity-mt-texture.cpp
                  )
-  target_link_libraries(test-gtest-xless gtest ${GMOCK_LIB} ${GMOCK_MAIN_LIB})
+  target_link_libraries(test-gtest-xless gtest ${GMOCK_LIB} ${GMOCK_MAIN_LIB} ${LIBS})
   add_test(UnityGTestXless test-gtest-xless)
   add_dependencies(test-gtest-xless unity-core-${UNITY_API_VERSION} gtest)
 
@@ -184,7 +185,7 @@
                  test_ratings_filter.cpp
                  test_results.cpp
                 )
-  target_link_libraries(test-gtest-dbus gtest)
+  target_link_libraries(test-gtest-dbus gtest ${LIBS})
   add_test(UnityGTestDBus test-gtest-dbus)
   add_dependencies(test-gtest-dbus unity-core-${UNITY_API_VERSION} test-gtest-service gtest)
 
@@ -246,7 +247,7 @@
                  ${UNITY_SRC}/UScreen.cpp
                  ${UNITY_SRC}/WindowManager.cpp
                 )
-  target_link_libraries(test-gtest gtest)
+  target_link_libraries(test-gtest gtest ${LIBS})
   add_test(UnityGTest test-gtest)
   add_dependencies(test-gtest unity-core-${UNITY_API_VERSION} gtest)
 
@@ -254,6 +255,8 @@
        GMOCK_LIB AND
        GMOCK_MAIN_LIB)
 
+add_subdirectory (test-gesture-engine)
+
 #
 # check target
 #
@@ -263,21 +266,25 @@
 set (GTEST_TEST_COMMAND ./test-gtest)
 set (GTEST_TEST_COMMAND_XLESS ./test-gtest-xless)
 set (GTEST_TEST_COMMAND_DBUS dbus-test-runner --task ./test-gtest-service --task ./test-gtest-dbus)
+set (GTEST_TEST_COMMAND_GESTURE_ENGINE ./test-gesture-engine/test-gesture-engine)
 
 set (TEST_COMMAND
      gtester --verbose -k --g-fatal-warnings -o=${TEST_RESULT_XML} ./test-unit
   && ${GTEST_TEST_COMMAND}
   && ${GTEST_TEST_COMMAND_XLESS}
-  && ${GTEST_TEST_COMMAND_DBUS})
+  && ${GTEST_TEST_COMMAND_GESTURE_ENGINE}
+  && ${GTEST_TEST_COMMAND_DBUS}
+    )
 
 set (TEST_COMMAND_HEADLESS
      ${GTEST_TEST_COMMAND_XLESS}
+  && ${GTEST_TEST_COMMAND_GESTURE_ENGINE}
   #&& ${GTEST_TEST_COMMAND_DBUS}
   && echo "Warning, DBus test cases are disabled!!")
 
 if (GTEST_SRC_DIR)
-  add_custom_target (check COMMAND  ${TEST_COMMAND} DEPENDS test-unit test-gtest test-gtest-xless test-gtest-dbus)
-  add_custom_target (check-headless COMMAND ${TEST_COMMAND_HEADLESS} DEPENDS test-gtest-xless test-gtest-dbus)
+  add_custom_target (check COMMAND  ${TEST_COMMAND} DEPENDS test-unit test-gtest test-gtest-xless test-gtest-dbus test-gesture-engine)
+  add_custom_target (check-headless COMMAND ${TEST_COMMAND_HEADLESS} DEPENDS test-gtest-xless test-gtest-dbus test-gesture-engine)
   add_custom_target (check-report COMMAND ${TEST_UNIT_COMMAND} && gtester-report ${TEST_RESULT_XML} > ${TEST_RESULT_HTML})
   add_custom_target (gcheck COMMAND  ${DBUS_TEST_COMMAND} DEPENDS test-gtest test-gtest-xless)
 else (GTEST_SRC_DIR)

=== added directory 'tests/test-gesture-engine'
=== added file 'tests/test-gesture-engine/CMakeLists.txt'
--- tests/test-gesture-engine/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/test-gesture-engine/CMakeLists.txt	2012-04-04 14:40:28 +0000
@@ -0,0 +1,40 @@
+if (GTEST_SRC_DIR)
+  set(UNITY_SRC ${CMAKE_SOURCE_DIR}/plugins/unityshell/src)
+
+  add_custom_command(OUTPUT GestureEngine.cpp GestureEngine.h UBusMessages.h
+                     COMMAND cp ${UNITY_SRC}/GestureEngine.cpp ${UNITY_SRC}/GestureEngine.h ${UNITY_SRC}/UBusMessages.h ${CMAKE_CURRENT_BINARY_DIR}
+                     COMMAND sed -f ${CMAKE_CURRENT_SOURCE_DIR}/sed_script ${UNITY_SRC}/GestureEngine.cpp > ${CMAKE_CURRENT_BINARY_DIR}/GestureEngine.cpp
+                     COMMAND sed -f ${CMAKE_CURRENT_SOURCE_DIR}/sed_script ${UNITY_SRC}/GestureEngine.h > ${CMAKE_CURRENT_BINARY_DIR}/GestureEngine.h
+                     DEPENDS ${UNITY_SRC}/GestureEngine.cpp ${UNITY_SRC}/GestureEngine.h ${UNITY_SRC}/UBusMessages.h
+                     COMMENT "Copying GestureEngine source.")
+
+  # Clean-up includes and definitions made in ../CmakeLists.txt
+  remove_definitions(${CFLAGS})
+  set_directory_properties(PROPERTY INCLUDE_DIRECTORIES "")
+  # And make our own
+  pkg_check_modules (TEST_GESTURE_ENGINE_DEPS REQUIRED QUIET "${UNITY_PLUGIN_DEPS}")
+  set(TEST_GESTURE_ENGINE_CFLAGS
+      "-g"
+      "-I${CMAKE_CURRENT_SOURCE_DIR}"
+      "-I${CMAKE_CURRENT_BINARY_DIR}"
+      ${TEST_GESTURE_ENGINE_DEPS_CFLAGS}
+     )
+  add_definitions(${TEST_GESTURE_ENGINE_CFLAGS})
+
+  pkg_check_modules (COMPIZ REQUIRED QUIET compiz)
+  link_directories (${COMPIZ_LIBDIR})
+
+  add_executable(test-gesture-engine
+                 test_gesture_engine.cpp
+                 X11_mock.cpp
+                 GestureEngine.cpp
+                 PluginAdapterMock.cpp
+                 GeisAdapterMock.cpp
+                 ubus-server-mock.cpp
+                )
+  target_link_libraries(test-gesture-engine gtest ${TEST_GESTURE_ENGINE_DEPS_LIBRARIES} -lcompiz_core)
+  add_test(UnityGTestGestureEngine test-gesture-engine)
+  add_dependencies(test-gesture-engine gtest)
+
+  add_custom_target (check-gesture-engine COMMAND ./test-gesture-engine DEPENDS test-gesture-engine)
+endif (GTEST_SRC_DIR)

=== added file 'tests/test-gesture-engine/GeisAdapterMock.cpp'
--- tests/test-gesture-engine/GeisAdapterMock.cpp	1970-01-01 00:00:00 +0000
+++ tests/test-gesture-engine/GeisAdapterMock.cpp	2012-04-04 14:40:28 +0000
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2012 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the  Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 3 along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>
+ *
+ * Authored by: Daniel d'Andrada <[e-mail]>
+ *
+ */
+
+#include "GeisAdapterMock.h"
+
+GeisAdapterMock *GeisAdapterMock::_default = 0;
+
+GeisAdapterMock* GeisAdapterMock::Default() {
+  if (!_default) {
+    _default = new GeisAdapterMock;
+  }
+  return _default;
+}

=== added file 'tests/test-gesture-engine/GeisAdapterMock.h'
--- tests/test-gesture-engine/GeisAdapterMock.h	1970-01-01 00:00:00 +0000
+++ tests/test-gesture-engine/GeisAdapterMock.h	2012-04-04 14:40:28 +0000
@@ -0,0 +1,148 @@
+/*
+ * Copyright 2012 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the  Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 3 along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>
+ *
+ * Authored by: Daniel d'Andrada <[e-mail]>
+ *
+ */
+
+#ifndef GEISADAPTER_MOCK_H
+#define GEISADAPTER_MOCK_H
+
+#include <sigc++/sigc++.h>
+#include <X11/Xlib.h>
+
+class GeisAdapterMock : public sigc::trackable
+{
+public:
+  static GeisAdapterMock* Default();
+
+  ~GeisAdapterMock() {}
+
+  typedef struct _GeisTapData
+  {
+    int id;
+    int device_id;
+    Window window;
+    int touches;
+    int timestamp;
+    float focus_x;
+    float focus_y;
+    int tap_length_ms;
+    float position_x;
+    float position_y;
+    float bound_x1;
+    float bound_y1;
+    float bound_x2;
+    float bound_y2;
+  } GeisTapData;
+
+  typedef struct _GeisDragData
+  {
+    int id;
+    int device_id;
+    Window window;
+    int touches;
+    int timestamp;
+    float focus_x;
+    float focus_y;
+    float delta_x;
+    float delta_y;
+    float velocity_x;
+    float velocity_y;
+    float position_x;
+    float position_y;
+    float bound_x1;
+    float bound_y1;
+    float bound_x2;
+    float bound_y2;
+  } GeisDragData;
+
+  typedef struct _GeisRotateData
+  {
+    int id;
+    int device_id;
+    Window window;
+    int touches;
+    int timestamp;
+    float focus_x;
+    float focus_y;
+    float angle;
+    float angle_delta;
+    float angle_velocity;
+    float bound_x1;
+    float bound_y1;
+    float bound_x2;
+    float bound_y2;
+  } GeisRotateData;
+
+  typedef struct _GeisPinchData
+  {
+    int id;
+    int device_id;
+    Window window;
+    int touches;
+    int timestamp;
+    float focus_x;
+    float focus_y;
+    float radius;
+    float radius_delta;
+    float radius_velocity;
+    float bound_x1;
+    float bound_y1;
+    float bound_x2;
+    float bound_y2;
+  } GeisPinchData;
+
+  typedef struct _GeisTouchData
+  {
+    int id;
+    int device_id;
+    Window window;
+    int touches;
+    int timestamp;
+    float focus_x;
+    float focus_y;
+    float bound_x1;
+    float bound_y1;
+    float bound_x2;
+    float bound_y2;
+  } GeisTouchData;
+
+  sigc::signal<void, GeisTapData*> tap;
+
+  sigc::signal<void, GeisDragData*> drag_start;
+  sigc::signal<void, GeisDragData*> drag_update;
+  sigc::signal<void, GeisDragData*> drag_finish;
+
+  sigc::signal<void, GeisRotateData*> rotate_start;
+  sigc::signal<void, GeisRotateData*> rotate_update;
+  sigc::signal<void, GeisRotateData*> rotate_finish;
+
+  sigc::signal<void, GeisPinchData*> pinch_start;
+  sigc::signal<void, GeisPinchData*> pinch_update;
+  sigc::signal<void, GeisPinchData*> pinch_finish;
+
+  sigc::signal<void, GeisTouchData*> touch_start;
+  sigc::signal<void, GeisTouchData*> touch_update;
+  sigc::signal<void, GeisTouchData*> touch_finish;
+
+private:
+  GeisAdapterMock() {}
+
+  static GeisAdapterMock* _default;
+
+};
+#endif

=== added file 'tests/test-gesture-engine/PluginAdapterMock.cpp'
--- tests/test-gesture-engine/PluginAdapterMock.cpp	1970-01-01 00:00:00 +0000
+++ tests/test-gesture-engine/PluginAdapterMock.cpp	2012-04-04 14:40:28 +0000
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2012 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the  Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 3 along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>
+ *
+ * Authored by: Daniel d'Andrada <[e-mail]>
+ *
+ */
+
+#include "PluginAdapterMock.h"
+
+PluginAdapterMock *PluginAdapterMock::_default = 0;
+
+PluginAdapterMock *PluginAdapterMock::Default() {
+  if (!_default) {
+    _default = new PluginAdapterMock;
+  }
+  return _default;
+}
+
+void PluginAdapterMock::ShowGrabHandles(CompWindowMock* window, bool use_timer) {
+}

=== added file 'tests/test-gesture-engine/PluginAdapterMock.h'
--- tests/test-gesture-engine/PluginAdapterMock.h	1970-01-01 00:00:00 +0000
+++ tests/test-gesture-engine/PluginAdapterMock.h	2012-04-04 14:40:28 +0000
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2012 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the  Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 3 along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>
+ *
+ * Authored by: Daniel d'Andrada <[e-mail]>
+ *
+ */
+
+#ifndef PLUGINADAPTER_MOCK_H
+#define PLUGINADAPTER_MOCK_H
+
+#include <compiz_mock/core/core.h>
+
+class PluginAdapterMock {
+public:
+  static PluginAdapterMock *Default();
+
+  void ShowGrabHandles(CompWindowMock* window, bool use_timer);
+
+private:
+  PluginAdapterMock() {}
+  static PluginAdapterMock* _default;
+};
+
+#endif

=== added file 'tests/test-gesture-engine/X11_mock.cpp'
--- tests/test-gesture-engine/X11_mock.cpp	1970-01-01 00:00:00 +0000
+++ tests/test-gesture-engine/X11_mock.cpp	2012-04-04 14:40:28 +0000
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2012 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the  Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 3 along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>
+ *
+ * Authored by: Daniel d'Andrada <[e-mail]>
+ *
+ */
+
+#include <X11/Xlib.h>
+
+Cursor XCreateFontCursorMock(Display * /*display*/, unsigned int /*shape*/) {
+    return 1;
+}
+
+int XFreeCursorMock(Display * /*display*/, Cursor /*cursor*/) {
+    return 1;
+}
+
+int XSyncMock(Display *display, Bool discard) {
+  return 1;
+}
+
+int XWarpPointerMock(Display *display, Window src_w, Window dest_w,
+                     int src_x, int src_y,
+                     unsigned int src_width, unsigned int src_height,
+                     int dest_x, int dest_y) {
+  return 1;
+}

=== added file 'tests/test-gesture-engine/X11_mock.h'
--- tests/test-gesture-engine/X11_mock.h	1970-01-01 00:00:00 +0000
+++ tests/test-gesture-engine/X11_mock.h	2012-04-04 14:40:28 +0000
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2012 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the  Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 3 along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>
+ *
+ * Authored by: Daniel d'Andrada <[e-mail]>
+ *
+ */
+
+#ifndef X11_MOCK_H
+#define X11_MOCK_H
+
+#include <X11/Xlib.h>
+
+Cursor XCreateFontCursorMock(Display *display, unsigned int shape);
+
+int XFreeCursorMock(Display *display, Cursor cursor);
+
+int XSyncMock(Display *display, Bool discard);
+
+int XWarpPointerMock(Display *display, Window src_w, Window dest_w,
+                     int src_x, int src_y,
+                     unsigned int src_width, unsigned int src_height,
+                     int dest_x, int dest_y);
+
+#endif // X11_MOCK_H

=== added directory 'tests/test-gesture-engine/compiz_mock'
=== added directory 'tests/test-gesture-engine/compiz_mock/core'
=== added file 'tests/test-gesture-engine/compiz_mock/core/core.h'
--- tests/test-gesture-engine/compiz_mock/core/core.h	1970-01-01 00:00:00 +0000
+++ tests/test-gesture-engine/compiz_mock/core/core.h	2012-04-04 14:40:28 +0000
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2012 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the  Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 3 along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>
+ *
+ * Authored by: Daniel d'Andrada <[e-mail]>
+ *
+ */
+
+#ifndef COMPIZ_CORE_MOCK_H
+#define COMPIZ_CORE_MOCK_H
+
+#include <X11_mock.h>
+
+#include <compiz_mock/core/window.h>
+#include <compiz_mock/core/screen.h>
+
+#endif

=== added file 'tests/test-gesture-engine/compiz_mock/core/screen.h'
--- tests/test-gesture-engine/compiz_mock/core/screen.h	1970-01-01 00:00:00 +0000
+++ tests/test-gesture-engine/compiz_mock/core/screen.h	2012-04-04 14:40:28 +0000
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2012 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the  Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 3 along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>
+ *
+ * Authored by: Daniel d'Andrada <[e-mail]>
+ *
+ */
+
+#ifndef COMPIZ_SCREEN_MOCK_H
+#define COMPIZ_SCREEN_MOCK_H
+
+#include <X11/Xlib.h>
+#include <vector>
+
+// The real CompScreen
+#include <core/screen.h>
+
+typedef std::vector<CompWindowMock*> CompWindowMockVector;
+
+class CompScreenMock {
+public:
+  typedef int GrabHandle;
+
+  int width() const {return _width;}
+  int height() const {return _height;}
+
+  Display *dpy() {return _dpy;}
+
+  const CompWindowMockVector & clientList(bool stackingOrder = true) {
+    if (stackingOrder)
+      return _client_list_stacking;
+    else
+      return _client_list;
+  }
+
+  Window root() {return _root;}
+
+  GrabHandle pushGrab(Cursor cursor, const char *name) {return 0;}
+  void removeGrab(GrabHandle handle, CompPoint *restorePointer) {}
+
+  Cursor invisibleCursor() {return 1;}
+
+  int _width;
+  int _height;
+  Display *_dpy;
+  CompWindowMockVector _client_list;
+  CompWindowMockVector _client_list_stacking;
+  Window _root;
+};
+
+extern CompScreenMock *screen_mock;
+extern int pointerX_mock;
+extern int pointerY_mock;
+
+#endif
+

=== added file 'tests/test-gesture-engine/compiz_mock/core/window.h'
--- tests/test-gesture-engine/compiz_mock/core/window.h	1970-01-01 00:00:00 +0000
+++ tests/test-gesture-engine/compiz_mock/core/window.h	2012-04-04 14:40:28 +0000
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2012 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the  Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 3 along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>
+ *
+ * Authored by: Daniel d'Andrada <[e-mail]>
+ *
+ */
+
+#ifndef COMPIZ_WINDOW_MOCK_H
+#define COMPIZ_WINDOW_MOCK_H
+
+/* The real CompWindow */
+#include <core/window.h>
+
+class CompWindowMock {
+public:
+  CompWindowMock() : _moved(false) {}
+
+  int x() const {return _geometry.x();}
+  int y() const {return _geometry.y();}
+  int width() const {return _geometry.width() + (_geometry.border()*2);}
+  int height() const {return _geometry.height() + (_geometry.border()*2);}
+
+  void move(int dx, int dy, bool immediate = true) {
+    _moved = true;
+    _movement_x = dx;
+    _movement_y = dy;
+  }
+
+  unsigned int actions () {return _actions;}
+
+  void maximize(int state) {}
+
+  /* OBS: I wonder why it returns a reference */
+  unsigned int &state() {return _state;}
+
+  void grabNotify(int x, int y, unsigned int state, unsigned int mask) {}
+  void ungrabNotify() {}
+
+  void syncPosition() {}
+
+  compiz::window::Geometry &serverGeometry() {return _serverGeometry;}
+
+  unsigned int _actions;
+  unsigned int _state;
+  compiz::window::Geometry _serverGeometry;
+  compiz::window::Geometry _geometry;
+
+  bool _moved;
+  int _movement_x;
+  int _movement_y;
+};
+
+#endif

=== added file 'tests/test-gesture-engine/sed_script'
--- tests/test-gesture-engine/sed_script	1970-01-01 00:00:00 +0000
+++ tests/test-gesture-engine/sed_script	2012-04-04 14:40:28 +0000
@@ -0,0 +1,14 @@
+s|<core/core.h>|<compiz_mock/core/core.h>|
+s|\<CompScreen\>|CompScreenMock|g
+s|\<CompWindow\>|CompWindowMock|g
+s|\<CompWindowVector\>|CompWindowMockVector|g
+s|\<screen\>|screen_mock|g
+s|\<pointerX\>|pointerX_mock|g
+s|\<pointerY\>|pointerY_mock|g
+s|\<XSync\>|XSyncMock|g
+s|\<XWarpPointer\>|XWarpPointerMock|g
+s|\<XFreeCursor\>|XFreeCursorMock|g
+s|\<XCreateFontCursor\>|XCreateFontCursorMock|g
+s|\<GeisAdapter\>|GeisAdapterMock|g
+s|\<PluginAdapter\>|PluginAdapterMock|g
+s|\<ubus-server.h\>|ubus-server-mock.h|g

=== added file 'tests/test-gesture-engine/test_gesture_engine.cpp'
--- tests/test-gesture-engine/test_gesture_engine.cpp	1970-01-01 00:00:00 +0000
+++ tests/test-gesture-engine/test_gesture_engine.cpp	2012-04-04 14:40:28 +0000
@@ -0,0 +1,165 @@
+/*
+ * Copyright 2012 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the  Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 3 along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>
+ *
+ * Authored by: Daniel d'Andrada <[e-mail]>
+ *
+ */
+
+#include <gtest/gtest.h>
+#include <compiz_mock/core/core.h>
+#include "GestureEngine.h"
+
+CompScreenMock concrete_screen_mock;
+CompScreenMock *screen_mock = &concrete_screen_mock;
+int pointerX_mock = 0;
+int pointerY_mock = 0;
+
+class GestureEngineTest : public ::testing::Test {
+ protected:
+  virtual void SetUp() {
+    screen_mock->_width = 1280;
+    screen_mock->_height = 1024;
+
+    GenerateWindows();
+  }
+
+ private:
+  void GenerateWindows() {
+    /* remove windows from previous test */
+    for (auto window : screen_mock->_client_list_stacking) {
+      delete window;
+    }
+    screen_mock->_client_list_stacking.clear();
+
+    /* and generate new ones */
+    CompWindowMock *window;
+
+    /* the root window */
+    window = new CompWindowMock;
+    /* x, y, width, height, border */
+    window->_geometry.set(0, 0, screen_mock->width(), screen_mock->height(), 0);
+    window->_serverGeometry = window->_geometry;
+    window->_actions = 0;
+    window->_state = 0;
+    screen_mock->_client_list_stacking.push_back(window);
+
+    /* middle window */
+    window = new CompWindowMock;
+    window->_geometry.set(10, 10, 400, 400, 0);
+    window->_serverGeometry = window->_geometry;
+    window->_actions = CompWindowActionMoveMask;
+    window->_state = 0;
+    screen_mock->_client_list_stacking.push_back(window);
+
+    /* top-level window */
+    window = new CompWindowMock;
+    window->_geometry.set(500, 500, 410, 410, 0);
+    window->_serverGeometry = window->_geometry;
+    window->_actions = CompWindowActionMoveMask;
+    window->_state = 0;
+    screen_mock->_client_list_stacking.push_back(window);
+
+    screen_mock->_client_list = screen_mock->_client_list_stacking;
+    std::reverse(screen_mock->_client_list.begin(),
+                 screen_mock->_client_list.end());
+  }
+};
+
+TEST_F(GestureEngineTest, ThreeFingersDragMovesWindow)
+{
+  GestureEngine gestureEngine(screen_mock);
+  CompWindowMock *middle_window = screen_mock->_client_list_stacking[1];
+
+  GeisAdapterMock::GeisTouchData touch_data;
+  touch_data.id = 1;
+  touch_data.touches = 3;
+  touch_data.window = 123;
+  touch_data.focus_x = 100; /* hits the middle window */
+  touch_data.focus_y = 100;
+  gestureEngine.OnTouchStart(&touch_data);
+
+  GeisAdapterMock::GeisDragData drag_data;
+  drag_data.id = 1;
+  drag_data.touches = 3;
+  drag_data.window = 123;
+  drag_data.focus_x = 100; /* hits the middle window */
+  drag_data.focus_y = 100;
+  gestureEngine.OnDragStart(&drag_data);
+
+  ASSERT_FALSE(middle_window->_moved);
+
+  touch_data.focus_x += 10;
+  touch_data.focus_y += 20;
+  gestureEngine.OnTouchUpdate(&touch_data);
+
+  drag_data.delta_x = 10;
+  drag_data.delta_y = 20;
+  drag_data.focus_x += drag_data.delta_x;
+  drag_data.focus_y += drag_data.delta_x;
+  gestureEngine.OnDragUpdate(&drag_data);
+
+  ASSERT_TRUE(middle_window->_moved);
+  ASSERT_EQ(drag_data.delta_x, middle_window->_movement_x);
+  ASSERT_EQ(drag_data.delta_y, middle_window->_movement_y);
+}
+
+TEST_F(GestureEngineTest, ThreeFingersDragDoesntMoveStaticWindow)
+{
+  GestureEngine gestureEngine(screen_mock);
+  CompWindowMock *middle_window = screen_mock->_client_list_stacking[1];
+
+  /* can't be moved */
+  middle_window->_actions = 0;
+
+  GeisAdapterMock::GeisTouchData touch_data;
+  touch_data.id = 1;
+  touch_data.touches = 3;
+  touch_data.window = 123;
+  touch_data.focus_x = 100; /* hits the middle window */
+  touch_data.focus_y = 100;
+  gestureEngine.OnTouchStart(&touch_data);
+
+  GeisAdapterMock::GeisDragData drag_data;
+  drag_data.id = 1;
+  drag_data.touches = 3;
+  drag_data.window = 123;
+  drag_data.focus_x = 100; /* hits the middle window */
+  drag_data.focus_y = 100;
+  gestureEngine.OnDragStart(&drag_data);
+
+  ASSERT_FALSE(middle_window->_moved);
+
+  touch_data.focus_x += 10;
+  touch_data.focus_y += 20;
+  gestureEngine.OnTouchUpdate(&touch_data);
+
+  drag_data.delta_x = 10;
+  drag_data.delta_y = 20;
+  drag_data.focus_x += drag_data.delta_x;
+  drag_data.focus_y += drag_data.delta_x;
+  gestureEngine.OnDragUpdate(&drag_data);
+
+  ASSERT_FALSE(middle_window->_moved);
+}
+
+int main(int argc, char** argv)
+{
+  ::testing::InitGoogleTest(&argc, argv);
+
+  int ret = RUN_ALL_TESTS();
+
+  return ret;
+}

=== added file 'tests/test-gesture-engine/ubus-server-mock.cpp'
--- tests/test-gesture-engine/ubus-server-mock.cpp	1970-01-01 00:00:00 +0000
+++ tests/test-gesture-engine/ubus-server-mock.cpp	2012-04-04 14:40:28 +0000
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2012 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the  Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 3 along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>
+ *
+ * Authored by: Daniel d'Andrada <[e-mail]>
+ *
+ */
+
+#include <ubus-server-mock.h>
+
+UBusServer default_server;
+
+UBusServer* ubus_server_get_default() {
+  return &default_server;
+}
+
+void ubus_server_send_message(UBusServer*   server,
+                              const gchar*  message,
+                              GVariant*     data) {
+}

=== added file 'tests/test-gesture-engine/ubus-server-mock.h'
--- tests/test-gesture-engine/ubus-server-mock.h	1970-01-01 00:00:00 +0000
+++ tests/test-gesture-engine/ubus-server-mock.h	2012-04-04 14:40:28 +0000
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2012 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the  Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 3 along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>
+ *
+ * Authored by: Daniel d'Andrada <[e-mail]>
+ *
+ */
+
+#ifndef UBUS_SERVER_MOCK_H
+#define UBUS_SERVER_MOCK_H
+
+#include <glib-object.h>
+#include <glib.h>
+
+class UBusServer {
+};
+
+UBusServer* ubus_server_get_default();
+
+void ubus_server_send_message(UBusServer*   server,
+                              const gchar*  message,
+                              GVariant*     data);
+#endif // UBUS_SERVER_MOCK_H