X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fapp.cpp;h=9b01fc72ee23bddda7c60c07ab1b91f84675ccde;hb=8614ffb86ddb853100d310721ce0b7fd26413438;hp=f99b7db178b2718b69ebbae0f084d2d5ec8fd874;hpb=a94f6c67c67a68df8a894699686f2eaa8e870208;p=apps%2Fagl-service-windowmanager.git diff --git a/src/app.cpp b/src/app.cpp index f99b7db..9b01fc7 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -34,10 +34,32 @@ #include #include #include +#include namespace wm { +/* DrawingArea name used by "{layout}.{area}" */ +const char kNameLayoutNormal[] = "normal"; +const char kNameLayoutSplit[] = "split"; +const char kNameAreaFull[] = "full"; +const char kNameAreaMain[] = "main"; +const char kNameAreaSub[] = "sub"; + +/* Key for json obejct */ +const char kKeyDrawingName[] = "drawing_name"; +const char kKeyDrawingArea[] = "drawing_area"; +const char kKeyDrawingRect[] = "drawing_rect"; +const char kKeyX[] = "x"; +const char kKeyY[] = "y"; +const char kKeyWidth[] = "width"; +const char kKeyHeight[] = "height"; +const char kKeyWidthPixel[] = "width_pixel"; +const char kKeyHeightPixel[] = "height_pixel"; +const char kKeyWidthMm[] = "width_mm"; +const char kKeyHeightMm[] = "height_mm"; + + namespace { using nlohmann::json; @@ -97,6 +119,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() { @@ -109,6 +138,17 @@ int App::init() { return -1; } +#if 1 // @@@@@ + // Load app.db + this->loadAppDb(); +#endif + + // Initialize PolicyManager + this->pm_.initialize(); + + // Initialize LayoutManager + this->lm_.initialize(); + // Make afb event for (int i=Event_Val_Min; i<=Event_Val_Max; i++) { map_afb_event[kListEventName[i]] = afb_daemon_make_event(kListEventName[i]); @@ -197,6 +237,8 @@ int App::init_layers() { // Write output dimensions to ivi controller... c->output_size = compositor::size{uint32_t(o->width), uint32_t(o->height)}; + c->physical_size = compositor::size{uint32_t(o->physical_width), + uint32_t(o->physical_height)}; // Clear scene layers.clear(); @@ -222,292 +264,256 @@ int App::init_layers() { return 0; } -void App::surface_set_layout(int surface_id, optional sub_surface_id) { - if (!this->controller->surface_exists(surface_id)) { - HMI_ERROR("wm", "Surface %d does not exist", surface_id); - return; - } - - auto o_layer_id = this->layers.get_layer_id(surface_id); - - if (!o_layer_id) { - HMI_ERROR("wm", "Surface %d is not associated with any layer!", surface_id); - return; - } - - uint32_t layer_id = *o_layer_id; - - auto const &layer = this->layers.get_layer(layer_id); - auto rect = layer.value().rect; - auto &s = this->controller->surfaces[surface_id]; - - int x = rect.x; - int y = rect.y; - int w = rect.w; - int h = rect.h; - - // less-than-0 values refer to MAX + 1 - $VALUE - // e.g. MAX is either screen width or height - if (w < 0) { - w = this->controller->output_size.w + 1 + w; - } - if (h < 0) { - h = this->controller->output_size.h + 1 + h; - } - - if (sub_surface_id) { - if (o_layer_id != this->layers.get_layer_id(*sub_surface_id)) { - HMI_ERROR("wm", - "surface_set_layout: layers of surfaces (%d and %d) don't match!", - surface_id, *sub_surface_id); - return; - } - - int x_off = 0; - int y_off = 0; - - // split along major axis - if (w > h) { - w /= 2; - x_off = w; - } else { - h /= 2; - y_off = h; - } - - auto &ss = this->controller->surfaces[*sub_surface_id]; - - HMI_DEBUG("wm", "surface_set_layout for sub surface %u on layer %u", - *sub_surface_id, layer_id); - - // set destination to the display rectangle - ss->set_destination_rectangle(x + x_off, y + y_off, w, h); - - } - - HMI_DEBUG("wm", "surface_set_layout for surface %u on layer %u", surface_id, - layer_id); - - // set destination to the display rectangle - s->set_destination_rectangle(x, y, w, h); - - HMI_DEBUG("wm", "Surface %u now on layer %u with rect { %d, %d, %d, %d }", - surface_id, layer_id, x, y, w, h); -} - void App::layout_commit() { this->controller->commit_changes(); this->display->flush(); } -char const *App::api_activate_surface(char const *drawing_name, char const *drawing_area) { - ST(); - - auto const &surface_id = this->lookup_id(drawing_name); - - if (!surface_id) { - return "Surface does not exist"; - } - - if (!this->controller->surface_exists(*surface_id)) { - return "Surface does not exist in controller!"; - } - - auto layer_id = this->layers.get_layer_id(*surface_id); - - if (!layer_id) { - return "Surface is not on any layer!"; - } - - auto o_state = *this->layers.get_layout_state(*surface_id); - - if (o_state == nullptr) { - return "Could not find layer for surface"; - } - - struct LayoutState &state = *o_state; - - // disable layers that are above our current layer - for (auto const &l : this->layers.mapping) { - if (l.second.layer_id <= *layer_id) { - continue; - } - - bool flush = false; - if (l.second.state.main != -1) { - this->deactivate(l.second.state.main); - l.second.state.main = -1; - flush = true; - } - - if (l.second.state.sub != -1) { - this->deactivate(l.second.state.sub); - l.second.state.sub = -1; - flush = true; - } - - if (flush) { - this->layout_commit(); - } - } - - auto layer = this->layers.get_layer(*layer_id); +const char* App::convertDrawingNameToRole(char const *drawing_name) { + const char* role; - if (state.main == -1) { - this->try_layout( - state, LayoutState{*surface_id}, [&] (LayoutState const &nl) { - HMI_DEBUG("wm", "Layout: %s", kNameLayoutNormal); - this->surface_set_layout(*surface_id); - state = nl; - - // Commit for configuraton - this->layout_commit(); - - std::string str_area = std::string(kNameLayoutNormal) + "." + std::string(kNameAreaFull); - this->emit_syncdraw(drawing_name, str_area.c_str()); - this->enqueue_flushdraw(state.main); - }); - } else { - if (0 == strcmp(drawing_name, "HomeScreen")) { - this->try_layout( - state, LayoutState{*surface_id}, [&] (LayoutState const &nl) { - HMI_DEBUG("wm", "Layout: %s", kNameLayoutNormal); - std::string str_area = std::string(kNameLayoutNormal) + "." + std::string(kNameAreaFull); - this->emit_syncdraw(drawing_name, str_area.c_str()); - this->enqueue_flushdraw(state.main); - }); - } else { - bool can_split = this->can_split(state, *surface_id); - - if (can_split) { - this->try_layout( - state, - LayoutState{state.main, *surface_id}, - [&] (LayoutState const &nl) { - HMI_DEBUG("wm", "Layout: %s", kNameLayoutSplit); - std::string main = - std::move(*this->lookup_name(state.main)); - - this->surface_set_layout(state.main, surface_id); - if (state.sub != *surface_id) { - if (state.sub != -1) { - this->deactivate(state.sub); - } - } - state = nl; - - // Commit for configuration and visibility(0) - this->layout_commit(); - - std::string str_area_main = std::string(kNameLayoutSplit) + "." + std::string(kNameAreaMain); - std::string str_area_sub = std::string(kNameLayoutSplit) + "." + std::string(kNameAreaSub); - this->emit_syncdraw(main.c_str(), str_area_main.c_str()); - this->emit_syncdraw(drawing_name, str_area_sub.c_str()); - this->enqueue_flushdraw(state.main); - this->enqueue_flushdraw(state.sub); - }); - } else { - this->try_layout( - state, LayoutState{*surface_id}, [&] (LayoutState const &nl) { - HMI_DEBUG("wm", "Layout: %s", kNameLayoutNormal); - - this->surface_set_layout(*surface_id); - if (state.main != *surface_id) { - this->deactivate(state.main); - } - if (state.sub != -1) { - if (state.sub != *surface_id) { - this->deactivate(state.sub); - } - } - state = nl; - - // Commit for configuraton and visibility(0) - this->layout_commit(); - - std::string str_area = std::string(kNameLayoutNormal) + "." + std::string(kNameAreaFull); - this->emit_syncdraw(drawing_name, str_area.c_str()); - this->enqueue_flushdraw(state.main); - }); - } - } - } + 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); - // no error - return nullptr; + return role; } -char const *App::api_deactivate_surface(char const *drawing_name) { - ST(); - auto const &surface_id = this->lookup_id(drawing_name); - - if (!surface_id) { - return "Surface does not exist"; - } - - if (*surface_id == this->layers.main_surface) { - return "Cannot deactivate main_surface"; - } - - auto o_state = *this->layers.get_layout_state(*surface_id); - - if (o_state == nullptr) { - return "Could not find layer for surface"; - } - - struct LayoutState &state = *o_state; - - if (state.main == -1) { - return "No surface active"; - } - - // Check against main_surface, main_surface_name is the configuration item. - if (*surface_id == this->layers.main_surface) { - HMI_DEBUG("wm", "Refusing to deactivate main_surface %d", *surface_id); - return nullptr; - } - - if (state.main == *surface_id) { - if (state.sub != -1) { - this->try_layout( - state, LayoutState{state.sub, -1}, [&] (LayoutState const &nl) { - std::string sub = std::move(*this->lookup_name(state.sub)); - - this->deactivate(*surface_id); - this->surface_set_layout(state.sub); - state = nl; - - this->layout_commit(); - std::string str_area = std::string(kNameLayoutNormal) + "." + std::string(kNameAreaFull); - this->emit_syncdraw(sub.c_str(), str_area.c_str()); - this->enqueue_flushdraw(state.sub); - }); - } else { - this->try_layout(state, LayoutState{-1, -1}, [&] (LayoutState const &nl) { - this->deactivate(*surface_id); - state = nl; - this->layout_commit(); - }); - } - } else if (state.sub == *surface_id) { - this->try_layout( - state, LayoutState{state.main, -1}, [&] (LayoutState const &nl) { - std::string main = std::move(*this->lookup_name(state.main)); - - this->deactivate(*surface_id); - this->surface_set_layout(state.main); - state = nl; - - this->layout_commit(); - std::string str_area = std::string(kNameLayoutNormal) + "." + std::string(kNameAreaFull); - this->emit_syncdraw(main.c_str(), str_area.c_str()); - this->enqueue_flushdraw(state.main); - }); - } else { - return "Surface is not active"; - } - - return nullptr; +void App::allocateWindowResource(char const *event, char const *drawing_name, + char const *drawing_area, const reply_func &reply) { + const char* new_role = nullptr; + const char* new_area = nullptr; + + // 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", new_role)) { + new_area = drawing_area; + } + else { + if (nullptr == drawing_area) { + new_area = "normal"; + } + else if (0 == strcmp("normal.full", drawing_area)) { + new_area = "normal"; + } + else if (0 == strcmp("restriction.split.sub", drawing_area)) { + new_area = "restriction.split.sub"; + } + else if (0 == strcmp("homescreen", new_role)) { + // Now homescreen specifies "normalfull" + new_area = "full"; + } + else { + new_area = "normal"; + } + } + HMI_DEBUG("wm", "drawing_area:%s, new_area: %s", drawing_area, new_area); + } + } + else if (0 == strcmp("deactivate", event)) { + new_area = ""; + } + + // TODO: + // Check role + + // TODO: + // If event is "activate" and area is not specifid, + // get default value by using role + + // Check Policy + json_object* json_in = 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)); + } + + // 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; + 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; + } + } + + // 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!!"); + } +}); + + // Release json_object + json_object_put(json_in); + + return; } void App::enqueue_flushdraw(int surface_id) { @@ -530,23 +536,32 @@ void App::check_flushdraw(int surface_id) { } } -char const *App::api_enddraw(char const *drawing_name) { +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]); - this->layout_commit(); this->emit_flushdraw(drawing_name); - return nullptr; } } - return "No EndDraw pending for surface"; } void App::api_ping() { this->dispatch_pending_events(); } +void App::send_event(char const *evname){ + HMI_DEBUG("wm", "%s: %s", __func__, evname); + + int ret = afb_event_push(this->map_afb_event[evname], nullptr); + if (ret != 0) { + HMI_DEBUG("wm", "afb_event_push failed: %m"); + } +} + void App::send_event(char const *evname, char const *label){ HMI_DEBUG("wm", "%s: %s(%s)", __func__, evname, label); @@ -559,12 +574,21 @@ void App::send_event(char const *evname, char const *label){ } } -void App::send_event(char const *evname, char const *label, char const *area){ - HMI_DEBUG("wm", "%s: %s(%s, %s)", __func__, evname, label, area); +void App::send_event(char const *evname, char const *label, char const *area, + int x, int y, int w, int h) { + HMI_DEBUG("wm", "%s: %s(%s, %s) x:%d y:%d w:%d h:%d", + __func__, evname, label, area, x, y, w, h); + + json_object *j_rect = json_object_new_object(); + json_object_object_add(j_rect, kKeyX, json_object_new_int(x)); + json_object_object_add(j_rect, kKeyY, json_object_new_int(y)); + json_object_object_add(j_rect, kKeyWidth, json_object_new_int(w)); + json_object_object_add(j_rect, kKeyHeight, json_object_new_int(h)); json_object *j = json_object_new_object(); json_object_object_add(j, kKeyDrawingName, json_object_new_string(label)); json_object_object_add(j, kKeyDrawingArea, json_object_new_string(area)); + json_object_object_add(j, kKeyDrawingRect, j_rect); int ret = afb_event_push(this->map_afb_event[evname], j); if (ret != 0) { @@ -604,9 +628,11 @@ 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->api_deactivate_surface(drawing_name->c_str()); + auto role = this->lookup_name(surface_id); + if (role) { + this->allocateWindowResource("deactivate", + role->c_str(), nullptr, + [](const char*){}); } } @@ -622,8 +648,8 @@ void App::emit_deactivated(char const *label) { this->send_event(kListEventName[Event_Inactive], label); } -void App::emit_syncdraw(char const *label, char const *area) { - this->send_event(kListEventName[Event_SyncDraw], label, area); +void App::emit_syncdraw(char const *label, char const *area, int x, int y, int w, int h) { + this->send_event(kListEventName[Event_SyncDraw], label, area, x, y, w, h); } void App::emit_flushdraw(char const *label) { @@ -640,17 +666,65 @@ void App::emit_invisible(char const *label) { void App::emit_visible(char const *label) { return emit_visible(label, true); } +void App::emitHeadlampOff() { + // Send HeadlampOff event for all application + this->send_event(kListEventName[Event_HeadlampOff]); +} + +void App::emitHeadlampOn() { + // Send HeadlampOn event for all application + this->send_event(kListEventName[Event_HeadlampOn]); +} + +void App::emitParkingBrakeOff() { + // Send ParkingBrakeOff event for all application + this->send_event(kListEventName[Event_ParkingBrakeOff]); +} + +void App::emitParkingBrakeOn() { + // Send ParkingBrakeOn event for all application + 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]); +} + +void App::emitCarRun() { + // Send CarRun event for all application + this->send_event(kListEventName[Event_CarRun]); +} + 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) { - // TODO: Do we need to put these applications on the App layer? - return Err("Drawing name does not match any role"); + /** + * register drawing_name as fallback and make it displayed. + */ + lid = this->layers.get_layer_id(std::string("Fallback")); + HMI_DEBUG("wm", "%s is not registered in layers.json, then fallback as normal app", drawing_name); + if(!lid){ + return Err("Drawing name does not match any role, Fallback is disabled"); + } } - 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 @@ -660,6 +734,12 @@ result App::api_request_surface(char const *drawing_name) { HMI_DEBUG("wm", "Set main_surface id to %u", id); } + // Set map of (role, surface_id) + this->role2surfaceid_[role] = id; + + // Set map of (role, drawing_name) + this->role2drawingname_[role] = std::string(drawing_name); + return Ok(id); } @@ -675,7 +755,14 @@ char const *App::api_request_surface(char const *drawing_name, unsigned sid = std::stol(ivi_id); if (!lid) { - return "Drawing name does not match any role"; + /** + * register drawing_name as fallback and make it displayed. + */ + lid = this->layers.get_layer_id(std::string("Fallback")); + HMI_DEBUG("wm", "%s is not registered in layers.json, then fallback as normal app", drawing_name); + if(!lid){ + return "Drawing name does not match any role, Fallback is disabled"; + } } auto rname = this->lookup_id(drawing_name); @@ -697,6 +784,67 @@ char const *App::api_request_surface(char const *drawing_name, return nullptr; } +result App::api_get_display_info() { + // Check controller + if (!this->controller) { + return Err("ivi_controller global not available"); + } + + // Set display info + compositor::size o_size = this->controller->output_size; + compositor::size p_size = this->controller->physical_size; + + json_object *object = json_object_new_object(); + json_object_object_add(object, kKeyWidthPixel, json_object_new_int(o_size.w)); + json_object_object_add(object, kKeyHeightPixel, json_object_new_int(o_size.h)); + json_object_object_add(object, kKeyWidthMm, json_object_new_int(p_size.w)); + json_object_object_add(object, kKeyHeightMm, json_object_new_int(p_size.h)); + + return Ok(object); +} + +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(role); + if (!surface_id) { + return Err("Surface does not exist"); + } + + if (!this->controller->surface_exists(*surface_id)) { + return Err("Surface does not exist in controller!"); + } + + auto layer_id = this->layers.get_layer_id(*surface_id); + if (!layer_id) { + return Err("Surface is not on any layer!"); + } + + auto o_state = *this->layers.get_layout_state(*surface_id); + if (o_state == nullptr) { + return Err("Could not find layer for surface"); + } + + struct LayoutState &state = *o_state; + if ((state.main != *surface_id) && (state.sub != *surface_id)) { + return Err("Surface is inactive"); + } + + // Set area rectangle + compositor::rect area_info = this->area_info[*surface_id]; + json_object *object = json_object_new_object(); + json_object_object_add(object, kKeyX, json_object_new_int(area_info.x)); + json_object_object_add(object, kKeyY, json_object_new_int(area_info.y)); + json_object_object_add(object, kKeyWidth, json_object_new_int(area_info.w)); + json_object_object_add(object, kKeyHeight, json_object_new_int(area_info.h)); + + return Ok(object); +} + void App::activate(int id) { auto ip = this->controller->sprops.find(id); if (ip != this->controller->sprops.end()) { @@ -704,11 +852,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 @@ -729,7 +875,8 @@ void App::activate(int id) { } } } - // <<< FOR CES DEMO + + this->layout_commit(); this->emit_visible(label); this->emit_activated(label); @@ -742,11 +889,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); @@ -766,63 +911,32 @@ void App::deactivate(int id) { else { this->controller->surfaces[id]->set_visibility(0); } - // <<< FOR CES DEMO + + this->layout_commit(); this->emit_deactivated(label); this->emit_invisible(label); } } -void App::deactivate_main_surface() { - this->layers.main_surface = -1; - this->api_deactivate_surface(this->layers.main_surface_name.c_str()); -} - -bool App::can_split(struct LayoutState const &state, int new_id) { - if (state.main != -1 && state.main != new_id) { - auto new_id_layer = this->layers.get_layer_id(new_id).value(); - auto current_id_layer = this->layers.get_layer_id(state.main).value(); - - // surfaces are on separate layers, don't bother. - if (new_id_layer != current_id_layer) { - return false; - } - - std::string const &new_id_str = this->lookup_name(new_id).value(); - std::string const &cur_id_str = this->lookup_name(state.main).value(); - - auto const &layer = this->layers.get_layer(new_id_layer); - - HMI_DEBUG("wm", "layer info name: %s", layer->name.c_str()); - - if (layer->layouts.empty()) { - return false; - } - - for (auto i = layer->layouts.cbegin(); i != layer->layouts.cend(); i++) { - HMI_DEBUG("wm", "%d main_match '%s'", new_id_layer, i->main_match.c_str()); - auto rem = std::regex(i->main_match); - if (std::regex_match(cur_id_str, rem)) { - // build the second one only if the first already matched - HMI_DEBUG("wm", "%d sub_match '%s'", new_id_layer, i->sub_match.c_str()); - auto res = std::regex(i->sub_match); - if (std::regex_match(new_id_str, res)) { - HMI_DEBUG("wm", "layout matched!"); - return true; - } - } - } - } +void App::deactivate(std::string role) { + auto const &id = this->lookup_id(role.c_str()); + if (!id) { + HMI_ERROR("wm", "Surface does not exist"); + return; + } + std::string drawing_name = this->role2drawingname_[role]; + HMI_DEBUG("wm", "Deactivate role:%s (drawing_name:%s)", + role.c_str(), drawing_name.c_str()); - return false; + this->deactivate(*id); } -void App::try_layout(struct LayoutState & /*state*/, - struct LayoutState const &new_layout, - std::function apply) { - if (this->policy.layout_is_valid(new_layout)) { - apply(new_layout); - } +void App::deactivate_main_surface() { + this->layers.main_surface = -1; + this->allocateWindowResource("deactivate", + this->layers.main_surface_name.c_str(), nullptr, + [](const char*){}); } /** @@ -845,4 +959,300 @@ 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); + + // Get size of current 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)) { + // 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; + HMI_DEBUG("wm", "Surface rect { %d, %d, %d, %d }", + size.x, size.y, size.w, size.h); + + // Emit syncDraw event + 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"); + + // Get afm application installed dir + char const *afm_app_install_dir = getenv("AFM_APP_INSTALL_DIR"); + HMI_DEBUG("wm", "afm_app_install_dir:%s", afm_app_install_dir); + + std::string file_name; + if (!afm_app_install_dir) { + HMI_ERROR("wm", "AFM_APP_INSTALL_DIR is not defined"); + } + else { + file_name = std::string(afm_app_install_dir) + std::string("/etc/app.db"); + } + + // Load app.db + json_object* json_obj; + int ret = jh::inputJsonFilie(file_name.c_str(), &json_obj); + if (0 > ret) { + HMI_ERROR("wm", "Could not open app.db, so use default role information"); + json_obj = json_tokener_parse(kDefaultAppDb); + } + HMI_DEBUG("wm", "json_obj dump:%s", json_object_get_string(json_obj)); + + // Perse apps + HMI_DEBUG("wm", "Perse apps"); + json_object* json_cfg; + if (!json_object_object_get_ex(json_obj, "apps", &json_cfg)) { + HMI_ERROR("wm", "Parse Error!!"); + return -1; + } + + int len = json_object_array_length(json_cfg); + HMI_DEBUG("wm", "json_cfg len:%d", len); + HMI_DEBUG("wm", "json_cfg dump:%s", json_object_get_string(json_cfg)); + + for (int i=0; i json_tmp dump:%s", json_object_get_string(json_tmp)); + + const char* app = jh::getStringFromJson(json_tmp, "name"); + if (nullptr == app) { + HMI_ERROR("wm", "Parse Error!!"); + return -1; + } + HMI_DEBUG("wm", "> app:%s", app); + + const char* role = jh::getStringFromJson(json_tmp, "role"); + if (nullptr == role) { + HMI_ERROR("wm", "Parse Error!!"); + return -1; + } + HMI_DEBUG("wm", "> role:%s", role); + + this->drawingname2role_[app] = std::string(role); + } + + // Check + 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()); + } + + // Release json_object + json_object_put(json_obj); + + return 0; +} + + +const char* kDefaultAppDb = "{ \ + \"apps\": [ \ + { \ + \"name\": \"HomeScreen\", \ + \"role\": \"homescreen\" \ + }, \ + { \ + \"name\": \"Music\", \ + \"role\": \"music\" \ + }, \ + { \ + \"name\": \"MediaPlayer\", \ + \"role\": \"music\" \ + }, \ + { \ + \"name\": \"Video\", \ + \"role\": \"video\" \ + }, \ + { \ + \"name\": \"VideoPlayer\", \ + \"role\": \"video\" \ + }, \ + { \ + \"name\": \"WebBrowser\", \ + \"role\": \"browser\" \ + }, \ + { \ + \"name\": \"Radio\", \ + \"role\": \"radio\" \ + }, \ + { \ + \"name\": \"Phone\", \ + \"role\": \"phone\" \ + }, \ + { \ + \"name\": \"Navigation\", \ + \"role\": \"map\" \ + }, \ + { \ + \"name\": \"HVAC\", \ + \"role\": \"hvac\" \ + }, \ + { \ + \"name\": \"Settings\", \ + \"role\": \"settings\" \ + }, \ + { \ + \"name\": \"Dashboard\", \ + \"role\": \"dashboard\" \ + }, \ + { \ + \"name\": \"POI\", \ + \"role\": \"poi\" \ + }, \ + { \ + \"name\": \"Mixer\", \ + \"role\": \"mixer\" \ + } \ + ] \ +}"; + + } // namespace wm