App: fix missing layout_commit() on single-surface deactivate

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

diff --git a/src/app.hpp b/src/app.hpp
index 6e18855..ed27cf2 100644 (file)
--- 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"
 
@@ -126,6 +127,8 @@ struct App {
 
    std::vector<int> pending_end_draw;
 
+   Policy policy;
+
    explicit App(wl::display *d);
    ~App();
 
@@ -139,8 +142,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<int> api_request_surface(char const *drawing_name);
@@ -164,6 +165,9 @@ 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);
    void emit_deactivated(char const *label);
@@ -175,8 +179,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