App/API: fix event emission methods

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

diff --git a/src/app.hpp b/src/app.hpp
index a35be27..6921865 100644 (file)
--- a/src/app.hpp
+++ b/src/app.hpp
@@ -21,6 +21,7 @@
 #include <memory>
 #include <unordered_map>
 #include <unordered_set>
+#include <deque>
 
 #include "afb_binding_api.hpp"
 #include "config.hpp"
@@ -41,7 +42,10 @@ struct controller;
 namespace wm {
 
 struct id_allocator {
-   unsigned next = 0x0100'0000;
+   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
    std::unordered_map<unsigned, std::string> surfaces;
@@ -53,8 +57,8 @@ struct id_allocator {
    id_allocator &operator=(id_allocator const &);
    id_allocator &operator=(id_allocator &&) = delete;
 
-   // Allocate a new ID
-   unsigned operator()(std::string const &name) {
+   // Insert and return a new ID
+   unsigned generate_id(std::string const &name) {
       unsigned sid = this->next++;
       this->surfaces[sid] = name;
       // this->pending_surfaces.insert({sid});
@@ -64,16 +68,34 @@ struct id_allocator {
    }
 
    // Lookup by ID or by name
-   optional<unsigned> operator[](std::string const &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);
    }
 
-   optional<std::string> operator[](unsigned id) {
+   optional<std::string> lookup(unsigned id) const {
       auto i = this->surfaces.find(id);
       return i == this->surfaces.end() ? nullopt
                                        : 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);
+      }
+   }
+
+   void remove_id(unsigned id) {
+      auto i = this->surfaces.find(id);
+      if (i != this->surfaces.end()) {
+         this->names.erase(i->second);
+         this->surfaces.erase(i);
+      }
+   }
 };
 
 struct App {
@@ -92,13 +114,14 @@ struct App {
    layer_map layers;
 
    typedef std::pair<char const *, std::function<void()>> name_task_pair;
-   std::vector<name_task_pair> pending;
 
    typedef std::map<std::string, int> drawing_name_map;
    drawing_name_map name_mapping;
 
    struct id_allocator id_alloc;
 
+   std::deque<unsigned> last_active;
+
    explicit App(wl::display *d);
    ~App();
 
@@ -114,20 +137,25 @@ struct App {
 
    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);
 
    // Activate (i.e. make visible, if allowed!) a surface
-   char const *activate_surface(char const *drawng_name);
-
-   // add tasks, executed after dispatch_events()
-   void add_task(char const *name, std::function<void()> &&f);
-   void execute_pending();
+   char const *activate_surface(char const *drawing_name);
+   char const *deactivate_surface(char const *drawing_name);
 
    // Events from the compositor we are interested in
    void surface_created(uint32_t surface_id);
    void surface_removed(uint32_t surface_id);
+
+   // 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);
 };
 
 }  // namespace wm