Merge lp:~robert-ancell/mir/vt-switch-keys into lp:~mir-team/mir/trunk

[Robert Ancell]

VT switch on alt+ctrl+Fn

[Robert Ancell (robert-ancell)]

Also tested with https://code.launchpad.net/~mlankhorst/mir/setsid/+merge/177800 to work.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:933
http://jenkins.qa.ubuntu.com/job/mir-ci/1247/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1649
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1534
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/485
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/485/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:934
http://jenkins.qa.ubuntu.com/job/mir-ci/1249/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1651
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1536
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/487
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/487/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Chris Halse Rogers (raof)]

This looks good to me, and does what it says on the tin.

It has to land after https://code.launchpad.net/~mlankhorst/mir/setsid/+merge/177800, though.

review: Approve

[Daniel van Vugt (vanvugt)]

1. Wrote year:
77 + * Copyright © 2012 Canonical Ltd.
165 + * Copyright © 2012 Canonical Ltd.

2. The giant switch statement looks "suboptimal". But it's clear and it works.

3. Missing error checking:
auto console_fd = open("/dev/console", O_RDONLY | O_NDELAY);

Tested with setsid and works nicely. So I'm not going to block on the above issues, but you might want to consider them.

review: Approve

[Daniel van Vugt (vanvugt)]

"Wrote"? I mean "Wrong" year.

[Daniel van Vugt (vanvugt)]

4. Is O_RDONLY correct for ioctl usage?

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:935
http://jenkins.qa.ubuntu.com/job/mir-ci/1250/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1653
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1538
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/488
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/488/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

=== modified file 'include/server/mir/default_server_configuration.h'
--- include/server/mir/default_server_configuration.h	2013-08-07 20:04:16 +0000
+++ include/server/mir/default_server_configuration.h	2013-08-08 01:41:29 +0000
@@ -97,6 +97,7 @@
 class InputConfiguration;
 class CursorListener;
 class InputRegion;
+class VTFilter;
 }
 
 namespace logging
@@ -234,8 +235,10 @@
 
 
     std::shared_ptr<input::InputConfiguration> input_configuration;
+    std::shared_ptr<input::VTFilter> vt_filter;
 
     CachedPtr<input::InputReport> input_report;
+    CachedPtr<input::CompositeEventFilter> composite_event_filter;
     CachedPtr<input::InputManager>    input_manager;
     CachedPtr<input::InputRegion>     input_region;
     CachedPtr<surfaces::InputRegistrar> input_registrar;

=== modified file 'src/server/default_server_configuration.cpp'
--- src/server/default_server_configuration.cpp	2013-08-07 20:04:16 +0000
+++ src/server/default_server_configuration.cpp	2013-08-08 01:41:29 +0000
@@ -62,6 +62,7 @@
 #include "mir/input/null_input_report.h"
 #include "mir/input/display_input_region.h"
 #include "mir/input/event_filter_chain.h"
+#include "input/vt_filter.h"
 #include "input/android/default_android_input_configuration.h"
 #include "input/android/android_input_manager.h"
 #include "input/android/android_input_targeter.h"
@@ -99,7 +100,6 @@
 
 namespace
 {
-std::initializer_list<std::shared_ptr<mi::EventFilter> const> empty_filter_list{};
 mir::SharedLibrary const* load_library(std::string const& libname);
 }
 
@@ -483,7 +483,14 @@
 std::shared_ptr<mi::CompositeEventFilter>
 mir::DefaultServerConfiguration::the_composite_event_filter()
 {
-    return std::make_shared<mi::EventFilterChain>(empty_filter_list);
+    return composite_event_filter(
+        [this]() -> std::shared_ptr<mi::CompositeEventFilter>
+        {
+            if (!vt_filter)
+                vt_filter = std::make_shared<mi::VTFilter>();
+            std::initializer_list<std::shared_ptr<mi::EventFilter> const> filter_list {vt_filter};
+            return std::make_shared<mi::EventFilterChain>(filter_list);
+        });
 }
 
 std::shared_ptr<mi::InputReport>

=== modified file 'src/server/input/CMakeLists.txt'
--- src/server/input/CMakeLists.txt	2013-07-22 02:18:21 +0000
+++ src/server/input/CMakeLists.txt	2013-08-08 01:41:29 +0000
@@ -6,6 +6,7 @@
   null_input_configuration.cpp
   null_input_report.cpp
   display_input_region.cpp
+  vt_filter.cpp
 )
 
 add_subdirectory(android)

=== added file 'src/server/input/vt_filter.cpp'
--- src/server/input/vt_filter.cpp	1970-01-01 00:00:00 +0000
+++ src/server/input/vt_filter.cpp	2013-08-08 01:41:29 +0000
@@ -0,0 +1,83 @@
+/*
+ * 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 warranty of
+ * MERCHANTABILITY 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
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Robert Ancell <[e-mail]>
+ */
+
+#include "vt_filter.h"
+
+#include <linux/input.h>
+#include <linux/vt.h>
+#include <sys/ioctl.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+bool mir::input::VTFilter::handle(MirEvent const& event)
+{
+    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))
+    {
+        switch (event.key.scan_code)
+        {
+        case KEY_F1:
+            set_active_vt(1);
+            return true;
+        case KEY_F2:
+            set_active_vt(2);
+            return true;
+        case KEY_F3:
+            set_active_vt(3);
+            return true;
+        case KEY_F4:
+            set_active_vt(4);
+            return true;
+        case KEY_F5:
+            set_active_vt(5);
+            return true;
+        case KEY_F6:
+            set_active_vt(6);
+            return true;
+        case KEY_F7:
+            set_active_vt(7);
+            return true;
+        case KEY_F8:
+            set_active_vt(8);
+            return true;
+        case KEY_F9:
+            set_active_vt(9);
+            return true;
+        case KEY_F10:
+            set_active_vt(10);
+            return true;
+        case KEY_F11:
+            set_active_vt(11);
+            return true;
+        case KEY_F12:
+            set_active_vt(12);
+            return true;
+        }
+    }
+
+    return false;
+}
+
+void mir::input::VTFilter::set_active_vt(int vt)
+{
+    auto console_fd = open("/dev/console", O_RDONLY | O_NDELAY);
+    ioctl(console_fd, VT_ACTIVATE, vt);
+    close(console_fd);
+}

=== added file 'src/server/input/vt_filter.h'
--- src/server/input/vt_filter.h	1970-01-01 00:00:00 +0000
+++ src/server/input/vt_filter.h	2013-08-08 01:41:29 +0000
@@ -0,0 +1,41 @@
+/*
+ * 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 warranty of
+ * MERCHANTABILITY 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
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Robert Ancell <[e-mail]>
+ */
+
+#ifndef MIR_INPUT_VT_FILTER_H_
+#define MIR_INPUT_VT_FILTER_H_
+
+#include "mir/input/event_filter.h"
+
+namespace mir
+{
+namespace input
+{
+
+class VTFilter : public EventFilter
+{
+public:  
+    bool handle(MirEvent const& event) override;
+
+private:
+    void set_active_vt(int vt);
+};
+
+}
+}
+
+#endif // MIR_INPUT_VT_FILTER_H_