X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fapp.hpp;h=7fccde3d48883d2d8f1a7cb6cc44ff86c776a753;hb=a94f6c67c67a68df8a894699686f2eaa8e870208;hp=ea3e92b45df890b58432977e10888fea89bc2856;hpb=eb7fc4eb593d723f1ac2ed4e5b523afd34e992ac;p=apps%2Fagl-service-windowmanager.git

diff --git a/src/app.hpp b/src/app.hpp
index ea3e92b..7fccde3 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,21 +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;
 }
 
@@ -76,10 +75,18 @@ struct id_allocator {
       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());
+      HMI_DEBUG("wm", "allocated new id %u with name %s", sid, name.c_str());
       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);
@@ -93,7 +100,6 @@ struct id_allocator {
    }
 
    // 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()) {
@@ -112,13 +118,36 @@ struct id_allocator {
 };
 
 struct App {
-   struct binding_api api;
+   enum EventType {
+      Event_Val_Min = 0,
+
+      Event_Active = Event_Val_Min,
+      Event_Inactive,
+
+      Event_Visible,
+      Event_Invisible,
+
+      Event_SyncDraw,
+      Event_FlushDraw,
+
+      Event_Val_Max = Event_FlushDraw,
+   };
+
+   const std::vector<const char *> kListEventName{
+     "active",
+     "inactive",
+     "visible",
+     "invisible",
+     "syncdraw",
+     "flushdraw"
+   };
+
    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;
@@ -136,6 +165,11 @@ struct App {
 
    Policy policy;
 
+   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;
 
@@ -146,16 +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);