// set source reactangle, even if we should not need to set it.
ss->set_source_rectangle(0, 0, w, h);
// set destination to the display rectangle
- ss->set_destination_rectangle(x+x_off, y+y_off, w, h);
+ ss->set_destination_rectangle(x + x_off, y + y_off, w, h);
- //redraw_fix(this, s, x, y, w, h);
- //redraw_fix(this, ss, x+x_off, y+y_off, w, h);
+ // redraw_fix(this, s, x, y, w, h);
+ // redraw_fix(this, ss, x+x_off, y+y_off, w, h);
logdebug("Surface %u now on layer %u with rect { %d, %d, %d, %d }",
surface_id, layer_id, x, y, w, h);
}
-char const *App::activate_surface(char const *drawing_name) {
+char const *App::api_activate_surface(char const *drawing_name) {
ST();
auto const &surface_id = this->lookup_id(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);
+
+ if (! layer_id) {
+ return "Surface is not on any layer!";
+ }
+
+ auto o_state = *this->layers.get_layout_state(*surface_id);
+
+ if (! o_state) {
+ return "Could not find layer for surface";
+ }
- logdebug("state @ %p = { %d, %d, %d }", &state, state.main, state.sub, state.s);
+ struct LayoutState &state = *o_state;
// 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;
}
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 nullptr;
}
-char const *App::deactivate_surface(char const *drawing_name) {
+char const *App::api_deactivate_surface(char const *drawing_name) {
ST();
auto const &surface_id = this->lookup_id(drawing_name);
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::api_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_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());
if (surface_id == static_cast<unsigned>(this->layers.main_surface)) {
logdebug("Activating main_surface (%d)", surface_id);
- this->activate_surface(
- this->lookup_name(surface_id).value_or("unknown-name").c_str());
+ this->api_activate_surface(
+ this->lookup_name(surface_id).value_or("unknown-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());
+ }
+
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) {
this->api.send_event(is_visible ? "visible" : "invisible", label);
}
-void App::emit_invisible(char const *label) { return emit_visible(label, false); }
+void App::emit_invisible(char const *label) {
+ return emit_visible(label, false);
+}
void App::emit_visible(char const *label) { return emit_visible(label, true); }
-result<int> App::request_surface(char const *drawing_name) {
+result<int> App::api_request_surface(char const *drawing_name) {
auto lid = this->layers.get_layer_id(std::string(drawing_name));
if (!lid) {
// XXX: to we need to put these applications on the App layer?
Code Review / staging / windowmanager.git / blobdiff