#include <regex>
#include <thread>
-#include "wm-client.hpp"
+#include "wm_client.hpp"
#include "applist.hpp"
extern "C"
namespace wm
{
-const unsigned TIME_OUT = 10000000UL; /* 10s */
+static const unsigned kTimeOut = 3000000UL; /* 3s */
/* DrawingArea name used by "{layout}.{area}" */
const char kNameLayoutNormal[] = "normal";
const char kKeyWidthMm[] = "width_mm";
const char kKeyHeightMm[] = "height_mm";
-static const std::string task_allocate = "allocate";
-static const std::string task_release = "release";
-static sd_event_source *timer_ev_src = nullptr;
+static sd_event_source *g_timer_ev_src = nullptr;
-static AppList app_list;
+static AppList g_app_list;
namespace
{
void App::timerHandler()
{
- unsigned seq = app_list.currentSequenceNumber();
- HMI_SEQ_DEBUG(seq, "Timer expired remove Request");
- app_list.req_dump();
- app_list.removeRequest(seq);
- app_list.next();
- app_list.req_dump();
- if (app_list.haveRequest())
- {
- this->process_request();
- }
+ unsigned req_num = g_app_list.currentRequestNumber();
+ HMI_SEQ_DEBUG(req_num, "Timer expired remove Request");
+ g_app_list.reqDump();
+ g_app_list.removeRequest(req_num);
+ this->processNextRequest();
}
void App::removeClient(const std::string &appid)
{
HMI_DEBUG("wm", "Remove clinet %s from list", appid.c_str());
- app_list.removeClient(appid);
+ g_app_list.removeClient(appid);
+}
+
+void App::exeptionProcessForTransition()
+{
+ unsigned req_num = g_app_list.currentRequestNumber();
+ HMI_SEQ_NOTICE(req_num, "Process exeption handling for request. Remove current request %d", req_num);
+ g_app_list.removeRequest(req_num);
+ HMI_SEQ_NOTICE(g_app_list.currentRequestNumber(), "Process next request if exists");
+ this->processNextRequest();
}
bool App::subscribeEventForApp(const std::string &appid, afb_req req, const std::string &evname)
{
- if(!app_list.contains(appid)){
+ if(!g_app_list.contains(appid)){
HMI_DEBUG("wm", "Client %s is not registered", appid.c_str());
return false;
}
- auto client = app_list.lookUpClient(appid);
+ auto client = g_app_list.lookUpClient(appid);
return client->subscribe(req, evname);
}
this->layout_commit();
+ this->layers.setupArea(o->width, o->height);
+
return 0;
}
-void App::surface_set_layout(int surface_id, optional<int> sub_surface_id)
+void App::surface_set_layout(int surface_id, const std::string& area)
{
if (!this->controller->surface_exists(surface_id))
{
uint32_t layer_id = *o_layer_id;
auto const &layer = this->layers.get_layer(layer_id);
- auto rect = layer.value().rect;
+ 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;
h = this->controller->output_size.h + 1 + h;
}
- if (sub_surface_id)
- {
- if (o_layer_id != this->layers.get_layer_id(*sub_surface_id))
- {
- HMI_ERROR("wm",
- "surface_set_layout: layers of surfaces (%d and %d) don't match!",
- surface_id, *sub_surface_id);
- return;
- }
-
- int x_off = 0;
- int y_off = 0;
-
- // split along major axis
- if (w > h)
- {
- w /= 2;
- x_off = w;
- }
- else
- {
- h /= 2;
- y_off = h;
- }
-
- auto &ss = this->controller->surfaces[*sub_surface_id];
-
- HMI_DEBUG("wm", "surface_set_layout for sub surface %u on layer %u",
- *sub_surface_id, layer_id);
-
- // set destination to the display rectangle
- ss->set_destination_rectangle(x + x_off, y + y_off, w, h);
-
- this->area_info[*sub_surface_id].x = x;
- this->area_info[*sub_surface_id].y = y;
- this->area_info[*sub_surface_id].w = w;
- this->area_info[*sub_surface_id].h = h;
- }
-
HMI_DEBUG("wm", "surface_set_layout for surface %u on layer %u", surface_id,
layer_id);
this->display->flush();
}
-void App::set_timer()
+void App::setTimer()
{
- HMI_SEQ_DEBUG(app_list.currentSequenceNumber(), "Timer set activate");
- if (timer_ev_src == nullptr)
+ 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(), &timer_ev_src,
- CLOCK_REALTIME, time(NULL) * (1000000UL) + TIME_OUT, 1, processTimerHandler, this);
+ int ret = sd_event_add_time(afb_daemon_get_event_loop(), &g_timer_ev_src,
+ CLOCK_REALTIME, time(NULL) * (1000000UL) + kTimeOut, 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(timer_ev_src, time(NULL) * (1000000UL) + TIME_OUT);
- sd_event_source_set_enabled(timer_ev_src, SD_EVENT_ONESHOT);
+ sd_event_source_set_time(g_timer_ev_src, time(NULL) * (1000000UL) + kTimeOut);
+ sd_event_source_set_enabled(g_timer_ev_src, SD_EVENT_ONESHOT);
}
}
-void App::stop_timer()
+void App::stopTimer()
{
- unsigned seq = app_list.currentSequenceNumber();
- HMI_SEQ_DEBUG(seq, "Timer stop");
- int rc = sd_event_source_set_enabled(timer_ev_src, SD_EVENT_OFF);
+ unsigned req_num = g_app_list.currentRequestNumber();
+ HMI_SEQ_DEBUG(req_num, "Timer stop");
+ int rc = sd_event_source_set_enabled(g_timer_ev_src, SD_EVENT_OFF);
if (rc < 0)
{
- HMI_SEQ_ERROR(seq, "Timer stop failed");
+ HMI_SEQ_ERROR(req_num, "Timer stop failed");
}
}
-bool App::lm_release(const struct WMAction &action)
+WMError App::doTransition(unsigned req_num)
{
- //auto const &surface_id = this->lookup_id(drawing_name);
- unsigned req_num = app_list.currentSequenceNumber();
- auto const &surface_id = this->lookup_id(action.role.c_str());
- if (!surface_id)
+ HMI_SEQ_DEBUG(req_num, "check policy");
+ WMError ret = this->checkPolicy(req_num);
+ if (ret != WMError::SUCCESS)
{
- HMI_SEQ_ERROR(req_num, "Surface does not exist");
- return false;
+ return ret;
}
+ HMI_SEQ_DEBUG(req_num, "Start transition.");
+ ret = this->startTransition(req_num);
+ return ret;
+}
- if (*surface_id == this->layers.main_surface)
+WMError App::checkPolicy(unsigned req_num)
+{
+ /*
+ * Check Policy
+ */
+ // 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)
{
- HMI_SEQ_ERROR(req_num, "Cannot deactivate main_surface");
- return false;
+ ret = WMError::NO_ENTRY;
+ return ret;
}
+ std::string req_area = trigger.area;
- auto o_state = *this->layers.get_layout_state(*surface_id);
-
- if (o_state == nullptr)
+ // >>>> Compatible with current window manager until policy manager coming
+ if (trigger.task == Task::TASK_ALLOCATE)
{
- HMI_SEQ_ERROR(req_num, "Could not find layer for surface");
- return false;
- }
+ HMI_SEQ_DEBUG(req_num, "Check split or not");
+ const char *msg = this->check_surface_exist(trigger.role.c_str());
- struct LayoutState &state = *o_state;
+ if (msg)
+ {
+ HMI_SEQ_ERROR(req_num, msg);
+ ret = WMError::LAYOUT_CHANGE_FAIL;
+ return ret;
+ }
- if (state.main == -1)
- {
- HMI_SEQ_ERROR(req_num, "No surface active");
- return false;
- }
+ 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;
- // Check against main_surface, main_surface_name is the configuration item.
- if (*surface_id == this->layers.main_surface)
- {
- HMI_SEQ_DEBUG(req_num, "Refusing to deactivate main_surface %d", *surface_id);
- //reply(nullptr);
- return true;
- }
- if ((state.main == *surface_id) && (state.sub == *surface_id))
- {
- HMI_SEQ_ERROR(req_num, "Surface is not active");
- return false;
- }
+ unsigned curernt_sid = state.main;
+ split = this->can_split(state, *surface_id);
- if (state.main == *surface_id)
- {
- if (state.sub != -1)
- {
- this->try_layout(
- state, LayoutState{state.sub, -1}, [&](LayoutState const &nl) {
- std::string sub = std::move(*this->lookup_name(state.sub));
-
- this->deactivate(*surface_id);
- this->surface_set_layout(state.sub);
- state = nl;
-
- this->layout_commit();
- std::string str_area = std::string(kNameLayoutNormal) + "." + std::string(kNameAreaFull);
- compositor::rect area_rect = this->area_info[state.sub];
- this->emit_syncdraw(sub.c_str(), str_area.c_str(),
- area_rect.x, area_rect.y, area_rect.w, area_rect.h);
- this->enqueue_flushdraw(state.sub);
- });
- }
- else
+ if (split)
{
- this->try_layout(state, LayoutState{-1, -1}, [&](LayoutState const &nl) {
- this->deactivate(*surface_id);
- state = nl;
- this->layout_commit();
- });
+ 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 is happen",
+ trigger.area, req_area);
+ // 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 : %s", 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 if (state.sub == *surface_id)
+ else
{
- this->try_layout(
- state, LayoutState{state.main, -1}, [&](LayoutState const &nl) {
- std::string main = std::move(*this->lookup_name(state.main));
-
- this->deactivate(*surface_id);
- this->surface_set_layout(state.main);
- state = nl;
-
- this->layout_commit();
- std::string str_area = std::string(kNameLayoutNormal) + "." + std::string(kNameAreaFull);
- compositor::rect area_rect = this->area_info[state.main];
- this->emit_syncdraw(main.c_str(), str_area.c_str(),
- area_rect.x, area_rect.y, area_rect.w, area_rect.h);
- this->enqueue_flushdraw(state.main);
- });
+ HMI_SEQ_DEBUG(req_num, "split doesn't happen");
}
- return true;
-}
-
-bool App::lm_layout_change(const struct WMAction &action)
-{
- const char *msg = this->check_surface_exist(action.role.c_str());
- /*
- lm_.updateLayout(action);
- TODO: emit syncDraw with application*/
- if (msg)
+ // Set invisible task(Remove if policy manager finish)
+ ret = this->setInvisibleTask(trigger.role, split);
+ if(ret != WMError::SUCCESS)
{
- HMI_SEQ_DEBUG(app_list.currentSequenceNumber(), msg);
- //app_list.removeRequest(req_num);
- return false;
- }
- this->lm_layout_change(action.role.c_str());
- return true;
-}
-
-bool App::do_transition(unsigned req_num)
-{
- /*
- * Check Policy
- */
- // get current trigger
- auto trigger = app_list.getRequest(req_num);
- bool is_activate = true;
-
- /* get new status from Policy Manager
-
- (json_object*?) newLayout = checkPolicy(trigger);
- (vector<struct WMAction>&) auto actions = translator.inputActionFromLayout(newLayout, currentLayout)
- for(const auto& x : actions){
- app_list.setAciton(req_num, x)
+ HMI_SEQ_ERROR(req_num, "Failed to set invisible task: %s", errorDescription(ret));
+ return ret;
}
- or
-
- translator.inputActionFromLayout(newLayout, currentLayout, &app_list, req_num);
-
- /* The following error check is not necessary because main.cpp will reject the message form not registered object
- } */
+ /* get new status from Policy Manager */
HMI_SEQ_NOTICE(req_num, "ATM, Policy manager does't exist, then set WMAction as is");
-
- if (TASK_RELEASE == trigger.task)
+ if(trigger.role == "HomeScreen")
{
- is_activate = false;
+ // TODO : Remove when Policy Manager completed
+ HMI_SEQ_NOTICE(req_num, "Hack. This process will be removed. Change HomeScreen code!!");
+ req_area = "fullscreen";
}
- bool ret = app_list.setAction(req_num, trigger.appid, trigger.role, trigger.area, is_activate);
- app_list.req_dump();
+ TaskVisible task_visible =
+ (trigger.task == Task::TASK_ALLOCATE) ? TaskVisible::VISIBLE : TaskVisible::INVISIBLE;
- if (!ret)
- {
- HMI_SEQ_ERROR(req_num, "Failed to set action");
+ ret = g_app_list.setAction(req_num, trigger.appid, trigger.role, req_area, task_visible);
+ g_app_list.reqDump();
+
+ return ret;
+}
+
+WMError App::startTransition(unsigned req_num)
+{
+ bool sync_draw_happen = false;
+ bool found = false;
+ WMError ret = WMError::SUCCESS;
+ auto actions = g_app_list.getActions(req_num, &found);
+ if (!found)
+ {
+ ret = WMError::NO_ENTRY;
+ HMI_SEQ_ERROR(req_num,
+ "Window Manager bug :%s : Action is not set", errorDescription(ret));
return ret;
}
- // layer manager task
- bool sync_draw_happen = false;
- for (const auto &y : app_list.getActions(req_num))
- {
- /*
- do_task(y);
- */
- /* TODO
- but current we can't do do_task,
- so divide the processing into lm_layout_change and lm_release
- */
- if (y.visible)
+ for (const auto &action : actions)
+ {
+ if (action.visible != TaskVisible::INVISIBLE)
{
sync_draw_happen = true;
- ret = lm_layout_change(y);
- if (!ret)
- {
- HMI_SEQ_ERROR(req_num, "Failed layout change: %s", y.appid.c_str());
- app_list.removeRequest(req_num);
- break;
- // TODO: if transition fails, what should we do?
- }
- /* app_list.lookUpClient(y.appid)->emit_syncdraw(y.role, y.area); */
- }
- else
- {
- ret = lm_release(y);
- if (!ret)
- {
- HMI_SEQ_ERROR(req_num, "Failed release resource: %s", y.appid.c_str());
- app_list.removeRequest(req_num);
- break;
- // TODO: if transition fails, what should we do?
- }
- /* app_list.lookUpClient(y.appid)->emit_invisible(y.role, y.area); */
+ this->emit_syncdraw(action.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); */
}
}
- if (!ret)
+ if (sync_draw_happen)
{
- //this->emit_error(request_seq, 0 /*error_num*/, "error happens"); // test
- }
- else if (ret && sync_draw_happen)
- {
- this->set_timer();
+ this->setTimer();
}
else
{
- app_list.removeRequest(req_num); // HACK!!!
+ // deactivate only, no syncDraw
+ // Make it deactivate here
+ for (const auto &x : actions)
+ {
+ if (g_app_list.contains(x.appid))
+ {
+ auto client = g_app_list.lookUpClient(x.appid);
+ this->deactivate(client->surfaceID(x.role));
+ }
+ }
+ ret = NO_LAYOUT_CHANGE;
}
return ret;
}
-void App::lm_layout_change(const char *drawing_name)
+WMError App::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;
- // disable layers that are above our current layer
for (auto const &l : this->layers.mapping)
{
if (l.second.layer_id <= *layer_id)
{
continue;
}
-
- bool flush = false;
+ 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);
+ //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;
- flush = true;
}
if (l.second.state.sub != -1)
{
- this->deactivate(l.second.state.sub);
+ //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;
- flush = true;
- }
-
- if (flush)
- {
- this->layout_commit();
}
}
+ // change current state here, but this is hack
auto layer = this->layers.get_layer(*layer_id);
if (state.main == -1)
{
- this->try_layout(
- state, LayoutState{*surface_id}, [&](LayoutState const &nl) {
- HMI_DEBUG("wm", "Layout: %s", kNameLayoutNormal);
- this->surface_set_layout(*surface_id);
- state = nl;
-
- // Commit for configuraton
- this->layout_commit();
-
- std::string str_area = std::string(kNameLayoutNormal) + "." + std::string(kNameAreaFull);
- compositor::rect area_rect = this->area_info[*surface_id];
- this->emit_syncdraw(drawing_name, str_area.c_str(),
- area_rect.x, area_rect.y, area_rect.w, area_rect.h);
- this->enqueue_flushdraw(state.main);
- });
+ HMI_DEBUG("wm", "Layout: %s", kNameLayoutNormal);
}
else
{
- if (0 == strcmp(drawing_name, "HomeScreen"))
- {
- this->try_layout(
- state, LayoutState{*surface_id}, [&](LayoutState const &nl) {
- HMI_DEBUG("wm", "Layout: %s", kNameLayoutNormal);
- std::string str_area = std::string(kNameLayoutNormal) + "." + std::string(kNameAreaFull);
- compositor::rect area_rect = this->area_info[*surface_id];
- this->emit_syncdraw(drawing_name, str_area.c_str(),
- area_rect.x, area_rect.y, area_rect.w, area_rect.h);
- this->enqueue_flushdraw(state.main);
- });
- }
- else
+ if (0 != strcmp(drawing_name, "HomeScreen"))
{
- bool can_split = this->can_split(state, *surface_id);
-
- if (can_split)
+ if (split)
{
- this->try_layout(
- state,
- LayoutState{state.main, *surface_id},
- [&](LayoutState const &nl) {
- HMI_DEBUG("wm", "Layout: %s", kNameLayoutSplit);
- std::string main =
- std::move(*this->lookup_name(state.main));
-
- this->surface_set_layout(state.main, surface_id);
- if (state.sub != *surface_id)
+ std::string main =
+ std::move(*this->id_alloc.lookup(state.main));
+ if (state.sub != *surface_id)
+ {
+ if (state.sub != -1)
+ {
+ //this->deactivate(state.sub);
+ WMAction deact_sub;
+ deact_sub.role = main;
+ deact_sub.area = add_area;
+ deact_sub.appid = g_app_list.getAppID(state.sub, main, &found);
+ if (!found)
{
- if (state.sub != -1)
- {
- this->deactivate(state.sub);
- }
+ HMI_SEQ_DEBUG(req_num, "sub surface doesn't exist");
+ return WMError::NOT_REGISTERED;
}
- state = nl;
-
- // Commit for configuration and visibility(0)
- this->layout_commit();
-
- std::string str_area_main = std::string(kNameLayoutSplit) + "." + std::string(kNameAreaMain);
- std::string str_area_sub = std::string(kNameLayoutSplit) + "." + std::string(kNameAreaSub);
- compositor::rect area_rect_main = this->area_info[state.main];
- compositor::rect area_rect_sub = this->area_info[*surface_id];
- this->emit_syncdraw(main.c_str(), str_area_main.c_str(),
- area_rect_main.x, area_rect_main.y,
- area_rect_main.w, area_rect_main.h);
- this->emit_syncdraw(drawing_name, str_area_sub.c_str(),
- area_rect_sub.x, area_rect_sub.y,
- area_rect_sub.w, area_rect_sub.h);
- this->enqueue_flushdraw(state.main);
- this->enqueue_flushdraw(state.sub);
- });
+ 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{state.main, *surface_id};
}
else
{
- this->try_layout(
- state, LayoutState{*surface_id}, [&](LayoutState const &nl) {
- HMI_DEBUG("wm", "Layout: %s", kNameLayoutNormal);
+ HMI_DEBUG("wm", "Layout: %s", kNameLayoutNormal);
- this->surface_set_layout(*surface_id);
- if (state.main != *surface_id)
- {
- this->deactivate(state.main);
- }
- if (state.sub != -1)
+ //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)
{
- if (state.sub != *surface_id)
- {
- this->deactivate(state.sub);
- }
+ HMI_SEQ_DEBUG(req_num, "sub surface ddoesn't exist");
+ return WMError::NOT_REGISTERED;
}
- state = nl;
-
- // Commit for configuraton and visibility(0)
- this->layout_commit();
-
- std::string str_area = std::string(kNameLayoutNormal) + "." + std::string(kNameAreaFull);
- compositor::rect area_rect = this->area_info[*surface_id];
- this->emit_syncdraw(drawing_name, str_area.c_str(),
- area_rect.x, area_rect.y, area_rect.w, area_rect.h);
- this->enqueue_flushdraw(state.main);
- });
+ 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;
}
const char *App::check_surface_exist(const char *drawing_name)
//reply(nullptr);
}
-void App::api_activate_surface(char const *appid, char const *drawing_name, char const *drawing_area, const reply_func &reply)
+WMError App::setRequest(const std::string& appid, const std::string &role, const std::string &area,
+ Task task, unsigned* req_num)
{
- ST();
-
- /*
- * Check Phase
- */
-
- std::string id = appid;
- std::string role = drawing_name;
- std::string area = drawing_area;
-
- if (!app_list.contains(id))
+ if (!g_app_list.contains(appid))
{
- reply("app doesn't request 'requestSurface' yet");
- return;
+ return WMError::NOT_REGISTERED;
}
- auto client = app_list.lookUpClient(id);
+ auto client = g_app_list.lookUpClient(appid);
/*
* Queueing Phase
*/
- unsigned current = app_list.currentSequenceNumber();
- unsigned requested_num = app_list.getSequenceNumber(id);
+ unsigned current = g_app_list.currentRequestNumber();
+ unsigned requested_num = g_app_list.getRequestNumber(appid);
if (requested_num != 0)
{
- HMI_SEQ_INFO(requested_num, "%s %s %s request is already queued", id.c_str(), role.c_str(), area.c_str());
- reply("already requested");
- return;
+ HMI_SEQ_INFO(requested_num,
+ "%s %s %s request is already queued", appid.c_str(), role.c_str(), area.c_str());
+ return REQ_REJECTED;
}
- WMRequest req = WMRequest(id, role, area, Task::TASK_ALLOCATE);
- unsigned new_req = app_list.addAllocateRequest(req);
- app_list.req_dump();
+ WMRequest req = WMRequest(appid, role, area, task);
+ unsigned new_req = g_app_list.addRequest(req);
+ *req_num = new_req;
+ g_app_list.reqDump();
- HMI_SEQ_DEBUG(current, "%s start sequence with %s, %s", id.c_str(), role.c_str(), area.c_str());
+ HMI_SEQ_DEBUG(current, "%s start sequence with %s, %s", appid.c_str(), role.c_str(), area.c_str());
+
+ return WMError::SUCCESS;
+}
+
+void App::api_activate_surface(char const *appid, char const *drawing_name,
+ char const *drawing_area, const reply_func &reply)
+{
+ ST();
+
+ std::string id = appid;
+ std::string role = drawing_name;
+ std::string area = drawing_area;
+ Task task = Task::TASK_ALLOCATE;
+ unsigned req_num = 0;
+ WMError ret = WMError::UNKNOWN;
+
+ ret = this->setRequest(id, role, area, task, &req_num);
+
+ if(ret != WMError::SUCCESS)
+ {
+ HMI_ERROR("wm", errorDescription(ret));
+ reply("Failed to set request");
+ return;
+ }
reply(nullptr);
- if (new_req != current)
+ if (req_num != g_app_list.currentRequestNumber())
{
// Add request, then invoked after the previous task is finished
- HMI_SEQ_DEBUG(new_req, "request is accepted");
+ HMI_SEQ_DEBUG(req_num, "request is accepted");
return;
}
/*
* Do allocate tasks
*/
- bool ret = this->do_transition(new_req);
+ ret = this->doTransition(req_num);
- if (!ret)
+ if (ret != WMError::SUCCESS)
{
- HMI_SEQ_ERROR(new_req, "failed to do_transition");
//this->emit_error()
+ HMI_SEQ_ERROR(req_num, errorDescription(ret));
+ g_app_list.removeRequest(req_num);
+ this->processNextRequest();
}
}
-void App::api_deactivate_surface(char const *appid, char const *drawing_name, const reply_func &reply)
+void App::api_deactivate_surface(char const *appid, char const *drawing_name,
+ const reply_func &reply)
{
ST();
std::string id = appid;
std::string role = drawing_name;
std::string area = ""; //drawing_area;
+ Task task = Task::TASK_RELEASE;
+ unsigned req_num = 0;
+ WMError ret = WMError::UNKNOWN;
- if (!app_list.contains(id))
- {
- reply("app doesn't request 'requestSurface' yet");
- return;
- }
- auto client = app_list.lookUpClient(id);
+ ret = this->setRequest(id, role, area, task, &req_num);
- /*
- * Queueing Phase
- */
- unsigned current = app_list.currentSequenceNumber();
- unsigned requested_num = app_list.getSequenceNumber(id);
- if (requested_num != 0)
+ if (ret != WMError::SUCCESS)
{
- HMI_SEQ_INFO(requested_num, "%s %s %s request is already queued", id.c_str(), role.c_str(), area.c_str());
- reply("already requested");
+ HMI_ERROR("wm", errorDescription(ret));
+ reply("Failed to set request");
return;
}
- WMRequest req = WMRequest(id, role, area, Task::TASK_RELEASE);
- unsigned new_req = app_list.addAllocateRequest(req);
- app_list.req_dump();
-
- HMI_SEQ_DEBUG(current, "%s start sequence with %s, %s", id.c_str(), role.c_str(), area.c_str());
-
reply(nullptr);
- if (new_req != current)
+ if (req_num != g_app_list.currentRequestNumber())
{
// Add request, then invoked after the previous task is finished
- HMI_SEQ_DEBUG(new_req, "request is accepted");
+ HMI_SEQ_DEBUG(req_num, "request is accepted");
return;
}
/*
* Do allocate tasks
*/
- bool ret = this->do_transition(new_req);
+ ret = this->doTransition(req_num);
- if (!ret)
+ if (ret != WMError::SUCCESS)
{
- HMI_SEQ_ERROR(new_req, "failed to do_transition");
//this->emit_error()
+ HMI_SEQ_ERROR(req_num, errorDescription(ret));
+ g_app_list.removeRequest(req_num);
+ this->processNextRequest();
}
}
-void App::enqueue_flushdraw(int surface_id)
+WMError App::doEndDraw(unsigned req_num)
{
- this->check_flushdraw(surface_id);
- HMI_DEBUG("wm", "Enqueuing EndDraw for surface_id %d", surface_id);
- this->pending_end_draw.push_back(surface_id);
-}
+ // get actions
+ bool found;
+ auto actions = g_app_list.getActions(req_num, &found);
+ WMError ret = WMError::SUCCESS;
+ if (!found)
+ {
+ ret = WMError::NO_ENTRY;
+ return ret;
+ }
-void App::check_flushdraw(int surface_id)
-{
- auto i = std::find(std::begin(this->pending_end_draw),
- std::end(this->pending_end_draw), surface_id);
- if (i != std::end(this->pending_end_draw))
- {
- auto n = this->lookup_name(surface_id);
- HMI_ERROR("wm", "Application %s (%d) has pending EndDraw call(s)!",
- n ? n->c_str() : "unknown-name", surface_id);
- std::swap(this->pending_end_draw[std::distance(
- std::begin(this->pending_end_draw), i)],
- this->pending_end_draw.back());
- this->pending_end_draw.resize(this->pending_end_draw.size() - 1);
+ HMI_SEQ_INFO(req_num, "do endDraw");
+
+ // 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)
+ {
+ 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());
}
-}
-void App::lm_enddraw(const char *drawing_name)
-{
- HMI_DEBUG("wm", "end draw %s", drawing_name);
- for (unsigned i = 0, iend = this->pending_end_draw.size(); i < iend; i++)
+ // Change current state
+ this->changeCurrentState(req_num);
+
+ HMI_SEQ_INFO(req_num, "emit flushDraw");
+
+ for(const auto &act_flush : actions)
{
- auto n = this->lookup_name(this->pending_end_draw[i]);
- if (n && *n == drawing_name)
+ if(act_flush.visible != TaskVisible::INVISIBLE)
{
- std::swap(this->pending_end_draw[i], this->pending_end_draw[iend - 1]);
- this->pending_end_draw.resize(iend - 1);
- this->activate(this->pending_end_draw[i]);
- this->emit_flushdraw(drawing_name);
+ this->emit_flushdraw(act_flush.role.c_str());
}
}
+
+ return ret;
}
-void App::do_enddraw(unsigned request_seq)
+WMError App::setSurfaceSize(unsigned surface, const std::string &area)
{
- // get actions
- auto actions = app_list.getActions(request_seq);
- HMI_SEQ_INFO(request_seq, "do endDraw");
+ this->surface_set_layout(surface, area);
- for (const auto &act : actions)
+ return WMError::SUCCESS;
+}
+
+WMError App::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_DEBUG(request_seq, "visible %s", act.role.c_str());
- this->lm_enddraw(act.role.c_str());
+ 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;
+}
- HMI_SEQ_INFO(request_seq, "emit flushDraw");
- /* do
+WMError App::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)
{
- // emit flush Draw
- //emitFlushDrawToAll(&app_list, request_seq);
- // emit status change event
- } while (!app_list.requestFinished());*/
+ 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;
}
-void App::process_request()
+WMError App::changeCurrentState(unsigned req_num)
{
- unsigned req = app_list.currentSequenceNumber();
- HMI_SEQ_DEBUG(req, "Do next request");
- do_transition(req);
+ 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 App::api_enddraw(char const *appid, char const *drawing_name)
{
- std::string id(appid);
- std::string role(drawing_name);
- unsigned current_seq = app_list.currentSequenceNumber();
- bool result = app_list.setEndDrawFinished(current_seq, id, role);
+ std::string id = appid;
+ std::string role = drawing_name;
+ unsigned current_req = g_app_list.currentRequestNumber();
+ bool result = g_app_list.setEndDrawFinished(current_req, id, role);
if (!result)
{
- HMI_ERROR("wm", "%s doesn't have Window Resource", id.c_str());
+ HMI_ERROR("wm", "%s is not in transition state", id.c_str());
return;
}
- if (app_list.endDrawFullfilled(current_seq))
+ if (g_app_list.endDrawFullfilled(current_req))
{
// do task for endDraw
- //this->stop_timer();
- this->do_enddraw(current_seq);
-
- this->stop_timer();
+ this->stopTimer();
+ WMError ret = this->doEndDraw(current_req);
- app_list.removeRequest(current_seq);
- HMI_SEQ_INFO(current_seq, "Finish request");
- app_list.next();
- if (app_list.haveRequest())
+ if(ret != WMError::SUCCESS)
{
- this->process_request();
+ //this->emit_error();
}
+ HMI_SEQ_INFO(current_req, "Finish request status: %s", errorDescription(ret));
+
+ g_app_list.removeRequest(current_req);
+
+ this->processNextRequest();
}
else
{
- HMI_SEQ_INFO(current_seq, "Wait other App call endDraw");
+ HMI_SEQ_INFO(current_req, "Wait other App call endDraw");
return;
}
}
+void App::processNextRequest()
+{
+ g_app_list.next();
+ g_app_list.reqDump();
+ unsigned req_num = g_app_list.currentRequestNumber();
+ if (g_app_list.haveRequest())
+ {
+ HMI_SEQ_DEBUG(req_num, "Process next request");
+ WMError rc = doTransition(req_num);
+ if (rc != WMError::SUCCESS)
+ {
+ HMI_SEQ_ERROR(req_num, errorDescription(rc));
+ }
+ }
+ else
+ {
+ HMI_SEQ_DEBUG(req_num, "Nothing Request. Waiting Request");
+ }
+}
+
void App::api_ping() { this->dispatch_pending_events(); }
void App::send_event(char const *evname, char const *label)
{
HMI_DEBUG("wm", "surface_id is %u", surface_id);
- app_list.removeSurface(surface_id);
+ g_app_list.removeSurface(surface_id);
}
void App::emit_activated(char const *label)
this->send_event(kListEventName[Event_SyncDraw], label, area, x, y, w, h);
}
+void App::emit_syncdraw(const std::string &role, const std::string &area)
+{
+ compositor::rect rect = this->layers.getAreaSize(area);
+ //this->lm_get_area_info(area, &x, &y, &w, &h);
+ this->send_event(kListEventName[Event_SyncDraw],
+ role.c_str(), area.c_str(), rect.x, rect.y, rect.w, rect.h);
+}
+
void App::emit_flushdraw(char const *label)
{
this->send_event(kListEventName[Event_FlushDraw], label);
// add client into the db
std::string appid_str(appid);
std::string role(drawing_name);
- //app_list.addClient(appid_str, role);
- app_list.addClient(appid_str, *lid, id, role);
+ //g_app_list.addClient(appid_str, role);
+ g_app_list.addClient(appid_str, *lid, id, role);
return Ok<int>(id);
}
char const *label =
this->lookup_name(id).value_or("unknown-name").c_str();
- // FOR CES DEMO >>>
- if ((0 == strcmp(label, "Radio")) || (0 == strcmp(label, "MediaPlayer")) || (0 == strcmp(label, "Music")) || (0 == strcmp(label, "Navigation")))
+ // FOR CES DEMO >>>
+ if ((0 == strcmp(label, "Radio")) ||
+ (0 == strcmp(label, "MediaPlayer")) ||
+ (0 == strcmp(label, "Music")) ||
+ (0 == strcmp(label, "Navigation")))
{
for (auto i = surface_bg.begin(); i != surface_bg.end(); ++i)
{
}
}
-void App::deactivate_main_surface()
-{
- this->layers.main_surface = -1;
- std::string appid = "HomeScreen";
- this->api_deactivate_surface(appid.c_str(), this->layers.main_surface_name.c_str(), [](const char *) {});
-}
-
bool App::can_split(struct LayoutState const &state, int new_id)
{
if (state.main != -1 && state.main != new_id)
return false;
}
-void App::try_layout(struct LayoutState & /*state*/,
- struct LayoutState const &new_layout,
- std::function<void(LayoutState const &nl)> apply)
-{
- if (this->policy.layout_is_valid(new_layout))
- {
- apply(new_layout);
- }
-}
-
/**
* controller_hooks
*/
Code Review / apps / agl-service-windowmanager.git / blobdiff