#include <QList>
#include <QMap>
-#include "windowmanager_adapter.h"
+#include "windowmanager_adaptor.h"
-typedef struct
-{
- int pid;
- QString processName;
-} SurfaceInfo;
-
-#ifdef __arm__
-extern "C" {
-#include "ilm/ilm_control.h"
-}
+#ifdef HAVE_IVI_LAYERMANAGEMENT_API
+#include <ilm/ilm_control.h>
#endif
-
class WindowManager : public QObject
{
Q_OBJECT
void start();
private:
WindowmanagerAdaptor *mp_windowManagerAdaptor;
- QMap<int, QList<SimpleRect> > m_layouts;
- QMap<int, QString> m_layoutNames;
+ QList<Layout> m_layouts;
+ QMap<int, unsigned int> *mp_layoutAreaToSurfaceIdAssignment;
+
int m_currentLayout;
+
+ int m_screenId;
+ unsigned int m_screenWidth;
+ unsigned int m_screenHeight;
+
void dumpScene();
- int m_homeScreenPid;
-#ifdef __arm__
- void createNewLayer(int layerId);
- void addSurfaceToLayer(int surfaceId, int layerId);
- void updateScreen();
+#ifdef HAVE_IVI_LAYERMANAGEMENT_API
+ t_ilm_layer* m_showLayers;
+ QMap<pid_t, t_ilm_layer> m_appLayers;
+ int getLayerRenderOrder(t_ilm_layer* id_array);
+ void createNewLayer(const 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;
+ 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();
- 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,
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, const QList<SimpleRect> &surfaceAreas);
+ 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);
- 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);
+ void showAppLayer(int pid);
+
+Q_SIGNALS: // SIGNALS
+ void surfaceVisibilityChanged(int surfaceId, bool visible);
};