X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fapp.cpp;h=59b762d39d9c5e750ab5b875dd6688a46f5adc4c;hb=65542e2498c33d534a9ab8037c3e0f1b263a6077;hp=c0cb1008747115013270ddb48a100a975490e129;hpb=7da386db79a2f10ce0a357a76001638ff3310b70;p=staging%2Fwindowmanager.git diff --git a/src/app.cpp b/src/app.cpp index c0cb100..59b762d 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -386,14 +386,17 @@ char const *App::activate_surface(char const *drawing_name) { return "Surface does not exist in controller!"; } - auto layer_id = *this->layers.get_layer_id(*surface_id); - struct LayoutState &state = **this->layers.get_layout_state(*surface_id); + auto layer_id = this->layers.get_layer_id(*surface_id); - logdebug("state @ %p = { %d, %d, %d }", &state, state.main, state.sub, state.s); + if (! layer_id) { + return "Surface is not on any layer!"; + } + + struct LayoutState &state = **this->layers.get_layout_state(*surface_id); // disable layers that are above our current layer for (auto const &l : this->layers.mapping) { - if (l.layer_id <= layer_id) { + if (l.layer_id <= *layer_id) { continue; } @@ -442,8 +445,9 @@ char const *App::activate_surface(char const *drawing_name) { if (state.sub == -1) { if (can_split) { if (state.main != *surface_id) { + std::string main = *this->lookup_name(state.main); this->emit_syncdraw(drawing_name); - this->emit_syncdraw(this->lookup_name(state.main)->c_str()); + this->emit_syncdraw(main.c_str()); this->surface_set_layout_split(state.main, *surface_id); this->activate(*surface_id); @@ -451,7 +455,7 @@ char const *App::activate_surface(char const *drawing_name) { // Should wait for EndDraw event... this->emit_flushdraw(drawing_name); - this->emit_flushdraw(this->lookup_name(state.main)->c_str()); + this->emit_flushdraw(main.c_str()); } } else { this->emit_syncdraw(drawing_name); @@ -500,11 +504,10 @@ char const *App::deactivate_surface(char const *drawing_name) { return nullptr; } - logdebug("state @ %p = { %d, %d, %d }", &state, state.main, state.sub, state.s); - if (state.main == *surface_id) { if (state.sub != -1) { - this->emit_syncdraw(this->lookup_name(state.sub)->c_str()); + std::string sub = *this->lookup_name(state.sub); + this->emit_syncdraw(sub.c_str()); this->deactivate(*surface_id); this->surface_set_layout_full(state.sub); @@ -512,13 +515,14 @@ char const *App::deactivate_surface(char const *drawing_name) { state.sub = -1; state.s = LayoutState::Single; - this->emit_flushdraw(this->lookup_name(state.sub)->c_str()); + this->emit_flushdraw(sub.c_str()); } else { this->deactivate(*surface_id); state.main = -1; } }else if (state.sub == *surface_id) { - this->emit_syncdraw(this->lookup_name(state.main)->c_str()); + std::string main = *this->lookup_name(state.main); + this->emit_syncdraw(main.c_str()); this->deactivate(*surface_id); this->deactivate(*surface_id); @@ -526,7 +530,7 @@ char const *App::deactivate_surface(char const *drawing_name) { state.sub = -1; state.s = LayoutState::Single; - this->emit_flushdraw(this->lookup_name(state.main)->c_str()); + this->emit_flushdraw(main.c_str()); } else { return "Surface is not active"; } @@ -545,7 +549,12 @@ char const *App::deactivate_surface(char const *drawing_name) { // |_| void App::surface_created(uint32_t surface_id) { auto layer_id = this->layers.get_layer_id(surface_id); - logdebug("surface_id is %u, layer_id is %u", surface_id, layer_id ? *layer_id : -1u); + if (! layer_id) { + logdebug("Newly created surfce %d is not associated with any layer!", surface_id); + return; + } + + logdebug("surface_id is %u, layer_id is %u", surface_id, *layer_id); this->controller->layers[*layer_id] ->add_surface(this->controller->surfaces[surface_id].get()); @@ -578,7 +587,7 @@ void App::emit_syncdraw(char const *label) { } void App::emit_flushdraw(char const *label) { - this->api.send_event("syncdraw", label); + this->api.send_event("flushdraw", label); } void App::emit_visible(char const *label, bool is_visible) {