[systemsettings] Expose display double tap wakeup state

sailfishos · Mar 11, 2014 · b62827a · b62827a
1 parent acd0d65
commit b62827a
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 0 deletions.
diff --git a/src/displaysettings.cpp b/src/displaysettings.cpp
@@ -40,6 +40,7 @@ static const char *MceDisplayDimTimeout = "/system/osso/dsm/display/display_dim_
 static const char *MceDisplayBlankTimeout = "/system/osso/dsm/display/display_blank_timeout";
 static const char *MceDisplayUseAdaptiveDimming = "/system/osso/dsm/display/use_adaptive_display_dimming";
 static const char *MceDisplayUseAmbientLightSensor = "/system/osso/dsm/display/als_enabled";
+static const char *MceDoubleTapMode = "/system/osso/dsm/doubletap/mode";
 
 DisplaySettings::DisplaySettings(QObject *parent)
     : QObject(parent),
@@ -66,6 +67,10 @@ DisplaySettings::DisplaySettings(QObject *parent)
     result.waitForFinished();
     m_ambientLightSensorEnabled = result.value().variant().toBool();
 
+    result = m_mceIface->get_config(QDBusObjectPath(MceDoubleTapMode));
+    result.waitForFinished();
+    m_doubleTapMode = result.value().variant().toInt();
+
     m_mceSignalIface = new ComNokiaMceSignalInterface(MCE_SERVICE, MCE_SIGNAL_PATH, QDBusConnection::systemBus(), this);
     connect(m_mceSignalIface, SIGNAL(config_change_ind(QString,QDBusVariant)), this, SLOT(configChange(QString,QDBusVariant)));
 }
@@ -148,6 +153,20 @@ void DisplaySettings::setAmbientLightSensorEnabled(bool enabled)
     }
 }
 
+int DisplaySettings::doubleTapMode() const
+{
+    return m_doubleTapMode;
+}
+
+void DisplaySettings::setDoubleTapMode(int mode)
+{
+    if (m_doubleTapMode != mode) {
+        m_doubleTapMode = mode;
+        m_mceIface->set_config(QDBusObjectPath(MceDoubleTapMode), QDBusVariant(mode));
+        emit doubleTapModeChanged();
+    }
+}
+
 QVariant DisplaySettings::orientationLock() const
 {
     return m_compositorSettings.value("Compositor/orientationLock", "dynamic");
@@ -190,5 +209,11 @@ void DisplaySettings::configChange(const QString &key, const QDBusVariant &value
             m_ambientLightSensorEnabled = val;
             emit ambientLightSensorEnabledChanged();
         }
+    } else if (key == MceDoubleTapMode) {
+        int val = value.variant().toInt();
+        if (val != m_doubleTapMode) {
+            m_doubleTapMode = val;
+            emit doubleTapModeChanged();
+        }
     }
 }
diff --git a/src/displaysettings.h b/src/displaysettings.h
@@ -44,15 +44,23 @@ class DisplaySettings: public QObject
 {
     Q_OBJECT
 
+    Q_ENUMS(DoubleTapMode)
     Q_PROPERTY(int brightness READ brightness WRITE setBrightness NOTIFY brightnessChanged)
     Q_PROPERTY(int maximumBrightness READ maximumBrightness CONSTANT)
     Q_PROPERTY(int dimTimeout READ dimTimeout WRITE setDimTimeout NOTIFY dimTimeoutChanged)
     Q_PROPERTY(int blankTimeout READ blankTimeout WRITE setBlankTimeout NOTIFY blankTimeoutChanged)
     Q_PROPERTY(bool adaptiveDimmingEnabled READ adaptiveDimmingEnabled WRITE setAdaptiveDimmingEnabled NOTIFY adaptiveDimmingEnabledChanged)
     Q_PROPERTY(bool ambientLightSensorEnabled READ ambientLightSensorEnabled WRITE setAmbientLightSensorEnabled NOTIFY ambientLightSensorEnabledChanged)
+    Q_PROPERTY(int doubleTapMode READ doubleTapMode WRITE setDoubleTapMode NOTIFY doubleTapModeChanged)
     Q_PROPERTY(QVariant orientationLock READ orientationLock WRITE setOrientationLock NOTIFY orientationLockChanged)
 
 public:
+    enum DoubleTapMode {
+        DoubleTapWakeupNever,
+        DoubleTapWakeupAlways,
+        DoubleTapWakeupNoProximity
+    };
+
     explicit DisplaySettings(QObject *parent = 0);
 
     int brightness() const;
@@ -72,6 +80,9 @@ class DisplaySettings: public QObject
     bool ambientLightSensorEnabled() const;
     void setAmbientLightSensorEnabled(bool);
 
+    int doubleTapMode() const;
+    void setDoubleTapMode(int);
+
     QVariant orientationLock() const;
     void setOrientationLock(const QVariant &);
 
@@ -81,6 +92,7 @@ class DisplaySettings: public QObject
     void blankTimeoutChanged();
     void adaptiveDimmingEnabledChanged();
     void ambientLightSensorEnabledChanged();
+    void doubleTapModeChanged();
     void orientationLockChanged();
 
 private slots:
@@ -95,6 +107,7 @@ private slots:
     int m_blankTimeout;
     bool m_adaptiveDimmingEnabled;
     bool m_ambientLightSensorEnabled;
+    bool m_doubleTapMode;
 };
 
 QML_DECLARE_TYPE(DisplaySettings)