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

diff --git a/HomeScreen/src/layouthandler.cpp b/HomeScreen/src/layouthandler.cpp
index 647bc79..35304e6 100644
--- a/HomeScreen/src/layouthandler.cpp
+++ b/HomeScreen/src/layouthandler.cpp
@@ -4,14 +4,16 @@ LayoutHandler::LayoutHandler(QObject *parent) :
     QObject(parent),
     mp_dBusWindowManagerProxy(0),
     mp_dBusPopupProxy(0),
-    m_visibleApps(),
-    m_invisibleApps(),
-    m_requestsToBeVisibleApps()
+    m_visibleSurfaces(),
+    m_invisibleSurfaces(),
+    m_requestsToBeVisibleSurfaces()
 {
     qDBusRegisterMetaType<SimplePoint>();
     qDBusRegisterMetaType<QList<SimplePoint> >();
-    qDBusRegisterMetaType<SimpleRect>();
-    qDBusRegisterMetaType<QList<SimpleRect> >();
+    qDBusRegisterMetaType<LayoutArea>();
+    qDBusRegisterMetaType<QList<LayoutArea> >();
+    qDBusRegisterMetaType<Layout>();
+    qDBusRegisterMetaType<QList<Layout> >();
 
     qDebug("D-Bus: connect to org.agl.windowmanager /windowmanager");
     mp_dBusWindowManagerProxy = new org::agl::windowmanager("org.agl.windowmanager",
@@ -34,11 +36,11 @@ LayoutHandler::~LayoutHandler()
 void LayoutHandler::setUpLayouts()
 {
     qDebug("setUpLayouts");
-    QList<SimpleRect> surfaceAreas;
-    SimpleRect surfaceArea;
+    QList<LayoutArea> surfaceAreas;
+    LayoutArea surfaceArea;
 
     const int SCREEN_WIDTH = 1080;
-    const int SCREEN_HEIGHT = 1080;
+    const int SCREEN_HEIGHT = 1920;
 
     const int STATUSBAR_HEIGHT = 60;
     const int STATUSBAR_WIDTH = SCREEN_WIDTH;
@@ -77,7 +79,7 @@ void LayoutHandler::setUpLayouts()
 
     // bottom surface
     surfaceArea.x = 0;
-    surfaceArea.y = STATUSBAR_HEIGHT / 2;
+    surfaceArea.y = SCREEN_HEIGHT / 2;
     surfaceArea.width = SCREEN_WIDTH;
     surfaceArea.height = (SCREEN_HEIGHT - STATUSBAR_HEIGHT - CONTROLBAR_HEIGHT) / 2;
 
@@ -108,72 +110,117 @@ void LayoutHandler::setUpLayouts()
     surfaceAreas.append(surfaceArea);
 
     mp_dBusWindowManagerProxy->addLayout(3, "side by side", surfaceAreas);
-
 }
 
 void LayoutHandler::makeMeVisible(int pid)
 {
     qDebug("makeMeVisible %d", pid);
-    m_requestsToBeVisibleApps.append(pid);
 
-    qDebug("m_visibleApps %d", m_visibleApps.size());
-    qDebug("m_invisibleApps %d", m_invisibleApps.size());
-    qDebug("m_requestsToBeVisibleApps %d", m_requestsToBeVisibleApps.size());
+    QList<int> allSurfaces = mp_dBusWindowManagerProxy->getAllSurfacesOfProcess(pid);
+    qSort(allSurfaces);
 
-    QList<int> availableLayouts = mp_dBusWindowManagerProxy->getAvailableLayouts(m_visibleApps.size() + m_requestsToBeVisibleApps.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 app");
+        m_requestsToBeVisibleSurfaces.append(allSurfaces.at(0));
 
-        m_invisibleApps.append(m_visibleApps.last());
-        m_visibleApps.removeLast();
+        qDebug("m_visibleSurfaces %d", m_visibleSurfaces.size());
+        qDebug("m_invisibleSurfaces %d", m_invisibleSurfaces.size());
+        qDebug("m_requestsToBeVisibleSurfaces %d", m_requestsToBeVisibleSurfaces.size());
 
-        for (int i = 0; i < m_visibleApps.size(); ++i)
+        QList<int> availableLayouts = mp_dBusWindowManagerProxy->getAvailableLayouts(m_visibleSurfaces.size() + m_requestsToBeVisibleSurfaces.size());
+        if (0 == availableLayouts.size())
         {
-            mp_dBusWindowManagerProxy->setSurfaceToLayoutArea(i, i);
-        }
-    }
-    if (1 == availableLayouts.size())
-    {
-        // switch to new layout
-        qDebug("switch to new layout %d", availableLayouts.at(0));
-        m_visibleApps.append(m_requestsToBeVisibleApps);
-        m_requestsToBeVisibleApps.clear();
+            // no layout fits the need!
+            // replace the last app
+            qDebug("no layout fits the need!");
+            qDebug("replace the last surface");
 
-        mp_dBusWindowManagerProxy->setLayoutById(availableLayouts.at(0));
-        for (int i = 0; i < m_visibleApps.size(); ++i)
+            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)
+            {
+                mp_dBusWindowManagerProxy->setSurfaceToLayoutArea(m_visibleSurfaces.at(i), i);
+            }
+        }
+        if (1 == availableLayouts.size())
         {
-            mp_dBusWindowManagerProxy->setSurfaceToLayoutArea(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())
-    {
-        // 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)
+        if (1 < availableLayouts.size())
         {
-            choices.append(mp_dBusWindowManagerProxy->getLayoutName(availableLayouts.at(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);
         }
+    }
+}
 
-        mp_dBusPopupProxy->showPopupComboBox("Select Layout", choices);
+QList<int> LayoutHandler::requestGetAllSurfacesOfProcess(int pid)
+{
+    qDebug("requestGetAllSurfacesOfProcess %d", pid);
 
+    return mp_dBusWindowManagerProxy->getAllSurfacesOfProcess(pid);
+}
+
+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)
+{
+    qDebug("requestRenderSurfaceToArea %d %d,%d,%d,%d", surfaceId, renderArea.x(), renderArea.y(), renderArea.width(), renderArea.height());
+}
+
+void LayoutHandler::requestSurfaceIdToFullScreen(int surfaceId)
+{
+    qDebug("requestSurfaceIdToFullScreen %d", surfaceId);
 }
 
 void LayoutHandler::setLayoutByName(QString layoutName)
 {
     // switch to new layout
     qDebug("setLayout: switch to new layout %s", layoutName.toStdString().c_str());
-    m_visibleApps.append(m_requestsToBeVisibleApps);
-    m_requestsToBeVisibleApps.clear();
+    m_visibleSurfaces.append(m_requestsToBeVisibleSurfaces);
+    m_requestsToBeVisibleSurfaces.clear();
 
     mp_dBusWindowManagerProxy->setLayoutByName(layoutName);
-    for (int i = 0; i < m_visibleApps.size(); ++i)
+    for (int i = 0; i < m_visibleSurfaces.size(); ++i)
     {
         mp_dBusWindowManagerProxy->setSurfaceToLayoutArea(i, i);
     }