X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fapp.cpp;h=bf84b226400773202f254ba0b4d6b89817d3b1d1;hb=dc337844cc987d37385ea19af02e997750c38931;hp=39ccfa87d0e7d378e78baeb1901b192e61fed6fa;hpb=6aaba1066fe89f324d4bae67497f4035fe997d5f;p=apps%2Fagl-service-windowmanager.git diff --git a/src/app.cpp b/src/app.cpp index 39ccfa8..bf84b22 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -29,7 +29,6 @@ #include #include -#include #include #include #include @@ -76,8 +75,7 @@ struct result load_layer_map(char const *filename) { * App Impl */ App::App(wl::display *d) - : api{this}, - chooks{this}, + : chooks{this}, display{d}, controller{}, outputs(), @@ -209,8 +207,6 @@ 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(); @@ -301,10 +297,6 @@ 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, @@ -318,12 +310,6 @@ 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); } @@ -405,9 +391,7 @@ char const *App::api_activate_surface(char const *drawing_name, char const *draw } std::string str_area = std::string(kNameLayoutNormal) + "." + std::string(kNameAreaFull); - 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->emit_syncdraw(drawing_name, str_area.c_str()); this->enqueue_flushdraw(state.main); }); } else { @@ -416,9 +400,7 @@ 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); - 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->emit_syncdraw(drawing_name, str_area.c_str()); this->enqueue_flushdraw(state.main); }); } else { @@ -441,7 +423,7 @@ char const *App::api_activate_surface(char const *drawing_name, char const *draw } state = nl; - // Commit for configuration and visibility(0) + // Commit for configuraton and visibility(0) this->layout_commit(); // Wait for configuration listener @@ -452,14 +434,8 @@ 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); - 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->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); }); @@ -491,9 +467,7 @@ char const *App::api_activate_surface(char const *drawing_name, char const *draw } std::string str_area = std::string(kNameLayoutNormal) + "." + std::string(kNameAreaFull); - 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->emit_syncdraw(drawing_name, str_area.c_str()); this->enqueue_flushdraw(state.main); }); } @@ -546,9 +520,7 @@ char const *App::api_deactivate_surface(char const *drawing_name) { this->layout_commit(); std::string str_area = std::string(kNameLayoutNormal) + "." + std::string(kNameAreaFull); - 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->emit_syncdraw(sub.c_str(), str_area.c_str()); this->enqueue_flushdraw(state.sub); }); } else { @@ -569,9 +541,7 @@ char const *App::api_deactivate_surface(char const *drawing_name) { this->layout_commit(); std::string str_area = std::string(kNameLayoutNormal) + "." + std::string(kNameAreaFull); - 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->emit_syncdraw(main.c_str(), str_area.c_str()); this->enqueue_flushdraw(state.main); }); } else { @@ -618,6 +588,31 @@ char const *App::api_enddraw(char const *drawing_name) { void App::api_ping() { this->dispatch_pending_events(); } +void App::send_event(char const *evname, char const *label){ + HMI_DEBUG("wm", "%s: %s(%s)", __func__, evname, label); + + json_object *j = json_object_new_object(); + json_object_object_add(j, kKeyDrawingName, json_object_new_string(label)); + + int ret = afb_event_push(this->map_afb_event[evname], j); + if (ret != 0) { + HMI_DEBUG("wm", "afb_event_push failed: %m"); + } +} + +void App::send_event(char const *evname, char const *label, char const *area){ + HMI_DEBUG("wm", "%s: %s(%s, %s)", __func__, evname, label, area); + + 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)); + + int ret = afb_event_push(this->map_afb_event[evname], j); + if (ret != 0) { + HMI_DEBUG("wm", "afb_event_push failed: %m"); + } +} + /** * proxied events */ @@ -662,23 +657,23 @@ void App::surface_removed(uint32_t surface_id) { } void App::emit_activated(char const *label) { - this->api.send_event(kListEventName[Event_Active], label); + this->send_event(kListEventName[Event_Active], label); } void App::emit_deactivated(char const *label) { - this->api.send_event(kListEventName[Event_Inactive], label); + this->send_event(kListEventName[Event_Inactive], label); } -void App::emit_syncdraw(char const *label, char const *area, int x, int y, int w, int h) { - this->api.send_event(kListEventName[Event_SyncDraw], label, area, x, y, w, h); +void App::emit_syncdraw(char const *label, char const *area) { + this->send_event(kListEventName[Event_SyncDraw], label, area); } void App::emit_flushdraw(char const *label) { - this->api.send_event(kListEventName[Event_FlushDraw], label); + this->send_event(kListEventName[Event_FlushDraw], label); } void App::emit_visible(char const *label, bool is_visible) { - this->api.send_event(is_visible ? kListEventName[Event_Visible] : kListEventName[Event_Invisible], label); + this->send_event(is_visible ? kListEventName[Event_Visible] : kListEventName[Event_Invisible], label); } void App::emit_invisible(char const *label) { @@ -714,62 +709,34 @@ result App::api_request_surface(char const *drawing_name) { return Err("Surface already present"); } -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); -} +char const *App::api_request_surface(char const *drawing_name, + char const *ivi_id) { + ST(); -result App::api_get_area_info(char const *drawing_name) { - HMI_DEBUG("wm", "called"); + auto lid = this->layers.get_layer_id(std::string(drawing_name)); + unsigned sid = std::stol(ivi_id); - // 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 (!lid) { + return "Drawing name does not match any role"; } - if (!this->controller->surface_exists(*surface_id)) { - return Err("Surface does not exist in controller!"); - } + auto rname = this->lookup_id(drawing_name); - auto layer_id = this->layers.get_layer_id(*surface_id); - if (!layer_id) { - return Err("Surface is not on any layer!"); + if (rname) { + return "Surface already present"; } - auto o_state = *this->layers.get_layout_state(*surface_id); - if (o_state == nullptr) { - return Err("Could not find layer for surface"); - } + // register pair drawing_name and ivi_id + this->id_alloc.register_name_id(drawing_name, sid); + this->layers.add_surface(sid, *lid); - struct LayoutState &state = *o_state; - if ((state.main != *surface_id) && (state.sub != *surface_id)) { - return Err("Surface is inactive"); - } + // this surface is already created + HMI_DEBUG("wm", "surface_id is %u, layer_id is %u", sid, *lid); - // 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)); + this->controller->layers[*lid]->add_surface( + this->controller->surfaces[sid].get()); - return Ok(object); + return nullptr; } void App::activate(int id) { @@ -780,6 +747,35 @@ void App::activate(int id) { this->controller->surfaces[id]->set_visibility(1); 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, "Navigation"))) { + for (auto i = surface_bg.begin(); i != surface_bg.end(); ++i) { + if (id == *i) { + // Remove id + this->surface_bg.erase(i); + + // Remove from BG layer (999) + HMI_DEBUG("wm", "Remove %s(%d) from BG layer", label, id); + this->controller->layers[999]->remove_surface( + this->controller->surfaces[id].get()); + + // Add to FG layer (1001) + HMI_DEBUG("wm", "Add %s(%d) to FG layer", label, id); + this->controller->layers[1001]->add_surface( + this->controller->surfaces[id].get()); + + for (int j : this->surface_bg) { + HMI_DEBUG("wm", "Stored id:%d", j); + } + break; + } + } + } + // <<< FOR CES DEMO + this->emit_visible(label); this->emit_activated(label); } @@ -788,9 +784,36 @@ void App::activate(int id) { void App::deactivate(int id) { auto ip = this->controller->sprops.find(id); if (ip != this->controller->sprops.end() && ip->second.visibility != 0) { - this->controller->surfaces[id]->set_visibility(0); 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, "Navigation"))) { + + // Store id + this->surface_bg.push_back(id); + + // Remove from FG layer (1001) + HMI_DEBUG("wm", "Remove %s(%d) from FG layer", label, id); + this->controller->layers[1001]->remove_surface( + this->controller->surfaces[id].get()); + + // Add to BG layer (999) + HMI_DEBUG("wm", "Add %s(%d) to BG layer", label, id); + this->controller->layers[999]->add_surface( + this->controller->surfaces[id].get()); + + for (int j : surface_bg) { + HMI_DEBUG("wm", "Stored id:%d", j); + } + } + else { + this->controller->surfaces[id]->set_visibility(0); + } + // <<< FOR CES DEMO + this->emit_deactivated(label); this->emit_invisible(label); }