layers/app: properly remove surfs, deactivate main_surface

Signed-off-by: Marcus Fritzsch <marcus_fritzsch@mentor.com>

3 files changed, 21 insertions, 3 deletions

diff --git a/src/app.cpp b/src/app.cpp
index 9b6486a..8208e8b 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -490,6 +490,7 @@ char const *App::api_deactivate_surface(char const *drawing_name) {
       return "No surface active";
    }
 
+   // XXX: check against main_surface, main_surface_name is the configuration item.
    if (*surface_id == this->layers.main_surface) {
       logdebug("Refusing to deactivate main_surface %d", *surface_id);
       return nullptr;
@@ -569,6 +570,11 @@ void App::api_ping() {
    this->dispatch_pending_events();
 }
 
+void App::deactivate_main_surface() {
+   this->layers.main_surface = -1;
+   this->api_deactivate_surface(this->layers.main_surface_name.c_str());
+}
+
 //                      _          _   _____                 _
 //  _ __  _ __ _____  _(_) ___  __| | | ____|_   _____ _ __ | |_ ___
 // | '_ \| '__/ _ \ \/ / |/ _ \/ _` | |  _| \ \ / / _ \ '_ \| __/ __|
@@ -600,12 +606,19 @@ void App::surface_created(uint32_t surface_id) {
 void App::surface_removed(uint32_t surface_id) {
    logdebug("surface_id is %u", surface_id);
 
-   auto drawing_name = this->lookup_name(surface_id);
-   if (drawing_name) {
-      this->api_deactivate_surface(drawing_name->c_str());
+   // We cannot normally deactivate the main_surface, so be explicit
+   // about it:
+   if (int(surface_id) == this->layers.main_surface) {
+      this->deactivate_main_surface();
+   } else {
+      auto drawing_name = this->lookup_name(surface_id);
+      if (drawing_name) {
+         this->api_deactivate_surface(drawing_name->c_str());
+      }
    }
 
    this->id_alloc.remove_id(surface_id);
+   this->layers.remove_surface(surface_id);
 }
 
 void App::emit_activated(char const *label) {
diff --git a/src/app.hpp b/src/app.hpp
index 3319081..71bc2c2 100644
--- a/src/app.hpp
+++ b/src/app.hpp
@@ -176,6 +176,7 @@ private:
 
    void activate(int id);
    void deactivate(int id);
+   void deactivate_main_surface();
 
    bool can_split(struct LayoutState const &state, int new_id);
 };
diff --git a/src/layers.hpp b/src/layers.hpp
index ada7344..b20d356 100644
--- a/src/layers.hpp
+++ b/src/layers.hpp
@@ -114,6 +114,10 @@ struct layer_map {
       this->surfaces[surface_id] = layer_id;
    }
 
+   void remove_surface(int surface_id) {
+      this->surfaces.erase(surface_id);
+   }
+
    json to_json() const;
 };