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 ee779aa..7358412 100644 (file)
--- a/WindowManager/src/windowmanager.hpp
+++ b/WindowManager/src/windowmanager.hpp
@@ -18,27 +18,51 @@
 #define WINDOWMANAGER_HPP
 
 #include <QObject>
+#include <QList>
+#include <QMap>
 
+#include "windowmanager_adaptor.h"
 
-#ifdef __arm__
-extern "C" {
-#include "ilm/ilm_control.h"
-}
-#endif
 
+#ifdef HAVE_IVI_LAYERMANAGEMENT_API
+#include <ilm/ilm_control.h>
+#endif
 
 class WindowManager : public QObject
 {
     Q_OBJECT
+
 public:
     explicit WindowManager(QObject *parent = 0);
     ~WindowManager();
+
+    void start();
 private:
+    WindowmanagerAdaptor *mp_windowManagerAdaptor;
+    QList<Layout> m_layouts;
+    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 HAVE_IVI_LAYERMANAGEMENT_API
+    void createNewLayer(int layerId);
+    void addSurfaceToLayer(int surfaceId, int layerId);
+#endif
+    void updateScreen();
 
 
 public:
+    static void* myThis;
 
-#ifdef __arm__
+#ifdef HAVE_IVI_LAYERMANAGEMENT_API
+    // for general notifications
     void notificationFunc_non_static(ilmObjectType object,
                                         t_ilm_uint id,
                                         t_ilm_bool created);
@@ -46,9 +70,45 @@ public:
                                         t_ilm_uint id,
                                         t_ilm_bool created,
                                         void* user_data);
+
+
+    // for surface notifications
+    void surfaceCallbackFunction_non_static(t_ilm_surface surface,
+                                        struct ilmSurfaceProperties* surfaceProperties,
+                                        t_ilm_notification_mask mask);
+    static void surfaceCallbackFunction_static(t_ilm_surface surface,
+                                        struct ilmSurfaceProperties* surfaceProperties,
+                                        t_ilm_notification_mask mask);
+
 #endif
 public slots:
 
+
+// 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, const QList<LayoutArea> &surfaceAreas);
+    int deleteLayoutById(int layoutId);
+    QList<Layout> getAllLayouts();
+    QList<int> getAllSurfacesOfProcess(int pid);
+    QList<int> getAvailableLayouts(int numberOfAppSurfaces);
+    QList<int> 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);
+
+Q_SIGNALS: // SIGNALS
+    void surfaceVisibilityChanged(int surfaceId, bool visible);
 };
 
+
 #endif // WINDOWMANAGER_HPP