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

diff --git a/src/app.hpp b/src/app.hpp
index 370c65d..71bc2c2 100644
--- a/src/app.hpp
+++ b/src/app.hpp
@@ -18,10 +18,12 @@
 #define TMCAGLWM_APP_HPP
 
 #include <json-c/json.h>
+
+#include <atomic>
 #include <memory>
 #include <unordered_map>
 #include <unordered_set>
-#include <deque>
+#include <experimental/optional>
 
 #include "afb_binding_api.hpp"
 #include "config.hpp"
@@ -41,6 +43,8 @@ struct controller;
 
 namespace wm {
 
+using std::experimental::optional;
+
 struct id_allocator {
    constexpr static const unsigned id_shift = 22;
    constexpr static const unsigned id_mask = (1 << id_shift) - 1;
@@ -110,18 +114,17 @@ struct App {
 
    struct config config;
 
-   layouts_type layouts;
+   // track current layouts separately
+   std::map<int, struct LayoutState> layouts;
    layer_map layers;
 
+   // 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);
-   }
 
-   std::deque<unsigned> last_active;
+   // Set by AFB API when wayland events need to be dispatched
+   std::atomic<bool> pending_events;
+
+   std::vector<int> pending_end_draw;
 
    explicit App(wl::display *d);
    ~App();
@@ -132,29 +135,50 @@ struct App {
    App &operator=(App &&) = delete;
 
    int init();
-   int init_layout();
 
    int dispatch_events();
+   int dispatch_pending_events();
 
-   void surface_set_layout(uint32_t surface_id);
-
-   // Allocate a surface ID for this role
-   result<int> request_surface(char const *drawing_name);
+   void set_pending_events();
 
-   // 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);
    void emit_syncdraw(char const *label);
    void emit_flushdraw(char const *label);
    void emit_visible(char const *label, bool is_visible);
+   void emit_invisible(char const *label);
+   void emit_visible(char const *label);
+
+   void activate(int id);
+   void deactivate(int id);
+   void deactivate_main_surface();
+
+   bool can_split(struct LayoutState const &state, int new_id);
 };
 
 }  // namespace wm