From 875547362223909f750d4ab2f536735e5b344fc8 Mon Sep 17 00:00:00 2001 From: Marcus Fritzsch Date: Tue, 12 Sep 2017 11:29:37 +0200 Subject: [PATCH] App: single-method layout setup Signed-off-by: Marcus Fritzsch --- src/app.cpp | 105 +++++++++++++++++++----------------------------------------- src/app.hpp | 4 +-- 2 files changed, 35 insertions(+), 74 deletions(-) diff --git a/src/app.cpp b/src/app.cpp index cf7b6be..3751fd3 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -272,22 +272,20 @@ void redraw_fix(App *app, std::unique_ptr &s, int x, int y, } // namespace -void App::surface_set_layout_full(uint32_t surface_id) { +void App::surface_set_layout(int surface_id, optional sub_surface_id) { if (!this->controller->surface_exists(surface_id)) { - logerror("Surface %d does not exist", int(surface_id)); + logerror("Surface %d does not exist", surface_id); return; } auto o_layer_id = this->layers.get_layer_id(surface_id); if (!o_layer_id) { - logerror("Surface %d is not associated with any layer!", int(surface_id)); + logerror("Surface %d is not associated with any layer!", surface_id); return; } - uint32_t layer_id = o_layer_id.value(); - logdebug("surface_set_layout for surface %u on layer %u", surface_id, - layer_id); + uint32_t layer_id = *o_layer_id; auto const &layer = this->layers.get_layer(layer_id); auto rect = layer.value().rect; @@ -307,70 +305,40 @@ void App::surface_set_layout_full(uint32_t surface_id) { h = this->controller->output_size.h + 1 + h; } - // 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); + if (sub_surface_id) { + if (o_layer_id != this->layers.get_layer_id(*sub_surface_id)) { + logerror("surface_set_layout: layers of surfaces (%d and %d) don't match!", surface_id, *sub_surface_id); + return; + } - // redraw_fix(this, s, x, y, w, h); + int x_off = 0; + int y_off = 0; - logdebug("Surface %u now with rect { %d, %d, %d, %d }", surface_id, x, y, w, - h); -} + // split along major axis + if (w > h) { + w /= 2; + x_off = w; + } else { + h /= 2; + y_off = h; + } -void App::surface_set_layout_split(uint32_t surface_id, - uint32_t sub_surface_id) { - if (!this->controller->surface_exists(surface_id)) { - logerror("Surface %d does not exist", int(surface_id)); - return; - } + auto &ss = this->controller->surfaces[*sub_surface_id]; - auto o_layer_id = this->layers.get_layer_id(surface_id); + logdebug("surface_set_layout for sub surface %u on layer %u", *sub_surface_id, + layer_id); - if (!o_layer_id) { - logerror("Surface %d is not associated with any layer!", int(surface_id)); - return; + // 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); } - uint32_t layer_id = o_layer_id.value(); logdebug("surface_set_layout for surface %u on layer %u", surface_id, layer_id); - auto const &layer = this->layers.get_layer(layer_id); - auto rect = layer.value().rect; - auto &s = this->controller->surfaces[surface_id]; - auto &ss = this->controller->surfaces[sub_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; - } - - 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; - } - // configure surface to wxh dimensions s->set_configuration(w, h); // set source reactangle, even if we should not need to set it. @@ -378,13 +346,6 @@ void App::surface_set_layout_split(uint32_t surface_id, // set destination to the display rectangle s->set_destination_rectangle(x, y, w, h); - // 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); - // redraw_fix(this, s, x, y, w, h); // redraw_fix(this, ss, x+x_off, y+y_off, w, h); @@ -456,7 +417,7 @@ char const *App::api_activate_surface(char const *drawing_name) { if (state.main == -1) { this->emit_syncdraw(drawing_name); - this->surface_set_layout_full(*surface_id); + this->surface_set_layout(*surface_id); this->activate(*surface_id); state.main = *surface_id; state.sub = -1; @@ -473,7 +434,7 @@ char const *App::api_activate_surface(char const *drawing_name) { this->emit_syncdraw(drawing_name); this->emit_syncdraw(main.c_str()); - this->surface_set_layout_split(state.main, *surface_id); + this->surface_set_layout(state.main, surface_id); this->activate(*surface_id); state.sub = *surface_id; @@ -483,7 +444,7 @@ char const *App::api_activate_surface(char const *drawing_name) { } else { this->emit_syncdraw(drawing_name); - this->surface_set_layout_full(*surface_id); + this->surface_set_layout(*surface_id); this->deactivate(state.main); this->activate(*surface_id); this->deactivate(state.sub); @@ -539,7 +500,7 @@ char const *App::api_deactivate_surface(char const *drawing_name) { this->emit_syncdraw(sub.c_str()); this->deactivate(*surface_id); - this->surface_set_layout_full(state.sub); + this->surface_set_layout(state.sub); state.main = state.sub; state.sub = -1; state.s = LayoutState::Single; @@ -555,7 +516,7 @@ char const *App::api_deactivate_surface(char const *drawing_name) { this->deactivate(*surface_id); this->deactivate(*surface_id); - this->surface_set_layout_full(state.main); + this->surface_set_layout(state.main); state.sub = -1; state.s = LayoutState::Single; diff --git a/src/app.hpp b/src/app.hpp index 6e18855..c12654d 100644 --- a/src/app.hpp +++ b/src/app.hpp @@ -139,8 +139,6 @@ struct App { int dispatch_events(); int dispatch_pending_events(); - void surface_set_layout_full(uint32_t surface_id); - void surface_set_layout_split(uint32_t surface_id, uint32_t sub_surface_id); void set_pending_events(); result api_request_surface(char const *drawing_name); @@ -164,6 +162,8 @@ private: int init_layers(); + void surface_set_layout(int surface_id, optional sub_surface_id = nullopt); + // TMC WM Events to clients void emit_activated(char const *label); void emit_deactivated(char const *label); -- 2.16.6