int w = rect.w;
int h = rect.h;
- this->state.main = surface_id;
- this->state.sub = sub_surface_id;
- this->state.s = LayoutState::Split;
-
// less-than-0 values refer to MAX + 1 - $VALUE
// e.g. MAX is either screen width or height
if (w < 0) {
return "Surface does not exist in controller!";
}
- if (this->state.main == *surface_id || this->state.sub == *surface_id) {
- return "Surface already active";
+ auto layer_id = this->layers.get_layer_id(*surface_id);
+
+ if (! layer_id) {
+ return "Surface is not on any layer!";
}
- // Special case main_surface
- if (*surface_id == this->layers.main_surface) {
- for (auto const &s: this->controller->surfaces) {
- if (s.second->id != *surface_id) {
- this->deactivate(s.second->id);
- }
+ 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) {
+ continue;
+ }
+
+ bool flush = false;
+ if (l.state.main != -1) {
+ this->deactivate(l.state.main);
+ l.state.main = -1;
+ flush = true;
+ }
+
+ if (l.state.sub != -1) {
+ this->deactivate(l.state.sub);
+ l.state.sub = -1;
+ flush = true;
+ }
+
+ l.state.s = LayoutState::Single;
+
+ if (flush) {
+ this->controller->commit_changes();
+ this->display->flush();
}
- this->activate(*surface_id);
- this->state.main = this->state.sub = -1;
- this->state.s = LayoutState::Single;
- // commit changes
- this->controller->commit_changes();
- this->display->flush();
- return nullptr;
+ }
+
+ if (state.main == *surface_id || state.sub == *surface_id) {
+ return "Surface already active";
}
// This should involve a policy check, but as we do not (yet) have
// such a thing, we will just switch to this surface.
// XXX: input focus missing!!1
- if (this->state.main == -1) {
+ if (state.main == -1) {
this->emit_syncdraw(drawing_name);
this->surface_set_layout_full(*surface_id);
this->activate(*surface_id);
- this->state.main = *surface_id;
- this->state.sub = -1;
- this->state.s = LayoutState::Single;
+ state.main = *surface_id;
+ state.sub = -1;
+ state.s = LayoutState::Single;
this->emit_flushdraw(drawing_name);
} else {
- bool can_split = this->can_split(*surface_id);
+ bool can_split = this->can_split(state, *surface_id);
- if (this->state.sub == -1) {
+ if (state.sub == -1) {
if (can_split) {
- if (this->state.main != *surface_id) {
+ if (state.main != *surface_id) {
+ std::string main = *this->lookup_name(state.main);
this->emit_syncdraw(drawing_name);
- this->emit_syncdraw(this->lookup_name(this->state.main)->c_str());
+ this->emit_syncdraw(main.c_str());
- this->surface_set_layout_split(this->state.main, *surface_id);
+ this->surface_set_layout_split(state.main, *surface_id);
this->activate(*surface_id);
- this->state.sub = *surface_id;
+ state.sub = *surface_id;
// Should wait for EndDraw event...
this->emit_flushdraw(drawing_name);
- this->emit_flushdraw(this->lookup_name(this->state.main)->c_str());
+ this->emit_flushdraw(main.c_str());
}
} else {
this->emit_syncdraw(drawing_name);
this->surface_set_layout_full(*surface_id);
- this->deactivate(this->state.main);
+ this->deactivate(state.main);
this->activate(*surface_id);
- this->deactivate(this->state.sub);
- this->state.main = *surface_id;
- this->state.sub = -1;
- this->state.s = LayoutState::Single;
+ this->deactivate(state.sub);
+ state.main = *surface_id;
+ state.sub = -1;
+ state.s = LayoutState::Single;
this->emit_flushdraw(drawing_name);
}
return "Cannot deactivate main_surface";
}
- if (this->state.main == -1) {
+ 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;
}
- if (this->state.main == *surface_id) {
- if (this->state.sub != -1) {
- this->emit_syncdraw(this->lookup_name(this->state.sub)->c_str());
+ if (state.main == *surface_id) {
+ if (state.sub != -1) {
+ std::string sub = *this->lookup_name(state.sub);
+ this->emit_syncdraw(sub.c_str());
this->deactivate(*surface_id);
- this->surface_set_layout_full(this->state.sub);
- this->state.main = this->state.sub;
- this->state.sub = -1;
- this->state.s = LayoutState::Single;
+ this->surface_set_layout_full(state.sub);
+ state.main = state.sub;
+ state.sub = -1;
+ state.s = LayoutState::Single;
- this->emit_flushdraw(this->lookup_name(this->state.sub)->c_str());
+ this->emit_flushdraw(sub.c_str());
} else {
this->deactivate(*surface_id);
- this->state.main = -1;
+ state.main = -1;
}
- }else if (this->state.sub == *surface_id) {
- this->emit_syncdraw(this->lookup_name(this->state.main)->c_str());
+ }else if (state.sub == *surface_id) {
+ std::string main = *this->lookup_name(state.main);
+ this->emit_syncdraw(main.c_str());
this->deactivate(*surface_id);
this->deactivate(*surface_id);
- this->surface_set_layout_full(this->state.main);
- this->state.sub = -1;
- this->state.s = LayoutState::Single;
+ this->surface_set_layout_full(state.main);
+ state.sub = -1;
+ state.s = LayoutState::Single;
- this->emit_flushdraw(this->lookup_name(this->state.main)->c_str());
+ this->emit_flushdraw(main.c_str());
} else {
return "Surface is not active";
}
// |_|
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());
}
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) {
}
}
-bool App::can_split(int new_id) {
- if (this->state.main != -1 && this->state.main != new_id) {
+bool App::can_split(struct LayoutState const &state, int new_id) {
+ if (state.main != -1 && state.main != new_id) {
auto new_id_layer = this->layers.get_layer_id(new_id).value();
auto current_id_layer =
- this->layers.get_layer_id(this->state.main).value();
+ this->layers.get_layer_id(state.main).value();
// surfaces are on separate layers, don't bother.
if (new_id_layer != current_id_layer) {
std::string const &new_id_str = this->lookup_name(new_id).value();
std::string const &cur_id_str =
- this->lookup_name(this->state.main).value();
+ this->lookup_name(state.main).value();
auto const &layer = this->layers.get_layer(new_id_layer);
Code Review / staging / windowmanager.git / blobdiff