Improve layer- and surface handling

[staging/HomeScreen.git] / WindowManager / src / windowmanager.hpp

diff --git a/WindowManager/src/windowmanager.hpp b/WindowManager/src/windowmanager.hpp
index a4d9d4f..7358412 100644 (file)
--- a/WindowManager/src/windowmanager.hpp
+++ b/WindowManager/src/windowmanager.hpp
@@ -21,13 +21,11 @@
 #include <QList>
 #include <QMap>
 
-#include "windowmanager_adapter.h"
+#include "windowmanager_adaptor.h"
 
 
-#ifdef __arm__
-extern "C" {
-#include "ilm/ilm_control.h"
-}
+#ifdef HAVE_IVI_LAYERMANAGEMENT_API
+#include <ilm/ilm_control.h>
 #endif
 
 class WindowManager : public QObject
@@ -42,14 +40,18 @@ public:
 private:
     WindowmanagerAdaptor *mp_windowManagerAdaptor;
     QList<Layout> m_layouts;
-    QList<int> m_surfaces;
+    QList<int> m_appSurfaces;
     QMap<int, unsigned int> *mp_layoutAreaToSurfaceIdAssignment;
 
     int m_currentLayout;
 
+    int m_screenId;
+    unsigned int m_screenWidth;
+    unsigned int m_screenHeight;
+
     void dumpScene();
 
-#ifdef __arm__
+#ifdef HAVE_IVI_LAYERMANAGEMENT_API
     void createNewLayer(int layerId);
     void addSurfaceToLayer(int surfaceId, int layerId);
 #endif
@@ -59,7 +61,7 @@ private:
 public:
     static void* myThis;
 
-#ifdef __arm__
+#ifdef HAVE_IVI_LAYERMANAGEMENT_API
     // for general notifications
     void notificationFunc_non_static(ilmObjectType object,
                                         t_ilm_uint id,
@@ -82,7 +84,7 @@ public:
 public slots:
 
 
-// from windowmanager_adapter.h
+// from windowmanager_adaptor.h
 public: // PROPERTIES
     Q_PROPERTY(int layoutId READ layoutId)
     int layoutId() const;