/*
* Copyright (c) 2017 TOYOTA MOTOR CORPORATION
+ * Copyright (c) 2018 Konsulko Group
*
* 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 "window_manager.hpp"
-#include "../include/json.hpp"
+#include "json_helper.hpp"
+#include "util.hpp"
#include "applist.hpp"
extern "C"
namespace wm
{
-static const unsigned kTimeOut = 3000000UL; /* 3s */
+static const uint64_t kTimeOut = 3ULL; /* 3s */
/* DrawingArea name used by "{layout}.{area}" */
const char kNameLayoutNormal[] = "normal";
const char kKeyHeightPixel[] = "height_pixel";
const char kKeyWidthMm[] = "width_mm";
const char kKeyHeightMm[] = "height_mm";
+const char kKeyScale[] = "scale";
+const char kKeyIds[] = "ids";
static sd_event_source *g_timer_ev_src = nullptr;
static AppList g_app_list;
+static WindowManager *g_context;
namespace
{
return 0;
}
+static void onStateTransitioned(std::vector<WMAction> actions)
+{
+ g_context->startTransitionWrapper(actions);
+}
+
+static void onError()
+{
+ g_context->processError(WMError::LAYOUT_CHANGE_FAIL);
+}
} // namespace
/**
id_alloc{},
pending_events(false)
{
- char const *path_layers_json = getenv("AFM_APP_INSTALL_DIR");
- std::string path;
- if (!path_layers_json)
- {
- HMI_ERROR("wm", "AFM_APP_INSTALL_DIR is not defined");
- path = std::string(path_layers_json);
- }
- else
- {
- path = std::string(path_layers_json) + std::string("/etc/layers.json");
- }
+ std::string path(get_file_path("layers.json"));
try
{
return -1;
}
+ // TODO: application requests by old role,
+ // so create role map (old, new)
+ // Load old_role.db
+ this->loadOldRoleDb();
+
+ // Store my context for calling callback from PolicyManager
+ g_context = this;
+
+ // Initialize PMWrapper
+ this->pmw.initialize();
+
+ // Register callback to PolicyManager
+ this->pmw.registerCallback(onStateTransitioned, onError);
+
// Make afb event
for (int i = Event_Val_Min; i <= Event_Val_Max; i++)
{
this->controller->chooks = &this->chooks;
// 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 *>(
- this->outputs.back()->proxy.get())));
-
- // Create screen
- this->controller->create_screen(this->outputs.back()->proxy.get());
+ if(!this->outputs.empty()) {
+ // FIXME : Work around to avoid signal 11. Window Manager can't handle hotplug.
+ this->controller->add_proxy_to_id_mapping(
+ this->outputs.front()->proxy.get(),
+ wl_proxy_get_id(reinterpret_cast<struct wl_proxy *>(
+ this->outputs.front()->proxy.get())));
+
+ // Create screen
+ this->controller->create_screen(this->outputs.front()->proxy.get());
+ }
+ else {
+ HMI_WARNING("wm", "No output object. Window Manager can't handle screen");
+ }
// Set display to controller
this->controller->display = this->display;
return -1;
}
-bool WindowManager::pop_pending_events()
-{
- bool x{true};
- return this->pending_events.compare_exchange_strong(
- x, false, std::memory_order_consume);
-}
-
void WindowManager::set_pending_events()
{
this->pending_events.store(true, std::memory_order_release);
}
-optional<int> WindowManager::lookup_id(char const *name)
-{
- return this->id_alloc.lookup(std::string(name));
-}
-optional<std::string> WindowManager::lookup_name(int id)
+result<int> WindowManager::api_request_surface(char const *appid, char const *drawing_name)
{
- return this->id_alloc.lookup(id);
-}
+ // TODO: application requests by old role,
+ // so convert role old to new
+ const char *role = this->convertRoleOldToNew(drawing_name);
-/**
- * init_layers()
- */
-int WindowManager::init_layers()
-{
- if (!this->controller)
+ auto lid = this->layers.get_layer_id(std::string(role));
+ if (!lid)
{
- HMI_ERROR("wm", "ivi_controller global not available");
- return -1;
+ /**
+ * 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", role);
+ if (!lid)
+ {
+ return Err<int>("Drawing name does not match any role, fallback is disabled");
+ }
}
- if (this->outputs.empty())
+ auto rname = this->lookup_id(role);
+ if (!rname)
{
- HMI_ERROR("wm", "no output was set up!");
- return -1;
- }
-
- auto &c = this->controller;
-
- auto &o = this->outputs.front();
- auto &s = c->screens.begin()->second;
- auto &layers = c->layers;
+ // name does not exist yet, allocate surface id...
+ auto id = int(this->id_alloc.generate_id(role));
+ this->layers.add_surface(id, *lid);
- // 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)};
+ // 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;
+ HMI_DEBUG("wm", "Set main_surface id to %u", id);
+ }
- // Clear scene
- layers.clear();
+ // add client into the db
+ std::string appid_str(appid);
+ g_app_list.addClient(appid_str, *lid, id, std::string(role));
- // Clear screen
- s->clear();
+ // Set role map of (new, old)
+ this->rolenew2old[role] = std::string(drawing_name);
- // Quick and dirty setup of layers
- 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);
- 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());
+ return Ok<int>(id);
}
- // Add layers to screen
- s->set_render_order(this->layers.layers);
-
- this->layout_commit();
-
- this->layers.setupArea(o->width, o->height);
-
- return 0;
+ // Check currently registered drawing names if it is already there.
+ return Err<int>("Surface already present");
}
-void WindowManager::surface_set_layout(int surface_id, const std::string& area)
+char const *WindowManager::api_request_surface(char const *appid, char const *drawing_name,
+ char const *ivi_id)
{
- if (!this->controller->surface_exists(surface_id))
- {
- HMI_ERROR("wm", "Surface %d does not exist", surface_id);
- return;
- }
+ ST();
- auto o_layer_id = this->layers.get_layer_id(surface_id);
+ // TODO: application requests by old role,
+ // so convert role old to new
+ const char *role = this->convertRoleOldToNew(drawing_name);
- if (!o_layer_id)
+ auto lid = this->layers.get_layer_id(std::string(role));
+ unsigned sid = std::stol(ivi_id);
+
+ if (!lid)
{
- HMI_ERROR("wm", "Surface %d is not associated with any layer!", surface_id);
- return;
+ /**
+ * 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", role);
+ if (!lid)
+ {
+ return "Drawing name does not match any role, fallback is disabled";
+ }
}
- uint32_t layer_id = *o_layer_id;
-
- auto const &layer = this->layers.get_layer(layer_id);
- auto rect = this->layers.getAreaSize(area);
- HMI_SEQ_DEBUG(g_app_list.currentRequestNumber(), "%s : x:%d y:%d w:%d h:%d", area.c_str(),
- rect.x, rect.y, rect.w, rect.h);
- auto &s = this->controller->surfaces[surface_id];
-
- int x = rect.x;
- int y = rect.y;
- int w = rect.w;
- int h = rect.h;
+ auto rname = this->lookup_id(role);
- // less-than-0 values refer to MAX + 1 - $VALUE
- // e.g. MAX is either screen width or height
- if (w < 0)
- {
- w = this->controller->output_size.w + 1 + w;
- }
- if (h < 0)
+ if (rname)
{
- h = this->controller->output_size.h + 1 + h;
+ return "Surface already present";
}
- HMI_DEBUG("wm", "surface_set_layout for surface %u on layer %u", surface_id,
- layer_id);
+ // register pair drawing_name and ivi_id
+ this->id_alloc.register_name_id(role, sid);
+ this->layers.add_surface(sid, *lid);
- // set destination to the display rectangle
- s->set_destination_rectangle(x, y, w, h);
+ // this surface is already created
+ HMI_DEBUG("wm", "surface_id is %u, layer_id is %u", sid, *lid);
- // 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;
+ this->controller->layers[*lid]->add_surface(sid);
+ this->layout_commit();
- HMI_DEBUG("wm", "Surface %u now on layer %u with rect { %d, %d, %d, %d }",
- surface_id, layer_id, x, y, w, h);
-}
+ // add client into the db
+ std::string appid_str(appid);
+ g_app_list.addClient(appid_str, *lid, sid, std::string(role));
-void WindowManager::layout_commit()
-{
- this->controller->commit_changes();
- this->display->flush();
+ // Set role map of (new, old)
+ this->rolenew2old[role] = std::string(drawing_name);
+
+ return nullptr;
}
void WindowManager::api_activate_surface(char const *appid, char const *drawing_name,
{
ST();
+ // TODO: application requests by old role,
+ // so convert role old to new
+ const char *c_role = this->convertRoleOldToNew(drawing_name);
+
std::string id = appid;
- std::string role = drawing_name;
+ std::string role = c_role;
std::string area = drawing_area;
Task task = Task::TASK_ALLOCATE;
unsigned req_num = 0;
{
ST();
+ // TODO: application requests by old role,
+ // so convert role old to new
+ const char *c_role = this->convertRoleOldToNew(drawing_name);
+
/*
* Check Phase
*/
std::string id = appid;
- std::string role = drawing_name;
+ std::string role = c_role;
std::string area = ""; //drawing_area;
Task task = Task::TASK_RELEASE;
unsigned req_num = 0;
void WindowManager::api_enddraw(char const *appid, char const *drawing_name)
{
+ // TODO: application requests by old role,
+ // so convert role old to new
+ const char *c_role = this->convertRoleOldToNew(drawing_name);
+
std::string id = appid;
- std::string role = drawing_name;
+ std::string role = c_role;
unsigned current_req = g_app_list.currentRequestNumber();
bool result = g_app_list.setEndDrawFinished(current_req, id, role);
if(ret != WMError::SUCCESS)
{
//this->emit_error();
+
+ // Undo state of PolicyManager
+ this->pmw.undoState();
}
+ this->emitScreenUpdated(current_req);
HMI_SEQ_INFO(current_req, "Finish request status: %s", errorDescription(ret));
g_app_list.removeRequest(current_req);
}
}
+result<json_object *> WindowManager::api_get_display_info()
+{
+ if (!this->display->ok())
+ {
+ return Err<json_object *>("Wayland compositor is 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));
+ json_object_object_add(object, kKeyScale, json_object_new_double(this->controller->scale));
+
+ return Ok<json_object *>(object);
+}
+
+result<json_object *> WindowManager::api_get_area_info(char const *drawing_name)
+{
+ HMI_DEBUG("wm", "called");
+
+ // TODO: application requests by old role,
+ // so convert role old to new
+ const char *role = this->convertRoleOldToNew(drawing_name);
+
+ // Check drawing name, surface/layer id
+ auto const &surface_id = this->lookup_id(role);
+ if (!surface_id)
+ {
+ return Err<json_object *>("Surface does not exist");
+ }
+
+ if (!this->controller->surface_exists(*surface_id))
+ {
+ return Err<json_object *>("Surface does not exist in controller!");
+ }
+
+ auto layer_id = this->layers.get_layer_id(*surface_id);
+ if (!layer_id)
+ {
+ return Err<json_object *>("Surface is not on any layer!");
+ }
+
+ // 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<json_object *>(object);
+}
+
void WindowManager::api_ping() { this->dispatch_pending_events(); }
void WindowManager::send_event(char const *evname, char const *label)
*/
void WindowManager::surface_created(uint32_t surface_id)
{
+ this->controller->get_surface_properties(surface_id, IVI_WM_PARAM_SIZE);
+
auto layer_id = this->layers.get_layer_id(surface_id);
if (!layer_id)
{
void WindowManager::surface_removed(uint32_t surface_id)
{
- HMI_DEBUG("wm", "surface_id is %u", surface_id);
+ HMI_DEBUG("wm", "Delete surface_id %u", surface_id);
+ this->id_alloc.remove_id(surface_id);
+ this->layers.remove_surface(surface_id);
g_app_list.removeSurface(surface_id);
}
this->processNextRequest();
}
-void WindowManager::emit_activated(char const *label)
+void WindowManager::startTransitionWrapper(std::vector<WMAction> &actions)
{
- this->send_event(kListEventName[Event_Active], label);
-}
+ WMError ret;
+ unsigned req_num = g_app_list.currentRequestNumber();
-void WindowManager::emit_deactivated(char const *label)
-{
- this->send_event(kListEventName[Event_Inactive], label);
-}
+ if (actions.empty())
+ {
+ if (g_app_list.haveRequest())
+ {
+ HMI_SEQ_DEBUG(req_num, "There is no WMAction for this request");
+ goto proc_remove_request;
+ }
+ else
+ {
+ HMI_SEQ_DEBUG(req_num, "There is no request");
+ return;
+ }
+ }
-void WindowManager::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);
-}
+ for (auto &act : actions)
+ {
+ if ("" != act.role)
+ {
+ bool found;
+ auto const &surface_id = this->lookup_id(act.role.c_str());
+ if(surface_id == nullopt)
+ {
+ goto proc_remove_request;
+ }
+ std::string appid = g_app_list.getAppID(*surface_id, act.role, &found);
+ if (!found)
+ {
+ if (TaskVisible::INVISIBLE == act.visible)
+ {
+ // App is killed, so do not set this action
+ continue;
+ }
+ else
+ {
+ HMI_SEQ_ERROR(req_num, "appid which is visible is not found");
+ ret = WMError::FAIL;
+ goto error;
+ }
+ }
+ act.appid = appid;
+ }
-void WindowManager::emit_syncdraw(const std::string &role, const std::string &area)
-{
- compositor::rect rect = this->layers.getAreaSize(area);
- this->send_event(kListEventName[Event_SyncDraw],
- role.c_str(), area.c_str(), rect.x, rect.y, rect.w, rect.h);
-}
+ ret = g_app_list.setAction(req_num, act);
+ if (ret != WMError::SUCCESS)
+ {
+ HMI_SEQ_ERROR(req_num, "Setting action is failed");
+ goto error;
+ }
+ }
-void WindowManager::emit_flushdraw(char const *label)
-{
- this->send_event(kListEventName[Event_FlushDraw], label);
+ HMI_SEQ_DEBUG(req_num, "Start transition.");
+ ret = this->startTransition(req_num);
+ if (ret != WMError::SUCCESS)
+ {
+ if (ret == WMError::NO_LAYOUT_CHANGE)
+ {
+ goto proc_remove_request;
+ }
+ else
+ {
+ HMI_SEQ_ERROR(req_num, "Transition state is failed");
+ goto error;
+ }
+ }
+
+ return;
+
+error:
+ //this->emit_error()
+ HMI_SEQ_ERROR(req_num, errorDescription(ret));
+ this->pmw.undoState();
+
+proc_remove_request:
+ g_app_list.removeRequest(req_num);
+ this->processNextRequest();
}
-void WindowManager::emit_visible(char const *label, bool is_visible)
+void WindowManager::processError(WMError error)
{
- this->send_event(is_visible ? kListEventName[Event_Visible] : kListEventName[Event_Invisible], label);
+ unsigned req_num = g_app_list.currentRequestNumber();
+
+ //this->emit_error()
+ HMI_SEQ_ERROR(req_num, errorDescription(error));
+ g_app_list.removeRequest(req_num);
+ this->processNextRequest();
}
-void WindowManager::emit_invisible(char const *label)
+/*
+ ******* Private Functions *******
+ */
+
+bool WindowManager::pop_pending_events()
{
- return emit_visible(label, false);
+ bool x{true};
+ return this->pending_events.compare_exchange_strong(
+ x, false, std::memory_order_consume);
}
-void WindowManager::emit_visible(char const *label) { return emit_visible(label, true); }
+optional<int> WindowManager::lookup_id(char const *name)
+{
+ return this->id_alloc.lookup(std::string(name));
+}
+optional<std::string> WindowManager::lookup_name(int id)
+{
+ return this->id_alloc.lookup(id);
+}
-result<int> WindowManager::api_request_surface(char const *appid, char const *drawing_name)
+/**
+ * init_layers()
+ */
+int WindowManager::init_layers()
{
- auto lid = this->layers.get_layer_id(std::string(drawing_name));
- if (!lid)
+ if (!this->controller)
{
- /**
- * 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<int>("Drawing name does not match any role, Fallback is disabled");
- }
+ HMI_ERROR("wm", "ivi_controller global not available");
+ return -1;
}
- auto rname = this->lookup_id(drawing_name);
- if (!rname)
+ if (this->outputs.empty())
{
- // name does not exist yet, allocate surface id...
- auto id = int(this->id_alloc.generate_id(drawing_name));
- this->layers.add_surface(id, *lid);
+ HMI_ERROR("wm", "no output was set up!");
+ return -1;
+ }
- // 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;
- HMI_DEBUG("wm", "Set main_surface id to %u", id);
- }
+ auto &c = this->controller;
- // add client into the db
- std::string appid_str(appid);
- std::string role(drawing_name);
- g_app_list.addClient(appid_str, *lid, id, role);
+ auto &o = this->outputs.front();
+ auto &s = c->screens.begin()->second;
+ auto &layers = c->layers;
- return Ok<int>(id);
+ // 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)};
+
+
+ HMI_DEBUG("wm", "SCALING: screen (%dx%d), physical (%dx%d)",
+ o->width, o->height, o->physical_width, o->physical_height);
+
+ this->layers.loadAreaDb();
+
+ const compositor::rect css_bg = this->layers.getAreaSize("fullscreen");
+ rectangle dp_bg(o->width, o->height);
+
+ dp_bg.set_aspect(static_cast<double>(css_bg.w) / css_bg.h);
+ dp_bg.fit(o->width, o->height);
+ dp_bg.center(o->width, o->height);
+ HMI_DEBUG("wm", "SCALING: CSS BG(%dx%d) -> DDP %dx%d,(%dx%d)",
+ css_bg.w, css_bg.h, dp_bg.left(), dp_bg.top(), dp_bg.width(), dp_bg.height());
+
+ // Clear scene
+ layers.clear();
+
+ // Clear screen
+ s->clear();
+
+ // Quick and dirty setup of layers
+ for (auto const &i : this->layers.mapping)
+ {
+ c->layer_create(i.second.layer_id, dp_bg.width(), dp_bg.height());
+ auto &l = layers[i.second.layer_id];
+ l->set_destination_rectangle(dp_bg.left(), dp_bg.top(), dp_bg.width(), dp_bg.height());
+ l->set_visibility(1);
+ 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());
}
- // Check currently registered drawing names if it is already there.
- return Err<int>("Surface already present");
-}
+ // Add layers to screen
+ s->set_render_order(this->layers.layers);
-char const *WindowManager::api_request_surface(char const *appid, char const *drawing_name,
- char const *ivi_id)
-{
- ST();
+ this->layout_commit();
- auto lid = this->layers.get_layer_id(std::string(drawing_name));
- unsigned sid = std::stol(ivi_id);
+ c->scale = static_cast<double>(dp_bg.height()) / css_bg.h;
+ this->layers.setupArea(c->scale);
- if (!lid)
+ return 0;
+}
+
+void WindowManager::surface_set_layout(int surface_id, const std::string& area)
+{
+ if (!this->controller->surface_exists(surface_id))
{
- /**
- * 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";
- }
+ HMI_ERROR("wm", "Surface %d does not exist", surface_id);
+ return;
}
- auto rname = this->lookup_id(drawing_name);
+ auto o_layer_id = this->layers.get_layer_id(surface_id);
- if (rname)
+ if (!o_layer_id)
{
- return "Surface already present";
+ HMI_ERROR("wm", "Surface %d is not associated with any layer!", surface_id);
+ return;
}
- // register pair drawing_name and ivi_id
- this->id_alloc.register_name_id(drawing_name, sid);
- this->layers.add_surface(sid, *lid);
+ uint32_t layer_id = *o_layer_id;
- // this surface is already created
- HMI_DEBUG("wm", "surface_id is %u, layer_id is %u", sid, *lid);
+ auto const &layer = this->layers.get_layer(layer_id);
+ auto rect = this->layers.getAreaSize(area);
+ HMI_SEQ_DEBUG(g_app_list.currentRequestNumber(), "%s : x:%d y:%d w:%d h:%d", area.c_str(),
+ rect.x, rect.y, rect.w, rect.h);
+ auto &s = this->controller->surfaces[surface_id];
- this->controller->layers[*lid]->add_surface(sid);
- this->layout_commit();
+ int x = rect.x;
+ int y = rect.y;
+ int w = rect.w;
+ int h = rect.h;
- // add client into the db
- std::string appid_str(appid);
- std::string role(drawing_name);
- g_app_list.addClient(appid_str, *lid, sid, role);
+ HMI_DEBUG("wm", "surface_set_layout for surface %u on layer %u", surface_id,
+ layer_id);
- return nullptr;
+ // set destination to the display rectangle
+ s->set_destination_rectangle(x, y, w, h);
+
+ // 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);
}
-result<json_object *> WindowManager::api_get_display_info()
+void WindowManager::layout_commit()
{
- // Check controller
- if (!this->controller)
- {
- return Err<json_object *>("ivi_controller global not available");
- }
+ this->controller->commit_changes();
+ this->display->flush();
+}
- // Set display info
- compositor::size o_size = this->controller->output_size;
- compositor::size p_size = this->controller->physical_size;
+void WindowManager::emit_activated(char const *label)
+{
+ this->send_event(kListEventName[Event_Active], label);
+}
- 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));
+void WindowManager::emit_deactivated(char const *label)
+{
+ this->send_event(kListEventName[Event_Inactive], label);
+}
- return Ok<json_object *>(object);
+void WindowManager::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);
}
-result<json_object *> WindowManager::api_get_area_info(char const *drawing_name)
+void WindowManager::emit_syncdraw(const std::string &role, const std::string &area)
{
- HMI_DEBUG("wm", "called");
+ compositor::rect rect = this->layers.getAreaSize(area);
+ this->send_event(kListEventName[Event_SyncDraw],
+ role.c_str(), area.c_str(), rect.x, rect.y, rect.w, rect.h);
+}
- // Check drawing name, surface/layer id
- auto const &surface_id = this->lookup_id(drawing_name);
- if (!surface_id)
- {
- return Err<json_object *>("Surface does not exist");
- }
+void WindowManager::emit_flushdraw(char const *label)
+{
+ this->send_event(kListEventName[Event_FlushDraw], label);
+}
- if (!this->controller->surface_exists(*surface_id))
- {
- return Err<json_object *>("Surface does not exist in controller!");
- }
+void WindowManager::emit_visible(char const *label, bool is_visible)
+{
+ this->send_event(is_visible ? kListEventName[Event_Visible] : kListEventName[Event_Invisible], label);
+}
- auto layer_id = this->layers.get_layer_id(*surface_id);
- if (!layer_id)
- {
- return Err<json_object *>("Surface is not on any layer!");
- }
+void WindowManager::emit_invisible(char const *label)
+{
+ return emit_visible(label, false);
+}
+
+void WindowManager::emit_visible(char const *label) { return emit_visible(label, true); }
- auto o_state = *this->layers.get_layout_state(*surface_id);
- if (o_state == nullptr)
+void WindowManager::activate(int id)
+{
+ auto ip = this->controller->sprops.find(id);
+ if (ip != this->controller->sprops.end())
{
- return Err<json_object *>("Could not find layer for surface");
+ 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, "music")) ||
+ (0 == strcmp(label, "video")) ||
+ (0 == strcmp(label, "map")))
+ {
+ 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();
+
+ // TODO: application requests by old role,
+ // so convert role new to old for emitting event
+ const char* old_role = this->rolenew2old[label].c_str();
+
+ this->emit_visible(old_role);
+ this->emit_activated(old_role);
}
+}
- struct LayoutState &state = *o_state;
- if ((state.main != *surface_id) && (state.sub != *surface_id))
+void WindowManager::deactivate(int id)
+{
+ auto ip = this->controller->sprops.find(id);
+ if (ip != this->controller->sprops.end())
{
- return Err<json_object *>("Surface is inactive");
- }
+ char const *label =
+ this->lookup_name(id).value_or("unknown-name").c_str();
- // 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));
+ // FOR CES DEMO >>>
+ if ((0 == strcmp(label, "radio")) ||
+ (0 == strcmp(label, "music")) ||
+ (0 == strcmp(label, "video")) ||
+ (0 == strcmp(label, "map")))
+ {
- return Ok<json_object *>(object);
+ // 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->layout_commit();
+
+ // TODO: application requests by old role,
+ // so convert role new to old for emitting event
+ const char* old_role = this->rolenew2old[label].c_str();
+
+ this->emit_deactivated(old_role);
+ this->emit_invisible(old_role);
+ }
}
WMError WindowManager::setRequest(const std::string& appid, const std::string &role, const std::string &area,
{
HMI_SEQ_DEBUG(req_num, "check policy");
WMError ret = this->checkPolicy(req_num);
- if (ret != WMError::SUCCESS)
- {
- return ret;
- }
- HMI_SEQ_DEBUG(req_num, "Start transition.");
- ret = this->startTransition(req_num);
return ret;
}
*/
// get current trigger
bool found = false;
- bool split = false;
WMError ret = WMError::LAYOUT_CHANGE_FAIL;
auto trigger = g_app_list.getRequest(req_num, &found);
if (!found)
}
std::string req_area = trigger.area;
- // >>>> Compatible with current window manager until policy manager coming
if (trigger.task == Task::TASK_ALLOCATE)
{
- HMI_SEQ_DEBUG(req_num, "Check split or not");
const char *msg = this->check_surface_exist(trigger.role.c_str());
if (msg)
{
HMI_SEQ_ERROR(req_num, msg);
- ret = WMError::LAYOUT_CHANGE_FAIL;
return ret;
}
-
- auto const &surface_id = this->lookup_id(trigger.role.c_str());
- auto o_state = *this->layers.get_layout_state(*surface_id);
- struct LayoutState &state = *o_state;
-
- unsigned curernt_sid = state.main;
- split = this->can_split(state, *surface_id);
-
- if (split)
- {
- HMI_SEQ_DEBUG(req_num, "Split happens");
- // Get current visible role
- std::string add_role = this->lookup_name(state.main).value();
- // Set next area
- std::string add_area = std::string(kNameLayoutSplit) + "." + std::string(kNameAreaMain);
- // Change request area
- req_area = std::string(kNameLayoutSplit) + "." + std::string(kNameAreaSub);
- HMI_SEQ_NOTICE(req_num, "Change request area from %s to %s, because split happens",
- trigger.area.c_str(), req_area.c_str());
- // set another action
- std::string add_name = g_app_list.getAppID(curernt_sid, add_role, &found);
- if (!found)
- {
- HMI_SEQ_ERROR(req_num, "Couldn't widhdraw with surfaceID : %d", curernt_sid);
- ret = WMError::NOT_REGISTERED;
- return ret;
- }
- HMI_SEQ_INFO(req_num, "Additional split app %s, role: %s, area: %s",
- add_name.c_str(), add_role.c_str(), add_area.c_str());
- // Set split action
- bool end_draw_finished = false;
- WMAction split_action{
- add_name,
- add_role,
- add_area,
- TaskVisible::VISIBLE,
- end_draw_finished};
- WMError ret = g_app_list.setAction(req_num, split_action);
- if (ret != WMError::SUCCESS)
- {
- HMI_SEQ_ERROR(req_num, "Failed to set action");
- return ret;
- }
- g_app_list.reqDump();
- }
- }
- else
- {
- HMI_SEQ_DEBUG(req_num, "split doesn't happen");
}
- // Set invisible task(Remove if policy manager finish)
- ret = this->setInvisibleTask(trigger.role, split);
- if(ret != WMError::SUCCESS)
+ // Input event data to PolicyManager
+ if (0 > this->pmw.setInputEventData(trigger.task, trigger.role, trigger.area))
{
- HMI_SEQ_ERROR(req_num, "Failed to set invisible task: %s", errorDescription(ret));
+ HMI_SEQ_ERROR(req_num, "Failed to set input event data to PolicyManager");
return ret;
}
- /* get new status from Policy Manager */
- HMI_SEQ_NOTICE(req_num, "ATM, Policy manager does't exist, then set WMAction as is");
- if(trigger.role == "HomeScreen")
+ // Execute state transition of PolicyManager
+ if (0 > this->pmw.executeStateTransition())
{
- // TODO : Remove when Policy Manager completed
- HMI_SEQ_NOTICE(req_num, "Hack. This process will be removed. Change HomeScreen code!!");
- req_area = "fullscreen";
+ HMI_SEQ_ERROR(req_num, "Failed to execute state transition of PolicyManager");
+ return ret;
}
- TaskVisible task_visible =
- (trigger.task == Task::TASK_ALLOCATE) ? TaskVisible::VISIBLE : TaskVisible::INVISIBLE;
- ret = g_app_list.setAction(req_num, trigger.appid, trigger.role, req_area, task_visible);
+ ret = WMError::SUCCESS;
+
g_app_list.reqDump();
return ret;
for (const auto &action : actions)
{
- if (action.visible != TaskVisible::INVISIBLE)
+ if (action.visible == TaskVisible::VISIBLE)
{
sync_draw_happen = true;
- this->emit_syncdraw(action.role, action.area);
+
+ // TODO: application requests by old role,
+ // so convert role new to old for emitting event
+ std::string old_role = this->rolenew2old[action.role];
+
+ this->emit_syncdraw(old_role, action.area);
/* TODO: emit event for app not subscriber
if(g_app_list.contains(y.appid))
g_app_list.lookUpClient(y.appid)->emit_syncdraw(y.role, y.area); */
this->deactivate(client->surfaceID(x.role));
}
}
- ret = NO_LAYOUT_CHANGE;
+ ret = WMError::NO_LAYOUT_CHANGE;
}
return ret;
}
-WMError WindowManager::setInvisibleTask(const std::string &role, bool split)
-{
- unsigned req_num = g_app_list.currentRequestNumber();
- HMI_SEQ_DEBUG(req_num, "set current visible app to invisible task");
- // This task is copied from original actiavete surface
- const char *drawing_name = role.c_str();
- auto const &surface_id = this->lookup_id(drawing_name);
- auto layer_id = this->layers.get_layer_id(*surface_id);
- auto o_state = *this->layers.get_layout_state(*surface_id);
- struct LayoutState &state = *o_state;
- std::string add_name, add_role;
- std::string add_area = "";
- int surface;
- TaskVisible task_visible = TaskVisible::INVISIBLE;
- bool end_draw_finished = true;
- bool found = false;
-
- for (auto const &l : this->layers.mapping)
- {
- if (l.second.layer_id <= *layer_id)
- {
- continue;
- }
- HMI_DEBUG("wm", "debug: main %d , sub : %d", l.second.state.main, l.second.state.sub);
- if (l.second.state.main != -1)
- {
- //this->deactivate(l.second.state.main);
- surface = l.second.state.main;
- add_role = *this->id_alloc.lookup(surface);
- add_name = g_app_list.getAppID(surface, add_role, &found);
- if(!found){
- return WMError::NOT_REGISTERED;
- }
- HMI_SEQ_INFO(req_num, "Invisible %s", add_name.c_str());
- WMAction act{add_name, add_role, add_area, task_visible, end_draw_finished};
- g_app_list.setAction(req_num, act);
- l.second.state.main = -1;
- }
-
- if (l.second.state.sub != -1)
- {
- //this->deactivate(l.second.state.sub);
- surface = l.second.state.sub;
- add_role = *this->id_alloc.lookup(surface);
- add_name = g_app_list.getAppID(surface, add_role, &found);
- if (!found)
- {
- return WMError::NOT_REGISTERED;
- }
- HMI_SEQ_INFO(req_num, "Invisible %s", add_name.c_str());
- WMAction act{add_name, add_role, add_area, task_visible, end_draw_finished};
- g_app_list.setAction(req_num, act);
- l.second.state.sub = -1;
- }
- }
-
- // change current state here, but this is hack
- auto layer = this->layers.get_layer(*layer_id);
-
- if (state.main == -1)
- {
- HMI_DEBUG("wm", "Layout: %s", kNameLayoutNormal);
- }
- else
- {
- if (0 != strcmp(drawing_name, "HomeScreen"))
- {
- if (split)
- {
- if (state.sub != *surface_id)
- {
- if (state.sub != -1)
- {
- //this->deactivate(state.sub);
- WMAction deact_sub;
- deact_sub.role =
- std::move(*this->id_alloc.lookup(state.sub));
- deact_sub.area = add_area;
- deact_sub.appid = g_app_list.getAppID(state.sub, deact_sub.role, &found);
- if (!found)
- {
- HMI_SEQ_ERROR(req_num, "App doesn't exist for role : %s",
- deact_sub.role.c_str());
- return WMError::NOT_REGISTERED;
- }
- deact_sub.visible = task_visible;
- deact_sub.end_draw_finished = end_draw_finished;
- HMI_SEQ_DEBUG(req_num, "Set invisible task for %s", deact_sub.appid.c_str());
- g_app_list.setAction(req_num, deact_sub);
- }
- }
- //state = LayoutState{state.main, *surface_id};
- }
- else
- {
- HMI_DEBUG("wm", "Layout: %s", kNameLayoutNormal);
-
- //this->surface_set_layout(*surface_id);
- if (state.main != *surface_id)
- {
- // this->deactivate(state.main);
- WMAction deact_main;
- deact_main.role = std::move(*this->id_alloc.lookup(state.main));
- ;
- deact_main.area = add_area;
- deact_main.appid = g_app_list.getAppID(state.main, deact_main.role, &found);
- if (!found)
- {
- HMI_SEQ_DEBUG(req_num, "sub surface ddoesn't exist");
- return WMError::NOT_REGISTERED;
- }
- deact_main.visible = task_visible;
- deact_main.end_draw_finished = end_draw_finished;
- HMI_SEQ_DEBUG(req_num, "sub surface doesn't exist");
- g_app_list.setAction(req_num, deact_main);
- }
- if (state.sub != -1)
- {
- if (state.sub != *surface_id)
- {
- //this->deactivate(state.sub);
- WMAction deact_sub;
- deact_sub.role = std::move(*this->id_alloc.lookup(state.sub));
- ;
- deact_sub.area = add_area;
- deact_sub.appid = g_app_list.getAppID(state.sub, deact_sub.role, &found);
- if (!found)
- {
- HMI_SEQ_DEBUG(req_num, "sub surface ddoesn't exist");
- return WMError::NOT_REGISTERED;
- }
- deact_sub.visible = task_visible;
- deact_sub.end_draw_finished = end_draw_finished;
- HMI_SEQ_DEBUG(req_num, "sub surface doesn't exist");
- g_app_list.setAction(req_num, deact_sub);
- }
- }
- //state = LayoutState{*surface_id};
- }
- }
- }
- return WMError::SUCCESS;
-}
-
WMError WindowManager::doEndDraw(unsigned req_num)
{
// get actions
// layout change and make it visible
for (const auto &act : actions)
{
- // layout change
- if(!g_app_list.contains(act.appid)){
- ret = WMError::NOT_REGISTERED;
- }
- ret = this->layoutChange(act);
- if(ret != WMError::SUCCESS)
+ if(act.visible != TaskVisible::NO_CHANGE)
{
- HMI_SEQ_WARNING(req_num,
- "Failed to manipulate surfaces while state change : %s", errorDescription(ret));
- return ret;
- }
- ret = this->visibilityChange(act);
- if (ret != WMError::SUCCESS)
- {
- HMI_SEQ_WARNING(req_num,
- "Failed to manipulate surfaces while state change : %s", errorDescription(ret));
- return ret;
+ // layout change
+ if(!g_app_list.contains(act.appid)){
+ ret = WMError::NOT_REGISTERED;
+ }
+ ret = this->layoutChange(act);
+ if(ret != WMError::SUCCESS)
+ {
+ HMI_SEQ_WARNING(req_num,
+ "Failed to manipulate surfaces while state change : %s", errorDescription(ret));
+ return ret;
+ }
+ ret = this->visibilityChange(act);
+ if (ret != WMError::SUCCESS)
+ {
+ HMI_SEQ_WARNING(req_num,
+ "Failed to manipulate surfaces while state change : %s", errorDescription(ret));
+ return ret;
+ }
+ HMI_SEQ_DEBUG(req_num, "visible %s", act.role.c_str());
+ //this->lm_enddraw(act.role.c_str());
}
- HMI_SEQ_DEBUG(req_num, "visible %s", act.role.c_str());
- //this->lm_enddraw(act.role.c_str());
}
-
- // Change current state
- this->changeCurrentState(req_num);
+ this->layout_commit();
HMI_SEQ_INFO(req_num, "emit flushDraw");
for(const auto &act_flush : actions)
{
- if(act_flush.visible != TaskVisible::INVISIBLE)
+ if(act_flush.visible == TaskVisible::VISIBLE)
{
- this->emit_flushdraw(act_flush.role.c_str());
+ // TODO: application requests by old role,
+ // so convert role new to old for emitting event
+ std::string old_role = this->rolenew2old[act_flush.role];
+
+ this->emit_flushdraw(old_role.c_str());
}
}
return ret;
}
-WMError WindowManager::setSurfaceSize(unsigned surface, const std::string &area)
-{
- this->surface_set_layout(surface, area);
-
- return WMError::SUCCESS;
-}
-
WMError WindowManager::layoutChange(const WMAction &action)
{
if (action.visible == TaskVisible::INVISIBLE)
return WMError::SUCCESS;
}
-WMError WindowManager::changeCurrentState(unsigned req_num)
+WMError WindowManager::setSurfaceSize(unsigned surface, const std::string &area)
{
- HMI_SEQ_DEBUG(req_num, "Change current layout state");
- bool trigger_found = false, action_found = false;
- auto trigger = g_app_list.getRequest(req_num, &trigger_found);
- auto actions = g_app_list.getActions(req_num, &action_found);
- if (!trigger_found || !action_found)
- {
- HMI_SEQ_ERROR(req_num, "Action not found");
- return WMError::LAYOUT_CHANGE_FAIL;
- }
+ this->surface_set_layout(surface, area);
- // Layout state reset
- struct LayoutState reset_state{-1, -1};
- HMI_SEQ_DEBUG(req_num,"Reset layout state");
- for (const auto &action : actions)
+ return WMError::SUCCESS;
+}
+
+void WindowManager::emitScreenUpdated(unsigned req_num)
+{
+ // Get visible apps
+ HMI_SEQ_DEBUG(req_num, "emit screen updated");
+ bool found = false;
+ auto actions = g_app_list.getActions(req_num, &found);
+
+ // create json object
+ json_object *j = json_object_new_object();
+ json_object *jarray = json_object_new_array();
+
+ for(const auto& action: actions)
{
- if(!g_app_list.contains(action.appid)){
- return WMError::NOT_REGISTERED;
- }
- auto client = g_app_list.lookUpClient(action.appid);
- auto pCurState = *this->layers.get_layout_state((int)client->surfaceID(action.role));
- if(pCurState == nullptr)
+ if(action.visible != TaskVisible::INVISIBLE)
{
- HMI_SEQ_ERROR(req_num, "Counldn't find current status");
- continue;
+ json_object_array_add(jarray, json_object_new_string(action.appid.c_str()));
}
- pCurState->main = reset_state.main;
- pCurState->sub = reset_state.sub;
}
+ json_object_object_add(j, kKeyIds, jarray);
+ HMI_SEQ_INFO(req_num, "Visible app: %s", json_object_get_string(j));
- HMI_SEQ_DEBUG(req_num, "Change state");
- for (const auto &action : actions)
+ int ret = afb_event_push(
+ this->map_afb_event[kListEventName[Event_ScreenUpdated]], j);
+ if (ret != 0)
{
- auto client = g_app_list.lookUpClient(action.appid);
- auto pLayerCurState = *this->layers.get_layout_state((int)client->surfaceID(action.role));
- if (pLayerCurState == nullptr)
- {
- HMI_SEQ_ERROR(req_num, "Counldn't find current status");
- continue;
- }
- int surface = -1;
-
- if (action.visible != TaskVisible::INVISIBLE)
- {
- surface = (int)client->surfaceID(action.role);
- HMI_SEQ_INFO(req_num, "Change %s surface : %d, state visible area : %s",
- action.role.c_str(), surface, action.area.c_str());
- // visible == true -> layout changes
- if(action.area == "normal.full" || action.area == "split.main")
- {
- pLayerCurState->main = surface;
- }
- else if (action.area == "split.sub")
- {
- pLayerCurState->sub = surface;
- }
- else
- {
- // normalfull
- pLayerCurState->main = surface;
- }
- }
+ HMI_DEBUG("wm", "afb_event_push failed: %m");
}
-
- return WMError::SUCCESS;
}
void WindowManager::setTimer()
{
+ struct timespec ts;
+ if (clock_gettime(CLOCK_BOOTTIME, &ts) != 0) {
+ HMI_ERROR("wm", "Could't set time (clock_gettime() returns with error");
+ return;
+ }
+
HMI_SEQ_DEBUG(g_app_list.currentRequestNumber(), "Timer set activate");
if (g_timer_ev_src == nullptr)
{
// firsttime set into sd_event
int ret = sd_event_add_time(afb_daemon_get_event_loop(), &g_timer_ev_src,
- CLOCK_REALTIME, time(NULL) * (1000000UL) + kTimeOut, 1, processTimerHandler, this);
+ CLOCK_BOOTTIME, (uint64_t)(ts.tv_sec + kTimeOut) * 1000000ULL, 1, processTimerHandler, this);
if (ret < 0)
{
HMI_ERROR("wm", "Could't set timer");
else
{
// update timer limitation after second time
- sd_event_source_set_time(g_timer_ev_src, time(NULL) * (1000000UL) + kTimeOut);
+ sd_event_source_set_time(g_timer_ev_src, (uint64_t)(ts.tv_sec + kTimeOut) * 1000000ULL);
sd_event_source_set_enabled(g_timer_ev_src, SD_EVENT_ONESHOT);
}
}
}
}
-const char *WindowManager::check_surface_exist(const char *drawing_name)
+const char* WindowManager::convertRoleOldToNew(char const *old_role)
{
- auto const &surface_id = this->lookup_id(drawing_name);
- if (!surface_id)
+ const char *new_role = nullptr;
+
+ for (auto const &on : this->roleold2new)
{
- return "Surface does not exist";
+ std::regex regex = std::regex(on.first);
+ if (std::regex_match(old_role, regex))
+ {
+ // role is old. So convert to new.
+ new_role = on.second.c_str();
+ break;
+ }
}
- if (!this->controller->surface_exists(*surface_id))
+ if (nullptr == new_role)
{
- return "Surface does not exist in controller!";
+ // role is new or fallback.
+ new_role = old_role;
}
- auto layer_id = this->layers.get_layer_id(*surface_id);
+ HMI_DEBUG("wm", "old:%s -> new:%s", old_role, new_role);
- if (!layer_id)
+ return new_role;
+}
+
+int WindowManager::loadOldRoleDb()
+{
+ std::string file_name(get_file_path("old_roles.db"));
+
+ // Load old_role.db
+ json_object* json_obj;
+ int ret = jh::inputJsonFilie(file_name.c_str(), &json_obj);
+ if (0 > ret)
{
- return "Surface is not on any layer!";
+ HMI_ERROR("wm", "Could not open old_role.db, so use default old_role information");
+ json_obj = json_tokener_parse(kDefaultOldRoleDb);
}
+ HMI_DEBUG("wm", "json_obj dump:%s", json_object_get_string(json_obj));
- auto o_state = *this->layers.get_layout_state(*surface_id);
-
- if (o_state == nullptr)
+ // Perse apps
+ json_object* json_cfg;
+ if (!json_object_object_get_ex(json_obj, "old_roles", &json_cfg))
{
- return "Could not find layer for surface";
+ HMI_ERROR("wm", "Parse Error!!");
+ return -1;
}
- HMI_DEBUG("wm", "surface %d is detected", *surface_id);
- return nullptr;
-}
+ int len = json_object_array_length(json_cfg);
+ HMI_DEBUG("wm", "json_cfg len:%d", len);
+ HMI_DEBUG("wm", "json_cfg dump:%s", json_object_get_string(json_cfg));
-void WindowManager::activate(int id)
-{
- auto ip = this->controller->sprops.find(id);
- if (ip != this->controller->sprops.end())
+ for (int i=0; i<len; i++)
{
- this->controller->surfaces[id]->set_visibility(1);
- char const *label =
- this->lookup_name(id).value_or("unknown-name").c_str();
+ json_object* json_tmp = json_object_array_get_idx(json_cfg, i);
- // FOR CES DEMO >>>
- if ((0 == strcmp(label, "Radio")) ||
- (0 == strcmp(label, "MediaPlayer")) ||
- (0 == strcmp(label, "Music")) ||
- (0 == strcmp(label, "Navigation")))
+ const char* old_role = jh::getStringFromJson(json_tmp, "name");
+ if (nullptr == old_role)
{
- 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);
+ HMI_ERROR("wm", "Parse Error!!");
+ return -1;
+ }
- for (int j : this->surface_bg)
- {
- HMI_DEBUG("wm", "Stored id:%d", j);
- }
- break;
- }
- }
+ const char* new_role = jh::getStringFromJson(json_tmp, "new");
+ if (nullptr == new_role)
+ {
+ HMI_ERROR("wm", "Parse Error!!");
+ return -1;
}
- // <<< FOR CES DEMO
- this->layout_commit();
- this->emit_visible(label);
- this->emit_activated(label);
+ this->roleold2new[old_role] = std::string(new_role);
}
-}
-void WindowManager::deactivate(int id)
-{
- auto ip = this->controller->sprops.find(id);
- if (ip != this->controller->sprops.end())
+ // Check
+ for(auto itr = this->roleold2new.begin();
+ itr != this->roleold2new.end(); ++itr)
{
- 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);
+ HMI_DEBUG("wm", ">>> role old:%s new:%s",
+ itr->first.c_str(), itr->second.c_str());
+ }
- for (int j : surface_bg)
- {
- HMI_DEBUG("wm", "Stored id:%d", j);
- }
- }
- else
- {
- this->controller->surfaces[id]->set_visibility(0);
- }
- // <<< FOR CES DEMO
+ // Release json_object
+ json_object_put(json_obj);
- this->emit_deactivated(label);
- this->emit_invisible(label);
- }
+ return 0;
}
-bool WindowManager::can_split(struct LayoutState const &state, int new_id)
+const char *WindowManager::check_surface_exist(const char *drawing_name)
{
- if (state.main != -1 && state.main != new_id)
+ auto const &surface_id = this->lookup_id(drawing_name);
+ if (!surface_id)
{
- auto new_id_layer = this->layers.get_layer_id(new_id).value();
- auto current_id_layer = this->layers.get_layer_id(state.main).value();
-
- // 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);
+ return "Surface does not exist";
+ }
- HMI_DEBUG("wm", "layer info name: %s", layer->name.c_str());
+ if (!this->controller->surface_exists(*surface_id))
+ {
+ return "Surface does not exist in controller!";
+ }
- if (layer->layouts.empty())
- {
- return false;
- }
+ auto layer_id = this->layers.get_layer_id(*surface_id);
- for (auto i = layer->layouts.cbegin(); i != layer->layouts.cend(); i++)
- {
- 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
- 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))
- {
- HMI_DEBUG("wm", "layout matched!");
- return true;
- }
- }
- }
+ if (!layer_id)
+ {
+ return "Surface is not on any layer!";
}
- return false;
+ HMI_DEBUG("wm", "surface %d is detected", *surface_id);
+ return nullptr;
}
+const char* WindowManager::kDefaultOldRoleDb = "{ \
+ \"old_roles\": [ \
+ { \
+ \"name\": \"HomeScreen\", \
+ \"new\": \"homescreen\" \
+ }, \
+ { \
+ \"name\": \"Music\", \
+ \"new\": \"music\" \
+ }, \
+ { \
+ \"name\": \"MediaPlayer\", \
+ \"new\": \"music\" \
+ }, \
+ { \
+ \"name\": \"Video\", \
+ \"new\": \"video\" \
+ }, \
+ { \
+ \"name\": \"VideoPlayer\", \
+ \"new\": \"video\" \
+ }, \
+ { \
+ \"name\": \"WebBrowser\", \
+ \"new\": \"browser\" \
+ }, \
+ { \
+ \"name\": \"Radio\", \
+ \"new\": \"radio\" \
+ }, \
+ { \
+ \"name\": \"Phone\", \
+ \"new\": \"phone\" \
+ }, \
+ { \
+ \"name\": \"Navigation\", \
+ \"new\": \"map\" \
+ }, \
+ { \
+ \"name\": \"HVAC\", \
+ \"new\": \"hvac\" \
+ }, \
+ { \
+ \"name\": \"Settings\", \
+ \"new\": \"settings\" \
+ }, \
+ { \
+ \"name\": \"Dashboard\", \
+ \"new\": \"dashboard\" \
+ }, \
+ { \
+ \"name\": \"POI\", \
+ \"new\": \"poi\" \
+ }, \
+ { \
+ \"name\": \"Mixer\", \
+ \"new\": \"mixer\" \
+ }, \
+ { \
+ \"name\": \"Restriction\", \
+ \"new\": \"restriction\" \
+ }, \
+ { \
+ \"name\": \"^OnScreen.*\", \
+ \"new\": \"on_screen\" \
+ } \
+ ] \
+}";
+
/**
* controller_hooks
*/
void controller_hooks::surface_created(uint32_t surface_id)
{
- this->app->surface_created(surface_id);
+ this->wmgr->surface_created(surface_id);
}
void controller_hooks::surface_removed(uint32_t surface_id)
{
- this->app->surface_removed(surface_id);
+ this->wmgr->surface_removed(surface_id);
}
void controller_hooks::surface_visibility(uint32_t /*surface_id*/,