[lipstick] Use QOrientationSensor to get updates about current device…

… orientation Call connect to backend Fix style Fixed problems pointed out by @Vesuri removed unneeded packages from spec file
bzeller · Oct 10, 2013 · 5ef43ab · 5ef43ab
1 parent cfa3ece
commit 5ef43ab
Show file tree

Hide file tree

Showing 5 changed files with 84 additions and 3 deletions.
diff --git a/rpm/lipstick-qt5.spec b/rpm/lipstick-qt5.spec
@@ -21,12 +21,12 @@ Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 BuildRequires:  pkgconfig(Qt5Core)
 BuildRequires:  pkgconfig(Qt5Gui)
-BuildRequires:  pkgconfig(Qt5Qml)
 BuildRequires:  pkgconfig(Qt5Quick)
 BuildRequires:  pkgconfig(Qt5Xml)
 BuildRequires:  pkgconfig(Qt5Sql)
 BuildRequires:  pkgconfig(Qt5SystemInfo)
 BuildRequires:  pkgconfig(Qt5Test)
+BuildRequires:  pkgconfig(Qt5Sensors)
 BuildRequires:  pkgconfig(contentaction5)
 BuildRequires:  pkgconfig(mlite5) >= 0.0.6
 BuildRequires:  pkgconfig(mce) >= 1.12.2

diff --git a/src/compositor/lipstickcompositor.cpp b/src/compositor/lipstickcompositor.cpp
@@ -19,6 +19,7 @@
 
 #include <QWaylandInputDevice>
 #include <QDesktopServices>
+#include <QtSensors/QOrientationSensor>
 #include "homeapplication.h"
 #include "windowmodel.h"
 #include "lipstickcompositorprocwindow.h"
@@ -40,6 +41,14 @@ LipstickCompositor::LipstickCompositor()
     connect(m_displayState, SIGNAL(displayStateChanged(MeeGo::QmDisplayState::DisplayState)), this, SLOT(reactOnDisplayStateChanges(MeeGo::QmDisplayState::DisplayState)));
     QObject::connect(HomeApplication::instance(), SIGNAL(aboutToDestroy()), this, SLOT(homeApplicationAboutToDestroy()));
 
+    m_orientationSensor = new QOrientationSensor(this);
+    QObject::connect(m_orientationSensor, SIGNAL(readingChanged()), this, SLOT(setScreenOrientationFromSensor()));
+    if (!m_orientationSensor->connectToBackend()) {
+        qWarning() << "Could not connect to the orientation sensor backend";
+    } else {
+        if (!m_orientationSensor->start())
+            qWarning() << "Could not start the orientation sensor";
+    }
     emit HomeApplication::instance()->homeActiveChanged();
 
     QDesktopServices::setUrlHandler("http", this, "openUrl");
@@ -460,6 +469,10 @@ QQmlComponent *LipstickCompositor::shaderEffectComponent()
 void LipstickCompositor::setScreenOrientation(Qt::ScreenOrientation screenOrientation)
 {
     if (m_screenOrientation != screenOrientation) {
+
+        if (debug())
+            qDebug() << "Setting screen orientation on QWaylandCompositor";
+
         QWaylandCompositor::setScreenOrientation(screenOrientation);
 
         m_screenOrientation = screenOrientation;
@@ -475,3 +488,61 @@ void LipstickCompositor::reactOnDisplayStateChanges(MeeGo::QmDisplayState::Displ
         emit displayOff();
     }
 }
+
+void LipstickCompositor::setScreenOrientationFromSensor()
+{
+    QOrientationReading* reading = m_orientationSensor->reading();
+
+    if (debug())
+        qDebug() << "Screen orientation changed " << reading->orientation();
+
+    switch (reading->orientation()) {
+        case QOrientationReading::TopUp:
+            setScreenOrientation(Qt::PortraitOrientation);
+            break;
+        case QOrientationReading::TopDown:
+            setScreenOrientation(Qt::InvertedPortraitOrientation);
+            break;
+        case QOrientationReading::LeftUp:
+            setScreenOrientation(Qt::InvertedLandscapeOrientation);
+            break;
+        case QOrientationReading::RightUp:
+            setScreenOrientation(Qt::LandscapeOrientation);
+            break;
+        case QOrientationReading::Undefined:
+        case QOrientationReading::FaceUp:
+        case QOrientationReading::FaceDown:
+        default:
+            setScreenOrientation(Qt::PrimaryOrientation);
+            break;
+    }
+}
+
+void LipstickCompositor::setScreenOrientationFromSensor()
+{
+    QOrientationReading* reading = m_orientationSensor->reading();
+
+    if (debug())
+        qDebug() << "Screen orientation changed " << reading->orientation();
+
+    switch (reading->orientation()) {
+        case QOrientationReading::TopUp:
+            setScreenOrientation(Qt::PortraitOrientation);
+            break;
+        case QOrientationReading::TopDown:
+            setScreenOrientation(Qt::InvertedPortraitOrientation);
+            break;
+        case QOrientationReading::LeftUp:
+            setScreenOrientation(Qt::InvertedLandscapeOrientation);
+            break;
+        case QOrientationReading::RightUp:
+            setScreenOrientation(Qt::LandscapeOrientation);
+            break;
+        case QOrientationReading::Undefined:
+        case QOrientationReading::FaceUp:
+        case QOrientationReading::FaceDown:
+        default:
+            setScreenOrientation(Qt::PrimaryOrientation);
+            break;
+    }
+}
diff --git a/src/compositor/lipstickcompositor.h b/src/compositor/lipstickcompositor.h
@@ -26,6 +26,7 @@
 class WindowModel;
 class LipstickCompositorWindow;
 class LipstickCompositorProcWindow;
+class QOrientationSensor;
 
 class LIPSTICK_EXPORT LipstickCompositor : public QQuickWindow, public QWaylandCompositor,
                                            public QQmlParserStatus
@@ -121,6 +122,7 @@ private slots:
     void openUrl(const QUrl &);
     void reactOnDisplayStateChanges(MeeGo::QmDisplayState::DisplayState state);
     void homeApplicationAboutToDestroy();
+    void setScreenOrientationFromSensor();
 
 private:
     friend class LipstickCompositorWindow;
@@ -157,6 +159,7 @@ private slots:
     Qt::ScreenOrientation m_screenOrientation;
     MeeGo::QmDisplayState *m_displayState;
     QAtomicInt m_updateRequestPosted;
+    QOrientationSensor* m_orientationSensor;
 };
 
 #endif // LIPSTICKCOMPOSITOR_H
diff --git a/src/src.pro b/src/src.pro
@@ -116,7 +116,7 @@ packagesExist(contextkit-statefs) {
     warning("Contextsubscriber not found")
 }
 
-QT += dbus xml qml quick sql gui gui-private
+QT += dbus xml qml quick sql gui gui-private sensors
 
 QMAKE_CXXFLAGS += \
     -Werror \

diff --git a/tests/stubs/lipstickcompositor_stub.h b/tests/stubs/lipstickcompositor_stub.h
@@ -46,6 +46,7 @@ class LipstickCompositorStub : public StubBase {
   virtual void windowDestroyed();
   virtual void windowPropertyChanged(const QString &);
   virtual void reactOnDisplayStateChanges(MeeGo::QmDisplayState::DisplayState);
+  virtual void setScreenOrientationFromSensor();
 }; 
 
 // 2. IMPLEMENT STUB
@@ -239,7 +240,9 @@ void LipstickCompositorStub::reactOnDisplayStateChanges(MeeGo::QmDisplayState::D
   stubMethodEntered("reactOnDisplayStateChanges",params);
 }
 
-
+void LipstickCompositorStub::setScreenOrientationFromSensor( ) {
+  stubMethodEntered("setScreenOrientationFromSensor");
+}
 
 // 3. CREATE A STUB INSTANCE
 LipstickCompositorStub gDefaultLipstickCompositorStub;
@@ -398,6 +401,10 @@ void LipstickCompositor::reactOnDisplayStateChanges(MeeGo::QmDisplayState::Displ
 void LipstickCompositor::homeApplicationAboutToDestroy() {
 }
 
+void LipstickCompositor::setScreenOrientationFromSensor() {
+  gLipstickCompositorStub->setScreenOrientationFromSensor();
+}
+
 QWaylandCompositor::QWaylandCompositor(QWindow *, const char *)
 {
 }