Merge lp:~alan-griffiths/mir/port-window-management-example-to-current-input-API into lp:mir

[Alan Griffiths]

examples: Port window management off of legacy input events

examples: Port window management off of legacy input events

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2310
http://jenkins.qa.ubuntu.com/job/mir-ci/2943/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1257
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1256
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1213
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/940
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/940/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1213
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1213/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/4254
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17915

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/2943/rebuild

review: Approve (continuous-integration)

[Robert Carr (robertcarr)]

LGTM

review: Approve

[Andreas Pokorny (andreas-pokorny)]

ack, and especially the follow up branch looks good

review: Approve

=== modified file 'examples/server_example_window_management.cpp'
--- examples/server_example_window_management.cpp	2015-02-04 18:10:25 +0000
+++ examples/server_example_window_management.cpp	2015-02-10 12:05:29 +0000
@@ -16,8 +16,6 @@
  * Authored By: Alan Griffiths <[e-mail]>
  */
 
-#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER 
-
 #include "server_example_window_management.h"
 #include "server_example_fullscreen_placement_strategy.h"
 
@@ -32,6 +30,8 @@
 #include "mir/scene/surface_creation_parameters.h"
 #include "mir/shell/abstract_shell.h"
 
+#include "mir_toolkit/events/input/input_event.h"
+
 #include <linux/input.h>
 
 #include <map>
@@ -577,44 +577,54 @@
 
     bool handle(MirEvent const& event) override
     {
-        switch (event.type)
-        {
-        case mir_event_type_key:
-            return handle_key_event(event.key);
-
-        case mir_event_type_motion:
-            return handle_motion_event(event.motion);
-
-        default:
+        if (mir_event_get_type(&event) != mir_event_type_input)
             return false;
+
+        auto const input_event = mir_event_get_input_event(&event);
+
+        switch (mir_input_event_get_type(input_event))
+        {
+        case mir_input_event_type_key:
+            return handle_key_event(mir_input_event_get_key_input_event(input_event));
+
+        case mir_input_event_type_touch:
+            return handle_touch_event(mir_input_event_get_touch_input_event(input_event));
+
+        case mir_input_event_type_pointer:
+            return handle_pointer_event(mir_input_event_get_pointer_input_event(input_event));
         }
+
+        return false;
     }
 
 private:
-    bool handle_key_event(MirKeyEvent const& event)
+    static const int modifier_mask =
+        mir_input_event_modifier_alt |
+        mir_input_event_modifier_shift |
+        mir_input_event_modifier_sym |
+        mir_input_event_modifier_ctrl |
+        mir_input_event_modifier_meta;
+
+    bool handle_key_event(MirKeyInputEvent const* event)
     {
-        static const int modifier_mask =
-            mir_key_modifier_alt |
-            mir_key_modifier_shift |
-            mir_key_modifier_sym |
-            mir_key_modifier_ctrl |
-            mir_key_modifier_meta;
+        auto const action = mir_key_input_event_get_action(event);
+        auto const scan_code = mir_key_input_event_get_scan_code(event);
+        auto const modifiers = mir_key_input_event_get_modifiers(event) & modifier_mask;
 
-        if (event.action == mir_key_action_down &&
-            event.scan_code == KEY_F11)
+        if (action == mir_key_input_event_action_down && scan_code == KEY_F11)
         {
             if (auto const wm = window_manager.lock())
-            switch (event.modifiers & modifier_mask)
+            switch (modifiers & modifier_mask)
             {
-            case mir_key_modifier_alt:
+            case mir_input_event_modifier_alt:
                 wm->toggle(mir_surface_state_maximized);
                 return true;
 
-            case mir_key_modifier_shift:
+            case mir_input_event_modifier_shift:
                 wm->toggle(mir_surface_state_vertmaximized);
                 return true;
 
-            case mir_key_modifier_ctrl:
+            case mir_input_event_modifier_ctrl:
                 wm->toggle(mir_surface_state_horizmaximized);
                 return true;
 
@@ -626,34 +636,79 @@
         return false;
     }
 
-    bool handle_motion_event(MirMotionEvent const& event)
-    {
-        if (event.action == mir_motion_action_down ||
-            event.action == mir_motion_action_pointer_down)
-        {
-            if (auto const wm = window_manager.lock())
-            {
-                wm->click(average_pointer(event.pointer_count, event.pointer_coordinates));
+    bool handle_touch_event(MirTouchInputEvent const* event)
+    {
+        auto const count = mir_touch_input_event_get_touch_count(event);
+
+        if (auto const wm = window_manager.lock())
+        {
+            long total_x = 0;
+            long total_y = 0;
+
+            for (auto i = 0U; i != count; ++i)
+            {
+                total_x += mir_touch_input_event_get_touch_axis_value(event, i, mir_touch_input_axis_x);
+                total_y += mir_touch_input_event_get_touch_axis_value(event, i, mir_touch_input_axis_y);
+            }
+
+            Point const cursor{total_x/count, total_y/count};
+
+            bool is_drag = true;
+            for (auto i = 0U; i != count; ++i)
+            {
+                switch (mir_touch_input_event_get_touch_action(event, i))
+                {
+                case mir_touch_input_event_action_up:
+                    return false;
+
+                case mir_touch_input_event_action_down:
+                    is_drag = false;
+
+                case mir_touch_input_event_action_change:
+                    continue;
+                }
+            }
+
+            if (is_drag && count == 3)
+            {
+                wm->drag(cursor);
+                return true;
+            }
+
+            wm->click(cursor);
+        }
+
+        return false;
+    }
+
+    bool handle_pointer_event(MirPointerInputEvent const* event)
+    {
+        if (auto const wm = window_manager.lock())
+        {
+            auto const action = mir_pointer_input_event_get_action(event);
+            auto const modifiers = mir_pointer_input_event_get_modifiers(event) & modifier_mask;
+            Point const cursor{
+                mir_pointer_input_event_get_axis_value(event, mir_pointer_input_axis_x),
+                mir_pointer_input_event_get_axis_value(event, mir_pointer_input_axis_y)};
+
+            if (action == mir_pointer_input_event_action_button_down)
+            {
+                wm->click(cursor);
                 return false;
             }
-        }
-        else if (event.action == mir_motion_action_move &&
-                 event.modifiers & mir_key_modifier_alt)
-        {
-            if (auto const wm = window_manager.lock())
+            else if (action == mir_pointer_input_event_action_motion &&
+                     modifiers == mir_input_event_modifier_alt)
             {
-                switch (event.button_state)
-                {
-                case mir_motion_button_primary:
-                    wm->drag(average_pointer(event.pointer_count, event.pointer_coordinates));
-                    return true;
-
-                case mir_motion_button_tertiary:
-                    wm->resize(average_pointer(event.pointer_count, event.pointer_coordinates));
-                    return true;
-
-                default:
-                    ;// ignore
+                if (mir_pointer_input_event_get_button_state(event, mir_pointer_input_button_primary))
+                {
+                    wm->drag(cursor);
+                    return true;
+                }
+
+                if (mir_pointer_input_event_get_button_state(event, mir_pointer_input_button_tertiary))
+                {
+                    wm->resize(cursor);
+                    return true;
                 }
             }
         }
@@ -661,20 +716,6 @@
         return false;
     }
 
-    static Point average_pointer(size_t pointer_count, MirMotionPointer const* pointer_coordinates)
-    {
-        long total_x = 0;
-        long total_y = 0;
-
-        for (auto p = pointer_coordinates; p != pointer_coordinates + pointer_count; ++p)
-        {
-            total_x += p->x;
-            total_y += p->y;
-        }
-
-        return Point{total_x/pointer_count, total_y/pointer_count};
-    }
-
     std::weak_ptr<me::WindowManager> const window_manager;
 };