X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fapp.cpp;h=b29024888d0bea1d16f5e15e83e53032dfd5a252;hb=6946f6008999f9aaffdbc3043afbfe17fe04fc49;hp=e58c85d6a75e17f56acead1b470d7b4bc29064ba;hpb=6a10feaafbe80f7c3738535dfd7ca97f00e1f405;p=staging%2Fwindowmanager.git

diff --git a/src/app.cpp b/src/app.cpp
index e58c85d..b290248 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -169,6 +169,23 @@ int App::dispatch_pending_events() {
    return -1;
 }
 
+bool App::pop_pending_events() {
+   bool x{true};
+   return this->pending_events.compare_exchange_strong(
+      x, false, std::memory_order_consume);
+}
+
+void App::set_pending_events() {
+   this->pending_events.store(true, std::memory_order_release);
+}
+
+optional<int> App::lookup_id(char const *name) {
+   return this->id_alloc.lookup(std::string(name));
+}
+optional<std::string> App::lookup_name(int id) {
+   return this->id_alloc.lookup(id);
+}
+
 //  _       _ _       _                         _    ____
 // (_)_ __ (_) |_    | | __ _ _   _  ___  _   _| |_ / /\ \
 // | | '_ \| | __|   | |/ _` | | | |/ _ \| | | | __| |  | |
@@ -218,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;
 }
@@ -255,22 +270,20 @@ void redraw_fix(App *app, std::unique_ptr<genivi::surface> &s, int x, int y,
 
 }  // namespace
 
-void App::surface_set_layout_full(uint32_t surface_id) {
+void App::surface_set_layout(int surface_id, optional<int> sub_surface_id) {
    if (!this->controller->surface_exists(surface_id)) {
-      logerror("Surface %d does not exist", int(surface_id));
+      logerror("Surface %d does not exist", surface_id);
       return;
    }
 
    auto o_layer_id = this->layers.get_layer_id(surface_id);
 
    if (!o_layer_id) {
-      logerror("Surface %d is not associated with any layer!", int(surface_id));
+      logerror("Surface %d is not associated with any layer!", surface_id);
       return;
    }
 
-   uint32_t layer_id = o_layer_id.value();
-   logdebug("surface_set_layout for surface %u on layer %u", surface_id,
-            layer_id);
+   uint32_t layer_id = *o_layer_id;
 
    auto const &layer = this->layers.get_layer(layer_id);
    auto rect = layer.value().rect;
@@ -290,70 +303,40 @@ void App::surface_set_layout_full(uint32_t surface_id) {
       h = this->controller->output_size.h + 1 + h;
    }
 
-   // configure surface to wxh dimensions
-   s->set_configuration(w, h);
-
-   // set source reactangle, even if we should not need to set it.
-   s->set_source_rectangle(0, 0, w, h);
-
-   // set destination to the display rectangle
-   s->set_destination_rectangle(x, y, w, h);
+   if (sub_surface_id) {
+      if (o_layer_id != this->layers.get_layer_id(*sub_surface_id)) {
+         logerror("surface_set_layout: layers of surfaces (%d and %d) don't match!", surface_id, *sub_surface_id);
+         return;
+      }
 
-   // redraw_fix(this, s, x, y, w, h);
+      int x_off = 0;
+      int y_off = 0;
 
-   logdebug("Surface %u now with rect { %d, %d, %d, %d }", surface_id, x, y, w,
-            h);
-}
+      // split along major axis
+      if (w > h) {
+         w /= 2;
+         x_off = w;
+      } else {
+         h /= 2;
+         y_off = h;
+      }
 
-void App::surface_set_layout_split(uint32_t surface_id,
-                                   uint32_t sub_surface_id) {
-   if (!this->controller->surface_exists(surface_id)) {
-      logerror("Surface %d does not exist", int(surface_id));
-      return;
-   }
+      auto &ss = this->controller->surfaces[*sub_surface_id];
 
-   auto o_layer_id = this->layers.get_layer_id(surface_id);
+      logdebug("surface_set_layout for sub surface %u on layer %u", *sub_surface_id,
+               layer_id);
 
-   if (!o_layer_id) {
-      logerror("Surface %d is not associated with any layer!", int(surface_id));
-      return;
+      // configure surface to wxh dimensions
+      ss->set_configuration(w, h);
+      // 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);
    }
 
-   uint32_t layer_id = o_layer_id.value();
    logdebug("surface_set_layout for surface %u on layer %u", surface_id,
             layer_id);
 
-   auto const &layer = this->layers.get_layer(layer_id);
-   auto rect = layer.value().rect;
-   auto &s = this->controller->surfaces[surface_id];
-   auto &ss = this->controller->surfaces[sub_surface_id];
-
-   int x = rect.x;
-   int y = rect.y;
-   int w = rect.w;
-   int h = rect.h;
-
-   // less-than-0 values refer to MAX + 1 - $VALUE
-   // e.g. MAX is either screen width or height
-   if (w < 0) {
-      w = this->controller->output_size.w + 1 + w;
-   }
-   if (h < 0) {
-      h = this->controller->output_size.h + 1 + h;
-   }
-
-   int x_off = 0;
-   int y_off = 0;
-
-   // split along major axis
-   if (w > h) {
-      w /= 2;
-      x_off = w;
-   } else {
-      h /= 2;
-      y_off = h;
-   }
-
    // configure surface to wxh dimensions
    s->set_configuration(w, h);
    // set source reactangle, even if we should not need to set it.
@@ -361,13 +344,6 @@ void App::surface_set_layout_split(uint32_t surface_id,
    // set destination to the display rectangle
    s->set_destination_rectangle(x, y, w, h);
 
-   // configure surface to wxh dimensions
-   ss->set_configuration(w, h);
-   // 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);
-
    // redraw_fix(this, s, x, y, w, h);
    // redraw_fix(this, ss, x+x_off, y+y_off, w, h);
 
@@ -375,6 +351,11 @@ void App::surface_set_layout_split(uint32_t 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);
@@ -423,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();
       }
    }
 
@@ -437,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_full(*surface_id);
-      this->activate(*surface_id);
+      this->surface_set_layout(*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);
@@ -453,20 +433,19 @@ 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_split(state.main, *surface_id);
+               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_full(*surface_id);
+            this->surface_set_layout(*surface_id);
             this->deactivate(state.main);
             this->activate(*surface_id);
             this->deactivate(state.sub);
@@ -474,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;
 }
@@ -511,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;
@@ -519,14 +497,15 @@ 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_full(state.sub);
+         this->surface_set_layout(state.sub);
          state.main = state.sub;
          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);
@@ -534,22 +513,20 @@ 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);
-      this->surface_set_layout_full(state.main);
+      this->surface_set_layout(state.main);
       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;
 }
 
@@ -587,6 +564,15 @@ char const *App::api_enddraw(char const *drawing_name) {
    return "No EndDraw pending for surface";
 }
 
+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());
+}
+
 //                      _          _   _____                 _
 //  _ __  _ __ _____  _(_) ___  __| | | ____|_   _____ _ __ | |_ ___
 // | '_ \| '__/ _ \ \/ / |/ _ \/ _` | |  _| \ \ / / _ \ '_ \| __/ __|
@@ -618,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) {