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
Reworking layer/surface management
[staging/HomeScreen.git]
/
WindowManager
/
src
/
windowmanager.hpp
diff --git
a/WindowManager/src/windowmanager.hpp
b/WindowManager/src/windowmanager.hpp
index
5cc536b
..
70ae31a
100644
(file)
--- a/
WindowManager/src/windowmanager.hpp
+++ b/
WindowManager/src/windowmanager.hpp
@@
-23,7
+23,6
@@
#include "windowmanager_adaptor.h"
#include "windowmanager_adaptor.h"
-
#ifdef HAVE_IVI_LAYERMANAGEMENT_API
#include <ilm/ilm_control.h>
#endif
#ifdef HAVE_IVI_LAYERMANAGEMENT_API
#include <ilm/ilm_control.h>
#endif
@@
-32,7
+31,7
@@
class WindowManager : public QObject
Q_OBJECT
public:
Q_OBJECT
public:
- explicit WindowManager(QObject *parent = 0);
+ explicit WindowManager(
int displayId,
QObject *parent = 0);
~WindowManager();
void start();
~WindowManager();
void start();
@@
-51,6
+50,7
@@
private:
#ifdef HAVE_IVI_LAYERMANAGEMENT_API
t_ilm_layer* m_showLayers;
#ifdef HAVE_IVI_LAYERMANAGEMENT_API
t_ilm_layer* m_showLayers;
+ QMap<pid_t, t_ilm_surface> m_appSurfaces;
QMap<pid_t, t_ilm_layer> m_appLayers;
int getLayerRenderOrder(t_ilm_layer* id_array);
QMap<pid_t, t_ilm_layer> m_appLayers;
int getLayerRenderOrder(t_ilm_layer* id_array);
@@
-60,8
+60,12
@@
private:
pid_t m_pending_to_show;
pid_t m_pending_to_show;
- void addSurfaceToAppLayer(const int surfaceID);
+ void addSurface(const t_ilm_surface surfaceId);
+ t_ilm_layer addSurfaceToAppLayer(pid_t pid, const int surfaceId);
void addSurfaceToLayer(const int surfaceId, const int layerId);
void addSurfaceToLayer(const int surfaceId, const int layerId);
+
+ void configureHomeScreenMainSurface(const t_ilm_surface surface, const t_ilm_int width, const t_ilm_int height);
+ void configureAppSurface(const pid_t pid, const t_ilm_surface surface, const t_ilm_int width, const t_ilm_int height);
#endif
void updateScreen();
#endif
void updateScreen();
@@
-119,5
+123,4
@@
Q_SIGNALS: // SIGNALS
void surfaceVisibilityChanged(int surfaceId, bool visible);
};
void surfaceVisibilityChanged(int surfaceId, bool visible);
};
-
#endif // WINDOWMANAGER_HPP
#endif // WINDOWMANAGER_HPP