X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fapp.hpp;h=e661794188a3ada138a33e6a7b725308baf2662f;hb=83b9b4e86d1193d820dfd67a3c0e1cbe0c29bb17;hp=c4c0a8151d2d511c27f8259dc3ea6d3d90e1ac22;hpb=83555b0c53f0d59f42e9dcfaeb269948e65e0391;p=staging%2Fwindowmanager.git

diff --git a/src/app.hpp b/src/app.hpp
index c4c0a81..e661794 100644
--- a/src/app.hpp
+++ b/src/app.hpp
@@ -102,25 +102,6 @@ struct id_allocator {
    }
 };
 
-struct LayoutState {
-   enum States {
-      LayoutNone,  // Not useful...
-      LayoutSingle,
-      LayoutSplit,
-   };
-
-   enum States state{LayoutSingle};
-   int main{-1};
-   int sub{-1};
-
-   bool operator==(const LayoutState &b) const {
-      return state == b.state && main == b.main && sub == b.sub;
-   }
-   bool operator!=(const LayoutState &b) const {
-      return !(*this == b);
-   }
-};
-
 struct App {
    struct binding_api api;
    struct controller_hooks chooks;
@@ -139,15 +120,13 @@ struct App {
 
    // ID allocation and proxy methods for lookup
    struct id_allocator id_alloc;
-   optional<unsigned> lookup_id(char const *name) {
+   optional<int> lookup_id(char const *name) {
       return this->id_alloc.lookup(std::string(name));
    }
-   optional<std::string> lookup_name(unsigned id) {
+   optional<std::string> lookup_name(int id) {
       return this->id_alloc.lookup(id);
    }
 
-   struct LayoutState state;
-
    // Set by AFB API when wayland events need to be dispatched
    std::atomic<bool> pending_events;
    void set_pending_events() {
@@ -159,6 +138,8 @@ struct App {
          x, false, std::memory_order_consume);
    }
 
+   std::vector<int> pending_end_draw;
+
    explicit App(wl::display *d);
    ~App();
 
@@ -183,6 +164,8 @@ struct App {
    char const *activate_surface(char const *drawing_name);
    char const *deactivate_surface(char const *drawing_name);
 
+   char const *enddraw(char const *drawing_name);
+
    // Events from the compositor we are interested in
    void surface_created(uint32_t surface_id);
    void surface_removed(uint32_t surface_id);
@@ -196,10 +179,10 @@ struct App {
    void emit_invisible(char const *label);
    void emit_visible(char const *label);
 
-   void activate(unsigned id);
-   void deactivate(unsigned id);
+   void activate(int id);
+   void deactivate(int id);
 
-   bool can_split(unsigned new_id);
+   bool can_split(struct LayoutState const &state, int new_id);
 };
 
 }  // namespace wm