app/id_alloc: remove destroyed surfaces

[staging/windowmanager.git] / src / app.cpp

diff --git a/src/app.cpp b/src/app.cpp
index 2fd11dc..07747b9 100644 (file)
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -382,6 +382,9 @@ void App::surface_created(uint32_t surface_id) {
 
 void App::surface_removed(uint32_t surface_id) {
    logdebug("surface_id is %u", surface_id);
+
+   this->add_task("remove surface ID",
+                  [surface_id, this] { this->id_alloc.remove_id(surface_id); });
 }
 
 result<int> App::request_surface(char const *drawing_name) {
@@ -391,10 +394,10 @@ result<int> App::request_surface(char const *drawing_name) {
       return Err<int>("Drawing name does not match any role");
    }
 
-   auto rname = this->id_alloc[drawing_name];
+   auto rname = this->id_alloc.lookup(drawing_name);
    if (!rname) {
       // name does not exist yet, allocate surface id...
-      auto id = int(this->id_alloc(drawing_name));
+      auto id = int(this->id_alloc.generate_id(drawing_name));
       this->layers.add_surface(id, lid.value());
 
       // XXX: you should fix this!
@@ -413,7 +416,7 @@ result<int> App::request_surface(char const *drawing_name) {
 }
 
 char const *App::activate_surface(char const *drawing_name) {
-   auto osid = this->id_alloc[drawing_name];
+   auto osid = this->id_alloc.lookup(drawing_name);
 
    if (osid) {
       logdebug("ativate surface with name %s and id %u", drawing_name,