X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fapp.cpp;h=67087060474acd1eeacf0871f038a3e32d725938;hb=3ec58ace778153427a161aca26192ba0279471bf;hp=e42d05f73fe1ee356dd9789eb990292efc90f348;hpb=793166f301c058503c37553204c4d4c2b106ff23;p=staging%2Fwindowmanager.git

diff --git a/src/app.cpp b/src/app.cpp
index e42d05f..6708706 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -147,9 +147,8 @@ int App::init() {
 }
 
 int App::dispatch_events() {
-   if (this->pending_events.load(std::memory_order_consume)) {
-      this->pending_events.store(false, std::memory_order_release);
-      return this->display->dispatch_pending();
+   if (this->dispatch_events() == 0) {
+      return 0;
    }
 
    int ret = this->display->dispatch();
@@ -160,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;
+}
+
 //  _       _ _       _                         _    ____
 // (_)_ __ (_) |_    | | __ _ _   _  ___  _   _| |_ / /\ \
 // | | '_ \| | __|   | |/ _` | | | |/ _ \| | | | __| |  | |
@@ -223,6 +227,7 @@ 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) {
@@ -246,6 +251,7 @@ void redraw_fix(App *app, std::unique_ptr<genivi::surface> &s, int x, int y,
       app->display->roundtrip();
    }
 }
+#endif
 
 }  // namespace
 
@@ -293,12 +299,6 @@ void App::surface_set_layout_full(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);
-
-   this->controller->commit_changes();
-   this->display->roundtrip();
-
    //redraw_fix(this, s, x, y, w, h);
 
    logdebug("Surface %u now with rect { %d, %d, %d, %d }",
@@ -332,10 +332,6 @@ void App::surface_set_layout_split(uint32_t surface_id, uint32_t sub_surface_id)
    int w = rect.w;
    int h = rect.h;
 
-   this->state.main = surface_id;
-   this->state.sub = sub_surface_id;
-   this->state.state = LayoutState::LayoutSplit;
-
    // less-than-0 values refer to MAX + 1 - $VALUE
    // e.g. MAX is either screen width or height
    if (w < 0) {
@@ -364,9 +360,6 @@ void App::surface_set_layout_split(uint32_t surface_id, uint32_t sub_surface_id)
    // set destination to the display rectangle
    s->set_destination_rectangle(x, y, w, h);
 
-   s->set_visibility(1);
-   s->set_opacity(256);
-
    // configure surface to wxh dimensions
    ss->set_configuration(w, h);
    // set source reactangle, even if we should not need to set it.
@@ -374,12 +367,6 @@ void App::surface_set_layout_split(uint32_t surface_id, uint32_t sub_surface_id)
    // set destination to the display rectangle
    ss->set_destination_rectangle(x+x_off, y+y_off, w, h);
 
-   ss->set_visibility(1);
-   ss->set_opacity(256);
-
-   this->controller->commit_changes();
-   this->display->roundtrip();
-
    //redraw_fix(this, s, x, y, w, h);
    //redraw_fix(this, ss, x+x_off, y+y_off, w, h);
 
@@ -388,22 +375,53 @@ void App::surface_set_layout_split(uint32_t surface_id, uint32_t sub_surface_id)
 }
 
 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";
+   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!";
    }
 
-   if (this->state.main == surface_id || this->state.sub == surface_id) {
+   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 (state.main == *surface_id || state.sub == *surface_id) {
       return "Surface already active";
    }
 
@@ -411,100 +429,117 @@ char const *App::activate_surface(char const *drawing_name) {
    // such a thing, we will just switch to this surface.
    // XXX: input focus missing!!1
 
-   if (this->state != LayoutState{}) {
-      switch (this->state.state) {
-         case LayoutState::LayoutSingle:
-            if (this->can_split(surface_id)) {
-               this->surface_set_layout_split(this->state.main, surface_id);
-               return nullptr;
-            }
-            break;
+   if (state.main == -1) {
+      this->emit_syncdraw(drawing_name);
 
-         case LayoutState::LayoutSplit:
-            if (this->can_split(surface_id)) {
-               this->deactivate(this->state.sub);
-               this->surface_set_layout_split(this->state.main, surface_id);
-            }
+      this->surface_set_layout_full(*surface_id);
+      this->activate(*surface_id);
+      state.main = *surface_id;
+      state.sub = -1;
+      state.s = LayoutState::Single;
 
-         case LayoutState::LayoutNone:
-            break;
-      }
-   }
+      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);
 
-   // Make it visible, no (or little effect) if already visible
-   auto &s = this->controller->surfaces[surface_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;
 
-   // 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->emit_flushdraw(drawing_name);
+         }
       }
    }
-   this->activate(s->id);
 
    // commit changes
    this->controller->commit_changes();
    this->display->flush();
 
-   this->state.main = surface_id;
-   this->state.state = LayoutState::LayoutSingle;
-
    // no error
    return nullptr;
 }
 
 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";
    }
 
-   switch (this->state.state) {
-      case LayoutState::LayoutSplit:
-         if (surface_id == this->state.main) {
-            this->deactivate(surface_id);
-            this->surface_set_layout_full(this->state.main);
+   auto o_state = *this->layers.get_layout_state(*surface_id);
 
-            this->deactivate(this->state.sub);
-            this->surface_set_layout_full(this->state.sub);
+   if (! o_state) {
+      return "Could not find layer for surface";
+   }
 
-            this->state.main = -1;
-            this->state.sub = -1;
-            this->state.state = LayoutState::LayoutSingle;
-         } else if (surface_id == this->state.sub) {
-            this->deactivate(surface_id);
-            this->surface_set_layout_full(this->state.sub);
-            this->surface_set_layout_full(this->state.main);
+   struct LayoutState &state = *o_state;
 
-            // XXX send syndraw events....
+   if (state.main == -1) {
+      return "No surface active";
+   }
 
-            this->state.sub = -1;
-            this->state.state = LayoutState::LayoutSingle;
-         }
-         break;
+   if (*surface_id == this->layers.main_surface) {
+      logdebug("Refusing to deactivate main_surface %d", *surface_id);
+      return nullptr;
+   }
 
-      case LayoutState::LayoutSingle:
-         this->deactivate(surface_id);
-         this->state.main = -1;
-         this->state.sub = -1;
-         break;
+   if (state.main == *surface_id) {
+      if (state.sub != -1) {
+         std::string sub = *this->lookup_name(state.sub);
+         this->emit_syncdraw(sub.c_str());
 
-      case LayoutState::LayoutNone:
-         break;
-   }
+         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();
@@ -519,11 +554,15 @@ 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_set_layout_full(surface_id);
+   logdebug("surface_id is %u, layer_id is %u", surface_id, *layer_id);
 
-   this->controller->layers[this->layers.get_layer_id(surface_id).value()]
+   this->controller->layers[*layer_id]
            ->add_surface(this->controller->surfaces[surface_id].get());
 
    // activate the main_surface right away
@@ -554,16 +593,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));
@@ -576,7 +615,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.
@@ -593,7 +632,7 @@ 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 =
@@ -603,7 +642,7 @@ void App::activate(unsigned id) {
    }
 }
 
-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 =
@@ -613,11 +652,11 @@ void App::deactivate(unsigned id) {
    }
 }
 
-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();
+         this->layers.get_layer_id(state.main).value();
 
       // surfaces are on separate layers, don't bother.
       if (new_id_layer != current_id_layer) {
@@ -626,7 +665,7 @@ bool App::can_split(unsigned new_id) {
 
       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();
+         this->lookup_name(state.main).value();
 
       auto const &layer = this->layers.get_layer(new_id_layer);
 
@@ -644,6 +683,7 @@ bool App::can_split(unsigned new_id) {
             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;
             }
          }