{
qDebug("makeMeVisible %d", pid);
- m_requestsToBeVisiblePids.append(pid);
+ // if app does not request to be visible
+ if (-1 == m_requestsToBeVisiblePids.indexOf(pid))
+ {
+ m_requestsToBeVisiblePids.append(pid);
- // callback every second
- if (-1 != m_secondsTimerId)
+ // callback every second
+ if (-1 != m_secondsTimerId)
+ {
+ killTimer(m_secondsTimerId);
+ m_secondsTimerId = -1;
+ }
+ m_secondsTimerId = startTimer(1000);
+ }
+ else
{
- killTimer(m_secondsTimerId);
- m_secondsTimerId = -1;
+ checkToDoQueue();
}
- m_secondsTimerId = startTimer(1000);
}
void LayoutHandler::checkToDoQueue()
if (0 != allSurfaces.size())
{
- if (-1 == m_visibleSurfaces.indexOf(allSurfaces.at(0)))
+ int firstSurface = allSurfaces.at(0);
+
+ if (-1 != m_visibleSurfaces.indexOf(firstSurface))
{
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)))
+ else
{
- m_requestsToBeVisibleSurfaces.append(allSurfaces.at(0));
- }
+ if (-1 != m_invisibleSurfaces.indexOf(firstSurface))
+ {
+ m_invisibleSurfaces.removeAt(m_invisibleSurfaces.indexOf(firstSurface));
+ }
+ if (-1 == m_requestsToBeVisibleSurfaces.indexOf(firstSurface))
+ {
+ m_requestsToBeVisibleSurfaces.append(firstSurface);
+ }
- qDebug("m_visibleSurfaces %d", m_visibleSurfaces.size());
- qDebug("m_invisibleSurfaces %d", m_invisibleSurfaces.size());
- qDebug("m_requestsToBeVisibleSurfaces %d", m_requestsToBeVisibleSurfaces.size());
+ qDebug("before");
+ 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)
+ QList<int> availableLayouts = mp_dBusWindowManagerProxy->getAvailableLayouts(1); // one app only for CES2017
+ if (1 == availableLayouts.size())
{
- mp_dBusWindowManagerProxy->setSurfaceToLayoutArea(m_visibleSurfaces.at(i), i);
+ 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);
+ }
+
+ qDebug("after");
+ qDebug(" m_visibleSurfaces %d", m_visibleSurfaces.size());
+ qDebug(" m_invisibleSurfaces %d", m_invisibleSurfaces.size());
+ qDebug(" m_requestsToBeVisibleSurfaces %d", m_requestsToBeVisibleSurfaces.size());
+ }
+ else
+ {
+ qDebug("this should not happen!?");
}
- }
- else
- {
- qDebug("this should not happen!?");
}
}
}
WindowManager::WindowManager(QObject *parent) :
QObject(parent),
m_layouts(),
- m_surfaces(),
+ m_appSurfaces(),
mp_layoutAreaToSurfaceIdAssignment(0),
- m_currentLayout(-1)
+ m_currentLayout(-1),
+ m_screenId(0), // use screen "0"
+ m_screenWidth(0),
+ m_screenHeight(0)
{
qDebug("-=[WindowManager]=-");
}
}
myThis = this;
- err = ilm_registerNotification(WindowManager::notificationFunc_static, this);
+
+ ilm_getScreenResolution(m_screenId, &m_screenWidth, &m_screenHeight);
createNewLayer(WINDOWMANAGER_LAYER_POPUP);
createNewLayer(WINDOWMANAGER_LAYER_HOMESCREEN_OVERLAY);
createNewLayer(WINDOWMANAGER_LAYER_APPLICATIONS);
createNewLayer(WINDOWMANAGER_LAYER_HOMESCREEN);
+
+ ilm_registerNotification(WindowManager::notificationFunc_static, this);
#endif
QDBusConnection dbus = QDBusConnection::sessionBus();
void WindowManager::createNewLayer(int layerId)
{
qDebug("-=[createNewLayer]=-");
- qDebug("layerId %d", layerId);
-
- t_ilm_uint screenID = 0;
- t_ilm_uint width;
- t_ilm_uint height;
-
- ilm_getScreenResolution(screenID, &width, &height);
+ qDebug(" layerId %d", layerId);
t_ilm_layer newLayerId = layerId;
- ilm_layerCreateWithDimension(&newLayerId, width, height);
+ ilm_layerCreateWithDimension(&newLayerId, m_screenWidth, m_screenHeight);
ilm_layerSetOpacity(newLayerId, 1.0);
ilm_layerSetVisibility(newLayerId, ILM_TRUE);
ilm_layerSetSourceRectangle(newLayerId,
0,
0,
- width,
- height);
+ m_screenWidth,
+ m_screenHeight);
ilm_layerSetDestinationRectangle(newLayerId,
0,
0,
- width,
- height);
+ m_screenWidth,
+ m_screenHeight);
ilm_commitChanges();
}
void WindowManager::addSurfaceToLayer(int surfaceId, int layerId)
{
qDebug("-=[addSurfaceToLayer]=-");
- qDebug("surfaceId %d", surfaceId);
- qDebug("layerId %d", layerId);
+ qDebug(" surfaceId %d", surfaceId);
+ qDebug(" layerId %d", layerId);
if (layerId == WINDOWMANAGER_LAYER_HOMESCREEN)
{
struct ilmSurfaceProperties surfaceProperties;
ilm_getPropertiesOfSurface(surfaceId, &surfaceProperties);
- qDebug("sourceX %d", surfaceProperties.sourceX);
- qDebug("sourceY %d", surfaceProperties.sourceY);
- qDebug("sourceWidth %d", surfaceProperties.sourceWidth);
- qDebug("sourceHeight %d", surfaceProperties.sourceHeight);
-
// homescreen app always fullscreen in the back
- t_ilm_uint screenID = 0;
- t_ilm_uint width;
- t_ilm_uint height;
-
- ilm_getScreenResolution(screenID, &width, &height);
-
- ilm_surfaceSetDestinationRectangle(surfaceId, 0, 0, width, height);
- ilm_surfaceSetSourceRectangle(surfaceId, 0, 0, width, height);
+ ilm_surfaceSetDestinationRectangle(surfaceId, 0, 0, m_screenWidth, m_screenHeight);
+ //ilm_surfaceSetSourceRectangle(surfaceId, 0, 0, m_screenWidth, m_screenHeight);
ilm_surfaceSetOpacity(surfaceId, 1.0);
ilm_surfaceSetVisibility(surfaceId, ILM_TRUE);
struct ilmSurfaceProperties surfaceProperties;
ilm_getPropertiesOfSurface(surfaceId, &surfaceProperties);
- ilm_surfaceSetDestinationRectangle(surfaceId, 0, 0, surfaceProperties.origSourceWidth, surfaceProperties.origSourceHeight);
- ilm_surfaceSetSourceRectangle(surfaceId, 0, 0, surfaceProperties.origSourceWidth, surfaceProperties.origSourceHeight);
- ilm_surfaceSetOpacity(surfaceId, 0.0);
- ilm_surfaceSetVisibility(surfaceId, ILM_FALSE);
+ //ilm_surfaceSetDestinationRectangle(surfaceId, 0, 0, surfaceProperties.origSourceWidth, surfaceProperties.origSourceHeight);
+ //ilm_surfaceSetSourceRectangle(surfaceId, 0, 0, surfaceProperties.origSourceWidth, surfaceProperties.origSourceHeight);
+ //ilm_surfaceSetOpacity(surfaceId, 0.0);
+ //ilm_surfaceSetVisibility(surfaceId, ILM_FALSE);
ilm_layerAddSurface(layerId, surfaceId);
}
struct ilmSurfaceProperties surfaceProperties;
ilm_getPropertiesOfSurface(surfaceId, &surfaceProperties);
- ilm_surfaceSetDestinationRectangle(surfaceId, 0, 0, surfaceProperties.origSourceWidth, surfaceProperties.origSourceHeight);
- ilm_surfaceSetSourceRectangle(surfaceId, 0, 0, surfaceProperties.origSourceWidth, surfaceProperties.origSourceHeight);
- ilm_surfaceSetOpacity(surfaceId, 0.5);
- ilm_surfaceSetVisibility(surfaceId, ILM_TRUE);
+ //ilm_surfaceSetDestinationRectangle(surfaceId, 0, 0, surfaceProperties.origSourceWidth, surfaceProperties.origSourceHeight);
+ //ilm_surfaceSetSourceRectangle(surfaceId, 0, 0, surfaceProperties.origSourceWidth, surfaceProperties.origSourceHeight);
+ //ilm_surfaceSetOpacity(surfaceId, 0.5);
+ //ilm_surfaceSetVisibility(surfaceId, ILM_TRUE);
ilm_layerAddSurface(layerId, surfaceId);
}
struct ilmSurfaceProperties surfaceProperties;
ilm_getPropertiesOfSurface(surfaceId, &surfaceProperties);
- ilm_surfaceSetDestinationRectangle(surfaceId, 0, 0, surfaceProperties.origSourceWidth, surfaceProperties.origSourceHeight);
- ilm_surfaceSetSourceRectangle(surfaceId, 0, 0, surfaceProperties.origSourceWidth, surfaceProperties.origSourceHeight);
- ilm_surfaceSetOpacity(surfaceId, 0.0);
- ilm_surfaceSetVisibility(surfaceId, ILM_FALSE);
+ //ilm_surfaceSetDestinationRectangle(surfaceId, 0, 0, surfaceProperties.origSourceWidth, surfaceProperties.origSourceHeight);
+ //ilm_surfaceSetSourceRectangle(surfaceId, 0, 0, surfaceProperties.origSourceWidth, surfaceProperties.origSourceHeight);
+ //ilm_surfaceSetOpacity(surfaceId, 0.0);
+ //ilm_surfaceSetVisibility(surfaceId, ILM_FALSE);
ilm_layerAddSurface(layerId, surfaceId);
}
#ifdef HAVE_IVI_LAYERMANAGEMENT_API
if (-1 != m_currentLayout)
{
-
// hide all surfaces
- for (int i = 0; i < m_surfaces.size(); ++i)
+ for (int i = 0; i < m_appSurfaces.size(); ++i)
{
- ilm_surfaceSetVisibility(m_surfaces.at(i), ILM_FALSE);
- ilm_surfaceSetOpacity(m_surfaces.at(i), 0.0);
+ ilm_layerRemoveSurface(WINDOWMANAGER_LAYER_APPLICATIONS, m_appSurfaces.at(i));
+ //ilm_surfaceSetVisibility(m_appSurfaces.at(i), ILM_FALSE);
+ //ilm_surfaceSetOpacity(m_appSurfaces.at(i), 0.0);
+ ilm_commitChanges();
}
// find the current used layout
int surfaceToShow = mp_layoutAreaToSurfaceIdAssignment->find(j).value();
qDebug(" surface no. %d: %d", j, surfaceToShow);
+ addSurfaceToLayer(surfaceToShow, WINDOWMANAGER_LAYER_APPLICATIONS);
+
ilm_surfaceSetVisibility(surfaceToShow, ILM_TRUE);
ilm_surfaceSetOpacity(surfaceToShow, 1.0);
currentLayout.layoutAreas[j].y,
currentLayout.layoutAreas[j].width,
currentLayout.layoutAreas[j].height);
+ ilm_commitChanges();
}
-
- ilm_commitChanges();
}
- // display layer render order
- t_ilm_layer renderOrder[WINDOWMANAGER_LAYER_NUM];
- renderOrder[0] = WINDOWMANAGER_LAYER_HOMESCREEN;
- renderOrder[1] = WINDOWMANAGER_LAYER_APPLICATIONS;
- renderOrder[2] = WINDOWMANAGER_LAYER_HOMESCREEN_OVERLAY;
- renderOrder[3] = WINDOWMANAGER_LAYER_POPUP;
- ilm_displaySetRenderOrder(0, renderOrder, WINDOWMANAGER_LAYER_NUM);
-
// layer surface render order
t_ilm_int length;
t_ilm_surface* pArray;
ilm_getSurfaceIDsOnLayer(WINDOWMANAGER_LAYER_HOMESCREEN, &length, &pArray);
ilm_layerSetRenderOrder(WINDOWMANAGER_LAYER_HOMESCREEN, pArray, length);
+ ilm_commitChanges();
ilm_getSurfaceIDsOnLayer(WINDOWMANAGER_LAYER_APPLICATIONS, &length, &pArray);
ilm_layerSetRenderOrder(WINDOWMANAGER_LAYER_APPLICATIONS, pArray, length);
+ ilm_commitChanges();
ilm_getSurfaceIDsOnLayer(WINDOWMANAGER_LAYER_HOMESCREEN_OVERLAY, &length, &pArray);
ilm_layerSetRenderOrder(WINDOWMANAGER_LAYER_HOMESCREEN_OVERLAY, pArray, length);
+ ilm_commitChanges();
ilm_getSurfaceIDsOnLayer(WINDOWMANAGER_LAYER_POPUP, &length, &pArray);
ilm_layerSetRenderOrder(WINDOWMANAGER_LAYER_POPUP, pArray, length);
-
ilm_commitChanges();
+ // display layer render order
+ t_ilm_layer renderOrder[WINDOWMANAGER_LAYER_NUM];
+ renderOrder[0] = WINDOWMANAGER_LAYER_HOMESCREEN;
+ renderOrder[1] = WINDOWMANAGER_LAYER_APPLICATIONS;
+ renderOrder[2] = WINDOWMANAGER_LAYER_HOMESCREEN_OVERLAY;
+ renderOrder[3] = WINDOWMANAGER_LAYER_POPUP;
+ ilm_displaySetRenderOrder(0, renderOrder, WINDOWMANAGER_LAYER_NUM);
+ ilm_displaySetRenderOrder(1, renderOrder, WINDOWMANAGER_LAYER_NUM);
+ ilm_commitChanges();
#endif
}
}
else
{
- addSurfaceToLayer(id, WINDOWMANAGER_LAYER_APPLICATIONS);
+ //addSurfaceToLayer(id, WINDOWMANAGER_LAYER_APPLICATIONS);
- m_surfaces.append(id);
+ m_appSurfaces.append(id);
}
ilm_surfaceAddNotification(id, surfaceCallbackFunction_static);
else
{
qDebug("Surface destroyed, ID: %d", id);
- m_surfaces.removeAt(m_surfaces.indexOf(id));
+ m_appSurfaces.removeAt(m_appSurfaces.indexOf(id));
ilm_surfaceRemoveNotification(id);
ilm_commitChanges();
if (ILM_NOTIFICATION_CONTENT_AVAILABLE & mask)
{
qDebug("ILM_NOTIFICATION_CONTENT_AVAILABLE");
- updateScreen();
+ //updateScreen();
}
if (ILM_NOTIFICATION_CONTENT_REMOVED & mask)
{
#ifdef HAVE_IVI_LAYERMANAGEMENT_API
struct ilmSurfaceProperties surfaceProperties;
- for (int i = 0; i < m_surfaces.size(); ++i)
+ for (int i = 0; i < m_appSurfaces.size(); ++i)
{
- ilm_getPropertiesOfSurface(m_surfaces.at(i), &surfaceProperties);
+ ilm_getPropertiesOfSurface(m_appSurfaces.at(i), &surfaceProperties);
if (pid == surfaceProperties.creatorPid)
{
- result.append(m_surfaces.at(i));
+ result.append(m_appSurfaces.at(i));
}
}
#endif
{
qDebug("-=[getAvailableSurfaces]=-");
- return m_surfaces;
+ return m_appSurfaces;
}
QString WindowManager::getLayoutName(int layoutId)