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

diff --git a/src/app.cpp b/src/app.cpp
index 7f0bcbb..59b762d 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -32,43 +32,16 @@
 #include <bits/signum.h>
 #include <csignal>
 #include <fstream>
-#include <thread>
 #include <json.hpp>
+#include <regex>
+#include <thread>
 
 namespace wm {
 
 namespace {
 App *g_app;
 
-using json = nlohmann::json;
-
-struct wm::area area_from_json(json const &j) {
-   return wm::area{
-      j["name"],
-      {
-         j["width"], j["height"], j["x"], j["y"],
-      },
-      j["zorder"],
-   };
-}
-
-result<struct layout> layout_from_json(json const &j) {
-   auto &ja = j["areas"];
-
-   auto l = layout{j["name"], uint32_t(ja.size()), {}};
-
-   if (ja.size() > layout::MAX_N_AREAS) {
-      return Err<struct layout>("Invalid number of areas in layout");
-   }
-
-   logdebug("Loading layout '%s' with %u areas", l.name.c_str(),
-            unsigned(ja.size()));
-
-   std::transform(std::cbegin(ja), std::cend(ja), std::begin(l.areas),
-                  area_from_json);
-
-   return Ok(l);
-}
+using nlohmann::json;
 
 result<json> file_to_json(char const *filename) {
    std::ifstream i(filename);
@@ -80,24 +53,6 @@ result<json> file_to_json(char const *filename) {
    return Ok(j);
 }
 
-// Will throw if parsing fails
-struct result<layouts_type> load_layout(char const *filename) {
-   logdebug("loading layout from %s", filename);
-
-   auto j = file_to_json(filename);
-   if (j.is_err()) {
-      return Err<layouts_type>(j.unwrap_err());
-   }
-   json jlayouts = j.unwrap();
-
-   auto layouts = layouts_type();
-   layouts.reserve(jlayouts.size());
-   std::transform(std::cbegin(jlayouts), std::cend(jlayouts),
-                  std::back_inserter(layouts), layout_from_json);
-
-   return Ok(layouts);
-}
-
 struct result<layer_map>
    load_layer_map(char const *filename) {
    logdebug("loading IDs from %s", filename);
@@ -128,7 +83,8 @@ App::App(wl::display *d)
      config(),
      layouts(),
      layers(),
-     id_alloc{} {
+     id_alloc{},
+     pending_events(false) {
    assert(g_app == nullptr);
    g_app = this;
 
@@ -142,16 +98,6 @@ App::App(wl::display *d)
             logerror("%s", l.err().value());
          }
       }
-
-      {
-         auto l =
-            load_layout(this->config.get_string("layout.json").value().c_str());
-         if (l.is_ok()) {
-            this->layouts = l.unwrap();
-         } else {
-            logerror("%s", l.err().value());
-         }
-      }
    } catch (std::exception &e) {
       logerror("Loading of configuration failed: %s", e.what());
    }
@@ -176,7 +122,8 @@ int App::init() {
 
    this->display->add_global_handler(
       "ivi_controller", [this](wl_registry *r, uint32_t name, uint32_t v) {
-         this->controller = std::make_unique<struct genivi::controller>(r, name, v);
+         this->controller =
+            std::make_unique<struct genivi::controller>(r, name, v);
 
          // Init controller hooks
          this->controller->chooks = &this->chooks;
@@ -200,6 +147,10 @@ int App::init() {
 }
 
 int App::dispatch_events() {
+   if (this->dispatch_events() == 0) {
+      return 0;
+   }
+
    int ret = this->display->dispatch();
    if (ret == -1) {
       logerror("wl_display_dipatch() returned error %d",
@@ -208,12 +159,17 @@ int App::dispatch_events() {
    }
    this->display->flush();
 
-   // execute pending tasks, that is layout changes etc.
-   //this->execute_pending();
-
    return 0;
 }
 
+int App::dispatch_pending_events() {
+   if (this->pop_pending_events()) {
+      this->display->dispatch_pending();
+      return 0;
+   }
+   return -1;
+}
+
 //  _       _ _       _                         _    ____
 // (_)_ __ (_) |_    | | __ _ _   _  ___  _   _| |_ / /\ \
 // | | '_ \| | __|   | |/ _` | | | |/ _ \| | | | __| |  | |
@@ -254,8 +210,9 @@ int App::init_layers() {
       auto &l = layers[i.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", i.name.c_str(),
-               i.layer_id, i.id_min, i.id_max);
+      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{};
    }
 
    // Add layers to screen (XXX: are they sorted correctly?)
@@ -270,9 +227,11 @@ int App::init_layers() {
 
 namespace {
 
+#ifdef WE_LIKE_NOT_TO_USE_THIS
 // This can fix the HomeScreen...
-void redraw_fix(App *app, std::unique_ptr<genivi::surface> &s, int x, int y, int w, int h) {
-   { // XXX: Work around weston redraw issues
+void redraw_fix(App *app, std::unique_ptr<genivi::surface> &s, int x, int y,
+                int w, int h) {
+   {  // XXX: Work around weston redraw issues
       // trigger an update by changing the source dimensions!
       s->set_configuration(w + 1, h);
       s->set_source_rectangle(0, 0, w + 1, h);
@@ -292,10 +251,11 @@ void redraw_fix(App *app, std::unique_ptr<genivi::surface> &s, int x, int y, int
       app->display->roundtrip();
    }
 }
+#endif
 
 }  // namespace
 
-void App::surface_init_layout(uint32_t surface_id) {
+void App::surface_set_layout_full(uint32_t surface_id) {
    if (!this->controller->surface_exists(surface_id)) {
       logerror("Surface %d does not exist", int(surface_id));
       return;
@@ -339,59 +299,179 @@ void App::surface_init_layout(uint32_t surface_id) {
    // set destination to the display rectangle
    s->set_destination_rectangle(x, y, w, h);
 
-   s->set_visibility(0);
-   s->set_opacity(256);
+   //redraw_fix(this, s, x, y, w, h);
 
-   this->controller->commit_changes();
-   this->display->roundtrip();
+   logdebug("Surface %u now with rect { %d, %d, %d, %d }",
+            surface_id, x, y, w, h);
+}
 
-   redraw_fix(this, s, x, y, w, 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;
+   }
 
-   this->controller->layers[layer_id]->add_surface(s.get());
+   auto o_layer_id = this->layers.get_layer_id(surface_id);
 
-   // activate the main_surface right away
-   if (surface_id == static_cast<unsigned>(this->layers.main_surface)) {
-      logdebug("Activating main_surface (%d)", surface_id);
+   if (!o_layer_id) {
+      logerror("Surface %d is not associated with any layer!", int(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);
+
+   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;
 
-      this->activate_surface(this->lookup_name(surface_id).value_or("unknown-name").c_str());
+   // 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.
+   s->set_source_rectangle(0, 0, w, h);
+   // 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);
+
    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) {
-   int surface_id = -1;
+   ST();
+   auto const &surface_id = this->lookup_id(drawing_name);
 
-   {
-      auto oid = this->lookup_id(drawing_name);
-      if (oid) {
-         surface_id = oid.value();
-      } else {
-         return "Surface does not exist";
+   if (!surface_id) {
+      return "Surface does not exist";
+   }
+
+   if (!this->controller->surface_exists(*surface_id)) {
+      return "Surface does not exist in controller!";
+   }
+
+   auto layer_id = this->layers.get_layer_id(*surface_id);
+
+   if (! layer_id) {
+      return "Surface is not on any layer!";
+   }
+
+   struct LayoutState &state = **this->layers.get_layout_state(*surface_id);
+
+   // disable layers that are above our current layer
+   for (auto const &l : this->layers.mapping) {
+      if (l.layer_id <= *layer_id) {
+         continue;
+      }
+
+      bool flush = false;
+      if (l.state.main != -1) {
+         this->deactivate(l.state.main);
+         l.state.main = -1;
+         flush = true;
+      }
+
+      if (l.state.sub != -1) {
+         this->deactivate(l.state.sub);
+         l.state.sub = -1;
+         flush = true;
+      }
+
+      l.state.s = LayoutState::Single;
+
+      if (flush) {
+         this->controller->commit_changes();
+         this->display->flush();
       }
    }
 
-   if (!this->controller->surface_exists(surface_id)) {
-      return "Surface does not exist";
+   if (state.main == *surface_id || state.sub == *surface_id) {
+      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
 
-   // Make it visible, no (or little effect) if already visible
-   auto &s = this->controller->surfaces[surface_id];
+   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->emit_flushdraw(drawing_name);
+   } 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);
+               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;
+
+               // Should wait for EndDraw event...
+               this->emit_flushdraw(drawing_name);
+               this->emit_flushdraw(main.c_str());
+            }
+         } else {
+            this->emit_syncdraw(drawing_name);
 
-   // Set all others invisible
-   for (auto &i : this->controller->surfaces) {
-      auto &si = this->controller->sprops[i.second->id];
-      if (si.id != s->id && si.visibility != 0 &&
-          int(si.id) != this->layers.main_surface) {
-         this->deactivate(si.id);
+            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->emit_flushdraw(drawing_name);
+         }
       }
    }
-   this->activate(s->id);
 
    // commit changes
    this->controller->commit_changes();
@@ -402,22 +482,58 @@ char const *App::activate_surface(char const *drawing_name) {
 }
 
 char const *App::deactivate_surface(char const *drawing_name) {
-   int surface_id = -1;
+   ST();
+   auto const &surface_id = this->lookup_id(drawing_name);
 
-   {
-      auto oid = this->lookup_id(drawing_name);
-      if (oid) {
-         surface_id = oid.value();
-      } else {
-         return "Surface does not exist";
-      }
+   if (!surface_id) {
+      return "Surface does not exist";
    }
 
-   if (surface_id == this->layers.main_surface) {
+   if (*surface_id == this->layers.main_surface) {
       return "Cannot deactivate main_surface";
    }
 
-   this->deactivate(surface_id);
+   struct LayoutState &state = **this->layers.get_layout_state(*surface_id);
+
+   if (state.main == -1) {
+      return "No surface active";
+   }
+
+   if (*surface_id == this->layers.main_surface) {
+      logdebug("Refusing to deactivate main_surface %d", *surface_id);
+      return nullptr;
+   }
+
+   if (state.main == *surface_id) {
+      if (state.sub != -1) {
+         std::string sub = *this->lookup_name(state.sub);
+         this->emit_syncdraw(sub.c_str());
+
+         this->deactivate(*surface_id);
+         this->surface_set_layout_full(state.sub);
+         state.main = state.sub;
+         state.sub = -1;
+         state.s = LayoutState::Single;
+
+         this->emit_flushdraw(sub.c_str());
+      } else {
+         this->deactivate(*surface_id);
+         state.main = -1;
+      }
+   }else if (state.sub == *surface_id) {
+      std::string main = *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);
+      state.sub = -1;
+      state.s = LayoutState::Single;
+
+      this->emit_flushdraw(main.c_str());
+   } else {
+      return "Surface is not active";
+   }
 
    this->controller->commit_changes();
    this->display->flush();
@@ -432,9 +548,24 @@ char const *App::deactivate_surface(char const *drawing_name) {
 // | .__/|_|  \___/_/\_\_|\___|\__,_| |_____| \_/ \___|_| |_|\__|___/
 // |_|
 void App::surface_created(uint32_t surface_id) {
-   logdebug("surface_id is %u", surface_id);
+   auto layer_id = this->layers.get_layer_id(surface_id);
+   if (! layer_id) {
+      logdebug("Newly created surfce %d is not associated with any layer!", surface_id);
+      return;
+   }
 
-   this->surface_init_layout(surface_id);
+   logdebug("surface_id is %u, layer_id is %u", surface_id, *layer_id);
+
+   this->controller->layers[*layer_id]
+           ->add_surface(this->controller->surfaces[surface_id].get());
+
+   // activate the main_surface right away
+   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());
+   }
 }
 
 void App::surface_removed(uint32_t surface_id) {
@@ -456,20 +587,16 @@ void App::emit_syncdraw(char const *label) {
 }
 
 void App::emit_flushdraw(char const *label) {
-   this->api.send_event("syncdraw", label);
+   this->api.send_event("flushdraw", label);
 }
 
 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, 0);
-}
+void App::emit_invisible(char const *label) { return emit_visible(label, false); }
 
-void App::emit_visible(char const *label) {
-   return emit_visible(label, 1);
-}
+void App::emit_visible(char const *label) { return emit_visible(label, true); }
 
 result<int> App::request_surface(char const *drawing_name) {
    auto lid = this->layers.get_layer_id(std::string(drawing_name));
@@ -482,7 +609,7 @@ result<int> App::request_surface(char const *drawing_name) {
    if (!rname) {
       // name does not exist yet, allocate surface id...
       auto id = int(this->id_alloc.generate_id(drawing_name));
-      this->layers.add_surface(id, lid.value());
+      this->layers.add_surface(id, *lid);
 
       // XXX: we set the main_surface[_name] here and now,
       // not sure if we want this, but it worked so far.
@@ -499,38 +626,65 @@ result<int> App::request_surface(char const *drawing_name) {
    return Err<int>("Surface already present");
 }
 
-void App::activate(unsigned id) {
+void App::activate(int id) {
    if (this->controller->sprops[id].visibility == 0) {
       this->controller->surfaces[id]->set_visibility(1);
-      char const *label = this->lookup_name(id).value_or("unknown-name").c_str();
+      char const *label =
+         this->lookup_name(id).value_or("unknown-name").c_str();
       this->emit_activated(label);
       this->emit_visible(label);
    }
 }
 
-void App::deactivate(unsigned id) {
+void App::deactivate(int id) {
    if (this->controller->sprops[id].visibility != 0) {
       this->controller->surfaces[id]->set_visibility(0);
-      char const *label = this->lookup_name(id).value_or("unknown-name").c_str();
+      char const *label =
+         this->lookup_name(id).value_or("unknown-name").c_str();
       this->emit_deactivated(label);
       this->emit_invisible(label);
    }
 }
 
-bool App::can_split(unsigned new_id) {
-   if (this->state.state == LayoutState::LayoutSingle) {
+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();
-      auto current_id_layer = this->layers.get_layer_id(this->state.main).value();
+      auto current_id_layer =
+         this->layers.get_layer_id(state.main).value();
 
+      // surfaces are on separate layers, don't bother.
       if (new_id_layer != current_id_layer) {
          return false;
       }
 
       std::string const &new_id_str = this->lookup_name(new_id).value();
-      std::string const &cur_id_str = this->lookup_name(this->state.main).value();
+      std::string const &cur_id_str =
+         this->lookup_name(state.main).value();
+
+      auto const &layer = this->layers.get_layer(new_id_layer);
 
+      logdebug("layer info name: %s", layer->name.c_str());
+
+      if (layer->layouts.empty()) {
+         return false;
+      }
 
+      for (auto i = layer->layouts.cbegin(); i != layer->layouts.cend(); i++) {
+         logdebug("%d main_match '%s'", new_id_layer, i->main_match.c_str());
+         auto rem = std::regex(i->main_match);
+         if (std::regex_match(cur_id_str, rem)) {
+            // build the second one only if the first already matched
+            logdebug("%d sub_match '%s'", new_id_layer, i->sub_match.c_str());
+            auto res = std::regex(i->sub_match);
+            if (std::regex_match(new_id_str, res)) {
+               logdebug("layout matched!");
+               return true;
+            }
+         }
+      }
    }
+
+   return false;
 }
 
 //                  _             _ _            _                 _