#include <regex>
#include <thread>
-#include "windowmanager-client.hpp"
+#include "wm-client.hpp"
#include "applist.hpp"
extern "C"
namespace wm
{
-const unsigned TIME_OUT = 1000000UL; /* 1s */
+const unsigned TIME_OUT = 10000000UL; /* 10s */
/* DrawingArea name used by "{layout}.{area}" */
const char kNameLayoutNormal[] = "normal";
void App::timerHandler()
{
unsigned seq = app_list.currentSequenceNumber();
- HMI_SEQ_DEBUG(seq, "Timer expired remove Request");
+ 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();
}
}
+void App::removeClient(const std::string &appid)
+{
+ HMI_DEBUG("wm", "Remove clinet %s from list", appid.c_str());
+ app_list.removeClient(appid);
+}
+
+bool App::subscribeEventForApp(const std::string &appid, afb_req req, const std::string &evname)
+{
+ if(app_list.contains(appid) != WMError::SUCCESS){
+ HMI_DEBUG("wm", "Client %s is not registered", appid.c_str());
+ return false;
+ }
+ auto client = app_list.lookUpClient(appid);
+ return client->subscribe(req, evname);
+}
+
/**
* App Impl
*/
this->display->flush();
}
-void App::set_timer(){
+void App::set_timer()
+{
HMI_SEQ_DEBUG(app_list.currentSequenceNumber(), "Timer set activate");
- if (timer_ev_src != nullptr)
+ if (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) + TIME_OUT, 0, processTimerHandler, this);
+ CLOCK_REALTIME, time(NULL) * (1000000UL) + TIME_OUT, 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) + TIME_OUT);
+ sd_event_source_set_time(timer_ev_src, time(NULL) * (1000000UL) + TIME_OUT);
sd_event_source_set_enabled(timer_ev_src, SD_EVENT_ONESHOT);
}
}
-void App::stop_timer(){
+void App::stop_timer()
+{
unsigned seq = app_list.currentSequenceNumber();
HMI_SEQ_DEBUG(seq, "Timer stop");
int rc = sd_event_source_set_enabled(timer_ev_src, SD_EVENT_OFF);
- if(rc < 0){
+ if (rc < 0)
+ {
HMI_SEQ_ERROR(seq, "Timer stop failed");
}
}
-bool App::do_allocate_window_resource(unsigned request_seq)
+WMError App::lm_release(const struct WMAction &action)
+{
+ //auto const &surface_id = this->lookup_id(drawing_name);
+ WMError ret = WMError::LAYOUT_CHANGE_FAIL;
+ unsigned req_num = app_list.currentSequenceNumber();
+ auto const &surface_id = this->lookup_id(action.role.c_str());
+ if (!surface_id)
+ {
+ HMI_SEQ_ERROR(req_num, "Surface does not exist");
+ return ret;
+ }
+
+ if (*surface_id == this->layers.main_surface)
+ {
+ HMI_SEQ_ERROR(req_num, "Cannot deactivate main_surface");
+ return ret;
+ }
+
+ auto o_state = *this->layers.get_layout_state(*surface_id);
+
+ if (o_state == nullptr)
+ {
+ HMI_SEQ_ERROR(req_num, "Could not find layer for surface");
+ return ret;
+ }
+
+ struct LayoutState &state = *o_state;
+
+ if (state.main == -1)
+ {
+ HMI_SEQ_ERROR(req_num, "No surface active");
+ return ret;
+ }
+
+ // 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 WMError::SUCCESS;
+ }
+ if ((state.main == *surface_id) && (state.sub == *surface_id))
+ {
+ HMI_SEQ_ERROR(req_num, "Surface is not active");
+ return ret;
+ }
+
+ 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
+ {
+ this->try_layout(state, LayoutState{-1, -1}, [&](LayoutState const &nl) {
+ this->deactivate(*surface_id);
+ state = nl;
+ this->layout_commit();
+ });
+ }
+ }
+ else if (state.sub == *surface_id)
+ {
+ 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);
+ });
+ }
+ return WMError::SUCCESS;
+}
+
+WMError 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)
+ {
+ HMI_SEQ_DEBUG(app_list.currentSequenceNumber(), msg);
+ //app_list.removeRequest(req_num);
+ return WMError::LAYOUT_CHANGE_FAIL;
+ }
+ this->lm_layout_change(action.role.c_str());
+ return WMError::SUCCESS;
+}
+
+WMError App::do_transition(unsigned req_num)
{
/*
* Check Policy
*/
- // get current trigger
- auto trigger = app_list.getRequest(request_seq);
+ // 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)
+ }
+
+ or
+
+ translator.inputActionFromLayout(newLayout, currentLayout, &app_list, req_num);
- // json_object* newState = checkPolicy(role);
/* The following error check is not necessary because main.cpp will reject the message form not registered object
- if(client != nullptr){
- reply("client is not registered");
- return;
} */
- HMI_SEQ_NOTICE(request_seq, "ATM, Policy manager does't exist, then set WMAction as is");
-
- bool ret = app_list.setAction(request_seq, trigger.appid, trigger.role, trigger.area);
+ HMI_SEQ_NOTICE(req_num, "ATM, Policy manager does't exist, then set WMAction as is");
+ if (TASK_RELEASE == trigger.task)
+ {
+ is_activate = false;
+ }
+ WMError ret = app_list.setAction(req_num, trigger.appid, trigger.role, trigger.area, is_activate);
app_list.req_dump();
- // TODO: Tasks will be changed according to policy manager result
- // do task(onTransition (activate))
- // lm_.updateLayout(jobj);
- // TODO: emit syncDraw with application
+ if (ret != WMError::SUCCESS)
+ {
+ HMI_SEQ_ERROR(req_num, "Failed to set action");
+ return ret;
+ }
- //client->emit_syncdraw(role);
- if (ret) {
- this->set_timer();
- } else {
+ // 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)
+ {
+ sync_draw_happen = true;
+ ret = lm_layout_change(y);
+ if (ret != WMError::SUCCESS)
+ {
+ HMI_SEQ_ERROR(req_num, "%s: appid: %s, role: %s, area: %s",
+ errorDescription(ret), y.appid.c_str(), y.role.c_str(), y.area.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); */
+ }
+ }
+
+ if (ret != WMError::SUCCESS)
+ {
//this->emit_error(request_seq, 0 /*error_num*/, "error happens"); // test
}
+ else if (sync_draw_happen)
+ {
+ this->set_timer();
+ }
+ else
+ {
+ app_list.removeRequest(req_num); // HACK!!!
+ }
return ret;
}
-void App::lm_layout_change(unsigned req_num, const char* drawing_name)
+void App::lm_layout_change(const char *drawing_name)
{
auto const &surface_id = this->lookup_id(drawing_name);
auto layer_id = this->layers.get_layer_id(*surface_id);
}
}
-const char* App::check_surface_exist(unsigned req_num, const char* drawing_name)
+const char *App::check_surface_exist(const char *drawing_name)
{
auto const &surface_id = this->lookup_id(drawing_name);
if (!surface_id)
std::string role = drawing_name;
std::string area = drawing_area;
- if(!app_list.contains(id)){
+ if (app_list.contains(id) != WMError::SUCCESS)
+ {
reply("app doesn't request 'requestSurface' yet");
return;
}
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)
{
// Add request, then invoked after the previous task is finished
HMI_SEQ_DEBUG(new_req, "request is accepted");
- reply(nullptr);
return;
}
/*
* Do allocate tasks
*/
- bool ret = this->do_allocate_window_resource(new_req);
+ WMError ret = this->do_transition(new_req);
- // layer manager task
- // this function will be integrated in do_allocate_window_resource()
- const char* msg = this->check_surface_exist(new_req, drawing_name);
-
- if(msg){
- HMI_SEQ_DEBUG(new_req,"surface doesn't exist");
- reply(msg);
- app_list.removeRequest(new_req);
- return;
+ if (ret != WMError::SUCCESS)
+ {
+ HMI_SEQ_ERROR(new_req, errorDescription(ret));
+ //this->emit_error()
}
- // this function will be integrated in do_allocate_window_resource()
- this->lm_layout_change(new_req, drawing_name);
-
- reply(nullptr);
}
void App::api_deactivate_surface(char const *appid, char const *drawing_name, const reply_func &reply)
*/
std::string id = appid;
std::string role = drawing_name;
- std::string area = ""; //drawing_area;
+ std::string area = ""; //drawing_area;
- if(!app_list.contains(id)){
+ if (app_list.contains(id) != WMError::SUCCESS)
+ {
reply("app doesn't request 'requestSurface' yet");
return;
}
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)
{
// Add request, then invoked after the previous task is finished
HMI_SEQ_DEBUG(new_req, "request is accepted");
- reply(nullptr);
return;
}
/*
* Do allocate tasks
*/
- //bool ret = this->do_allocate_window_resource(new_req);
+ WMError ret = this->do_transition(new_req);
- auto const &surface_id = this->lookup_id(drawing_name);
- if (!surface_id)
+ if (ret != WMError::SUCCESS)
{
- reply("Surface does not exist");
- return;
- }
-
- if (*surface_id == this->layers.main_surface)
- {
- reply("Cannot deactivate main_surface");
- return;
- }
-
- auto o_state = *this->layers.get_layout_state(*surface_id);
-
- if (o_state == nullptr)
- {
- reply("Could not find layer for surface");
- return;
- }
-
- struct LayoutState &state = *o_state;
-
- if (state.main == -1)
- {
- reply("No surface active");
- return;
- }
-
- // Check against main_surface, main_surface_name is the configuration item.
- if (*surface_id == this->layers.main_surface)
- {
- HMI_DEBUG("wm", "Refusing to deactivate main_surface %d", *surface_id);
- reply(nullptr);
- return;
- }
- if ((state.main == *surface_id) && (state.sub == *surface_id))
- {
- reply("Surface is not active");
- return;
- }
- reply(nullptr);
-
- 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
- {
- this->try_layout(state, LayoutState{-1, -1}, [&](LayoutState const &nl) {
- this->deactivate(*surface_id);
- state = nl;
- this->layout_commit();
- });
- }
- }
- else if (state.sub == *surface_id)
- {
- 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_ERROR(new_req, errorDescription(ret));
+ //this->emit_error()
}
}
}
}
-void App::lm_enddraw(const char* drawing_name){
+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++)
{
auto actions = app_list.getActions(request_seq);
HMI_SEQ_INFO(request_seq, "do endDraw");
- for(const auto& act : actions){
+ for (const auto &act : actions)
+ {
HMI_SEQ_DEBUG(request_seq, "visible %s", act.role.c_str());
this->lm_enddraw(act.role.c_str());
}
HMI_SEQ_INFO(request_seq, "emit flushDraw");
-/* do
+ /* do
{
// emit flush Draw
//emitFlushDrawToAll(&app_list, request_seq);
{
unsigned req = app_list.currentSequenceNumber();
HMI_SEQ_DEBUG(req, "Do next request");
- do_allocate_window_resource(req);
+ WMError rc = do_transition(req);
+ if(rc != WMError::SUCCESS){
+ HMI_SEQ_ERROR(req, errorDescription(rc));
+ }
}
void App::api_enddraw(char const *appid, char const *drawing_name)
//this->stop_timer();
this->do_enddraw(current_seq);
+ this->stop_timer();
+
app_list.removeRequest(current_seq);
HMI_SEQ_INFO(current_seq, "Finish request");
app_list.next();
this->api_activate_surface(
this->lookup_name(surface_id).value_or("unknown-name").c_str());
}*/
+
+ // search pid from surfaceID
+
+ // pick up appid from pid from application manager
+
+ // check appid then add it to the client
}
void App::surface_removed(uint32_t surface_id)
{
HMI_DEBUG("wm", "surface_id is %u", surface_id);
- // We cannot normally deactivate the main_surface, so be explicit
- // about it:
- if (int(surface_id) == this->layers.main_surface)
- {
- this->deactivate_main_surface();
- }
- else
- {
- auto drawing_name = this->lookup_name(surface_id);
- if (drawing_name)
- {
- std::string appid = "";
- /* auto = lookUpClient(surface_id);
- appid = client->appID();
-
- */
- this->api_deactivate_surface(appid.c_str(), drawing_name->c_str(), [](const char *) {});
- }
- }
-
- this->id_alloc.remove_id(surface_id);
- this->layers.remove_surface(surface_id);
+ app_list.removeSurface(surface_id);
}
void App::emit_activated(char const *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, role);
+ app_list.addClient(appid_str, *lid, id, role);
return Ok<int>(id);
}
Code Review / apps / agl-service-windowmanager.git / blobdiff