X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fapp.cpp;h=39ccfa87d0e7d378e78baeb1901b192e61fed6fa;hb=6aaba1066fe89f324d4bae67497f4035fe997d5f;hp=4de7b03a56f9a15b2f9ca8b0faf93d057953047f;hpb=860d9537b74f6fe406d21d3da753a3d09b995557;p=apps%2Fagl-service-windowmanager-2017.git diff --git a/src/app.cpp b/src/app.cpp index 4de7b03..39ccfa8 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Mentor Graphics Development (Deutschland) GmbH + * Copyright (c) 2017 TOYOTA MOTOR CORPORATION * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -44,12 +44,16 @@ namespace { using nlohmann::json; result file_to_json(char const *filename) { + json j; std::ifstream i(filename); if (i.fail()) { - return Err("Could not open config file"); + HMI_DEBUG("wm", "Could not open config file, so use default layer information"); + j = default_layers_json; } - json j; - i >> j; + else { + i >> j; + } + return Ok(j); } @@ -120,7 +124,7 @@ int App::init() { 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); + std::make_unique(r, name, v); // Init controller hooks this->controller->chooks = &this->chooks; @@ -204,7 +208,9 @@ int App::init_layers() { auto &layers = c->layers; // Write output dimensions to ivi controller... - c->output_size = genivi::size{uint32_t(o->width), uint32_t(o->height)}; + 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(); @@ -295,6 +301,10 @@ void App::surface_set_layout(int surface_id, optional sub_surface_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, @@ -308,6 +318,12 @@ void App::surface_set_layout(int surface_id, optional sub_surface_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); } @@ -319,6 +335,7 @@ void App::layout_commit() { 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) { @@ -367,59 +384,120 @@ char const *App::api_activate_surface(char const *drawing_name, char const *draw } } - if (state.main == *surface_id || state.sub == *surface_id) { - return "Surface already active"; - } + 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(); + + 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); - this->emit_syncdraw(drawing_name, str_area.c_str()); + 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 (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 != -1) { - this->deactivate(state.sub); + 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); - this->emit_syncdraw(main.c_str(), str_area_main.c_str()); - this->emit_syncdraw(drawing_name, str_area_sub.c_str()); + 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); - this->deactivate(state.main); + if (state.main != *surface_id) { + this->deactivate(state.main); + } if (state.sub != -1) { - this->deactivate(state.sub); + 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); - this->emit_syncdraw(drawing_name, str_area.c_str()); + 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 @@ -450,8 +528,7 @@ char const *App::api_deactivate_surface(char const *drawing_name) { return "No surface active"; } - // XXX: check against main_surface, main_surface_name is the configuration - // item. + // 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; @@ -469,7 +546,9 @@ char const *App::api_deactivate_surface(char const *drawing_name) { this->layout_commit(); std::string str_area = std::string(kNameLayoutNormal) + "." + std::string(kNameAreaFull); - this->emit_syncdraw(sub.c_str(), str_area.c_str()); + 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 { @@ -490,7 +569,9 @@ char const *App::api_deactivate_surface(char const *drawing_name) { this->layout_commit(); std::string str_area = std::string(kNameLayoutNormal) + "." + std::string(kNameAreaFull); - this->emit_syncdraw(main.c_str(), str_area.c_str()); + 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 { @@ -526,7 +607,6 @@ char const *App::api_enddraw(char const *drawing_name) { 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); - // XXX: Please tell the compositor to thaw the surface... this->activate(this->pending_end_draw[i]); this->layout_commit(); this->emit_flushdraw(drawing_name); @@ -589,8 +669,8 @@ 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) { - this->api.send_event(kListEventName[Event_SyncDraw], label, area); +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_flushdraw(char const *label) { @@ -634,9 +714,69 @@ result App::api_request_surface(char const *drawing_name) { 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() && ip->second.visibility == 0) { + 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();