#include "controller_hooks.hpp"
#include "layers.hpp"
#include "layout.hpp"
+#include "policy.hpp"
#include "result.hpp"
#include "wayland.hpp"
}
};
-struct LayoutState {
- enum States {
- LayoutNone, // Not useful...
- LayoutSingle,
- LayoutSplit,
- };
-
- enum States state{LayoutSingle};
- int main{-1};
- int sub{-1};
-
- bool operator==(const LayoutState &b) const {
- return state == b.state && main == b.main && sub == b.sub;
- }
- bool operator!=(const LayoutState &b) const {
- return !(*this == b);
- }
-};
-
struct App {
struct binding_api api;
struct controller_hooks chooks;
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<unsigned> lookup_id(char const *name) {
- return this->id_alloc.lookup(std::string(name));
- }
- optional<std::string> lookup_name(unsigned id) {
- return this->id_alloc.lookup(id);
- }
-
- struct LayoutState state;
+ // Set by AFB API when wayland events need to be dispatched
std::atomic<bool> pending_events;
+ std::vector<int> pending_end_draw;
+
+ Policy policy;
+
explicit App(wl::display *d);
~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);
-
- // Allocate a surface ID for this role
- result<int> request_surface(char const *drawing_name);
+ void set_pending_events();
- // Activate (i.e. make visible, if allowed!) a surface
- char const *activate_surface(char const *drawing_name);
- char const *deactivate_surface(char const *drawing_name);
+ result<int> api_request_surface(char const *drawing_name);
+ 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);
void emit_invisible(char const *label);
void emit_visible(char const *label);
- void activate(unsigned id);
- void deactivate(unsigned id);
+ void activate(int id);
+ void deactivate(int id);
+ void deactivate_main_surface();
- bool can_split(unsigned new_id);
+ 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