X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fapp.hpp;h=9424d9f65651e7bd1e58fcbfda641c9c9f3754f5;hb=refs%2Ftags%2F5.0.0;hp=71bc2c27f0f044e9ddf7c5eb0aff3b42fc10d2da;hpb=f8e49ab7a90503ff791e264d61d5b658b0b4fad0;p=staging%2Fwindowmanager.git

diff --git a/src/app.hpp b/src/app.hpp
index 71bc2c2..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;
@@ -179,6 +178,9 @@ private:
    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