X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fapp.cpp;h=05f8b6497b090b9fbda7254fc6d3bd0ddcda6f93;hb=f509e0a79eef109e77532b9e391f07609e296b87;hp=cf10cefe84fdabec6c4ea4f828eacb859b0b7dcf;hpb=26557a931e330a3ce92d241dcb275a49b66afa10;p=apps%2Fagl-service-windowmanager.git diff --git a/src/app.cpp b/src/app.cpp index cf10cef..05f8b64 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -93,6 +93,249 @@ struct result load_layer_map(char const *filename) { } // namespace +namespace rm { +App *context; +static void onStateTransitioned(json_object* json_out) { + context->updateWindowResources(json_out); +} + +static void onError(json_object* json_out) { + HMI_DEBUG("wm", "error message from PolicyManager:%s", + json_object_get_string(json_out)); +} +} // namespace rm + + +void App::updateCarStates(json_object* json_out) { + // 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; + } + } +} + +void App::updateLayers(json_object* json_out) { + // Get displayed roles from current layout + json_object* json_layers; + if (!json_object_object_get_ex(json_out, "layers", &json_layers)) { + HMI_DEBUG("wm", "Not found key \"layers\""); + return; + } + + int len = json_object_array_length(json_layers); + HMI_DEBUG("wm", "json_layers len:%d", len); + HMI_DEBUG("wm", "json_layers dump:%s", json_object_get_string(json_layers)); + + for (int i=0; icrr_layer_state[layer_name]; + for (int j=0; jsetSurfaceSize(role_name.c_str(), area_name.c_str()); + } + else { + HMI_DEBUG("wm", "current role:%s area:%s", + i_crr->first.c_str(), i_crr->second.c_str()); + + // If next role exists in current and area is different with current + if (area_name != i_crr->second) { + HMI_DEBUG("wm", "next role exists in current and area is different with current"); + + // Set surface size + this->setSurfaceSize(role_name.c_str(), area_name.c_str()); + } + + // Remove role which exist in next list from current list + crr_roles.erase(i_crr); + } + } + + // Deactivate roles which remains in current list + // because these are not displayed in next layout + for (auto i_crr : crr_roles) { + HMI_DEBUG("wm", "Deactivate role:%s", i_crr.first.c_str()); + + // Deactivate + this->deactivate(i_crr.first.c_str()); + } + + // Update current role list + this->crr_layer_state[layer_name] = nxt_roles; + } + } +} + +void App::updateWindowResources(json_object* json_out) { + // Update car states + this->updateCarStates(json_out); + + // Update layers + this->updateLayers(json_out); +} + /** * App Impl */ @@ -138,6 +381,9 @@ int App::init() { return -1; } + // Store my context for calling callback for PolicyManager + rm::context = this; + #if 1 // @@@@@ // Load app.db this->loadAppDb(); @@ -146,6 +392,12 @@ int App::init() { // Initialize PolicyManager this->pm_.initialize(); + // Register callback to PolicyManager + PolicyManager::CallbackTable callback; + callback.onStateTransitioned = rm::onStateTransitioned; + callback.onError = rm::onError; + this->pm_.registerCallback(callback); + // Initialize LayoutManager this->lm_.initialize(); @@ -315,7 +567,7 @@ void App::allocateWindowResource(char const *event, char const *drawing_name, } else if (0 == strcmp("homescreen", new_role)) { // Now homescreen specifies "normalfull" - new_area = "full"; + new_area = "fullscreen"; } else { new_area = "normal"; @@ -335,11 +587,9 @@ 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)); } @@ -347,178 +597,14 @@ void App::allocateWindowResource(char const *event, char const *drawing_name, 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)); - } - - // 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) { - 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 { - reply("Unknown parking brake state"); - return; - } - } + // Set input event data + this->pm_.setInputEventData(json_in); - // 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; - } - - 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 { - reply("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)) { - reply("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 { - reply("Unknown lightstatus brake state"); - 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) { - 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 { - 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) { - 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 { - 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!!"); - } + // Execute state transition + this->pm_.executeStateTransition(); // Release json_object - json_object_put(json_out); + json_object_put(json_in); return; } @@ -544,12 +630,17 @@ 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) { + int surface_id = this->pending_end_draw[i]; + + 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]); + this->activate(surface_id); this->emit_flushdraw(drawing_name); } } @@ -632,10 +723,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) { + auto role = this->lookup_name(surface_id); + if (role) { this->allocateWindowResource("deactivate", - drawing_name->c_str(), nullptr, + role->c_str(), nullptr, [](const char*){}); } } @@ -711,7 +802,10 @@ void App::emitCarRun() { } result 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. @@ -723,10 +817,10 @@ result 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 @@ -736,24 +830,8 @@ result 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) - const char* role = this->convertDrawingNameToRole(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(id); } @@ -765,8 +843,10 @@ result 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) { @@ -780,14 +860,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 @@ -821,8 +901,11 @@ result App::api_get_display_info() { result 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("Surface does not exist"); } @@ -864,11 +947,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 @@ -889,7 +970,7 @@ void App::activate(int id) { } } } - // <<< FOR CES DEMO + this->layout_commit(); this->emit_visible(label); @@ -903,11 +984,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); @@ -927,7 +1006,6 @@ void App::deactivate(int id) { else { this->controller->surfaces[id]->set_visibility(0); } - // <<< FOR CES DEMO this->layout_commit(); @@ -937,14 +1015,14 @@ 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); } @@ -976,129 +1054,6 @@ void controller_hooks::surface_destination_rectangle(uint32_t /*surface_id*/, uint32_t /*w*/, uint32_t /*h*/) {} -int App::allocateSurface() { - HMI_DEBUG("wm", "Call"); - - // Get current/previous layers - LayoutManager::TypeLayers crr_layers = this->lm_.getCurrentLayers(); - LayoutManager::TypeLayers prv_layers = this->lm_.getPreviousLayers(); - - // Update resource of all layers - for (auto itr_layers = crr_layers.begin(); - itr_layers != crr_layers.end(); ++itr_layers) { - // Get layer - std::string layer = itr_layers->first; - HMI_DEBUG("wm", "Try to update resource in %s layer", layer.c_str()); - - // If layout is changed, update resouce - if (this->lm_.isLayoutChanged(layer.c_str())) { - // Get current/previous layout - LayoutManager::TypeLayouts crr_layout = itr_layers->second; - LayoutManager::TypeLayouts prv_layout = prv_layers[layer]; - - // Get current/previous layout name - std::string crr_layout_name = crr_layout.begin()->first; - std::string prv_layout_name = prv_layout.begin()->first; - HMI_DEBUG("wm", "layout name crr:%s prv:%s", - crr_layout_name.c_str(), prv_layout_name.c_str()); - - // Get current/previous ares - LayoutManager::TypeAreas crr_areas = crr_layout[crr_layout_name]; - LayoutManager::TypeAreas prv_areas = prv_layout[prv_layout_name]; - - // Create previous displayed role list - std::string prv_area_name; - std::vector prv_role_list; - for (auto itr_areas = prv_areas.begin(); - itr_areas != prv_areas.end(); ++itr_areas) { - prv_area_name = itr_areas->first; - prv_role_list.push_back(prv_areas[prv_area_name]["role"]); - HMI_DEBUG("wm", "previous displayed role:%s", - prv_areas[prv_area_name]["role"].c_str()); - } - - // Allocate surface for each area - std::string crr_area_name; - std::string crr_role_name; - LayoutManager::TypeRolCtg crr_rol_ctg; - for (auto itr_areas = crr_areas.begin(); - itr_areas != crr_areas.end(); ++itr_areas) { - crr_area_name = itr_areas->first; - crr_rol_ctg = itr_areas->second; - - // Get role of current area - if ("category" == crr_rol_ctg.begin()->first) { - // If current area have category - // Get category name - std::string crr_ctg = crr_rol_ctg.begin()->second; - - // Serch relevant role from previous displayed role list - for (auto itr_role = prv_role_list.begin(); - itr_role != prv_role_list.end(); ++itr_role) { - std::string prv_ctg = this->pm_.roleToCategory((*itr_role).c_str()); - if (crr_ctg == prv_ctg) { - // First discovered role is set to current role - crr_role_name = *itr_role; - - // Delete used role for other areas - // which have same category - prv_role_list.erase(itr_role); - - break; - } - } - } - else { - crr_role_name = itr_areas->second["role"]; - } - HMI_DEBUG("wm", "Allocate surface for area:%s role:%s", - crr_area_name.c_str(), crr_role_name.c_str()); - - // Deactivate non-displayed role - std::string prv_role_name; - if (crr_layout_name == prv_layout_name) { - HMI_DEBUG("wm", "Current layout is same with previous"); - - // Deactivate previous role in same area - // if it is different with current - prv_role_name = prv_areas[crr_area_name]["role"]; - if (crr_role_name != prv_role_name) { - this->deactivate(prv_role_name); - } - } - else { - HMI_DEBUG("wm", "Current layout is different with previous"); - - if ("none" != prv_layout_name) { - // Deactivate previous role in all area in previous layout - // if it is different with current role - for(auto itr = prv_areas.begin(); itr != prv_areas.end(); ++itr) { - prv_role_name = itr->second["role"].c_str(); - if (crr_role_name != prv_role_name) { - this->deactivate(prv_role_name); - } - } - } - } - - // Set surface for displayed role - if ("none" != crr_layout_name) { - // If current layout is not "none", - // set surface for current role - this->setSurfaceSize(crr_role_name.c_str(), crr_area_name.c_str()); - - // TODO: - // This API is workaround. - // Resource manager should manage each resource infomations - // according to architecture document. - this->lm_.updateArea(layer.c_str(), crr_role_name.c_str(), crr_area_name.c_str()); - } - } - } - } - return 0; -} - void App::setSurfaceSize(const char* role, const char* area) { HMI_DEBUG("wm", "role:%s area:%s", role, area); @@ -1106,32 +1061,31 @@ void App::setSurfaceSize(const char* role, const char* area) { compositor::rect size = this->lm_.getAreaSize(area); // Set destination to the display rectangle - int surface_id = this->role2surfaceid_[role]; - - if (!this->controller->surface_exists(surface_id)) { + auto const &surface_id = this->lookup_id(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]; + auto &s = this->controller->surfaces[*surface_id]; s->set_destination_rectangle(size.x, size.y, size.w, size.h); this->layout_commit(); // Update area information - this->area_info[surface_id].x = size.x; - this->area_info[surface_id].y = size.y; - this->area_info[surface_id].w = size.w; - this->area_info[surface_id].h = size.h; + this->area_info[*surface_id].x = size.x; + this->area_info[*surface_id].y = size.y; + this->area_info[*surface_id].w = size.w; + this->area_info[*surface_id].h = size.h; HMI_DEBUG("wm", "Surface rect { %d, %d, %d, %d }", 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); + this->enqueue_flushdraw(*surface_id); } void App::setAccelPedalPos(double val) {