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

diff --git a/HomeScreen/src/layouthandler.cpp b/HomeScreen/src/layouthandler.cpp
index 0dac24f..35304e6 100644
--- a/HomeScreen/src/layouthandler.cpp
+++ b/HomeScreen/src/layouthandler.cpp
@@ -112,61 +112,94 @@ void LayoutHandler::setUpLayouts()
     mp_dBusWindowManagerProxy->addLayout(3, "side by side", surfaceAreas);
 }
 
-void LayoutHandler::makeMeVisible(int surfaceId)
+void LayoutHandler::makeMeVisible(int pid)
 {
-    qDebug("makeMeVisible %d", surfaceId);
-    m_requestsToBeVisibleSurfaces.append(surfaceId);
+    qDebug("makeMeVisible %d", pid);
 
-    qDebug("m_visibleSurfaces %d", m_visibleSurfaces.size());
-    qDebug("m_invisibleSurfaces %d", m_invisibleSurfaces.size());
-    qDebug("m_requestsToBeVisibleSurfaces %d", m_requestsToBeVisibleSurfaces.size());
+    QList<int> allSurfaces = mp_dBusWindowManagerProxy->getAllSurfacesOfProcess(pid);
+    qSort(allSurfaces);
 
-    QList<int> availableLayouts = mp_dBusWindowManagerProxy->getAvailableLayouts(m_visibleSurfaces.size() + m_requestsToBeVisibleSurfaces.size());
-    if (0 == availableLayouts.size())
+    if (0 != allSurfaces.size())
     {
-        // no layout fits the need!
-        // replace the last app
-        qDebug("no layout fits the need!");
-        qDebug("replace the last surface");
+        m_requestsToBeVisibleSurfaces.append(allSurfaces.at(0));
 
-        m_invisibleSurfaces.append(m_visibleSurfaces.last());
-        m_visibleSurfaces.removeLast();
+        qDebug("m_visibleSurfaces %d", m_visibleSurfaces.size());
+        qDebug("m_invisibleSurfaces %d", m_invisibleSurfaces.size());
+        qDebug("m_requestsToBeVisibleSurfaces %d", m_requestsToBeVisibleSurfaces.size());
 
-        m_visibleSurfaces.append(m_requestsToBeVisibleSurfaces);
-        m_requestsToBeVisibleSurfaces.clear();
+        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");
+
+            m_invisibleSurfaces.append(m_visibleSurfaces.last());
+            m_visibleSurfaces.removeLast();
+
+            m_visibleSurfaces.append(m_requestsToBeVisibleSurfaces);
+            m_requestsToBeVisibleSurfaces.clear();
 
-        for (int i = 0; i < m_visibleSurfaces.size(); ++i)
+            for (int i = 0; i < m_visibleSurfaces.size(); ++i)
+            {
+                mp_dBusWindowManagerProxy->setSurfaceToLayoutArea(m_visibleSurfaces.at(i), i);
+            }
+        }
+        if (1 == availableLayouts.size())
         {
-            mp_dBusWindowManagerProxy->setSurfaceToLayoutArea(m_visibleSurfaces.at(i), i);
+            // 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);
+            }
         }
-    }
-    if (1 == availableLayouts.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)
+        if (1 < availableLayouts.size())
         {
-            mp_dBusWindowManagerProxy->setSurfaceToLayoutArea(m_visibleSurfaces.at(i), i);
+            // more than one layout possible! Ask user.
+            qDebug("more than one layout possible! Ask user.");
+
+            QStringList choices;
+            for (int i = 0; i < availableLayouts.size(); ++i)
+            {
+                choices.append(mp_dBusWindowManagerProxy->getLayoutName(availableLayouts.at(i)));
+            }
+
+            mp_dBusPopupProxy->showPopupComboBox("Select Layout", choices);
         }
     }
-    if (1 < availableLayouts.size())
-    {
-        // more than one layout possible! Ask user.
-        qDebug("more than one layout possible! Ask user.");
+}
 
-        QStringList choices;
-        for (int i = 0; i < availableLayouts.size(); ++i)
-        {
-            choices.append(mp_dBusWindowManagerProxy->getLayoutName(availableLayouts.at(i)));
-        }
+QList<int> LayoutHandler::requestGetAllSurfacesOfProcess(int pid)
+{
+    qDebug("requestGetAllSurfacesOfProcess %d", pid);
+
+    return mp_dBusWindowManagerProxy->getAllSurfacesOfProcess(pid);
+}
 
-        mp_dBusPopupProxy->showPopupComboBox("Select Layout", choices);
+int LayoutHandler::requestGetSurfaceStatus(int surfaceId)
+{
+    int result = -1;
 
+    if (-1 != m_visibleSurfaces.indexOf(surfaceId))
+    {
+        result = 0;
     }
+    if (-1 != m_invisibleSurfaces.indexOf(surfaceId))
+    {
+        result = 1;
+    }
+    if (-1 != m_requestsToBeVisibleSurfaces.indexOf(surfaceId))
+    {
+        result = 1;
+    }
+
+    return result;
 }
 
 void LayoutHandler::requestRenderSurfaceToArea(int surfaceId, const QRect &renderArea)