*/
#include "windowmanager.hpp"
-#include <wayland-client.h>
-#include <QFile>
+
//////////////////////////////////////////
// THIS IS STILL UNDER HEAVY DEVELOPMENT!
#define WINDOWMANAGER_LAYER_APPLICATIONS 102
#define WINDOWMANAGER_LAYER_HOMESCREEN 103
-#define WINDOWMANAGER_LAYER_NUM 3
+#define WINDOWMANAGER_LAYER_NUM 4
// the HomeScreen app has to have the surface id 1000
#define WINDOWMANAGER_HOMESCREEN_MAIN_SURFACE_ID 1000
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]=-");
- // publish windowmanager interface
- mp_windowManagerAdaptor = new WindowmanagerAdaptor((QObject*)this);
-
- QDBusConnection dbus = QDBusConnection::sessionBus();
- dbus.registerObject("/windowmanager", this);
- dbus.registerService("org.agl.windowmanager");
}
void WindowManager::start()
{
qDebug("-=[start]=-");
mp_layoutAreaToSurfaceIdAssignment = new QMap<int, unsigned int>;
-#ifdef __arm__
+#ifdef HAVE_IVI_LAYERMANAGEMENT_API
ilmErrorTypes err;
err = ilm_init();
qDebug("ilm_init = %d", err);
+ if(ILM_SUCCESS != err)
+ {
+ qDebug("failed! Exiting!");
+ exit(-1);
+ }
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();
+ dbus.registerObject("/windowmanager", this);
+ dbus.registerService("org.agl.windowmanager");
+
+ // publish windowmanager interface
+ mp_windowManagerAdaptor = new WindowmanagerAdaptor((QObject*)this);
}
WindowManager::~WindowManager()
{
qDebug("-=[~WindowManager]=-");
delete mp_windowManagerAdaptor;
-#ifdef __arm__
+#ifdef HAVE_IVI_LAYERMANAGEMENT_API
ilm_destroy();
#endif
delete mp_layoutAreaToSurfaceIdAssignment;
}
}
-#ifdef __arm__
+#ifdef HAVE_IVI_LAYERMANAGEMENT_API
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);
}
{
qDebug("-=[updateScreen]=-");
-#ifdef __arm__
+#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();
}
+ // 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
}
-#ifdef __arm__
+#ifdef HAVE_IVI_LAYERMANAGEMENT_API
void WindowManager::notificationFunc_non_static(ilmObjectType object,
t_ilm_uint id,
t_ilm_bool created)
}
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_VISIBILITY & mask)
{
qDebug("ILM_NOTIFICATION_VISIBILITY");
- surfaceVisibilityChanged(surface, surfaceProperties.visibility);
+ surfaceVisibilityChanged(surface, surfaceProperties->visibility);
}
if (ILM_NOTIFICATION_OPACITY & mask)
{
if (ILM_NOTIFICATION_CONTENT_AVAILABLE & mask)
{
qDebug("ILM_NOTIFICATION_CONTENT_AVAILABLE");
- updateScreen();
+ //updateScreen();
}
if (ILM_NOTIFICATION_CONTENT_REMOVED & mask)
{
if (ILM_NOTIFICATION_CONFIGURED & mask)
{
qDebug("ILM_NOTIFICATION_CONFIGURED");
+ qDebug(" surfaceProperties %d", surface);
+ qDebug(" surfaceProperties.origSourceWidth: %d", surfaceProperties->origSourceWidth);
+ qDebug(" surfaceProperties.origSourceHeight: %d", surfaceProperties->origSourceHeight);
+
+ ilm_surfaceSetSourceRectangle(surface,
+ 0,
+ 0,
+ surfaceProperties->origSourceWidth,
+ surfaceProperties->origSourceHeight);
+
+ ilm_commitChanges();
updateScreen();
}
}
QList<int> WindowManager::getAllSurfacesOfProcess(int pid)
{
QList<int> result;
-#ifdef __arm__
+#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)
qDebug("-=[hideLayer]=-");
qDebug("layer %d", layer);
-#ifdef __arm__
+#ifdef HAVE_IVI_LAYERMANAGEMENT_API
if (0 == layer)
{
ilm_layerSetVisibility(WINDOWMANAGER_LAYER_POPUP, ILM_FALSE);
qDebug("-=[showLayer]=-");
qDebug("layer %d", layer);
-#ifdef __arm__
+#ifdef HAVE_IVI_LAYERMANAGEMENT_API
if (0 == layer)
{
ilm_layerSetVisibility(WINDOWMANAGER_LAYER_POPUP, ILM_TRUE);