auto layer_id = this->layers.get_layer_id(*surface_id);
if (! layer_id) {
- logdebug("Surface %d has no associated layer!", *surface_id);
return "Surface is not on any layer!";
}
- struct LayoutState &state = **this->layers.get_layout_state(*surface_id);
+ auto o_state = *this->layers.get_layout_state(*surface_id);
- logdebug("state @ %p = { %d, %d, %d }", &state, state.main, state.sub, state.s);
+ if (! o_state) {
+ return "Could not find layer for surface";
+ }
+
+ struct LayoutState &state = *o_state;
// disable layers that are above our current layer
for (auto const &l : this->layers.mapping) {
state.sub = -1;
state.s = LayoutState::Single;
- this->emit_flushdraw(drawing_name);
+ //////this->emit_flushdraw(drawing_name);
+ this->pending_end_draw.push_back(state.main);
} else {
bool can_split = this->can_split(state, *surface_id);
if (state.sub == -1) {
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(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);
state.sub = *surface_id;
+ this->pending_end_draw.push_back(state.main);
+ this->pending_end_draw.push_back(state.sub);
// Should wait for EndDraw event...
- this->emit_flushdraw(drawing_name);
- this->emit_flushdraw(this->lookup_name(state.main)->c_str());
+ //////this->emit_flushdraw(drawing_name);
+ //////this->emit_flushdraw(main.c_str());
}
} else {
this->emit_syncdraw(drawing_name);
state.sub = -1;
state.s = LayoutState::Single;
- this->emit_flushdraw(drawing_name);
+ //////this->emit_flushdraw(drawing_name);
+ this->pending_end_draw.push_back(state.main);
}
}
}
return "Cannot deactivate main_surface";
}
- struct LayoutState &state = **this->layers.get_layout_state(*surface_id);
+ auto o_state = *this->layers.get_layout_state(*surface_id);
+
+ if (! o_state) {
+ return "Could not find layer for surface";
+ }
+
+ struct LayoutState &state = *o_state;
if (state.main == -1) {
return "No surface active";
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 = std::move(*this->lookup_name(state.sub));
+ this->emit_syncdraw(sub.c_str());
this->deactivate(*surface_id);
this->surface_set_layout_full(state.sub);
state.sub = -1;
state.s = LayoutState::Single;
- this->emit_flushdraw(this->lookup_name(state.sub)->c_str());
+ //////this->emit_flushdraw(sub.c_str());
+ this->pending_end_draw.push_back(state.sub);
} 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 = std::move(*this->lookup_name(state.main));
+ this->emit_syncdraw(main.c_str());
this->deactivate(*surface_id);
this->deactivate(*surface_id);
state.sub = -1;
state.s = LayoutState::Single;
- this->emit_flushdraw(this->lookup_name(state.main)->c_str());
+ //////this->emit_flushdraw(main.c_str());
+ this->pending_end_draw.push_back(state.main);
} else {
return "Surface is not active";
}
return nullptr;
}
+char const *App::enddraw(char const *drawing_name) {
+ for (unsigned i = 0, iend = this->pending_end_draw.size(); i < iend; i++) {
+ auto n = this->lookup_name(this->pending_end_draw[i]);
+ if (n && *n == drawing_name) {
+ std::swap(this->pending_end_draw[i], this->pending_end_draw[iend - 1]);
+ this->pending_end_draw.resize(iend - 1);
+ // XXX: Please tell the compositor to thaw the surface...
+ this->emit_flushdraw(drawing_name);
+ return nullptr;
+ }
+ }
+ return "No EndDraw pending for surface";
+}
+
// _ _ _____ _
// _ __ _ __ _____ _(_) ___ __| | | ____|_ _____ _ __ | |_ ___
// | '_ \| '__/ _ \ \/ / |/ _ \/ _` | | _| \ \ / / _ \ '_ \| __/ __|
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->deactivate_surface(drawing_name->c_str());
+ }
+
this->id_alloc.remove_id(surface_id);
}
}
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) {