Merge lp:~vanvugt/mir/rotate-using-keyboard into lp:mir

[Daniel van Vugt]

demo-shell: Add simple keyboard controls to rotate outputs;
    Ctrl + Alt + <arrow-key>

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1366
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/694/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/683
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/679
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-trusty-touch/285
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/424
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/424/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/428
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/428/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/285
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/285/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/300
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3219

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/694/rebuild

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

LGTM (but don't top-approve without prerequisite)

review: Approve

[Kevin DuBois (kdub)]

lgtm.

review: Approve

=== modified file 'examples/demo-shell/window_manager.cpp'
--- examples/demo-shell/window_manager.cpp	2014-01-13 06:12:33 +0000
+++ examples/demo-shell/window_manager.cpp	2014-01-21 10:21:07 +0000
@@ -164,6 +164,42 @@
                 compositor->start();
             return true;
         }
+        else if ((event.key.modifiers & mir_key_modifier_alt) &&
+                 (event.key.modifiers & mir_key_modifier_ctrl))
+        {
+            MirOrientation orientation = mir_orientation_normal;
+            bool rotating = true;
+
+            switch (event.key.scan_code)
+            {
+            case KEY_UP:    orientation = mir_orientation_normal; break;
+            case KEY_DOWN:  orientation = mir_orientation_inverted; break;
+            case KEY_LEFT:  orientation = mir_orientation_left; break;
+            case KEY_RIGHT: orientation = mir_orientation_right; break;
+            default:        rotating = false; break;
+            }
+
+            if (rotating)
+            {
+                compositor->stop();
+                auto conf = display->configuration();
+                conf->for_each_output(
+                    [&](mg::DisplayConfigurationOutput const& output) -> void
+                    {
+                        conf->configure_output(output.id, output.used,
+                                               output.top_left,
+                                               output.current_mode_index,
+                                               output.current_format,
+                                               output.power_mode,
+                                               orientation);
+                    }
+                );
+                display->configure(*conf);
+                compositor->start();
+                return true;
+            }
+        }
+
     }
     else if (event.type == mir_event_type_motion &&
              focus_controller)