Merge lp:~robert-ancell/unity-system-compositor/vt-switch into lp:unity-system-compositor

[Robert Ancell]

Re-enable input and have global keys for VT switching

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:39
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ci/22/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-saucy-amd64-ci/15

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-system-compositor-ci/22/rebuild

review: Approve (continuous-integration)

[lp:~robert-ancell/unity-system-compositor/vt-switch]

40. By Robert Ancell on 2013-08-01

Merge with trunk

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:40
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ci/23/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-saucy-amd64-ci/16

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-system-compositor-ci/23/rebuild

review: Approve (continuous-integration)

[Robert Ancell (robert-ancell)]

The VT code is not needed once https://code.launchpad.net/~robert-ancell/mir/vt-switch-keys/+merge/179067 lands.

[Robert Ancell (robert-ancell)]

Dropping in favour of lp:~robert-ancell/unity-system-compositor/enable-input

Unmerged revisions

40. By Robert Ancell on 2013-08-01

Merge with trunk

39. By Robert Ancell on 2013-08-01

Re-enable input and have global keys for VT switching

=== modified file 'debian/10-unity-system-compositor.conf'
--- debian/10-unity-system-compositor.conf	2013-07-24 12:44:50 +0000
+++ debian/10-unity-system-compositor.conf	2013-08-01 14:34:30 +0000
@@ -1,3 +1,3 @@
 [SeatDefaults]
 type=unity
-unity-compositor-command=unity-system-compositor.sleep --enable-input=false
+unity-compositor-command=unity-system-compositor.sleep

=== modified file 'src/system_compositor.cpp'
--- src/system_compositor.cpp	2013-07-10 17:16:32 +0000
+++ src/system_compositor.cpp	2013-08-01 14:34:30 +0000
@@ -19,6 +19,7 @@
 #include "system_compositor.h"
 
 #include <mir/run_mir.h>
+#include <mir/input/event_filter.h>
 #include <mir/shell/session.h>
 #include <mir/shell/session_container.h>
 #include <mir/shell/focus_setter.h>
@@ -26,25 +27,104 @@
 
 #include <iostream>
 #include <thread>
+#include <linux/input.h>
+#include <linux/vt.h>
+#include <sys/ioctl.h>
+#include <fcntl.h>
 
+namespace mi = mir::input;
 namespace msh = mir::shell;
 namespace mi = mir::input;
 
+struct VTFilter : public mi::EventFilter
+{
+    bool handle(MirEvent const& event) override
+    {
+        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;
+            }
+        }
+
+        return false;
+    }
+  
+private:
+    void set_active_vt(int vt)
+    {
+        int console_fd;
+
+        console_fd = open("/dev/console", O_RDONLY | O_NDELAY);      
+        ioctl(console_fd, VT_ACTIVATE, vt);
+        close(console_fd);
+    }
+};
+
+
 class SystemCompositorServerConfiguration : public mir::DefaultServerConfiguration
 {
 public:
     SystemCompositorServerConfiguration(int argc, char const** argv)
-        : mir::DefaultServerConfiguration(argc, argv)
+        : mir::DefaultServerConfiguration(argc, argv),
+          vt_filter(std::make_shared<VTFilter>())
     {
         namespace po = boost::program_options;
 
         add_options()
             ("from-dm-fd", po::value<int>(),  "File descriptor of read end of pipe from display manager [int]")
             ("to-dm-fd", po::value<int>(),  "File descriptor of write end of pipe to display manager [int]");
-       add_options()
+        add_options()
             ("version", "Show version of Unity System Compositor");
     }
 
+    std::shared_ptr<mi::CursorListener> the_cursor_listener() override
+    {
+        struct NullCursorListener : public mi::CursorListener
+        {
+            void cursor_moved_to(float, float) override
+            {
+            }
+        };
+        return std::make_shared<NullCursorListener>();
+    }
+
+    std::initializer_list<std::shared_ptr<mi::EventFilter> const> the_event_filters() override
+    {
+        static std::initializer_list<std::shared_ptr<mi::EventFilter> const> filter_list = { vt_filter };
+        return filter_list;
+    }
+
     int from_dm_fd()
     {
         return the_options()->get("from-dm-fd", -1);
@@ -57,19 +137,11 @@
 
     bool show_version()
     {
-        return the_options()->is_set ("version");
-    }
-    
-    std::shared_ptr<mi::CursorListener> the_cursor_listener() override
-    {
-        struct NullCursorListener : public mi::CursorListener
-        {
-            void cursor_moved_to(float, float) override
-            {
-            }
-        };
-        return std::make_shared<NullCursorListener>();
-    }
+        return the_options()->is_set("version");
+    }
+
+private:
+    std::shared_ptr<VTFilter> const vt_filter;
 };
 
 void SystemCompositor::run(int argc, char const** argv)