X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fapp.hpp;h=aac28cd35736d57749ce10f4170cb2bc759b28ec;hb=2f2408428a9ed9205fdb92cc2cb786949042f256;hp=5ef7ab4ac8434cd64db6293857fc70ca5ce6f612;hpb=6a10feaafbe80f7c3738535dfd7ca97f00e1f405;p=staging%2Fwindowmanager.git

diff --git a/src/app.hpp b/src/app.hpp
index 5ef7ab4..aac28cd 100644
--- a/src/app.hpp
+++ b/src/app.hpp
@@ -30,6 +30,7 @@
 #include "controller_hooks.hpp"
 #include "layers.hpp"
 #include "layout.hpp"
+#include "policy.hpp"
 #include "result.hpp"
 #include "wayland.hpp"
 
@@ -46,9 +47,6 @@ 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;
-
    unsigned next = 1;
 
    // Surfaces that where requested but not yet created
@@ -115,32 +113,17 @@ struct App {
    struct config config;
 
    // 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<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);
-   }
 
    // 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;
-   void enqueue_flushdraw(int surface_id);
-   void check_flushdraw(int surface_id);
+
+   Policy policy;
 
    explicit App(wl::display *d);
    ~App();
@@ -151,26 +134,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> api_request_surface(char const *drawing_name);
-
-   // Activate (i.e. make visible, if allowed!) a surface
    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);
@@ -182,8 +175,12 @@ struct App {
 
    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