/*
- * 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.
#include <regex>
#include <thread>
+
namespace wm {
namespace {
using nlohmann::json;
result<json> file_to_json(char const *filename) {
+ json j;
std::ifstream i(filename);
if (i.fail()) {
- return Err<json>("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<layer_map> 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()) {
} // namespace
+
/**
* App Impl
*/
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());
}
}
}
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<wl::output>(r, name, v));
this->display->add_global_handler(
"ivi_controller", [this](wl_registry *r, uint32_t name, uint32_t v) {
this->controller =
- std::make_unique<struct genivi::controller>(r, name, v);
+ std::make_unique<struct compositor::controller>(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<struct wl_proxy *>(
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;
}
*/
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;
}
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();
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());
}
void App::surface_set_layout(int surface_id, optional<int> 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;
}
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;
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_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
// 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);
}
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) {
}
}
- 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());
} 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
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;
}
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);
}
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)],
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);
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<unsigned>(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());
}
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:
}
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, char const *area) {
- this->api.send_event("syncdraw", label, 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) {
result<int> 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<int>("Drawing name does not match any role");
}
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<int>(id);
return Err<int>("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, "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);
}
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);
}
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;
}
}
Code Review / apps / agl-service-windowmanager.git / blobdiff