X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fapp.hpp;h=ee4e7329c493c4c26be28f5573cf044ae1a53f1a;hb=b3f280dd0264f05626d5bc7d896f4b33c9f01e3d;hp=9f8b7cefa1be7028721005460385dac73ea44ee2;hpb=be02238a0e92c74a13daaf516b5f379f29217eb8;p=apps%2Fagl-service-windowmanager-2017.git

diff --git a/src/app.hpp b/src/app.hpp
index 9f8b7ce..ee4e732 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.
@@ -33,12 +33,13 @@
 #include "policy.hpp"
 #include "result.hpp"
 #include "wayland.hpp"
+#include "hmi-debug.h"
 
 namespace wl {
 struct display;
 }
 
-namespace genivi {
+namespace compositor {
 struct controller;
 }
 
@@ -76,10 +77,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);
@@ -141,7 +150,7 @@ struct App {
    // 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;
@@ -161,6 +170,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;
 
@@ -177,6 +189,7 @@ struct App {
    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);