X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fapp.hpp;h=71bc2c27f0f044e9ddf7c5eb0aff3b42fc10d2da;hb=f8e49ab7a90503ff791e264d61d5b658b0b4fad0;hp=297b6af1ad0fc1d3f2d9adb56d5ffc071b65a451;hpb=e2a149b190298bc60e9f952f119d52a1b3ddc9d6;p=staging%2Fwindowmanager.git

diff --git a/src/app.hpp b/src/app.hpp
index 297b6af..71bc2c2 100644
--- a/src/app.hpp
+++ b/src/app.hpp
@@ -120,25 +120,11 @@ struct App {
 
    // ID allocation and proxy methods for lookup
    struct id_allocator id_alloc;
-   optional<int> lookup_id(char const *name) {
-      return this->id_alloc.lookup(std::string(name));
-   }
-   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() {
-      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();
@@ -149,25 +135,36 @@ 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();
+
+   void surface_set_layout(int surface_id, optional<int> sub_surface_id = nullopt);
+   void layout_commit();
+
    // TMC WM Events to clients
    void emit_activated(char const *label);
    void emit_deactivated(char const *label);
@@ -179,8 +176,9 @@ struct App {
 
    void activate(int id);
    void deactivate(int id);
+   void deactivate_main_surface();
 
-   bool can_split(int new_id);
+   bool can_split(struct LayoutState const &state, int new_id);
 };
 
 }  // namespace wm