app/id_alloc: remove destroyed surfaces

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

diff --git a/src/app.cpp b/src/app.cpp
index fbeb4fd..07747b9 100644 (file)
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -306,12 +306,14 @@ void App::surface_set_layout(uint32_t surface_id) {
 
    // configure surface to wxh dimensions
    s->set_configuration(w, h);
+   // set source reactangle, even if we should not need to set it.
+   s->set_source_rectangle(0, 0, w, h);
    // set destination to the display rectangle
    s->set_destination_rectangle(x, y, w, h);
 
-   // XXX: visibility should be determined independently of our
-   //      layer + geometry setup.
-   s->set_visibility(surface_id == (unsigned)this->layers.main_surface ? 1 : 0);
+   // XXX: The main_surface will be visible regardless
+   s->set_visibility(
+      surface_id == static_cast<unsigned>(this->layers.main_surface) ? 1 : 0);
    this->controller->layers[layer_id]->add_surface(s.get());
 
    logdebug("Surface %u now on layer %u with rect { %d, %d, %d, %d }",
@@ -380,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) {
@@ -389,15 +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...
-      // XXX: how to allocate surface IDs?
-      // * allocate by running a counter for each layer?
-      // * allocate IDs globally, i.e. do not have layers contain
-      //   ID ranges (only define the surfaces on the layer by
-      //   role?)
-      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!
@@ -416,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,
@@ -448,7 +448,7 @@ binding_api::result_type binding_api::activate_surface(
    char const *drawing_name) {
    logdebug("%s drawing_name %s", __func__, drawing_name);
    auto r = this->app->activate_surface(drawing_name);
-   if (r) {
+   if (r != nullptr) {
       return Err<json_object *>(r);
    }
    return Ok(json_object_new_object());
@@ -488,7 +488,7 @@ binding_api::result_type binding_api::debug_terminate() {
 binding_api::result_type binding_api::demo_activate_surface(
    uint32_t surfaceid) {
    char const *e = this->app->activate_surface(surfaceid);
-   if (e) {
+   if (e != nullptr) {
       return Err<json_object *>(e);
    }
    return Ok(json_object_new_object());