summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/wayland.cpp5
-rw-r--r--src/wayland.hpp5
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 *)>>