App: remove unused g_app global, make dtor default

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

diff --git a/src/app.hpp b/src/app.hpp
index 1926ca4..9424d9f 100644 (file)
--- a/src/app.hpp
+++ b/src/app.hpp
@@ -18,13 +18,19 @@
 #define TMCAGLWM_APP_HPP
 
 #include <json-c/json.h>
+
+#include <atomic>
 #include <memory>
+#include <unordered_map>
+#include <unordered_set>
+#include <experimental/optional>
 
 #include "afb_binding_api.hpp"
 #include "config.hpp"
 #include "controller_hooks.hpp"
 #include "layers.hpp"
 #include "layout.hpp"
+#include "policy.hpp"
 #include "result.hpp"
 #include "wayland.hpp"
 
@@ -38,6 +44,62 @@ struct controller;
 
 namespace wm {
 
+using std::experimental::optional;
+
+struct id_allocator {
+   unsigned next = 1;
+
+   // Surfaces that where requested but not yet created
+   std::unordered_map<unsigned, std::string> id2name;
+   // std::unordered_set<unsigned> pending_surfaces;
+   std::unordered_map<std::string, unsigned> name2id;
+
+   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->id2name[sid] = name;
+      // this->pending_surfaces.insert({sid});
+      this->name2id[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->name2id.find(name);
+      return i == this->name2id.end() ? nullopt : optional<unsigned>(i->second);
+   }
+
+   optional<std::string> lookup(unsigned id) const {
+      auto i = this->id2name.find(id);
+      return i == this->id2name.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->name2id.find(name);
+      if (i != this->name2id.end()) {
+         this->id2name.erase(i->second);
+         this->name2id.erase(i);
+      }
+   }
+
+   void remove_id(unsigned id) {
+      auto i = this->id2name.find(id);
+      if (i != this->id2name.end()) {
+         this->name2id.erase(i->second);
+         this->id2name.erase(i);
+      }
+   }
+};
+
 struct App {
    struct binding_api api;
    struct controller_hooks chooks;
@@ -50,29 +112,75 @@ struct App {
 
    struct config config;
 
-   layouts_type layouts;
+   // track current layouts separately
    layer_map layers;
 
-   typedef std::pair<char const *, std::function<void()>> name_task_pair;
-   std::vector<name_task_pair> pending;
+   // ID allocation and proxy methods for lookup
+   struct id_allocator id_alloc;
+
+   // Set by AFB API when wayland events need to be dispatched
+   std::atomic<bool> pending_events;
 
-   App(wl::display *d);
-   ~App();
+   std::vector<int> pending_end_draw;
+
+   Policy policy;
+
+   explicit App(wl::display *d);
+   ~App() = default;
 
    App(App const &) = delete;
    App &operator=(App const &) = delete;
+   App(App &&) = delete;
+   App &operator=(App &&) = delete;
 
    int init();
+
    int dispatch_events();
-   int init_layout();
-   void surface_set_layout(uint32_t surface_id);
-   char const *activate_surface(uint32_t surface_id);
+   int dispatch_pending_events();
+
+   void set_pending_events();
 
-   void add_task(char const *name, std::function<void()> &&f);
-   void execute_pending();
+   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_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);
+   void deactivate_main_surface();
+
+   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