diff options
| -rw-r--r-- | HomeScreen/conf/HomeScreen.service | 3 | ||||
| -rw-r--r-- | HomeScreen/qml/Home.qml | 2 | ||||
| -rw-r--r-- | HomeScreen/qml/main.qml | 4 | ||||
| -rw-r--r-- | README.md | 113 | ||||
| -rw-r--r-- | WindowManager/src/windowmanager.cpp | 242 | ||||
| -rw-r--r-- | WindowManager/src/windowmanager.hpp | 9 |
6 files changed, 156 insertions, 217 deletions
diff --git a/HomeScreen/conf/HomeScreen.service b/HomeScreen/conf/HomeScreen.service index b60c86e..59843e3 100644 --- a/HomeScreen/conf/HomeScreen.service +++ b/HomeScreen/conf/HomeScreen.service @@ -10,7 +10,8 @@ Type=dbus BusName=org.agl.homescreen ExecStartPre=/bin/systemctl --user is-active WindowManager ExecStart=/usr/AGL/homescreen/HomeScreen -Environment=QT_IVI_SURFACE_ID=1000 QT_WAYLAND_SHELL_INTEGRATION=ivi-shell LD_PRELOAD=/usr/lib/libEGL.so.1 +# 4194304(= 1 << 22) is special surface id for HomeScreen +Environment=QT_IVI_SURFACE_ID=4194304 QT_WAYLAND_SHELL_INTEGRATION=ivi-shell LD_PRELOAD=/usr/lib/libEGL.so.1 Restart=on-failure RestartSec=1 diff --git a/HomeScreen/qml/Home.qml b/HomeScreen/qml/Home.qml index 142e7f5..5800f81 100644 --- a/HomeScreen/qml/Home.qml +++ b/HomeScreen/qml/Home.qml @@ -16,8 +16,6 @@ */ import QtQuick 2.2 -import QtQuick.Layouts 1.1 -import QtQuick.Controls 1.0 import Home 1.0 Item { diff --git a/HomeScreen/qml/main.qml b/HomeScreen/qml/main.qml index 6a515fc..4c65fb5 100644 --- a/HomeScreen/qml/main.qml +++ b/HomeScreen/qml/main.qml @@ -54,7 +54,7 @@ Window { Layout.fillHeight: true Layout.preferredHeight: 1920 - 218 - 215 - visible: true + visible: false } Home { @@ -62,7 +62,7 @@ Window { Layout.fillWidth: true Layout.fillHeight: true Layout.preferredHeight: 1920 - 218 - 215 - visible: false + visible: true } MediaArea { @@ -1,108 +1,47 @@ This project contains: HomeScreen: AGL Home Screen reference implementation +HomeScreenAppFrameworkBinderAGL: Binder for the AGL application framework HomeScreenSimulator: AGL Home Screen Simulator for development InputEventManager: AGL Input event manager -interfaces: library with the D-Bus interfaces +interfaces: the D-Bus interface introspections +libhomescreen: HomeScreen API C++ shared library SampleAppTimeDate: AGL Sample Application for Home Screen Statusbar -HomeScreenAppFrameworkBinderTizen: Binder for the TIZEN application framework +SampleHomeScreenInterfaceApp: sample application to show how to use libhomescreen +WindowManager: AGL WindowManager reference implementation AGL repo for source code: -https://gerrit.automotivelinux.org/gerrit/#/admin/projects/staging/HomeScreen +https://gerrit.automotivelinux.org/gerrit/gitweb?p=staging%2FHomeScreen.git AGL repo for bitbake recipe: -https://gerrit.automotivelinux.org/gerrit/#/admin/projects/AGL/meta-agl-demo/recipes-demo-hmi/HomeScreen/HomeScreen_?.bb +https://gerrit.automotivelinux.org/gerrit/gitweb?p=AGL/meta-agl-demo.git;a=blob;f=recipes-demo-hmi/homescreen/homescreen_git.bb -Instructions for running on porter board ----------------------------------------- - -Add "HomeScreen" to your image recipe. -Right now, HomeScreen depends on the TIZEN application manager, because the HomeScreenAppFrameworkBinderTizen makes use of it. -So also add this to your image recipe: -" - tizen-platform-wrapper \ - tizen-platform-config \ - xdgmime \ - libdlog \ - dlogutil \ - libiri \ - \ - smack \ - libprivilege-control \ - libslp-db-util \ - \ - vconf \ - capi-base-common \ - ail \ - \ - sensor \ - libsf-common \ - \ - iniparser \ - app-svc \ - heynoti \ - notification \ - app-core-efl \ - app-core-common \ - capi-system-info \ - \ - pkgmgr-info \ - librua \ - bundle \ - app-checker \ - \ - libcom-core \ - privacy-manager-server \ - pkgmgr \ - pkgmgr-info \ - pkgmgr-info-parser \ - aul \ - aul-test \ - \ - dlt-daemon \ - dlt-daemon-systemd \ - \ - amhelloworld \ - pkgmgr-first-setup-service \ -" - - -All "HomeScreen" applications can be found in /opt/AGL/HomeScreen. - -Make sure, weston is using the IVI shell extension: - -/etc/xdg/weston/weston.ini: -[core] -shell=ivi-shell.so -[ivi-shell] -ivi-module=ivi-controller.so -ivi-shell-user-interface=/usr/lib/weston/weston-ivi-shell-user-interface +Quickstart: -[output] -name=HDMI-A-1 -transform=270 - - - -If you want to use the TIZEN application manager to launch apps, you need to execute HomeScreen app with the user "aglglobalapp": - -Therefore you need to change the owner of the weston socket: +Instructions for building HomeScreen app +---------------------------------------- -chown aglglobalapp:aglglobalapp /tmp/wayland-0 +The HomeScreen app is part of the +packagegroup-agl-demo-platform +packagegroup. -P.S.: the path may also something likle /run/user/0, depending on the XDG_RUNTIME_DIR. +This also includes the following apps: +- HomeScreenAppFrameworkBinderAGL +- InputEventManager +- SampleAppTimeDate +- SampleHomeScreenInterfaceApp +- WindowManager -If not already stared, launch D-Bus: -export `dbus-launch` +And the library +- libhomescreen -Now you can start the HomeScreen apps: -cd /opt/AGL/HomeScreen -./WindowManager & -./InputEventManager & -./HomeScreenAppFrameworkBinderTizen & -./HomeScreen & +To build all the above, follow the instrucions on the AGL +documentation website: +http://docs.automotivelinux.org/docs/getting_started/en/dev/reference/source-code.html#features-supported-by-aglsetup +Please activate the "agl-demo" feature when running the aglsetup script: +http://docs.automotivelinux.org/docs/getting_started/en/dev/reference/source-code.html#features-supported-by-aglsetup diff --git a/WindowManager/src/windowmanager.cpp b/WindowManager/src/windowmanager.cpp index cee7ad7..ac34756 100644 --- a/WindowManager/src/windowmanager.cpp +++ b/WindowManager/src/windowmanager.cpp @@ -33,10 +33,10 @@ #define WINDOWMANAGER_LAYER_NUM 4 -#define WINDOWMANAGER_LAYER_ID_SHIFT 22 +#define WINDOWMANAGER_SURFACE_ID_SHIFT 22 -// the HomeScreen app has to have the surface id 1000 -#define WINDOWMANAGER_HOMESCREEN_MAIN_SURFACE_ID 1000 +// the HomeScreen app has to have the surface id 4194304 +#define WINDOWMANAGER_HOMESCREEN_MAIN_SURFACE_ID (1 << WINDOWMANAGER_SURFACE_ID_SHIFT) // Quick hack for scaling layer to fit non-FHD(1920x1080) screen // * source rect of layer should be 1920x1080 @@ -51,14 +51,14 @@ void* WindowManager::myThis = 0; WindowManager::WindowManager(int displayId, QObject *parent) : QObject(parent), m_layouts(), - // m_appSurfaces(), mp_layoutAreaToSurfaceIdAssignment(0), m_currentLayout(-1), m_screenId(displayId), m_screenWidth(0), m_screenHeight(0) #ifdef HAVE_IVI_LAYERMANAGEMENT_API - , + , + m_appSurfaces(), m_appLayers(), m_pending_to_show(-1) #endif @@ -96,7 +96,6 @@ void WindowManager::start() createNewLayer(WINDOWMANAGER_LAYER_POPUP); createNewLayer(WINDOWMANAGER_LAYER_HOMESCREEN_OVERLAY); -// createNewLayer(WINDOWMANAGER_LAYER_APPLICATIONS); createNewLayer(WINDOWMANAGER_LAYER_HOMESCREEN); ilm_registerNotification(WindowManager::notificationFunc_static, this); @@ -125,9 +124,9 @@ int WindowManager::getLayerRenderOrder(t_ilm_layer id_array[]) { int i, j; - for (i = WINDOWMANAGER_LAYER_NUM - 1, j = 0; i >= 0; i--, j++) { + for (i = WINDOWMANAGER_LAYER_NUM - 1, j = 0; i >= 0; i--) { if (m_showLayers[i] != 0) { - id_array[j] = m_showLayers[i]; + id_array[j++] = m_showLayers[i]; } } @@ -170,8 +169,7 @@ void WindowManager::createNewLayer(int layerId) ilm_layerCreateWithDimension(&newLayerId, WINDOWMANAGER_HOMESCREEN_WIDTH, WINDOWMANAGER_HOMESCREEN_HEIGHT); - ilm_layerSetOpacity(newLayerId, 1.0); - ilm_layerSetVisibility(newLayerId, ILM_TRUE); + ilm_commitChanges(); ilm_layerSetSourceRectangle(newLayerId, 0, 0, @@ -182,7 +180,9 @@ void WindowManager::createNewLayer(int layerId) 0, m_screenWidth, m_screenHeight); - + ilm_commitChanges(); + ilm_layerSetOpacity(newLayerId, 1.0); + ilm_layerSetVisibility(newLayerId, ILM_TRUE); ilm_commitChanges(); } @@ -196,35 +196,53 @@ t_ilm_layer WindowManager::getAppLayerID(pid_t pid) return layer_id; } -void WindowManager::addSurfaceToAppLayer(int surfaceId) +void WindowManager::addSurface(t_ilm_surface surfaceId) { struct ilmSurfaceProperties surfaceProperties; - t_ilm_layer layer_id; - int found = 0; pid_t pid; - qDebug("-=[addSurfaceToAppLayer]=-"); - qDebug(" surfaceId %d", surfaceId); - ilm_getPropertiesOfSurface(surfaceId, &surfaceProperties); pid = surfaceProperties.creatorPid; - if (pid < 0) { - /* No process */ - qDebug("addSurfaceToAppLayer(%d) got pid == -1", surfaceId); - return; + QMap<pid_t, t_ilm_surface>::const_iterator i = m_appSurfaces.find(pid); + if (i != m_appSurfaces.end() && i.value() == 0) { + /* Only the 1st surface is handled by Window Manager */ + qDebug("This surface (%d) is 1st one for app (%d)", surfaceId, pid); + /* update surface id */ + m_appSurfaces.insert(pid, surfaceId); + + /* this surface should be handled by WindowManager */ + ilm_surfaceAddNotification(surfaceId, surfaceCallbackFunction_static); + ilm_commitChanges(); } +} + +t_ilm_layer WindowManager::addSurfaceToAppLayer(pid_t pid, int surfaceId) +{ + struct ilmSurfaceProperties surfaceProperties; + t_ilm_layer layer_id; + int found = 0; + + qDebug("-=[addSurfaceToAppLayer]=-"); + qDebug(" surfaceId %d", surfaceId); + + if (pid < 0) + return 0; QMap<pid_t, t_ilm_layer>::const_iterator i = m_appLayers.find(pid); if (i == m_appLayers.end()) { qDebug("No layer found, create new for app(pid=%d)", pid); /* not found, create new one */ - t_ilm_layer layer_id = getAppLayerID(pid); + layer_id = getAppLayerID(pid); createNewLayer(layer_id); m_appLayers.insert(pid, layer_id); + } else { + layer_id = i.value(); } + + return layer_id; } void WindowManager::addSurfaceToLayer(int surfaceId, int layerId) @@ -235,34 +253,9 @@ void WindowManager::addSurfaceToLayer(int surfaceId, int layerId) if (layerId == WINDOWMANAGER_LAYER_HOMESCREEN) { - struct ilmSurfaceProperties surfaceProperties; - ilm_getPropertiesOfSurface(surfaceId, &surfaceProperties); - - // homescreen app always fullscreen in the back - ilm_surfaceSetDestinationRectangle(surfaceId, 0, 0, - WINDOWMANAGER_HOMESCREEN_WIDTH, - WINDOWMANAGER_HOMESCREEN_HEIGHT); - //ilm_surfaceSetSourceRectangle(surfaceId, 0, 0, m_screenWidth, m_screenHeight); - ilm_surfaceSetOpacity(surfaceId, 1.0); - ilm_surfaceSetVisibility(surfaceId, ILM_TRUE); - - ilm_layerAddSurface(layerId, surfaceId); + ilm_layerAddSurface(layerId, surfaceId); } -#if 0 - if (layerId == WINDOWMANAGER_LAYER_APPLICATIONS) - { - 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_layerAddSurface(layerId, surfaceId); - } -#endif - if (layerId == WINDOWMANAGER_LAYER_HOMESCREEN_OVERLAY) + else if (layerId == WINDOWMANAGER_LAYER_HOMESCREEN_OVERLAY) { struct ilmSurfaceProperties surfaceProperties; ilm_getPropertiesOfSurface(surfaceId, &surfaceProperties); @@ -274,8 +267,7 @@ void WindowManager::addSurfaceToLayer(int surfaceId, int layerId) ilm_layerAddSurface(layerId, surfaceId); } - - if (layerId == WINDOWMANAGER_LAYER_POPUP) + else if (layerId == WINDOWMANAGER_LAYER_POPUP) { struct ilmSurfaceProperties surfaceProperties; ilm_getPropertiesOfSurface(surfaceId, &surfaceProperties); @@ -286,11 +278,52 @@ void WindowManager::addSurfaceToLayer(int surfaceId, int layerId) //ilm_surfaceSetVisibility(surfaceId, ILM_FALSE); ilm_layerAddSurface(layerId, surfaceId); + } else { + return; } ilm_commitChanges(); } +void WindowManager::configureHomeScreenMainSurface(t_ilm_surface surface, t_ilm_int width, t_ilm_int height) +{ + // homescreen app always fullscreen in the back + ilm_surfaceSetDestinationRectangle(surface, 0, 0, + WINDOWMANAGER_HOMESCREEN_WIDTH, + WINDOWMANAGER_HOMESCREEN_HEIGHT); + ilm_surfaceSetSourceRectangle(surface, 0, 0, width, height); + ilm_surfaceSetOpacity(surface, 1.0); + ilm_surfaceSetVisibility(surface, ILM_TRUE); + + ilm_commitChanges(); +} + +void WindowManager::configureAppSurface(pid_t pid, t_ilm_surface surface, t_ilm_int width, t_ilm_int height) +{ + /* Dirty hack! cut & paste from HomeScreen/src/layouthandler.cpp */ + const int SCREEN_WIDTH = 1080; + const int SCREEN_HEIGHT = 1920; + + 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; + + ilm_surfaceSetDestinationRectangle(surface, + 0, + TOPAREA_HEIGHT, + SCREEN_WIDTH, + SCREEN_HEIGHT - TOPAREA_HEIGHT - MEDIAAREA_HEIGHT); + ilm_surfaceSetSourceRectangle(surface, 0, 0, width, height); + ilm_surfaceSetOpacity(surface, 1.0); + ilm_surfaceSetVisibility(surface, ILM_TRUE); /* Hack to avoid blank screen when switch apps */ + + ilm_commitChanges(); +} #endif void WindowManager::updateScreen() @@ -368,11 +401,14 @@ void WindowManager::updateScreen() #endif #ifdef HAVE_IVI_LAYERMANAGEMENT_API if (m_pending_to_show != -1) { + qDebug("show pending app (%d)", m_pending_to_show); showAppLayer(m_pending_to_show); } else { // display layer render order t_ilm_layer renderOrder[WINDOWMANAGER_LAYER_NUM]; int num_layers = getLayerRenderOrder(renderOrder); + + qDebug("Screen render order %d, %d layers", m_screenId, num_layers); ilm_displaySetRenderOrder(m_screenId, renderOrder, num_layers); ilm_commitChanges(); } @@ -392,26 +428,15 @@ void WindowManager::notificationFunc_non_static(ilmObjectType object, if (created) { - qDebug("Surface created, ID: %d", id); - ilm_getPropertiesOfSurface(id, &surfaceProperties); - qDebug(" origSourceWidth : %d", surfaceProperties.origSourceWidth); - qDebug(" origSourceHeight: %d", surfaceProperties.origSourceHeight); - if (WINDOWMANAGER_HOMESCREEN_MAIN_SURFACE_ID == id) { - qDebug("HomeScreen app detected"); - addSurfaceToLayer(id, WINDOWMANAGER_LAYER_HOMESCREEN); - updateScreen(); + ilm_surfaceAddNotification(id, surfaceCallbackFunction_static); + ilm_commitChanges(); } else { - addSurfaceToAppLayer(id); - //addSurfaceToLayer(id, WINDOWMANAGER_LAYER_APPLICATIONS); - //m_appSurfaces.append(id); + addSurface(id); } - ilm_surfaceAddNotification(id, surfaceCallbackFunction_static); - - ilm_commitChanges(); } else { @@ -448,6 +473,7 @@ void WindowManager::surfaceCallbackFunction_non_static(t_ilm_surface surface, { qDebug("ILM_NOTIFICATION_VISIBILITY"); surfaceVisibilityChanged(surface, surfaceProperties->visibility); + updateScreen(); } if (ILM_NOTIFICATION_OPACITY & mask) { @@ -468,44 +494,6 @@ void WindowManager::surfaceCallbackFunction_non_static(t_ilm_surface surface, if (ILM_NOTIFICATION_CONTENT_AVAILABLE & mask) { qDebug("ILM_NOTIFICATION_CONTENT_AVAILABLE"); - /* add surface to layer for the application */ - - ilmErrorTypes result; - pid_t pid = surfaceProperties->creatorPid; - - QMap<pid_t, t_ilm_layer>::const_iterator i = m_appLayers.find(pid); - if (i != m_appLayers.end()) { - t_ilm_layer layer_id = m_appLayers.value(pid); - - result = ilm_layerAddSurface(layer_id, surface); - - if (result != ILM_SUCCESS) { - qDebug("ilm_layerAddSurface(%d,%d) failed.", layer_id, surface); - } - - /* Dirty hack! cut & paste from HomeScreen/src/layouthandler.cpp */ - const int SCREEN_WIDTH = 1080; - const int SCREEN_HEIGHT = 1920; - - 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; - - ilm_surfaceSetDestinationRectangle(surface, - 0, - TOPAREA_HEIGHT, - SCREEN_WIDTH, - SCREEN_HEIGHT - TOPAREA_HEIGHT - MEDIAAREA_HEIGHT); - - ilm_commitChanges(); - } else { - qDebug("No layer for application(pid=%d)", surfaceProperties->creatorPid); - } } if (ILM_NOTIFICATION_CONTENT_REMOVED & mask) { @@ -513,8 +501,6 @@ void WindowManager::surfaceCallbackFunction_non_static(t_ilm_surface surface, /* application being down */ m_appLayers.remove(surfaceProperties->creatorPid); - - updateScreen(); } if (ILM_NOTIFICATION_CONFIGURED & mask) { @@ -523,14 +509,26 @@ void WindowManager::surfaceCallbackFunction_non_static(t_ilm_surface surface, qDebug(" surfaceProperties.origSourceWidth: %d", surfaceProperties->origSourceWidth); qDebug(" surfaceProperties.origSourceHeight: %d", surfaceProperties->origSourceHeight); - ilm_surfaceSetSourceRectangle(surface, - 0, - 0, - surfaceProperties->origSourceWidth, - surfaceProperties->origSourceHeight); - - ilm_surfaceSetVisibility(surface, ILM_TRUE); - + if (surface == WINDOWMANAGER_HOMESCREEN_MAIN_SURFACE_ID) { + addSurfaceToLayer(surface, WINDOWMANAGER_LAYER_HOMESCREEN); + configureHomeScreenMainSurface(surface, surfaceProperties->origSourceWidth, surfaceProperties->origSourceHeight); + } else { + ilmErrorTypes result; + pid_t pid = surfaceProperties->creatorPid; + t_ilm_layer layer = addSurfaceToAppLayer(pid, surface); + + if (layer != 0) { + configureAppSurface(pid, surface, + surfaceProperties->origSourceWidth, + surfaceProperties->origSourceHeight); + + result = ilm_layerAddSurface(layer, surface); + if (result != ILM_SUCCESS) { + qDebug("ilm_layerAddSurface(%d,%d) failed.", layer, surface); + } + ilm_commitChanges(); + } + } updateScreen(); } } @@ -698,14 +696,9 @@ void WindowManager::hideLayer(int layer) if (layer >= 0 && layer < WINDOWMANAGER_LAYER_NUM) { /* hide target layer */ m_showLayers[layer] = 0; - - if (layer == WINDOWMANAGER_LAYER_APPLICATIONS) { + if (layer == 2) { /* clear pending flag */ m_pending_to_show = -1; - } else if (m_pending_to_show != -1) { - /* there is a pending application to show */ - showAppLayer(m_pending_to_show); - return; } t_ilm_layer renderOrder[WINDOWMANAGER_LAYER_NUM]; @@ -804,22 +797,27 @@ void WindowManager::showAppLayer(int pid) return; } #ifdef HAVE_IVI_LAYERMANAGEMENT_API - /* clear pending flag */ m_pending_to_show = -1; /* search layer id for application to show */ QMap<pid_t, t_ilm_layer>::const_iterator i = m_appLayers.find(pid); + QMap<pid_t, t_ilm_surface>::const_iterator j = m_appSurfaces.find(pid); if (i != m_appLayers.end()) { - m_showLayers[2] = m_appLayers.value(pid); + m_showLayers[2] = i.value(); qDebug("Found layer(%d) to show for app(pid=%d)", m_showLayers[2], pid); } else { + /* check if this app is registered */ + if (j == m_appSurfaces.end()) { + qDebug("New app %d", pid); + m_appSurfaces.insert(pid, 0); /* register pid only so far */ + } + /* Probably app layer hasn't been made yet */ m_pending_to_show = pid; /* hide current app once, back to default screen */ m_showLayers[2] = 0; - qDebug("No layer to show for app(pid=%d)", pid); } t_ilm_layer renderOrder[WINDOWMANAGER_LAYER_NUM]; diff --git a/WindowManager/src/windowmanager.hpp b/WindowManager/src/windowmanager.hpp index d2c9c9b..70ae31a 100644 --- a/WindowManager/src/windowmanager.hpp +++ b/WindowManager/src/windowmanager.hpp @@ -23,7 +23,6 @@ #include "windowmanager_adaptor.h" - #ifdef HAVE_IVI_LAYERMANAGEMENT_API #include <ilm/ilm_control.h> #endif @@ -51,6 +50,7 @@ private: #ifdef HAVE_IVI_LAYERMANAGEMENT_API t_ilm_layer* m_showLayers; + QMap<pid_t, t_ilm_surface> m_appSurfaces; QMap<pid_t, t_ilm_layer> m_appLayers; int getLayerRenderOrder(t_ilm_layer* id_array); @@ -60,8 +60,12 @@ private: pid_t m_pending_to_show; - void addSurfaceToAppLayer(const int surfaceID); + void addSurface(const t_ilm_surface surfaceId); + t_ilm_layer addSurfaceToAppLayer(pid_t pid, const int surfaceId); void addSurfaceToLayer(const int surfaceId, const int layerId); + + void configureHomeScreenMainSurface(const t_ilm_surface surface, const t_ilm_int width, const t_ilm_int height); + void configureAppSurface(const pid_t pid, const t_ilm_surface surface, const t_ilm_int width, const t_ilm_int height); #endif void updateScreen(); @@ -119,5 +123,4 @@ Q_SIGNALS: // SIGNALS void surfaceVisibilityChanged(int surfaceId, bool visible); }; - #endif // WINDOWMANAGER_HPP |