X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fapp.hpp;h=b7d68154f10a53fa13093b4fdb6c964afe627ee4;hb=3a3f1ddf5c67403d61341034d5d189d13a900474;hp=ee4e7329c493c4c26be28f5573cf044ae1a53f1a;hpb=25abec6a1ff6661283976f202f1ac43b2eb4f455;p=apps%2Fagl-service-windowmanager.git

diff --git a/src/app.hpp b/src/app.hpp
index ee4e732..b7d6815 100644
--- a/src/app.hpp
+++ b/src/app.hpp
@@ -24,15 +24,14 @@
 #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 "policy_manager.hpp"
 #include "hmi-debug.h"
 
 namespace wl {
@@ -48,15 +47,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;
@@ -120,6 +129,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,
 
@@ -132,7 +145,16 @@ struct App {
       Event_SyncDraw,
       Event_FlushDraw,
 
-      Event_Val_Max = Event_FlushDraw,
+      Event_HeadlampOff,
+      Event_HeadlampOn,
+
+      Event_ParkingBrakeOff,
+      Event_ParkingBrakeOn,
+
+      Event_CarStop,
+      Event_CarRun,
+
+      Event_Val_Max = Event_CarRun,
    };
 
    const std::vector<const char *> kListEventName{
@@ -141,10 +163,15 @@ struct App {
      "visible",
      "invisible",
      "syncdraw",
-     "flushdraw"
+     "flushdraw",
+     "headlamp_off",
+     "headlamp_on",
+     "parking_brake_off",
+     "parking_brake_on",
+     "car_stop",
+     "car_run",
    };
 
-   struct binding_api api;
    struct controller_hooks chooks;
 
    // This is the one thing, we do not own.
@@ -170,6 +197,9 @@ 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;
 
@@ -183,24 +213,44 @@ 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 allocateWindowResource(char const *event, char const *drawing_name,
+                               char const *role, char const *drawing_area,
+                               const reply_func &reply);
+   void api_enddraw(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);
+   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:
+   PolicyManager pm_;
+   LayoutManager lm_;
+   std::unordered_map<std::string, int> role2surfaceid_;
+   std::unordered_map<std::string, std::string> app2role_;
+   std::unordered_map<std::string, std::string> role2app_;
+   std::unordered_map<int, int> appid2role_;
+
+   int allocateSurface();
+   void setSurfaceSize(const char* role, const char* area);
+   int loadAppDb();
+
+#if 0
+   struct id_allocator app_id_alloc_;
+   std::unordered_map<std::string, int> appname2appid_;
+#endif
+
    optional<int> lookup_id(char const *name);
    optional<std::string> lookup_name(int id);
 
@@ -211,26 +261,28 @@ private:
 
    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, 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);
+   void emitHeadlampOff();
+   void emitHeadlampOn();
+   void emitParkingBrakeOff();
+   void emitParkingBrakeOn();
+   void emitCarStop();
+   void emitCarRun();
 
    void activate(int id);
    void deactivate(int id);
+   void deactivate(std::string role);
    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