} // 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::updateCarElements(json_object* json_out) {
+ json_object* json_car_ele;
+ if (!json_object_object_get_ex(json_out, "car_elements", &json_car_ele)) {
+ HMI_DEBUG("wm", "Not found key \"car_elements\"");
+ return;
+ }
+
+ int len = json_object_array_length(json_car_ele);
+ HMI_DEBUG("wm", "json_car_ele len:%d", len);
+
+ for (int i=0; i<len; i++) {
+ json_object* json_tmp = json_object_array_get_idx(json_car_ele, i);
+
+ std::string car_ele_name = jh::getStringFromJson(json_tmp, "name");
+ std::string state = jh::getStringFromJson(json_tmp, "state");
+ json_bool changed = jh::getBoolFromJson(json_tmp, "changed");
+ HMI_DEBUG("wm", "car_element:%s changed:%d", car_ele_name.c_str(), changed);
+
+ if (changed) {
+ if ("parking_brake" == car_ele_name) {
+ if ("off" == 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 ("on" == 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: %s", state.c_str());
+ }
+ }
+ else if ("accel_pedal" == car_ele_name) {
+ if ("off" == state) {
+ this->crr_car_info.accel_pedal_stt = false;
+ }
+ else if ("on" == state) {
+ this->crr_car_info.accel_pedal_stt = true;
+ }
+ else {
+ HMI_DEBUG("wm", "Unknown accel pedal state: %s", state.c_str());
+ }
+ }
+ else if ("lightstatus_brake" == car_ele_name) {
+ if ("off" == state) {
+ this->crr_car_info.lightstatus_brake_stt = false;
+ this->emitLightstatusBrakeOff();
+ }
+ else if ("on" == state) {
+ this->crr_car_info.lightstatus_brake_stt = true;
+ this->emitLightstatusBrakeOn();
+ }
+ else {
+ HMI_DEBUG("wm", "Unknown lightstatus brake state: %s", state.c_str());
+ }
+ }
+ else if ("running" == car_ele_name) {
+ if ("stop" == state) {
+ this->crr_car_info.car_stt = "stop";
+ this->emitCarStop();
+ }
+ else if ("run" == state) {
+ this->crr_car_info.car_stt = "run";
+ this->emitCarRun();
+ }
+ else {
+ HMI_DEBUG("wm", "Unknown car state: %s", state.c_str());
+ }
+ }
+ else if ("lamp" == car_ele_name) {
+ if ("off" == state) {
+ this->crr_car_info.headlamp_stt = false;
+ this->emitHeadlampOff();
+ }
+ else if ("on" == state) {
+ this->crr_car_info.headlamp_stt = true;
+ this->emitHeadlampOn();
+ }
+ else {
+ HMI_DEBUG("wm", "Unknown lamp state: %s", state.c_str());
+ }
+ }
+ else {
+ HMI_DEBUG("wm", "Unknown car element: %s", car_ele_name.c_str());
+ }
+ }
+ }
+}
+
+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);
+
+ for (int i=0; i<len; i++) {
+ json_object* json_tmp = json_object_array_get_idx(json_layers, i);
+
+ std::string layer_name = jh::getStringFromJson(json_tmp, "name");
+ json_bool changed = jh::getBoolFromJson(json_tmp, "changed");
+ HMI_DEBUG("wm", "layer:%s changed:%d", layer_name.c_str(), changed);
+
+ if (changed) {
+ json_object* json_areas;
+ if (!json_object_object_get_ex(json_tmp, "areas", &json_areas)) {
+ HMI_DEBUG("wm", "Not found key \"areas\"");
+ return;
+ }
+
+ int len = json_object_array_length(json_areas);
+ HMI_DEBUG("wm", "json_layers len:%d", len);
+
+ RoleState nxt_roles;
+ RoleState crr_roles = this->crr_layer_state[layer_name];
+ for (int j=0; j<len; j++) {
+ json_object* json_tmp2 = json_object_array_get_idx(json_areas, j);
+
+ std::string area_name = jh::getStringFromJson(json_tmp2, "name");
+ std::string role_name = jh::getStringFromJson(json_tmp2, "role");
+
+ nxt_roles[role_name] = area_name;
+
+ auto i_crr = crr_roles.find(role_name);
+ HMI_DEBUG("wm", "next role:%s area:%s",
+ role_name.c_str(), area_name.c_str());
+
+ // If next role does not exist in current
+ if (crr_roles.end() == i_crr) {
+ HMI_DEBUG("wm", "next role does not exist in current");
+
+ // Set surface size
+ this->setSurfaceSize(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) {
+ HMI_DEBUG("wm", "json_out dump:%s", json_object_get_string(json_out));
+
+ // Update car elements
+ this->updateCarElements(json_out);
+
+ // Update layers
+ this->updateLayers(json_out);
+}
+
/**
* App Impl
*/
} 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() {
return -1;
}
+ // Store my context for calling callback for PolicyManager
+ rm::context = this;
+
#if 1 // @@@@@
// Load app.db
this->loadAppDb();
#endif
// Initialize PolicyManager
- this->pm_.initialize();
+ 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();
+ this->lm.initialize();
// Make afb event
for (int i=Event_Val_Min; i<=Event_Val_Max; i++) {
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 {
}
else if (0 == strcmp("homescreen", new_role)) {
// Now homescreen specifies "normalfull"
- new_area = "full";
+ new_area = "fullscreen";
}
else {
new_area = "normal";
}
}
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 = "";
}
// 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));
}
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;
- }
+ // Set input event data
+ this->pm.setInputEventData(json_in);
- 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 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!!");
- }
+ // Execute state transition
+ this->pm.executeStateTransition();
// Release json_object
- json_object_put(json_out);
+ json_object_put(json_in);
return;
}
}
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);
}
}
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*){});
}
}
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]);
}
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.
}
}
- 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
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);
}
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) {
}
}
- 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
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");
}
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
}
}
}
- // <<< FOR CES DEMO
+
this->layout_commit();
this->emit_visible(label);
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);
else {
this->controller->surfaces[id]->set_visibility(0);
}
- // <<< FOR CES DEMO
this->layout_commit();
}
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*){});
}
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<std::string> 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);
// Get size of current area
- compositor::rect size = this->lm_.getAreaSize(area);
+ compositor::rect size = this->lm.getAreaSize(area);
// Set destination to the display rectangle
- int surface_id = this->role2surfaceid_[role];
- auto &s = this->controller->surfaces[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];
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) {
+ this->crr_car_info.accel_pedal_pos = val;
}
extern const char* kDefaultAppDb;
}
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());
}
Code Review / apps / agl-service-windowmanager.git / blobdiff