X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=HomeScreen%2Fsrc%2Flayouthandler.cpp;h=f8804b44e9e30e61a3829b30050c1d886ac163ac;hb=79714c0aa8fc461d77b75d6c5dae6a1a7d726954;hp=11dd2cb5f7d6b4c61720649494498d240221ffaa;hpb=dd8c90f87463d370c3076e13b7c6cc0e27c0d2f5;p=staging%2FHomeScreen.git diff --git a/HomeScreen/src/layouthandler.cpp b/HomeScreen/src/layouthandler.cpp index 11dd2cb..f8804b4 100644 --- a/HomeScreen/src/layouthandler.cpp +++ b/HomeScreen/src/layouthandler.cpp @@ -27,101 +27,59 @@ LayoutHandler::LayoutHandler(QObject *parent) : "/Popup", QDBusConnection::sessionBus(), 0); -} -LayoutHandler::~LayoutHandler() -{ - delete mp_dBusPopupProxy; - delete mp_dBusWindowManagerProxy; -} + QDBusConnection::sessionBus().connect("org.agl.windowmanager", + "/windowmanager", + "org.agl.windowmanager", + "surfaceVisibilityChanged", + this, + SIGNAL(surfaceVisibilityChanged(int,bool))); -void LayoutHandler::setUpLayouts() -{ - qDebug("setUpLayouts"); QList surfaceAreas; LayoutArea surfaceArea; const int SCREEN_WIDTH = 1080; const int SCREEN_HEIGHT = 1920; - const int STATUSBAR_HEIGHT = 60; - const int STATUSBAR_WIDTH = SCREEN_WIDTH; - const int STATUSBAR_X = 0; - const int STATUSBAR_Y = 0; - const int CONTROLBAR_HEIGHT = 60; - const int CONTROLBAR_WIDTH = SCREEN_WIDTH; - const int CONTROLBAR_X = 0; - const int CONTROLBAR_Y = SCREEN_HEIGHT - CONTROLBAR_HEIGHT; + const int TOPAREA_HEIGHT = 218; + const int TOPAREA_WIDTH = SCREEN_WIDTH; + const int TOPAREA_X = 0; + const int TOPAREA_Y = 0; + const int MEDIAAREA_HEIGHT = 215; + const int MEDIAAREA_WIDTH = SCREEN_WIDTH; + const int MEDIAAREA_X = 0; + const int MEDIAAREA_Y = SCREEN_HEIGHT - MEDIAAREA_HEIGHT; + // only one Layout for CES2017 needed // layout 1: // one app surface, statusbar, control bar surfaceArea.x = 0; - surfaceArea.y = STATUSBAR_HEIGHT; + surfaceArea.y = TOPAREA_HEIGHT; surfaceArea.width = SCREEN_WIDTH; - surfaceArea.height = SCREEN_HEIGHT - STATUSBAR_HEIGHT - CONTROLBAR_HEIGHT; + surfaceArea.height = SCREEN_HEIGHT - TOPAREA_HEIGHT - MEDIAAREA_HEIGHT; surfaceAreas.append(surfaceArea); mp_dBusWindowManagerProxy->addLayout(1, "one app", surfaceAreas); +} - - surfaceAreas.clear(); - - // layout 2: - // two app surfaces (one on top of the other), statusbar, control bar - - // top surface - surfaceArea.x = 0; - surfaceArea.y = STATUSBAR_HEIGHT; - surfaceArea.width = SCREEN_WIDTH; - surfaceArea.height = (SCREEN_HEIGHT - STATUSBAR_HEIGHT - CONTROLBAR_HEIGHT) / 2; - - surfaceAreas.append(surfaceArea); - - // bottom surface - surfaceArea.x = 0; - surfaceArea.y = SCREEN_HEIGHT / 2; - surfaceArea.width = SCREEN_WIDTH; - surfaceArea.height = (SCREEN_HEIGHT - STATUSBAR_HEIGHT - CONTROLBAR_HEIGHT) / 2; - - surfaceAreas.append(surfaceArea); - - mp_dBusWindowManagerProxy->addLayout(2, "top on bottom", surfaceAreas); - - - surfaceAreas.clear(); - - // layout 3: - // two app surfaces (one besides the other), statusbar, control bar - - // left surface - surfaceArea.x = 0; - surfaceArea.y = STATUSBAR_HEIGHT; - surfaceArea.width = SCREEN_WIDTH / 2; - surfaceArea.height = SCREEN_HEIGHT - STATUSBAR_HEIGHT - CONTROLBAR_HEIGHT; - - surfaceAreas.append(surfaceArea); - - // right surface - surfaceArea.x = SCREEN_WIDTH / 2; - surfaceArea.y = STATUSBAR_HEIGHT; - surfaceArea.width = SCREEN_WIDTH / 2; - surfaceArea.height = SCREEN_HEIGHT - STATUSBAR_HEIGHT - CONTROLBAR_HEIGHT; - - surfaceAreas.append(surfaceArea); - - mp_dBusWindowManagerProxy->addLayout(3, "side by side", surfaceAreas); +LayoutHandler::~LayoutHandler() +{ + delete mp_dBusPopupProxy; + delete mp_dBusWindowManagerProxy; } void LayoutHandler::showAppLayer() { - mp_dBusWindowManagerProxy->showLayer(1); //1==app layer + // POPUP=0, HOMESCREEN_OVERLAY=1, APPS=2, HOMESCREEN=3 + mp_dBusWindowManagerProxy->showLayer(2); // TODO: enum } void LayoutHandler::hideAppLayer() { - mp_dBusWindowManagerProxy->hideLayer(1); //1==app layer + // POPUP=0, HOMESCREEN_OVERLAY=1, APPS=2, HOMESCREEN=3 + mp_dBusWindowManagerProxy->hideLayer(2); // TODO: enum } void LayoutHandler::makeMeVisible(int pid) @@ -165,35 +123,29 @@ void LayoutHandler::checkToDoQueue() if (0 != allSurfaces.size()) { - m_requestsToBeVisibleSurfaces.append(allSurfaces.at(0)); + 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 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) - { - mp_dBusWindowManagerProxy->setSurfaceToLayoutArea(m_visibleSurfaces.at(i), i); - } - } + QList availableLayouts = mp_dBusWindowManagerProxy->getAvailableLayouts(1); // one app only for CES2017 if (1 == availableLayouts.size()) { - // switch to new layout - qDebug("switch to new layout %d", availableLayouts.at(0)); + qDebug("active layout: %d", availableLayouts.at(0)); + m_invisibleSurfaces.append(m_visibleSurfaces); + m_visibleSurfaces.clear(); m_visibleSurfaces.append(m_requestsToBeVisibleSurfaces); m_requestsToBeVisibleSurfaces.clear(); @@ -203,18 +155,9 @@ void LayoutHandler::checkToDoQueue() mp_dBusWindowManagerProxy->setSurfaceToLayoutArea(m_visibleSurfaces.at(i), i); } } - if (1 < availableLayouts.size()) + else { - // 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); + qDebug("this should not happen!?"); } } } @@ -248,9 +191,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", surfaceId, layoutArea); +} + +bool LayoutHandler::requestRenderSurfaceToAreaAllowed(int surfaceId, int layoutArea) { - qDebug("requestRenderSurfaceToArea %d %d,%d,%d,%d", surfaceId, renderArea.x(), renderArea.y(), renderArea.width(), renderArea.height()); + qDebug("requestRenderSurfaceToAreaAllowed %d %d", surfaceId, layoutArea); + bool result = true; + return result; } void LayoutHandler::requestSurfaceIdToFullScreen(int surfaceId) @@ -272,6 +222,12 @@ void LayoutHandler::setLayoutByName(QString layoutName) } } +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)