/*
- * 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.
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);
}
* App Impl
*/
App::App(wl::display *d)
- : api{this},
- chooks{this},
+ : chooks{this},
display{d},
controller{},
outputs(),
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;
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();
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) {
HMI_DEBUG("wm", "Refusing to deactivate main_surface %d", *surface_id);
return nullptr;
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::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::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) {
- this->api.send_event(kListEventName[Event_SyncDraw], label, 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) {
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, "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);
}
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);
}
Code Review / apps / agl-service-windowmanager.git / blobdiff