From a414f394e06111d761ca6ac0aa783d59a42c6ea8 Mon Sep 17 00:00:00 2001 From: Marcus Fritzsch Date: Wed, 13 Sep 2017 12:02:42 +0200 Subject: Remove remnants of obsolete surface management by their IDs Signed-off-by: Marcus Fritzsch --- src/app.cpp | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'src/app.cpp') diff --git a/src/app.cpp b/src/app.cpp index 42f6f16..4bd7393 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -222,13 +222,12 @@ int App::init_layers() { // XXX: This likely needs to be sorted by order (note, we don't (yet?) // do any zorder arrangement). for (auto const &i : this->layers.mapping) { - c->layer_create(i.layer_id, o->width, o->height); - auto &l = layers[i.layer_id]; + c->layer_create(i.second.layer_id, o->width, o->height); + auto &l = layers[i.second.layer_id]; l->set_destination_rectangle(0, 0, o->width, o->height); l->set_visibility(1); - logdebug( - "Setting up layer %s (%d) for surfaces %d-%d and role match \"%s\"", - i.name.c_str(), i.layer_id, i.id_min, i.id_max, i.role.c_str()); + logdebug("Setting up layer %s (%d) for surface role match \"%s\"", + i.second.name.c_str(), i.second.layer_id, i.second.role.c_str()); } // Add layers to screen (XXX: are they sorted correctly?) @@ -385,20 +384,20 @@ char const *App::api_activate_surface(char const *drawing_name) { // disable layers that are above our current layer for (auto const &l : this->layers.mapping) { - if (l.layer_id <= *layer_id) { + if (l.second.layer_id <= *layer_id) { continue; } bool flush = false; - if (l.state.main != -1) { - this->deactivate(l.state.main); - l.state.main = -1; + if (l.second.state.main != -1) { + this->deactivate(l.second.state.main); + l.second.state.main = -1; flush = true; } - if (l.state.sub != -1) { - this->deactivate(l.state.sub); - l.state.sub = -1; + if (l.second.state.sub != -1) { + this->deactivate(l.second.state.sub); + l.second.state.sub = -1; flush = true; } -- cgit 1.2.3-korg