Merge lp:~ricmm/unity-mir/add-keyfilter-interface into lp:unity-mir

[Ricardo Mendoza]

Add KeyFilter interface to implement Mir's EventFilter

This needs to be tested with the following changes to Shell.qml (unity8):

https://code.launchpad.net/~ricmm/unity8/use-volume-key-signals/+merge/189728

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:101
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/95/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-amd64-ci/37
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-armhf-ci/95
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-armhf-ci/95/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-i386-ci/95

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-mir-ci/95/rebuild

review: Approve (continuous-integration)

[lp:~ricmm/unity-mir/add-keyfilter-interface]

102. By Ricardo Mendoza on 2013-10-15

Merge trunk

[Robert Carr (robertcarr)]

LGTM. I'll do a test run.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:102
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/129/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-amd64-ci/71
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-armhf-ci/129
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-armhf-ci/129/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-i386-ci/129

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-mir-ci/129/rebuild

review: Approve (continuous-integration)

[Robert Carr (robertcarr)]

Built unity-mir with this and updated Shell.qml...not getting the signals in unity8 though, added some logging to verify the emission is happing from unity-mir.

[Robert Carr (robertcarr)]

Didnt realize the volume OSD notification was removed, this is actually working fine :)

review: Approve

[Michał Sawicz (saviq)]

Let's not merge this now. It's just a case of broken mapping in qtubuntu again.

review: Disapprove

Unmerged revisions

102. By Ricardo Mendoza on 2013-10-15

Merge trunk

101. By Ricardo Mendoza on 2013-10-07

Add KeyFilter interface to receive and filter key hardware key events

=== modified file 'src/modules/Unity/Application/application_manager.cpp'
--- src/modules/Unity/Application/application_manager.cpp	2013-10-14 19:29:44 +0000
+++ src/modules/Unity/Application/application_manager.cpp	2013-10-15 17:46:07 +0000
@@ -27,6 +27,7 @@
 #include "sessionauthorizer.h"
 #include "taskcontroller.h"
 #include "logging.h"
+#include "keyfilter.h"
 
 // mir
 #include <mir/shell/session_manager.h>
@@ -89,6 +90,13 @@
     QObject::connect(m_taskController.data(), &TaskController::requestResume,
                      this, &ApplicationManager::onResumeRequested);
 
+    QObject::connect(mirServerApplication->keyFilter(), &KeyFilter::volumeDownKeyPressed,
+                     this, &ApplicationManager::onVolumeDownKeyPressed);
+    QObject::connect(mirServerApplication->keyFilter(), &KeyFilter::volumeUpKeyPressed,
+                     this, &ApplicationManager::onVolumeUpKeyPressed);
+    QObject::connect(mirServerApplication->keyFilter(), &KeyFilter::powerKeyPressed,
+                     this, &ApplicationManager::onPowerKeyPressed);
+
     m_dbusWindowStack = new DBusWindowStack(this);
 }
 
@@ -336,6 +344,17 @@
     }
 }
 
+void ApplicationManager::onVolumeDownKeyPressed(void) {
+    Q_EMIT volumeDownKeyPressed();
+}
+
+void ApplicationManager::onVolumeUpKeyPressed(void) {
+    Q_EMIT volumeUpKeyPressed();
+}
+
+void ApplicationManager::onPowerKeyPressed(void) {
+    Q_EMIT powerKeyPressed();
+}
 /************************************* Mir-side methods *************************************/
 
 void ApplicationManager::authorizeSession(const quint64 pid, bool &authorized)

=== modified file 'src/modules/Unity/Application/application_manager.h'
--- src/modules/Unity/Application/application_manager.h	2013-10-11 14:23:22 +0000
+++ src/modules/Unity/Application/application_manager.h	2013-10-15 17:46:07 +0000
@@ -96,8 +96,15 @@
     void onFocusRequested(const QString& appId);
     void onResumeRequested(const QString& appId);
 
+    void onVolumeDownKeyPressed();
+    void onVolumeUpKeyPressed();
+    void onPowerKeyPressed();
+
 Q_SIGNALS:
     void focusRequested(const QString &appId);
+    void volumeUpKeyPressed();
+    void volumeDownKeyPressed();
+    void powerKeyPressed();
 
 private:
     void setFocused(Application *application);

=== added file 'src/unity-mir/keyfilter.cpp'
--- src/unity-mir/keyfilter.cpp	1970-01-01 00:00:00 +0000
+++ src/unity-mir/keyfilter.cpp	2013-10-15 17:46:07 +0000
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2013 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 warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY, 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/>.
+ */
+
+#include "keyfilter.h"
+#include <linux/input.h>
+
+bool KeyFilter::handle(MirEvent const& event)
+{
+    if (event.type != mir_event_type_key)
+        return false;
+
+    switch (event.key.scan_code)
+    {
+    case KEY_VOLUMEDOWN:
+        Q_EMIT volumeDownKeyPressed();
+        return true;
+    case KEY_VOLUMEUP:
+        Q_EMIT volumeUpKeyPressed();
+        return true;
+    case KEY_POWER:
+        Q_EMIT powerKeyPressed();
+        return true;
+    }
+
+    return false;
+}

=== added file 'src/unity-mir/keyfilter.h'
--- src/unity-mir/keyfilter.h	1970-01-01 00:00:00 +0000
+++ src/unity-mir/keyfilter.h	2013-10-15 17:46:07 +0000
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2013 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 warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY, 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/>.
+ */
+
+#ifndef KEYFILTER_H
+#define KEYFILTER_H
+
+// qt
+#include <QObject>
+
+#include <mir/input/event_filter.h>
+
+class KeyFilter : public QObject, public mir::input::EventFilter
+{
+    Q_OBJECT
+
+public:
+    bool handle(MirEvent const& event);
+
+Q_SIGNALS:
+    void volumeUpKeyPressed();
+    void volumeDownKeyPressed();
+    void powerKeyPressed();
+
+};
+
+#endif // KEYFILTER_H

=== modified file 'src/unity-mir/qmirserverapplication.cpp'
--- src/unity-mir/qmirserverapplication.cpp	2013-09-25 09:43:14 +0000
+++ src/unity-mir/qmirserverapplication.cpp	2013-10-15 17:46:07 +0000
@@ -16,6 +16,9 @@
 
 #include "qmirserverapplication.h"
 #include "dbusscreen.h"
+#include "keyfilter.h"
+#include "shellserverconfiguration.h"
+#include <mir/input/event_filter_chain.h>
 
 class QMirServerApplicationPrivate {
 public:
@@ -23,11 +26,15 @@
         : q_ptr(qq)
         , serverConfiguration(serverConfiguration)
         , dbusScreen(new DBusScreen(serverConfiguration))
-    {}
+        , keyFilter(std::make_shared<KeyFilter>())
+    {
+        serverConfiguration->the_composite_event_filter()->append(keyFilter);
+    }
 
     QMirServerApplication * const q_ptr;
     ShellServerConfiguration *serverConfiguration;
     QScopedPointer<DBusScreen> dbusScreen;
+    std::shared_ptr<KeyFilter> keyFilter;
     Q_DECLARE_PUBLIC(QMirServerApplication)
 };
 
@@ -49,6 +56,12 @@
     return d->serverConfiguration;
 }
 
+KeyFilter* QMirServerApplication::keyFilter() const
+{
+    Q_D(const QMirServerApplication);
+    return d->keyFilter.get();
+}
+
 // class factory implemenation
 extern "C" {
     QMirServerApplication *createQMirServerApplication(int &argc, char **argv, ShellServerConfiguration *serverConfiguration) {

=== modified file 'src/unity-mir/qmirserverapplication.h'
--- src/unity-mir/qmirserverapplication.h	2013-09-25 09:43:14 +0000
+++ src/unity-mir/qmirserverapplication.h	2013-10-15 17:46:07 +0000
@@ -21,6 +21,7 @@
 
 class ShellServerConfiguration;
 class QMirServerApplicationPrivate;
+class KeyFilter;
 
 class QMirServerApplication : public QGuiApplication
 {
@@ -31,6 +32,7 @@
     ~QMirServerApplication();
 
     ShellServerConfiguration* server() const;
+    KeyFilter* keyFilter() const;
 
 protected:
     QMirServerApplicationPrivate * const d_ptr;

=== modified file 'src/unity-mir/unity-mir.pro'
--- src/unity-mir/unity-mir.pro	2013-10-07 21:52:28 +0000
+++ src/unity-mir/unity-mir.pro	2013-10-15 17:46:07 +0000
@@ -24,7 +24,8 @@
     surfacecontroller.cpp \
     surfacesource.cpp \
     surfaceconfigurator.cpp \
-    focussetter.cpp
+    focussetter.cpp \
+    keyfilter.cpp
 
 HEADERS += \
     dbusscreen.h \
@@ -37,6 +38,7 @@
     surfacecontroller.h \
     surfacesource.h \
     surfaceconfigurator.h \
+    keyfilter.h \
     logging.h \
     focussetter.h