Change the protocol from ivi-controller to ivi-wm

[apps/agl-service-windowmanager.git] / src / app.hpp

diff --git a/src/app.hpp b/src/app.hpp
index 413d1c9..7fccde3 100644 (file)
--- a/src/app.hpp
+++ b/src/app.hpp
@@ -24,15 +24,13 @@
 #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"
+#include "wayland_ivi_wm.hpp"
 #include "hmi-debug.h"
 
 namespace wl {
@@ -81,6 +79,14 @@ struct id_allocator {
       return sid;
    }
 
+   // Insert a new ID which defined outside
+   void register_name_id(std::string const &name, unsigned sid) {
+      this->id2name[sid] = name;
+      this->name2id[name] = sid;
+      HMI_DEBUG("wm", "register id %u with name %s", sid, name.c_str());
+      return;
+   }
+
    // Lookup by ID or by name
    optional<unsigned> lookup(std::string const &name) const {
       auto i = this->name2id.find(name);
@@ -136,7 +142,6 @@ struct App {
      "flushdraw"
    };
 
-   struct binding_api api;
    struct controller_hooks chooks;
 
    // This is the one thing, we do not own.
@@ -162,6 +167,9 @@ struct App {
 
    std::map<const char *, struct afb_event> map_afb_event;
 
+   // FOR CES DEMO
+   std::vector<int> surface_bg;
+
    explicit App(wl::display *d);
    ~App() = default;
 
@@ -172,17 +180,19 @@ struct App {
 
    int init();
 
-   int dispatch_events();
    int dispatch_pending_events();
 
    void set_pending_events();
 
    result<int> api_request_surface(char const *drawing_name);
+   char const *api_request_surface(char const *drawing_name, char const *ivi_id);
    char const *api_activate_surface(char const *drawing_name, char const *drawing_area);
    char const *api_deactivate_surface(char const *drawing_name);
    char const *api_enddraw(char const *drawing_name);
    char const *api_subscribe(afb_req *req, char const *event_name);
    void api_ping();
+   void send_event(char const *evname, char const *label);
+   void send_event(char const *evname, char const *label, char const *area);
 
    // Events from the compositor we are interested in
    void surface_created(uint32_t surface_id);