app: remove add_task/execute_pending support

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

diff --git a/src/app.hpp b/src/app.hpp
index 9df1573..8a5dc2f 100644 (file)
--- a/src/app.hpp
+++ b/src/app.hpp
@@ -14,23 +14,22 @@
  * limitations under the License.
  */
 
-//
-// Created by mfritzsc on 7/11/17.
-//
-
 #ifndef TMCAGLWM_APP_HPP
 #define TMCAGLWM_APP_HPP
 
 #include <json-c/json.h>
 #include <memory>
+#include <unordered_map>
+#include <unordered_set>
+#include <deque>
 
 #include "afb_binding_api.hpp"
+#include "config.hpp"
 #include "controller_hooks.hpp"
 #include "layers.hpp"
 #include "layout.hpp"
 #include "result.hpp"
 #include "wayland.hpp"
-#include "config.hpp"
 
 namespace wl {
 struct display;
@@ -42,6 +41,63 @@ struct controller;
 
 namespace wm {
 
+struct id_allocator {
+   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;
+   // std::unordered_set<unsigned> pending_surfaces;
+   std::unordered_map<std::string, unsigned> names;
+
+   id_allocator(id_allocator const &) = delete;
+   id_allocator(id_allocator &&) = delete;
+   id_allocator &operator=(id_allocator const &);
+   id_allocator &operator=(id_allocator &&) = delete;
+
+   // 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});
+      this->names[name] = sid;
+      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);
+   }
+
+   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 {
    struct binding_api api;
    struct controller_hooks chooks;
@@ -58,25 +114,47 @@ struct App {
    layer_map layers;
 
    typedef std::pair<char const *, std::function<void()>> name_task_pair;
-   std::vector<name_task_pair> pending;
 
-   App(wl::display *d);
+   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();
 
    App(App const &) = delete;
    App &operator=(App const &) = delete;
+   App(App &&) = delete;
+   App &operator=(App &&) = delete;
 
    int init();
-   int dispatch_events();
    int init_layout();
+
+   int dispatch_events();
+
    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 add_task(char const *name, std::function<void()> &&f);
-   void execute_pending();
+   // 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);
 
+   // 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_visible(char const *label, bool is_visible);
 };
 
 }  // namespace wm