diff options
Diffstat (limited to 'src/wayland.cpp')
-rw-r--r-- | src/wayland.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/wayland.cpp b/src/wayland.cpp index 7be89c5..c2c5cbe 100644 --- a/src/wayland.cpp +++ b/src/wayland.cpp @@ -198,15 +198,19 @@ constexpr struct ivi_controller_listener listener = { 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{}, screens{}, pending{}, output_size{} { ivi_controller_add_listener(this->proxy, &listener, this); } -controller::~controller() {} +controller::~controller() { +} void controller::layer_create(uint32_t id, int32_t w, int32_t h) { this->layers[id] = std::make_unique<layer>(id, w, h, this); @@ -331,11 +335,13 @@ layer::layer(uint32_t i, int32_t w, int32_t h, struct controller *c) orientation{}, visibility{}, opacity{} { + this->parent->add_proxy_to_id_mapping(this->proxy, i); ivi_controller_layer_add_listener(this->proxy, &layer_listener, this); } layer::~layer() { logdebug("%s layer %i @ %p", __func__, this->id, this->proxy); + this->parent->remove_proxy_to_id_mapping(this->proxy); ivi_controller_layer_destroy(this->proxy, 1); this->proxy = nullptr; } @@ -496,11 +502,13 @@ surface::surface(uint32_t i, struct controller *c) orientation{}, visibility{}, opacity{1.f} { + this->parent->add_proxy_to_id_mapping(this->proxy, i); ivi_controller_surface_add_listener(this->proxy, &surface_listener, this); } surface::~surface() { logdebug("%s surface %i @ %p", __func__, this->id, this->proxy); + this->parent->remove_proxy_to_id_mapping(this->proxy); ivi_controller_surface_destroy(this->proxy, 1); this->proxy = nullptr; } @@ -548,7 +556,8 @@ void controller::surface_pixelformat(uint32_t id, int32_t pixelformat) { void controller::surface_layer(uint32_t id, struct ivi_controller_layer *layer) { - logdebug("genivi::surface %s @ %p l @ %p", __func__, this->proxy, layer); + logdebug("genivi::surface %s @ %p l %u @ %p", __func__, this->proxy, + this->layer_proxy_to_id[uintptr_t(layer)], layer); } void controller::surface_stats(uint32_t id, uint32_t redraw_count, |