Merge lp:~mterry/unity-mir/drop-dbusscreen into lp:unity-mir

[Michael Terry]

Drop dbusscreen code because it has moved to unity-system-compositor.

Drop dbusscreen code because it has moved to unity-system-compositor.

 * Are there any related MPs required for this MP to build/function as expected? Please list.
 - No
 * Did you perform an exploratory manual test run of your code change and any related functionality?
 - Yes
 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
 - I am in the team

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:163
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/229/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-ci/92
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/93
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/93/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-ci/92

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

review: Approve (continuous-integration)

[Thomas Voß (thomas-voss)]

Could you provide reviewers at least with some manual testing instructions to make sure that things don't break?

review: Needs Information

[Michael Terry (mterry)]

Trying to turn screen on and off again will exercise this code path. So if your device turns off, everything is fine. When testing, make sure you install from a built deb to get the proper conffile handling.

Also, I'm going to mark this WIP for now, because nested mode got temporarily reverted while we fix a regression.

[Michael Terry (mterry)]

OK! This is ready again. To test, just run with this code on your phone, reboot, and try turning the screen on and off again.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:164
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/252/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-ci/115
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/116
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/116/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-ci/115

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

review: Approve (continuous-integration)

[Alberto Aguirre (albaguirre)]

review: Approve

[Gerry Boland (gerboland)]

review: Approve

[Gerry Boland (gerboland)]

• Did you perform an exploratory manual test run of the code change and any related functionality?
Yes

• Did CI run pass? If not, please explain why.
Yep

[lp:~mterry/unity-mir/drop-dbusscreen]

165. By Michael Terry on 2014-03-04

Merge from trunk

=== modified file 'debian/changelog'
--- debian/changelog	2014-02-21 17:07:41 +0000
+++ debian/changelog	2014-03-04 16:21:59 +0000
@@ -1,3 +1,9 @@
+unity-mir (0.3) UNRELEASED; urgency=medium
+
+  * Bump version so we can specify it for rm_conffile
+
+ -- Michael Terry <[e-mail]>  Sun, 19 Jan 2014 21:04:06 -0500
+
 unity-mir (0.2+14.04.20140221.1-0ubuntu1) trusty; urgency=low
 
   [ Michael Terry ]

=== removed file 'debian/com.canonical.Unity.conf'
--- debian/com.canonical.Unity.conf	2013-10-07 21:41:32 +0000
+++ debian/com.canonical.Unity.conf	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-<!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_interface="com.canonical.Unity.Screen"/>
-	</policy>
-
-	<policy user="root">
-		<allow send_interface="com.canonical.Unity.Screen"/>
-	</policy>
-	
-</busconfig>

=== modified file 'debian/libunity-mir1.install'
--- debian/libunity-mir1.install	2013-09-24 16:54:23 +0000
+++ debian/libunity-mir1.install	2014-03-04 16:21:59 +0000
@@ -1,3 +1,2 @@
 usr/lib/*/libunity-mir.so.*
 usr/lib/*/qt5/*
-debian/com.canonical.Unity.conf etc/dbus-1/system.d/

=== added file 'debian/libunity-mir1.maintscript'
--- debian/libunity-mir1.maintscript	1970-01-01 00:00:00 +0000
+++ debian/libunity-mir1.maintscript	2014-03-04 16:21:59 +0000
@@ -0,0 +1,1 @@
+rm_conffile /etc/dbus-1/system.d/com.canonical.Unity.conf 0.3

=== modified file 'src/unity-mir/CMakeLists.txt'
--- src/unity-mir/CMakeLists.txt	2014-02-21 17:07:32 +0000
+++ src/unity-mir/CMakeLists.txt	2014-03-04 16:21:59 +0000
@@ -14,7 +14,6 @@
 set(
   UNITY_MIR_HEADERS
 
-  dbusscreen.h
   displayconfigurationpolicy.h
   initialsurfaceplacementstrategy.h
   qmirserverapplication.h
@@ -36,7 +35,6 @@
 add_library(
   unity-mir SHARED
 
-  dbusscreen.cpp
   displayconfigurationpolicy.cpp
   initialsurfaceplacementstrategy.cpp
   qmirserverapplication.cpp
@@ -58,7 +56,7 @@
 
 # We should not need this line according to the Qt5/CMake docs.
 # However, when removing it, include paths are not set and linking to Qt5 fails.
-qt5_use_modules(unity-mir Core Quick DBus)
+qt5_use_modules(unity-mir Core Quick)
 
 set_target_properties(
   unity-mir
@@ -72,7 +70,6 @@
 
   Qt5::Core
   Qt5::Quick
-  Qt5::DBus
 
   ${CMAKE_THREAD_LIBS_INIT}
 

=== removed file 'src/unity-mir/dbusscreen.cpp'
--- src/unity-mir/dbusscreen.cpp	2014-02-04 01:53:24 +0000
+++ src/unity-mir/dbusscreen.cpp	1970-01-01 00:00:00 +0000
@@ -1,91 +0,0 @@
-/*
- * 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/compositor/compositor.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();
-    std::shared_ptr<mc::Compositor> compositor = m_serverConfig->the_compositor();
-
-    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
-                        displayConfigOutput.current_format,
-                        newPowerMode,
-                        displayConfigOutput.orientation //unchanged
-                        );
-        }
-    });
-
-    if (newPowerMode != MirPowerMode::mir_power_mode_on)
-        compositor->stop();
-
-    display->configure(*displayConfig.get());
-
-    if (newPowerMode == MirPowerMode::mir_power_mode_on)
-        compositor->start();
-
-    return true;
-}

=== removed file 'src/unity-mir/dbusscreen.h'
--- src/unity-mir/dbusscreen.h	2013-09-25 09:30:08 +0000
+++ src/unity-mir/dbusscreen.h	1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
-/*
- * 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-25 09:43:14 +0000
+++ src/unity-mir/qmirserverapplication.cpp	2014-03-04 16:21:59 +0000
@@ -15,19 +15,16 @@
  */
 
 #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)
 };