X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fapp.cpp;h=ee027172cfc34b9553387676e131c0c8ebf57645;hb=83b9b4e86d1193d820dfd67a3c0e1cbe0c29bb17;hp=59b762d39d9c5e750ab5b875dd6688a46f5adc4c;hpb=65542e2498c33d534a9ab8037c3e0f1b263a6077;p=staging%2Fwindowmanager.git

diff --git a/src/app.cpp b/src/app.cpp
index 59b762d..ee02717 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -392,7 +392,13 @@ char const *App::activate_surface(char const *drawing_name) {
       return "Surface is not on any layer!";
    }
 
-   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;
 
    // disable layers that are above our current layer
    for (auto const &l : this->layers.mapping) {
@@ -438,14 +444,15 @@ char const *App::activate_surface(char const *drawing_name) {
       state.sub = -1;
       state.s = LayoutState::Single;
 
-      this->emit_flushdraw(drawing_name);
+      //////this->emit_flushdraw(drawing_name);
+      this->pending_end_draw.push_back(state.main);
    } else {
       bool can_split = this->can_split(state, *surface_id);
 
       if (state.sub == -1) {
          if (can_split) {
             if (state.main != *surface_id) {
-               std::string main = *this->lookup_name(state.main);
+               std::string main = std::move(*this->lookup_name(state.main));
                this->emit_syncdraw(drawing_name);
                this->emit_syncdraw(main.c_str());
 
@@ -453,9 +460,11 @@ char const *App::activate_surface(char const *drawing_name) {
                this->activate(*surface_id);
                state.sub = *surface_id;
 
+               this->pending_end_draw.push_back(state.main);
+               this->pending_end_draw.push_back(state.sub);
                // Should wait for EndDraw event...
-               this->emit_flushdraw(drawing_name);
-               this->emit_flushdraw(main.c_str());
+               //////this->emit_flushdraw(drawing_name);
+               //////this->emit_flushdraw(main.c_str());
             }
          } else {
             this->emit_syncdraw(drawing_name);
@@ -468,7 +477,8 @@ char const *App::activate_surface(char const *drawing_name) {
             state.sub = -1;
             state.s = LayoutState::Single;
 
-            this->emit_flushdraw(drawing_name);
+            //////this->emit_flushdraw(drawing_name);
+            this->pending_end_draw.push_back(state.main);
          }
       }
    }
@@ -493,7 +503,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";
@@ -506,7 +522,7 @@ char const *App::deactivate_surface(char const *drawing_name) {
 
    if (state.main == *surface_id) {
       if (state.sub != -1) {
-         std::string sub = *this->lookup_name(state.sub);
+         std::string sub = std::move(*this->lookup_name(state.sub));
          this->emit_syncdraw(sub.c_str());
 
          this->deactivate(*surface_id);
@@ -515,13 +531,14 @@ char const *App::deactivate_surface(char const *drawing_name) {
          state.sub = -1;
          state.s = LayoutState::Single;
 
-         this->emit_flushdraw(sub.c_str());
+         //////this->emit_flushdraw(sub.c_str());
+         this->pending_end_draw.push_back(state.sub);
       } else {
          this->deactivate(*surface_id);
          state.main = -1;
       }
    }else if (state.sub == *surface_id) {
-      std::string main = *this->lookup_name(state.main);
+      std::string main = std::move(*this->lookup_name(state.main));
       this->emit_syncdraw(main.c_str());
 
       this->deactivate(*surface_id);
@@ -530,7 +547,8 @@ char const *App::deactivate_surface(char const *drawing_name) {
       state.sub = -1;
       state.s = LayoutState::Single;
 
-      this->emit_flushdraw(main.c_str());
+      //////this->emit_flushdraw(main.c_str());
+      this->pending_end_draw.push_back(state.main);
    } else {
       return "Surface is not active";
    }
@@ -541,6 +559,20 @@ char const *App::deactivate_surface(char const *drawing_name) {
    return nullptr;
 }
 
+char const *App::enddraw(char const *drawing_name) {
+   for (unsigned i = 0, iend = this->pending_end_draw.size(); i < iend; i++) {
+      auto n = this->lookup_name(this->pending_end_draw[i]);
+      if (n && *n == drawing_name) {
+         std::swap(this->pending_end_draw[i], this->pending_end_draw[iend - 1]);
+         this->pending_end_draw.resize(iend - 1);
+         // XXX: Please tell the compositor to thaw the surface...
+         this->emit_flushdraw(drawing_name);
+         return nullptr;
+      }
+   }
+   return "No EndDraw pending for surface";
+}
+
 //                      _          _   _____                 _
 //  _ __  _ __ _____  _(_) ___  __| | | ____|_   _____ _ __ | |_ ___
 // | '_ \| '__/ _ \ \/ / |/ _ \/ _` | |  _| \ \ / / _ \ '_ \| __/ __|
@@ -571,6 +603,11 @@ 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->deactivate_surface(drawing_name->c_str());
+   }
+
    this->id_alloc.remove_id(surface_id);
 }