X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fapp.cpp;h=1e7a617af007d7186c1d2b4d2f632beb3aeefa3b;hb=d1fbf20ba98bcb935d75c7a13ab5d5b9450a7837;hp=296ce35f62abd8ab1742200c00bf50f56b40fd6c;hpb=b126caef1760902eb863af8ea892c4db9b9663f9;p=apps%2Fagl-service-windowmanager.git

diff --git a/src/app.cpp b/src/app.cpp
index 296ce35..1e7a617 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -93,6 +93,176 @@ struct result<layer_map> load_layer_map(char const *filename) {
 }  // namespace
 
 
+namespace rm {
+App *context;
+std::string g_new_role; // TODO: workaround
+static void eventHandler(json_object* json_out) {
+    context->updateWindowResource(json_out);
+}
+}  // namespace rm
+
+
+void App::updateWindowResource(json_object* json_out) {
+    HMI_DEBUG("wm", "role:%s", rm::g_new_role.c_str());
+
+    // Check parking brake state
+    json_object* json_parking_brake;
+    if (!json_object_object_get_ex(json_out, "parking_brake", &json_parking_brake)) {
+        HMI_DEBUG("wm", "Not found key \"parking_brake\"");
+        return;
+    }
+
+    json_bool is_changed;
+    is_changed = jh::getBoolFromJson(json_parking_brake, "is_changed");
+    if (is_changed) {
+        std::string parking_brake_state = jh::getStringFromJson(json_parking_brake, "state");
+        HMI_DEBUG("wm", "parking_brake_state: %s", parking_brake_state.c_str());
+
+        // Update state and emit event
+        if ("parking_brake_off" == parking_brake_state) {
+            this->crr_car_info_.parking_brake_stt = false;
+#if 0 // FOR ALS: using lightstatus brake, so do not emit parking brake event
+            this->emitParkingBrakeOff();
+#endif
+        }
+        else if ("parking_brake_on" == parking_brake_state) {
+            this->crr_car_info_.parking_brake_stt = true;
+#if 0 // FOR ALS: using lightstatus brake, so do not emit parking brake event
+            this->emitParkingBrakeOn();
+#endif
+        }
+        else {
+            HMI_DEBUG("wm", "Unknown parking brake state");
+            return;
+        }
+    }
+
+    // Check accelerator pedal state
+    json_object* json_accel_pedal;
+    if (!json_object_object_get_ex(json_out, "accel_pedal", &json_accel_pedal)) {
+        HMI_DEBUG("wm", "Not found key \"accel_pedal\"");
+        return;
+    }
+
+    is_changed = jh::getBoolFromJson(json_accel_pedal, "is_changed");
+    if (is_changed) {
+        std::string accel_pedal_state = jh::getStringFromJson(json_accel_pedal, "state");
+        HMI_DEBUG("wm", "accel_pedal_state: %s", accel_pedal_state.c_str());
+
+        // Update state
+        if ("accel_pedal_off" == accel_pedal_state) {
+            this->crr_car_info_.accel_pedal_stt = false;
+        }
+        else if ("accel_pedal_on" == accel_pedal_state) {
+            this->crr_car_info_.accel_pedal_stt = true;
+        }
+        else {
+            HMI_DEBUG("wm", "Unknown accel pedal state");
+            return;
+        }
+    }
+
+    // Check lightstatus brake state
+    json_object* json_lightstatus_brake;
+    if (!json_object_object_get_ex(json_out, "lightstatus_brake", &json_lightstatus_brake)) {
+        HMI_DEBUG("wm", "Not found key \"lightstatus_brake\"");
+        return;
+    }
+
+    is_changed = jh::getBoolFromJson(json_lightstatus_brake, "is_changed");
+    if (is_changed) {
+        std::string lightstatus_brake_state = jh::getStringFromJson(json_lightstatus_brake, "state");
+        HMI_DEBUG("wm", "lightstatus_brake_state: %s", lightstatus_brake_state.c_str());
+
+        // Update state and emit event
+        if ("lightstatus_brake_off" == lightstatus_brake_state) {
+            this->crr_car_info_.lightstatus_brake_stt = false;
+            this->emitLightstatusBrakeOff();
+        }
+        else if ("lightstatus_brake_on" == lightstatus_brake_state) {
+            this->crr_car_info_.lightstatus_brake_stt = true;
+            this->emitLightstatusBrakeOn();
+        }
+        else {
+            HMI_DEBUG("wm", "Unknown lightstatus brake state");
+            return;
+        }
+    }
+
+    // Check car state
+    json_object* json_car;
+    if (!json_object_object_get_ex(json_out, "car", &json_car)) {
+        HMI_DEBUG("wm", "Not found key \"car\"");
+        return;
+    }
+
+    is_changed = jh::getBoolFromJson(json_car, "is_changed");
+    if (is_changed) {
+        std::string car_state = jh::getStringFromJson(json_car, "state");
+        HMI_DEBUG("wm", "car_state: %s", car_state.c_str());
+
+        // Emit car event
+        if ("car_stop" == car_state) {
+            this->crr_car_info_.car_stt = "stop";
+            this->emitCarStop();
+        }
+        else if ("car_run" == car_state) {
+            this->crr_car_info_.car_stt = "run";
+            this->emitCarRun();
+        }
+        else {
+            HMI_DEBUG("wm", "Unknown car state");
+            return;
+        }
+    }
+
+    // Check lamp state
+    json_object* json_lamp;
+    if (!json_object_object_get_ex(json_out, "lamp", &json_lamp)) {
+        HMI_DEBUG("wm", "Not found key \"lamp\"");
+        return;
+    }
+
+    is_changed = jh::getBoolFromJson(json_lamp, "is_changed");
+    if (is_changed) {
+        std::string lamp_state = jh::getStringFromJson(json_lamp, "state");
+        HMI_DEBUG("wm", "lamp_state: %s", lamp_state.c_str());
+
+        // Update state and emit event
+        if ("lamp_off" == lamp_state) {
+            this->crr_car_info_.headlamp_stt = false;
+            this->emitHeadlampOff();
+        }
+        else if ("lamp_on" == lamp_state) {
+            this->crr_car_info_.headlamp_stt = true;
+            this->emitHeadlampOn();
+        }
+        else {
+            HMI_DEBUG("wm", "Unknown lamp state");
+            return;
+        }
+    }
+
+    // Get category
+    const char* category = nullptr;
+    std::string str_category;
+    str_category = this->pm_.roleToCategory(rm::g_new_role.c_str());
+    category = str_category.c_str();
+    HMI_DEBUG("wm", "role:%s category:%s", rm::g_new_role.c_str(), category);
+
+    // Update layout
+    if (this->lm_.updateLayout(json_out, rm::g_new_role.c_str(), category)) {
+        HMI_DEBUG("wm", "Layer is changed!!");
+
+        // Allocate surface
+        this->allocateSurface();
+    }
+    else {
+        HMI_DEBUG("wm", "All layer is NOT changed!!");
+    }
+}
+
+
 /**
  * App Impl
  */
@@ -119,6 +289,13 @@ App::App(wl::display *d)
    } catch (std::exception &e) {
       HMI_ERROR("wm", "Loading of configuration failed: %s", e.what());
    }
+
+   // Initialize current car info
+   this->crr_car_info_.parking_brake_stt = true;
+   this->crr_car_info_.accel_pedal_stt = false;
+   this->crr_car_info_.accel_pedal_pos = 0;
+   this->crr_car_info_.car_stt = "stop";
+   this->crr_car_info_.headlamp_stt = false;
 }
 
 int App::init() {
@@ -131,6 +308,9 @@ int App::init() {
       return -1;
    }
 
+   // Store my context for calling callback for PolicyManager
+   rm::context = this;
+
 #if 1 // @@@@@
    // Load app.db
    this->loadAppDb();
@@ -139,6 +319,12 @@ int App::init() {
    // Initialize PolicyManager
    this->pm_.initialize();
 
+   // Register callback to PolicyManager
+   PolicyManager::CallbackTable callback;
+   callback.onStateTransitioned = rm::eventHandler;
+   callback.onError = nullptr;
+   this->pm_.registerCallback(callback);
+
    // Initialize LayoutManager
    this->lm_.initialize();
 
@@ -262,32 +448,38 @@ void App::layout_commit() {
    this->display->flush();
 }
 
+const char* App::convertDrawingNameToRole(char const *drawing_name) {
+    const char* role;
+
+    if (this->drawingname2role_.find(drawing_name) != this->drawingname2role_.end()) {
+        // drawing_name is old role. So convert to new role.
+        role = this->drawingname2role_[drawing_name].c_str();
+    }
+    else {
+        // drawing_name is new role.
+        role = drawing_name;
+    }
+    HMI_DEBUG("wm", "drawing_name:%s -> role: %s", drawing_name, role);
+
+    return role;
+}
+
 void App::allocateWindowResource(char const *event, char const *drawing_name,
-                                 char const *drawing_area, char const *role,
-                                 const reply_func &reply) {
+                                 char const *drawing_area, const reply_func &reply) {
     const char* new_role = nullptr;
     const char* new_area = nullptr;
 
-    if (0 == strcmp("activate", event)) {
-        // TODO:
-        // This process will be removed
-        // because the applications will specify role instead of drawing_name
-        {
-            if ((nullptr == role) || (0 == strcmp("", role))) {
-                HMI_DEBUG("wm", "Role is not specified, so get by using app name");
-                new_role = this->app2role_[drawing_name].c_str();
-            }
-            else {
-                new_role = role;
-            }
-            HMI_DEBUG("wm", "drawing_name:%s, new_role: %s", drawing_name, new_role);
-        }
+    // Convert old role to new role
+    if ((nullptr != drawing_name) && (0 != strcmp("", drawing_name))) {
+        new_role = this->convertDrawingNameToRole(drawing_name);
+    }
 
+    if (0 == strcmp("activate", event)) {
         // TODO:
         // This process will be removed
         // because the area "normal.full" and "normalfull" will be prohibited
         {
-            if (0 == strcmp("Restriction", drawing_name)) {
+            if (0 == strcmp("restriction", new_role)) {
                 new_area = drawing_area;
             }
             else {
@@ -312,19 +504,6 @@ void App::allocateWindowResource(char const *event, char const *drawing_name,
         }
     }
     else if (0 == strcmp("deactivate", event)) {
-        // TODO:
-        // This process will be removed
-        // because the applications will specify role instead of drawing_name
-        {
-            if ((nullptr == role) || (0 == strcmp("", role))) {
-                HMI_DEBUG("wm", "Role is not specified, so get by using app name");
-                new_role = this->app2role_[drawing_name].c_str();
-            }
-            else {
-                new_role = role;
-            }
-            HMI_DEBUG("wm", "drawing_name:%s, new_role: %s", drawing_name, new_role);
-        }
         new_area = "";
     }
 
@@ -335,139 +514,21 @@ void App::allocateWindowResource(char const *event, char const *drawing_name,
     // If event is "activate" and area is not specifid,
     // get default value by using role
 
-    // Check Policy
+    // Input event to PolicyManager
     json_object* json_in = json_object_new_object();
-    json_object* json_out = json_object_new_object();
     json_object_object_add(json_in, "event", json_object_new_string(event));
-
     if (nullptr != new_role) {
         json_object_object_add(json_in, "role", json_object_new_string(new_role));
     }
     if (nullptr != new_area) {
         json_object_object_add(json_in, "area", json_object_new_string(new_area));
     }
-
-    int ret = this->pm_.checkPolicy(json_in, &json_out);
-    if (0 > ret) {
-        reply("Error checkPolicy()");
-        return;
-    }
-    else {
-        HMI_DEBUG("wm", "result: %s", json_object_get_string(json_out));
-    }
+    rm::g_new_role = std::string(new_role);  // TODO: workaround
+    this->pm_.inputEvent(json_in);
 
     // Release json_object
     json_object_put(json_in);
 
-    // Check parking brake state
-    json_object* json_parking_brake;
-    if (!json_object_object_get_ex(json_out, "parking_brake", &json_parking_brake)) {
-        reply("Not found key \"parking_brake\"");
-        return;
-    }
-
-    json_bool is_changed;
-    is_changed = jh::getBoolFromJson(json_parking_brake, "is_changed");
-    if (is_changed) {
-        // Update parking brake state
-        std::string parking_brake_state = jh::getStringFromJson(json_parking_brake, "state");
-        HMI_DEBUG("wm", "parking_brake_state: %s", parking_brake_state.c_str());
-
-        // Emit parking brake event
-        if ("parking_brake_off" == parking_brake_state) {
-            this->emitParkingBrakeOff();
-        }
-        else if ("parking_brake_on" == parking_brake_state) {
-            this->emitParkingBrakeOn();
-        }
-        else {
-            reply("Unknown parking brake state");
-            return;
-        }
-    }
-
-    // Check accelerator pedal state
-    json_object* json_accel_pedal;
-    if (!json_object_object_get_ex(json_out, "accel_pedal", &json_accel_pedal)) {
-        reply("Not found key \"accel_pedal\"");
-        return;
-    }
-
-    // Check car state
-    json_object* json_car;
-    if (!json_object_object_get_ex(json_out, "car", &json_car)) {
-        reply("Not found key \"car\"");
-        return;
-    }
-
-    is_changed = jh::getBoolFromJson(json_car, "is_changed");
-    if (is_changed) {
-        // Update car state
-        std::string car_state = jh::getStringFromJson(json_car, "state");
-        HMI_DEBUG("wm", "car_state: %s", car_state.c_str());
-
-        // Emit car event
-        if ("car_stop" == car_state) {
-            this->emitCarStop();
-        }
-        else if ("car_run" == car_state) {
-            this->emitCarRun();
-        }
-        else {
-            reply("Unknown car state");
-            return;
-        }
-    }
-
-    // Check lamp state
-    json_object* json_lamp;
-    if (!json_object_object_get_ex(json_out, "lamp", &json_lamp)) {
-        reply("Not found key \"lamp\"");
-        return;
-    }
-
-    is_changed = jh::getBoolFromJson(json_lamp, "is_changed");
-    if (is_changed) {
-        // Update car state
-        std::string lamp_state = jh::getStringFromJson(json_lamp, "state");
-        HMI_DEBUG("wm", "lamp_state: %s", lamp_state.c_str());
-
-        // Emit lamp event
-        if ("lamp_off" == lamp_state) {
-            this->emitHeadlampOff();
-        }
-        else if ("lamp_on" == lamp_state) {
-            this->emitHeadlampOn();
-        }
-        else {
-            reply("Unknown lamp state");
-            return;
-        }
-    }
-
-    // Get category
-    const char* category = nullptr;
-    std::string str_category;
-    if (nullptr != new_role) {
-        str_category = this->pm_.roleToCategory(new_role);
-        category = str_category.c_str();
-        HMI_DEBUG("wm", "role:%s category:%s", new_role, category);
-    }
-
-    // Update layout
-    if (this->lm_.updateLayout(json_out, new_role, category)) {
-        HMI_DEBUG("wm", "Layer is changed!!");
-
-        // Allocate surface
-        this->allocateSurface();
-    }
-    else {
-        HMI_DEBUG("wm", "All layer is NOT changed!!");
-    }
-
-    // Release json_object
-    json_object_put(json_out);
-
     return;
 }
 
@@ -492,9 +553,12 @@ void App::check_flushdraw(int surface_id) {
 }
 
 void App::api_enddraw(char const *drawing_name) {
+   // Convert drawing_name to role
+   const char* role = this->convertDrawingNameToRole(drawing_name);
+
    for (unsigned i = 0, iend = this->pending_end_draw.size(); i < iend; i++) {
       auto n = this->lookup_name(this->pending_end_draw[i]);
-      if (n && *n == drawing_name) {
+      if (n && *n == role) {
          std::swap(this->pending_end_draw[i], this->pending_end_draw[iend - 1]);
          this->pending_end_draw.resize(iend - 1);
          this->activate(this->pending_end_draw[i]);
@@ -580,10 +644,10 @@ void App::surface_removed(uint32_t surface_id) {
    if (int(surface_id) == this->layers.main_surface) {
       this->deactivate_main_surface();
    } else {
-      auto drawing_name = this->lookup_name(surface_id);
-      if (drawing_name) {
-         this->allocateWindowResource("deactivate", drawing_name->c_str(),
-                                      nullptr, nullptr,
+      auto role = this->lookup_name(surface_id);
+      if (role) {
+         this->allocateWindowResource("deactivate",
+                                      role->c_str(), nullptr,
                                       [](const char*){});
       }
    }
@@ -638,6 +702,16 @@ void App::emitParkingBrakeOn() {
     this->send_event(kListEventName[Event_ParkingBrakeOn]);
 }
 
+void App::emitLightstatusBrakeOff() {
+    // Send LightstatusBrakeOff event for all application
+    this->send_event(kListEventName[Event_LightstatusBrakeOff]);
+}
+
+void App::emitLightstatusBrakeOn() {
+    // Send LightstatusBrakeOn event for all application
+    this->send_event(kListEventName[Event_LightstatusBrakeOn]);
+}
+
 void App::emitCarStop() {
     // Send CarStop event for all application
     this->send_event(kListEventName[Event_CarStop]);
@@ -649,7 +723,10 @@ void App::emitCarRun() {
 }
 
 result<int> App::api_request_surface(char const *drawing_name) {
-   auto lid = this->layers.get_layer_id(std::string(drawing_name));
+   // Convert drawing_name to role
+   const char* role = this->convertDrawingNameToRole(drawing_name);
+
+   auto lid = this->layers.get_layer_id(std::string(role));
    if (!lid) {
       /**
        * register drawing_name as fallback and make it displayed.
@@ -661,10 +738,10 @@ result<int> App::api_request_surface(char const *drawing_name) {
       }
    }
 
-   auto rname = this->lookup_id(drawing_name);
+   auto rname = this->lookup_id(role);
    if (!rname) {
       // name does not exist yet, allocate surface id...
-      auto id = int(this->id_alloc.generate_id(drawing_name));
+      auto id = int(this->id_alloc.generate_id(role));
       this->layers.add_surface(id, *lid);
 
       // set the main_surface[_name] here and now
@@ -674,24 +751,11 @@ result<int> App::api_request_surface(char const *drawing_name) {
          HMI_DEBUG("wm", "Set main_surface id to %u", id);
       }
 
-#if 0 // @@@@@
-      // TODO:
-      // This process will be implemented in SystemManager
-      {
-          // Generate app id
-          auto id = int(this->app_id_alloc_.generate_id(drawing_name));
-          this->appname2appid_[drawing_name] = id;
-      }
-#endif
-
       // Set map of (role, surface_id)
-      std::string role = this->app2role_[std::string(drawing_name)];
       this->role2surfaceid_[role] = id;
 
-      // Set map of (role, app)
-      // If the new app which has the same role which is had by existing app is requested,
-      // the role is given to the new app.
-      this->role2app_[role] = std::string(drawing_name);
+      // Set map of (role, drawing_name)
+      this->role2drawingname_[role] = std::string(drawing_name);
 
       return Ok<int>(id);
    }
@@ -703,8 +767,10 @@ result<int> App::api_request_surface(char const *drawing_name) {
 char const *App::api_request_surface(char const *drawing_name,
                                      char const *ivi_id) {
    ST();
+   // Convert drawing_name to role
+   const char* role = this->convertDrawingNameToRole(drawing_name);
 
-   auto lid = this->layers.get_layer_id(std::string(drawing_name));
+   auto lid = this->layers.get_layer_id(std::string(role));
    unsigned sid = std::stol(ivi_id);
 
    if (!lid) {
@@ -718,14 +784,14 @@ char const *App::api_request_surface(char const *drawing_name,
       }
    }
 
-   auto rname = this->lookup_id(drawing_name);
+   auto rname = this->lookup_id(role);
 
    if (rname) {
        return "Surface already present";
    }
 
    // register pair drawing_name and ivi_id
-   this->id_alloc.register_name_id(drawing_name, sid);
+   this->id_alloc.register_name_id(role, sid);
    this->layers.add_surface(sid, *lid);
 
    // this surface is already created
@@ -759,8 +825,11 @@ result<json_object *> App::api_get_display_info() {
 result<json_object *> App::api_get_area_info(char const *drawing_name) {
    HMI_DEBUG("wm", "called");
 
+   // Convert drawing_name to role
+   const char* role = this->convertDrawingNameToRole(drawing_name);
+
    // Check drawing name, surface/layer id
-   auto const &surface_id = this->lookup_id(drawing_name);
+   auto const &surface_id = this->lookup_id(role);
    if (!surface_id) {
       return Err<json_object *>("Surface does not exist");
    }
@@ -802,11 +871,9 @@ void App::activate(int id) {
       char const *label =
          this->lookup_name(id).value_or("unknown-name").c_str();
 
-      // FOR CES DEMO >>>
-      if ((0 == strcmp(label, "Radio"))
-          || (0 == strcmp(label, "MediaPlayer"))
-          || (0 == strcmp(label, "Music"))
-          || (0 == strcmp(label, "Navigation"))) {
+      if ((0 == strcmp(label, "radio"))
+          || (0 == strcmp(label, "music"))
+          || (0 == strcmp(label, "map"))) {
         for (auto i = surface_bg.begin(); i != surface_bg.end(); ++i) {
             if (id == *i) {
                // Remove id
@@ -827,7 +894,7 @@ void App::activate(int id) {
             }
          }
       }
-      // <<< FOR CES DEMO
+
       this->layout_commit();
 
       this->emit_visible(label);
@@ -841,11 +908,9 @@ void App::deactivate(int id) {
       char const *label =
          this->lookup_name(id).value_or("unknown-name").c_str();
 
-      // FOR CES DEMO >>>
-      if ((0 == strcmp(label, "Radio"))
-          || (0 == strcmp(label, "MediaPlayer"))
-          || (0 == strcmp(label, "Music"))
-          || (0 == strcmp(label, "Navigation"))) {
+      if ((0 == strcmp(label, "radio"))
+          || (0 == strcmp(label, "music"))
+          || (0 == strcmp(label, "map"))) {
 
          // Store id
          this->surface_bg.push_back(id);
@@ -865,7 +930,6 @@ void App::deactivate(int id) {
       else {
          this->controller->surfaces[id]->set_visibility(0);
       }
-      // <<< FOR CES DEMO
 
       this->layout_commit();
 
@@ -875,22 +939,22 @@ void App::deactivate(int id) {
 }
 
 void App::deactivate(std::string role) {
-    std::string app = this->role2app_[role];
-    auto const &id = this->lookup_id(app.c_str());
+    auto const &id = this->lookup_id(role.c_str());
     if (!id) {
       HMI_ERROR("wm", "Surface does not exist");
       return;
     }
-    HMI_DEBUG("wm", "Deactivate role:%s (app:%s)",
-              role.c_str(), app.c_str());
+    std::string drawing_name = this->role2drawingname_[role];
+    HMI_DEBUG("wm", "Deactivate role:%s (drawing_name:%s)",
+              role.c_str(), drawing_name.c_str());
 
     this->deactivate(*id);
 }
 
 void App::deactivate_main_surface() {
    this->layers.main_surface = -1;
-   this->allocateWindowResource("deactivate", this->layers.main_surface_name.c_str(),
-                                nullptr, nullptr,
+   this->allocateWindowResource("deactivate",
+                                this->layers.main_surface_name.c_str(), nullptr,
                                 [](const char*){});
 }
 
@@ -1045,6 +1109,12 @@ void App::setSurfaceSize(const char* role, const char* area) {
 
     // Set destination to the display rectangle
     int surface_id = this->role2surfaceid_[role];
+
+    if (!this->controller->surface_exists(surface_id)) {
+        // Block until all pending request are processed by wayland display server
+        // because waiting for the surface of new app is created
+        this->display->roundtrip();
+    }
     auto &s = this->controller->surfaces[surface_id];
     s->set_destination_rectangle(size.x, size.y, size.w, size.h);
     this->layout_commit();
@@ -1058,14 +1128,18 @@ void App::setSurfaceSize(const char* role, const char* area) {
               size.x, size.y, size.w, size.h);
 
     // Emit syncDraw event
-    const char* app = this->role2app_[role].c_str();
-    this->emit_syncdraw(app, area,
+    const char* drawing_name = this->role2drawingname_[role].c_str();
+    this->emit_syncdraw(drawing_name, area,
                         size.x, size.y, size.w, size.h);
 
     // Enqueue flushDraw event
     this->enqueue_flushdraw(surface_id);
 }
 
+void App::setAccelPedalPos(double val) {
+    this->crr_car_info_.accel_pedal_pos = val;
+}
+
 extern const char* kDefaultAppDb;
 int App::loadAppDb() {
     HMI_DEBUG("wm", "Call");
@@ -1121,12 +1195,12 @@ int App::loadAppDb() {
         }
         HMI_DEBUG("wm", "> role:%s", role);
 
-        this->app2role_[app] = std::string(role);
+        this->drawingname2role_[app] = std::string(role);
     }
 
     // Check
-    for(auto itr = this->app2role_.begin();
-      itr != this->app2role_.end(); ++itr) {
+    for(auto itr = this->drawingname2role_.begin();
+      itr != this->drawingname2role_.end(); ++itr) {
         HMI_DEBUG("wm", "app:%s role:%s",
                   itr->first.c_str(), itr->second.c_str());
     }