Merge lp:~mir-team/mir/unify-event-modifiers into lp:mir

[Robert Carr]

Remove the legacy event modifier enum.

Remove the legacy event modifier enum.

This branch is part of the event cleaning pipeline:

Pluck-low-hanging-event-fruit: Remove unused event members.
Unify-event-modifiers: Consolidate modifier enums (https://code.launchpad.net/~mir-team/mir/unify-event-modifiers/+merge/258218)
Unify-keyboard-actions: Consolidate keyboard action enums and key repeat representation (https://code.launchpad.net/~mir-team/mir/unify-keyboard-actions/+merge/258288)
Remaining-nsec-removal: Remove usage of nsecs_t in event_private.h https://code.launchpad.net/~mir-team/mir/remaining-nsec-removal/+merge/258292
unify-pointer-button: Consolidate pointer button enums
https://code.launchpad.net/~mir-team/mir/unify-pointer-button

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2542
http://jenkins.qa.ubuntu.com/job/mir-ci/3698/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/2293/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/2292
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/2241/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1695/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2241/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2543
http://jenkins.qa.ubuntu.com/job/mir-ci/3706/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/2302
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/2301
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/2250
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1703
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1703/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2250
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2250/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/5152
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20187

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

review: Approve (continuous-integration)

[Kevin DuBois (kdub)]

side note: If playground/demo-shell/window_manager.cpp could be ported to use the new events, that's a big step forward to moving it to examples/

lgtm

review: Approve

[Alan Griffiths (alan-griffiths)]

585+ if (mir_modifiers != mir_input_event_modifier_none && mir_modifiers & mir_input_event_modifier_none)
586+ mir_modifiers &= ~mir_input_event_modifier_none;

if (mir_modifiers != mir_input_event_modifier_none)
    mir_modifiers &= ~mir_input_event_modifier_none;

or

if (mir_modifiers | ~mir_input_event_modifier_none)
    mir_modifiers &= ~mir_input_event_modifier_none;

[Alexandros Frantzis (afrantzis)]

Looks good.

I think that mir_input_event_modifier_none not being equal to 0 (i.e. no modifiers), makes its use unintuitive, but that's another discussion.

review: Approve

[Robert Carr (robertcarr)]

>> I think that mir_input_event_modifier_none not being equal to 0 (i.e. no modifiers), makes its
>> use unintuitive, but that's another discussion.

Yeah you may be right. It was originally an intentional decision with the idea that 0 was reserved for an out of band/invalid state. Practically though I made an error in the original assembly of the branch (fixed before submission don't worry ;))...I'm not sure if it was just because of confusion with the android flags or this interface really is hard to use though.

=== modified file 'playground/demo-shell/window_manager.cpp'
--- playground/demo-shell/window_manager.cpp	2015-04-16 18:50:58 +0000
+++ playground/demo-shell/window_manager.cpp	2015-05-05 05:53:22 +0000
@@ -209,7 +209,7 @@
     if (event.key.type == mir_event_type_key &&
         event.key.action == mir_key_action_down)
     {
-        if (event.key.modifiers & mir_key_modifier_alt &&
+        if (event.key.modifiers & mir_input_event_modifier_alt &&
             event.key.scan_code == KEY_TAB)  // TODO: Use keycode once we support keymapping on the server side
         {
             focus_controller->focus_next_session();
@@ -217,7 +217,7 @@
                 focus_controller->raise({surface});
             return true;
         }
-        else if (event.key.modifiers & mir_key_modifier_alt &&
+        else if (event.key.modifiers & mir_input_event_modifier_alt &&
                  event.key.scan_code == KEY_GRAVE)
         {
             if (auto const prev = focus_controller->focused_surface())
@@ -229,7 +229,7 @@
             }
             return true;
         }
-        else if (event.key.modifiers & mir_key_modifier_alt &&
+        else if (event.key.modifiers & mir_input_event_modifier_alt &&
                  event.key.scan_code == KEY_F4)
         {
             auto const surf = focus_controller->focused_surface();
@@ -237,7 +237,7 @@
                 surf->request_client_surface_close();
             return true;
         }
-        else if ((event.key.modifiers & mir_key_modifier_alt &&
+        else if ((event.key.modifiers & mir_input_event_modifier_alt &&
                   event.key.scan_code == KEY_P) ||
                  (event.key.scan_code == KEY_POWER))
         {
@@ -258,15 +258,15 @@
                 compositor->start();
             return true;
         }
-        else if ((event.key.modifiers & mir_key_modifier_alt) &&
-                 (event.key.modifiers & mir_key_modifier_ctrl) &&
+        else if ((event.key.modifiers & mir_input_event_modifier_alt) &&
+                 (event.key.modifiers & mir_input_event_modifier_ctrl) &&
                  (event.key.scan_code == KEY_ESC))
         {
             std::abort();
             return true;
         }
-        else if ((event.key.modifiers & mir_key_modifier_alt) &&
-                 (event.key.modifiers & mir_key_modifier_ctrl) &&
+        else if ((event.key.modifiers & mir_input_event_modifier_alt) &&
+                 (event.key.modifiers & mir_input_event_modifier_ctrl) &&
                  (event.key.scan_code == KEY_L) &&
                  focus_controller)
         {
@@ -276,8 +276,8 @@
                 app->set_lifecycle_state(mir_lifecycle_state_will_suspend);
             }
         }
-        else if ((event.key.modifiers & mir_key_modifier_alt) &&
-                 (event.key.modifiers & mir_key_modifier_ctrl))
+        else if ((event.key.modifiers & mir_input_event_modifier_alt) &&
+                 (event.key.modifiers & mir_input_event_modifier_ctrl))
         {
             MirOrientation orientation = mir_orientation_normal;
             bool rotating = true;
@@ -366,13 +366,13 @@
             compositor->start();
             return true;
         }
-        else if (event.key.modifiers & mir_key_modifier_meta &&
+        else if (event.key.modifiers & mir_input_event_modifier_meta &&
                  event.key.scan_code == KEY_N)
         {
             toggle(inverse);
             return true;
         }
-        else if (event.key.modifiers & mir_key_modifier_meta &&
+        else if (event.key.modifiers & mir_input_event_modifier_meta &&
                  event.key.scan_code == KEY_C)
         {
             toggle(contrast);
@@ -389,7 +389,7 @@
 
         float new_zoom_mag = 0.0f;  // zero means unchanged
 
-        if (event.motion.modifiers & mir_key_modifier_meta &&
+        if (event.motion.modifiers & mir_input_event_modifier_meta &&
             action == mir_motion_action_scroll)
         {
             zoom_exponent += event.motion.pointer_coordinates[0].vscroll;
@@ -421,7 +421,7 @@
 
         auto const surf = focus_controller->focused_surface();
         if (surf &&
-            (event.motion.modifiers & mir_key_modifier_alt ||
+            (event.motion.modifiers & mir_input_event_modifier_alt ||
              fingers >= 3))
         {
             geometry::Displacement pinch_dir;
 
=== modified file 'src/client/events/event_builders.cpp'
--- src/client/events/event_builders.cpp	2015-05-05 05:53:22 +0000
+++ src/client/events/event_builders.cpp	2015-05-05 05:53:22 +0000
@@ -107,49 +107,6 @@
         BOOST_THROW_EXCEPTION(std::logic_error("Invalid key action"));
     }
 }
-MirKeyModifier old_modifiers_from_new(MirInputEventModifiers modifiers)
-{
-    int old_modifiers = mir_key_modifier_none;
-
-    if (modifiers & mir_input_event_modifier_none)
-        old_modifiers |= mir_key_modifier_none;
-    if (modifiers & mir_input_event_modifier_alt)
-        old_modifiers |= mir_key_modifier_alt;
-    if (modifiers & mir_input_event_modifier_alt_left)
-        old_modifiers |= mir_key_modifier_alt_left;
-    if (modifiers & mir_input_event_modifier_alt_right)
-        old_modifiers |= mir_key_modifier_alt_right;
-    if (modifiers & mir_input_event_modifier_shift)
-        old_modifiers |= mir_key_modifier_shift;
-    if (modifiers & mir_input_event_modifier_shift_left)
-        old_modifiers |= mir_key_modifier_shift_left;
-    if (modifiers & mir_input_event_modifier_shift_right)
-        old_modifiers |= mir_key_modifier_shift_right;
-    if (modifiers & mir_input_event_modifier_sym)
-        old_modifiers |= mir_key_modifier_sym;
-    if (modifiers & mir_input_event_modifier_function)
-        old_modifiers |= mir_key_modifier_function;
-    if (modifiers & mir_input_event_modifier_ctrl)
-        old_modifiers |= mir_key_modifier_ctrl;
-    if (modifiers & mir_input_event_modifier_ctrl_left)
-        old_modifiers |= mir_key_modifier_ctrl_left;
-    if (modifiers & mir_input_event_modifier_ctrl_right)
-        old_modifiers |= mir_key_modifier_ctrl_right;
-    if (modifiers & mir_input_event_modifier_meta)
-        old_modifiers |= mir_key_modifier_meta;
-    if (modifiers & mir_input_event_modifier_meta_left)
-        old_modifiers |= mir_key_modifier_meta_left;
-    if (modifiers & mir_input_event_modifier_meta_right)
-        old_modifiers |= mir_key_modifier_meta_right;
-    if (modifiers & mir_input_event_modifier_caps_lock)
-        old_modifiers |= mir_key_modifier_caps_lock;
-    if (modifiers & mir_input_event_modifier_num_lock)
-        old_modifiers |= mir_key_modifier_num_lock;
-    if (modifiers & mir_input_event_modifier_scroll_lock)
-        old_modifiers |= mir_key_modifier_scroll_lock;
-
-    return static_cast<MirKeyModifier>(old_modifiers);
-}
 }
 
 mir::EventUPtr mev::make_event(MirInputDeviceId device_id, int64_t timestamp,
@@ -168,7 +125,7 @@
         kev.repeat_count = 1;
     kev.key_code = key_code;
     kev.scan_code = scan_code;
-    kev.modifiers = old_modifiers_from_new(modifiers);
+    kev.modifiers = modifiers;
 
     return make_event_uptr(e);
 }
@@ -214,7 +171,7 @@
     auto& mev = e->motion;
     mev.device_id = device_id;
     mev.event_time = timestamp;
-    mev.modifiers = old_modifiers_from_new(modifiers);
+    mev.modifiers = modifiers;
     mev.action = mir_motion_action_move;
     mev.source_id = AINPUT_SOURCE_TOUCHSCREEN;
     
@@ -314,7 +271,7 @@
     auto& mev = e->motion;
     mev.device_id = device_id;
     mev.event_time = timestamp;
-    mev.modifiers = old_modifiers_from_new(modifiers);
+    mev.modifiers = modifiers;
     mev.action = old_action_from_pointer_action(action);
     mev.source_id = AINPUT_SOURCE_MOUSE;
     
 
=== modified file 'src/client/input/android/CMakeLists.txt'
--- src/client/input/android/CMakeLists.txt	2015-03-31 02:35:42 +0000
+++ src/client/input/android/CMakeLists.txt	2015-05-05 05:53:22 +0000
@@ -19,6 +19,7 @@
   ${CMAKE_CURRENT_SOURCE_DIR}/android_input_lexicon.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/android_input_receiver.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/android_input_platform.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/event_conversion_helpers.cpp
 )
 
 set(ANDROID_SHARED_INPUT_SOURCES ${ANDROID_SHARED_INPUT_SOURCES} PARENT_SCOPE)
 
=== modified file 'src/client/input/android/android_input_lexicon.cpp'
--- src/client/input/android/android_input_lexicon.cpp	2015-05-05 05:53:22 +0000
+++ src/client/input/android/android_input_lexicon.cpp	2015-05-05 05:53:22 +0000
@@ -18,6 +18,7 @@
  */
 
 #include "mir/input/android/android_input_lexicon.h"
+#include "mir/input/android/event_conversion_helpers.h"
 #include "mir/events/event_private.h"
 
 #include <androidfw/Input.h>
@@ -35,7 +36,7 @@
             mir_event.key.device_id = android_event->getDeviceId();
             mir_event.key.source_id = android_event->getSource();
             mir_event.key.action = static_cast<MirKeyAction>(kev->getAction());
-            mir_event.key.modifiers = kev->getMetaState();
+            mir_event.key.modifiers = mia::mir_modifiers_from_android(kev->getMetaState());
             mir_event.key.key_code = kev->getKeyCode();
             mir_event.key.scan_code = kev->getScanCode();
             mir_event.key.repeat_count = kev->getRepeatCount();
@@ -49,7 +50,7 @@
             mir_event.motion.device_id = android_event->getDeviceId();
             mir_event.motion.source_id = android_event->getSource();
             mir_event.motion.action = mev->getAction();
-            mir_event.motion.modifiers = mev->getMetaState();
+            mir_event.motion.modifiers = mia::mir_modifiers_from_android(mev->getMetaState());
             mir_event.motion.button_state = static_cast<MirMotionButton>(mev->getButtonState());
             mir_event.motion.event_time = mev->getEventTime().count();
             mir_event.motion.pointer_count = mev->getPointerCount();
 
=== added file 'src/client/input/android/event_conversion_helpers.cpp'
--- src/client/input/android/event_conversion_helpers.cpp	1970-01-01 00:00:00 +0000
+++ src/client/input/android/event_conversion_helpers.cpp	2015-05-05 05:53:22 +0000
@@ -0,0 +1,70 @@
+/*
+ * Copyright © 2015 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser 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 warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Robert Carr <[e-mail]>
+ */
+
+#include "mir/input/android/event_conversion_helpers.h"
+
+#include <androidfw/Input.h>
+
+namespace mia = mir::input::android;
+
+MirInputEventModifiers mia::mir_modifiers_from_android(int32_t android_modifiers)
+{
+    MirInputEventModifiers ret = 0;
+    if (android_modifiers == 0) ret |= mir_input_event_modifier_none;
+    if (android_modifiers & AMETA_ALT_ON) ret |= mir_input_event_modifier_alt;
+    if (android_modifiers & AMETA_ALT_LEFT_ON) ret |= mir_input_event_modifier_alt_left;
+    if (android_modifiers & AMETA_ALT_RIGHT_ON) ret |= mir_input_event_modifier_alt_right;
+    if (android_modifiers & AMETA_SHIFT_ON) ret |= mir_input_event_modifier_shift;
+    if (android_modifiers & AMETA_SHIFT_LEFT_ON) ret |= mir_input_event_modifier_shift_left;
+    if (android_modifiers & AMETA_SHIFT_RIGHT_ON) ret |= mir_input_event_modifier_shift_right;
+    if (android_modifiers & AMETA_SYM_ON) ret |= mir_input_event_modifier_sym;
+    if (android_modifiers & AMETA_FUNCTION_ON) ret |= mir_input_event_modifier_function;
+    if (android_modifiers & AMETA_CTRL_ON) ret |= mir_input_event_modifier_ctrl;
+    if (android_modifiers & AMETA_CTRL_LEFT_ON) ret |= mir_input_event_modifier_ctrl_left;
+    if (android_modifiers & AMETA_CTRL_RIGHT_ON) ret |= mir_input_event_modifier_ctrl_right;
+    if (android_modifiers & AMETA_META_ON) ret |= mir_input_event_modifier_meta;
+    if (android_modifiers & AMETA_META_LEFT_ON) ret |= mir_input_event_modifier_meta_left;
+    if (android_modifiers & AMETA_META_RIGHT_ON) ret |= mir_input_event_modifier_meta_right;
+    if (android_modifiers & AMETA_CAPS_LOCK_ON) ret |= mir_input_event_modifier_caps_lock;
+    if (android_modifiers & AMETA_NUM_LOCK_ON) ret |= mir_input_event_modifier_num_lock;
+    if (android_modifiers & AMETA_SCROLL_LOCK_ON) ret |= mir_input_event_modifier_scroll_lock;
+    return ret;
+}
+
+int32_t mia::android_modifiers_from_mir(MirInputEventModifiers mir_modifiers)
+{
+    int32_t ret = AMETA_NONE;
+    if (mir_modifiers & mir_input_event_modifier_alt) ret |= AMETA_ALT_ON;
+    if (mir_modifiers & mir_input_event_modifier_alt_left) ret |= AMETA_ALT_LEFT_ON;
+    if (mir_modifiers & mir_input_event_modifier_alt_right) ret |= AMETA_ALT_RIGHT_ON;
+    if (mir_modifiers & mir_input_event_modifier_shift) ret |= AMETA_SHIFT_ON;
+    if (mir_modifiers & mir_input_event_modifier_shift_left) ret |= AMETA_SHIFT_LEFT_ON;
+    if (mir_modifiers & mir_input_event_modifier_shift_right) ret |= AMETA_SHIFT_RIGHT_ON;
+    if (mir_modifiers & mir_input_event_modifier_sym) ret |= AMETA_SYM_ON;
+    if (mir_modifiers & mir_input_event_modifier_function) ret |= AMETA_FUNCTION_ON;
+    if (mir_modifiers & mir_input_event_modifier_ctrl) ret |= AMETA_CTRL_ON;
+    if (mir_modifiers & mir_input_event_modifier_ctrl_left) ret |= AMETA_CTRL_LEFT_ON;
+    if (mir_modifiers & mir_input_event_modifier_ctrl_right) ret |= AMETA_CTRL_RIGHT_ON;
+    if (mir_modifiers & mir_input_event_modifier_meta) ret |= AMETA_META_ON;
+    if (mir_modifiers & mir_input_event_modifier_meta_left) ret |= AMETA_META_LEFT_ON;
+    if (mir_modifiers & mir_input_event_modifier_meta_right) ret |= AMETA_META_RIGHT_ON;
+    if (mir_modifiers & mir_input_event_modifier_caps_lock) ret |= AMETA_CAPS_LOCK_ON;
+    if (mir_modifiers & mir_input_event_modifier_num_lock) ret |= AMETA_NUM_LOCK_ON;
+    if (mir_modifiers & mir_input_event_modifier_scroll_lock) ret |= AMETA_SCROLL_LOCK_ON;
+    return ret;
+}
 
=== modified file 'src/client/input/input_event.cpp'
--- src/client/input/input_event.cpp	2015-04-01 19:39:19 +0000
+++ src/client/input/input_event.cpp	2015-05-05 05:53:22 +0000
@@ -239,66 +239,17 @@
     return old_kev.scan_code;
 }
 
-namespace
-{
-MirInputEventModifiers old_modifiers_to_new(unsigned int old_modifier)
-{
-    MirInputEventModifiers modifier = 0;
-
-    if (old_modifier & mir_key_modifier_none)
-        modifier |= mir_input_event_modifier_none;
-    if (old_modifier & mir_key_modifier_alt)
-        modifier |= mir_input_event_modifier_alt;
-    if (old_modifier & mir_key_modifier_alt_left)
-        modifier |= mir_input_event_modifier_alt_left;
-    if (old_modifier & mir_key_modifier_alt_right)
-        modifier |= mir_input_event_modifier_alt_right;
-    if (old_modifier & mir_key_modifier_shift)
-        modifier |= mir_input_event_modifier_shift;
-    if (old_modifier & mir_key_modifier_shift_left)
-        modifier |= mir_input_event_modifier_shift_left;
-    if (old_modifier & mir_key_modifier_shift_right)
-        modifier |= mir_input_event_modifier_shift_right;
-    if (old_modifier & mir_key_modifier_sym)
-        modifier |= mir_input_event_modifier_sym;
-    if (old_modifier & mir_key_modifier_function)
-        modifier |= mir_input_event_modifier_function;
-    if (old_modifier & mir_key_modifier_ctrl)
-        modifier |= mir_input_event_modifier_ctrl;
-    if (old_modifier & mir_key_modifier_ctrl_left)
-        modifier |= mir_input_event_modifier_ctrl_left;
-    if (old_modifier & mir_key_modifier_ctrl_right)
-        modifier |= mir_input_event_modifier_ctrl_right;
-    if (old_modifier & mir_key_modifier_meta)
-        modifier |= mir_input_event_modifier_meta;
-    if (old_modifier & mir_key_modifier_meta_left)
-        modifier |= mir_input_event_modifier_meta_left;
-    if (old_modifier & mir_key_modifier_meta_right)
-        modifier |= mir_input_event_modifier_meta_right;
-    if (old_modifier & mir_key_modifier_caps_lock)
-        modifier |= mir_input_event_modifier_caps_lock;
-    if (old_modifier & mir_key_modifier_num_lock)
-        modifier |= mir_input_event_modifier_num_lock;
-    if (old_modifier & mir_key_modifier_scroll_lock)
-        modifier |= mir_input_event_modifier_scroll_lock;
-
-    if (modifier)
-        return modifier;
-    return mir_input_event_modifier_none;
-}
-}
-
 MirInputEventModifiers mir_keyboard_event_modifiers(MirKeyboardEvent const* kev)
 {    
     auto const& old_kev = old_kev_from_new(kev);
-    return old_modifiers_to_new(old_kev.modifiers);
+    return old_kev.modifiers;
 }
 /* Touch event accessors */
 
 MirInputEventModifiers mir_touch_event_modifiers(MirTouchEvent const* tev)
 {    
     auto const& old_mev = old_mev_from_new(tev);
-    return old_modifiers_to_new(old_mev.modifiers);
+    return old_mev.modifiers;
 }
 
 MirTouchEvent const* mir_input_event_get_touch_event(MirInputEvent const* ev)
@@ -453,7 +404,7 @@
 MirInputEventModifiers mir_pointer_event_modifiers(MirPointerEvent const* pev)
 {    
     auto const& old_mev = old_mev_from_new(pev);
-    return old_modifiers_to_new(old_mev.modifiers);
+    return old_mev.modifiers;
 }
 
 MirPointerAction mir_pointer_event_action(MirPointerEvent const* pev)
 
=== modified file 'src/client/symbols.map'
--- src/client/symbols.map	2015-04-30 17:41:03 +0000
+++ src/client/symbols.map	2015-05-05 05:53:22 +0000
@@ -200,6 +200,8 @@
       mir::events::make_event*;
       mir::events::add_touch*;
       mir::input::android::Lexicon::translate*;
+      mir::input::android::android_modifiers_from_mir*;
+      mir::input::android::mir_modifiers_from_android*;
       mir::client::DefaultConnectionConfiguration::DefaultConnectionConfiguration*;
       mir::client::DefaultConnectionConfiguration::the_surface_map*;
       mir::client::DefaultConnectionConfiguration::the_rpc_channel*;
 
=== modified file 'src/include/common/mir/events/event_private.h'
--- src/include/common/mir/events/event_private.h	2015-05-05 05:53:22 +0000
+++ src/include/common/mir/events/event_private.h	2015-05-05 05:53:22 +0000
@@ -51,27 +51,6 @@
 } MirKeyAction;
 
 typedef enum {
-    mir_key_modifier_none        = 0,
-    mir_key_modifier_alt         = 0x02,
-    mir_key_modifier_alt_left    = 0x10,
-    mir_key_modifier_alt_right   = 0x20,
-    mir_key_modifier_shift       = 0x01,
-    mir_key_modifier_shift_left  = 0x40,
-    mir_key_modifier_shift_right = 0x80,
-    mir_key_modifier_sym         = 0x04,
-    mir_key_modifier_function    = 0x08,
-    mir_key_modifier_ctrl        = 0x1000,
-    mir_key_modifier_ctrl_left   = 0x2000,
-    mir_key_modifier_ctrl_right  = 0x4000,
-    mir_key_modifier_meta        = 0x10000,
-    mir_key_modifier_meta_left   = 0x20000,
-    mir_key_modifier_meta_right  = 0x40000,
-    mir_key_modifier_caps_lock   = 0x100000,
-    mir_key_modifier_num_lock    = 0x200000,
-    mir_key_modifier_scroll_lock = 0x400000
-} MirKeyModifier;
-
-typedef enum {
     mir_motion_action_down         = 0,
     mir_motion_action_up           = 1,
     mir_motion_action_move         = 2,
@@ -111,7 +90,7 @@
     int32_t device_id;
     int32_t source_id;
     MirKeyAction action;
-    unsigned int modifiers;
+    MirInputEventModifiers modifiers;
 
     int32_t key_code;
     int32_t scan_code;
@@ -150,7 +129,7 @@
      * this way for now until we can drop SF/Hybris support in QtUbuntu.
      */
     int action;
-    unsigned int modifiers;
+    MirInputEventModifiers modifiers;
 
     MirMotionButton button_state;
     nsecs_t event_time;
 
=== added file 'src/include/common/mir/input/android/event_conversion_helpers.h'
--- src/include/common/mir/input/android/event_conversion_helpers.h	1970-01-01 00:00:00 +0000
+++ src/include/common/mir/input/android/event_conversion_helpers.h	2015-05-05 05:53:22 +0000
@@ -0,0 +1,36 @@
+/*
+ * Copyright © 2015 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser 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 warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Robert Carr <[e-mail]>
+ */
+
+#ifndef MIR_INPUT_EVENT_CONVERSION_HELPERS_H_
+#define MIR_INPUT_EVENT_CONVERSION_HELPERS_H_
+
+#include "mir_toolkit/event.h"
+
+namespace mir
+{
+namespace input
+{
+namespace android
+{
+MirInputEventModifiers mir_modifiers_from_android(int32_t android_modifiers);
+int32_t android_modifiers_from_mir(MirInputEventModifiers modifiers);
+}
+}
+}
+
+#endif // MIR_INPUT_EVENT_CONVERSION_HELPERS_H_
 
=== modified file 'src/server/input/android/android_input_dispatcher.cpp'
--- src/server/input/android/android_input_dispatcher.cpp	2015-05-05 05:53:22 +0000
+++ src/server/input/android/android_input_dispatcher.cpp	2015-05-05 05:53:22 +0000
@@ -21,6 +21,7 @@
 #include "android_input_constants.h"
 #include "android_input_thread.h"
 
+#include "mir/input/android/event_conversion_helpers.h"
 #include "mir/events/event_private.h"
 
 #include <InputListener.h> // NotifyArgs
@@ -75,7 +76,7 @@
             0, /* flags */
             event.key.key_code,
             event.key.scan_code,
-            event.key.modifiers,
+            mia::android_modifiers_from_mir(event.key.modifiers),
             std::chrono::nanoseconds(event.key.event_time));
 
         dispatcher->notifyKey(&notify_key_args);
@@ -111,7 +112,7 @@
             policy_flags,
             event.motion.action,
             0, /* flags */
-            event.motion.modifiers,
+            mia::android_modifiers_from_mir(event.motion.modifiers),
             event.motion.button_state,
             0, /* edge_flags */
             event.motion.pointer_count,
 
=== modified file 'src/server/input/android/input_sender.cpp'
--- src/server/input/android/input_sender.cpp	2015-05-05 05:53:22 +0000
+++ src/server/input/android/input_sender.cpp	2015-05-05 05:53:22 +0000
@@ -21,6 +21,7 @@
 #include "input_sender.h"
 #include "input_send_entry.h"
 
+#include "mir/input/android/event_conversion_helpers.h"
 #include "mir/input/input_send_observer.h"
 #include "mir/input/input_channel.h"
 #include "mir/input/input_report.h"
@@ -244,7 +245,7 @@
         0, /* Flags */
         event.key_code,
         event.scan_code,
-        event.modifiers,
+        mia::android_modifiers_from_mir(event.modifiers),
         event.repeat_count,
         std::chrono::nanoseconds(event.event_time),
         std::chrono::nanoseconds(event.event_time)
@@ -284,7 +285,7 @@
         event.action,
         0, /* flags */
         0, /* edge flags */
-        static_cast<int32_t>(event.modifiers),
+        mia::android_modifiers_from_mir(event.modifiers),
         static_cast<int32_t>(event.button_state),
         0.0f,  // event.x_offset,
         0.0f,  // event.y_offset,
 
=== modified file 'src/server/input/android/input_translator.cpp'
--- src/server/input/android/input_translator.cpp	2015-05-05 05:53:22 +0000
+++ src/server/input/android/input_translator.cpp	2015-05-05 05:53:22 +0000
@@ -18,6 +18,7 @@
 
 #include "input_translator.h"
 
+#include "mir/input/android/event_conversion_helpers.h"
 #include "mir/events/event_private.h"
 
 #include "androidfw/Input.h"
@@ -100,25 +101,31 @@
     if (!args)
         return;
     uint32_t policy_flags = args->policyFlags;
-    int32_t modifiers = args->metaState;
+    MirInputEventModifiers mir_modifiers = mia::mir_modifiers_from_android(args->metaState);
 
     if (policy_flags & droidinput::POLICY_FLAG_ALT)
-        modifiers |= mir_key_modifier_alt | mir_key_modifier_alt_left;
+        mir_modifiers |= mir_input_event_modifier_alt | mir_input_event_modifier_alt_left;
     if (policy_flags & droidinput::POLICY_FLAG_ALT_GR)
-        modifiers |= mir_key_modifier_alt | mir_key_modifier_alt_right;
+        mir_modifiers |= mir_input_event_modifier_alt | mir_input_event_modifier_alt_right;
     if (policy_flags & droidinput::POLICY_FLAG_SHIFT)
-        modifiers |= mir_key_modifier_shift | mir_key_modifier_shift_left;
+        mir_modifiers |= mir_input_event_modifier_shift | mir_input_event_modifier_shift_left;
     if (policy_flags & droidinput::POLICY_FLAG_CAPS_LOCK)
-        modifiers |= mir_key_modifier_caps_lock;
+        mir_modifiers |= mir_input_event_modifier_caps_lock;
     if (policy_flags & droidinput::POLICY_FLAG_FUNCTION)
-        modifiers |= mir_key_modifier_function;
+        mir_modifiers |= mir_input_event_modifier_function;
+
+    // If we've added a modifier to none we have to remove the none flag.
+    if (mir_modifiers != mir_input_event_modifier_none && mir_modifiers & mir_input_event_modifier_none)
+    {
+        mir_modifiers &= ~mir_input_event_modifier_none;
+    }
 
     MirEvent mir_event;
     mir_event.type = mir_event_type_key;
     mir_event.key.device_id = args->deviceId;
     mir_event.key.source_id = args->source;
     mir_event.key.action = static_cast<MirKeyAction>(args->action);
-    mir_event.key.modifiers = modifiers;
+    mir_event.key.modifiers = mir_modifiers;
     mir_event.key.key_code = args->keyCode;
     mir_event.key.scan_code = args->scanCode;
     mir_event.key.repeat_count = 0;
@@ -140,7 +147,7 @@
     mir_event.motion.device_id = args->deviceId;
     mir_event.motion.source_id = args->source;
     mir_event.motion.action = args->action;
-    mir_event.motion.modifiers = args->metaState;
+    mir_event.motion.modifiers = mia::mir_modifiers_from_android(args->metaState);
     mir_event.motion.button_state = static_cast<MirMotionButton>(args->buttonState);
     mir_event.motion.event_time = args->eventTime.count();
     mir_event.motion.pointer_count = args->pointerCount;
 
=== modified file 'src/server/input/vt_filter.cpp'
--- src/server/input/vt_filter.cpp	2015-04-01 19:39:19 +0000
+++ src/server/input/vt_filter.cpp	2015-05-05 05:53:22 +0000
@@ -39,8 +39,8 @@
 {
     if (event.type == mir_event_type_key &&
         event.key.action == mir_key_action_down &&
-        (event.key.modifiers & mir_key_modifier_alt) &&
-        (event.key.modifiers & mir_key_modifier_ctrl))
+        (event.key.modifiers & mir_input_event_modifier_alt) &&
+        (event.key.modifiers & mir_input_event_modifier_ctrl))
     {
         switch (event.key.scan_code)
         {
 
=== modified file 'tests/unit-tests/input/android/test_android_input_dispatcher.cpp'
--- tests/unit-tests/input/android/test_android_input_dispatcher.cpp	2015-05-05 05:53:22 +0000
+++ tests/unit-tests/input/android/test_android_input_dispatcher.cpp	2015-05-05 05:53:22 +0000
@@ -179,7 +179,7 @@
     event.motion.device_id = 3;
     event.motion.source_id = 4;
     event.motion.action = mir_motion_action_scroll;
-    event.motion.modifiers = 6;
+    event.motion.modifiers = mir_input_event_modifier_shift,
     event.motion.button_state =
         static_cast<MirMotionButton>(mir_motion_button_forward | mir_motion_button_secondary);
 
@@ -214,7 +214,7 @@
                                           default_policy_flags,
                                           event.motion.action,
                                           0, /* flags */
-                                          event.motion.modifiers,
+                                          AMETA_SHIFT_ON,
                                           event.motion.button_state,
                                           0, /* edge_flags */
                                           event.motion.pointer_count,
@@ -240,7 +240,7 @@
     event.key.scan_code = 4;
     event.key.key_code = 5;
     event.key.repeat_count = 0;
-    event.key.modifiers = 7;
+    event.key.modifiers = mir_input_event_modifier_shift;
 
     droidinput::NotifyKeyArgs expected(std::chrono::nanoseconds(event.key.event_time),
                                        event.key.device_id,
@@ -250,7 +250,7 @@
                                        0, /* flags */
                                        event.key.key_code,
                                        event.key.scan_code,
-                                       event.key.modifiers,
+                                       AMETA_SHIFT_ON,
                                        std::chrono::nanoseconds(event.key.event_time));
 
     EXPECT_CALL(*dispatcher, notifyKey(KeyArgsMatches(expected)));
 
=== modified file 'tests/unit-tests/input/android/test_android_input_lexicon.cpp'
--- tests/unit-tests/input/android/test_android_input_lexicon.cpp	2015-05-05 05:53:22 +0000
+++ tests/unit-tests/input/android/test_android_input_lexicon.cpp	2015-05-05 05:53:22 +0000
@@ -38,7 +38,7 @@
     const int32_t flags = 4;
     const int32_t key_code = 5;
     const int32_t scan_code = 6;
-    const int32_t meta_state = 7;
+    const int32_t meta_state = AMETA_ALT_ON;
     const int32_t repeat_count = 8;
     auto const down_time = std::chrono::nanoseconds(9);
     auto const event_time = std::chrono::nanoseconds(10);
@@ -54,7 +54,7 @@
     EXPECT_EQ(device_id, mir_ev.key.device_id);
     EXPECT_EQ(source_id, mir_ev.key.source_id);
     EXPECT_EQ(action, mir_ev.key.action);
-    EXPECT_EQ((unsigned int)meta_state, mir_ev.key.modifiers);
+    EXPECT_EQ(mir_input_event_modifier_alt, mir_ev.key.modifiers);
 
     auto mir_key_ev = &mir_ev.key;
     // Key event specific properties
@@ -129,7 +129,6 @@
     EXPECT_EQ(device_id, mir_ev.motion.device_id);
     EXPECT_EQ(source_id, mir_ev.motion.source_id);
     EXPECT_EQ(action, mir_ev.motion.action);
-    EXPECT_EQ((unsigned int)meta_state, mir_ev.motion.modifiers);
 
     // Motion event specific properties
     EXPECT_EQ(mir_ev.type, mir_event_type_motion);
@@ -237,7 +236,6 @@
     EXPECT_EQ(device_id, mir_ev.motion.device_id);
     EXPECT_EQ(source_id, mir_ev.motion.source_id);
     EXPECT_EQ(action, mir_ev.motion.action);
-    EXPECT_EQ((unsigned int)meta_state, mir_ev.motion.modifiers);
 
     // Motion event specific properties
     EXPECT_EQ(mir_ev.type, mir_event_type_motion);
 
=== modified file 'tests/unit-tests/input/android/test_input_translator.cpp'
--- tests/unit-tests/input/android/test_input_translator.cpp	2015-05-05 05:53:22 +0000
+++ tests/unit-tests/input/android/test_input_translator.cpp	2015-05-05 05:53:22 +0000
@@ -252,7 +252,7 @@
     expected.key.scan_code = 4;
     expected.key.key_code = 5;
     expected.key.repeat_count = 0;
-    expected.key.modifiers = 7;
+    expected.key.modifiers = mir_input_event_modifier_shift;
 
     InSequence seq;
     EXPECT_CALL(dispatcher, dispatch(mt::MirKeyEventMatches(expected))).Times(1);
@@ -265,7 +265,7 @@
                                        0, /* flags */
                                        expected.key.key_code,
                                        expected.key.scan_code,
-                                       expected.key.modifiers,
+                                       AMETA_SHIFT_ON,
                                        std::chrono::nanoseconds(expected.key.event_time));
 
     translator.notifyKey(&notified);
 
=== modified file 'tests/unit-tests/input/test_input_event.cpp'
--- tests/unit-tests/input/test_input_event.cpp	2015-04-01 19:39:19 +0000
+++ tests/unit-tests/input/test_input_event.cpp	2015-05-05 05:53:22 +0000
@@ -150,17 +150,17 @@
 {
     xkb_keysym_t key_code = 171;
     int scan_code = 31;
-    MirKeyModifier old_modifiers = mir_key_modifier_shift;
+    MirInputEventModifiers modifiers = mir_input_event_modifier_shift;
 
     auto old_ev = a_key_ev();
     old_ev.key.key_code = key_code;
     old_ev.key.scan_code = scan_code;
-    old_ev.key.modifiers = old_modifiers;
+    old_ev.key.modifiers = modifiers;
 
     auto new_kev = mir_input_event_get_keyboard_event(mir_event_get_input_event(&old_ev));
     EXPECT_EQ(key_code, mir_keyboard_event_key_code(new_kev));
     EXPECT_EQ(scan_code, mir_keyboard_event_scan_code(new_kev));
-    EXPECT_EQ(mir_input_event_modifier_shift, mir_keyboard_event_modifiers(new_kev));
+    EXPECT_EQ(modifiers, mir_keyboard_event_modifiers(new_kev));
 }
 
 TEST(TouchEventProperties, touch_count_taken_from_pointer_count)
@@ -296,12 +296,13 @@
 
 TEST(PointerInputEventProperties, modifiers_taken_from_old_style_ev)
 {
+    MirInputEventModifiers modifiers = mir_input_event_modifier_shift;
     auto old_ev = a_motion_ev(AINPUT_SOURCE_MOUSE);
-    old_ev.motion.modifiers = mir_key_modifier_shift;
+    old_ev.motion.modifiers = modifiers;
     
     auto pointer_event = 
         mir_input_event_get_pointer_event(mir_event_get_input_event(&old_ev));
-    EXPECT_EQ(mir_input_event_modifier_shift, mir_pointer_event_modifiers(pointer_event));
+    EXPECT_EQ(modifiers, mir_pointer_event_modifiers(pointer_event));
 }
 
 namespace