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 11ae8a7..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 {
@@ -57,17 +55,6 @@ static const char *kNameAreaSub = "sub";
 /* Key for json obejct */
 static const char *kKeyDrawingName = "drawing_name";
 static const char *kKeyDrawingArea = "drawing_area";
-static const char *kKeyDrawingRect = "drawing_rect";
-static const char *kKeyX           = "x";
-static const char *kKeyY           = "y";
-static const char *kKeyWidth       = "width";
-static const char *kKeyHeight      = "height";
-static const char *kKeyWidthPixel  = "width_pixel";
-static const char *kKeyHeightPixel = "height_pixel";
-static const char *kKeyWidthMm     = "width_mm";
-static const char *kKeyHeightMm    = "height_mm";
-
-
 
 struct id_allocator {
    unsigned next = 1;
@@ -92,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);
@@ -123,9 +118,6 @@ struct id_allocator {
 };
 
 struct App {
-
-   typedef std::unordered_map<uint32_t, struct compositor::rect> rect_map;
-
    enum EventType {
       Event_Val_Min = 0,
 
@@ -150,7 +142,6 @@ struct App {
      "flushdraw"
    };
 
-   struct binding_api api;
    struct controller_hooks chooks;
 
    // This is the one thing, we do not own.
@@ -176,7 +167,8 @@ struct App {
 
    std::map<const char *, struct afb_event> map_afb_event;
 
-   rect_map area_info;
+   // FOR CES DEMO
+   std::vector<int> surface_bg;
 
    explicit App(wl::display *d);
    ~App() = default;
@@ -188,19 +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);
-   result<json_object *> api_get_display_info();
-   result<json_object *> api_get_area_info(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);
@@ -223,7 +215,7 @@ private:
    // TMC WM Events to clients
    void emit_activated(char const *label);
    void emit_deactivated(char const *label);
-   void emit_syncdraw(char const *label, char const *area, int x, int y, int w, int h);
+   void emit_syncdraw(char const *label, char const *area);
    void emit_flushdraw(char const *label);
    void emit_visible(char const *label, bool is_visible);
    void emit_invisible(char const *label);