X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=HomeScreen%2Fsrc%2Flayouthandler.cpp;h=6aad54b12ea43c28e3a6a1db1f0f69083038d5a6;hb=505ec164e5174ddd838c0cac1e3e828930cb3b50;hp=35304e6733529d18543db0cd6216b823094dc969;hpb=ef35ccbf522a2aaaece7625e9886bd910e3bd8b8;p=staging%2FHomeScreen.git

diff --git a/HomeScreen/src/layouthandler.cpp b/HomeScreen/src/layouthandler.cpp
index 35304e6..6aad54b 100644
--- a/HomeScreen/src/layouthandler.cpp
+++ b/HomeScreen/src/layouthandler.cpp
@@ -1,7 +1,9 @@
 #include "layouthandler.h"
+#include <QTimerEvent>
 
 LayoutHandler::LayoutHandler(QObject *parent) :
     QObject(parent),
+    m_secondsTimerId(-1),
     mp_dBusWindowManagerProxy(0),
     mp_dBusPopupProxy(0),
     m_visibleSurfaces(),
@@ -25,6 +27,13 @@ LayoutHandler::LayoutHandler(QObject *parent) :
                                               "/Popup",
                                               QDBusConnection::sessionBus(),
                                               0);
+
+    QDBusConnection::sessionBus().connect("org.agl.windowmanager",
+                                       "/windowmanager",
+                                       "org.agl.windowmanager",
+                                       "surfaceVisibilityChanged",
+                                       this,
+                                       SIGNAL(surfaceVisibilityChanged(int,bool)));
 }
 
 LayoutHandler::~LayoutHandler()
@@ -52,6 +61,7 @@ void LayoutHandler::setUpLayouts()
     const int CONTROLBAR_Y = SCREEN_HEIGHT - CONTROLBAR_HEIGHT;
 
 
+    // only one Layout for CES2017 needed
     // layout 1:
     // one app surface, statusbar, control bar
     surfaceArea.x = 0;
@@ -63,7 +73,7 @@ void LayoutHandler::setUpLayouts()
 
     mp_dBusWindowManagerProxy->addLayout(1, "one app", surfaceAreas);
 
-
+    /*
     surfaceAreas.clear();
 
     // layout 2:
@@ -109,68 +119,99 @@ void LayoutHandler::setUpLayouts()
 
     surfaceAreas.append(surfaceArea);
 
-    mp_dBusWindowManagerProxy->addLayout(3, "side by side", surfaceAreas);
+    mp_dBusWindowManagerProxy->addLayout(3, "side by side", surfaceAreas);*/
+}
+
+void LayoutHandler::showAppLayer()
+{
+    // POPUP=0, HOMESCREEN_OVERLAY=1, APPS=2, HOMESCREEN=3
+    mp_dBusWindowManagerProxy->showLayer(2); // TODO: enum
+}
+
+void LayoutHandler::hideAppLayer()
+{
+    // POPUP=0, HOMESCREEN_OVERLAY=1, APPS=2, HOMESCREEN=3
+    mp_dBusWindowManagerProxy->hideLayer(2); // TODO: enum
 }
 
 void LayoutHandler::makeMeVisible(int pid)
 {
     qDebug("makeMeVisible %d", pid);
 
-    QList<int> allSurfaces = mp_dBusWindowManagerProxy->getAllSurfacesOfProcess(pid);
-    qSort(allSurfaces);
+    m_requestsToBeVisiblePids.append(pid);
 
-    if (0 != allSurfaces.size())
+    // callback every second
+    if (-1 != m_secondsTimerId)
     {
-        m_requestsToBeVisibleSurfaces.append(allSurfaces.at(0));
-
-        qDebug("m_visibleSurfaces %d", m_visibleSurfaces.size());
-        qDebug("m_invisibleSurfaces %d", m_invisibleSurfaces.size());
-        qDebug("m_requestsToBeVisibleSurfaces %d", m_requestsToBeVisibleSurfaces.size());
-
-        QList<int> availableLayouts = mp_dBusWindowManagerProxy->getAvailableLayouts(m_visibleSurfaces.size() + m_requestsToBeVisibleSurfaces.size());
-        if (0 == availableLayouts.size())
-        {
-            // no layout fits the need!
-            // replace the last app
-            qDebug("no layout fits the need!");
-            qDebug("replace the last surface");
+        killTimer(m_secondsTimerId);
+        m_secondsTimerId = -1;
+    }
+    m_secondsTimerId = startTimer(1000);
+}
 
-            m_invisibleSurfaces.append(m_visibleSurfaces.last());
-            m_visibleSurfaces.removeLast();
+void LayoutHandler::checkToDoQueue()
+{
+    if ((-1 != m_secondsTimerId) && (0 == m_requestsToBeVisiblePids.size()))
+    {
+        killTimer(m_secondsTimerId);
+        m_secondsTimerId = -1;
+    }
 
-            m_visibleSurfaces.append(m_requestsToBeVisibleSurfaces);
-            m_requestsToBeVisibleSurfaces.clear();
+    if (0 != m_requestsToBeVisiblePids.size())
+    {
+        int pid = m_requestsToBeVisiblePids.at(0);
+        qDebug("pid %d wants to be visible", pid);
 
-            for (int i = 0; i < m_visibleSurfaces.size(); ++i)
-            {
-                mp_dBusWindowManagerProxy->setSurfaceToLayoutArea(m_visibleSurfaces.at(i), i);
-            }
-        }
-        if (1 == availableLayouts.size())
+        QList<int> allSurfaces;
+        allSurfaces = mp_dBusWindowManagerProxy->getAllSurfacesOfProcess(pid);
+        if (0 == allSurfaces.size())
         {
-            // switch to new layout
-            qDebug("switch to new layout %d", availableLayouts.at(0));
-            m_visibleSurfaces.append(m_requestsToBeVisibleSurfaces);
-            m_requestsToBeVisibleSurfaces.clear();
-
-            mp_dBusWindowManagerProxy->setLayoutById(availableLayouts.at(0));
-            for (int i = 0; i < m_visibleSurfaces.size(); ++i)
-            {
-                mp_dBusWindowManagerProxy->setSurfaceToLayoutArea(m_visibleSurfaces.at(i), i);
-            }
+            qDebug("no surfaces for pid %d. retrying!", pid);
         }
-        if (1 < availableLayouts.size())
+        else
         {
-            // more than one layout possible! Ask user.
-            qDebug("more than one layout possible! Ask user.");
+            m_requestsToBeVisiblePids.removeAt(0);
+            qSort(allSurfaces);
 
-            QStringList choices;
-            for (int i = 0; i < availableLayouts.size(); ++i)
+            if (0 != allSurfaces.size())
             {
-                choices.append(mp_dBusWindowManagerProxy->getLayoutName(availableLayouts.at(i)));
+                if (-1 == m_visibleSurfaces.indexOf(allSurfaces.at(0)))
+                {
+                    qDebug("already visible");
+                }
+                if (-1 == m_invisibleSurfaces.indexOf(allSurfaces.at(0)))
+                {
+                    m_invisibleSurfaces.removeAt(m_invisibleSurfaces.indexOf(allSurfaces.at(0)));
+                }
+                if (-1 == m_requestsToBeVisibleSurfaces.indexOf(allSurfaces.at(0)))
+                {
+                    m_requestsToBeVisibleSurfaces.append(allSurfaces.at(0));
+                }
+
+                qDebug("m_visibleSurfaces %d", m_visibleSurfaces.size());
+                qDebug("m_invisibleSurfaces %d", m_invisibleSurfaces.size());
+                qDebug("m_requestsToBeVisibleSurfaces %d", m_requestsToBeVisibleSurfaces.size());
+
+                QList<int> availableLayouts = mp_dBusWindowManagerProxy->getAvailableLayouts(1); // one app only for CES2017
+                if (1 == availableLayouts.size())
+                {
+                    qDebug("active layout: %d", availableLayouts.at(0));
+                    m_invisibleSurfaces.append(m_visibleSurfaces);
+                    m_visibleSurfaces.clear();
+                    m_visibleSurfaces.append(m_requestsToBeVisibleSurfaces);
+                    m_requestsToBeVisibleSurfaces.clear();
+
+                    mp_dBusWindowManagerProxy->setLayoutById(availableLayouts.at(0));
+                    for (int i = 0; i < m_visibleSurfaces.size(); ++i)
+                    {
+                        mp_dBusWindowManagerProxy->setSurfaceToLayoutArea(m_visibleSurfaces.at(i), i);
+                    }
+                }
+                else
+                {
+                    qDebug("this should not happen!?");
+                }
             }
-
-            mp_dBusPopupProxy->showPopupComboBox("Select Layout", choices);
         }
     }
 }
@@ -202,9 +243,16 @@ int LayoutHandler::requestGetSurfaceStatus(int surfaceId)
     return result;
 }
 
-void LayoutHandler::requestRenderSurfaceToArea(int surfaceId, const QRect &renderArea)
+void LayoutHandler::requestRenderSurfaceToArea(int surfaceId, int layoutArea)
 {
-    qDebug("requestRenderSurfaceToArea %d %d,%d,%d,%d", surfaceId, renderArea.x(), renderArea.y(), renderArea.width(), renderArea.height());
+    qDebug("requestRenderSurfaceToArea %d %d", surfaceId, layoutArea);
+}
+
+bool LayoutHandler::requestRenderSurfaceToAreaAllowed(int surfaceId, int layoutArea)
+{
+    qDebug("requestRenderSurfaceToAreaAllowed %d %d", surfaceId, layoutArea);
+    bool result = true;
+    return result;
 }
 
 void LayoutHandler::requestSurfaceIdToFullScreen(int surfaceId)
@@ -225,3 +273,18 @@ void LayoutHandler::setLayoutByName(QString layoutName)
         mp_dBusWindowManagerProxy->setSurfaceToLayoutArea(i, i);
     }
 }
+
+void LayoutHandler::requestSurfaceVisibilityChanged(int surfaceId, bool visible)
+{
+    qDebug("requestSurfaceVisibilityChanged %d %s", surfaceId, visible ? "true" : "false");
+    emit surfaceVisibilityChanged(surfaceId, visible);
+}
+
+void LayoutHandler::timerEvent(QTimerEvent *e)
+{
+    if (e->timerId() == m_secondsTimerId)
+    {
+        checkToDoQueue();
+    }
+}
+