Code Review
/
staging
/
HomeScreen.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix for pid and surface handling.
[staging/HomeScreen.git]
/
WindowManager
/
src
/
windowmanager.hpp
diff --git
a/WindowManager/src/windowmanager.hpp
b/WindowManager/src/windowmanager.hpp
index
8fb716d
..
6c11760
100644
(file)
--- a/
WindowManager/src/windowmanager.hpp
+++ b/
WindowManager/src/windowmanager.hpp
@@
-24,12
+24,6
@@
#include "windowmanager_adapter.h"
#include "windowmanager_adapter.h"
-typedef struct
-{
- int pid;
- QString processName;
-} SurfaceInfo;
-
#ifdef __arm__
extern "C" {
#include "ilm/ilm_control.h"
#ifdef __arm__
extern "C" {
#include "ilm/ilm_control.h"
@@
-42,25
+36,25
@@
class WindowManager : public QObject
public:
explicit WindowManager(QObject *parent = 0);
public:
explicit WindowManager(QObject *parent = 0);
- QMutex callbackMutex;
-
~WindowManager();
~WindowManager();
+
+ void start();
private:
WindowmanagerAdaptor *mp_windowManagerAdaptor;
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;
int m_currentLayout;
+
void dumpScene();
#ifdef __arm__
void createNewLayer(int layerId);
void addSurfaceToLayer(int surfaceId, int layerId);
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
#endif
+ void updateScreen();
+
public:
static void* myThis;
public:
static void* myThis;
@@
-89,16
+83,23
@@
public slots:
// from windowmanager_adapter.h
// 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
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> getAllSurfacesOfProcess(int pid);
QList<int> getAvailableLayouts(int numberOfAppSurfaces);
QList<int> getAvailableLayouts(int numberOfAppSurfaces);
- QList<SimplePoint> getAvailableSurfaces();
- int getLayout();
+ QList<int> getAvailableSurfaces();
QString getLayoutName(int layoutId);
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);
};
};