// 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;
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);
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);
state.s = LayoutState::Single;
this->layout_commit();
+ this->emit_syncdraw(drawing_name);
this->enqueue_flushdraw(state.main);
}
}
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;
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);
state.s = LayoutState::Single;
this->layout_commit();
+ this->emit_syncdraw(sub.c_str());
this->enqueue_flushdraw(state.sub);
} else {
this->deactivate(*surface_id);
}
} 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);
state.s = LayoutState::Single;
this->layout_commit();
+ this->emit_syncdraw(main.c_str());
this->enqueue_flushdraw(state.main);
} else {
return "Surface is not active";
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());
+}
+
// _ _ _____ _
// _ __ _ __ _____ _(_) ___ __| | | ____|_ _____ _ __ | |_ ___
// | '_ \| '__/ _ \ \/ / |/ _ \/ _` | | _| \ \ / / _ \ '_ \| __/ __|
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) {