X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fapp.cpp;h=b29024888d0bea1d16f5e15e83e53032dfd5a252;hb=6946f6008999f9aaffdbc3043afbfe17fe04fc49;hp=9b6486ab0b37722c836b5d3e50000df2e9c60c46;hpb=260b142249baa6cbd9147473384d40f83f7db61e;p=staging%2Fwindowmanager.git diff --git a/src/app.cpp b/src/app.cpp index 9b6486a..b290248 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -417,8 +417,6 @@ char const *App::api_activate_surface(char const *drawing_name) { // XXX: input focus missing!!1 if (state.main == -1) { - this->emit_syncdraw(drawing_name); - this->surface_set_layout(*surface_id); this->activate(*surface_id); // XXX do we need to activate after enddraw? state.main = *surface_id; @@ -426,6 +424,7 @@ char const *App::api_activate_surface(char const *drawing_name) { state.s = LayoutState::Single; this->layout_commit(); + this->emit_syncdraw(drawing_name); this->enqueue_flushdraw(state.main); } else { bool can_split = this->can_split(state, *surface_id); @@ -434,20 +433,18 @@ char const *App::api_activate_surface(char const *drawing_name) { if (can_split) { if (state.main != *surface_id) { std::string main = std::move(*this->lookup_name(state.main)); - this->emit_syncdraw(drawing_name); - this->emit_syncdraw(main.c_str()); this->surface_set_layout(state.main, surface_id); this->activate(*surface_id); state.sub = *surface_id; this->layout_commit(); + this->emit_syncdraw(drawing_name); + this->emit_syncdraw(main.c_str()); this->enqueue_flushdraw(state.main); this->enqueue_flushdraw(state.sub); } } else { - this->emit_syncdraw(drawing_name); - this->surface_set_layout(*surface_id); this->deactivate(state.main); this->activate(*surface_id); @@ -457,6 +454,7 @@ char const *App::api_activate_surface(char const *drawing_name) { state.s = LayoutState::Single; this->layout_commit(); + this->emit_syncdraw(drawing_name); this->enqueue_flushdraw(state.main); } } @@ -490,6 +488,7 @@ char const *App::api_deactivate_surface(char const *drawing_name) { return "No surface active"; } + // XXX: check against main_surface, main_surface_name is the configuration item. if (*surface_id == this->layers.main_surface) { logdebug("Refusing to deactivate main_surface %d", *surface_id); return nullptr; @@ -498,7 +497,6 @@ char const *App::api_deactivate_surface(char const *drawing_name) { if (state.main == *surface_id) { if (state.sub != -1) { std::string sub = std::move(*this->lookup_name(state.sub)); - this->emit_syncdraw(sub.c_str()); this->deactivate(*surface_id); this->surface_set_layout(state.sub); @@ -507,6 +505,7 @@ char const *App::api_deactivate_surface(char const *drawing_name) { state.s = LayoutState::Single; this->layout_commit(); + this->emit_syncdraw(sub.c_str()); this->enqueue_flushdraw(state.sub); } else { this->deactivate(*surface_id); @@ -514,7 +513,6 @@ char const *App::api_deactivate_surface(char const *drawing_name) { } } else if (state.sub == *surface_id) { std::string main = std::move(*this->lookup_name(state.main)); - this->emit_syncdraw(main.c_str()); this->deactivate(*surface_id); this->deactivate(*surface_id); @@ -523,6 +521,7 @@ char const *App::api_deactivate_surface(char const *drawing_name) { state.s = LayoutState::Single; this->layout_commit(); + this->emit_syncdraw(main.c_str()); this->enqueue_flushdraw(state.main); } else { return "Surface is not active"; @@ -569,6 +568,11 @@ void App::api_ping() { this->dispatch_pending_events(); } +void App::deactivate_main_surface() { + this->layers.main_surface = -1; + this->api_deactivate_surface(this->layers.main_surface_name.c_str()); +} + // _ _ _____ _ // _ __ _ __ _____ _(_) ___ __| | | ____|_ _____ _ __ | |_ ___ // | '_ \| '__/ _ \ \/ / |/ _ \/ _` | | _| \ \ / / _ \ '_ \| __/ __| @@ -600,12 +604,19 @@ void App::surface_created(uint32_t surface_id) { void App::surface_removed(uint32_t surface_id) { logdebug("surface_id is %u", surface_id); - auto drawing_name = this->lookup_name(surface_id); - if (drawing_name) { - this->api_deactivate_surface(drawing_name->c_str()); + // We cannot normally deactivate the main_surface, so be explicit + // about it: + if (int(surface_id) == this->layers.main_surface) { + this->deactivate_main_surface(); + } else { + auto drawing_name = this->lookup_name(surface_id); + if (drawing_name) { + this->api_deactivate_surface(drawing_name->c_str()); + } } this->id_alloc.remove_id(surface_id); + this->layers.remove_surface(surface_id); } void App::emit_activated(char const *label) {