X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fapp.cpp;h=937da6a36cc7808a908819dc3a21fe157f922aee;hb=c83642c69ede418f4c4d89daa0dae4b8698e0765;hp=f99b7db178b2718b69ebbae0f084d2d5ec8fd874;hpb=a94f6c67c67a68df8a894699686f2eaa8e870208;p=apps%2Fagl-service-windowmanager.git diff --git a/src/app.cpp b/src/app.cpp index f99b7db..937da6a 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -38,6 +38,27 @@ 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; @@ -197,6 +218,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(); @@ -283,6 +306,10 @@ void App::surface_set_layout(int surface_id, optional sub_surface_id) { // set destination to the display rectangle ss->set_destination_rectangle(x + x_off, y + y_off, w, h); + this->area_info[*sub_surface_id].x = x; + this->area_info[*sub_surface_id].y = y; + this->area_info[*sub_surface_id].w = w; + this->area_info[*sub_surface_id].h = h; } HMI_DEBUG("wm", "surface_set_layout for surface %u on layer %u", surface_id, @@ -291,6 +318,12 @@ void App::surface_set_layout(int surface_id, optional sub_surface_id) { // set destination to the display rectangle s->set_destination_rectangle(x, y, w, h); + // update area information + this->area_info[surface_id].x = x; + this->area_info[surface_id].y = y; + this->area_info[surface_id].w = w; + this->area_info[surface_id].h = h; + HMI_DEBUG("wm", "Surface %u now on layer %u with rect { %d, %d, %d, %d }", surface_id, layer_id, x, y, w, h); } @@ -300,31 +333,38 @@ void App::layout_commit() { this->display->flush(); } -char const *App::api_activate_surface(char const *drawing_name, char const *drawing_area) { +void App::api_activate_surface(char const *drawing_name, char const *drawing_area, const reply_func &reply) { ST(); auto const &surface_id = this->lookup_id(drawing_name); if (!surface_id) { - return "Surface does not exist"; + reply("Surface does not exist"); + return; } if (!this->controller->surface_exists(*surface_id)) { - return "Surface does not exist in controller!"; + reply("Surface does not exist in controller!"); + return; } auto layer_id = this->layers.get_layer_id(*surface_id); if (!layer_id) { - return "Surface is not on any layer!"; + reply("Surface is not on any layer!"); + return; } auto o_state = *this->layers.get_layout_state(*surface_id); if (o_state == nullptr) { - return "Could not find layer for surface"; + reply("Could not find layer for surface"); + return; } + HMI_DEBUG("wm", "surface %d is detected", *surface_id); + reply(nullptr); + struct LayoutState &state = *o_state; // disable layers that are above our current layer @@ -364,7 +404,9 @@ char const *App::api_activate_surface(char const *drawing_name, char const *draw this->layout_commit(); std::string str_area = std::string(kNameLayoutNormal) + "." + std::string(kNameAreaFull); - this->emit_syncdraw(drawing_name, str_area.c_str()); + compositor::rect area_rect = this->area_info[*surface_id]; + this->emit_syncdraw(drawing_name, str_area.c_str(), + area_rect.x, area_rect.y, area_rect.w, area_rect.h); this->enqueue_flushdraw(state.main); }); } else { @@ -373,7 +415,9 @@ char const *App::api_activate_surface(char const *drawing_name, char const *draw 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()); + compositor::rect area_rect = this->area_info[*surface_id]; + this->emit_syncdraw(drawing_name, str_area.c_str(), + area_rect.x, area_rect.y, area_rect.w, area_rect.h); this->enqueue_flushdraw(state.main); }); } else { @@ -401,8 +445,14 @@ char const *App::api_activate_surface(char const *drawing_name, char const *draw 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()); + compositor::rect area_rect_main = this->area_info[state.main]; + compositor::rect area_rect_sub = this->area_info[*surface_id]; + this->emit_syncdraw(main.c_str(), str_area_main.c_str(), + area_rect_main.x, area_rect_main.y, + area_rect_main.w, area_rect_main.h); + this->emit_syncdraw(drawing_name, str_area_sub.c_str(), + area_rect_sub.x, area_rect_sub.y, + area_rect_sub.w, area_rect_sub.h); this->enqueue_flushdraw(state.main); this->enqueue_flushdraw(state.sub); }); @@ -426,46 +476,55 @@ char const *App::api_activate_surface(char const *drawing_name, char const *draw this->layout_commit(); std::string str_area = std::string(kNameLayoutNormal) + "." + std::string(kNameAreaFull); - this->emit_syncdraw(drawing_name, str_area.c_str()); + compositor::rect area_rect = this->area_info[*surface_id]; + this->emit_syncdraw(drawing_name, str_area.c_str(), + area_rect.x, area_rect.y, area_rect.w, area_rect.h); this->enqueue_flushdraw(state.main); }); } } } - - // no error - return nullptr; } -char const *App::api_deactivate_surface(char const *drawing_name) { +void App::api_deactivate_surface(char const *drawing_name, const reply_func &reply) { ST(); auto const &surface_id = this->lookup_id(drawing_name); if (!surface_id) { - return "Surface does not exist"; - } + reply ("Surface does not exist"); + return; + } if (*surface_id == this->layers.main_surface) { - return "Cannot deactivate main_surface"; + reply("Cannot deactivate main_surface"); + return; } auto o_state = *this->layers.get_layout_state(*surface_id); if (o_state == nullptr) { - return "Could not find layer for surface"; + reply("Could not find layer for surface"); + return; } struct LayoutState &state = *o_state; if (state.main == -1) { - return "No surface active"; + reply("No surface active"); + return; } // 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; + reply(nullptr); + return; } + if((state.main == *surface_id) && (state.sub == *surface_id)){ + reply("Surface is not active"); + return; + } + reply(nullptr); if (state.main == *surface_id) { if (state.sub != -1) { @@ -479,7 +538,9 @@ char const *App::api_deactivate_surface(char const *drawing_name) { this->layout_commit(); std::string str_area = std::string(kNameLayoutNormal) + "." + std::string(kNameAreaFull); - this->emit_syncdraw(sub.c_str(), str_area.c_str()); + compositor::rect area_rect = this->area_info[state.sub]; + this->emit_syncdraw(sub.c_str(), str_area.c_str(), + area_rect.x, area_rect.y, area_rect.w, area_rect.h); this->enqueue_flushdraw(state.sub); }); } else { @@ -500,14 +561,12 @@ char const *App::api_deactivate_surface(char const *drawing_name) { this->layout_commit(); std::string str_area = std::string(kNameLayoutNormal) + "." + std::string(kNameAreaFull); - this->emit_syncdraw(main.c_str(), str_area.c_str()); + compositor::rect area_rect = this->area_info[state.main]; + this->emit_syncdraw(main.c_str(), str_area.c_str(), + area_rect.x, area_rect.y, area_rect.w, area_rect.h); this->enqueue_flushdraw(state.main); }); - } else { - return "Surface is not active"; } - - return nullptr; } void App::enqueue_flushdraw(int surface_id) { @@ -530,19 +589,16 @@ void App::check_flushdraw(int surface_id) { } } -char const *App::api_enddraw(char const *drawing_name) { +void App::api_enddraw(char const *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) { 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(); } @@ -559,12 +615,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) { @@ -606,7 +671,7 @@ void App::surface_removed(uint32_t surface_id) { } else { auto drawing_name = this->lookup_name(surface_id); if (drawing_name) { - this->api_deactivate_surface(drawing_name->c_str()); + this->api_deactivate_surface(drawing_name->c_str(), [](const char*){}); } } @@ -622,8 +687,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) { @@ -643,8 +708,14 @@ void App::emit_visible(char const *label) { return emit_visible(label, true); } result App::api_request_surface(char const *drawing_name) { auto lid = this->layers.get_layer_id(std::string(drawing_name)); 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); @@ -675,7 +746,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 +775,64 @@ 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"); + + // Check drawing name, surface/layer id + auto const &surface_id = this->lookup_id(drawing_name); + 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()) { @@ -730,6 +866,7 @@ void App::activate(int id) { } } // <<< FOR CES DEMO + this->layout_commit(); this->emit_visible(label); this->emit_activated(label); @@ -775,7 +912,7 @@ void App::deactivate(int id) { void App::deactivate_main_surface() { this->layers.main_surface = -1; - this->api_deactivate_surface(this->layers.main_surface_name.c_str()); + this->api_deactivate_surface(this->layers.main_surface_name.c_str(), [](const char*){}); } bool App::can_split(struct LayoutState const &state, int new_id) {