X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=WindowManager%2Fsrc%2Fwindowmanager.hpp;h=fce5937a543fdaa9a5f4654c1b8ddf32f9a58e63;hb=6656309e1ddf27c3e62fe5d599bee2beeddcbff1;hp=8fb716d38e9271c5666021fe96b1b83eaa6b6eab;hpb=cf8cd699e91df40c3f9070019f7c561432b4b4dd;p=staging%2FHomeScreen.git

diff --git a/WindowManager/src/windowmanager.hpp b/WindowManager/src/windowmanager.hpp
index 8fb716d..fce5937 100644
--- a/WindowManager/src/windowmanager.hpp
+++ b/WindowManager/src/windowmanager.hpp
@@ -24,12 +24,6 @@
 #include "windowmanager_adapter.h"
 
 
-typedef struct
-{
-    int pid;
-    QString processName;
-} SurfaceInfo;
-
 #ifdef __arm__
 extern "C" {
 #include "ilm/ilm_control.h"
@@ -42,25 +36,25 @@ class WindowManager : public QObject
 
 public:
     explicit WindowManager(QObject *parent = 0);
-    QMutex callbackMutex;
-
     ~WindowManager();
+
+    void start();
 private:
     WindowmanagerAdaptor *mp_windowManagerAdaptor;
-    QMap<int, QList<SimpleRect> > m_layouts;
-    QMap<int, QString> m_layoutNames;
+    QList<Layout> m_layouts;
+    QList<int> m_surfaces;
+    QMap<int, unsigned int> *mp_layoutAreaToSurfaceIdAssignment;
+
     int m_currentLayout;
+
     void dumpScene();
 
 #ifdef __arm__
     void createNewLayer(int layerId);
     void addSurfaceToLayer(int surfaceId, int layerId);
-
-    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();
+
 
 public:
     static void* myThis;
@@ -89,16 +83,22 @@ public slots:
 
 
 // from windowmanager_adapter.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, const QList<SimpleRect> &surfaceAreas);
+    int addLayout(int layoutId, const QString &layoutName, const QList<LayoutArea> &surfaceAreas);
+    QList<Layout> getAllLayouts();
     QList<int> getAvailableLayouts(int numberOfAppSurfaces);
-    QList<SimplePoint> getAvailableSurfaces();
-    int getLayout();
+    QList<int> getAvailableSurfaces();
     QString getLayoutName(int layoutId);
-    void setLayoutById(int layoutId);
-    void setLayoutByName(const QString &layoutName);
-    void setSurfaceToLayoutArea(int surfaceId, int layoutAreaId);
-
+    int setLayoutById(int layoutId);
+    int setLayoutByName(const QString &layoutName);
+    int setSurfaceToLayoutArea(int surfaceId, int layoutAreaId);
 };