Code Review
/
apps
/
agl-service-windowmanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Update wm_layer
[apps/agl-service-windowmanager.git]
/
src
/
wm_client.hpp
diff --git
a/src/wm_client.hpp
b/src/wm_client.hpp
index
0268807
..
7c6c0b4
100644
(file)
--- a/
src/wm_client.hpp
+++ b/
src/wm_client.hpp
@@
-42,18
+42,23
@@
class WMClient
WMClient(const std::string &appid, unsigned layer,
unsigned surface, const std::string &role);
WMClient(const std::string &appid, const std::string &role);
WMClient(const std::string &appid, unsigned layer,
unsigned surface, const std::string &role);
WMClient(const std::string &appid, const std::string &role);
- virtual ~WMClient();
+ WMClient(const std::string &appid, unsigned layer, const std::string &role);
+ WMClient(const std::string &appid, unsigned layer,
+ const std::string& layer_name, unsigned surface, const std::string &role);
+ ~WMClient() = default;
std::string appID() const;
unsigned surfaceID(const std::string &role) const;
unsigned layerID() const;
std::string appID() const;
unsigned surfaceID(const std::string &role) const;
unsigned layerID() const;
- const std::string& getWMLayerName();
unsigned surfaceID() const;
std::vector<unsigned> renderOrder() const;
unsigned surfaceID() const;
std::vector<unsigned> renderOrder() const;
+ std::string role(unsigned surface) const;
+ std::string role() const;
const std::vector<std::string> &roles() const;
void setRole(const std::string& role);
const std::vector<std::string> &roles() const;
void setRole(const std::string& role);
- void registerLayer(unsigned layer);
- bool addSurface(const std::string& role, unsigned surface);
+ void appendRole(const std::string& role);
+ //bool addSurface(const std::string& role, unsigned surface);
+ bool addSurface(unsigned surface);
bool removeSurfaceIfExist(unsigned surface);
bool removeRole(const std::string& role);
bool removeSurfaceIfExist(unsigned surface);
bool removeRole(const std::string& role);
@@
-67,17
+72,18
@@
class WMClient
private:
std::string id;
unsigned layer;
private:
std::string id;
unsigned layer;
- std::string
wm_layer_nam
e;
+ std::string
main_rol
e;
std::string area;
unsigned surface; // currently, main application has only one surface.
std::vector<std::string> role_list;
std::vector<unsigned> surface_render_order;
std::unordered_map<std::string, unsigned> service2surfaces;
std::string area;
unsigned surface; // currently, main application has only one surface.
std::vector<std::string> role_list;
std::vector<unsigned> surface_render_order;
std::unordered_map<std::string, unsigned> service2surfaces;
+ std::unordered_map<std::string, unsigned> role2surface;
#if GTEST_ENABLED
// This is for unit test. afb_make_event occurs sig11 if call not in afb-binding
#if GTEST_ENABLED
// This is for unit test. afb_make_event occurs sig11 if call not in afb-binding
- std::unordered_map<std::string, std::string> ev
ent2lis
t;
+ std::unordered_map<std::string, std::string> ev
name2afb_even
t;
#else
#else
- std::unordered_map<std::string, struct afb_event> ev
ent2lis
t;
+ std::unordered_map<std::string, struct afb_event> ev
name2afb_even
t;
#endif
};
} // namespace wm
#endif
};
} // namespace wm