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

diff --git a/src/app.hpp b/src/app.hpp
index c4c0a81..6e18855 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,25 +120,11 @@ struct App {
 
    // ID allocation and proxy methods for lookup
    struct id_allocator id_alloc;
-   optional<unsigned> lookup_id(char const *name) {
-      return this->id_alloc.lookup(std::string(name));
-   }
-   optional<std::string> lookup_name(unsigned 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() {
-      this->pending_events.store(true, std::memory_order_release);
-   }
-   bool pop_pending_events() {
-      bool x{true};
-      return this->pending_events.compare_exchange_strong(
-         x, false, std::memory_order_consume);
-   }
+
+   std::vector<int> pending_end_draw;
 
    explicit App(wl::display *d);
    ~App();
@@ -168,25 +135,35 @@ struct App {
    App &operator=(App &&) = delete;
 
    int init();
-   int init_layers();
 
    int dispatch_events();
    int dispatch_pending_events();
 
    void surface_set_layout_full(uint32_t surface_id);
    void surface_set_layout_split(uint32_t surface_id, uint32_t sub_surface_id);
+   void set_pending_events();
 
-   // Allocate a surface ID for this role
-   result<int> request_surface(char const *drawing_name);
-
-   // Activate (i.e. make visible, if allowed!) a surface
-   char const *activate_surface(char const *drawing_name);
-   char const *deactivate_surface(char const *drawing_name);
+   result<int> api_request_surface(char const *drawing_name);
+   char const *api_activate_surface(char const *drawing_name);
+   char const *api_deactivate_surface(char const *drawing_name);
+   char const *api_enddraw(char const *drawing_name);
+   void api_ping();
 
    // Events from the compositor we are interested in
    void surface_created(uint32_t surface_id);
    void surface_removed(uint32_t surface_id);
 
+private:
+   optional<int> lookup_id(char const *name);
+   optional<std::string> lookup_name(int id);
+
+   bool pop_pending_events();
+
+   void enqueue_flushdraw(int surface_id);
+   void check_flushdraw(int surface_id);
+
+   int init_layers();
+
    // TMC WM Events to clients
    void emit_activated(char const *label);
    void emit_deactivated(char const *label);
@@ -196,10 +173,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