X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=WindowManager%2Fsrc%2Fwindowmanager.hpp;h=26fe8ea1408a57bfa819baddcdfa7f049f746d2f;hb=75a4e94d7610db25c98f05cdda9491f4e7c0a4db;hp=ef19f4e65d3e57b8528c1bc5b70e5eed7b9703d5;hpb=d19555c038f6f1f89f08f12c88908d84b32b1bbf;p=staging%2FHomeScreen.git

diff --git a/WindowManager/src/windowmanager.hpp b/WindowManager/src/windowmanager.hpp
index ef19f4e..26fe8ea 100644
--- a/WindowManager/src/windowmanager.hpp
+++ b/WindowManager/src/windowmanager.hpp
@@ -21,18 +21,12 @@
 #include <QList>
 #include <QMap>
 
-#include "windowmanager_adapter.h"
+#include "windowmanager_adaptor.h"
 
 
-typedef struct
-{
-    int pid;
-    QString processName;
-} SurfaceInfo;
-
-#ifdef __arm__
+#ifdef HAVE_IVI_LAYERMANAGEMENT_API
 extern "C" {
-#include "ilm/ilm_control.h"
+#include <ilm/ilm_control.h>
 }
 #endif
 
@@ -47,32 +41,25 @@ public:
     void start();
 private:
     WindowmanagerAdaptor *mp_windowManagerAdaptor;
-    QMap<int, QList<SimpleRect> > m_layouts;
-    QMap<int, QString> m_layoutNames;
-    QMap<int, bool> m_layoutFullScreen;
-    QMap<int, int> m_layoutFullScreenAssociated;
+    QList<Layout> m_layouts;
+    QList<int> m_surfaces;
+    QMap<int, unsigned int> *mp_layoutAreaToSurfaceIdAssignment;
+
     int m_currentLayout;
+
     void dumpScene();
-    int m_homeScreenPid;
 
-#ifdef __arm__
+#ifdef HAVE_IVI_LAYERMANAGEMENT_API
     void createNewLayer(int layerId);
     void addSurfaceToLayer(int surfaceId, int layerId);
-    void updateScreen();
-
-
-    QMap<t_ilm_uint, SurfaceInfo> *mp_surfaces;
-    /* one layer per pid is created
-    where the surfaces are added that are created by the process */
-    QList<int> *mp_processLayers;
 #endif
+    void updateScreen();
 
-    QMap<int, unsigned int> *mp_layoutAreaToPidAssignment;
 
 public:
     static void* myThis;
 
-#ifdef __arm__
+#ifdef HAVE_IVI_LAYERMANAGEMENT_API
     // for general notifications
     void notificationFunc_non_static(ilmObjectType object,
                                         t_ilm_uint id,
@@ -95,19 +82,30 @@ public:
 public slots:
 
 
-// from windowmanager_adapter.h
+// from windowmanager_adaptor.h
+public: // PROPERTIES
+    Q_PROPERTY(int layoutId READ layoutId)
+    int layoutId() const;
+
+    Q_PROPERTY(QString layoutName READ layoutName)
+    QString layoutName() const;
+
 public Q_SLOTS: // METHODS
-    int addLayout(int layoutId, const QString &layoutName, bool isFullScreen, int associatedFullScreenLayout, const QList<SimpleRect> &surfaceAreas);
-    int getAssociatedFullScreenLayout(int layoutId);
+    int addLayout(int layoutId, const QString &layoutName, const QList<LayoutArea> &surfaceAreas);
+    int deleteLayoutById(int layoutId);
+    QList<Layout> getAllLayouts();
+    QList<int> getAllSurfacesOfProcess(int pid);
     QList<int> getAvailableLayouts(int numberOfAppSurfaces);
-    QList<SimplePoint> getAvailableSurfaces();
-    int getLayout();
+    QList<int> getAvailableSurfaces();
     QString getLayoutName(int layoutId);
-    bool isLayoutFullScreen(int layoutId);
-    void setLayoutById(int layoutId);
-    void setLayoutByName(const QString &layoutName);
-    void setPidToLayoutArea(int pid, int layoutAreaId);
-
+    void hideLayer(int layer);
+    int setLayoutById(int layoutId);
+    int setLayoutByName(const QString &layoutName);
+    int setSurfaceToLayoutArea(int surfaceId, int layoutAreaId);
+    void showLayer(int layer);
+
+Q_SIGNALS: // SIGNALS
+    void surfaceVisibilityChanged(int surfaceId, bool visible);
 };