X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fapp.hpp;h=9424d9f65651e7bd1e58fcbfda641c9c9f3754f5;hb=ac77bd576083ccecfce128b1bca6ab66d16491ee;hp=c12654dbe3cac454d8668eb8c3f356145313f9af;hpb=875547362223909f750d4ab2f536735e5b344fc8;p=staging%2Fwindowmanager.git

diff --git a/src/app.hpp b/src/app.hpp
index c12654d..9424d9f 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,7 +113,6 @@ 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
@@ -126,8 +123,10 @@ struct App {
 
    std::vector<int> pending_end_draw;
 
+   Policy policy;
+
    explicit App(wl::display *d);
-   ~App();
+   ~App() = default;
 
    App(App const &) = delete;
    App &operator=(App const &) = delete;
@@ -163,6 +162,7 @@ private:
    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);
@@ -175,8 +175,12 @@ private:
 
    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