X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fapp.hpp;h=5f6ec836d55c11998831c9e5e5eabb1d9ed4798d;hb=2cb77378b47dfda8032f13f1c0c66d4f389d628c;hp=1029aace81a814f1e0198201e49c9af21156d996;hpb=860d9537b74f6fe406d21d3da753a3d09b995557;p=apps%2Fagl-service-windowmanager.git

diff --git a/src/app.hpp b/src/app.hpp
index 1029aac..5f6ec83 100644
--- a/src/app.hpp
+++ b/src/app.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Mentor Graphics Development (Deutschland) GmbH
+ * Copyright (c) 2017 TOYOTA MOTOR CORPORATION
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,22 +24,20 @@
 #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 {
 struct display;
 }
 
-namespace genivi {
+namespace compositor {
 struct controller;
 }
 
@@ -48,15 +46,25 @@ namespace wm {
 using std::experimental::optional;
 
 /* DrawingArea name used by "{layout}.{area}" */
-static const char *kNameLayoutNormal = "normal";
-static const char *kNameLayoutSplit = "split";
-static const char *kNameAreaFull = "full";
-static const char *kNameAreaMain = "main";
-static const char *kNameAreaSub = "sub";
+extern const char kNameLayoutNormal[];
+extern const char kNameLayoutSplit[];
+extern const char kNameAreaFull[];
+extern const char kNameAreaMain[];
+extern const char kNameAreaSub[];
 
 /* Key for json obejct */
-static const char *kKeyDrawingName = "drawing_name";
-static const char *kKeyDrawingArea = "drawing_area";
+extern const char kKeyDrawingName[];
+extern const char kKeyDrawingArea[];
+extern const char kKeyDrawingRect[];
+extern const char kKeyX[];
+extern const char kKeyY[];
+extern const char kKeyWidth[];
+extern const char kKeyHeigh[];
+extern const char kKeyWidthPixel[];
+extern const char kKeyHeightPixel[];
+extern const char kKeyWidthMm[];
+extern const char kKeyHeightMm[];
+
 
 struct id_allocator {
    unsigned next = 1;
@@ -81,6 +89,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);
@@ -112,6 +128,10 @@ struct id_allocator {
 };
 
 struct App {
+
+   typedef std::unordered_map<uint32_t, struct compositor::rect> rect_map;
+   typedef std::function<void(const char* err_msg)> reply_func;
+
    enum EventType {
       Event_Val_Min = 0,
 
@@ -136,13 +156,12 @@ struct App {
      "flushdraw"
    };
 
-   struct binding_api api;
    struct controller_hooks chooks;
 
    // This is the one thing, we do not own.
    struct wl::display *display;
 
-   std::unique_ptr<struct genivi::controller> controller;
+   std::unique_ptr<struct compositor::controller> controller;
    std::vector<std::unique_ptr<struct wl::output>> outputs;
 
    struct config config;
@@ -162,6 +181,12 @@ struct App {
 
    std::map<const char *, struct afb_event> map_afb_event;
 
+   // Surface are info (x, y, w, h)
+   rect_map area_info;
+
+   // FOR CES DEMO
+   std::vector<int> surface_bg;
+
    explicit App(wl::display *d);
    ~App() = default;
 
@@ -172,23 +197,30 @@ 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_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);
+   result<int> api_request_surface(char const *appid, char const *drawing_name);
+   char const *api_request_surface(char const *appid, char const *drawing_name, char const *ivi_id);
+   void api_activate_surface(char const *appid, char const *drawing_name, char const *drawing_area, const reply_func &reply);
+   void api_deactivate_surface(char const *appid, char const *drawing_name, const reply_func &reply);
+   void api_enddraw(char const *appid, char const *drawing_name);
+   result<json_object *> api_get_display_info();
+   result<json_object *> api_get_area_info(char const *drawing_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, int x, int y, int w, int h);
 
    // Events from the compositor we are interested in
    void surface_created(uint32_t surface_id);
    void surface_removed(uint32_t surface_id);
 
-private:
+   // Do not use this function
+   //static int processTimerHandler(sd_event_source *s, uint64_t usec, void *userdata);
+   void timerHandler();
+
+ private:
    optional<int> lookup_id(char const *name);
    optional<std::string> lookup_name(int id);
 
@@ -205,12 +237,19 @@ 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);
+   void emit_syncdraw(char const *label, char const *area, int x, int y, int w, int h);
    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);
 
+   bool do_allocate_window_resource(unsigned sequence_number);
+   void do_enddraw(unsigned sequence_number);
+   void process_request();
+   void set_timer();
+   void stop_timer();
+   const char *check_surface_exist(unsigned req_num, const char *drawing_name);
+
    void activate(int id);
    void deactivate(int id);
    void deactivate_main_surface();
@@ -219,6 +258,11 @@ private:
    void try_layout(struct LayoutState &state,
                    struct LayoutState const &new_layout,
                    std::function<void(LayoutState const &nl)> apply);
+
+   // The following function is temporary.
+   // Then will be removed when layermanager is finished
+   void lm_layout_change(unsigned req_num, const char* drawing_name);
+   void lm_enddraw(const char* drawing_name);
 };
 
 }  // namespace wm