Merge lp:~gerboland/unity-mir/add-screen-blank into lp:unity-mir

[Gerry Boland]

Adding controller for Display power mode and a DBus API to allow other processes to adjust it

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:89
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/63/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-amd64-ci/5/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-armhf-ci/63/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-i386-ci/63/console

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

review: Needs Fixing (continuous-integration)

[Gerry Boland (gerboland)]

Need to wait for new Mir release (version 3)

[lp:~gerboland/unity-mir/add-screen-blank]

90. By Gerry Boland on 2013-09-24

Merge trunk

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~gerboland/unity-mir/add-screen-blank]

91. By Gerry Boland on 2013-09-24

Register dbus on the system bus, as powerd lives there

92. By Gerry Boland on 2013-09-24

Add dbus policy file to allow connection to system bus

93. By Gerry Boland on 2013-09-24

s/org/com/

94. By Gerry Boland on 2013-09-24

whitespace

95. By Gerry Boland on 2013-09-24

missed s/org/com/

[Ricardo Mendoza (ricmm)]

Tested. LGTM.

review: Approve

[Robert Carr (robertcarr)]

Is this tested on N4 or should I give it a run?

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~gerboland/unity-mir/add-screen-blank]

96. By Gerry Boland on 2013-09-25

Some review comments addressed

97. By Gerry Boland on 2013-09-25

Fix usage of Q_D macro in const context

98. By Gerry Boland on 2013-09-25

Make sure to delete Private class when parent deleted

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== added file 'debian/com.canonical.Unity.conf'
--- debian/com.canonical.Unity.conf	1970-01-01 00:00:00 +0000
+++ debian/com.canonical.Unity.conf	2013-09-25 09:43:24 +0000
@@ -0,0 +1,18 @@
+<!DOCTYPE busconfig PUBLIC
+ "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+
+	<policy user="phablet">
+		<allow own="com.canonical.Unity.Screen"/>
+	</policy>
+
+	<policy context="default">
+		<deny send_destination="com.canonical.Unity.Screen"/>
+	</policy>
+
+	<policy user="root">
+		<allow send_destination="com.canonical.Unity.Screen"/>
+	</policy>
+	
+</busconfig>

=== modified file 'debian/libunity-mir1.install'
--- debian/libunity-mir1.install	2013-07-25 13:24:00 +0000
+++ debian/libunity-mir1.install	2013-09-25 09:43:24 +0000
@@ -1,2 +1,3 @@
 usr/lib/*/libunity-mir.so.*
 usr/lib/*/qt5/*
+debian/com.canonical.Unity.conf etc/dbus-1/system.d/

=== added file 'src/unity-mir/dbusscreen.cpp'
--- src/unity-mir/dbusscreen.cpp	1970-01-01 00:00:00 +0000
+++ src/unity-mir/dbusscreen.cpp	2013-09-25 09:43:24 +0000
@@ -0,0 +1,80 @@
+/*
+ * 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/>.
+ */
+
+// mir
+#include <mir/graphics/display.h>
+#include <mir/graphics/display_configuration.h>
+#include <mir_toolkit/common.h>
+
+// qt
+#include <QDBusConnection>
+#include <QDebug>
+
+// local
+#include "shellserverconfiguration.h"
+#include "dbusscreen.h"
+
+namespace mc = mir::compositor;
+namespace mg = mir::graphics;
+
+// Note: this class should be created only after when the Mir DisplayServer has started
+DBusScreen::DBusScreen(ShellServerConfiguration *config, QObject *parent)
+    : QObject(parent)
+    , m_serverConfig(config)
+{
+    QDBusConnection::systemBus().registerService("com.canonical.Unity.Screen");
+    // TODO ExportScriptableSlots shouldn't be needed but without it I don't get the methods :-/
+    QDBusConnection::systemBus().registerObject("/com/canonical/Unity/Screen", this,
+                                                QDBusConnection::ExportScriptableSlots |
+                                                QDBusConnection::ExportScriptableInvokables );
+}
+
+bool DBusScreen::setScreenPowerMode(const QString &mode)
+{
+    MirPowerMode newPowerMode;
+    // Note: the "standby" and "suspend" modes are mostly unused
+
+    if (mode == "on") {
+        newPowerMode = MirPowerMode::mir_power_mode_on;
+    } else if (mode == "standby") {
+        newPowerMode = MirPowerMode::mir_power_mode_standby; // higher power "off" mode (fastest resume)
+    } else if (mode == "suspend") {
+        newPowerMode = MirPowerMode::mir_power_mode_suspend; // medium power "off" mode
+    } else if (mode == "off") {
+        newPowerMode = MirPowerMode::mir_power_mode_off;     // lowest power "off" mode (slowest resume)
+    } else {
+        qWarning() << "DBusScreen: unknown mode type" << mode;
+        return false;
+    }
+
+    std::shared_ptr<mg::Display> display = m_serverConfig->the_display();
+    std::shared_ptr<mg::DisplayConfiguration> displayConfig = display->configuration();
+
+    displayConfig->for_each_output([&](const mg::DisplayConfigurationOutput displayConfigOutput) {
+        if (displayConfigOutput.power_mode != newPowerMode) {
+            displayConfig->configure_output(
+                        displayConfigOutput.id,         //unchanged
+                        displayConfigOutput.used,       //unchanged
+                        displayConfigOutput.top_left,   //unchanged
+                        displayConfigOutput.current_mode_index, //unchanged
+                        newPowerMode
+                        );
+        }
+    });
+
+    display->configure(*displayConfig.get());
+    return true;
+}

=== added file 'src/unity-mir/dbusscreen.h'
--- src/unity-mir/dbusscreen.h	1970-01-01 00:00:00 +0000
+++ src/unity-mir/dbusscreen.h	2013-09-25 09:43:24 +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 DBUSSCREEN_H
+#define DBUSSCREEN_H
+
+// qt
+#include <QObject>
+
+class ShellServerConfiguration;
+
+class DBusScreen : public QObject
+{
+    Q_OBJECT
+    Q_CLASSINFO("D-Bus Interface", "com.canonical.Unity.Screen")
+
+public:
+    explicit DBusScreen(ShellServerConfiguration *config, QObject *parent = 0);
+
+    Q_INVOKABLE Q_SCRIPTABLE bool setScreenPowerMode(const QString &mode);
+
+private:
+    ShellServerConfiguration *m_serverConfig;
+};
+
+#endif // DBUSSCREEN_H

=== modified file 'src/unity-mir/qmirserverapplication.cpp'
--- src/unity-mir/qmirserverapplication.cpp	2013-09-09 20:27:47 +0000
+++ src/unity-mir/qmirserverapplication.cpp	2013-09-25 09:43:24 +0000
@@ -15,16 +15,38 @@
  */
 
 #include "qmirserverapplication.h"
+#include "dbusscreen.h"
+
+class QMirServerApplicationPrivate {
+public:
+    QMirServerApplicationPrivate(ShellServerConfiguration* serverConfiguration, QMirServerApplication *qq)
+        : q_ptr(qq)
+        , serverConfiguration(serverConfiguration)
+        , dbusScreen(new DBusScreen(serverConfiguration))
+    {}
+
+    QMirServerApplication * const q_ptr;
+    ShellServerConfiguration *serverConfiguration;
+    QScopedPointer<DBusScreen> dbusScreen;
+    Q_DECLARE_PUBLIC(QMirServerApplication)
+};
+
 
 QMirServerApplication::QMirServerApplication(int &argc, char **argv, ShellServerConfiguration* serverConfiguration)
     : QGuiApplication(argc, argv)
-    , m_serverConfiguration(serverConfiguration)
-{
+    , d_ptr(new QMirServerApplicationPrivate(serverConfiguration, this))
+{
+}
+
+QMirServerApplication::~QMirServerApplication()
+{
+    delete d_ptr;
 }
 
 ShellServerConfiguration* QMirServerApplication::server() const
 {
-    return m_serverConfiguration;
+    Q_D(const QMirServerApplication);
+    return d->serverConfiguration;
 }
 
 // class factory implemenation
@@ -41,4 +63,3 @@
         delete mirServer;
     }
 }
-

=== modified file 'src/unity-mir/qmirserverapplication.h'
--- src/unity-mir/qmirserverapplication.h	2013-09-09 20:27:47 +0000
+++ src/unity-mir/qmirserverapplication.h	2013-09-25 09:43:24 +0000
@@ -20,6 +20,7 @@
 #include <QGuiApplication>
 
 class ShellServerConfiguration;
+class QMirServerApplicationPrivate;
 
 class QMirServerApplication : public QGuiApplication
 {
@@ -27,11 +28,15 @@
 
 public:
     explicit QMirServerApplication(int &argc, char **argv, ShellServerConfiguration* serverConfiguration);
+    ~QMirServerApplication();
 
     ShellServerConfiguration* server() const;
 
+protected:
+    QMirServerApplicationPrivate * const d_ptr;
+
 private:
-    ShellServerConfiguration* m_serverConfiguration;
+    Q_DECLARE_PRIVATE(QMirServerApplication)
 };
 
 

=== modified file 'src/unity-mir/unity-mir.pro'
--- src/unity-mir/unity-mir.pro	2013-08-22 15:33:55 +0000
+++ src/unity-mir/unity-mir.pro	2013-09-25 09:43:24 +0000
@@ -1,7 +1,7 @@
 TARGET = unity-mir
 TEMPLATE = lib
 
-QT       += core quick
+QT       += core quick dbus
 CONFIG   += link_pkgconfig
 
 # CONFIG += c++11 # only enables C++0x
@@ -13,7 +13,9 @@
 
 LIBS += -lubuntu_application_api_mirserver #FIXME platform-api pkgconfig should set this
 
-SOURCES += initialsurfaceplacementstrategy.cpp \
+SOURCES += \
+    dbusscreen.cpp \
+    initialsurfaceplacementstrategy.cpp \
     qmirserverapplication.cpp \
     qmirserver.cpp \
     sessionauthorizer.cpp \
@@ -23,7 +25,9 @@
     surfacesource.cpp \
     surfaceconfigurator.cpp
 
-HEADERS += initialsurfaceplacementstrategy.h \
+HEADERS += \
+    dbusscreen.h \
+    initialsurfaceplacementstrategy.h \
     qmirserverapplication.h \
     qmirserver.h \
     sessionauthorizer.h \