struct id_allocator {
constexpr static const unsigned id_shift = 22;
constexpr static const unsigned id_mask = (1 << id_shift) - 1;
struct id_allocator {
constexpr static const unsigned id_shift = 22;
constexpr static const unsigned id_mask = (1 << id_shift) - 1;
// Insert and return a new ID
unsigned generate_id(std::string const &name) {
unsigned sid = this->next++;
// Insert and return a new ID
unsigned generate_id(std::string const &name) {
unsigned sid = this->next++;
logdebug("allocated new id %u with name %s", sid, name.c_str());
return sid;
}
// Lookup by ID or by name
optional<unsigned> lookup(std::string const &name) const {
logdebug("allocated new id %u with name %s", sid, name.c_str());
return sid;
}
// Lookup by ID or by name
optional<unsigned> lookup(std::string const &name) const {
- auto i = this->names.find(name);
- return i == this->names.end() ? nullopt : optional<unsigned>(i->second);
+ auto i = this->name2id.find(name);
+ return i == this->name2id.end() ? nullopt : optional<unsigned>(i->second);
: optional<std::string>(i->second);
}
// Remove a surface id and name
// I don't think I will need this, do I?
void remove_id(std::string const &name) {
: optional<std::string>(i->second);
}
// Remove a surface id and name
// I don't think I will need this, do I?
void remove_id(std::string const &name) {
- auto i = this->names.find(name);
- if (i != this->names.end()) {
- this->surfaces.erase(i->second);
- this->names.erase(i);
+ auto i = this->name2id.find(name);
+ if (i != this->name2id.end()) {
+ this->id2name.erase(i->second);
+ this->name2id.erase(i);
- auto i = this->surfaces.find(id);
- if (i != this->surfaces.end()) {
- this->names.erase(i->second);
- this->surfaces.erase(i);
+ auto i = this->id2name.find(id);
+ if (i != this->id2name.end()) {
+ this->name2id.erase(i->second);
+ this->id2name.erase(i);
- typedef std::pair<char const *, std::function<void()>> name_task_pair;
-
- typedef std::map<std::string, int> drawing_name_map;
- drawing_name_map name_mapping;
-
+ // ID allocation and proxy methods for lookup
- void surface_set_layout(uint32_t surface_id);
- char const *activate_surface(uint32_t surface_id);
- char const *deactivate_surface(uint32_t surface_id);
-
- // Allocate a surface ID for this role
- result<int> request_surface(char const *drawing_name);
+ 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();
- // 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);
// 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();
+
// TMC WM Events to clients
void emit_activated(char const *label);
void emit_deactivated(char const *label);
void emit_syncdraw(char const *label);
void emit_flushdraw(char const *label);
void emit_visible(char const *label, bool is_visible);
// TMC WM Events to clients
void emit_activated(char const *label);
void emit_deactivated(char const *label);
void emit_syncdraw(char const *label);
void emit_flushdraw(char const *label);
void emit_visible(char const *label, bool is_visible);
+ void emit_invisible(char const *label);
+ void emit_visible(char const *label);
+
+ void activate(int id);
+ void deactivate(int id);
+
+ bool can_split(struct LayoutState const &state, int new_id);