X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fapp.hpp;h=aac28cd35736d57749ce10f4170cb2bc759b28ec;hb=2f2408428a9ed9205fdb92cc2cb786949042f256;hp=6e18855b9e6d0983ef4b6e4f4f9233f79b06dfa5;hpb=78d6f15eadfdc6d2d4a166e0e559ebad0a34723e;p=staging%2Fwindowmanager.git diff --git a/src/app.hpp b/src/app.hpp index 6e18855..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,7 +113,6 @@ struct App { struct config config; // track current layouts separately - std::map layouts; layer_map layers; // ID allocation and proxy methods for lookup @@ -126,6 +123,8 @@ struct App { std::vector pending_end_draw; + Policy policy; + explicit App(wl::display *d); ~App(); @@ -139,8 +138,6 @@ struct App { 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(); result api_request_surface(char const *drawing_name); @@ -164,6 +161,9 @@ private: int init_layers(); + void surface_set_layout(int surface_id, optional sub_surface_id = nullopt); + void layout_commit(); + // TMC WM Events to clients void emit_activated(char const *label); void emit_deactivated(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 apply); }; } // namespace wm