Merge lp:~andreas-pokorny/mir/fix-1521225 into lp:mir

[Andreas Pokorny]

fix error in bitwise logic

Current logic actually triggers when either ctrl or alt modifier is pressed.

[Alan Griffiths (alan-griffiths)]

Better, but there's another error in the same area:

After exiting Mir (by Ctrl+Alt+BkSp) VT switching by Ctrl+Alt+Fn seems broken (A switch by "sudo chvt 7" gets things back to normal).

Is this a separate problem?

review: Needs Information

[Andreas Pokorny (andreas-pokorny)]

> Better, but there's another error in the same area:
>
> After exiting Mir (by Ctrl+Alt+BkSp) VT switching by Ctrl+Alt+Fn seems broken
> (A switch by "sudo chvt 7" gets things back to normal).
>
> Is this a separate problem?

Yes I think so..

[Alan Griffiths (alan-griffiths)]

OK then. Logged the VT switching issue as lp:1521651

review: Approve

[Alberto Aguirre (albaguirre)]

OK.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3148
http://jenkins.qa.ubuntu.com/job/mir-ci/5730/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5126
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4032
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5074
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-xenial-touch/66/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/59
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/59/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/59
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/59/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5074
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5074/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7607
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25671
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/64/console

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

review: Approve (continuous-integration)

[Kevin DuBois (kdub)]

could use a test, but looks good otherwise

review: Approve

=== modified file 'src/server/input/vt_filter.cpp'
--- src/server/input/vt_filter.cpp	2015-11-17 11:34:17 +0000
+++ src/server/input/vt_filter.cpp	2015-12-01 14:13:32 +0000
@@ -46,9 +46,11 @@
         return false;
 
     auto const keyboard_event = mir_input_event_get_keyboard_event(input_event);
+    auto const modifier_state  = mir_keyboard_event_modifiers(keyboard_event);
 
     if (mir_keyboard_event_action(keyboard_event) == mir_keyboard_action_down &&
-        (mir_keyboard_event_modifiers(keyboard_event) & (mir_input_event_modifier_alt | mir_input_event_modifier_ctrl)))
+        (modifier_state & mir_input_event_modifier_alt) &&
+        (modifier_state & mir_input_event_modifier_ctrl))
     {
         switch (mir_keyboard_event_scan_code(keyboard_event))
         {