app/id_alloc: remove destroyed surfaces

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

diff --git a/src/app.cpp b/src/app.cpp
index 779997a..07747b9 100644 (file)
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -28,6 +28,7 @@
 
 #include <json-c/json.h>
 
+#include <algorithm>
 #include <bits/signum.h>
 #include <csignal>
 #include <fstream>
@@ -44,8 +45,7 @@ struct wm::area area_from_json(json const &j) {
    return wm::area{
       j["name"],
       {
-         j["width"], j["height"],
-         j["x"], j["y"],
+         j["width"], j["height"], j["x"], j["y"],
       },
       j["zorder"],
    };
@@ -126,7 +126,10 @@ App::App(wl::display *d)
      outputs(),
      config(),
      layouts(),
-     layers() {
+     layers(),
+     pending(),
+     name_mapping(),
+     id_alloc{} {
    assert(g_app == nullptr);
    g_app = this;
 
@@ -280,8 +283,11 @@ void App::surface_set_layout(uint32_t surface_id) {
    }
 
    uint32_t layer_id = o_layer_id.value();
+   logdebug("surface_set_layout for surface %u on layer %u", surface_id,
+            layer_id);
 
-   auto rect = this->layers.get_layer_rect(surface_id).value();
+   auto const &layer = this->layers.get_layer(layer_id);
+   auto rect = layer.value().rect;
    auto &s = this->controller->surfaces[surface_id];
 
    int x = rect.x;
@@ -297,16 +303,17 @@ void App::surface_set_layout(uint32_t surface_id) {
    if (h < 0) {
       h = this->controller->output_size.h + 1 + h;
    }
-   logdebug("Computed rect={ %d, %d, %d, %d }", x, y, w, h);
 
    // 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(1);
+   // 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 }",
@@ -318,7 +325,7 @@ char const *App::activate_surface(uint32_t surface_id) {
       return "Surface does not exist";
    }
 
-   // This shouild involve a policy check, but as we do not (yet) have
+   // 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
 
@@ -375,6 +382,51 @@ 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) {
+   auto lid = this->layers.get_layer_id(std::string(drawing_name));
+   if (!lid) {
+      // XXX: to we need to put these applications on the App layer?
+      return Err<int>("Drawing name does not match any role");
+   }
+
+   auto rname = this->id_alloc.lookup(drawing_name);
+   if (!rname) {
+      // name does not exist yet, allocate surface id...
+      auto id = int(this->id_alloc.generate_id(drawing_name));
+      this->layers.add_surface(id, lid.value());
+
+      // XXX: you should fix this!
+      if (!this->layers.main_surface_name.empty() &&
+          this->layers.main_surface_name == drawing_name) {
+         this->layers.main_surface = id;
+         this->activate_surface(id);
+         logdebug("Set main_surface id to %u", id);
+      }
+
+      return Ok<int>(id);
+   }
+
+   // Check currently registered drawing names if it is already there.
+   return Err<int>("Surface already present");
+}
+
+char const *App::activate_surface(char const *drawing_name) {
+   auto osid = this->id_alloc.lookup(drawing_name);
+
+   if (osid) {
+      logdebug("ativate surface with name %s and id %u", drawing_name,
+               osid.value());
+      this->activate_surface(osid.value());
+      return nullptr;
+   }
+
+   logerror("surface %s unknown", drawing_name);
+   return "Surface unknown";
 }
 
 //  _     _           _ _                            _   _                 _
@@ -383,18 +435,28 @@ void App::surface_removed(uint32_t surface_id) {
 // | |_) | | | | | (_| | | | | | (_| |  | (_| | |_) | | | | | | | | | |_) | |
 // |_.__/|_|_| |_|\__,_|_|_| |_|\__, |___\__,_| .__/|_| |_|_| |_| |_| .__/|_|
 //                              |___/_____|   |_|                   |_|
-binding_api::result_type binding_api::register_surface(uint32_t appid,
-                                                       uint32_t surfid) {
-   logdebug("%s appid %u surfid %u", __func__, appid, surfid);
-   if (appid > 0xff) {
-      return Err<json_object *>("invalid appid");
+binding_api::result_type binding_api::request_surface(
+   char const *drawing_name) {
+   auto r = this->app->request_surface(drawing_name);
+   if (r.is_err()) {
+      return Err<json_object *>(r.unwrap_err());
    }
+   return Ok(json_object_new_int(r.unwrap()));
+}
 
-   if (surfid > 0xffff) {
-      return Err<json_object *>("invalid surfaceid");
+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 != nullptr) {
+      return Err<json_object *>(r);
    }
+   return Ok(json_object_new_object());
+}
 
-   return Ok(json_object_new_int((appid << 16) + surfid));
+binding_api::result_type binding_api::list_drawing_names() {
+   json j = this->app->id_alloc.names;
+   return Ok(json_tokener_parse(j.dump().c_str()));
 }
 
 binding_api::result_type binding_api::debug_layers() {
@@ -426,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());