mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-26 18:01:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement hide_edge_borders

Browse source
This commit is contained in:
Brian Ashworth 2018-05-11 18:44:56 -04:00
parent 2217518bd5
commit 3db7fc2bb2
5 changed files with 216 additions and 113 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
sway/commands.c
View file

@ -108,6 +108,7 @@ static struct cmd_handler handlers[] = {
{ "font", cmd_font }, { "font", cmd_font },
{ "for_window", cmd_for_window }, { "for_window", cmd_for_window },
{ "fullscreen", cmd_fullscreen }, { "fullscreen", cmd_fullscreen },
{ "hide_edge_borders", cmd_hide_edge_borders },
{ "include", cmd_include }, { "include", cmd_include },
{ "input", cmd_input }, { "input", cmd_input },
{ "mode", cmd_mode }, { "mode", cmd_mode },

37
sway/commands/hide_edge_borders.c Normal file
View file

@ -0,0 +1,37 @@
#include "sway/commands.h"
#include "sway/config.h"
#include "sway/tree/container.h"
#include "sway/tree/view.h"
static void _configure_view(struct sway_container *con, void *data) {
if (con->type == C_VIEW) {
view_autoconfigure(con->sway_view);
}
}
struct cmd_results *cmd_hide_edge_borders(int argc, char **argv) {
struct cmd_results *error = NULL;
if ((error = checkarg(argc, "hide_edge_borders", EXPECTED_EQUAL_TO, 1))) {
return error;
}
if (strcmp(argv[0], "none") == 0) {
config->hide_edge_borders = E_NONE;
} else if (strcmp(argv[0], "vertical") == 0) {
config->hide_edge_borders = E_VERTICAL;
} else if (strcmp(argv[0], "horizontal") == 0) {
config->hide_edge_borders = E_HORIZONTAL;
} else if (strcmp(argv[0], "both") == 0) {
config->hide_edge_borders = E_BOTH;
} else if (strcmp(argv[0], "smart") == 0) {
config->hide_edge_borders = E_SMART;
} else {
return cmd_results_new(CMD_INVALID, "hide_edge_borders",
"Expected 'hide_edge_borders "
"<none|vertical|horizontal|both|smart>'");
}
container_for_each_descendant_dfs(&root_container, _configure_view, NULL);
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
}

234
sway/desktop/output.c
View file

@ -14,6 +14,7 @@
#include <wlr/types/wlr_wl_shell.h> #include <wlr/types/wlr_wl_shell.h>
#include <wlr/util/region.h> #include <wlr/util/region.h>
#include "log.h" #include "log.h"
#include "sway/config.h"
#include "sway/input/input-manager.h" #include "sway/input/input-manager.h"
#include "sway/input/seat.h" #include "sway/input/seat.h"
#include "sway/layers.h" #include "sway/layers.h"
@ -321,82 +322,96 @@ static void render_container_simple_border_normal(struct sway_output *output,
struct wlr_box box; struct wlr_box box;
float color[4]; float color[4];
// Child border - left edge struct sway_container *workspace = container_parent(con, C_WORKSPACE);
memcpy(&color, colors->child_border, sizeof(float) * 4); int other_views = workspace->children->length - 1;
color[3] *= con->alpha;
box.x = con->x;
box.y = con->y + 1;
box.width = con->sway_view->border_thickness;
box.height = con->height - 1;
render_rect(output->wlr_output, output_damage, &box, color);
// Child border - right edge if (config->hide_edge_borders != E_VERTICAL
if (con->parent->children->length == 1 && con->parent->layout == L_HORIZ) { && config->hide_edge_borders != E_BOTH
memcpy(&color, colors->indicator, sizeof(float) * 4); && (config->hide_edge_borders != E_SMART || other_views)) {
} else { // Child border - left edge
memcpy(&color, colors->child_border, sizeof(float) * 4); memcpy(&color, colors->child_border, sizeof(float) * 4);
color[3] *= con->alpha;
box.x = con->x;
box.y = con->y + 1;
box.width = con->sway_view->border_thickness;
box.height = con->height - 1;
render_rect(output->wlr_output, output_damage, &box, color);
// Child border - right edge
if (con->parent->children->length == 1
&& con->parent->layout == L_HORIZ) {
memcpy(&color, colors->indicator, sizeof(float) * 4);
} else {
memcpy(&color, colors->child_border, sizeof(float) * 4);
}
color[3] *= con->alpha;
box.x = con->x + con->width - con->sway_view->border_thickness;
box.y = con->y + 1;
box.width = con->sway_view->border_thickness;
box.height = con->height - 1;
render_rect(output->wlr_output, output_damage, &box, color);
} }
color[3] *= con->alpha;
box.x = con->x + con->width - con->sway_view->border_thickness;
box.y = con->y + 1;
box.width = con->sway_view->border_thickness;
box.height = con->height - 1;
render_rect(output->wlr_output, output_damage, &box, color);
// Child border - bottom edge if (config->hide_edge_borders != E_HORIZONTAL
if (con->parent->children->length == 1 && con->parent->layout == L_VERT) { && config->hide_edge_borders != E_BOTH
memcpy(&color, colors->indicator, sizeof(float) * 4); && (config->hide_edge_borders != E_SMART || other_views)) {
} else { // Child border - bottom edge
memcpy(&color, colors->child_border, sizeof(float) * 4); if (con->parent->children->length == 1
} && con->parent->layout == L_VERT) {
color[3] *= con->alpha; memcpy(&color, colors->indicator, sizeof(float) * 4);
box.x = con->x; } else {
box.y = con->y + con->height - con->sway_view->border_thickness; memcpy(&color, colors->child_border, sizeof(float) * 4);
box.width = con->width; }
box.height = con->sway_view->border_thickness; color[3] *= con->alpha;
render_rect(output->wlr_output, output_damage, &box, color); box.x = con->x;
box.y = con->y + con->height - con->sway_view->border_thickness;
box.width = con->width;
box.height = con->sway_view->border_thickness;
render_rect(output->wlr_output, output_damage, &box, color);
// Single pixel bar above title // Single pixel bar above title
memcpy(&color, colors->border, sizeof(float) * 4); memcpy(&color, colors->border, sizeof(float) * 4);
color[3] *= con->alpha; color[3] *= con->alpha;
box.x = con->x; box.x = con->x;
box.y = con->y; box.y = con->y;
box.width = con->width; box.width = con->width;
box.height = 1; box.height = 1;
render_rect(output->wlr_output, output_damage, &box, color); render_rect(output->wlr_output, output_damage, &box, color);
// Single pixel bar below title // Single pixel bar below title
box.x = con->x + con->sway_view->border_thickness; box.x = con->x + con->sway_view->border_thickness;
box.y = con->sway_view->y - 1; box.y = con->sway_view->y - 1;
box.width = con->width - con->sway_view->border_thickness * 2; box.width = con->width - con->sway_view->border_thickness * 2;
box.height = 1; box.height = 1;
render_rect(output->wlr_output, output_damage, &box, color); render_rect(output->wlr_output, output_damage, &box, color);
// Title background // Title background
memcpy(&color, colors->background, sizeof(float) * 4); memcpy(&color, colors->background, sizeof(float) * 4);
color[3] *= con->alpha; color[3] *= con->alpha;
box.x = con->x + con->sway_view->border_thickness; box.x = con->x + con->sway_view->border_thickness;
box.y = con->y + 1; box.y = con->y + 1;
box.width = con->width - con->sway_view->border_thickness * 2; box.width = con->width - con->sway_view->border_thickness * 2;
box.height = con->sway_view->y - con->y - 2; box.height = con->sway_view->y - con->y - 2;
render_rect(output->wlr_output, output_damage, &box, color); render_rect(output->wlr_output, output_damage, &box, color);
// Title text // Title text
if (title_texture) { if (title_texture) {
float output_scale = output->wlr_output->scale; float output_scale = output->wlr_output->scale;
struct wlr_box texture_box = { struct wlr_box texture_box = {
.x = box.x * output_scale, .x = box.x * output_scale,
.y = box.y * output_scale, .y = box.y * output_scale,
}; };
wlr_texture_get_size(title_texture, wlr_texture_get_size(title_texture,
&texture_box.width, &texture_box.height); &texture_box.width, &texture_box.height);
float matrix[9]; float matrix[9];
wlr_matrix_project_box(matrix, &texture_box, WL_OUTPUT_TRANSFORM_NORMAL, wlr_matrix_project_box(matrix, &texture_box,
0.0, output->wlr_output->transform_matrix); WL_OUTPUT_TRANSFORM_NORMAL,
0.0, output->wlr_output->transform_matrix);
render_texture(output->wlr_output, output_damage, title_texture, render_texture(output->wlr_output, output_damage, title_texture,
&texture_box, matrix, 1.0); &texture_box, matrix, 1.0);
}
} }
} }
@ -409,47 +424,60 @@ static void render_container_simple_border_pixel(struct sway_output *output,
struct wlr_box box; struct wlr_box box;
float color[4]; float color[4];
// Child border - left edge struct sway_container *workspace = container_parent(con, C_WORKSPACE);
memcpy(&color, colors->child_border, sizeof(float) * 4); int other_views = workspace->children->length - 1;
color[3] *= con->alpha;
box.x = con->x;
box.y = con->y;
box.width = con->sway_view->border_thickness;
box.height = con->height;
render_rect(output->wlr_output, output_damage, &box, color);
// Child border - right edge if (config->hide_edge_borders != E_VERTICAL
if (con->parent->children->length == 1 && con->parent->layout == L_HORIZ) { && config->hide_edge_borders != E_BOTH
memcpy(&color, colors->indicator, sizeof(float) * 4); && (config->hide_edge_borders != E_SMART || other_views)) {
} else { // Child border - left edge
memcpy(&color, colors->child_border, sizeof(float) * 4); memcpy(&color, colors->child_border, sizeof(float) * 4);
} color[3] *= con->alpha;
color[3] *= con->alpha; box.x = con->x;
box.x = con->x + con->width - con->sway_view->border_thickness; box.y = con->y;
box.y = con->y; box.width = con->sway_view->border_thickness;
box.width = con->sway_view->border_thickness; box.height = con->height;
box.height = con->height; render_rect(output->wlr_output, output_damage, &box, color);
render_rect(output->wlr_output, output_damage, &box, color);
// Child border - top edge // Child border - right edge
box.x = con->x; if (con->parent->children->length == 1
box.y = con->y; && con->parent->layout == L_HORIZ) {
box.width = con->width; memcpy(&color, colors->indicator, sizeof(float) * 4);
box.height = con->sway_view->border_thickness; } else {
render_rect(output->wlr_output, output_damage, &box, color); memcpy(&color, colors->child_border, sizeof(float) * 4);
}
// Child border - bottom edge color[3] *= con->alpha;
if (con->parent->children->length == 1 && con->parent->layout == L_VERT) { box.x = con->x + con->width - con->sway_view->border_thickness;
memcpy(&color, colors->indicator, sizeof(float) * 4); box.y = con->y;
} else { box.width = con->sway_view->border_thickness;
memcpy(&color, colors->child_border, sizeof(float) * 4); box.height = con->height;
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)) {
// Child border - top edge
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);
// Child border - bottom edge
if (con->parent->children->length == 1
&& con->parent->layout == L_VERT) {
memcpy(&color, colors->indicator, sizeof(float) * 4);
} else {
memcpy(&color, colors->child_border, sizeof(float) * 4);
}
color[3] *= con->alpha;
box.x = con->x;
box.y = con->y + con->height - con->sway_view->border_thickness;
box.width = con->width;
box.height = con->sway_view->border_thickness;
render_rect(output->wlr_output, output_damage, &box, color);
} }
color[3] *= con->alpha;
box.x = con->x;
box.y = con->y + con->height - con->sway_view->border_thickness;
box.width = con->width;
box.height = con->sway_view->border_thickness;
render_rect(output->wlr_output, output_damage, &box, color);
} }
static void render_container(struct sway_output *output, static void render_container(struct sway_output *output,

1
sway/meson.build
View file

@ -41,6 +41,7 @@ sway_sources = files(
'commands/font.c', 'commands/font.c',
'commands/for_window.c', 'commands/for_window.c',
'commands/fullscreen.c', 'commands/fullscreen.c',
'commands/hide_edge_borders.c',
'commands/kill.c', 'commands/kill.c',
'commands/opacity.c', 'commands/opacity.c',
'commands/include.c', 'commands/include.c',

56
sway/tree/view.c
View file

@ -100,6 +100,9 @@ void view_autoconfigure(struct sway_view *view) {
return; return;
} }
struct sway_container *ws = container_parent(view->swayc, C_WORKSPACE);
int other_views = ws->children->length - 1;
double x, y, width, height; double x, y, width, height;
x = y = width = height = 0; x = y = width = height = 0;
switch (view->border) { switch (view->border) {
@ -110,18 +113,51 @@ void view_autoconfigure(struct sway_view *view) {
height = view->swayc->height; height = view->swayc->height;
break; break;
case B_PIXEL: case B_PIXEL:
x = view->swayc->x + view->border_thickness; if (view->swayc->layout > L_VERT
y = view->swayc->y + view->border_thickness; || config->hide_edge_borders == E_NONE
width = view->swayc->width - view->border_thickness * 2; || config->hide_edge_borders == E_HORIZONTAL
height = view->swayc->height - view->border_thickness * 2; || (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;
}
break; break;
case B_NORMAL: case B_NORMAL:
// Height is: border + title height + border + view height + border if (view->swayc->layout > L_VERT
x = view->swayc->x + view->border_thickness; || config->hide_edge_borders == E_NONE
y = view->swayc->y + config->font_height + view->border_thickness * 2; || config->hide_edge_borders == E_HORIZONTAL
width = view->swayc->width - view->border_thickness * 2; || (config->hide_edge_borders == E_SMART && other_views)) {
height = view->swayc->height - config->font_height x = view->swayc->x + view->border_thickness;
- view->border_thickness * 3; 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;
}
break; break;
} }