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("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 = "";
}
// Check Policy
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, "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);
+ // Input event to PolicyManager
+ this->pm_.inputEvent(json_in,
+ [this, new_role, reply] (json_object* json_out) {
+ HMI_DEBUG("wm", "role:%s", new_role);
// Check parking brake state
json_object* json_parking_brake;
else {
HMI_DEBUG("wm", "All layer is NOT changed!!");
}
+});
// 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) {
+ 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]);
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*){});
}
}
}
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);
}
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*){});
}
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
}
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