#define TMCAGLWM_APP_HPP
#include <json-c/json.h>
+
+#include <atomic>
#include <memory>
#include <unordered_map>
#include <unordered_set>
-#include <deque>
+#include <experimental/optional>
#include "afb_binding_api.hpp"
#include "config.hpp"
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;
}
};
-struct LayoutState {
- enum States {
- LayoutSingle,
- LayoutSplit,
- };
-
- enum States state;
- int main;
- int sub;
-};
-
struct App {
struct binding_api api;
struct controller_hooks chooks;
struct config config;
- layouts_type layouts;
+ // 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) {
+ optional<int> lookup_id(char const *name) {
return this->id_alloc.lookup(std::string(name));
}
- optional<std::string> lookup_name(unsigned id) {
+ optional<std::string> lookup_name(int 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;
+ void set_pending_events() {
+ this->pending_events.store(true, std::memory_order_release);
+ }
+ bool pop_pending_events() {
+ bool x{true};
+ return this->pending_events.compare_exchange_strong(
+ x, false, std::memory_order_consume);
+ }
+
+ std::vector<int> pending_end_draw;
+ void enqueue_flushdraw(int surface_id);
+ void check_flushdraw(int surface_id);
explicit App(wl::display *d);
~App();
int init_layers();
int dispatch_events();
+ int dispatch_pending_events();
- void surface_init_layout(uint32_t surface_id);
+ 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);
+ result<int> api_request_surface(char const *drawing_name);
// 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);
+ 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);
// Events from the compositor we are interested in
void surface_created(uint32_t surface_id);
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);
- bool can_split(unsigned new_id);
+ bool can_split(struct LayoutState const &state, int new_id);
};
} // namespace wm