X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fapp.cpp;h=3ee4379c9f7f86ff84b9f6f9936ec0d9575947a9;hb=f7f02a664fc0438f00e6bd09797a3bf4184c123f;hp=cf7b6bee7dbc74ed91dadc8fe406a47122c668c0;hpb=78d6f15eadfdc6d2d4a166e0e559ebad0a34723e;p=staging%2Fwindowmanager.git

diff --git a/src/app.cpp b/src/app.cpp
index cf7b6be..3ee4379 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -80,10 +80,10 @@ App::App(wl::display *d)
      controller{},
      outputs(),
      config(),
-     layouts(),
      layers(),
      id_alloc{},
-     pending_events(false) {
+     pending_events(false),
+     policy{} {
    assert(g_app == nullptr);
    g_app = this;
 
@@ -222,22 +222,18 @@ int App::init_layers() {
    // XXX: This likely needs to be sorted by order (note, we don't (yet?)
    // do any zorder arrangement).
    for (auto const &i : this->layers.mapping) {
-      c->layer_create(i.layer_id, o->width, o->height);
-      auto &l = layers[i.layer_id];
+      c->layer_create(i.second.layer_id, o->width, o->height);
+      auto &l = layers[i.second.layer_id];
       l->set_destination_rectangle(0, 0, o->width, o->height);
       l->set_visibility(1);
-      logdebug(
-         "Setting up layer %s (%d) for surfaces %d-%d and role match \"%s\"",
-         i.name.c_str(), i.layer_id, i.id_min, i.id_max, i.role.c_str());
-      this->layouts[l->id] = LayoutState{};
+      logdebug("Setting up layer %s (%d) for surface role match \"%s\"",
+               i.second.name.c_str(), i.second.layer_id, i.second.role.c_str());
    }
 
    // 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;
 }
@@ -272,22 +268,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;
@@ -307,70 +301,42 @@ 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.
@@ -378,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);
 
@@ -392,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);
@@ -412,7 +376,7 @@ char const *App::api_activate_surface(char const *drawing_name) {
 
    auto o_state = *this->layers.get_layout_state(*surface_id);
 
-   if (!o_state) {
+   if (o_state == nullptr) {
       return "Could not find layer for surface";
    }
 
@@ -420,28 +384,25 @@ char const *App::api_activate_surface(char const *drawing_name) {
 
    // disable layers that are above our current layer
    for (auto const &l : this->layers.mapping) {
-      if (l.layer_id <= *layer_id) {
+      if (l.second.layer_id <= *layer_id) {
          continue;
       }
 
       bool flush = false;
-      if (l.state.main != -1) {
-         this->deactivate(l.state.main);
-         l.state.main = -1;
+      if (l.second.state.main != -1) {
+         this->deactivate(l.second.state.main);
+         l.second.state.main = -1;
          flush = true;
       }
 
-      if (l.state.sub != -1) {
-         this->deactivate(l.state.sub);
-         l.state.sub = -1;
+      if (l.second.state.sub != -1) {
+         this->deactivate(l.second.state.sub);
+         l.second.state.sub = -1;
          flush = true;
       }
 
-      l.state.s = LayoutState::Single;
-
       if (flush) {
-         this->controller->commit_changes();
-         this->display->flush();
+         this->layout_commit();
       }
    }
 
@@ -449,57 +410,60 @@ char const *App::api_activate_surface(char const *drawing_name) {
       return "Surface already active";
    }
 
-   // This should involve a policy check, but as we do not (yet) have
-   // such a thing, we will just switch to this surface.
-   // 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);
-      state.main = *surface_id;
-      state.sub = -1;
-      state.s = LayoutState::Single;
-
-      this->enqueue_flushdraw(state.main);
+      this->try_layout(
+         state, LayoutState{*surface_id}, [&] (LayoutState const &nl) {
+            this->surface_set_layout(*surface_id);
+            // XXX do we need to activate after enddraw?
+            this->activate(*surface_id);
+            state = nl;
+            this->layout_commit();
+            this->emit_syncdraw(drawing_name);
+            this->enqueue_flushdraw(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 = 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->activate(*surface_id);
-               state.sub = *surface_id;
-
-               this->enqueue_flushdraw(state.main);
-               this->enqueue_flushdraw(state.sub);
-            }
+            this->try_layout(
+               state,
+               LayoutState{state.main, *surface_id},
+               [&] (LayoutState const &nl) {
+                  std::string main =
+                     std::move(*this->lookup_name(state.main));
+
+                  this->surface_set_layout(state.main, surface_id);
+                  this->activate(*surface_id);
+                  if (state.sub != -1) {
+                     this->deactivate(state.sub);
+                  }
+                  state = nl;
+
+                  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->deactivate(state.main);
-            this->activate(*surface_id);
-            this->deactivate(state.sub);
-            state.main = *surface_id;
-            state.sub = -1;
-            state.s = LayoutState::Single;
-
-            this->enqueue_flushdraw(state.main);
+            this->try_layout(
+               state, LayoutState{*surface_id}, [&] (LayoutState const &nl) {
+                  this->surface_set_layout(*surface_id);
+                  this->deactivate(state.main);
+                  this->activate(*surface_id);
+                  if (state.sub != -1) {
+                     this->deactivate(state.sub);
+                  }
+                  state = nl;
+
+                  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;
 }
@@ -518,7 +482,7 @@ char const *App::api_deactivate_surface(char const *drawing_name) {
 
    auto o_state = *this->layers.get_layout_state(*surface_id);
 
-   if (!o_state) {
+   if (o_state == nullptr) {
       return "Could not find layer for surface";
    }
 
@@ -528,6 +492,8 @@ 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;
@@ -535,38 +501,42 @@ 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->try_layout(
+            state, LayoutState{state.sub, -1}, [&] (LayoutState const &nl) {
+               std::string sub = std::move(*this->lookup_name(state.sub));
 
-         this->deactivate(*surface_id);
-         this->surface_set_layout_full(state.sub);
-         state.main = state.sub;
-         state.sub = -1;
-         state.s = LayoutState::Single;
+               this->deactivate(*surface_id);
+               this->surface_set_layout(state.sub);
+               state = nl;
 
-         this->enqueue_flushdraw(state.sub);
+               this->layout_commit();
+               this->emit_syncdraw(sub.c_str());
+               this->enqueue_flushdraw(state.sub);
+            });
       } else {
-         this->deactivate(*surface_id);
-         state.main = -1;
+         this->try_layout(state, LayoutState{-1, -1}, [&] (LayoutState const &nl) {
+            this->deactivate(*surface_id);
+            state = nl;
+            this->layout_commit();
+         });
       }
    } else if (state.sub == *surface_id) {
-      std::string main = std::move(*this->lookup_name(state.main));
-      this->emit_syncdraw(main.c_str());
+      this->try_layout(
+         state, LayoutState{state.main, -1}, [&] (LayoutState const &nl) {
+            std::string main = std::move(*this->lookup_name(state.main));
 
-      this->deactivate(*surface_id);
-      this->deactivate(*surface_id);
-      this->surface_set_layout_full(state.main);
-      state.sub = -1;
-      state.s = LayoutState::Single;
+            this->deactivate(*surface_id);
+            this->surface_set_layout(state.main);
+            state = nl;
 
-      this->enqueue_flushdraw(state.main);
+            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;
 }
 
@@ -584,7 +554,7 @@ void App::check_flushdraw(int surface_id) {
       logerror("Application %s (%d) has pending EndDraw call(s)!",
                n ? n->c_str() : "unknown-name", surface_id);
       std::swap(this->pending_end_draw[std::distance(
-         std::begin(this->pending_end_draw), i)],
+                   std::begin(this->pending_end_draw), i)],
                 this->pending_end_draw.back());
       this->pending_end_draw.resize(this->pending_end_draw.size() - 1);
    }
@@ -604,9 +574,7 @@ 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::api_ping() { this->dispatch_pending_events(); }
 
 //                      _          _   _____                 _
 //  _ __  _ __ _____  _(_) ___  __| | | ____|_   _____ _ __ | |_ ___
@@ -639,20 +607,27 @@ 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) {
-   this->api.send_event("activated", label);
+   this->api.send_event("active", label);
 }
 
 void App::emit_deactivated(char const *label) {
-   this->api.send_event("deactivated", label);
+   this->api.send_event("inactive", label);
 }
 
 void App::emit_syncdraw(char const *label) {
@@ -702,7 +677,8 @@ result<int> App::api_request_surface(char const *drawing_name) {
 }
 
 void App::activate(int id) {
-   if (this->controller->sprops[id].visibility == 0) {
+   auto ip = this->controller->sprops.find(id);
+   if (ip != this->controller->sprops.end() && ip->second.visibility == 0) {
       this->controller->surfaces[id]->set_visibility(1);
       char const *label =
          this->lookup_name(id).value_or("unknown-name").c_str();
@@ -712,7 +688,8 @@ void App::activate(int id) {
 }
 
 void App::deactivate(int id) {
-   if (this->controller->sprops[id].visibility != 0) {
+   auto ip = this->controller->sprops.find(id);
+   if (ip != this->controller->sprops.end() && ip->second.visibility != 0) {
       this->controller->surfaces[id]->set_visibility(0);
       char const *label =
          this->lookup_name(id).value_or("unknown-name").c_str();
@@ -721,6 +698,11 @@ void App::deactivate(int id) {
    }
 }
 
+void App::deactivate_main_surface() {
+   this->layers.main_surface = -1;
+   this->api_deactivate_surface(this->layers.main_surface_name.c_str());
+}
+
 bool App::can_split(struct LayoutState const &state, int new_id) {
    if (state.main != -1 && state.main != new_id) {
       auto new_id_layer = this->layers.get_layer_id(new_id).value();
@@ -760,6 +742,14 @@ bool App::can_split(struct LayoutState const &state, int new_id) {
    return false;
 }
 
+void App::try_layout(struct LayoutState & /*state*/,
+                     struct LayoutState const &new_layout,
+                     std::function<void(LayoutState const &nl)> apply) {
+   if (this->policy.layout_is_valid(new_layout)) {
+      apply(new_layout);
+   }
+}
+
 //                  _             _ _            _                 _
 //   ___ ___  _ __ | |_ _ __ ___ | | | ___ _ __ | |__   ___   ___ | | _____
 //  / __/ _ \| '_ \| __| '__/ _ \| | |/ _ \ '__|| '_ \ / _ \ / _ \| |/ / __|
@@ -774,4 +764,13 @@ void controller_hooks::surface_removed(uint32_t surface_id) {
    this->app->surface_removed(surface_id);
 }
 
+void controller_hooks::surface_visibility(uint32_t /*surface_id*/,
+                                          uint32_t /*v*/) {}
+
+void controller_hooks::surface_destination_rectangle(uint32_t /*surface_id*/,
+                                                     uint32_t /*x*/,
+                                                     uint32_t /*y*/,
+                                                     uint32_t /*w*/,
+                                                     uint32_t /*h*/) {}
+
 }  // namespace wm