X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fapp.cpp;h=74a114da5be9a41f818a506218c913d7e1a76f64;hb=4bd8c0c0ad298c9da8b3803c121001d04e39f707;hp=f38668f018a7591c951304a99d5f4049a54bda53;hpb=eb7fc4eb593d723f1ac2ed4e5b523afd34e992ac;p=apps%2Fagl-service-windowmanager-2017.git diff --git a/src/app.cpp b/src/app.cpp index f38668f..74a114d 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. @@ -36,6 +36,7 @@ #include #include + namespace wm { namespace { @@ -43,17 +44,21 @@ 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,12 +71,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(), @@ -87,11 +92,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()); } } @@ -101,10 +106,15 @@ 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)); @@ -113,13 +123,12 @@ int App::init() { this->display->add_global_handler( "ivi_controller", [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( @@ -143,7 +152,7 @@ int App::dispatch_events() { int ret = this->display->dispatch(); if (ret == -1) { - logerror("wl_display_dipatch() returned error %d", + HMI_ERROR("wm", "wl_display_dipatch() returned error %d", this->display->get_error()); return -1; } @@ -182,12 +191,12 @@ optional App::lookup_name(int id) { */ 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; } @@ -198,7 +207,7 @@ int App::init_layers() { auto &layers = c->layers; // Write output dimensions to ivi controller... - c->output_size = genivi::size{uint32_t(o->width), uint32_t(o->height)}; + c->output_size = compositor::size{uint32_t(o->width), uint32_t(o->height)}; // Clear scene layers.clear(); @@ -212,7 +221,7 @@ int App::init_layers() { 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()); } @@ -226,14 +235,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; } @@ -259,7 +268,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; @@ -279,7 +288,7 @@ 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 @@ -288,9 +297,10 @@ void App::surface_set_layout(int surface_id, optional sub_surface_id) { 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); + } - 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 @@ -301,7 +311,7 @@ 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); - logdebug("Surface %u now on layer %u with rect { %d, %d, %d, %d }", + HMI_DEBUG("wm", "Surface %u now on layer %u with rect { %d, %d, %d, %d }", surface_id, layer_id, x, y, w, h); } @@ -312,6 +322,7 @@ void App::layout_commit() { 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) { @@ -360,36 +371,68 @@ char const *App::api_activate_surface(char const *drawing_name, char const *draw } } - 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); state = nl; + + // Commit for configuraton + this->layout_commit(); + + if (!(layer->is_normal_layout_only)) { + // Wait for configuration listener + controller->is_configured = false; + while (!(controller->is_configured)) { + dispatch_pending_events(); + } + } + 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 (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 != -1) { - this->deactivate(state.sub); + if (state.sub != *surface_id) { + if (state.sub != -1) { + this->deactivate(state.sub); + } } state = nl; + // Commit for configuraton and visibility(0) + this->layout_commit(); + + // Wait for configuration listener + controller->is_configured = false; + while (!(controller->is_configured)) { + dispatch_pending_events(); + } + 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()); @@ -400,19 +443,36 @@ char const *App::api_activate_surface(char const *drawing_name, char const *draw } 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; + // Commit for configuraton and visibility(0) + this->layout_commit(); + + if (!(layer->is_normal_layout_only)) { + // Wait for configuration listener + controller->is_configured = false; + while (!(controller->is_configured)) { + dispatch_pending_events(); + } + } std::string str_area = std::string(kNameLayoutNormal) + "." + std::string(kNameAreaFull); this->emit_syncdraw(drawing_name, str_area.c_str()); this->enqueue_flushdraw(state.main); }); } + } } // no error @@ -443,10 +503,9 @@ char const *App::api_deactivate_surface(char const *drawing_name) { return "No surface active"; } - // 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); + HMI_DEBUG("wm", "Refusing to deactivate main_surface %d", *surface_id); return nullptr; } @@ -495,7 +554,7 @@ char const *App::api_deactivate_surface(char const *drawing_name) { 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); } @@ -504,7 +563,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)], @@ -519,7 +578,6 @@ char const *App::api_enddraw(char const *drawing_name) { 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); @@ -531,25 +589,50 @@ 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 */ 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); + HMI_DEBUG("wm", "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()); // 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()); @@ -557,7 +640,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: @@ -575,23 +658,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, char const *area) { - this->api.send_event("syncdraw", label, area); + this->send_event(kListEventName[Event_SyncDraw], label, area); } 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) { @@ -603,7 +686,7 @@ 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? + // TODO: Do we need to put these applications on the App layer? return Err("Drawing name does not match any role"); } @@ -613,12 +696,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); @@ -628,12 +710,74 @@ 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) { + return "Drawing name does not match any role"; + } + + 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( + this->controller->surfaces[sid].get()); + + return nullptr; +} + 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(0); + this->layout_commit(); 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( + 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); } @@ -642,9 +786,37 @@ 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, "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( + 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); } @@ -670,21 +842,21 @@ bool App::can_split(struct LayoutState const &state, int new_id) { 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; } }