#include "window_manager.hpp"
#include "json_helper.hpp"
-#include "wm_config.hpp"
#include "applist.hpp"
extern "C"
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
{
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())
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;
}
+static void onStateTransitioned(std::vector<WMAction> actions)
+{
+ g_context->startTransitionWrapper(actions);
+}
+
+static void onError()
+{
+ g_context->processError(WMError::LAYOUT_CHANGE_FAIL);
+}
} // namespace
/**
std::string path;
if (!path_layers_json)
{
- HMI_ERROR("wm", "AFM_APP_INSTALL_DIR is not defined");
+ HMI_ERROR("AFM_APP_INSTALL_DIR is not defined");
path = std::string(path_layers_json);
}
else
}
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()
{
- int ret;
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;
}
// 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 protocol needs the output, so lets just add our mapping here...
this->controller->add_proxy_to_id_mapping(
- this->outputs.back()->proxy.get(),
+ this->outputs.front()->proxy.get(),
wl_proxy_get_id(reinterpret_cast<struct wl_proxy *>(
- this->outputs.back()->proxy.get())));
+ this->outputs.front()->proxy.get())));
// Create screen
- this->controller->create_screen(this->outputs.back()->proxy.get());
+ this->controller->create_screen(this->outputs.front()->proxy.get());
// Set display to controller
this->controller->display = this->display;
// Third level objects
this->display->roundtrip();
- ret = init_layers();
- return ret;
+ return init_layers();
}
int WindowManager::dispatch_pending_events()
* 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);
+ HMI_DEBUG("%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");
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
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);
* 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);
+ HMI_DEBUG("%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";
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();
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
const char *c_role = this->convertRoleOldToNew(drawing_name);
if(ret != WMError::SUCCESS)
{
- HMI_ERROR("wm", errorDescription(ret));
+ HMI_ERROR(errorDescription(ret));
reply("Failed to set request");
return;
}
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
const char *c_role = this->convertRoleOldToNew(drawing_name);
if (ret != WMError::SUCCESS)
{
- HMI_ERROR("wm", errorDescription(ret));
+ HMI_ERROR(errorDescription(ret));
reply("Failed to set request");
return;
}
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;
}
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));
result<json_object *> WindowManager::api_get_display_info()
{
- // Check controller
- if (!this->controller)
+ if (!this->display->ok())
{
- return Err<json_object *>("ivi_controller global not available");
+ return Err<json_object *>("Wayland compositor is not available");
}
// Set display info
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");
+ HMI_DEBUG("called");
// TODO: application requests by old role,
// so convert role old to new
return Err<json_object *>("Surface is not on any layer!");
}
- auto o_state = *this->layers.get_layout_state(*surface_id);
- if (o_state == nullptr)
- {
- return Err<json_object *>("Could not find layer for surface");
- }
-
- struct LayoutState &state = *o_state;
- if ((state.main != *surface_id) && (state.sub != *surface_id))
- {
- return Err<json_object *>("Surface is inactive");
- }
-
// Set area rectangle
compositor::rect area_info = this->area_info[*surface_id];
json_object *object = json_object_new_object();
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");
}
}
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();
void WindowManager::surface_removed(uint32_t surface_id)
{
- HMI_DEBUG("wm", "surface_id is %u", surface_id);
+ HMI_DEBUG("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);
}
void WindowManager::removeClient(const std::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);
}
this->processNextRequest();
}
+void WindowManager::startTransitionWrapper(std::vector<WMAction> &actions)
+{
+ WMError ret;
+ unsigned req_num = g_app_list.currentRequestNumber();
+
+ 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;
+ }
+ }
+
+ 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;
+ }
+
+ ret = g_app_list.setAction(req_num, act);
+ if (ret != WMError::SUCCESS)
+ {
+ HMI_SEQ_ERROR(req_num, "Setting action is failed");
+ goto error;
+ }
+ }
+
+ 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::processError(WMError error)
+{
+ 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();
+}
+
/*
******* Private Functions *******
*/
{
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;
}
- WMConfig wm_config;
- wm_config.loadConfigs();
-
auto &c = this->controller;
auto &o = this->outputs.front();
auto &s = c->screens.begin()->second;
auto &layers = c->layers;
- this->layers.loadAreaDb();
- const compositor::rect base = this->layers.getAreaSize("fullscreen");
-
- const std::string aspect_setting = wm_config.getConfigAspect();
- const compositor::rect scale_rect =
- this->layers.getScaleDestRect(o->width, o->height, aspect_setting);
-
// 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();
// Quick and dirty setup of layers
for (auto const &i : this->layers.mapping)
{
- c->layer_create(i.second.layer_id, scale_rect.w, scale_rect.h);
+ c->layer_create(i.second.layer_id, dp_bg.width(), dp_bg.height());
auto &l = layers[i.second.layer_id];
- l->set_source_rectangle(0, 0, base.w, base.h);
- l->set_destination_rectangle(
- scale_rect.x, scale_rect.y, scale_rect.w, scale_rect.h);
+ 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());
}
this->layout_commit();
+ c->scale = static_cast<double>(dp_bg.height()) / css_bg.h;
+ this->layers.setupArea(c->scale);
+
return 0;
}
{
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 }",
+ HMI_DEBUG("Surface %u now on layer %u with rect { %d, %d, %d, %d }",
surface_id, layer_id, x, y, w, h);
}
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;
}
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
{
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->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");
- bool found = false;
- auto trigger = g_app_list.getRequest(req_num, &found);
- // I don't check found == true here because this is checked in caller.
- if(trigger.role == "homescreen")
- {
- HMI_SEQ_INFO(req_num, "In case of 'homescreen' visible, don't change app to invisible");
- return WMError::SUCCESS;
- }
-
- // This task is copied from original actiavete surface
- const char *drawing_name = this->rolenew2old[role].c_str();
- auto const &surface_id = this->lookup_id(role.c_str());
- 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;
-
- 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());
}
this->layout_commit();
- // Change current state
- this->changeCurrentState(req_num);
-
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)
{
// TODO: application requests by old role,
// so convert role new to old for emitting event
return WMError::SUCCESS;
}
-WMError WindowManager::changeCurrentState(unsigned req_num)
-{
- 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;
- }
-
- // Layout state reset
- struct LayoutState reset_state{-1, -1};
- HMI_SEQ_DEBUG(req_num,"Reset layout state");
- 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)
- {
- HMI_SEQ_ERROR(req_num, "Counldn't find current status");
- continue;
- }
- pCurState->main = reset_state.main;
- pCurState->sub = reset_state.sub;
- }
-
- HMI_SEQ_DEBUG(req_num, "Change state");
- for (const auto &action : actions)
- {
- 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;
- }
- }
- }
-
- return WMError::SUCCESS;
-}
-
void WindowManager::emitScreenUpdated(unsigned req_num)
{
// Get visible apps
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
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);
std::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());
}
return "Surface is not on any layer!";
}
- auto o_state = *this->layers.get_layout_state(*surface_id);
-
- if (o_state == nullptr)
- {
- return "Could not find layer for surface";
- }
-
- HMI_DEBUG("wm", "surface %d is detected", *surface_id);
+ HMI_DEBUG("surface %d is detected", *surface_id);
return nullptr;
}
-bool WindowManager::can_split(struct LayoutState const &state, int new_id)
-{
- if (state.main != -1 && state.main != new_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);
-
- HMI_DEBUG("wm", "layer info name: %s", layer->name.c_str());
-
- if (layer->layouts.empty())
- {
- return false;
- }
-
- for (auto i = layer->layouts.cbegin(); i != layer->layouts.cend(); i++)
- {
- 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;
- }
- }
- }
- }
-
- return false;
-}
-
const char* WindowManager::kDefaultOldRoleDb = "{ \
\"old_roles\": [ \
{ \
Code Review / apps / agl-service-windowmanager.git / blobdiff