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

diff --git a/src/app.hpp b/src/app.hpp
index 3e3a56e..e661794 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,32 @@ 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) {
+   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);
    }
 
+   // 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();
 
@@ -131,11 +149,13 @@ struct App {
    App &operator=(App &&) = delete;
 
    int init();
-   int init_layout();
+   int init_layers();
 
    int dispatch_events();
+   int dispatch_pending_events();
 
-   void surface_set_layout(uint32_t surface_id);
+   void surface_set_layout_full(uint32_t surface_id);
+   void surface_set_layout_split(uint32_t surface_id, uint32_t sub_surface_id);
 
    // Allocate a surface ID for this role
    result<int> request_surface(char const *drawing_name);
@@ -144,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);
@@ -154,6 +176,13 @@ struct App {
    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);
+
+   bool can_split(struct LayoutState const &state, int new_id);
 };
 
 }  // namespace wm