app: emit_syncdraw() only after layout commit to compositor

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

diff --git a/src/app.cpp b/src/app.cpp
index 3751fd3..b290248 100644 (file)
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -235,9 +235,7 @@ int App::init_layers() {
    // Add layers to screen (XXX: are they sorted correctly?)
    s->set_render_order(this->layers.layers);
 
-   c->commit_changes();
-
-   this->display->flush();
+   this->layout_commit();
 
    return 0;
 }
@@ -353,6 +351,11 @@ void App::surface_set_layout(int surface_id, optional<int> sub_surface_id) {
             surface_id, layer_id, x, y, w, h);
 }
 
+void App::layout_commit() {
+   this->controller->commit_changes();
+   this->display->flush();
+}
+
 char const *App::api_activate_surface(char const *drawing_name) {
    ST();
    auto const &surface_id = this->lookup_id(drawing_name);
@@ -401,8 +404,7 @@ char const *App::api_activate_surface(char const *drawing_name) {
       l.state.s = LayoutState::Single;
 
       if (flush) {
-         this->controller->commit_changes();
-         this->display->flush();
+         this->layout_commit();
       }
    }
 
@@ -415,14 +417,14 @@ char const *App::api_activate_surface(char const *drawing_name) {
    // XXX: input focus missing!!1
 
    if (state.main == -1) {
-      this->emit_syncdraw(drawing_name);
-
       this->surface_set_layout(*surface_id);
-      this->activate(*surface_id);
+      this->activate(*surface_id);  // XXX do we need to activate after enddraw?
       state.main = *surface_id;
       state.sub = -1;
       state.s = LayoutState::Single;
 
+      this->layout_commit();
+      this->emit_syncdraw(drawing_name);
       this->enqueue_flushdraw(state.main);
    } else {
       bool can_split = this->can_split(state, *surface_id);
@@ -431,19 +433,18 @@ char const *App::api_activate_surface(char const *drawing_name) {
          if (can_split) {
             if (state.main != *surface_id) {
                std::string main = std::move(*this->lookup_name(state.main));
-               this->emit_syncdraw(drawing_name);
-               this->emit_syncdraw(main.c_str());
 
                this->surface_set_layout(state.main, surface_id);
                this->activate(*surface_id);
                state.sub = *surface_id;
 
+               this->layout_commit();
+               this->emit_syncdraw(drawing_name);
+               this->emit_syncdraw(main.c_str());
                this->enqueue_flushdraw(state.main);
                this->enqueue_flushdraw(state.sub);
             }
          } else {
-            this->emit_syncdraw(drawing_name);
-
             this->surface_set_layout(*surface_id);
             this->deactivate(state.main);
             this->activate(*surface_id);
@@ -452,15 +453,13 @@ char const *App::api_activate_surface(char const *drawing_name) {
             state.sub = -1;
             state.s = LayoutState::Single;
 
+            this->layout_commit();
+            this->emit_syncdraw(drawing_name);
             this->enqueue_flushdraw(state.main);
          }
       }
    }
 
-   // commit changes
-   this->controller->commit_changes();
-   this->display->flush();
-
    // no error
    return nullptr;
 }
@@ -489,6 +488,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;
@@ -497,7 +497,6 @@ char const *App::api_deactivate_surface(char const *drawing_name) {
    if (state.main == *surface_id) {
       if (state.sub != -1) {
          std::string sub = std::move(*this->lookup_name(state.sub));
-         this->emit_syncdraw(sub.c_str());
 
          this->deactivate(*surface_id);
          this->surface_set_layout(state.sub);
@@ -505,6 +504,8 @@ char const *App::api_deactivate_surface(char const *drawing_name) {
          state.sub = -1;
          state.s = LayoutState::Single;
 
+         this->layout_commit();
+         this->emit_syncdraw(sub.c_str());
          this->enqueue_flushdraw(state.sub);
       } else {
          this->deactivate(*surface_id);
@@ -512,7 +513,6 @@ char const *App::api_deactivate_surface(char const *drawing_name) {
       }
    } else if (state.sub == *surface_id) {
       std::string main = std::move(*this->lookup_name(state.main));
-      this->emit_syncdraw(main.c_str());
 
       this->deactivate(*surface_id);
       this->deactivate(*surface_id);
@@ -520,14 +520,13 @@ char const *App::api_deactivate_surface(char const *drawing_name) {
       state.sub = -1;
       state.s = LayoutState::Single;
 
+      this->layout_commit();
+      this->emit_syncdraw(main.c_str());
       this->enqueue_flushdraw(state.main);
    } else {
       return "Surface is not active";
    }
 
-   this->controller->commit_changes();
-   this->display->flush();
-
    return nullptr;
 }
 
@@ -569,6 +568,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 +604,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) {