From 6ff7c5273659061ec4ff2f6c79c69af2d4d165a5 Mon Sep 17 00:00:00 2001 From: Brian Ashworth Date: Mon, 14 May 2018 00:20:34 -0400 Subject: [PATCH 1/3] Fix titles and detect edges for hide_edge_borders --- include/sway/tree/view.h | 4 ++ sway/desktop/output.c | 111 +++++++++++++++++++-------------------- sway/tree/view.c | 83 ++++++++++++++--------------- 3 files changed, 96 insertions(+), 102 deletions(-) diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h index 8091fe0c..de431c89 100644 --- a/include/sway/tree/view.h +++ b/include/sway/tree/view.h @@ -51,6 +51,10 @@ struct sway_view { char *title_format; enum sway_container_border border; int border_thickness; + bool border_top; + bool border_bottom; + bool border_left; + bool border_right; union { struct wlr_xdg_surface_v6 *wlr_xdg_surface_v6; diff --git a/sway/desktop/output.c b/sway/desktop/output.c index 974cd56c..705e542a 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c @@ -322,15 +322,7 @@ static void render_container_simple_border_normal(struct sway_output *output, struct wlr_box box; float color[4]; - int other_views = 1; - if (config->hide_edge_borders == E_SMART) { - struct sway_container *ws = container_parent(con, C_WORKSPACE); - other_views = container_count_descendants_of_type(ws, C_VIEW) - 1; - } - - if (config->hide_edge_borders != E_VERTICAL - && config->hide_edge_borders != E_BOTH - && (config->hide_edge_borders != E_SMART || other_views)) { + if (con->sway_view->border_left) { // Child border - left edge memcpy(&color, colors->child_border, sizeof(float) * 4); color[3] *= con->alpha; @@ -339,7 +331,9 @@ static void render_container_simple_border_normal(struct sway_output *output, box.width = con->sway_view->border_thickness; box.height = con->height - 1; render_rect(output->wlr_output, output_damage, &box, color); + } + if (con->sway_view->border_right) { // Child border - right edge if (con->parent->children->length == 1 && con->parent->layout == L_HORIZ) { @@ -355,9 +349,7 @@ static void render_container_simple_border_normal(struct sway_output *output, render_rect(output->wlr_output, output_damage, &box, color); } - if (config->hide_edge_borders != E_HORIZONTAL - && config->hide_edge_borders != E_BOTH - && (config->hide_edge_borders != E_SMART || other_views)) { + if (con->sway_view->border_bottom) { // Child border - bottom edge if (con->parent->children->length == 1 && con->parent->layout == L_VERT) { @@ -371,7 +363,9 @@ static void render_container_simple_border_normal(struct sway_output *output, box.width = con->width; box.height = con->sway_view->border_thickness; render_rect(output->wlr_output, output_damage, &box, color); + } + if (con->sway_view->border_top) { // Single pixel bar above title memcpy(&color, colors->border, sizeof(float) * 4); color[3] *= con->alpha; @@ -380,41 +374,46 @@ static void render_container_simple_border_normal(struct sway_output *output, box.width = con->width; box.height = 1; render_rect(output->wlr_output, output_damage, &box, color); + } - // Single pixel bar below title - box.x = con->x + con->sway_view->border_thickness; - box.y = con->sway_view->y - 1; - box.width = con->width - con->sway_view->border_thickness * 2; - box.height = 1; - render_rect(output->wlr_output, output_damage, &box, color); - - // Title background - memcpy(&color, colors->background, sizeof(float) * 4); - color[3] *= con->alpha; - box.x = con->x + con->sway_view->border_thickness; - box.y = con->y + 1; - box.width = con->width - con->sway_view->border_thickness * 2; - box.height = con->sway_view->y - con->y - 2; - render_rect(output->wlr_output, output_damage, &box, color); - - // Title text - if (title_texture) { - float output_scale = output->wlr_output->scale; - struct wlr_box texture_box = { - .x = box.x * output_scale, - .y = box.y * output_scale, - }; - wlr_texture_get_size(title_texture, - &texture_box.width, &texture_box.height); - - float matrix[9]; - wlr_matrix_project_box(matrix, &texture_box, - WL_OUTPUT_TRANSFORM_NORMAL, - 0.0, output->wlr_output->transform_matrix); - - render_texture(output->wlr_output, output_damage, title_texture, - &texture_box, matrix, 1.0); - } + // Single pixel bar below title + memcpy(&color, colors->border, sizeof(float) * 4); + color[3] *= con->alpha; + box.x = con->x + con->sway_view->border_thickness; + box.y = con->sway_view->y - 1; + box.width = con->width - con->sway_view->border_thickness * 2; + box.height = 1; + render_rect(output->wlr_output, output_damage, &box, color); + + // Title background + memcpy(&color, colors->background, sizeof(float) * 4); + color[3] *= con->alpha; + box.x = con->x + + con->sway_view->border_thickness * con->sway_view->border_left; + box.y = con->y + con->sway_view->border_top; + box.width = con->width + - con->sway_view->border_thickness * con->sway_view->border_left + - con->sway_view->border_thickness * con->sway_view->border_right; + box.height = con->sway_view->y - con->y - (con->sway_view->border_top + 1); + render_rect(output->wlr_output, output_damage, &box, color); + + // Title text + if (title_texture) { + float output_scale = output->wlr_output->scale; + struct wlr_box texture_box = { + .x = box.x * output_scale, + .y = box.y * output_scale, + }; + wlr_texture_get_size(title_texture, + &texture_box.width, &texture_box.height); + + float matrix[9]; + wlr_matrix_project_box(matrix, &texture_box, + WL_OUTPUT_TRANSFORM_NORMAL, + 0.0, output->wlr_output->transform_matrix); + + render_texture(output->wlr_output, output_damage, title_texture, + &texture_box, matrix, 1.0); } } @@ -427,15 +426,7 @@ static void render_container_simple_border_pixel(struct sway_output *output, struct wlr_box box; float color[4]; - int other_views = 1; - if (config->hide_edge_borders == E_SMART) { - struct sway_container *ws = container_parent(con, C_WORKSPACE); - other_views = container_count_descendants_of_type(ws, C_VIEW) - 1; - } - - if (config->hide_edge_borders != E_VERTICAL - && config->hide_edge_borders != E_BOTH - && (config->hide_edge_borders != E_SMART || other_views)) { + if (con->sway_view->border_left) { // Child border - left edge memcpy(&color, colors->child_border, sizeof(float) * 4); color[3] *= con->alpha; @@ -444,7 +435,9 @@ static void render_container_simple_border_pixel(struct sway_output *output, box.width = con->sway_view->border_thickness; box.height = con->height; render_rect(output->wlr_output, output_damage, &box, color); + } + if (con->sway_view->border_right) { // Child border - right edge if (con->parent->children->length == 1 && con->parent->layout == L_HORIZ) { @@ -460,16 +453,18 @@ static void render_container_simple_border_pixel(struct sway_output *output, render_rect(output->wlr_output, output_damage, &box, color); } - if (config->hide_edge_borders != E_HORIZONTAL - && config->hide_edge_borders != E_BOTH - && (config->hide_edge_borders != E_SMART || other_views)) { + if (con->sway_view->border_top) { // Child border - top edge + memcpy(&color, colors->child_border, sizeof(float) * 4); + color[3] *= con->alpha; box.x = con->x; box.y = con->y; box.width = con->width; box.height = con->sway_view->border_thickness; render_rect(output->wlr_output, output_damage, &box, color); + } + if (con->sway_view->border_bottom) { // Child border - bottom edge if (con->parent->children->length == 1 && con->parent->layout == L_VERT) { diff --git a/sway/tree/view.c b/sway/tree/view.c index e2cb8a7a..a48a6619 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c @@ -93,8 +93,9 @@ void view_autoconfigure(struct sway_view *view) { return; } + struct sway_container *output = container_parent(view->swayc, C_OUTPUT); + if (view->is_fullscreen) { - struct sway_container *output = container_parent(view->swayc, C_OUTPUT); view_configure(view, 0, 0, output->width, output->height); view->x = view->y = 0; return; @@ -106,6 +107,25 @@ void view_autoconfigure(struct sway_view *view) { other_views = container_count_descendants_of_type(ws, C_VIEW) - 1; } + view->border_top = view->border_bottom = true; + view->border_left = view->border_right = true; + if (view->swayc->layout != L_FLOATING) { + if (config->hide_edge_borders == E_BOTH + || config->hide_edge_borders == E_VERTICAL + || (config->hide_edge_borders == E_SMART && !other_views)) { + view->border_left = view->swayc->x != 0; + int right_x = view->swayc->x + view->swayc->width; + view->border_right = right_x != output->width; + } + if (config->hide_edge_borders == E_BOTH + || config->hide_edge_borders == E_HORIZONTAL + || (config->hide_edge_borders == E_SMART && !other_views)) { + view->border_top = view->swayc->y != 0; + int bottom_y = view->swayc->y + view->swayc->height; + view->border_bottom = bottom_y != output->height; + } + } + double x, y, width, height; x = y = width = height = 0; switch (view->border) { @@ -116,51 +136,26 @@ void view_autoconfigure(struct sway_view *view) { height = view->swayc->height; break; case B_PIXEL: - if (view->swayc->layout > L_VERT - || config->hide_edge_borders == E_NONE - || config->hide_edge_borders == E_HORIZONTAL - || (config->hide_edge_borders == E_SMART && other_views)) { - x = view->swayc->x + view->border_thickness; - width = view->swayc->width - view->border_thickness * 2; - } else { - x = view->swayc->x; - width = view->swayc->width; - } - if (view->swayc->layout > L_VERT - || config->hide_edge_borders == E_NONE - || config->hide_edge_borders == E_VERTICAL - || (config->hide_edge_borders == E_SMART && other_views)) { - y = view->swayc->y + view->border_thickness; - height = view->swayc->height - view->border_thickness * 2; - } else { - y = view->swayc->y; - height = view->swayc->height; - } + x = view->swayc->x + view->border_thickness * view->border_left; + y = view->swayc->y + view->border_thickness * view->border_top; + width = view->swayc->width + - view->border_thickness * view->border_left + - view->border_thickness * view->border_right; + height = view->swayc->height + - view->border_thickness * view->border_top + - view->border_thickness * view->border_bottom; break; case B_NORMAL: - if (view->swayc->layout > L_VERT - || config->hide_edge_borders == E_NONE - || config->hide_edge_borders == E_HORIZONTAL - || (config->hide_edge_borders == E_SMART && other_views)) { - x = view->swayc->x + view->border_thickness; - width = view->swayc->width - view->border_thickness * 2; - } else { - x = view->swayc->x; - width = view->swayc->width; - } - if (view->swayc->layout > L_VERT - || config->hide_edge_borders == E_NONE - || config->hide_edge_borders == E_VERTICAL - || (config->hide_edge_borders == E_SMART && other_views)) { - // Height is: border + title height + border + view height + border - y = view->swayc->y + config->font_height - + view->border_thickness * 2; - height = view->swayc->height - config->font_height - - view->border_thickness * 3; - } else { - y = view->swayc->y; - height = view->swayc->height; - } + // Height is: border + title height + border + view height + border + x = view->swayc->x + view->border_thickness * view->border_left; + y = view->swayc->y + config->font_height + + view->border_thickness * (view->border_top + 1); + width = view->swayc->width + - view->border_thickness * view->border_left + - view->border_thickness * view->border_right; + height = view->swayc->height - config->font_height + - view->border_thickness * (view->border_top + 1) + - view->border_thickness * view->border_bottom; break; } From 3488fbc85952c617c304e6e1b84015c9c6a30651 Mon Sep 17 00:00:00 2001 From: Brian Ashworth Date: Mon, 14 May 2018 01:46:53 -0400 Subject: [PATCH 2/3] Fix y and height for a hidden top normal border --- sway/tree/view.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sway/tree/view.c b/sway/tree/view.c index a485e902..392cd59d 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c @@ -152,14 +152,12 @@ void view_autoconfigure(struct sway_view *view) { case B_NORMAL: // Height is: border + title height + border + view height + border x = view->swayc->x + view->border_thickness * view->border_left; - y = view->swayc->y + config->font_height - + view->border_thickness * (view->border_top + 1); + y = view->swayc->y + config->font_height + view->border_thickness * 2; width = view->swayc->width - view->border_thickness * view->border_left - view->border_thickness * view->border_right; height = view->swayc->height - config->font_height - - view->border_thickness * (view->border_top + 1) - - view->border_thickness * view->border_bottom; + - view->border_thickness * (2 + view->border_bottom); break; } From 77b42ec8216ec785e3981617c5afbb16c1cd31d7 Mon Sep 17 00:00:00 2001 From: Brian Ashworth Date: Mon, 14 May 2018 09:04:18 -0400 Subject: [PATCH 3/3] Always render top border for border normal --- sway/desktop/output.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/sway/desktop/output.c b/sway/desktop/output.c index 705e542a..577279ac 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c @@ -365,16 +365,14 @@ static void render_container_simple_border_normal(struct sway_output *output, render_rect(output->wlr_output, output_damage, &box, color); } - if (con->sway_view->border_top) { - // Single pixel bar above title - memcpy(&color, colors->border, sizeof(float) * 4); - color[3] *= con->alpha; - box.x = con->x; - box.y = con->y; - box.width = con->width; - box.height = 1; - render_rect(output->wlr_output, output_damage, &box, color); - } + // Single pixel bar above title + memcpy(&color, colors->border, sizeof(float) * 4); + color[3] *= con->alpha; + box.x = con->x; + box.y = con->y; + box.width = con->width; + box.height = 1; + render_rect(output->wlr_output, output_damage, &box, color); // Single pixel bar below title memcpy(&color, colors->border, sizeof(float) * 4); @@ -390,11 +388,11 @@ static void render_container_simple_border_normal(struct sway_output *output, color[3] *= con->alpha; box.x = con->x + con->sway_view->border_thickness * con->sway_view->border_left; - box.y = con->y + con->sway_view->border_top; + box.y = con->y + 1; box.width = con->width - con->sway_view->border_thickness * con->sway_view->border_left - con->sway_view->border_thickness * con->sway_view->border_right; - box.height = con->sway_view->y - con->y - (con->sway_view->border_top + 1); + box.height = con->sway_view->y - con->y - 2; render_rect(output->wlr_output, output_damage, &box, color); // Title text