Code Review
/
staging
/
windowmanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Remove remnants of obsolete surface management by their IDs
[staging/windowmanager.git]
/
src
/
app.cpp
diff --git
a/src/app.cpp
b/src/app.cpp
index
3085c61
..
4bd7393
100644
(file)
--- 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) {
// 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);
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?)
}
// 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) {
// 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;
continue;
}
bool flush = false;
- if (l.state.main != -1) {
- this->deactivate(l.state.main);
- l.state.main = -1;
+ if (l.s
econd.s
tate.main != -1) {
+ this->deactivate(l.s
econd.s
tate.main);
+ l.s
econd.s
tate.main = -1;
flush = true;
}
flush = true;
}
- if (l.state.sub != -1) {
- this->deactivate(l.state.sub);
- l.state.sub = -1;
+ if (l.s
econd.s
tate.sub != -1) {
+ this->deactivate(l.s
econd.s
tate.sub);
+ l.s
econd.s
tate.sub = -1;
flush = true;
}
flush = true;
}
@@
-678,7
+677,8
@@
result<int> App::api_request_surface(char const *drawing_name) {
}
void App::activate(int id) {
}
void App::activate(int id) {
- if (this->controller->sprops[id].visibility == 0) {
+ auto ip = this->controller->sprops.find(id);
+ if (ip != this->controller->sprops.end() && ip->second.visibility == 0) {
this->controller->surfaces[id]->set_visibility(1);
char const *label =
this->lookup_name(id).value_or("unknown-name").c_str();
this->controller->surfaces[id]->set_visibility(1);
char const *label =
this->lookup_name(id).value_or("unknown-name").c_str();
@@
-688,7
+688,8
@@
void App::activate(int id) {
}
void App::deactivate(int id) {
}
void App::deactivate(int id) {
- if (this->controller->sprops[id].visibility != 0) {
+ auto ip = this->controller->sprops.find(id);
+ if (ip != this->controller->sprops.end() && ip->second.visibility != 0) {
this->controller->surfaces[id]->set_visibility(0);
char const *label =
this->lookup_name(id).value_or("unknown-name").c_str();
this->controller->surfaces[id]->set_visibility(0);
char const *label =
this->lookup_name(id).value_or("unknown-name").c_str();
@@
-763,4
+764,10
@@
void controller_hooks::surface_removed(uint32_t surface_id) {
this->app->surface_removed(surface_id);
}
this->app->surface_removed(surface_id);
}
+void controller_hooks::surface_visibility(uint32_t surface_id, uint32_t v) {
+}
+
+void controller_hooks::surface_destination_rectangle(uint32_t surface_id, uint32_t x, uint32_t y, uint32_t w, uint32_t h) {
+}
+
} // namespace wm
} // namespace wm