App: remove id_shift and id_mask constants

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

diff --git a/src/app.hpp b/src/app.hpp
index 3e3a56e..aac28cd 100644 (file)
--- a/src/app.hpp
+++ b/src/app.hpp
@@ -18,16 +18,19 @@
 #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"
 #include "controller_hooks.hpp"
 #include "layers.hpp"
 #include "layout.hpp"
+#include "policy.hpp"
 #include "result.hpp"
 #include "wayland.hpp"
 
@@ -41,10 +44,9 @@ struct controller;
 
 namespace wm {
 
-struct id_allocator {
-   constexpr static const unsigned id_shift = 22;
-   constexpr static const unsigned id_mask = (1 << id_shift) - 1;
+using std::experimental::optional;
 
+struct id_allocator {
    unsigned next = 1;
 
    // Surfaces that where requested but not yet created
@@ -110,17 +112,18 @@ struct App {
 
    struct config config;
 
-   layouts_type layouts;
+   // track current layouts separately
    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);
-   }
+
+   // Set by AFB API when wayland events need to be dispatched
+   std::atomic<bool> pending_events;
+
+   std::vector<int> pending_end_draw;
+
+   Policy policy;
 
    explicit App(wl::display *d);
    ~App();
@@ -131,29 +134,53 @@ 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);
+   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);
    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);
+   void try_layout(struct LayoutState &state,
+                   struct LayoutState const &new_layout,
+                   std::function<void(LayoutState const &nl)> apply);
 };
 
 }  // namespace wm