X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fapp.cpp;h=414e1fb1ab34f7f0685f06c378cc05d5c8d261f1;hb=aae4a578e9c23a7418053fdc15599f0c19fc7f17;hp=39ccfa87d0e7d378e78baeb1901b192e61fed6fa;hpb=6aaba1066fe89f324d4bae67497f4035fe997d5f;p=apps%2Fagl-service-windowmanager.git diff --git a/src/app.cpp b/src/app.cpp index 39ccfa8..414e1fb 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -19,7 +19,7 @@ #include "layers.hpp" #include "layout.hpp" #include "util.hpp" -#include "wayland.hpp" +#include "wayland_ivi_wm.hpp" #include #include @@ -29,834 +29,1848 @@ #include #include -#include #include #include #include #include #include +#include "wm_client.hpp" +#include "applist.hpp" -namespace wm { +extern "C" +{ +#include +} + +namespace wm +{ + +const unsigned kTimeOut = 10000000UL; /* 10s */ + +/* DrawingArea name used by "{layout}.{area}" */ +const char kNameLayoutNormal[] = "normal"; +const char kNameLayoutSplit[] = "split"; +const char kNameAreaFull[] = "full"; +const char kNameAreaMain[] = "main"; +const char kNameAreaSub[] = "sub"; + +/* Key for json obejct */ +const char kKeyDrawingName[] = "drawing_name"; +const char kKeyDrawingArea[] = "drawing_area"; +const char kKeyDrawingRect[] = "drawing_rect"; +const char kKeyX[] = "x"; +const char kKeyY[] = "y"; +const char kKeyWidth[] = "width"; +const char kKeyHeight[] = "height"; +const char kKeyWidthPixel[] = "width_pixel"; +const char kKeyHeightPixel[] = "height_pixel"; +const char kKeyWidthMm[] = "width_mm"; +const char kKeyHeightMm[] = "height_mm"; + +static sd_event_source *g_timer_ev_src = nullptr; + +static AppList g_app_list; -namespace { +namespace +{ using nlohmann::json; -result file_to_json(char const *filename) { - json j; - std::ifstream i(filename); - if (i.fail()) { - HMI_DEBUG("wm", "Could not open config file, so use default layer information"); - j = default_layers_json; - } - else { - i >> j; - } +result file_to_json(char const *filename) +{ + json j; + std::ifstream i(filename); + if (i.fail()) + { + HMI_DEBUG("wm", "Could not open config file, so use default layer information"); + j = default_layers_json; + } + else + { + i >> j; + } + + return Ok(j); +} + +struct result load_layer_map(char const *filename) +{ + HMI_DEBUG("wm", "loading IDs from %s", filename); - return Ok(j); + auto j = file_to_json(filename); + if (j.is_err()) + { + return Err(j.unwrap_err()); + } + json jids = j.unwrap(); + + return to_layer_map(jids); } -struct result load_layer_map(char const *filename) { - HMI_DEBUG("wm", "loading IDs from %s", filename); +static int +processTimerHandler(sd_event_source *s, uint64_t usec, void *userdata) +{ + HMI_NOTICE("wm", "Time out occurs because the client replys endDraw slow, so revert the request"); + reinterpret_cast(userdata)->timerHandler(); + return 0; +} - auto j = file_to_json(filename); - if (j.is_err()) { - return Err(j.unwrap_err()); - } - json jids = j.unwrap(); +} // namespace - return to_layer_map(jids); +void App::timerHandler() +{ + 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(); } -} // namespace +void App::removeClient(const std::string &appid) +{ + HMI_DEBUG("wm", "Remove clinet %s from list", appid.c_str()); + g_app_list.removeClient(appid); +} +bool App::subscribeEventForApp(const std::string &appid, afb_req req, const std::string &evname) +{ + if(!g_app_list.contains(appid)){ + HMI_DEBUG("wm", "Client %s is not registered", appid.c_str()); + return false; + } + auto client = g_app_list.lookUpClient(appid); + return client->subscribe(req, evname); +} /** * App Impl */ App::App(wl::display *d) - : api{this}, - chooks{this}, - display{d}, - controller{}, - outputs(), - config(), - layers(), - id_alloc{}, - pending_events(false), - policy{} { - try { - { - auto l = load_layer_map( - this->config.get_string("layers.json").value().c_str()); - if (l.is_ok()) { - this->layers = l.unwrap(); - } else { - HMI_ERROR("wm", "%s", l.err().value()); - } - } - } catch (std::exception &e) { - HMI_ERROR("wm", "Loading of configuration failed: %s", e.what()); - } -} - -int App::init() { - if (!this->display->ok()) { - return -1; - } - - if (this->layers.mapping.empty()) { - HMI_ERROR("wm", "No surface -> layer mapping loaded"); - return -1; - } - - // Make afb event - for (int i=Event_Val_Min; i<=Event_Val_Max; i++) { - map_afb_event[kListEventName[i]] = afb_daemon_make_event(kListEventName[i]); - } - - this->display->add_global_handler( - "wl_output", [this](wl_registry *r, uint32_t name, uint32_t v) { - this->outputs.emplace_back(std::make_unique(r, name, v)); - }); - - this->display->add_global_handler( - "ivi_controller", [this](wl_registry *r, uint32_t name, uint32_t v) { - this->controller = - std::make_unique(r, name, v); - - // Init controller hooks - this->controller->chooks = &this->chooks; - - // This protocol needs the output, so lets just add our mapping here... - this->controller->add_proxy_to_id_mapping( - this->outputs.back()->proxy.get(), - wl_proxy_get_id(reinterpret_cast( - this->outputs.back()->proxy.get()))); - }); - - // First level objects - this->display->roundtrip(); - // Second level objects - this->display->roundtrip(); - // Third level objects - this->display->roundtrip(); - - return init_layers(); -} - -int App::dispatch_events() { - if (this->dispatch_events() == 0) { - return 0; - } - - int ret = this->display->dispatch(); - if (ret == -1) { - HMI_ERROR("wm", "wl_display_dipatch() returned error %d", - this->display->get_error()); - return -1; - } - this->display->flush(); - - return 0; -} - -int App::dispatch_pending_events() { - if (this->pop_pending_events()) { - this->display->dispatch_pending(); - return 0; - } - return -1; -} - -bool App::pop_pending_events() { - bool x{true}; - return this->pending_events.compare_exchange_strong( - x, false, std::memory_order_consume); -} - -void App::set_pending_events() { - this->pending_events.store(true, std::memory_order_release); -} - -optional App::lookup_id(char const *name) { - return this->id_alloc.lookup(std::string(name)); -} -optional App::lookup_name(int id) { - return this->id_alloc.lookup(id); + : chooks{this}, + display{d}, + controller{}, + outputs(), + config(), + layers(), + id_alloc{}, + pending_events(false), + policy{} +{ + try + { + { + auto l = load_layer_map( + this->config.get_string("layers.json").value().c_str()); + if (l.is_ok()) + { + this->layers = l.unwrap(); + } + else + { + HMI_ERROR("wm", "%s", l.err().value()); + } + } + } + catch (std::exception &e) + { + HMI_ERROR("wm", "Loading of configuration failed: %s", e.what()); + } +} + +int App::init() +{ + if (!this->display->ok()) + { + return -1; + } + + if (this->layers.mapping.empty()) + { + HMI_ERROR("wm", "No surface -> layer mapping loaded"); + return -1; + } + + // Make afb event + for (int i = Event_Val_Min; i <= Event_Val_Max; i++) + { + map_afb_event[kListEventName[i]] = afb_daemon_make_event(kListEventName[i]); + } + + this->display->add_global_handler( + "wl_output", [this](wl_registry *r, uint32_t name, uint32_t v) { + this->outputs.emplace_back(std::make_unique(r, name, v)); + }); + + this->display->add_global_handler( + "ivi_wm", [this](wl_registry *r, uint32_t name, uint32_t v) { + this->controller = + std::make_unique(r, name, v); + + // Init controller hooks + this->controller->chooks = &this->chooks; + + // This protocol needs the output, so lets just add our mapping here... + this->controller->add_proxy_to_id_mapping( + this->outputs.back()->proxy.get(), + wl_proxy_get_id(reinterpret_cast( + this->outputs.back()->proxy.get()))); + + // Create screen + this->controller->create_screen(this->outputs.back()->proxy.get()); + + // Set display to controller + this->controller->display = this->display; + }); + + // First level objects + this->display->roundtrip(); + // Second level objects + this->display->roundtrip(); + // Third level objects + this->display->roundtrip(); + + return init_layers(); +} + +int App::dispatch_pending_events() +{ + if (this->pop_pending_events()) + { + this->display->dispatch_pending(); + return 0; + } + return -1; +} + +bool App::pop_pending_events() +{ + bool x{true}; + return this->pending_events.compare_exchange_strong( + x, false, std::memory_order_consume); +} + +void App::set_pending_events() +{ + this->pending_events.store(true, std::memory_order_release); +} + +optional App::lookup_id(char const *name) +{ + return this->id_alloc.lookup(std::string(name)); +} +optional App::lookup_name(int id) +{ + return this->id_alloc.lookup(id); } /** * init_layers() */ -int App::init_layers() { - if (!this->controller) { - HMI_ERROR("wm", "ivi_controller global not available"); - return -1; - } - - if (this->outputs.empty()) { - HMI_ERROR("wm", "no output was set up!"); - return -1; - } - - auto &c = this->controller; - - auto &o = this->outputs.front(); - auto &s = c->screens.begin()->second; - auto &layers = c->layers; - - // Write output dimensions to ivi controller... - c->output_size = compositor::size{uint32_t(o->width), uint32_t(o->height)}; - c->physical_size = compositor::size{uint32_t(o->physical_width), - uint32_t(o->physical_height)}; - - // Clear scene - layers.clear(); - - // Clear screen - s->clear(); - - // Quick and dirty setup of layers - for (auto const &i : this->layers.mapping) { - c->layer_create(i.second.layer_id, o->width, o->height); - auto &l = layers[i.second.layer_id]; - l->set_destination_rectangle(0, 0, o->width, o->height); - l->set_visibility(1); - HMI_DEBUG("wm", "Setting up layer %s (%d) for surface role match \"%s\"", - i.second.name.c_str(), i.second.layer_id, i.second.role.c_str()); - } - - // Add layers to screen - s->set_render_order(this->layers.layers); - - this->layout_commit(); - - return 0; -} - -void App::surface_set_layout(int surface_id, optional sub_surface_id) { - if (!this->controller->surface_exists(surface_id)) { - HMI_ERROR("wm", "Surface %d does not exist", surface_id); - return; - } - - auto o_layer_id = this->layers.get_layer_id(surface_id); - - if (!o_layer_id) { - HMI_ERROR("wm", "Surface %d is not associated with any layer!", surface_id); - return; - } +int App::init_layers() +{ + if (!this->controller) + { + HMI_ERROR("wm", "ivi_controller global not available"); + return -1; + } + + if (this->outputs.empty()) + { + HMI_ERROR("wm", "no output was set up!"); + return -1; + } + + auto &c = this->controller; + + auto &o = this->outputs.front(); + auto &s = c->screens.begin()->second; + auto &layers = c->layers; + + // Write output dimensions to ivi controller... + c->output_size = compositor::size{uint32_t(o->width), uint32_t(o->height)}; + c->physical_size = compositor::size{uint32_t(o->physical_width), + uint32_t(o->physical_height)}; + + // Clear scene + layers.clear(); + + // Clear screen + s->clear(); + + // Quick and dirty setup of layers + for (auto const &i : this->layers.mapping) + { + c->layer_create(i.second.layer_id, o->width, o->height); + auto &l = layers[i.second.layer_id]; + l->set_destination_rectangle(0, 0, o->width, o->height); + l->set_visibility(1); + HMI_DEBUG("wm", "Setting up layer %s (%d) for surface role match \"%s\"", + i.second.name.c_str(), i.second.layer_id, i.second.role.c_str()); + } + + // Add layers to screen + s->set_render_order(this->layers.layers); + + this->layout_commit(); + + return 0; +} - uint32_t layer_id = *o_layer_id; - - auto const &layer = this->layers.get_layer(layer_id); - auto rect = layer.value().rect; - auto &s = this->controller->surfaces[surface_id]; +void App::surface_set_layout(int surface_id, optional sub_surface_id) +{ + if (!this->controller->surface_exists(surface_id)) + { + HMI_ERROR("wm", "Surface %d does not exist", surface_id); + return; + } + + auto o_layer_id = this->layers.get_layer_id(surface_id); + + if (!o_layer_id) + { + HMI_ERROR("wm", "Surface %d is not associated with any layer!", surface_id); + return; + } + + uint32_t layer_id = *o_layer_id; + + auto const &layer = this->layers.get_layer(layer_id); + auto rect = layer.value().rect; + auto &s = this->controller->surfaces[surface_id]; + + int x = rect.x; + int y = rect.y; + int w = rect.w; + int h = rect.h; + + // less-than-0 values refer to MAX + 1 - $VALUE + // e.g. MAX is either screen width or height + if (w < 0) + { + w = this->controller->output_size.w + 1 + w; + } + if (h < 0) + { + 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); + + // set destination to the display rectangle + s->set_destination_rectangle(x, y, w, h); + + // update area information + this->area_info[surface_id].x = x; + this->area_info[surface_id].y = y; + this->area_info[surface_id].w = w; + this->area_info[surface_id].h = h; + + HMI_DEBUG("wm", "Surface %u now on layer %u with rect { %d, %d, %d, %d }", + surface_id, layer_id, x, y, w, h); +} - int x = rect.x; - int y = rect.y; - int w = rect.w; - int h = rect.h; +void App::layout_commit() +{ + this->controller->commit_changes(); + this->display->flush(); +} - // less-than-0 values refer to MAX + 1 - $VALUE - // e.g. MAX is either screen width or height - if (w < 0) { - w = this->controller->output_size.w + 1 + w; - } - if (h < 0) { - h = this->controller->output_size.h + 1 + h; - } +void App::setTimer() +{ + 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(), &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(g_timer_ev_src, time(NULL) * (1000000UL) + kTimeOut); + sd_event_source_set_enabled(g_timer_ev_src, SD_EVENT_ONESHOT); + } +} - 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); - - // configure surface to wxh dimensions - ss->set_configuration(w, h); - // set source reactangle, even if we should not need to set it. - ss->set_source_rectangle(0, 0, w, h); - // set destination to the display rectangle - ss->set_destination_rectangle(x + x_off, y + y_off, w, h); +void App::stopTimer() +{ + 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(req_num, "Timer stop failed"); + } +} - 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); - - // configure surface to wxh dimensions - s->set_configuration(w, h); - // set source reactangle, even if we should not need to set it. - s->set_source_rectangle(0, 0, w, h); - - // set destination to the display rectangle - s->set_destination_rectangle(x, y, w, h); - - // update area information - this->area_info[surface_id].x = x; - this->area_info[surface_id].y = y; - this->area_info[surface_id].w = w; - this->area_info[surface_id].h = h; +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 = g_app_list.currentRequestNumber(); + 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; +} - HMI_DEBUG("wm", "Surface %u now on layer %u with rect { %d, %d, %d, %d }", - surface_id, layer_id, x, y, w, h); +/* 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"); + WMError ret = this->checkPolicy(req_num); + if (ret != WMError::SUCCESS) + { + return ret; + } + HMI_SEQ_DEBUG(req_num, "Start transition."); + ret = this->startTransition(req_num); + return ret; } -void App::layout_commit() { - this->controller->commit_changes(); - this->display->flush(); +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) + { + ret = WMError::NO_ENTRY; + return ret; + } + std::string req_area = trigger.area; + + // >>>> Compatible with current window manager until policy manager coming + if (trigger.task == Task::TASK_ALLOCATE) + { + HMI_SEQ_DEBUG(req_num, "Check split or not"); + const char *msg = this->check_surface_exist(trigger.role.c_str()); + + if (msg) + { + HMI_SEQ_ERROR(req_num, msg); + ret = WMError::LAYOUT_CHANGE_FAIL; + return ret; + } + + auto const &surface_id = this->lookup_id(trigger.role.c_str()); + auto o_state = *this->layers.get_layout_state(*surface_id); + struct LayoutState &state = *o_state; + + unsigned curernt_sid = state.main; + split = this->can_split(state, *surface_id); + + if (split) + { + HMI_SEQ_DEBUG(req_num, "Split happens"); + // Get current visible role + std::string add_role = this->lookup_name(state.main).value(); + // Set next area + std::string add_area = std::string(kNameLayoutSplit) + "." + std::string(kNameAreaMain); + // Change request area + req_area = std::string(kNameLayoutSplit) + "." + std::string(kNameAreaSub); + // 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 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"); + return ret; + } + g_app_list.reqDump(); + } + } + else + { + HMI_SEQ_DEBUG(req_num, "split doesn't happen"); + } + + // Set invisible task(Remove if policy manager finish) + ret = this->setInvisibleTask(trigger.role, split); + if(ret != WMError::SUCCESS) + { + 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, trigger.task); + g_app_list.reqDump(); + + return ret; } -char const *App::api_activate_surface(char const *drawing_name, char const *drawing_area) { - ST(); - - auto const &surface_id = this->lookup_id(drawing_name); - - if (!surface_id) { - return "Surface does not exist"; - } - - if (!this->controller->surface_exists(*surface_id)) { - return "Surface does not exist in controller!"; - } - - auto layer_id = this->layers.get_layer_id(*surface_id); - - if (!layer_id) { - return "Surface is not on any layer!"; - } - - auto o_state = *this->layers.get_layout_state(*surface_id); - - if (o_state == nullptr) { - return "Could not find layer for surface"; - } - - 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; - } +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; + } + + for (const auto &y : actions) + { + if (y.visible) + { + sync_draw_happen = true; + this->emit_syncdraw(y.role, y.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 (sync_draw_happen) + { + this->setTimer(); + } + else + { + // deactivate only, no syncDraw + // Make it deactivate here + for (const auto &z : actions) + { + if (g_app_list.contains(z.appid)) + { + auto client = g_app_list.lookUpClient(z.appid); + this->deactivate(client->surfaceID(z.role)); + } + } + ret = NO_LAYOUT_CHANGE; + } + return ret; +} - if (l.second.state.sub != -1) { - this->deactivate(l.second.state.sub); - l.second.state.sub = -1; - flush = true; - } +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) + { + HMI_DEBUG("wm", "Layout: %s", kNameLayoutNormal); + state = LayoutState{*surface_id}; + /* 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")) + { + if (split) + { + 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 = LayoutState{state.main, *surface_id}; + } + else + { + HMI_DEBUG("wm", "Layout: %s", kNameLayoutNormal); + + //this->surface_set_layout(*surface_id); + if (state.main != *surface_id) + { + // this->deactivate(state.main); + WMAction deact_main; + deact_main.role = std::move(*this->id_alloc.lookup(state.main)); + ; + deact_main.area = add_area; + deact_main.appid = g_app_list.getAppID(state.main, deact_main.role, &found); + if (!found) + { + HMI_SEQ_DEBUG(req, "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 doesn'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 = LayoutState{*surface_id}; + } + } + } - if (flush) { - this->layout_commit(); - } - } + return WMError::SUCCESS; +} - auto layer = this->layers.get_layer(*layer_id); +/* 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); + if (!surface_id) + { + //reply("Surface does not exist"); + return "Surface does not exist"; + } + + if (!this->controller->surface_exists(*surface_id)) + { + //reply("Surface does not exist in controller!"); + return "Surface does not exist in controller!"; + } + + auto layer_id = this->layers.get_layer_id(*surface_id); + + if (!layer_id) + { + //reply("Surface is not on any layer!"); + return "Surface is not on any layer!"; + } + + auto o_state = *this->layers.get_layout_state(*surface_id); + + if (o_state == nullptr) + { + //reply("Could not find layer for surface"); + return "Could not find layer for surface"; + } + + HMI_DEBUG("wm", "surface %d is detected", *surface_id); + return nullptr; + //reply(nullptr); +} - 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; +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)) + { + return WMError::NOT_REGISTERED; + } + + auto client = g_app_list.lookUpClient(appid); + + /* + * Queueing Phase + */ + 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", appid.c_str(), role.c_str(), area.c_str()); + return REQ_REJECTED; + } + + 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", appid.c_str(), role.c_str(), area.c_str()); + + return WMError::SUCCESS; +} - // Commit for configuraton - this->layout_commit(); +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 (req_num != g_app_list.currentRequestNumber()) + { + // Add request, then invoked after the previous task is finished + HMI_SEQ_DEBUG(req_num, "request is accepted"); + return; + } + + /* + * Do allocate tasks + */ + ret = this->doTransition(req_num); + + if (ret != WMError::SUCCESS) + { + //this->emit_error() + HMI_SEQ_ERROR(req_num, errorDescription(ret)); + g_app_list.removeRequest(req_num); + g_app_list.next(); + g_app_list.reqDump(); + } +} - if (!(layer->is_normal_layout_only)) { - // Wait for configuration listener - controller->is_configured = false; - while (!(controller->is_configured)) { - dispatch_pending_events(); - } - } +void App::api_deactivate_surface(char const *appid, char const *drawing_name, const reply_func &reply) +{ + ST(); + + /* + * Check Phase + */ + std::string id = appid; + std::string role = drawing_name; + std::string area = ""; //drawing_area; + + if (!g_app_list.contains(id)) + { + reply("app doesn't request 'requestSurface' yet"); + return; + } + auto client = g_app_list.lookUpClient(id); + + /* + * Queueing Phase + */ + unsigned current = g_app_list.currentRequestNumber(); + unsigned requested_num = g_app_list.getRequestNumber(id); + 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; + } + + WMRequest req = WMRequest(id, role, area, Task::TASK_RELEASE); + unsigned new_req = g_app_list.addAllocateRequest(req); + g_app_list.reqDump(); + + 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"); + return; + } + + /* + * Do allocate tasks + */ + WMError ret = this->doTransition(new_req); + + if (ret != WMError::SUCCESS) + { + HMI_SEQ_ERROR(new_req, errorDescription(ret)); + g_app_list.removeRequest(new_req); + g_app_list.next(); + //this->emit_error() + } +} - 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); +void App::enqueue_flushdraw(int surface_id) +{ + this->check_flushdraw(surface_id); + HMI_DEBUG("wm", "Enqueuing EndDraw for surface_id %d", surface_id); + this->pending_end_draw.push_back(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(); - - // Wait for configuration listener - controller->is_configured = false; - while (!(controller->is_configured)) { - dispatch_pending_events(); - } - - 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); - }); - } 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(); - - if (!(layer->is_normal_layout_only)) { - // Wait for configuration listener - controller->is_configured = false; - while (!(controller->is_configured)) { - dispatch_pending_events(); - } - } - - 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); - }); - } - } - } - - // no error - return nullptr; -} - -char const *App::api_deactivate_surface(char const *drawing_name) { - ST(); - auto const &surface_id = this->lookup_id(drawing_name); - - if (!surface_id) { - return "Surface does not exist"; - } - - if (*surface_id == this->layers.main_surface) { - return "Cannot deactivate main_surface"; - } - - auto o_state = *this->layers.get_layout_state(*surface_id); - - if (o_state == nullptr) { - return "Could not find layer for surface"; - } - - struct LayoutState &state = *o_state; - - if (state.main == -1) { - return "No surface active"; - } - - // 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); - return 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)); +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); + } +} + +/* 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 + bool found; + auto actions = g_app_list.getActions(req_num, &found); + WMError ret = WMError::SUCCESS; + if (!found) + { + 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()); + } + + HMI_SEQ_INFO(req_num, "emit flushDraw"); + + for(const auto &act_flush : actions) + { + if(act_flush.visible) + { + this->emit_flushdraw(act_flush.role.c_str()); + } + } + + return ret; +} - this->deactivate(*surface_id); - this->surface_set_layout(state.main); - state = nl; +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 (action.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(); - 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); - }); - } else { - return "Surface is not active"; - } - - return nullptr; -} - -void App::enqueue_flushdraw(int surface_id) { - this->check_flushdraw(surface_id); - HMI_DEBUG("wm", "Enqueuing EndDraw for surface_id %d", surface_id); - this->pending_end_draw.push_back(surface_id); -} - -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); - } -} - -char const *App::api_enddraw(char const *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->layout_commit(); - this->emit_flushdraw(drawing_name); - return nullptr; - } - } - return "No EndDraw pending for surface"; + } + } +} */ + +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; + unsigned current_req = g_app_list.currentRequestNumber(); + bool result = g_app_list.setEndDrawFinished(current_req, id, role); + + if (!result) + { + 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(); + WMError ret = this->doEndDraw(current_req); + + if(ret != WMError::SUCCESS) + { + //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_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(); } -/** - * proxied events - */ -void App::surface_created(uint32_t surface_id) { - auto layer_id = this->layers.get_layer_id(surface_id); - if (!layer_id) { - HMI_DEBUG("wm", "Newly created surfce %d is not associated with any layer!", - surface_id); - return; - } +void App::send_event(char const *evname, char const *label) +{ + HMI_DEBUG("wm", "%s: %s(%s)", __func__, evname, label); - HMI_DEBUG("wm", "surface_id is %u, layer_id is %u", surface_id, *layer_id); + json_object *j = json_object_new_object(); + json_object_object_add(j, kKeyDrawingName, json_object_new_string(label)); - this->controller->layers[*layer_id]->add_surface( - this->controller->surfaces[surface_id].get()); + int ret = afb_event_push(this->map_afb_event[evname], j); + if (ret != 0) + { + HMI_DEBUG("wm", "afb_event_push failed: %m"); + } +} + +void App::send_event(char const *evname, char const *label, char const *area, + int x, int y, int w, int h) +{ + HMI_DEBUG("wm", "%s: %s(%s, %s) x:%d y:%d w:%d h:%d", + __func__, evname, label, area, x, y, w, h); + + json_object *j_rect = json_object_new_object(); + json_object_object_add(j_rect, kKeyX, json_object_new_int(x)); + json_object_object_add(j_rect, kKeyY, json_object_new_int(y)); + json_object_object_add(j_rect, kKeyWidth, json_object_new_int(w)); + json_object_object_add(j_rect, kKeyHeight, json_object_new_int(h)); + + json_object *j = json_object_new_object(); + json_object_object_add(j, kKeyDrawingName, json_object_new_string(label)); + json_object_object_add(j, kKeyDrawingArea, json_object_new_string(area)); + json_object_object_add(j, kKeyDrawingRect, j_rect); + + int ret = afb_event_push(this->map_afb_event[evname], j); + if (ret != 0) + { + HMI_DEBUG("wm", "afb_event_push failed: %m"); + } +} - // activate the main_surface right away - /*if (surface_id == static_cast(this->layers.main_surface)) { +/** + * proxied events + */ +void App::surface_created(uint32_t surface_id) +{ + auto layer_id = this->layers.get_layer_id(surface_id); + if (!layer_id) + { + HMI_DEBUG("wm", "Newly created surfce %d is not associated with any layer!", + surface_id); + return; + } + + HMI_DEBUG("wm", "surface_id is %u, layer_id is %u", surface_id, *layer_id); + + this->controller->layers[*layer_id]->add_surface(surface_id); + this->layout_commit(); + // activate the main_surface right away + /*if (surface_id == static_cast(this->layers.main_surface)) { HMI_DEBUG("wm", "Activating main_surface (%d)", surface_id); 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); +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) { - this->api_deactivate_surface(drawing_name->c_str()); - } - } + g_app_list.removeSurface(surface_id); +} - this->id_alloc.remove_id(surface_id); - this->layers.remove_surface(surface_id); +void App::emit_activated(char const *label) +{ + this->send_event(kListEventName[Event_Active], label); } -void App::emit_activated(char const *label) { - this->api.send_event(kListEventName[Event_Active], label); +void App::emit_deactivated(char const *label) +{ + this->send_event(kListEventName[Event_Inactive], label); } -void App::emit_deactivated(char const *label) { - this->api.send_event(kListEventName[Event_Inactive], label); +void App::emit_syncdraw(char const *label, char const *area, int x, int y, int w, int h) +{ + this->send_event(kListEventName[Event_SyncDraw], label, area, x, y, w, h); } -void App::emit_syncdraw(char const *label, char const *area, int x, int y, int w, int h) { - this->api.send_event(kListEventName[Event_SyncDraw], label, area, x, y, w, h); +void App::emit_syncdraw(const std::string &role, const std::string &area) +{ + int x = 0, y = 0, w = 0, h = 0; + //this->lm_get_area_info(area, &x, &y, &w, &h); + this->send_event(kListEventName[Event_SyncDraw], + role.c_str(), area.c_str(), x, y, w, h); } -void App::emit_flushdraw(char const *label) { - this->api.send_event(kListEventName[Event_FlushDraw], label); +void App::emit_flushdraw(char const *label) +{ + this->send_event(kListEventName[Event_FlushDraw], label); } -void App::emit_visible(char const *label, bool is_visible) { - this->api.send_event(is_visible ? kListEventName[Event_Visible] : kListEventName[Event_Invisible], label); +void App::emit_visible(char const *label, bool is_visible) +{ + this->send_event(is_visible ? kListEventName[Event_Visible] : kListEventName[Event_Invisible], label); } -void App::emit_invisible(char const *label) { - return emit_visible(label, false); +void App::emit_invisible(char const *label) +{ + return emit_visible(label, false); } void App::emit_visible(char const *label) { return emit_visible(label, true); } -result App::api_request_surface(char const *drawing_name) { - auto lid = this->layers.get_layer_id(std::string(drawing_name)); - if (!lid) { - // TODO: Do we need to put these applications on the App layer? - return Err("Drawing name does not match any role"); - } - - auto rname = this->lookup_id(drawing_name); - if (!rname) { - // name does not exist yet, allocate surface id... - auto id = int(this->id_alloc.generate_id(drawing_name)); - this->layers.add_surface(id, *lid); - - // set the main_surface[_name] here and now - if (!this->layers.main_surface_name.empty() && - this->layers.main_surface_name == drawing_name) { - this->layers.main_surface = id; - HMI_DEBUG("wm", "Set main_surface id to %u", id); - } - - return Ok(id); - } - - // Check currently registered drawing names if it is already there. - return Err("Surface already present"); -} - -result App::api_get_display_info() { - // Check controller - if (!this->controller) { - return Err("ivi_controller global not available"); - } - - // Set display info - compositor::size o_size = this->controller->output_size; - compositor::size p_size = this->controller->physical_size; - - json_object *object = json_object_new_object(); - json_object_object_add(object, kKeyWidthPixel, json_object_new_int(o_size.w)); - json_object_object_add(object, kKeyHeightPixel, json_object_new_int(o_size.h)); - json_object_object_add(object, kKeyWidthMm, json_object_new_int(p_size.w)); - json_object_object_add(object, kKeyHeightMm, json_object_new_int(p_size.h)); - - return Ok(object); -} - -result App::api_get_area_info(char const *drawing_name) { - HMI_DEBUG("wm", "called"); - - // Check drawing name, surface/layer id - auto const &surface_id = this->lookup_id(drawing_name); - if (!surface_id) { - return Err("Surface does not exist"); - } - - if (!this->controller->surface_exists(*surface_id)) { - return Err("Surface does not exist in controller!"); - } - - auto layer_id = this->layers.get_layer_id(*surface_id); - if (!layer_id) { - return Err("Surface is not on any layer!"); - } - - auto o_state = *this->layers.get_layout_state(*surface_id); - if (o_state == nullptr) { - return Err("Could not find layer for surface"); - } - - struct LayoutState &state = *o_state; - if ((state.main != *surface_id) && (state.sub != *surface_id)) { - return Err("Surface is inactive"); - } - - // Set area rectangle - compositor::rect area_info = this->area_info[*surface_id]; - json_object *object = json_object_new_object(); - json_object_object_add(object, kKeyX, json_object_new_int(area_info.x)); - json_object_object_add(object, kKeyY, json_object_new_int(area_info.y)); - json_object_object_add(object, kKeyWidth, json_object_new_int(area_info.w)); - json_object_object_add(object, kKeyHeight, json_object_new_int(area_info.h)); - - return Ok(object); -} - -void App::activate(int id) { - auto ip = this->controller->sprops.find(id); - if (ip != this->controller->sprops.end()) { - this->controller->surfaces[id]->set_visibility(0); - this->layout_commit(); - this->controller->surfaces[id]->set_visibility(1); - char const *label = - this->lookup_name(id).value_or("unknown-name").c_str(); - this->emit_visible(label); - this->emit_activated(label); - } -} - -void App::deactivate(int id) { - auto ip = this->controller->sprops.find(id); - if (ip != this->controller->sprops.end() && ip->second.visibility != 0) { - this->controller->surfaces[id]->set_visibility(0); - char const *label = - this->lookup_name(id).value_or("unknown-name").c_str(); - this->emit_deactivated(label); - this->emit_invisible(label); - } -} - -void App::deactivate_main_surface() { - this->layers.main_surface = -1; - this->api_deactivate_surface(this->layers.main_surface_name.c_str()); -} - -bool App::can_split(struct LayoutState const &state, int new_id) { - if (state.main != -1 && state.main != new_id) { - auto new_id_layer = this->layers.get_layer_id(new_id).value(); - auto current_id_layer = this->layers.get_layer_id(state.main).value(); - - // surfaces are on separate layers, don't bother. - if (new_id_layer != current_id_layer) { - return false; - } - - std::string const &new_id_str = this->lookup_name(new_id).value(); - std::string const &cur_id_str = this->lookup_name(state.main).value(); - - auto const &layer = this->layers.get_layer(new_id_layer); - - HMI_DEBUG("wm", "layer info name: %s", layer->name.c_str()); - - if (layer->layouts.empty()) { - return false; - } - - for (auto i = layer->layouts.cbegin(); i != layer->layouts.cend(); i++) { - HMI_DEBUG("wm", "%d main_match '%s'", new_id_layer, i->main_match.c_str()); - auto rem = std::regex(i->main_match); - if (std::regex_match(cur_id_str, rem)) { - // build the second one only if the first already matched - HMI_DEBUG("wm", "%d sub_match '%s'", new_id_layer, i->sub_match.c_str()); - auto res = std::regex(i->sub_match); - if (std::regex_match(new_id_str, res)) { - HMI_DEBUG("wm", "layout matched!"); - return true; +result App::api_request_surface(char const *appid, char const *drawing_name) +{ + auto lid = this->layers.get_layer_id(std::string(drawing_name)); + if (!lid) + { + /** + * register drawing_name as fallback and make it displayed. + */ + lid = this->layers.get_layer_id(std::string("Fallback")); + HMI_DEBUG("wm", "%s is not registered in layers.json, then fallback as normal app", drawing_name); + if (!lid) + { + return Err("Drawing name does not match any role, Fallback is disabled"); + } + } + + auto rname = this->lookup_id(drawing_name); + if (!rname) + { + // name does not exist yet, allocate surface id... + auto id = int(this->id_alloc.generate_id(drawing_name)); + this->layers.add_surface(id, *lid); + + // set the main_surface[_name] here and now + if (!this->layers.main_surface_name.empty() && + this->layers.main_surface_name == drawing_name) + { + this->layers.main_surface = id; + HMI_DEBUG("wm", "Set main_surface id to %u", id); + } + + // add client into the db + std::string appid_str(appid); + std::string role(drawing_name); + //g_app_list.addClient(appid_str, role); + g_app_list.addClient(appid_str, *lid, id, role); + + return Ok(id); + } + + // Check currently registered drawing names if it is already there. + return Err("Surface already present"); +} + +char const *App::api_request_surface(char const *appid, char const *drawing_name, + char const *ivi_id) +{ + ST(); + + auto lid = this->layers.get_layer_id(std::string(drawing_name)); + unsigned sid = std::stol(ivi_id); + + if (!lid) + { + /** + * register drawing_name as fallback and make it displayed. + */ + lid = this->layers.get_layer_id(std::string("Fallback")); + HMI_DEBUG("wm", "%s is not registered in layers.json, then fallback as normal app", drawing_name); + if (!lid) + { + return "Drawing name does not match any role, Fallback is disabled"; + } + } + + auto rname = this->lookup_id(drawing_name); + + if (rname) + { + return "Surface already present"; + } + + // register pair drawing_name and ivi_id + this->id_alloc.register_name_id(drawing_name, sid); + this->layers.add_surface(sid, *lid); + + // this surface is already created + HMI_DEBUG("wm", "surface_id is %u, layer_id is %u", sid, *lid); + + this->controller->layers[*lid]->add_surface(sid); + this->layout_commit(); + + return nullptr; +} + +result App::api_get_display_info() +{ + // Check controller + if (!this->controller) + { + return Err("ivi_controller global not available"); + } + + // Set display info + compositor::size o_size = this->controller->output_size; + compositor::size p_size = this->controller->physical_size; + + json_object *object = json_object_new_object(); + json_object_object_add(object, kKeyWidthPixel, json_object_new_int(o_size.w)); + json_object_object_add(object, kKeyHeightPixel, json_object_new_int(o_size.h)); + json_object_object_add(object, kKeyWidthMm, json_object_new_int(p_size.w)); + json_object_object_add(object, kKeyHeightMm, json_object_new_int(p_size.h)); + + return Ok(object); +} + +result App::api_get_area_info(char const *drawing_name) +{ + HMI_DEBUG("wm", "called"); + + // Check drawing name, surface/layer id + auto const &surface_id = this->lookup_id(drawing_name); + if (!surface_id) + { + return Err("Surface does not exist"); + } + + if (!this->controller->surface_exists(*surface_id)) + { + return Err("Surface does not exist in controller!"); + } + + auto layer_id = this->layers.get_layer_id(*surface_id); + if (!layer_id) + { + return Err("Surface is not on any layer!"); + } + + auto o_state = *this->layers.get_layout_state(*surface_id); + if (o_state == nullptr) + { + return Err("Could not find layer for surface"); + } + + struct LayoutState &state = *o_state; + if ((state.main != *surface_id) && (state.sub != *surface_id)) + { + return Err("Surface is inactive"); + } + + // Set area rectangle + compositor::rect area_info = this->area_info[*surface_id]; + json_object *object = json_object_new_object(); + json_object_object_add(object, kKeyX, json_object_new_int(area_info.x)); + json_object_object_add(object, kKeyY, json_object_new_int(area_info.y)); + json_object_object_add(object, kKeyWidth, json_object_new_int(area_info.w)); + json_object_object_add(object, kKeyHeight, json_object_new_int(area_info.h)); + + return Ok(object); +} + +void App::activate(int id) +{ + auto ip = this->controller->sprops.find(id); + if (ip != this->controller->sprops.end()) + { + this->controller->surfaces[id]->set_visibility(1); + 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 (auto i = surface_bg.begin(); i != surface_bg.end(); ++i) + { + if (id == *i) + { + // Remove id + this->surface_bg.erase(i); + + // Remove from BG layer (999) + HMI_DEBUG("wm", "Remove %s(%d) from BG layer", label, id); + this->controller->layers[999]->remove_surface(id); + + // Add to FG layer (1001) + HMI_DEBUG("wm", "Add %s(%d) to FG layer", label, id); + this->controller->layers[1001]->add_surface(id); + + for (int j : this->surface_bg) + { + HMI_DEBUG("wm", "Stored id:%d", j); + } + break; + } + } + } + // <<< FOR CES DEMO + this->layout_commit(); + + this->emit_visible(label); + this->emit_activated(label); + } +} + +void App::deactivate(int id) +{ + auto ip = this->controller->sprops.find(id); + if (ip != this->controller->sprops.end()) + { + 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"))) + { + + // Store id + this->surface_bg.push_back(id); + + // Remove from FG layer (1001) + HMI_DEBUG("wm", "Remove %s(%d) from FG layer", label, id); + this->controller->layers[1001]->remove_surface(id); + + // Add to BG layer (999) + HMI_DEBUG("wm", "Add %s(%d) to BG layer", label, id); + this->controller->layers[999]->add_surface(id); + + for (int j : surface_bg) + { + HMI_DEBUG("wm", "Stored id:%d", j); + } + } + else + { + this->controller->surfaces[id]->set_visibility(0); + } + // <<< FOR CES DEMO + + this->emit_deactivated(label); + this->emit_invisible(label); + } +} + +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) + { + auto new_id_layer = this->layers.get_layer_id(new_id).value(); + auto current_id_layer = this->layers.get_layer_id(state.main).value(); + + // surfaces are on separate layers, don't bother. + if (new_id_layer != current_id_layer) + { + return false; + } + + std::string const &new_id_str = this->lookup_name(new_id).value(); + std::string const &cur_id_str = this->lookup_name(state.main).value(); + + auto const &layer = this->layers.get_layer(new_id_layer); + + HMI_DEBUG("wm", "layer info name: %s", layer->name.c_str()); + + if (layer->layouts.empty()) + { + return false; + } + + for (auto i = layer->layouts.cbegin(); i != layer->layouts.cend(); i++) + { + HMI_DEBUG("wm", "%d main_match '%s'", new_id_layer, i->main_match.c_str()); + auto rem = std::regex(i->main_match); + if (std::regex_match(cur_id_str, rem)) + { + // build the second one only if the first already matched + HMI_DEBUG("wm", "%d sub_match '%s'", new_id_layer, i->sub_match.c_str()); + auto res = std::regex(i->sub_match); + if (std::regex_match(new_id_str, res)) + { + HMI_DEBUG("wm", "layout matched!"); + return true; + } } - } - } - } + } + } - return false; + return false; } void App::try_layout(struct LayoutState & /*state*/, struct LayoutState const &new_layout, - std::function apply) { - if (this->policy.layout_is_valid(new_layout)) { - apply(new_layout); - } + std::function apply) +{ + if (this->policy.layout_is_valid(new_layout)) + { + apply(new_layout); + } } /** * controller_hooks */ -void controller_hooks::surface_created(uint32_t surface_id) { - this->app->surface_created(surface_id); +void controller_hooks::surface_created(uint32_t surface_id) +{ + this->app->surface_created(surface_id); } -void controller_hooks::surface_removed(uint32_t surface_id) { - this->app->surface_removed(surface_id); +void controller_hooks::surface_removed(uint32_t surface_id) +{ + this->app->surface_removed(surface_id); } void controller_hooks::surface_visibility(uint32_t /*surface_id*/, @@ -868,4 +1882,4 @@ void controller_hooks::surface_destination_rectangle(uint32_t /*surface_id*/, uint32_t /*w*/, uint32_t /*h*/) {} -} // namespace wm +} // namespace wm