X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=WindowManager%2Fsrc%2Fwindowmanager.hpp;fp=WindowManager%2Fsrc%2Fwindowmanager.hpp;h=5cc536b9b77d29d7a503c09441af8599b48b1fa3;hb=b0632b0a5cd7e31c79c4a81764ebed329114a983;hp=8c8f63c19f58433db9812eced3b554b3151fd1e8;hpb=87a370594448b73a28ee8a8b783873cbefbc8e10;p=staging%2FHomeScreen.git diff --git a/WindowManager/src/windowmanager.hpp b/WindowManager/src/windowmanager.hpp index 8c8f63c..5cc536b 100644 --- a/WindowManager/src/windowmanager.hpp +++ b/WindowManager/src/windowmanager.hpp @@ -27,7 +27,6 @@ #ifdef HAVE_IVI_LAYERMANAGEMENT_API #include #endif - class WindowManager : public QObject { Q_OBJECT @@ -40,7 +39,6 @@ public: private: WindowmanagerAdaptor *mp_windowManagerAdaptor; QList m_layouts; - QList m_appSurfaces; QMap *mp_layoutAreaToSurfaceIdAssignment; int m_currentLayout; @@ -49,14 +47,21 @@ private: unsigned int m_screenWidth; unsigned int m_screenHeight; - int* m_showLayers; - int getLayerRenderOrder(t_ilm_layer id_array[]); - void dumpScene(); #ifdef HAVE_IVI_LAYERMANAGEMENT_API - void createNewLayer(int layerId); - void addSurfaceToLayer(int surfaceId, int layerId); + t_ilm_layer* m_showLayers; + QMap m_appLayers; + int getLayerRenderOrder(t_ilm_layer* id_array); + + void createNewLayer(const int layerId); + + t_ilm_layer getAppLayerID(const pid_t pid); + + pid_t m_pending_to_show; + + void addSurfaceToAppLayer(const int surfaceID); + void addSurfaceToLayer(const int surfaceId, const int layerId); #endif void updateScreen(); @@ -99,15 +104,16 @@ public Q_SLOTS: // METHODS int addLayout(int layoutId, const QString &layoutName, const QList &surfaceAreas); int deleteLayoutById(int layoutId); QList getAllLayouts(); - QList getAllSurfacesOfProcess(int pid); + // QList getAllSurfacesOfProcess(int pid); QList getAvailableLayouts(int numberOfAppSurfaces); - QList getAvailableSurfaces(); + // QList getAvailableSurfaces(); QString getLayoutName(int layoutId); void hideLayer(int layer); int setLayoutById(int layoutId); int setLayoutByName(const QString &layoutName); int setSurfaceToLayoutArea(int surfaceId, int layoutAreaId); void showLayer(int layer); + void showAppLayer(int pid); Q_SIGNALS: // SIGNALS void surfaceVisibilityChanged(int surfaceId, bool visible);