X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fapp.cpp;h=937da6a36cc7808a908819dc3a21fe157f922aee;hb=c83642c69ede418f4c4d89daa0dae4b8698e0765;hp=8aa75472a3972f98c996299673562202e36677b7;hpb=6adb64ee4760b33cf212f03d3190100d37556a9a;p=apps%2Fagl-service-windowmanager-2017.git diff --git a/src/app.cpp b/src/app.cpp index 8aa7547..937da6a 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Mentor Graphics Development (Deutschland) GmbH + * Copyright (c) 2017 TOYOTA MOTOR CORPORATION * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ #include "layers.hpp" #include "layout.hpp" #include "util.hpp" -#include "wayland.hpp" +#include "wayland_ivi_wm.hpp" #include #include @@ -29,31 +29,56 @@ #include #include -#include #include #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; result file_to_json(char const *filename) { + json j; std::ifstream i(filename); if (i.fail()) { - return Err("Could not open config file"); + HMI_DEBUG("wm", "Could not open config file, so use default layer information"); + j = default_layers_json; } - json j; - i >> j; + else { + i >> j; + } + return Ok(j); } struct result load_layer_map(char const *filename) { - logdebug("loading IDs from %s", filename); + HMI_DEBUG("wm", "loading IDs from %s", filename); auto j = file_to_json(filename); if (j.is_err()) { @@ -66,15 +91,12 @@ struct result load_layer_map(char const *filename) { } // namespace -// _ _ _ _ -// ___| | __ _ ___ ___ / \ _ __ _ __ (_)_ __ ___ _ __ | | -// / __| |/ _` / __/ __| / _ \ | '_ \| '_ \ | | '_ ` _ \| '_ \| | -// | (__| | (_| \__ \__ \ / ___ \| |_) | |_) | | | | | | | | |_) | | -// \___|_|\__,_|___/___/ /_/ \_\ .__/| .__/ |_|_| |_| |_| .__/|_| -// |_| |_| |_| + +/** + * App Impl + */ App::App(wl::display *d) - : api{this}, - chooks{this}, + : chooks{this}, display{d}, controller{}, outputs(), @@ -90,11 +112,11 @@ App::App(wl::display *d) if (l.is_ok()) { this->layers = l.unwrap(); } else { - logerror("%s", l.err().value()); + HMI_ERROR("wm", "%s", l.err().value()); } } } catch (std::exception &e) { - logerror("Loading of configuration failed: %s", e.what()); + HMI_ERROR("wm", "Loading of configuration failed: %s", e.what()); } } @@ -104,29 +126,39 @@ int App::init() { } if (this->layers.mapping.empty()) { - logerror("No surface -> layer mapping loaded"); + HMI_ERROR("wm", "No surface -> layer mapping loaded"); return -1; } + // 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]); + } + this->display->add_global_handler( "wl_output", [this](wl_registry *r, uint32_t name, uint32_t v) { this->outputs.emplace_back(std::make_unique(r, name, v)); }); this->display->add_global_handler( - "ivi_controller", [this](wl_registry *r, uint32_t name, uint32_t v) { + "ivi_wm", [this](wl_registry *r, uint32_t name, uint32_t v) { this->controller = - std::make_unique(r, name, v); + std::make_unique(r, name, v); // Init controller hooks this->controller->chooks = &this->chooks; - // XXX: This protocol needs the output, so lets just add our mapping - // here... + // This protocol needs the output, so lets just add our mapping here... this->controller->add_proxy_to_id_mapping( this->outputs.back()->proxy.get(), wl_proxy_get_id(reinterpret_cast( this->outputs.back()->proxy.get()))); + + // Create screen + this->controller->create_screen(this->outputs.back()->proxy.get()); + + // Set display to controller + this->controller->display = this->display; }); // First level objects @@ -139,27 +171,11 @@ int App::init() { return init_layers(); } -int App::dispatch_events() { - if (this->dispatch_events() == 0) { - return 0; - } - - int ret = this->display->dispatch(); - if (ret == -1) { - logerror("wl_display_dipatch() returned error %d", - this->display->get_error()); - return -1; - } - this->display->flush(); - - return 0; -} - int App::dispatch_pending_events() { if (this->pop_pending_events()) { this->display->dispatch_pending(); - return 0; -} + return 0; + } return -1; } @@ -180,20 +196,17 @@ optional App::lookup_name(int id) { return this->id_alloc.lookup(id); } -// _ _ _ _ _ ____ -// (_)_ __ (_) |_ | | __ _ _ _ ___ _ _| |_ / /\ \ -// | | '_ \| | __| | |/ _` | | | |/ _ \| | | | __| | | | -// | | | | | | |_ | | (_| | |_| | (_) | |_| | |_| | | | -// |_|_| |_|_|\__|___|_|\__,_|\__, |\___/ \__,_|\__| | | | -// |_____| |___/ \_\/_/ +/** + * init_layers() + */ int App::init_layers() { if (!this->controller) { - logerror("ivi_controller global not available"); + HMI_ERROR("wm", "ivi_controller global not available"); return -1; } if (this->outputs.empty()) { - logerror("no output was set up!"); + HMI_ERROR("wm", "no output was set up!"); return -1; } @@ -203,8 +216,10 @@ int App::init_layers() { auto &s = c->screens.begin()->second; auto &layers = c->layers; - // XXX: Write output dimensions to ivi controller... - c->output_size = genivi::size{uint32_t(o->width), uint32_t(o->height)}; + // 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(); @@ -213,18 +228,16 @@ int App::init_layers() { s->clear(); // Quick and dirty setup of layers - // XXX: This likely needs to be sorted by order (note, we don't (yet?) - // do any zorder arrangement). for (auto const &i : this->layers.mapping) { c->layer_create(i.second.layer_id, o->width, o->height); auto &l = layers[i.second.layer_id]; l->set_destination_rectangle(0, 0, o->width, o->height); l->set_visibility(1); - logdebug("Setting up layer %s (%d) for surface role match \"%s\"", + HMI_DEBUG("wm", "Setting up layer %s (%d) for surface role match \"%s\"", i.second.name.c_str(), i.second.layer_id, i.second.role.c_str()); } - // Add layers to screen (XXX: are they sorted correctly?) + // Add layers to screen s->set_render_order(this->layers.layers); this->layout_commit(); @@ -234,14 +247,14 @@ int App::init_layers() { void App::surface_set_layout(int surface_id, optional sub_surface_id) { if (!this->controller->surface_exists(surface_id)) { - logerror("Surface %d does not exist", 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) { - logerror("Surface %d is not associated with any layer!", surface_id); + HMI_ERROR("wm", "Surface %d is not associated with any layer!", surface_id); return; } @@ -267,7 +280,7 @@ void App::surface_set_layout(int surface_id, optional sub_surface_id) { if (sub_surface_id) { if (o_layer_id != this->layers.get_layer_id(*sub_surface_id)) { - logerror( + HMI_ERROR("wm", "surface_set_layout: layers of surfaces (%d and %d) don't match!", surface_id, *sub_surface_id); return; @@ -287,29 +300,31 @@ void App::surface_set_layout(int surface_id, optional sub_surface_id) { auto &ss = this->controller->surfaces[*sub_surface_id]; - logdebug("surface_set_layout for sub surface %u on layer %u", + HMI_DEBUG("wm", "surface_set_layout for sub surface %u on layer %u", *sub_surface_id, layer_id); - // configure surface to wxh dimensions - ss->set_configuration(w, h); - // set source reactangle, even if we should not need to set it. - ss->set_source_rectangle(0, 0, w, h); // 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; } - logdebug("surface_set_layout for surface %u on layer %u", surface_id, + HMI_DEBUG("wm", "surface_set_layout for surface %u on layer %u", surface_id, layer_id); - // configure surface to wxh dimensions - s->set_configuration(w, h); - // set source reactangle, even if we should not need to set it. - s->set_source_rectangle(0, 0, w, h); - // set destination to the display rectangle s->set_destination_rectangle(x, y, w, h); - logdebug("Surface %u now on layer %u with rect { %d, %d, %d, %d }", + // 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); } @@ -318,29 +333,37 @@ void App::layout_commit() { this->display->flush(); } -char const *App::api_activate_surface(char const *drawing_name) { +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; @@ -355,104 +378,153 @@ char const *App::api_activate_surface(char const *drawing_name) { 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(); } } - if (state.main == *surface_id || state.sub == *surface_id) { - return "Surface already active"; - } + auto layer = this->layers.get_layer(*layer_id); 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); - // XXX do we need to activate after enddraw? state = nl; - this->emit_syncdraw(drawing_name); + + // Commit for configuraton + this->layout_commit(); + + 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->enqueue_flushdraw(state.main); }); } else { - bool can_split = this->can_split(state, *surface_id); + 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); + 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 { + 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 != -1) { - this->deactivate(state.sub); - } + if (state.sub != *surface_id) { + if (state.sub != -1) { + this->deactivate(state.sub); + } + } state = nl; - this->emit_syncdraw(drawing_name); - this->emit_syncdraw(main.c_str()); + // 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); + 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); }); } else { this->try_layout( state, LayoutState{*surface_id}, [&] (LayoutState const &nl) { + HMI_DEBUG("wm", "Layout: %s", kNameLayoutNormal); + this->surface_set_layout(*surface_id); - this->deactivate(state.main); + if (state.main != *surface_id) { + this->deactivate(state.main); + } if (state.sub != -1) { - this->deactivate(state.sub); - } + if (state.sub != *surface_id) { + this->deactivate(state.sub); + } + } state = nl; - this->emit_syncdraw(drawing_name); + // Commit for configuraton and visibility(0) + this->layout_commit(); + + 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->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; } - // XXX: check against main_surface, main_surface_name is the configuration - // item. + // Check against main_surface, main_surface_name is the configuration item. if (*surface_id == this->layers.main_surface) { - logdebug("Refusing to deactivate main_surface %d", *surface_id); - return nullptr; + HMI_DEBUG("wm", "Refusing to deactivate main_surface %d", *surface_id); + 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) { @@ -465,7 +537,10 @@ char const *App::api_deactivate_surface(char const *drawing_name) { state = nl; this->layout_commit(); - this->emit_syncdraw(sub.c_str()); + 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->enqueue_flushdraw(state.sub); }); } else { @@ -485,19 +560,18 @@ char const *App::api_deactivate_surface(char const *drawing_name) { state = nl; this->layout_commit(); - this->emit_syncdraw(main.c_str()); + 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->enqueue_flushdraw(state.main); }); - } else { - return "Surface is not active"; } - - return nullptr; } void App::enqueue_flushdraw(int surface_id) { this->check_flushdraw(surface_id); - logdebug("Enqueuing EndDraw for surface_id %d", surface_id); + HMI_DEBUG("wm", "Enqueuing EndDraw for surface_id %d", surface_id); this->pending_end_draw.push_back(surface_id); } @@ -506,7 +580,7 @@ void App::check_flushdraw(int surface_id) { std::end(this->pending_end_draw), surface_id); if (i != std::end(this->pending_end_draw)) { auto n = this->lookup_name(surface_id); - logerror("Application %s (%d) has pending EndDraw call(s)!", + HMI_ERROR("wm", "Application %s (%d) has pending EndDraw call(s)!", n ? n->c_str() : "unknown-name", surface_id); std::swap(this->pending_end_draw[std::distance( std::begin(this->pending_end_draw), i)], @@ -515,46 +589,72 @@ 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); - // XXX: Please tell the compositor to thaw the surface... 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(); } -// _ _ _____ _ -// _ __ _ __ _____ _(_) ___ __| | | ____|_ _____ _ __ | |_ ___ -// | '_ \| '__/ _ \ \/ / |/ _ \/ _` | | _| \ \ / / _ \ '_ \| __/ __| -// | |_) | | | (_) > <| | __/ (_| | | |___ \ V / __/ | | | |_\__ \ -// | .__/|_| \___/_/\_\_|\___|\__,_| |_____| \_/ \___|_| |_|\__|___/ -// |_| +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, + 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) { + HMI_DEBUG("wm", "afb_event_push failed: %m"); + } +} + +/** + * proxied events + */ void App::surface_created(uint32_t surface_id) { auto layer_id = this->layers.get_layer_id(surface_id); if (!layer_id) { - logdebug("Newly created surfce %d is not associated with any layer!", + HMI_DEBUG("wm", "Newly created surfce %d is not associated with any layer!", surface_id); return; } - logdebug("surface_id is %u, layer_id is %u", surface_id, *layer_id); - - this->controller->layers[*layer_id]->add_surface( - this->controller->surfaces[surface_id].get()); + HMI_DEBUG("wm", "surface_id is %u, layer_id is %u", surface_id, *layer_id); + this->controller->layers[*layer_id]->add_surface(surface_id); + this->layout_commit(); // activate the main_surface right away /*if (surface_id == static_cast(this->layers.main_surface)) { - logdebug("Activating main_surface (%d)", surface_id); + HMI_DEBUG("wm", "Activating main_surface (%d)", surface_id); this->api_activate_surface( this->lookup_name(surface_id).value_or("unknown-name").c_str()); @@ -562,7 +662,7 @@ void App::surface_created(uint32_t surface_id) { } void App::surface_removed(uint32_t surface_id) { - logdebug("surface_id is %u", surface_id); + HMI_DEBUG("wm", "surface_id is %u", surface_id); // We cannot normally deactivate the main_surface, so be explicit // about it: @@ -571,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*){}); } } @@ -580,23 +680,23 @@ void App::surface_removed(uint32_t surface_id) { } void App::emit_activated(char const *label) { - this->api.send_event("active", label); + this->send_event(kListEventName[Event_Active], label); } void App::emit_deactivated(char const *label) { - this->api.send_event("inactive", label); + this->send_event(kListEventName[Event_Inactive], label); } -void App::emit_syncdraw(char const *label) { - this->api.send_event("syncdraw", label); +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) { - this->api.send_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 ? "visible" : "invisible", label); + this->send_event(is_visible ? kListEventName[Event_Visible] : kListEventName[Event_Invisible], label); } void App::emit_invisible(char const *label) { @@ -608,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) { - // XXX: to 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); @@ -618,12 +724,11 @@ result App::api_request_surface(char const *drawing_name) { auto id = int(this->id_alloc.generate_id(drawing_name)); this->layers.add_surface(id, *lid); - // XXX: we set the main_surface[_name] here and now, - // not sure if we want this, but it worked so far. + // set the main_surface[_name] here and now if (!this->layers.main_surface_name.empty() && this->layers.main_surface_name == drawing_name) { this->layers.main_surface = id; - logdebug("Set main_surface id to %u", id); + HMI_DEBUG("wm", "Set main_surface id to %u", id); } return Ok(id); @@ -633,12 +738,136 @@ result App::api_request_surface(char const *drawing_name) { return Err("Surface already present"); } +char const *App::api_request_surface(char const *drawing_name, + char const *ivi_id) { + ST(); + + auto lid = this->layers.get_layer_id(std::string(drawing_name)); + unsigned sid = std::stol(ivi_id); + + if (!lid) { + /** + * 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); + + if (rname) { + return "Surface already present"; + } + + // register pair drawing_name and ivi_id + this->id_alloc.register_name_id(drawing_name, sid); + this->layers.add_surface(sid, *lid); + + // this surface is already created + HMI_DEBUG("wm", "surface_id is %u, layer_id is %u", sid, *lid); + + this->controller->layers[*lid]->add_surface(sid); + this->layout_commit(); + + 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() && ip->second.visibility == 0) { + if (ip != this->controller->sprops.end()) { 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, "Music")) + || (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(id); + + // Add to FG layer (1001) + HMI_DEBUG("wm", "Add %s(%d) to FG layer", label, id); + this->controller->layers[1001]->add_surface(id); + + for (int j : this->surface_bg) { + HMI_DEBUG("wm", "Stored id:%d", j); + } + break; + } + } + } + // <<< FOR CES DEMO + this->layout_commit(); + this->emit_visible(label); this->emit_activated(label); } @@ -646,10 +875,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); + if (ip != this->controller->sprops.end()) { 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"))) { + + // 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(id); + + // Add to BG layer (999) + HMI_DEBUG("wm", "Add %s(%d) to BG layer", label, id); + this->controller->layers[999]->add_surface(id); + + 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); } @@ -657,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) { @@ -668,30 +923,30 @@ bool App::can_split(struct LayoutState const &state, int new_id) { // 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); - logdebug("layer info name: %s", layer->name.c_str()); + 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++) { - logdebug("%d main_match '%s'", new_id_layer, i->main_match.c_str()); + 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 - logdebug("%d sub_match '%s'", new_id_layer, i->sub_match.c_str()); + 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)) { - logdebug("layout matched!"); + HMI_DEBUG("wm", "layout matched!"); return true; -} + } } } } @@ -707,12 +962,9 @@ void App::try_layout(struct LayoutState & /*state*/, } } -// _ _ _ _ _ -// ___ ___ _ __ | |_ _ __ ___ | | | ___ _ __ | |__ ___ ___ | | _____ -// / __/ _ \| '_ \| __| '__/ _ \| | |/ _ \ '__|| '_ \ / _ \ / _ \| |/ / __| -// | (_| (_) | | | | |_| | | (_) | | | __/ | | | | | (_) | (_) | <\__ \ -// \___\___/|_| |_|\__|_| \___/|_|_|\___|_|___|_| |_|\___/ \___/|_|\_\___/ -// |_____| +/** + * controller_hooks + */ void controller_hooks::surface_created(uint32_t surface_id) { this->app->surface_created(surface_id); }