namespace
{
-// using nlohmann::json;
-
-/* result<json> file_to_json(char const *filename)
-{
- json j;
- std::ifstream i(filename);
- if (i.fail())
- {
- HMI_DEBUG("Could not open config file, so use default layer information");
- j = default_layers_json;
- }
- else
- {
- i >> j;
- }
-
- return Ok(j);
-}
-
-struct result<layer_map> load_layer_map(char const *filename)
-{
- HMI_DEBUG("loading IDs from %s", filename);
-
- auto j = file_to_json(filename);
- if (j.is_err())
- {
- return Err<layer_map>(j.unwrap_err());
- }
- json jids = j.unwrap();
-
- return to_layer_map(jids);
-} */
-
static int processTimerHandler(sd_event_source *s, uint64_t usec, void *userdata)
{
HMI_NOTICE("Time out occurs because the client replys endDraw slow, so revert the request");
* WindowManager Impl
*/
WindowManager::WindowManager()
- : chooks{this},
- id_alloc{}
+ : id_alloc{}
{
const char *path = getenv("AFM_APP_INSTALL_DIR");
if (!path)
this->lc = std::make_shared<LayerControl>(root);
-/* try
- {
- {
- auto l = load_layer_map(path.c_str());
- if (l.is_ok())
- {
- this->layers = l.unwrap();
- }
- else
- {
- HMI_ERROR("%s", l.err().value());
- }
- }
- }
- catch (std::exception &e)
- {
- HMI_ERROR("Loading of configuration failed: %s", e.what());
- } */
+ HMI_DEBUG("Layer Controller initialized");
}
int WindowManager::init()
{
- /* if (!this->display->ok())
- {
- return -1;
- }
-
- if (this->layers.mapping.empty())
- {
- 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);
+ };
+ lmcb.surfaceDestroyed = [&](unsigned surface){
+ this->surface_removed(surface);
+ };
+ this->lc->init(lmcb);
this->loadOldRoleDb();
// Store my context for calling callback from PolicyManager
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));
- });
-
- this->display->add_global_handler(
- "ivi_wm", [this](wl_registry *r, uint32_t name, uint32_t v) {
- this->controller =
- std::make_unique<struct compositor::controller>(r, name, v);
-
- // Init controller hooks
- 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.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());
-
- // Set display to controller
- this->controller->display = this->display;
- });
-
- // First level objects
- this->display->roundtrip();
- // Second level objects
- this->display->roundtrip();
- // Third level objects
- this->display->roundtrip(); */
+ this->lc->setupArea(dp_bg, scale);
return 0; //init_layers();
}
-/* int WindowManager::dispatch_pending_events()
-{
- if (this->pop_pending_events())
- {
- this->display->dispatch_pending();
- return 0;
- }
- return -1;
-}
-
-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 = role;
- // auto lid = this->layers.get_layer_id(string(role));
- unsigned l_id = this->lc->getNewLayerID(role, &l_name);
- if (l_id == 0)
+ if(!g_app_list.contains(s_appid))
{
- /**
- * 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);
+ // 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>("Designated role does not match any role, fallback is disabled");
+ /**
+ * register drawing_name as fallback and make it displayed.
+ */
+ 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
{
// name does not exist yet, allocate surface id...
auto id = int(this->id_alloc.generate_id(role));
- // this->layers.add_surface(id, *lid);
-
- // 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("Set main_surface id to %u", id);
- // }
-
- // add client into the db
- string appid_str(appid);
- g_app_list.addClient(appid_str, l_id, l_name, id, string(role));
-
- /* if(g_app_list.contains(appid_str))
- {
- // add surface into app
- auto client = g_app_list.lookUpClient(appid_str);
- // client.addSurface(id);
- }
- else
- {
- g_app_list.addClient(appid_str, l_id, id, string(role));
- } */
+ this->tmp_surface2app[id] = s_appid;
// Set role map of (new, old)
this->rolenew2old[role] = string(drawing_name);
// TODO: application requests by old role,
// so convert role old to new
const char *role = this->convertRoleOldToNew(drawing_name);
- string str = role;
+ string s_role = role;
+ string s_appid = appid;
string l_name;
- // 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 == 0)
+ if(!g_app_list.contains(s_appid))
{
- //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)
+ // auto lid = this->layers.get_layer_id(string(role));
+ unsigned l_id = this->lc->getNewLayerID(s_role, &l_name);
+ if (l_id == 0)
{
- return "Drawing name does not match any role, fallback is disabled";
+ /**
+ * register drawing_name as fallback and make it displayed.
+ */
+ 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 "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);
}
- auto rname = this->id_alloc.lookup(str);
+ unsigned sid = std::stol(ivi_id);
+ auto rname = this->id_alloc.lookup(s_role);
if (rname)
{
return "Surface already present";
}
+ if(this->tmp_surface2app.count(sid) != 0)
+ {
+ this->tmp_surface2app.erase(sid);
+ }
+
// register pair drawing_name and ivi_id
this->id_alloc.register_name_id(role, sid);
// this->layout_commit();
// add client into the db
- string appid_str(appid);
- g_app_list.addClient(appid_str, lid, l_name, sid, string(role));
+ // g_app_list.addClient(appid_str, lid, s_role);
+ auto client = g_app_list.lookUpClient(s_appid);
+ client->addSurface(sid);
// Set role map of (new, old)
this->rolenew2old[role] = string(drawing_name);
return nullptr;
}
-/**
- * This function is substitute of requestSurface
- * If surface creation is faster than application request of this function,
- * WM will bind surfaceID with application and role.
- * If surface creation is slower than application request of thie function,
- * WM will put Client into pending list.
- *
- * Note :
- * Application can request with pid but this is temporary solution for now.
- * This will be removed.
- * */
bool WindowManager::api_set_role(char const *appid, char const *drawing_name, unsigned pid){
string id = appid;
string role = drawing_name;
else{
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, l_name, surface, role);
+ 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 surface is already created
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;
- 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();
-
return ret;
}
void WindowManager::api_activate_surface(char const *appid, char const *drawing_name,
char const *drawing_area, const reply_func &reply)
{
- ;
-
// TODO: application requests by old role,
// so convert role old to new
const char *c_role = this->convertRoleOldToNew(drawing_name);
/*
* 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)
{
- ;
-
// TODO: application requests by old role,
// so convert role old to new
const char *c_role = this->convertRoleOldToNew(drawing_name);
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)
{
/*
* Do allocate tasks
*/
- ret = this->doTransition(req_num);
+ ret = this->checkPolicy(req_num);
if (ret != WMError::SUCCESS)
{
result<json_object *> WindowManager::api_get_display_info()
{
- /* if (!this->display->ok())
- {
- return Err<json_object *>("Wayland compositor is not available");
- } */
-
- // Set display info
-/* 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();
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
rect area_info = this->area_info[*surface_id];
json_object *object = json_object_new_object();
return Ok<json_object *>(object);
}
-void WindowManager::api_ping() { /* this->dispatch_pending_events(); */ }
-
void WindowManager::send_event(char const *evname, char const *label)
{
HMI_DEBUG("%s: %s(%s)", __func__, evname, 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)
+ if(this->tmp_surface2app.count(surface_id) != 0)
{
- HMI_DEBUG("Newly created surfce %d is not associated with any layer!",
- surface_id);
- return;
+ string appid = this->tmp_surface2app[surface_id];
+ this->tmp_surface2app.erase(surface_id);
+ if(g_app_list.contains(appid))
+ {
+ auto client = g_app_list.lookUpClient(appid);
+ WMError ret = client->addSurface(surface_id);
+ HMI_INFO("Add surface %d to \"%s\"", surface_id, appid.c_str());
+ if(ret != WMError::SUCCESS)
+ {
+ HMI_ERROR("Failed to add surface to client %s", client->appID().c_str());
+ }
+ }
+ }
+ else
+ {
+ HMI_NOTICE("Unknown surface %d", surface_id);
+ this->tmp_surface2app[surface_id] = ""; /* Store for requestSurfaceXDG */
}
-
- 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(); */
}
void WindowManager::surface_removed(uint32_t surface_id)
g_app_list.removeSurface(surface_id);
}
-void WindowManager::surface_properties(unsigned surface_id, unsigned pid)
-{
- HMI_DEBUG("get surface properties");
-
- // search pid from surfaceID
- /*json_object *response;
- afb_service_call_sync("afm-main", "runners", nullptr, &response);
-
- // retrieve appid from pid from application manager
- string appid = "";
- if(response == nullptr)
- {
- HMI_ERROR("No runners");
- }
- else
- {
- // check appid then add it to the client
- HMI_INFO("Runners:%s", json_object_get_string(response));
- int size = json_object_array_length(response);
- for(int i = 0; i < size; i++)
- {
- json_object *j = json_object_array_get_idx(response, i);
- const char* id = jh::getStringFromJson(j, "id");
- int runid = jh::getIntFromJson(j, "runid");
- if(id && (runid > 0))
- {
- if(runid == pid)
- {
- appid = id;
- break;
- }
- }
- }
- }
- json_object_put(response);
-
- g_app_list.addFloatingSurface(appid, surface_id, pid);*/
-}
-
void WindowManager::removeClient(const string &appid)
{
HMI_DEBUG("Remove clinet %s from list", appid.c_str());
+ auto client = g_app_list.lookUpClient(appid);
+ this->lc->terminateApp(client);
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->id_alloc.lookup(act.role);
- string appid = g_app_list.getAppID(*surface_id, act.role, &found);
+ auto const &surface_id = this->id_alloc.lookup(act.role.c_str());
+ if(surface_id == nullopt)
+ {
+ goto proc_remove_request;
+ }
+ std::string appid = g_app_list.getAppID(*surface_id, &found);
if (!found)
{
if (TaskVisible::INVISIBLE == act.visible)
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 *******
*/
-/**
- * init_layers()
- */
-int WindowManager::init_layers()
-{
- /* if (!this->controller)
- {
- HMI_ERROR("ivi_controller global not available");
- return -1;
- }
-
- if (this->outputs.empty())
- {
- HMI_ERROR("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;
-
- // 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("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("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("Setting up layer %s (%d) for surface role match \"%s\"",
- i.second.name.c_str(), i.second.layer_id, i.second.role.c_str());
- }
-
- // Add layers to screen
- s->set_render_order(this->layers.layers);
-
- this->layout_commit();
-
- 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))
- {
- HMI_ERROR("Surface %d does not exist", surface_id);
- return;
- }
-
- auto o_layer_id = this->layers.get_layer_id(surface_id);
-
- if (!o_layer_id)
- {
- HMI_ERROR("Surface %d is not associated with any layer!", surface_id);
- return;
- }
-
- 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;
-
- HMI_DEBUG("surface_set_layout for surface %u on layer %u", surface_id,
- layer_id);
-
- // 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("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(); */
-}
-
void WindowManager::emit_activated(char const *label)
{
this->send_event(kListEventName[Event_Active], label);
void WindowManager::emit_syncdraw(const string &role, const string &area)
{
-/* 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); */
+ role.c_str(), area.c_str(), rect.x, rect.y, rect.w, rect.h);
}
void WindowManager::emit_flushdraw(char const *label)
void WindowManager::activate(int 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->id_alloc.lookup(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("Remove %s(%d) from BG layer", label, id);
- this->controller->layers[999]->remove_surface(id);
-
- // Add to FG layer (1001)
- 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("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();
+ // 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);
- // }
+ this->emit_visible(old_role);
+ this->emit_activated(old_role); */
}
void WindowManager::deactivate(int id)
{
- /* auto ip = this->controller->sprops.find(id);
- if (ip != this->controller->sprops.end())
- {*/
- char const *label =
- this->id_alloc.lookup(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")))
- {
-
- // Store id
- this->surface_bg.push_back(id);
-
- // Remove from FG layer (1001)
- HMI_DEBUG("Remove %s(%d) from FG layer", label, id);
- this->controller->layers[1001]->remove_surface(id);
-
- // Add to BG layer (999)
- HMI_DEBUG("Add %s(%d) to BG layer", label, id);
- this->controller->layers[999]->add_surface(id);
-
- for (int j : surface_bg)
- {
- HMI_DEBUG("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();
+ // 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);
- // }
+ 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);
+ string old_role = this->rolenew2old[x.role];
+ emit_deactivated(old_role.c_str());
+
+ /* 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->renderLayers();
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->lc->layoutChange(act);
if(ret != WMError::SUCCESS)
{
return ret;
}
ret = this->lc->visibilityChange(act);
+
+ // Emit active/deactive event
+ string old_role = this->rolenew2old[act.role];
+ if(act.visible == VISIBLE)
+ {
+ emit_activated(old_role.c_str());
+ }
+ else
+ {
+ emit_deactivated(old_role.c_str());
+ }
+
if (ret != WMError::SUCCESS)
{
HMI_SEQ_WARNING(req_num,
return ret;
}
HMI_SEQ_DEBUG(req_num, "visible %s", act.role.c_str());
- //this->lc_enddraw(act.role.c_str());
}
}
- this->lc->commitChange();
+ this->lc->renderLayers();
HMI_SEQ_INFO(req_num, "emit flushDraw");
return ret;
}
-WMError WindowManager::layoutChange(const WMAction &action)
-{
- if (action.visible == TaskVisible::INVISIBLE)
- {
- // Visibility is not change -> no redraw is required
- return WMError::SUCCESS;
- }
- auto client = g_app_list.lookUpClient(action.appid);
- unsigned surface = client->surfaceID(action.role);
- if (surface == 0)
- {
- HMI_SEQ_ERROR(g_app_list.currentRequestNumber(),
- "client doesn't have surface with role(%s)", action.role.c_str());
- return WMError::NOT_REGISTERED;
- }
- // Layout Manager
- 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)){
- return WMError::NOT_REGISTERED;
- }
- auto client = g_app_list.lookUpClient(action.appid);
- unsigned surface = client->surfaceID(action.role);
- if(surface == 0)
- {
- HMI_SEQ_ERROR(g_app_list.currentRequestNumber(),
- "client doesn't have surface with role(%s)", action.role.c_str());
- return WMError::NOT_REGISTERED;
- }
-
- if (action.visible != TaskVisible::INVISIBLE)
- {
- this->activate(surface); // Layout Manager task
- }
- else
- {
- this->deactivate(surface); // Layout Manager task
- }
- return WMError::SUCCESS;
-}
-
-WMError WindowManager::setSurfaceSize(unsigned surface, const string &area)
-{
- this->surface_set_layout(surface, area);
-
- return WMError::SUCCESS;
-}
-
void WindowManager::emitScreenUpdated(unsigned req_num)
{
// Get visible apps
{
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);
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));
] \
}";
-/**
- * controller_hooks
- */
-void controller_hooks::surface_created(uint32_t surface_id)
-{
- this->wmgr->surface_created(surface_id);
-}
-
-void controller_hooks::surface_removed(uint32_t surface_id)
-{
- this->wmgr->surface_removed(surface_id);
-}
-
-void controller_hooks::surface_visibility(uint32_t /*surface_id*/,
- uint32_t /*v*/) {}
-
-void controller_hooks::surface_destination_rectangle(uint32_t /*surface_id*/,
- uint32_t /*x*/,
- uint32_t /*y*/,
- uint32_t /*w*/,
- uint32_t /*h*/) {}
-
-void controller_hooks::surface_properties(uint32_t surface_id, uint32_t pid)
-{
- this->wmgr->surface_properties(surface_id, pid);
-}
-
} // namespace wm
Code Review / apps / agl-service-windowmanager.git / blobdiff