X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fapp.cpp;h=af552b564501ef95f41b2cc2822adbc49faca4a7;hb=0b1d9ca2550bdb877d065a74e4debcc95c4e7b98;hp=75df8d7e8328916b6ef7c5a63b191825a5bfd066;hpb=074d058a7a483a66af7f8c0b928b321ad483f47c;p=apps%2Fagl-service-windowmanager.git diff --git a/src/app.cpp b/src/app.cpp index 75df8d7..af552b5 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,10 @@ struct result load_layer_map(char const *filename) { } // namespace -// _ _ _ _ -// ___| | __ _ ___ ___ / \ _ __ _ __ (_)_ __ ___ _ __ | | -// / __| |/ _` / __/ __| / _ \ | '_ \| '_ \ | | '_ ` _ \| '_ \| | -// | (__| | (_| \__ \__ \ / ___ \| |_) | |_) | | | | | | | | |_) | | -// \___|_|\__,_|___/___/ /_/ \_\ .__/| .__/ |_|_| |_| |_| .__/|_| -// |_| |_| |_| + +/** + * App Impl + */ App::App(wl::display *d) : api{this}, chooks{this}, @@ -90,11 +93,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,10 +107,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)); @@ -116,13 +124,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( @@ -146,7 +153,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; } @@ -158,8 +165,8 @@ int App::dispatch_events() { int App::dispatch_pending_events() { if (this->pop_pending_events()) { this->display->dispatch_pending(); - return 0; -} + return 0; + } return -1; } @@ -180,20 +187,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 +207,8 @@ 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)}; // Clear scene layers.clear(); @@ -213,18 +217,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 +236,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 +269,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,18 +289,19 @@ 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 + // 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); + } - 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 @@ -309,7 +312,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); } @@ -318,8 +321,9 @@ void App::layout_commit() { this->display->flush(); } -char const *App::api_activate_surface(char const *drawing_name) { +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) { @@ -340,7 +344,7 @@ char const *App::api_activate_surface(char const *drawing_name) { if (o_state == nullptr) { return "Could not find layer for surface"; -} + } struct LayoutState &state = *o_state; @@ -355,68 +359,121 @@ 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(); + + 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; - this->emit_syncdraw(drawing_name); - this->emit_syncdraw(main.c_str()); + // 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()); + 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); - 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(); + + 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 @@ -450,7 +507,7 @@ char const *App::api_deactivate_surface(char const *drawing_name) { // XXX: 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; } @@ -465,7 +522,8 @@ 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); + this->emit_syncdraw(sub.c_str(), str_area.c_str()); this->enqueue_flushdraw(state.sub); }); } else { @@ -485,7 +543,8 @@ 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); + this->emit_syncdraw(main.c_str(), str_area.c_str()); this->enqueue_flushdraw(state.main); }); } else { @@ -497,7 +556,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); } @@ -506,7 +565,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)], @@ -533,28 +592,25 @@ char const *App::api_enddraw(char const *drawing_name) { void App::api_ping() { this->dispatch_pending_events(); } -// _ _ _____ _ -// _ __ _ __ _____ _(_) ___ __| | | ____|_ _____ _ __ | |_ ___ -// | '_ \| '__/ _ \ \/ / |/ _ \/ _` | | _| \ \ / / _ \ '_ \| __/ __| -// | |_) | | | (_) > <| | __/ (_| | | |___ \ V / __/ | | | |_\__ \ -// | .__/|_| \___/_/\_\_|\___|\__,_| |_____| \_/ \___|_| |_|\__|___/ -// |_| +/** + * 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()); @@ -562,7 +618,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: @@ -580,23 +636,23 @@ void App::surface_removed(uint32_t surface_id) { } void App::emit_activated(char const *label) { - this->api.send_event("active", label); + this->api.send_event(kListEventName[Event_Active], label); } void App::emit_deactivated(char const *label) { - this->api.send_event("inactive", label); + this->api.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) { + this->api.send_event(kListEventName[Event_SyncDraw], label, area); } void App::emit_flushdraw(char const *label) { - this->api.send_event("flushdraw", label); + this->api.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->api.send_event(is_visible ? kListEventName[Event_Visible] : kListEventName[Event_Invisible], label); } void App::emit_invisible(char const *label) { @@ -608,7 +664,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"); } @@ -618,12 +674,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); @@ -635,12 +690,14 @@ result App::api_request_surface(char const *drawing_name) { 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(); - this->emit_activated(label); this->emit_visible(label); + this->emit_activated(label); } } @@ -668,30 +725,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 +764,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); }