Merge lp:~ricmm/qtpowerd/names-and-display into lp:qtpowerd

[Ricardo Mendoza]

* Select lock name dynamically according to application
* Hold display active as well on KeepAlive

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:6
http://jenkins.qa.ubuntu.com/job/qtpowerd-ci/2/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtpowerd-saucy-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtpowerd-saucy-armhf-ci/2

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/qtpowerd-ci/2/rebuild

review: Approve (continuous-integration)

[Loïc Minier (lool)]

Rather than:
+ POWERD_DISPLAY_STATE_ON = POWERD_SYS_STATE_ACTIVE,
maybe you should copy-paste the whole powerd.h enum:
enum powerd_display_state {
    POWERD_DISPLAY_STATE_DONT_CARE = 0,
    POWERD_DISPLAY_STATE_ON,

    /* Keep last */
    POWERD_NUM_DISPLAY_STATES
};

[Loïc Minier (lool)]

Hmm this doens't look good, it seems to me like music-app and mediaplayer-app will both take both locks when we want a different lock for each of them.

review: Disapprove

[lp:~ricmm/qtpowerd/names-and-display]

7. By Ricardo Mendoza on 2013-10-14

Split state setters and add keepDisplayOn for the Display value

[Loïc Minier (lool)]

Looks good to me; thanks!

review: Approve

=== modified file 'QtPowerd.cpp'
--- QtPowerd.cpp	2013-10-01 21:49:39 +0000
+++ QtPowerd.cpp	2013-10-14 18:53:43 +0000
@@ -17,6 +17,7 @@
  */
 
 #include <QtDebug>
+#include <QGuiApplication>
 
 /* FIXME should really include powerd.h, but not available right now */
 //#include <powerd.h>
@@ -27,24 +28,26 @@
 
     //The Active state will prevent system suspend
     POWERD_SYS_STATE_ACTIVE,
+    POWERD_DISPLAY_STATE_ON = POWERD_SYS_STATE_ACTIVE,
 
     POWERD_NUM_POWER_STATES
 };
 
 #include "QtPowerd.h"
 
-// XXX this should be set by QML app; in fact it could hold multiple ones
-#define LOCK_NAME "music-app-background"
-
 QtPowerd::QtPowerd(QObject* parent)
   : QObject(parent),
     m_keepAlive(false),
+    m_keepDisplayOn(false),
     m_qtpowerd(NULL)
 {
     m_qtpowerd = new QDBusInterface("com.canonical.powerd",
                                     "/com/canonical/powerd",
                                     "com.canonical.powerd",
                                     QDBusConnection::SM_BUSNAME(), this);
+
+    m_lockName = QGuiApplication::instance()->applicationName();
+    m_lockName.append("-background");
 }
 
 bool QtPowerd::keepAlive() const
@@ -61,15 +64,15 @@
 
     if (keep) {
         QDBusReply<QString> reply = m_qtpowerd->call("requestSysState",
-                                                     LOCK_NAME,
+                                                     m_lockName,
                                                      POWERD_SYS_STATE_ACTIVE);
         if (!reply.isValid()) {
             qCritical() << "requestSysState:" << reply.error();
             return;
         }
-        m_cookie = reply.value();
+        m_sysCookie = reply.value();
     } else {
-        QDBusReply<void> reply = m_qtpowerd->call("clearSysState", m_cookie);
+        QDBusReply<void> reply = m_qtpowerd->call("clearSysState", m_sysCookie);
         if (!reply.isValid()) {
             qCritical() << "clearSysState:" << reply.error();
             return;
@@ -79,3 +82,37 @@
     m_keepAlive = keep;
     Q_EMIT keepAliveChanged();
 }
+
+bool QtPowerd::keepDisplayOn() const
+{
+    return m_keepDisplayOn;
+}
+
+void QtPowerd::setDisplayOn(const bool keep)
+{
+    if (m_keepDisplayOn == keep) {
+        // nothing to do
+        return;
+    }
+
+    if (keep) {
+        QDBusReply<QString> reply = m_qtpowerd->call("requestDisplayState",
+                                 m_lockName,
+                                 POWERD_DISPLAY_STATE_ON,
+                                 QVariant((uint) 0));
+        if (!reply.isValid()) {
+            qCritical() << "requestDisplayState:" << reply.error();
+            return;
+        }
+        m_dispCookie = reply.value();
+    } else {
+        QDBusReply<void> reply = m_qtpowerd->call("clearDisplayState", m_dispCookie);
+        if (!reply.isValid()) {
+            qCritical() << "clearDisplayState:" << reply.error();
+            return;
+        }
+    }
+
+    m_keepDisplayOn = keep;
+    Q_EMIT keepDisplayOnChanged();
+}
 
=== modified file 'QtPowerd.h'
--- QtPowerd.h	2013-10-01 21:49:39 +0000
+++ QtPowerd.h	2013-10-14 18:53:43 +0000
@@ -28,6 +28,7 @@
 {
     Q_OBJECT
     Q_PROPERTY(bool keepAlive READ keepAlive WRITE setKeepAlive NOTIFY keepAliveChanged)
+    Q_PROPERTY(bool keepDisplayOn READ keepDisplayOn WRITE setDisplayOn NOTIFY keepDisplayOnChanged)
 
 public:
     explicit QtPowerd(QObject *parent = 0);
@@ -35,12 +36,19 @@
     bool keepAlive() const;
     void setKeepAlive(const bool keepAlive);
 
+    bool keepDisplayOn() const;
+    void setDisplayOn(const bool keepDisplayOn);
+
 Q_SIGNALS:
     void keepAliveChanged();
+    void keepDisplayOnChanged();
 
 private:
-    QString m_cookie;
+    QString m_lockName;
+    QString m_dispCookie;
+    QString m_sysCookie;
     bool m_keepAlive;
+    bool m_keepDisplayOn;
     QDBusInterface *m_qtpowerd;
 };
 
 
=== modified file 'qtpowerd.pro'
--- qtpowerd.pro	2013-10-01 21:49:39 +0000
+++ qtpowerd.pro	2013-10-14 18:53:43 +0000
@@ -1,7 +1,7 @@
 TEMPLATE = lib
 CONFIG += qt plugin link_pkgconfig
 
-equals(QT_MAJOR_VERSION, 5): QT = core dbus qml
+equals(QT_MAJOR_VERSION, 5): QT = core dbus qml quick
 
 PKGCONFIG =