From 77b239e85360594820534afe5cb79c7d60721f40 Mon Sep 17 00:00:00 2001 From: Kazumasa Mitsunari Date: Wed, 13 Jun 2018 21:25:32 +0900 Subject: activate/deactivate surface only set transtion state Change-Id: If16e9ff1c584ee609aaac7db22400db92c1a6a93 Signed-off-by: Kazumasa Mitsunari --- src/app.hpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/app.hpp') diff --git a/src/app.hpp b/src/app.hpp index a91654d..8b98788 100644 --- a/src/app.hpp +++ b/src/app.hpp @@ -257,12 +257,15 @@ struct App void emit_activated(char const *label); void emit_deactivated(char const *label); void emit_syncdraw(char const *label, char const *area, int x, int y, int w, int h); + void emit_syncdraw(const std::string &role, const std::string &area); void emit_flushdraw(char const *label); void emit_visible(char const *label, bool is_visible); void emit_invisible(char const *label); void emit_visible(char const *label); WMError do_transition(unsigned sequence_number); + WMError check_policy(unsigned req_num); + WMError start_transition(unsigned req_num); void do_enddraw(unsigned req_num); void process_request(); @@ -281,10 +284,11 @@ struct App // The following function is temporary. // Then will be removed when layermanager is finished - void lm_layout_change(const char *drawing_name); + void lm_layout_change(const char *drawing_name); WMError lm_layout_change(const struct WMAction &action); WMError lm_release(const struct WMAction &action); - void lm_enddraw(const char *drawing_name); + void lm_enddraw(const char *drawing_name); + void lm_get_area_info(const std::string &area); }; } // namespace wm -- cgit 1.2.3-korg From 1be43a5f46ffe04d530e093077337c6582fd81d1 Mon Sep 17 00:00:00 2001 From: Kazumasa Mitsunari Date: Wed, 13 Jun 2018 21:53:15 +0900 Subject: Add set_request Change-Id: Ieb0ac4e8f71c698782effab8e2fe13f30fa381ac Signed-off-by: Kazumasa Mitsunari --- src/app.cpp | 65 ++++++++++++++++++++++++++++++++++++------------------------- src/app.hpp | 2 ++ 2 files changed, 41 insertions(+), 26 deletions(-) (limited to 'src/app.hpp') diff --git a/src/app.cpp b/src/app.cpp index 8832cda..d44986e 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -889,62 +889,75 @@ 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::set_request(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 (!g_app_list.contains(id)) + if (!g_app_list.contains(appid)) { - reply("app doesn't request 'requestSurface' yet"); - return; + return WMError::NOT_REGISTERED; } - auto client = g_app_list.lookUpClient(id); + auto client = g_app_list.lookUpClient(appid); /* * Queueing Phase */ unsigned current = g_app_list.currentRequestNumber(); - unsigned requested_num = g_app_list.getRequestNumber(id); + 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); + WMRequest req = WMRequest(appid, role, area, task); unsigned new_req = g_app_list.addAllocateRequest(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->set_request(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 */ - WMError ret = this->do_transition(new_req); + ret = this->do_transition(req_num); if (ret != WMError::SUCCESS) { //this->emit_error() - HMI_SEQ_ERROR(new_req, errorDescription(ret)); - g_app_list.removeRequest(new_req); + HMI_SEQ_ERROR(req_num, errorDescription(ret)); + g_app_list.removeRequest(req_num); g_app_list.next(); g_app_list.reqDump(); } diff --git a/src/app.hpp b/src/app.hpp index 8b98788..e04472e 100644 --- a/src/app.hpp +++ b/src/app.hpp @@ -263,6 +263,8 @@ struct App void emit_invisible(char const *label); void emit_visible(char const *label); + WMError set_request(const std::string &appid, const std::string &role, const std::string &area, + Task task, unsigned *req_num); WMError do_transition(unsigned sequence_number); WMError check_policy(unsigned req_num); WMError start_transition(unsigned req_num); -- cgit 1.2.3-korg From 237be6f894c56cc32042c9dee16b6445bbae92f7 Mon Sep 17 00:00:00 2001 From: Kazumasa Mitsunari Date: Wed, 13 Jun 2018 22:00:58 +0900 Subject: Use camel case Change-Id: I4f4e714d2aeea4b7cca95495293aab88b97fc2ca Signed-off-by: Kazumasa Mitsunari --- src/app.cpp | 36 ++++++++++++++++++------------------ src/app.hpp | 14 +++++++------- 2 files changed, 25 insertions(+), 25 deletions(-) (limited to 'src/app.hpp') diff --git a/src/app.cpp b/src/app.cpp index d44986e..9e6e3d5 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -128,7 +128,7 @@ void App::timerHandler() g_app_list.reqDump(); if (g_app_list.haveRequest()) { - this->process_request(); + this->processRequest(); } } @@ -421,7 +421,7 @@ void App::layout_commit() this->display->flush(); } -void App::set_timer() +void App::setTimer() { HMI_SEQ_DEBUG(g_app_list.currentRequestNumber(), "Timer set activate"); if (g_timer_ev_src == nullptr) @@ -442,7 +442,7 @@ void App::set_timer() } } -void App::stop_timer() +void App::stopTimer() { unsigned req_num = g_app_list.currentRequestNumber(); HMI_SEQ_DEBUG(req_num, "Timer stop"); @@ -563,20 +563,20 @@ WMError App::lm_layout_change(const struct WMAction &action) return WMError::SUCCESS; } -WMError App::do_transition(unsigned req_num) +WMError App::doTransition(unsigned req_num) { HMI_SEQ_DEBUG(req_num, "check next state"); - WMError ret = this->check_policy(req_num); + WMError ret = this->checkPolicy(req_num); if (ret != WMError::SUCCESS) { return ret; } HMI_SEQ_DEBUG(req_num, "Start transition."); - ret = this->start_transition(req_num); + ret = this->startTransition(req_num); return ret; } -WMError App::check_policy(unsigned req_num) +WMError App::checkPolicy(unsigned req_num) { /* * Check Policy @@ -651,7 +651,7 @@ WMError App::check_policy(unsigned req_num) return ret; } -WMError App::start_transition(unsigned req_num) +WMError App::startTransition(unsigned req_num) { bool sync_draw_happen = false; bool found = false; @@ -678,7 +678,7 @@ WMError App::start_transition(unsigned req_num) if (sync_draw_happen) { - this->set_timer(); + this->setTimer(); } else { @@ -889,7 +889,7 @@ const char *App::check_surface_exist(const char *drawing_name) //reply(nullptr); } -WMError App::set_request(const std::string& appid, const std::string &role, const std::string &area, +WMError App::setRequest(const std::string& appid, const std::string &role, const std::string &area, Task task, unsigned* req_num) { if (!g_app_list.contains(appid)) @@ -931,7 +931,7 @@ void App::api_activate_surface(char const *appid, char const *drawing_name, char unsigned req_num = 0; WMError ret = WMError::UNKNOWN; - ret = this->set_request(id, role, area, task, &req_num); + ret = this->setRequest(id, role, area, task, &req_num); if(ret != WMError::SUCCESS) { @@ -951,7 +951,7 @@ void App::api_activate_surface(char const *appid, char const *drawing_name, char /* * Do allocate tasks */ - ret = this->do_transition(req_num); + ret = this->doTransition(req_num); if (ret != WMError::SUCCESS) { @@ -1010,7 +1010,7 @@ void App::api_deactivate_surface(char const *appid, char const *drawing_name, co /* * Do allocate tasks */ - WMError ret = this->do_transition(new_req); + WMError ret = this->doTransition(new_req); if (ret != WMError::SUCCESS) { @@ -1089,11 +1089,11 @@ void App::do_enddraw(unsigned req_num) } while (!g_app_list.requestFinished());*/ } -void App::process_request() +void App::processRequest() { unsigned req = g_app_list.currentRequestNumber(); HMI_SEQ_DEBUG(req, "Do next request"); - WMError rc = do_transition(req); + WMError rc = doTransition(req); if(rc != WMError::SUCCESS){ HMI_SEQ_ERROR(req, errorDescription(rc)); } @@ -1115,17 +1115,17 @@ void App::api_enddraw(char const *appid, char const *drawing_name) if (g_app_list.endDrawFullfilled(current_req)) { // do task for endDraw - //this->stop_timer(); + //this->stopTimer(); this->do_enddraw(current_req); - this->stop_timer(); + this->stopTimer(); g_app_list.removeRequest(current_req); HMI_SEQ_INFO(current_req, "Finish request"); g_app_list.next(); if (g_app_list.haveRequest()) { - this->process_request(); + this->processRequest(); } } else diff --git a/src/app.hpp b/src/app.hpp index e04472e..9f53f84 100644 --- a/src/app.hpp +++ b/src/app.hpp @@ -263,16 +263,16 @@ struct App void emit_invisible(char const *label); void emit_visible(char const *label); - WMError set_request(const std::string &appid, const std::string &role, const std::string &area, + WMError setRequest(const std::string &appid, const std::string &role, const std::string &area, Task task, unsigned *req_num); - WMError do_transition(unsigned sequence_number); - WMError check_policy(unsigned req_num); - WMError start_transition(unsigned req_num); + WMError doTransition(unsigned sequence_number); + WMError checkPolicy(unsigned req_num); + WMError startTransition(unsigned req_num); + void setTimer(); + void stopTimer(); + void processRequest(); void do_enddraw(unsigned req_num); - void process_request(); - void set_timer(); - void stop_timer(); const char *check_surface_exist(const char *drawing_name); void activate(int id); -- cgit 1.2.3-korg From eb892f6103c8bb2d95e6fd5274d2bac7d7f0b6fb Mon Sep 17 00:00:00 2001 From: Kazumasa Mitsunari Date: Fri, 15 Jun 2018 08:30:01 +0900 Subject: On the way to move process to endDraw Change-Id: I728afc6d2b1c93ee676fa2990e060c911edf8296 Signed-off-by: Kazumasa Mitsunari --- src/app.cpp | 238 +++++++++++++++++++++++++++++++++++++++++++++++------- src/app.hpp | 27 ++++++- src/wm_client.cpp | 11 +++ src/wm_client.hpp | 1 + 4 files changed, 243 insertions(+), 34 deletions(-) (limited to 'src/app.hpp') diff --git a/src/app.cpp b/src/app.cpp index 9e6e3d5..c30223c 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -124,12 +124,7 @@ void App::timerHandler() HMI_SEQ_DEBUG(req_num, "Timer expired remove Request"); g_app_list.reqDump(); g_app_list.removeRequest(req_num); - g_app_list.next(); - g_app_list.reqDump(); - if (g_app_list.haveRequest()) - { - this->processRequest(); - } + this->processNextRequest(); } void App::removeClient(const std::string &appid) @@ -360,7 +355,7 @@ void App::surface_set_layout(int surface_id, optional sub_surface_id) h = this->controller->output_size.h + 1 + h; } - if (sub_surface_id) + /* if (sub_surface_id) { if (o_layer_id != this->layers.get_layer_id(*sub_surface_id)) { @@ -397,7 +392,7 @@ void App::surface_set_layout(int surface_id, optional sub_surface_id) 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); @@ -565,7 +560,7 @@ WMError App::lm_layout_change(const struct WMAction &action) WMError App::doTransition(unsigned req_num) { - HMI_SEQ_DEBUG(req_num, "check next state"); + HMI_SEQ_DEBUG(req_num, "check policy"); WMError ret = this->checkPolicy(req_num); if (ret != WMError::SUCCESS) { @@ -642,6 +637,37 @@ WMError App::checkPolicy(unsigned req_num) } // >>>> This will be removed + /* get new status from Policy Manager */ + if (can_split) + { + // 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); + // set another action + std::string add_name = "navigation"; + + 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 visible = true; + bool end_draw_finished = false; + WMAction new_act{add_name, add_role, add_area, visible, end_draw_finished}; + WMError ret = g_app_list.setAction(req_num, new_act); + if (ret != WMError::SUCCESS) + { + HMI_SEQ_ERROR(req_num, "Failed to set action"); + return ret; + } + g_app_list.reqDump(); + } + } + // >>>> This will be removed + + // Set invisible task + this->setInvisibleTask(trigger.role, can_split); + /* get new status from Policy Manager */ HMI_SEQ_NOTICE(req_num, "ATM, Policy manager does't exist, then set WMAction as is"); @@ -1060,33 +1086,56 @@ void App::lm_enddraw(const char *drawing_name) } } -void App::do_enddraw(unsigned req_num) +WMError App::doEndDraw(unsigned req_num) { // get actions bool found; auto actions = g_app_list.getActions(req_num, &found); + WMError ret = WMError::SUCCESS; if (!found) { - WMError err = WMError::NO_ENTRY; - HMI_SEQ_ERROR(req_num, errorDescription(err)); - return; + ret = WMError::NO_ENTRY; + return ret; } HMI_SEQ_INFO(req_num, "do endDraw"); + // layout change and make it visible + + // Temporary action + /* auto itr = actions.cend(); + this->currentAppInvisible(itr->role); */ 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()); + //this->lm_enddraw(act.role.c_str()); } HMI_SEQ_INFO(req_num, "emit flushDraw"); - /* do + + for(const auto &act_flush : actions) { - // emit flush Draw - //emitFlushDrawToAll(&g_app_list, req_num); - // emit status change event - } while (!g_app_list.requestFinished());*/ + if(act_flush.visible) + { + this->emit_flushdraw(act_flush.role.c_str()); + } + } } void App::processRequest() @@ -1094,39 +1143,146 @@ void App::processRequest() unsigned req = g_app_list.currentRequestNumber(); HMI_SEQ_DEBUG(req, "Do next request"); WMError rc = doTransition(req); - if(rc != WMError::SUCCESS){ + if(rc != WMError::SUCCESS) + { HMI_SEQ_ERROR(req, errorDescription(rc)); } } +WMError App::setSurfaceSize(unsigned surface, const std::string &area) +{ + // Actually this function is under Layout Manager + /* compositor::rect size = this->lm.getAreaSize(area); // compositor::rect size = this->lm_.getAreaSize(area); + + if (!this->controller->surface_exists(surface)) + { + // Block until all pending request are processed by wayland display server + // because waiting for the surface of new app is created + this->display->roundtrip(); + } + auto &s = this->controller->surfaces[surface]; + s->set_destination_rectangle(size.x, size.y, size.w, size.h); + this->layout_commit(); + + // Update area information + this->area_info[surface].x = size.x; + this->area_info[surface].y = size.y; + this->area_info[surface].w = size.w; + this->area_info[surface].h = size.h; + HMI_DEBUG("wm", "Surface %d rect { %d, %d, %d, %d }", + surface, size.x, size.y, size.w, size.h); */ + this->surface_set_layout(surface); + + return WMError::SUCCESS; +} + +WMError App::layoutChange(const WMAction &action) +{ + if(act.visible == false) + { + 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; +} + +/* void App::currentAppInvisible(const std::string &role) +{ + 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; + + // 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; + if (l.second.state.main != -1) + { + this->deactivate(l.second.state.main); + l.second.state.main = -1; + flush = true; + } + + if (l.second.state.sub != -1) + { + this->deactivate(l.second.state.sub); + l.second.state.sub = -1; + flush = true; + } + + if (flush) + { + this->layout_commit(); + } + } +} */ + +WMError App::visibilityChange(const WMAction &action) +{ + 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) + { + this->activate(surface); // Layout Manager task + } + else + { + this->deactivate(surface); // Layout Manager task + } + return WMError::SUCCESS; +} + void App::api_enddraw(char const *appid, char const *drawing_name) { - std::string id(appid); - std::string role(drawing_name); + 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 (g_app_list.endDrawFullfilled(current_req)) { // do task for endDraw - //this->stopTimer(); - this->do_enddraw(current_req); - this->stopTimer(); + WMError ret = this->doEndDraw(current_req); - g_app_list.removeRequest(current_req); - HMI_SEQ_INFO(current_req, "Finish request"); - g_app_list.next(); - if (g_app_list.haveRequest()) + if(ret != WMError::SUCCESS) { - this->processRequest(); + //this->emit_error(); } + HMI_SEQ_INFO(current_req, "Finish request status: %s", errorDescription(ret)); + + g_app_list.removeRequest(current_req); + + this->processNextRequest(); } else { @@ -1135,6 +1291,26 @@ void App::api_enddraw(char const *appid, char const *drawing_name) } } +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) diff --git a/src/app.hpp b/src/app.hpp index 9f53f84..9ebdda5 100644 --- a/src/app.hpp +++ b/src/app.hpp @@ -233,11 +233,11 @@ struct App void surface_created(uint32_t surface_id); void surface_removed(uint32_t surface_id); + void removeClient(const std::string &appid); + bool subscribeEventForApp(const std::string &appid, afb_req req, const std::string &evname); // Do not use this function //static int processTimerHandler(sd_event_source *s, uint64_t usec, void *userdata); void timerHandler(); - void removeClient(const std::string &appid); - bool subscribeEventForApp(const std::string &appid, afb_req req, const std::string &evname); private: optional lookup_id(char const *name); @@ -272,7 +272,24 @@ struct App void setTimer(); void stopTimer(); void processRequest(); - void do_enddraw(unsigned req_num); + + WMError setRequest(const std::string &appid, const std::string &role, const std::string &area, + Task task, unsigned *req_num); + WMError doTransition(unsigned req_num); + WMError checkPolicy(unsigned req_num); + void setInvisibleTask(const std::string &role); + WMError startTransition(unsigned req_num); + WMError layoutChange(const WMAction &action); + WMError visibilityChange(const WMAction &action); + WMError setSurfaceSize(unsigned surface, const std::string& area); + void processNextRequest(); + //void currentAppInvisible(const std::string &role); + + + void setTimer(); + void stopTimer(); + void processRequest(); + WMError doEndDraw(unsigned req_num); const char *check_surface_exist(const char *drawing_name); void activate(int id); @@ -291,6 +308,10 @@ struct App WMError lm_release(const struct WMAction &action); void lm_enddraw(const char *drawing_name); void lm_get_area_info(const std::string &area); + void lm_get_area_info(const std::string &area); + + private: + std::unordered_map area2size; }; } // namespace wm diff --git a/src/wm_client.cpp b/src/wm_client.cpp index 6f1aa20..24e2247 100644 --- a/src/wm_client.cpp +++ b/src/wm_client.cpp @@ -90,6 +90,17 @@ unsigned WMClient::surfaceID(const string &role) const return this->role2surface.at(role); } +std::string WMClient::role(unsigned surface) const +{ + for(const auto& [key, value] : this->role2surface) + { + if(value == surface){ + return key; + } + } + return std::string(""); +} + unsigned WMClient::layerID() const { return this->layer; diff --git a/src/wm_client.hpp b/src/wm_client.hpp index 5fa9444..e1ef75b 100644 --- a/src/wm_client.hpp +++ b/src/wm_client.hpp @@ -46,6 +46,7 @@ class WMClient std::string appID() const; unsigned surfaceID(const std::string &role) const; unsigned layerID() const; + std::string role(unsigned surface) const; void registerLayer(unsigned layer); bool addSurface(const std::string& role, unsigned surface); bool removeSurfaceIfExist(unsigned surface); -- cgit 1.2.3-korg From d3fd818d0f2cb5a40f900166aad9a7f21bebc5b3 Mon Sep 17 00:00:00 2001 From: Kazumasa Mitsunari Date: Fri, 15 Jun 2018 17:11:44 +0900 Subject: Compile success Change-Id: I950ec6359e95c76eaed6894d489c58ad0d2cde25 Signed-off-by: Kazumasa Mitsunari --- src/app.cpp | 55 ++++++++++--------------------------------------------- src/app.hpp | 22 +++++----------------- 2 files changed, 15 insertions(+), 62 deletions(-) (limited to 'src/app.hpp') diff --git a/src/app.cpp b/src/app.cpp index c30223c..7a0804d 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -577,7 +577,7 @@ WMError App::checkPolicy(unsigned req_num) * Check Policy */ // get current trigger - bool found; + bool found, split; WMError ret = WMError::LAYOUT_CHANGE_FAIL; auto trigger = g_app_list.getRequest(req_num, &found); if (!found) @@ -605,9 +605,9 @@ WMError App::checkPolicy(unsigned req_num) struct LayoutState &state = *o_state; unsigned curernt_sid = state.main; - bool can_split = this->can_split(state, *surface_id); + bool split = this->can_split(state, *surface_id); - if (can_split) + if (split) { // Get current visible role std::string add_role = this->lookup_name(state.main).value(); @@ -635,38 +635,9 @@ WMError App::checkPolicy(unsigned req_num) g_app_list.reqDump(); } } - // >>>> This will be removed - - /* get new status from Policy Manager */ - if (can_split) - { - // 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); - // set another action - std::string add_name = "navigation"; - - 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 visible = true; - bool end_draw_finished = false; - WMAction new_act{add_name, add_role, add_area, visible, end_draw_finished}; - WMError ret = g_app_list.setAction(req_num, new_act); - if (ret != WMError::SUCCESS) - { - HMI_SEQ_ERROR(req_num, "Failed to set action"); - return ret; - } - g_app_list.reqDump(); - } - } - // >>>> This will be removed // Set invisible task - this->setInvisibleTask(trigger.role, can_split); + this->setInvisibleTask(trigger.role, split); /* get new status from Policy Manager */ HMI_SEQ_NOTICE(req_num, "ATM, Policy manager does't exist, then set WMAction as is"); @@ -723,6 +694,11 @@ WMError App::startTransition(unsigned req_num) return ret; } +void App::setInvisibleTask(const std::string &role, bool split) +{ + ; +} + void App::lm_layout_change(const char *drawing_name) { auto const &surface_id = this->lookup_id(drawing_name); @@ -1138,17 +1114,6 @@ WMError App::doEndDraw(unsigned req_num) } } -void App::processRequest() -{ - unsigned req = g_app_list.currentRequestNumber(); - HMI_SEQ_DEBUG(req, "Do next request"); - WMError rc = doTransition(req); - if(rc != WMError::SUCCESS) - { - HMI_SEQ_ERROR(req, errorDescription(rc)); - } -} - WMError App::setSurfaceSize(unsigned surface, const std::string &area) { // Actually this function is under Layout Manager @@ -1178,7 +1143,7 @@ WMError App::setSurfaceSize(unsigned surface, const std::string &area) WMError App::layoutChange(const WMAction &action) { - if(act.visible == false) + if (action.visible == false) { return WMError::SUCCESS; } diff --git a/src/app.hpp b/src/app.hpp index 9ebdda5..235cd01 100644 --- a/src/app.hpp +++ b/src/app.hpp @@ -268,28 +268,18 @@ struct App WMError doTransition(unsigned sequence_number); WMError checkPolicy(unsigned req_num); WMError startTransition(unsigned req_num); + void setInvisibleTask(const std::string &role, bool split); - void setTimer(); - void stopTimer(); - void processRequest(); - - WMError setRequest(const std::string &appid, const std::string &role, const std::string &area, - Task task, unsigned *req_num); - WMError doTransition(unsigned req_num); - WMError checkPolicy(unsigned req_num); - void setInvisibleTask(const std::string &role); - WMError startTransition(unsigned req_num); + WMError doEndDraw(unsigned req_num); WMError layoutChange(const WMAction &action); WMError visibilityChange(const WMAction &action); WMError setSurfaceSize(unsigned surface, const std::string& area); - void processNextRequest(); - //void currentAppInvisible(const std::string &role); - void setTimer(); void stopTimer(); - void processRequest(); - WMError doEndDraw(unsigned req_num); + void processNextRequest(); + //void currentAppInvisible(const std::string &role); + const char *check_surface_exist(const char *drawing_name); void activate(int id); @@ -307,8 +297,6 @@ struct App WMError lm_layout_change(const struct WMAction &action); WMError lm_release(const struct WMAction &action); void lm_enddraw(const char *drawing_name); - void lm_get_area_info(const std::string &area); - void lm_get_area_info(const std::string &area); private: std::unordered_map area2size; -- cgit 1.2.3-korg From 91a38260c68db9cf9732a905680523bba820079d Mon Sep 17 00:00:00 2001 From: Kazumasa Mitsunari Date: Fri, 15 Jun 2018 20:14:18 +0900 Subject: Set deactivate task But doesn't set deactivateSurface pattern Change-Id: I052a54c9d58b224619a182e2815567811d12b3c5 Signed-off-by: Kazumasa Mitsunari --- src/app.cpp | 226 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---- src/app.hpp | 8 +-- 2 files changed, 215 insertions(+), 19 deletions(-) (limited to 'src/app.hpp') diff --git a/src/app.cpp b/src/app.cpp index 7a0804d..48c6740 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -545,7 +545,7 @@ WMError App::lm_release(const struct WMAction &action) return WMError::SUCCESS; } -WMError App::lm_layout_change(const struct WMAction &action) +/* WMError App::lm_layout_change(const struct WMAction &action) { const char *msg = this->check_surface_exist(action.role.c_str()); @@ -556,7 +556,7 @@ WMError App::lm_layout_change(const struct WMAction &action) } this->lm_layout_change(action.role.c_str()); return WMError::SUCCESS; -} +} */ WMError App::doTransition(unsigned req_num) { @@ -585,17 +585,17 @@ WMError App::checkPolicy(unsigned req_num) ret = WMError::NO_ENTRY; return ret; } - bool is_activate = (trigger.task == Task::TASK_ALLOCATE); std::string req_area = trigger.area; // >>>> Compatible with current window manager until policy manager coming - if (is_activate) + 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(g_app_list.currentRequestNumber(), msg); + HMI_SEQ_ERROR(req_num, msg); ret = WMError::LAYOUT_CHANGE_FAIL; return ret; } @@ -609,6 +609,7 @@ WMError App::checkPolicy(unsigned req_num) 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 @@ -626,7 +627,15 @@ WMError App::checkPolicy(unsigned req_num) 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 - WMError ret = g_app_list.setAction(req_num, add_name, add_role, add_area); + bool visible = true; + bool end_draw_finished = false; + WMAction split_action{ + add_name, + add_role, + add_area, + 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"); @@ -635,14 +644,23 @@ WMError App::checkPolicy(unsigned req_num) g_app_list.reqDump(); } } + else + { + HMI_SEQ_DEBUG(req_num, "split doesn't happen"); + } - // Set invisible task - this->setInvisibleTask(trigger.role, split); + // Set invisible task(Remove if policy manager finish) + ret = this->setInvisibleTask(trigger.role, split); + if(ret != WMError::SUCCESS) + { + HMI_SEQ_ERROR(req_num, "Failed to set invisible task: %s", errorDescription(ret)); + return ret; + } /* get new status from Policy Manager */ HMI_SEQ_NOTICE(req_num, "ATM, Policy manager does't exist, then set WMAction as is"); - ret = g_app_list.setAction(req_num, trigger.appid, trigger.role, req_area, is_activate); + ret = g_app_list.setAction(req_num, trigger.appid, trigger.role, req_area, trigger.task); g_app_list.reqDump(); return ret; @@ -694,12 +712,188 @@ WMError App::startTransition(unsigned req_num) return ret; } -void App::setInvisibleTask(const std::string &role, bool split) +WMError App::setInvisibleTask(const std::string &role, bool split) { - ; + unsigned req = g_app_list.currentRequestNumber(); + HMI_SEQ_DEBUG(req, "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; + bool visible = false; + bool end_draw_finished = true; + bool found = false; + + for (auto const &l : this->layers.mapping) + { + if (l.second.layer_id <= *layer_id) + { + continue; + } + 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, "Invisible %s", add_name.c_str()); + WMAction act{add_name, add_role, add_area, visible, end_draw_finished}; + g_app_list.setAction(req, 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, "Invisible %s", add_name.c_str()); + WMAction act{add_name, add_role, add_area, visible, end_draw_finished}; + g_app_list.setAction(req, 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) + { + this->try_layout( + state, LayoutState{*surface_id}, [&](LayoutState const &nl) { + HMI_DEBUG("wm", "Layout: %s", kNameLayoutNormal); + //this->surface_set_layout(*surface_id); + state = nl; + + //compositor::rect area_rect = this->area_info[*surface_id]; + }); + } + else + { + if (0 == strcmp(drawing_name, "HomeScreen")) + { + // Nothing To do + this->try_layout( + state, LayoutState{*surface_id}, [&](LayoutState const &nl) { + HMI_DEBUG("wm", "Layout: %s", kNameLayoutNormal); + }); + } + else + { + 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->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){ + HMI_SEQ_DEBUG(req, "sub surface ddoesn't exist"); + return WMError::NOT_REGISTERED; + } + deact_sub.visible = visible; + deact_sub.end_draw_finished = end_draw_finished; + HMI_SEQ_DEBUG(req, "sub surface ddoesn't exist"); + g_app_list.setAction(req, deact_sub); + } + } + state = nl; + + /* 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]; + // >>> HACK + HMI_WARNING("wm", "HACK!!! mediaplayer and hvac is only supported for split"); + std::string request_role = drawing_name; + //std::string request_app = transform(request_role.begin(), request_role.end(), request_role.begin(), tolower); //hvac or mediaplayer + std::string hack_appid = "navigation"; + std::string hack_role = main; + std::string hack_area = str_area_main; + //g_app_list.setAction(g_app_list.currentRequestNumber(), hack_appid, hack_role, hack_area, true); + // >>> HACK */ + }); + } + else + { + this->try_layout( + state, LayoutState{*surface_id}, [&](LayoutState const &nl) { + 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, "sub surface ddoesn't exist"); + return WMError::NOT_REGISTERED; + } + deact_main.visible = visible; + deact_main.end_draw_finished = end_draw_finished; + HMI_SEQ_DEBUG(req, "sub surface ddoesn't exist"); + g_app_list.setAction(req, 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, "sub surface ddoesn't exist"); + return WMError::NOT_REGISTERED; + } + deact_sub.visible = visible; + deact_sub.end_draw_finished = end_draw_finished; + HMI_SEQ_DEBUG(req, "sub surface ddoesn't exist"); + g_app_list.setAction(req, deact_sub); + } + } + state = nl; + }); + } + } + } + + return WMError::SUCCESS; } -void App::lm_layout_change(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); @@ -853,7 +1047,7 @@ void App::lm_layout_change(const char *drawing_name) } } } -} +} */ const char *App::check_surface_exist(const char *drawing_name) { @@ -1046,7 +1240,7 @@ void App::check_flushdraw(int surface_id) } } -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++) @@ -1060,7 +1254,7 @@ void App::lm_enddraw(const char *drawing_name) this->emit_flushdraw(drawing_name); } } -} +} */ WMError App::doEndDraw(unsigned req_num) { @@ -1112,6 +1306,8 @@ WMError App::doEndDraw(unsigned req_num) this->emit_flushdraw(act_flush.role.c_str()); } } + + return ret; } WMError App::setSurfaceSize(unsigned surface, const std::string &area) diff --git a/src/app.hpp b/src/app.hpp index 235cd01..e2f8d44 100644 --- a/src/app.hpp +++ b/src/app.hpp @@ -268,7 +268,7 @@ struct App WMError doTransition(unsigned sequence_number); WMError checkPolicy(unsigned req_num); WMError startTransition(unsigned req_num); - void setInvisibleTask(const std::string &role, bool split); + WMError setInvisibleTask(const std::string &role, bool split); WMError doEndDraw(unsigned req_num); WMError layoutChange(const WMAction &action); @@ -293,10 +293,10 @@ struct App // The following function is temporary. // Then will be removed when layermanager is finished - void lm_layout_change(const char *drawing_name); - WMError lm_layout_change(const struct WMAction &action); + //void lm_layout_change(const char *drawing_name); + //WMError lm_layout_change(const struct WMAction &action); WMError lm_release(const struct WMAction &action); - void lm_enddraw(const char *drawing_name); + //void lm_enddraw(const char *drawing_name); private: std::unordered_map area2size; -- cgit 1.2.3-korg From 6d805fcec8891d85c92936881f962af3deee324e Mon Sep 17 00:00:00 2001 From: Kazumasa Mitsunari Date: Sun, 17 Jun 2018 16:34:43 +0900 Subject: Remove comment out Change-Id: I4f707b7c8095e298c610ecb5ba74ae77636dd98c Signed-off-by: Kazumasa Mitsunari --- src/app.cpp | 286 ------------------------------------------------------------ src/app.hpp | 4 - 2 files changed, 290 deletions(-) (limited to 'src/app.hpp') diff --git a/src/app.cpp b/src/app.cpp index 414e1fb..2482d37 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -355,45 +355,6 @@ void App::surface_set_layout(int surface_id, optional sub_surface_id) 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); @@ -545,19 +506,6 @@ WMError App::lm_release(const struct WMAction &action) return WMError::SUCCESS; } -/* WMError App::lm_layout_change(const struct WMAction &action) -{ - const char *msg = this->check_surface_exist(action.role.c_str()); - - if (msg) - { - HMI_SEQ_DEBUG(g_app_list.currentRequestNumber(), msg); - return WMError::LAYOUT_CHANGE_FAIL; - } - this->lm_layout_change(action.role.c_str()); - return WMError::SUCCESS; -} */ - WMError App::doTransition(unsigned req_num) { HMI_SEQ_DEBUG(req_num, "check policy"); @@ -866,162 +814,6 @@ WMError App::setInvisibleTask(const std::string &role, bool split) return WMError::SUCCESS; } -/* 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); - auto o_state = *this->layers.get_layout_state(*surface_id); - struct LayoutState &state = *o_state; - - // 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; - if (l.second.state.main != -1) - { - this->deactivate(l.second.state.main); - l.second.state.main = -1; - flush = true; - } - - if (l.second.state.sub != -1) - { - this->deactivate(l.second.state.sub); - l.second.state.sub = -1; - flush = true; - } - - if (flush) - { - this->layout_commit(); - } - } - - 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); - }); - } - 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 - { - bool can_split = this->can_split(state, *surface_id); - - if (can_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) - { - if (state.sub != -1) - { - this->deactivate(state.sub); - } - } - 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]; - // >>> HACK - HMI_WARNING("wm", "HACK!!! mediaplayer and hvac is only supported for split"); - std::string request_role = drawing_name; - //std::string request_app = transform(request_role.begin(), request_role.end(), request_role.begin(), tolower); //hvac or mediaplayer - std::string hack_appid = "navigation"; - std::string hack_role = main; - std::string hack_area = str_area_main; - g_app_list.setAction(g_app_list.currentRequestNumber(), hack_appid, hack_role, hack_area, true); - //g_app_list.setEndDrawFinished(g_app_list.currentRequestNumber(), request_role, request_role); - //g_app_list.setEndDrawFinished(g_app_list.currentRequestNumber(), hack_appid, hack_role); // This process is illegal - // >>> HACK - 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(request_role.c_str(), 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); - }); - } - else - { - this->try_layout( - state, LayoutState{*surface_id}, [&](LayoutState const &nl) { - 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) - { - if (state.sub != *surface_id) - { - this->deactivate(state.sub); - } - } - 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); - }); - } - } - } -} */ - const char *App::check_surface_exist(const char *drawing_name) { auto const &surface_id = this->lookup_id(drawing_name); @@ -1213,22 +1005,6 @@ void App::check_flushdraw(int surface_id) } } -/* 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 n = this->lookup_name(this->pending_end_draw[i]); - if (n && *n == drawing_name) - { - 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); - } - } -} */ - WMError App::doEndDraw(unsigned req_num) { // get actions @@ -1244,10 +1020,6 @@ WMError App::doEndDraw(unsigned req_num) HMI_SEQ_INFO(req_num, "do endDraw"); // layout change and make it visible - // Temporary action - /* auto itr = actions.cend(); - this->currentAppInvisible(itr->role); */ - for (const auto &act : actions) { // layout change @@ -1285,26 +1057,6 @@ WMError App::doEndDraw(unsigned req_num) WMError App::setSurfaceSize(unsigned surface, const std::string &area) { - // Actually this function is under Layout Manager - /* compositor::rect size = this->lm.getAreaSize(area); // compositor::rect size = this->lm_.getAreaSize(area); - - if (!this->controller->surface_exists(surface)) - { - // Block until all pending request are processed by wayland display server - // because waiting for the surface of new app is created - this->display->roundtrip(); - } - auto &s = this->controller->surfaces[surface]; - s->set_destination_rectangle(size.x, size.y, size.w, size.h); - this->layout_commit(); - - // Update area information - this->area_info[surface].x = size.x; - this->area_info[surface].y = size.y; - this->area_info[surface].w = size.w; - this->area_info[surface].h = size.h; - HMI_DEBUG("wm", "Surface %d rect { %d, %d, %d, %d }", - surface, size.x, size.y, size.w, size.h); */ this->surface_set_layout(surface); return WMError::SUCCESS; @@ -1329,44 +1081,6 @@ WMError App::layoutChange(const WMAction &action) return ret; } -/* void App::currentAppInvisible(const std::string &role) -{ - 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; - - // 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; - if (l.second.state.main != -1) - { - this->deactivate(l.second.state.main); - l.second.state.main = -1; - flush = true; - } - - if (l.second.state.sub != -1) - { - this->deactivate(l.second.state.sub); - l.second.state.sub = -1; - flush = true; - } - - if (flush) - { - this->layout_commit(); - } - } -} */ - WMError App::visibilityChange(const WMAction &action) { auto client = g_app_list.lookUpClient(action.appid); diff --git a/src/app.hpp b/src/app.hpp index e2f8d44..74361a2 100644 --- a/src/app.hpp +++ b/src/app.hpp @@ -278,7 +278,6 @@ struct App void setTimer(); void stopTimer(); void processNextRequest(); - //void currentAppInvisible(const std::string &role); const char *check_surface_exist(const char *drawing_name); @@ -293,10 +292,7 @@ struct App // The following function is temporary. // Then will be removed when layermanager is finished - //void lm_layout_change(const char *drawing_name); - //WMError lm_layout_change(const struct WMAction &action); WMError lm_release(const struct WMAction &action); - //void lm_enddraw(const char *drawing_name); private: std::unordered_map area2size; -- cgit 1.2.3-korg From 5ae7f0df360a72a42b4722cbffddd169da21b4d0 Mon Sep 17 00:00:00 2001 From: Kazumasa Mitsunari Date: Sun, 17 Jun 2018 23:09:09 +0900 Subject: Add changeCurrentStatus function To set state in endDraw, Add change status function Change-Id: I547e382d108ce11371bbb07325fcefe97215775c Signed-off-by: Kazumasa Mitsunari --- src/app.cpp | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--- src/app.hpp | 4 +++- 2 files changed, 58 insertions(+), 4 deletions(-) (limited to 'src/app.hpp') diff --git a/src/app.cpp b/src/app.cpp index 2d82e95..f1c9ed3 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -1020,8 +1020,8 @@ WMError App::doEndDraw(unsigned req_num) } HMI_SEQ_INFO(req_num, "do endDraw"); - // layout change and make it visible + // layout change and make it visible for (const auto &act : actions) { // layout change @@ -1044,6 +1044,9 @@ WMError App::doEndDraw(unsigned req_num) //this->lm_enddraw(act.role.c_str()); } + // Change current state + this->changeCurrentState(req_num); + HMI_SEQ_INFO(req_num, "emit flushDraw"); for(const auto &act_flush : actions) @@ -1105,6 +1108,52 @@ WMError App::visibilityChange(const WMAction &action) return WMError::SUCCESS; } +WMError App::changeCurrentState(unsigned req_num) +{ + HMI_SEQ_DEBUG(req_num, "Change current layout status"); + bool found = false; + auto actions = g_app_list.getActions(req_num, &found); + if(!found) + { + HMI_SEQ_ERROR(req_num, "Action not found"); + return WMError::LAYOUT_CHANGE_FAIL; + } + + struct LayoutState state; + std::vector areas; + bool state_change = false; + + for(const auto &action : actions) + { + if(action.visible) + { + // visible == true -> layout changes + areas.push_back(action.area); + auto client = g_app_list.lookUpClient(action.appid); + if(action.area == "normal.full" || action.area == "split.main") + { + state.main = (int)client->surfaceID(action.role); + } + else if(action.role == "split.sub") + { + state.sub = (int)client->surfaceID(action.role); + } + state_change = true; + } + } + + if(state_change) + { + auto trigger = g_app_list.getRequest(req_num, &found); + auto client = g_app_list.lookUpClient(trigger.appid); + auto pCurState = *this->layers.get_layout_state((int)client->surfaceID(trigger.role)); + struct LayoutState &curState = *pCurState; + curState = state; + } + + return WMError::SUCCESS; +} + void App::api_enddraw(char const *appid, char const *drawing_name) { std::string id = appid; @@ -1440,8 +1489,11 @@ void App::activate(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) { diff --git a/src/app.hpp b/src/app.hpp index 74361a2..04caf12 100644 --- a/src/app.hpp +++ b/src/app.hpp @@ -274,8 +274,10 @@ struct App WMError layoutChange(const WMAction &action); WMError visibilityChange(const WMAction &action); WMError setSurfaceSize(unsigned surface, const std::string& area); + WMError changeCurrentState(unsigned req_num); - void setTimer(); + void + setTimer(); void stopTimer(); void processNextRequest(); -- cgit 1.2.3-korg From e3dd2dd3952bf3ba27858422b1800b31ef8e2ee0 Mon Sep 17 00:00:00 2001 From: Kazumasa Mitsunari Date: Mon, 18 Jun 2018 13:39:47 +0900 Subject: Bug Fix : Show split TODO: Couldn't return to Home when tap shortcut key Change-Id: I53399452b82c838fd034ef1c7eece1deecaa2701 Signed-off-by: Kazumasa Mitsunari --- src/app.cpp | 47 +++++++++++++++++++++++++++++++---------------- src/app.hpp | 2 +- 2 files changed, 32 insertions(+), 17 deletions(-) (limited to 'src/app.hpp') diff --git a/src/app.cpp b/src/app.cpp index 0976a19..6689148 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -319,7 +319,7 @@ int App::init_layers() return 0; } -void App::surface_set_layout(int surface_id, optional sub_surface_id) +void App::surface_set_layout(int surface_id, const std::string& area) { if (!this->controller->surface_exists(surface_id)) { @@ -338,7 +338,7 @@ void App::surface_set_layout(int surface_id, optional sub_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); auto &s = this->controller->surfaces[surface_id]; int x = rect.x; @@ -754,12 +754,12 @@ WMError App::setInvisibleTask(const std::string &role, bool split) deact_sub.appid = g_app_list.getAppID(state.sub, main, &found); if (!found) { - HMI_SEQ_DEBUG(req, "sub surface ddoesn't exist"); + HMI_SEQ_DEBUG(req, "sub surface doesn't exist"); return WMError::NOT_REGISTERED; } deact_sub.visible = task_visible; deact_sub.end_draw_finished = end_draw_finished; - HMI_SEQ_DEBUG(req, "sub surface ddoesn't exist"); + HMI_SEQ_DEBUG(req, "sub surface doesn't exist"); g_app_list.setAction(req, deact_sub); } } @@ -1062,7 +1062,7 @@ WMError App::doEndDraw(unsigned req_num) WMError App::setSurfaceSize(unsigned surface, const std::string &area) { - this->surface_set_layout(surface); + this->surface_set_layout(surface, area); return WMError::SUCCESS; } @@ -1089,6 +1089,10 @@ WMError App::layoutChange(const WMAction &action) 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) @@ -1111,13 +1115,10 @@ WMError App::visibilityChange(const WMAction &action) WMError App::changeCurrentState(unsigned req_num) { - HMI_SEQ_DEBUG(req_num, "Change current layout status"); + 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); - //auto client = g_app_list.lookUpClient(trigger.appid); - //auto pCurState = *this->layers.get_layout_state((int)client->surfaceID(trigger.role)); - //pCurState = state; if (!trigger_found || !action_found) { HMI_SEQ_ERROR(req_num, "Action not found"); @@ -1126,25 +1127,39 @@ WMError App::changeCurrentState(unsigned req_num) // Layout state reset struct LayoutState reset_state{-1, -1}; - HMI_SEQ_DEBUG(req_num."Reset layout state"); + 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(trigger.appid); auto pCurState = *this->layers.get_layout_state((int)client->surfaceID(trigger.role)); - *pCurState = reset_state; + if(pCurState == nullptr) + { + HMI_SEQ_ERROR(req_num, "Counldn't find current status"); + continue; + } + pCurState->main = reset_state.main; + pCurState->sub = reset_state.sub; } - for(const auto &action : actions) + 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(trigger.role)); - int surface = -1; - if(action.visible != TaskVisible::INVISIBLE) + auto pLayerCurState = *this->layers.get_layout_state((int)client->surfaceID(action.role)); + if (pLayerCurState == nullptr) { - surface = (int)client->surfaceID(action.role); + 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 state visible area : %s", action.role.c_str(), action.area.c_str()); // visible == true -> layout changes if(action.area == "normal.full" || action.area == "split.main") { diff --git a/src/app.hpp b/src/app.hpp index 04caf12..047436b 100644 --- a/src/app.hpp +++ b/src/app.hpp @@ -250,7 +250,7 @@ struct App int init_layers(); - void surface_set_layout(int surface_id, optional sub_surface_id = nullopt); + void surface_set_layout(int surface_id, const std::string& area = ""); void layout_commit(); // TMC WM Events to clients -- cgit 1.2.3-korg