From 9f9abc58011121722a82759124d061a645cee112 Mon Sep 17 00:00:00 2001 From: Tadao Tanikawa Date: Mon, 11 Dec 2017 20:39:21 +0900 Subject: Revert "Add APIs which can get information of display and area" This reverts commit 6aaba1066fe89f324d4bae67497f4035fe997d5f. To fix double posts to Gerrit Review and repository directly. Signed-off-by: Tadao Tanikawa --- src/app.cpp | 106 ++++++------------------------------------------------------ 1 file changed, 10 insertions(+), 96 deletions(-) (limited to 'src/app.cpp') diff --git a/src/app.cpp b/src/app.cpp index 39ccfa8..307217e 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -209,8 +209,6 @@ int App::init_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(); @@ -301,10 +299,6 @@ 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, @@ -318,12 +312,6 @@ 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); } @@ -405,9 +393,7 @@ char const *App::api_activate_surface(char const *drawing_name, char const *draw } 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->emit_syncdraw(drawing_name, str_area.c_str()); this->enqueue_flushdraw(state.main); }); } else { @@ -416,9 +402,7 @@ char const *App::api_activate_surface(char const *drawing_name, char const *draw 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->emit_syncdraw(drawing_name, str_area.c_str()); this->enqueue_flushdraw(state.main); }); } else { @@ -441,7 +425,7 @@ char const *App::api_activate_surface(char const *drawing_name, char const *draw } state = nl; - // Commit for configuration and visibility(0) + // Commit for configuraton and visibility(0) this->layout_commit(); // Wait for configuration listener @@ -452,14 +436,8 @@ char const *App::api_activate_surface(char const *drawing_name, char const *draw 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->emit_syncdraw(main.c_str(), str_area_main.c_str()); + this->emit_syncdraw(drawing_name, str_area_sub.c_str()); this->enqueue_flushdraw(state.main); this->enqueue_flushdraw(state.sub); }); @@ -491,9 +469,7 @@ char const *App::api_activate_surface(char const *drawing_name, char const *draw } 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->emit_syncdraw(drawing_name, str_area.c_str()); this->enqueue_flushdraw(state.main); }); } @@ -546,9 +522,7 @@ char const *App::api_deactivate_surface(char const *drawing_name) { 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->emit_syncdraw(sub.c_str(), str_area.c_str()); this->enqueue_flushdraw(state.sub); }); } else { @@ -569,9 +543,7 @@ char const *App::api_deactivate_surface(char const *drawing_name) { 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->emit_syncdraw(main.c_str(), str_area.c_str()); this->enqueue_flushdraw(state.main); }); } else { @@ -669,8 +641,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, 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(char const *label, char const *area) { + this->api.send_event(kListEventName[Event_SyncDraw], label, area); } void App::emit_flushdraw(char const *label) { @@ -714,64 +686,6 @@ 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()) { -- cgit 1.2.3-korg