binding: ping() dispatches only pending events

[staging/windowmanager.git] / src / app.hpp

diff --git a/src/app.hpp b/src/app.hpp
index 370c65d..e295797 100644 (file)
--- 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;
@@ -98,6 +102,25 @@ 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;
@@ -110,9 +133,11 @@ 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));
@@ -121,7 +146,9 @@ struct App {
       return this->id_alloc.lookup(id);
    }
 
-   std::deque<unsigned> last_active;
+   struct LayoutState state;
+
+   std::atomic<bool> pending_events;
 
    explicit App(wl::display *d);
    ~App();
@@ -132,11 +159,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);
@@ -155,6 +184,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(unsigned id);
+   void deactivate(unsigned id);
+
+   bool can_split(unsigned new_id);
 };
 
 }  // namespace wm