diff options
| -rw-r--r-- | src/app.cpp | 207 |
1 files changed, 111 insertions, 96 deletions
diff --git a/src/app.cpp b/src/app.cpp index c6e342d..20b80ae 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -438,6 +438,97 @@ void App::stop_timer(){ bool App::lm_release(const struct WMAction &action) { + //auto const &surface_id = this->lookup_id(drawing_name); + unsigned req_num = app_list.currentSequenceNumber(); + auto const &surface_id = this->lookup_id(action.appid.c_str()); + if (!surface_id) + { + HMI_SEQ_ERROR(req_num, "Surface does not exist"); + return false; + } + + if (*surface_id == this->layers.main_surface) + { + HMI_SEQ_ERROR(req_num, "Cannot deactivate main_surface"); + return false; + } + + 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 false; + } + + struct LayoutState &state = *o_state; + + if (state.main == -1) + { + HMI_SEQ_ERROR(req_num, "No surface active"); + return false; + } + + // 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; + } + + 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 true; } @@ -495,14 +586,20 @@ bool App::do_transition(unsigned req_num) return ret; } - /*client->emit_syncdraw(role); */ - // layer manager task + bool sync_draw_happen = false; for (const auto &y : app_list.getActions(req_num)) { - // do_task(y); but current we can't do this + /* + 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){ HMI_SEQ_ERROR(req_num, "Failed layout change: %s", y.appid.c_str()); @@ -510,6 +607,7 @@ bool App::do_transition(unsigned 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); @@ -520,14 +618,16 @@ bool App::do_transition(unsigned req_num) break; // TODO: if transition fails, what should we do? } + /* app_list.lookUpClient(y.appid)->emit_invisible(y.role, y.area); */ } } - if (ret) { - this->set_timer(); - } else { + if(!ret){ //this->emit_error(request_seq, 0 /*error_num*/, "error happens"); // test } + if (ret && sync_draw_happen){ + this->set_timer(); + } return ret; } @@ -803,108 +903,23 @@ void App::api_deactivate_surface(char const *appid, char const *drawing_name, co 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_transition(new_req); - - auto const &surface_id = this->lookup_id(drawing_name); - if (!surface_id) - { - 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; + bool ret = this->do_transition(new_req); - 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) + if (!ret) { - 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, "failed to do_transition"); + //this->emit_error() } } |