namespace
{
-using nlohmann::json;
+// using nlohmann::json;
-result<json> file_to_json(char const *filename)
+/* result<json> file_to_json(char const *filename)
{
json j;
std::ifstream i(filename);
if (i.fail())
{
- HMI_DEBUG("wm", "Could not open config file, so use default layer information");
+ HMI_DEBUG("Could not open config file, so use default layer information");
j = default_layers_json;
}
else
struct result<layer_map> load_layer_map(char const *filename)
{
- HMI_DEBUG("wm", "loading IDs from %s", filename);
+ HMI_DEBUG("loading IDs from %s", filename);
auto j = file_to_json(filename);
if (j.is_err())
json jids = j.unwrap();
return to_layer_map(jids);
-}
+} */
static int processTimerHandler(sd_event_source *s, uint64_t usec, void *userdata)
{
- HMI_NOTICE("wm", "Time out occurs because the client replys endDraw slow, so revert the request");
+ HMI_NOTICE("Time out occurs because the client replys endDraw slow, so revert the request");
reinterpret_cast<wm::WindowManager *>(userdata)->timerHandler();
return 0;
}
/**
* WindowManager Impl
*/
-WindowManager::WindowManager(wl::display *d)
+WindowManager::WindowManager()
: chooks{this},
- display{d},
- controller{},
- outputs(),
- layers(),
- id_alloc{},
- pending_events(false)
+ id_alloc{}
{
const char *path = getenv("AFM_APP_INSTALL_DIR");
- string lm_setting_path = path;
if (!path)
{
- HMI_ERROR("wm", "AFM_APP_INSTALL_DIR is not defined");
- }
- else
- {
- lm_setting_path += "/etc/layers_setting.json";
+ HMI_ERROR("AFM_APP_INSTALL_DIR is not defined");
}
- this->lm = std::make_shared<LayerControl>(lm_setting_path);
+ string root = path;
+
+ this->lc = std::make_shared<LayerControl>(root);
+
+ HMI_DEBUG("Layer Controller initialized");
/* try
{
}
else
{
- HMI_ERROR("wm", "%s", l.err().value());
+ HMI_ERROR("%s", l.err().value());
}
}
}
catch (std::exception &e)
{
- HMI_ERROR("wm", "Loading of configuration failed: %s", e.what());
+ HMI_ERROR("Loading of configuration failed: %s", e.what());
} */
}
int WindowManager::init()
{
- if (!this->display->ok())
+ /* if (!this->display->ok())
{
return -1;
}
if (this->layers.mapping.empty())
{
- HMI_ERROR("wm", "No surface -> layer mapping loaded");
+ HMI_ERROR("No surface -> layer mapping loaded");
return -1;
- }
+ } */
// TODO: application requests by old role,
// so create role map (old, new)
// Load old_role.db
+ LayerControlCallbacks lmcb;
+ lmcb.surfaceCreated = [&](unsigned pid, unsigned surface){
+ this->surface_created(surface);
+ };
+ this->lc->init(lmcb);
this->loadOldRoleDb();
// Store my context for calling callback from PolicyManager
map_afb_event[kListEventName[i]] = afb_daemon_make_event(kListEventName[i]);
}
- this->display->add_global_handler(
+ const struct rect css_bg = this->lc->getAreaSize("fullscreen");
+ Screen screen = this->lc->getScreenInfo();
+ rectangle dp_bg(screen.width(), screen.height());
+
+ dp_bg.set_aspect(static_cast<double>(css_bg.w) / css_bg.h);
+ dp_bg.fit(screen.width(), screen.height());
+ dp_bg.center(screen.width(), screen.height());
+ HMI_DEBUG("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());
+
+ double scale = static_cast<double>(dp_bg.height()) / css_bg.h;
+ this->lc->setupArea(scale);
+
+ /* 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));
});
// Second level objects
this->display->roundtrip();
// Third level objects
- this->display->roundtrip();
+ this->display->roundtrip(); */
- return init_layers();
+ return 0; //init_layers();
}
-int WindowManager::dispatch_pending_events()
+/* int WindowManager::dispatch_pending_events()
{
if (this->pop_pending_events())
{
void WindowManager::set_pending_events()
{
this->pending_events.store(true, std::memory_order_release);
-}
+} */
result<int> WindowManager::api_request_surface(char const *appid, char const *drawing_name)
{
// TODO: application requests by old role,
// so convert role old to new
const char *role = this->convertRoleOldToNew(drawing_name);
+ string l_name;
+ string s_appid = appid;
+ string s_role = drawing_name;
- auto lid = this->layers.get_layer_id(string(role));
- unsigned l_id = this->lm->getNewLayerID(role);
- if (l_id != 0)
- {
- /**
- * register drawing_name as fallback and make it displayed.
- */
- lid = this->layers.get_layer_id(string("fallback"));
- l_id = this->lm->getNewLayerID("fallback");
- HMI_DEBUG("wm", "%s is not registered in layers.json, then fallback as normal app", role);
- if (!lid)
+ if(!g_app_list.contains(s_appid))
+ {
+ // auto lid = this->layers.get_layer_id(string(role));
+ unsigned l_id = this->lc->getNewLayerID(s_role, &l_name);
+ if (l_id == 0)
{
- return Err<int>("Drawing name does not match any role, fallback is disabled");
+ /**
+ * register drawing_name as fallback and make it displayed.
+ */
+ // lid = this->layers.get_layer_id(string("fallback"));
+ l_id = this->lc->getNewLayerID("fallback", &l_name);
+ HMI_DEBUG("%s is not registered in layers.json, then fallback as normal app", role);
+ if (l_id == 0)
+ {
+ return Err<int>("Designated role does not match any role, fallback is disabled");
+ }
}
+ this->lc->createNewLayer(l_id);
+ // add client into the db
+ g_app_list.addClient(s_appid, l_id, s_role);
}
// generate surface ID for ivi-shell application
- // auto rname = this->lookup_id(role);
- // if (!rname)
- // {
+ auto rname = this->id_alloc.lookup(string(role));
+ if (!rname)
+ {
// name does not exist yet, allocate surface id...
auto id = int(this->id_alloc.generate_id(role));
// this->layers.add_surface(id, *lid);
// this->layers.main_surface_name == drawing_name)
// {
// this->layers.main_surface = id;
- // HMI_DEBUG("wm", "Set main_surface id to %u", id);
+ // HMI_DEBUG("Set main_surface id to %u", id);
// }
- // add client into the db
- string appid_str(appid);
- if(g_app_list.contains(appid_str))
+
+
+ /* if(g_app_list.contains(appid_str))
{
// add surface into app
auto client = g_app_list.lookUpClient(appid_str);
else
{
g_app_list.addClient(appid_str, l_id, id, string(role));
- }
+ } */
// Set role map of (new, old)
this->rolenew2old[role] = string(drawing_name);
return Ok<int>(id);
- // }
+ }
// Check currently registered drawing names if it is already there.
return Err<int>("Surface already present");
char const *WindowManager::api_request_surface(char const *appid, char const *drawing_name,
char const *ivi_id)
{
- ST();
-
// TODO: application requests by old role,
// so convert role old to new
const char *role = this->convertRoleOldToNew(drawing_name);
+ string str = role;
+ string l_name;
- auto lid = this->layers.get_layer_id(string(role));
+ // auto lid = this->layers.get_layer_id(string(role));
+ unsigned lid = this->lc->getNewLayerID(str, &l_name);
unsigned sid = std::stol(ivi_id);
- if (!lid)
+ if (lid == 0)
{
- /**
- * register drawing_name as fallback and make it displayed.
- */
- lid = this->layers.get_layer_id(string("fallback"));
- HMI_DEBUG("wm", "%s is not registered in layers.json, then fallback as normal app", role);
- if (!lid)
+ //register drawing_name as fallback and make it displayed.
+ lid = this->lc->getNewLayerID(str, &l_name);
+ HMI_DEBUG("%s is not registered in layers.json, then fallback as normal app", role);
+ if (lid == 0)
{
return "Drawing name does not match any role, fallback is disabled";
}
}
- auto rname = this->lookup_id(role);
+ this->lc->createNewLayer(lid);
+
+ auto rname = this->id_alloc.lookup(str);
if (rname)
{
// register pair drawing_name and ivi_id
this->id_alloc.register_name_id(role, sid);
- this->layers.add_surface(sid, *lid);
+ // this->layers.add_surface(sid, *lid);
// this surface is already created
- HMI_DEBUG("wm", "surface_id is %u, layer_id is %u", sid, *lid);
+ // HMI_DEBUG("surface_id is %u, layer_id is %u", sid, *lid);
- this->controller->layers[*lid]->add_surface(sid);
- this->layout_commit();
+ // this->controller->layers[*lid]->add_surface(sid);
+ // this->layout_commit();
// add client into the db
string appid_str(appid);
- g_app_list.addClient(appid_str, *lid, sid, string(role));
+ g_app_list.addClient(appid_str, lid, string(role));
// Set role map of (new, old)
this->rolenew2old[role] = string(drawing_name);
bool WindowManager::api_set_role(char const *appid, char const *drawing_name, unsigned pid){
string id = appid;
string role = drawing_name;
+ string l_name;
unsigned surface = 0;
WMError wm_err = WMError::UNKNOWN;
bool ret = false;
// get layer ID which role should be in
- auto lid = this->layers.get_layer_id(role);
- if (!lid)
- {
- /**
- * register drawing_name as fallback and make it displayed.
- */
- lid = this->layers.get_layer_id(string("fallback"));
- HMI_DEBUG("wm", "%s is not registered in layers.json, then fallback as normal app", role.c_str());
- if (!lid)
+ // auto lid = this->layers.get_layer_id(role);
+ unsigned lid = this->lc->getNewLayerID(role, &l_name);
+ if (lid == 0)
+ {
+ // lid = this->layers.get_layer_id(string("fallback"));
+ HMI_DEBUG("%s is not registered in layers.json, then fallback as normal app", role.c_str());
+ if (lid == 0)
{
- HMI_ERROR("wm", "Drawing name does not match any role, fallback is disabled");
+ HMI_ERROR("Drawing name does not match any role, fallback is disabled");
return ret;
}
}
if(0 != pid){
// search floating surfaceID from pid if pid is designated.
- // It is not good that application request with its pid
wm_err = g_app_list.popFloatingSurface(pid, &surface);
}
else{
//wm_err = g_app_list.popFloatingSurface(id);
}
if(wm_err != WMError::SUCCESS){
- HMI_ERROR("wm", "No floating surface for app: %s", id.c_str());
- g_app_list.addFloatingClient(id, *lid, role);
- HMI_NOTICE("wm", "%s : Waiting for surface creation", id.c_str());
+ HMI_ERROR("No floating surface for app: %s", id.c_str());
+ g_app_list.addFloatingClient(id, lid, role);
+ HMI_NOTICE("%s : Waiting for surface creation", id.c_str());
return ret;
}
ret = true;
if (g_app_list.contains(id))
{
- HMI_INFO("wm", "Add role: %s with surface: %d. Client %s has multi surfaces.",
+ HMI_INFO("Add role: %s with surface: %d. Client %s has multi surfaces.",
role.c_str(), surface, id.c_str());
- wm_err = g_app_list.appendRole(id, role, surface);
- if(wm_err != WMError::SUCCESS){
- HMI_INFO("wm", errorDescription(wm_err));
- }
+ auto client = g_app_list.lookUpClient(id);
+ client->appendRole(role);
}
else{
- HMI_INFO("wm", "Create new client: %s, surface: %d into layer: %d with role: %s",
- id.c_str(), surface, *lid, role.c_str());
- g_app_list.addClient(id, *lid, surface, role);
+ HMI_INFO("Create new client: %s, surface: %d into layer: %d with role: %s",
+ id.c_str(), surface, lid, role.c_str());
+ g_app_list.addClient(id, lid, role);
}
// register pair drawing_name and ivi_id
this->id_alloc.register_name_id(role.c_str(), surface);
- this->layers.add_surface(surface, *lid);
+ // this->layers.add_surface(surface, *lid);
// this surface is already created
- HMI_DEBUG("wm", "surface_id is %u, layer_id is %u", surface, *lid);
+ HMI_DEBUG("surface_id is %u, layer_id is %u", surface, lid);
- const auto &o_layer = this->layers.get_layer(*lid);
- auto rect = o_layer.value().rect;
+ // const auto &o_layer = this->layers.get_layer(*lid);
+ /* auto rect = o_layer.value().rect;
if(rect.w < 0)
{
rect.w = this->controller->output_size.w + 1 + rect.w;
if(rect.h < 0)
{
rect.h = this->controller->output_size.h + 1 + rect.h;
- }
+ } */
- this->controller->layers[*lid]->add_surface(surface);
- this->layout_commit();
+ // this->controller->layers[*lid]->add_surface(surface);
+ // this->layout_commit();
return ret;
}
void WindowManager::api_activate_surface(char const *appid, char const *drawing_name,
char const *drawing_area, const reply_func &reply)
{
- ST();
+ ;
// TODO: application requests by old role,
// so convert role old to new
}
auto client = g_app_list.lookUpClient(id);
- unsigned srfc = client->surfaceID(role);
- if(srfc == 0)
- {
- HMI_ERROR("wm", "role sould be set with surface");
- reply("role sould be set with surface");
- return;
- }
- g_app_list.removeFloatingSurface(client->surfaceID());
+ // unsigned srfc = client->surfaceID(role);
+ // unsigned layer = client->layerID();
+
+ // g_app_list.removeFloatingSurface(client->surfaceID());
+ // g_app_list.removeFloatingSurface(client);
Task task = Task::TASK_ALLOCATE;
unsigned req_num = 0;
ret = this->setRequest(id, role, area, task, &req_num);
+ //vector<WMLayerState> current_states = this->lc->getCurrentStates();
+ // ret = this->setRequest(id, role, area, task, current_states, &req_num);
+
if(ret != WMError::SUCCESS)
{
- HMI_ERROR("wm", errorDescription(ret));
+ HMI_ERROR(errorDescription(ret));
reply("Failed to set request");
return;
}
/*
* Do allocate tasks
*/
- ret = this->doTransition(req_num);
+ ret = this->checkPolicy(req_num);
if (ret != WMError::SUCCESS)
{
void WindowManager::api_deactivate_surface(char const *appid, char const *drawing_name,
const reply_func &reply)
{
- ST();
+ ;
// TODO: application requests by old role,
// so convert role old to new
WMError ret = WMError::UNKNOWN;
ret = this->setRequest(id, role, area, task, &req_num);
+ //vector<WMLayerState> current_states = this->lc->getCurrentStates();
+ // ret = this->setRequest(id, role, area, task, current_states, &req_num);
if (ret != WMError::SUCCESS)
{
- HMI_ERROR("wm", errorDescription(ret));
+ HMI_ERROR(errorDescription(ret));
reply("Failed to set request");
return;
}
/*
* Do allocate tasks
*/
- ret = this->doTransition(req_num);
+ ret = this->checkPolicy(req_num);
if (ret != WMError::SUCCESS)
{
if (!result)
{
- HMI_ERROR("wm", "%s is not in transition state", id.c_str());
+ HMI_ERROR("%s is not in transition state", id.c_str());
return;
}
// Undo state of PolicyManager
this->pmw.undoState();
+ this->lc->undoUpdate();
}
this->emitScreenUpdated(current_req);
HMI_SEQ_INFO(current_req, "Finish request status: %s", errorDescription(ret));
result<json_object *> WindowManager::api_get_display_info()
{
- if (!this->display->ok())
+ /* 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;
+/* size o_size = this->controller->output_size;
+ size p_size = this->controller->physical_size; */
+ Screen screen = this->lc->getScreenInfo();
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));
+ json_object_object_add(object, kKeyWidthPixel, json_object_new_int(screen.width()));
+ json_object_object_add(object, kKeyHeightPixel, json_object_new_int(screen.height()));
+ // TODO: set size
+ json_object_object_add(object, kKeyWidthMm, json_object_new_int(0));
+ json_object_object_add(object, kKeyHeightMm, json_object_new_int(0));
+ json_object_object_add(object, kKeyScale, json_object_new_double(this->lc->scale()));
return Ok<json_object *>(object);
}
result<json_object *> WindowManager::api_get_area_info(char const *drawing_name)
{
- HMI_DEBUG("wm", "called");
+ HMI_DEBUG("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);
+ auto const &surface_id = this->id_alloc.lookup(string(role));
if (!surface_id)
{
return Err<json_object *>("Surface does not exist");
}
- if (!this->controller->surface_exists(*surface_id))
+ /* 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);
+ /* // 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];
+ 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));
return Ok<json_object *>(object);
}
-void WindowManager::api_ping() { this->dispatch_pending_events(); }
+void WindowManager::api_ping() { /* this->dispatch_pending_events(); */ }
void WindowManager::send_event(char const *evname, char const *label)
{
- HMI_DEBUG("wm", "%s: %s(%s)", __func__, evname, label);
+ HMI_DEBUG("%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");
+ HMI_DEBUG("afb_event_push failed: %m");
}
}
void WindowManager::send_event(char const *evname, char const *label, char const *area,
int x, int y, int w, int h)
{
- HMI_DEBUG("wm", "%s: %s(%s, %s) x:%d y:%d w:%d h:%d",
+ HMI_DEBUG("%s: %s(%s, %s) x:%d y:%d w:%d h:%d",
__func__, evname, label, area, x, y, w, h);
json_object *j_rect = json_object_new_object();
int ret = afb_event_push(this->map_afb_event[evname], j);
if (ret != 0)
{
- HMI_DEBUG("wm", "afb_event_push failed: %m");
+ HMI_DEBUG("afb_event_push failed: %m");
}
}
*/
void WindowManager::surface_created(uint32_t surface_id)
{
- this->controller->get_surface_properties(surface_id, IVI_WM_PARAM_SIZE);
+ HMI_DEBUG("current : %d", 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)
{
- HMI_DEBUG("wm", "Newly created surfce %d is not associated with any layer!",
+ HMI_DEBUG("Newly created surfce %d is not associated with any layer!",
surface_id);
return;
}
- HMI_DEBUG("wm", "surface_id is %u, layer_id is %u", surface_id, *layer_id);
+ HMI_DEBUG("surface_id is %u, layer_id is %u", surface_id, *layer_id);
this->controller->layers[*layer_id]->add_surface(surface_id);
- this->layout_commit();
+ this->layout_commit(); */
}
void WindowManager::surface_removed(uint32_t surface_id)
{
- HMI_DEBUG("wm", "Delete surface_id %u", surface_id);
+ HMI_DEBUG("Delete surface_id %u", surface_id);
this->id_alloc.remove_id(surface_id);
- this->layers.remove_surface(surface_id);
+ // this->layers.remove_surface(surface_id);
g_app_list.removeSurface(surface_id);
}
void WindowManager::surface_properties(unsigned surface_id, unsigned pid)
{
- HMI_DEBUG("wm", "get surface properties");
+ HMI_DEBUG("get surface properties");
// search pid from surfaceID
/*json_object *response;
string appid = "";
if(response == nullptr)
{
- HMI_ERROR("wm", "No runners");
+ HMI_ERROR("No runners");
}
else
{
// check appid then add it to the client
- HMI_INFO("wm", "Runners:%s", json_object_get_string(response));
+ HMI_INFO("Runners:%s", json_object_get_string(response));
int size = json_object_array_length(response);
for(int i = 0; i < size; i++)
{
void WindowManager::removeClient(const string &appid)
{
- HMI_DEBUG("wm", "Remove clinet %s from list", appid.c_str());
+ HMI_DEBUG("Remove clinet %s from list", appid.c_str());
g_app_list.removeClient(appid);
}
void WindowManager::startTransitionWrapper(vector<WMAction> &actions)
{
WMError ret;
+ // req_num is guaranteed by Window Manager
unsigned req_num = g_app_list.currentRequestNumber();
if (actions.empty())
if ("" != act.role)
{
bool found;
- auto const &surface_id = this->lookup_id(act.role.c_str());
+ auto const &surface_id = this->id_alloc.lookup(act.role);
string appid = g_app_list.getAppID(*surface_id, act.role, &found);
if (!found)
{
goto error;
}
}
- act.appid = appid;
+ auto client = g_app_list.lookUpClient(appid);
+ act.req_num = req_num;
+ act.client = client;
}
ret = g_app_list.setAction(req_num, act);
******* Private Functions *******
*/
-bool WindowManager::pop_pending_events()
-{
- bool x{true};
- return this->pending_events.compare_exchange_strong(
- x, false, std::memory_order_consume);
-}
-
-optional<int> WindowManager::lookup_id(char const *name)
-{
- return this->id_alloc.lookup(string(name));
-}
-optional<string> WindowManager::lookup_name(int id)
-{
- return this->id_alloc.lookup(id);
-}
-
/**
* init_layers()
*/
int WindowManager::init_layers()
{
- if (!this->controller)
+ /* if (!this->controller)
{
- HMI_ERROR("wm", "ivi_controller global not available");
+ HMI_ERROR("ivi_controller global not available");
return -1;
}
if (this->outputs.empty())
{
- HMI_ERROR("wm", "no output was set up!");
+ HMI_ERROR("no output was set up!");
return -1;
}
uint32_t(o->physical_height)};
- HMI_DEBUG("wm", "SCALING: screen (%dx%d), physical (%dx%d)",
+ HMI_DEBUG("SCALING: screen (%dx%d), physical (%dx%d)",
o->width, o->height, o->physical_width, o->physical_height);
- this->layers.loadAreaDb();
+ // 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)",
+ HMI_DEBUG("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();
+ // layers.clear();
// Clear screen
- s->clear();
+ // s->clear();
// Quick and dirty setup of layers
for (auto const &i : this->layers.mapping)
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\"",
+ HMI_DEBUG("Setting up layer %s (%d) for surface role match \"%s\"",
i.second.name.c_str(), i.second.layer_id, i.second.role.c_str());
}
c->scale = static_cast<double>(dp_bg.height()) / css_bg.h;
this->layers.setupArea(c->scale);
-
+ */
return 0;
}
void WindowManager::surface_set_layout(int surface_id, const string& area)
{
- if (!this->controller->surface_exists(surface_id))
+ /* if (!this->controller->surface_exists(surface_id))
{
- HMI_ERROR("wm", "Surface %d does not exist", surface_id);
+ HMI_ERROR("Surface %d does not exist", surface_id);
return;
}
if (!o_layer_id)
{
- HMI_ERROR("wm", "Surface %d is not associated with any layer!", surface_id);
+ HMI_ERROR("Surface %d is not associated with any layer!", surface_id);
return;
}
int w = rect.w;
int h = rect.h;
- HMI_DEBUG("wm", "surface_set_layout for surface %u on layer %u", surface_id,
+ HMI_DEBUG("surface_set_layout for surface %u on layer %u", surface_id,
layer_id);
// set destination to the display rectangle
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);
+ HMI_DEBUG("Surface %u now on layer %u with rect { %d, %d, %d, %d }",
+ surface_id, layer_id, x, y, w, h); */
}
void WindowManager::layout_commit()
{
- this->controller->commit_changes();
- this->display->flush();
+/* this->controller->commit_changes();
+ this->display->flush(); */
}
void WindowManager::emit_activated(char const *label)
void WindowManager::emit_syncdraw(const string &role, const string &area)
{
- compositor::rect rect = this->layers.getAreaSize(area);
+ rect rect = this->lc->getAreaSize(area);
this->send_event(kListEventName[Event_SyncDraw],
role.c_str(), area.c_str(), rect.x, rect.y, rect.w, rect.h);
}
void WindowManager::activate(int id)
{
- auto ip = this->controller->sprops.find(id);
+ /* auto ip = this->controller->sprops.find(id);
if (ip != this->controller->sprops.end())
{
this->controller->surfaces[id]->set_visibility(1);
+ */
char const *label =
- this->lookup_name(id).value_or("unknown-name").c_str();
+ this->id_alloc.lookup(id).value_or("unknown-name").c_str();
- // FOR CES DEMO >>>
+ /* // FOR CES DEMO >>>
if ((0 == strcmp(label, "radio")) ||
(0 == strcmp(label, "music")) ||
(0 == strcmp(label, "video")) ||
this->surface_bg.erase(i);
// Remove from BG layer (999)
- HMI_DEBUG("wm", "Remove %s(%d) from BG layer", label, id);
+ HMI_DEBUG("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);
+ HMI_DEBUG("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);
+ HMI_DEBUG("Stored id:%d", j);
}
break;
}
}
// <<< FOR CES DEMO
- this->layout_commit();
+ this->layout_commit(); */
// TODO: application requests by old role,
// so convert role new to old for emitting event
this->emit_visible(old_role);
this->emit_activated(old_role);
- }
+ // }
}
void WindowManager::deactivate(int id)
{
- auto ip = this->controller->sprops.find(id);
+ /* auto ip = this->controller->sprops.find(id);
if (ip != this->controller->sprops.end())
- {
+ {*/
char const *label =
- this->lookup_name(id).value_or("unknown-name").c_str();
+ this->id_alloc.lookup(id).value_or("unknown-name").c_str();
- // FOR CES DEMO >>>
+ /*// FOR CES DEMO >>>
if ((0 == strcmp(label, "radio")) ||
(0 == strcmp(label, "music")) ||
(0 == strcmp(label, "video")) ||
this->surface_bg.push_back(id);
// Remove from FG layer (1001)
- HMI_DEBUG("wm", "Remove %s(%d) from FG layer", label, id);
+ HMI_DEBUG("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);
+ HMI_DEBUG("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);
+ HMI_DEBUG("Stored id:%d", j);
}
}
else
}
// <<< FOR CES DEMO
- this->layout_commit();
+ this->layout_commit(); */
// TODO: application requests by old role,
// so convert role new to old for emitting event
this->emit_deactivated(old_role);
this->emit_invisible(old_role);
- }
+ // }
}
WMError WindowManager::setRequest(const string& appid, const string &role, const string &area,
return WMError::SUCCESS;
}
-WMError WindowManager::doTransition(unsigned req_num)
-{
- HMI_SEQ_DEBUG(req_num, "check policy");
- WMError ret = this->checkPolicy(req_num);
- return ret;
-}
-
WMError WindowManager::checkPolicy(unsigned req_num)
{
/*
return ret;
}
+ g_app_list.reqDump();
for (const auto &action : actions)
{
if (action.visible == TaskVisible::VISIBLE)
// Make it deactivate here
for (const auto &x : actions)
{
- if (g_app_list.contains(x.appid))
+ this->lc->visibilityChange(x);
+ /* if (g_app_list.contains(x.appid))
{
auto client = g_app_list.lookUpClient(x.appid);
- this->deactivate(client->surfaceID(x.role));
- }
+ //this->deactivate(client->surfaceID(x.role));
+ } */
}
+ this->lc->commitChange();
ret = WMError::NO_LAYOUT_CHANGE;
}
return ret;
if(act.visible != TaskVisible::NO_CHANGE)
{
// layout change
- if(!g_app_list.contains(act.appid)){
- ret = WMError::NOT_REGISTERED;
- }
- ret = this->layoutChange(act);
+ ret = this->lc->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);
+ ret = this->lc->visibilityChange(act);
if (ret != WMError::SUCCESS)
{
HMI_SEQ_WARNING(req_num,
return ret;
}
HMI_SEQ_DEBUG(req_num, "visible %s", act.role.c_str());
- //this->lm_enddraw(act.role.c_str());
+ //this->lc_enddraw(act.role.c_str());
}
}
- this->layout_commit();
+ this->lc->commitChange();
HMI_SEQ_INFO(req_num, "emit flushDraw");
// Visibility is not change -> no redraw is required
return WMError::SUCCESS;
}
- auto client = g_app_list.lookUpClient(action.appid);
+ WMError ret = this->lc->layoutChange(action);
+ /* auto client = g_app_list.lookUpClient(action.appid);
unsigned surface = client->surfaceID(action.role);
if (surface == 0)
{
return WMError::NOT_REGISTERED;
}
// Layout Manager
- WMError ret = this->setSurfaceSize(surface, action.area);
+ WMError ret = this->setSurfaceSize(surface, action.area); */
return ret;
}
WMError WindowManager::visibilityChange(const WMAction &action)
{
HMI_SEQ_DEBUG(g_app_list.currentRequestNumber(), "Change visibility");
- if(!g_app_list.contains(action.appid)){
+ /* if(!g_app_list.contains(action.appid)){
return WMError::NOT_REGISTERED;
}
auto client = g_app_list.lookUpClient(action.appid);
HMI_SEQ_ERROR(g_app_list.currentRequestNumber(),
"client doesn't have surface with role(%s)", action.role.c_str());
return WMError::NOT_REGISTERED;
- }
+ } */
+ WMError ret = this->lc->visibilityChange(action);
- if (action.visible != TaskVisible::INVISIBLE)
+/* if (action.visible != TaskVisible::INVISIBLE)
{
this->activate(surface); // Layout Manager task
}
else
{
this->deactivate(surface); // Layout Manager task
- }
- return WMError::SUCCESS;
+ } */
+ return ret;
}
WMError WindowManager::setSurfaceSize(unsigned surface, const string &area)
{
if(action.visible != TaskVisible::INVISIBLE)
{
- json_object_array_add(jarray, json_object_new_string(action.appid.c_str()));
+ json_object_array_add(jarray, json_object_new_string(action.client->appID().c_str()));
}
}
json_object_object_add(j, kKeyIds, jarray);
this->map_afb_event[kListEventName[Event_ScreenUpdated]], j);
if (ret != 0)
{
- HMI_DEBUG("wm", "afb_event_push failed: %m");
+ HMI_DEBUG("afb_event_push failed: %m");
}
}
{
struct timespec ts;
if (clock_gettime(CLOCK_BOOTTIME, &ts) != 0) {
- HMI_ERROR("wm", "Could't set time (clock_gettime() returns with error");
+ HMI_ERROR("Could't set time (clock_gettime() returns with error");
return;
}
CLOCK_BOOTTIME, (uint64_t)(ts.tv_sec + kTimeOut) * 1000000ULL, 1, processTimerHandler, this);
if (ret < 0)
{
- HMI_ERROR("wm", "Could't set timer");
+ HMI_ERROR("Could't set timer");
}
}
else
if (g_app_list.haveRequest())
{
HMI_SEQ_DEBUG(req_num, "Process next request");
- WMError rc = doTransition(req_num);
+ WMError rc = checkPolicy(req_num);
if (rc != WMError::SUCCESS)
{
HMI_SEQ_ERROR(req_num, errorDescription(rc));
new_role = old_role;
}
- HMI_DEBUG("wm", "old:%s -> new:%s", old_role, new_role);
+ HMI_DEBUG("old:%s -> new:%s", old_role, new_role);
return new_role;
}
{
// Get afm application installed dir
char const *afm_app_install_dir = getenv("AFM_APP_INSTALL_DIR");
- HMI_DEBUG("wm", "afm_app_install_dir:%s", afm_app_install_dir);
+ HMI_DEBUG("afm_app_install_dir:%s", afm_app_install_dir);
string file_name;
if (!afm_app_install_dir)
{
- HMI_ERROR("wm", "AFM_APP_INSTALL_DIR is not defined");
+ HMI_ERROR("AFM_APP_INSTALL_DIR is not defined");
}
else
{
int ret = jh::inputJsonFilie(file_name.c_str(), &json_obj);
if (0 > ret)
{
- HMI_ERROR("wm", "Could not open old_role.db, so use default old_role information");
+ HMI_ERROR("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));
+ HMI_DEBUG("json_obj dump:%s", json_object_get_string(json_obj));
// Perse apps
json_object* json_cfg;
if (!json_object_object_get_ex(json_obj, "old_roles", &json_cfg))
{
- HMI_ERROR("wm", "Parse Error!!");
+ HMI_ERROR("Parse Error!!");
return -1;
}
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));
+ HMI_DEBUG("json_cfg len:%d", len);
+ HMI_DEBUG("json_cfg dump:%s", json_object_get_string(json_cfg));
for (int i=0; i<len; i++)
{
const char* old_role = jh::getStringFromJson(json_tmp, "name");
if (nullptr == old_role)
{
- HMI_ERROR("wm", "Parse Error!!");
+ HMI_ERROR("Parse Error!!");
return -1;
}
const char* new_role = jh::getStringFromJson(json_tmp, "new");
if (nullptr == new_role)
{
- HMI_ERROR("wm", "Parse Error!!");
+ HMI_ERROR("Parse Error!!");
return -1;
}
for(auto itr = this->roleold2new.begin();
itr != this->roleold2new.end(); ++itr)
{
- HMI_DEBUG("wm", ">>> role old:%s new:%s",
+ HMI_DEBUG(">>> role old:%s new:%s",
itr->first.c_str(), itr->second.c_str());
}
const char *WindowManager::check_surface_exist(const char *drawing_name)
{
- auto const &surface_id = this->lookup_id(drawing_name);
+ auto const &surface_id = this->id_alloc.lookup(string(drawing_name));
if (!surface_id)
{
return "Surface does not exist";
}
- if (!this->controller->surface_exists(*surface_id))
+ /* if (!this->controller->surface_exists(*surface_id))
{
return "Surface does not exist in controller!";
- }
+ } */
- auto layer_id = this->layers.get_layer_id(*surface_id);
+ /* auto layer_id = this->layers.get_layer_id(*surface_id);
if (!layer_id)
{
return "Surface is not on any layer!";
- }
+ } */
- HMI_DEBUG("wm", "surface %d is detected", *surface_id);
+ HMI_DEBUG("surface %d is detected", *surface_id);
return nullptr;
}
Code Review / apps / agl-service-windowmanager.git / blobdiff