App: rename api call implementations to api_*

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

diff --git a/src/app.cpp b/src/app.cpp
index 596391c..da149b9 100644 (file)
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -365,16 +365,16 @@ void App::surface_set_layout_split(uint32_t surface_id, uint32_t sub_surface_id)
    // set source reactangle, even if we should not need to set it.
    ss->set_source_rectangle(0, 0, w, h);
    // set destination to the display rectangle
-   ss->set_destination_rectangle(x+x_off, y+y_off, w, h);
+   ss->set_destination_rectangle(x + x_off, y + y_off, w, h);
 
-   //redraw_fix(this, s, x, y, w, h);
-   //redraw_fix(this, ss, x+x_off, y+y_off, w, h);
+   // redraw_fix(this, s, x, y, w, h);
+   // redraw_fix(this, ss, x+x_off, y+y_off, w, h);
 
    logdebug("Surface %u now on layer %u with rect { %d, %d, %d, %d }",
             surface_id, layer_id, x, y, w, h);
 }
 
-char const *App::activate_surface(char const *drawing_name) {
+char const *App::api_activate_surface(char const *drawing_name) {
    ST();
    auto const &surface_id = this->lookup_id(drawing_name);
 
@@ -444,7 +444,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);
    } else {
       bool can_split = this->can_split(state, *surface_id);
 
@@ -459,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);
@@ -474,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);
          }
       }
    }
@@ -487,7 +491,7 @@ char const *App::activate_surface(char const *drawing_name) {
    return nullptr;
 }
 
-char const *App::deactivate_surface(char const *drawing_name) {
+char const *App::api_deactivate_surface(char const *drawing_name) {
    ST();
    auto const &surface_id = this->lookup_id(drawing_name);
 
@@ -527,7 +531,8 @@ 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;
@@ -542,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";
    }
@@ -553,6 +559,20 @@ char const *App::deactivate_surface(char const *drawing_name) {
    return nullptr;
 }
 
+char const *App::api_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";
+}
+
 //                      _          _   _____                 _
 //  _ __  _ __ _____  _(_) ___  __| | | ____|_   _____ _ __ | |_ ___
 // | '_ \| '__/ _ \ \/ / |/ _ \/ _` | |  _| \ \ / / _ \ '_ \| __/ __|
@@ -575,14 +595,19 @@ void App::surface_created(uint32_t surface_id) {
    if (surface_id == static_cast<unsigned>(this->layers.main_surface)) {
       logdebug("Activating main_surface (%d)", surface_id);
 
-      this->activate_surface(
-              this->lookup_name(surface_id).value_or("unknown-name").c_str());
+      this->api_activate_surface(
+         this->lookup_name(surface_id).value_or("unknown-name").c_str());
    }
 }
 
 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());
+   }
+
    this->id_alloc.remove_id(surface_id);
 }
 
@@ -606,11 +631,13 @@ void App::emit_visible(char const *label, bool is_visible) {
    this->api.send_event(is_visible ? "visible" : "invisible", label);
 }
 
-void App::emit_invisible(char const *label) { return emit_visible(label, false); }
+void App::emit_invisible(char const *label) {
+   return emit_visible(label, false);
+}
 
 void App::emit_visible(char const *label) { return emit_visible(label, true); }
 
-result<int> App::request_surface(char const *drawing_name) {
+result<int> App::api_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?