App: be more thorough when checking surface-associated LayoutState

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

diff --git a/src/app.cpp b/src/app.cpp
index c0cb100..6708706 100644 (file)
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -386,14 +386,17 @@ char const *App::activate_surface(char const *drawing_name) {
       return "Surface does not exist in controller!";
    }
 
-   auto layer_id = *this->layers.get_layer_id(*surface_id);
-   struct LayoutState &state = **this->layers.get_layout_state(*surface_id);
+   auto layer_id = this->layers.get_layer_id(*surface_id);
+
+   if (! layer_id) {
+      return "Surface is not on any layer!";
+   }
 
-   logdebug("state @ %p = { %d, %d, %d }", &state, state.main, state.sub, state.s);
+   struct LayoutState &state = **this->layers.get_layout_state(*surface_id);
 
    // disable layers that are above our current layer
    for (auto const &l : this->layers.mapping) {
-      if (l.layer_id <= layer_id) {
+      if (l.layer_id <= *layer_id) {
          continue;
       }
 
@@ -442,8 +445,9 @@ char const *App::activate_surface(char const *drawing_name) {
       if (state.sub == -1) {
          if (can_split) {
             if (state.main != *surface_id) {
+               std::string main = *this->lookup_name(state.main);
                this->emit_syncdraw(drawing_name);
-               this->emit_syncdraw(this->lookup_name(state.main)->c_str());
+               this->emit_syncdraw(main.c_str());
 
                this->surface_set_layout_split(state.main, *surface_id);
                this->activate(*surface_id);
@@ -451,7 +455,7 @@ char const *App::activate_surface(char const *drawing_name) {
 
                // Should wait for EndDraw event...
                this->emit_flushdraw(drawing_name);
-               this->emit_flushdraw(this->lookup_name(state.main)->c_str());
+               this->emit_flushdraw(main.c_str());
             }
          } else {
             this->emit_syncdraw(drawing_name);
@@ -489,7 +493,13 @@ char const *App::deactivate_surface(char const *drawing_name) {
       return "Cannot deactivate main_surface";
    }
 
-   struct LayoutState &state = **this->layers.get_layout_state(*surface_id);
+   auto o_state = *this->layers.get_layout_state(*surface_id);
+
+   if (! o_state) {
+      return "Could not find layer for surface";
+   }
+
+   struct LayoutState &state = *o_state;
 
    if (state.main == -1) {
       return "No surface active";
@@ -500,11 +510,10 @@ char const *App::deactivate_surface(char const *drawing_name) {
       return nullptr;
    }
 
-   logdebug("state @ %p = { %d, %d, %d }", &state, state.main, state.sub, state.s);
-
    if (state.main == *surface_id) {
       if (state.sub != -1) {
-         this->emit_syncdraw(this->lookup_name(state.sub)->c_str());
+         std::string sub = *this->lookup_name(state.sub);
+         this->emit_syncdraw(sub.c_str());
 
          this->deactivate(*surface_id);
          this->surface_set_layout_full(state.sub);
@@ -512,13 +521,14 @@ char const *App::deactivate_surface(char const *drawing_name) {
          state.sub = -1;
          state.s = LayoutState::Single;
 
-         this->emit_flushdraw(this->lookup_name(state.sub)->c_str());
+         this->emit_flushdraw(sub.c_str());
       } else {
          this->deactivate(*surface_id);
          state.main = -1;
       }
    }else if (state.sub == *surface_id) {
-      this->emit_syncdraw(this->lookup_name(state.main)->c_str());
+      std::string main = *this->lookup_name(state.main);
+      this->emit_syncdraw(main.c_str());
 
       this->deactivate(*surface_id);
       this->deactivate(*surface_id);
@@ -526,7 +536,7 @@ char const *App::deactivate_surface(char const *drawing_name) {
       state.sub = -1;
       state.s = LayoutState::Single;
 
-      this->emit_flushdraw(this->lookup_name(state.main)->c_str());
+      this->emit_flushdraw(main.c_str());
    } else {
       return "Surface is not active";
    }
@@ -545,7 +555,12 @@ char const *App::deactivate_surface(char const *drawing_name) {
 // |_|
 void App::surface_created(uint32_t surface_id) {
    auto layer_id = this->layers.get_layer_id(surface_id);
-   logdebug("surface_id is %u, layer_id is %u", surface_id, layer_id ? *layer_id : -1u);
+   if (! layer_id) {
+      logdebug("Newly created surfce %d is not associated with any layer!", surface_id);
+      return;
+   }
+
+   logdebug("surface_id is %u, layer_id is %u", surface_id, *layer_id);
 
    this->controller->layers[*layer_id]
            ->add_surface(this->controller->surfaces[surface_id].get());
@@ -578,7 +593,7 @@ void App::emit_syncdraw(char const *label) {
 }
 
 void App::emit_flushdraw(char const *label) {
-   this->api.send_event("syncdraw", label);
+   this->api.send_event("flushdraw", label);
 }
 
 void App::emit_visible(char const *label, bool is_visible) {