diff options
| author |   Marcus Fritzsch <marcus_fritzsch@mentor.com> | 2017-06-27 08:55:18 +0200 |
|---|---|---|
| committer | Marcus Fritzsch <marcus_fritzsch@mentor.com> | 2017-08-08 17:24:00 +0200 |
| commit | 88666c08dd76d09596aa9906f39d466c45d5979e (patch) | |
| tree | 55a9766d7d7cbaa4d0f31c9a8438b6bd769ba9b8 | |
| parent | 5a905147d566e62ceafd8f885143a49e2866947e (diff) | |
wayland: simpler layout for controller::proxy_to_id maps
Signed-off-by: Marcus Fritzsch <marcus_fritzsch@mentor.com>
| -rw-r--r-- | src/wayland.cpp | 5 | ||||
| -rw-r--r-- | src/wayland.hpp | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/wayland.cpp b/src/wayland.cpp index 4678661..af28edf 100644 --- a/src/wayland.cpp +++ b/src/wayland.cpp @@ -205,10 +205,10 @@ controller::controller(struct wl_registry *r, uint32_t name, uint32_t version) : wayland_proxy( wl_registry_bind(r, name, &ivi_controller_interface, version)), surface_proxy_to_id{}, - surfaces{}, layer_proxy_to_id{}, - layers{}, screen_proxy_to_id{}, + surfaces{}, + layers{}, screens{}, pending{}, output_size{} { @@ -721,6 +721,7 @@ void controller::execute_pending() { // XXX: No flush here... } } + // // ___ ___ _ __ ___ ___ _ __ // / __|/ __| '__/ _ \/ _ \ '_ \ diff --git a/src/wayland.hpp b/src/wayland.hpp index 79dd7ae..60a045b 100644 --- a/src/wayland.hpp +++ b/src/wayland.hpp @@ -221,10 +221,11 @@ struct screen : public wayland_proxy<struct ivi_controller_screen>, // struct controller : public wayland_proxy<struct ivi_controller> { std::unordered_map<uintptr_t, uint32_t> surface_proxy_to_id; - std::unordered_map<uint32_t, std::unique_ptr<struct surface>> surfaces; std::unordered_map<uintptr_t, uint32_t> layer_proxy_to_id; - std::unordered_map<uint32_t, std::unique_ptr<struct layer>> layers; std::unordered_map<uintptr_t, uint32_t> screen_proxy_to_id; + + std::unordered_map<uint32_t, std::unique_ptr<struct surface>> surfaces; + std::unordered_map<uint32_t, std::unique_ptr<struct layer>> layers; std::unordered_map<uint32_t, std::unique_ptr<struct screen>> screens; typedef std::pair<char const *, std::function<void(struct controller *)>> |