Merge pull request #3408 from RedSoxFan/bar-padding

swaybar: adjustable status padding

13 files changed, 89 insertions, 9 deletions

diff --git a/include/sway/commands.h b/include/sway/commands.h
index 7d0ff838..04f93ba9 100644
--- a/include/sway/commands.h
+++ b/include/sway/commands.h
@@ -198,6 +198,8 @@ sway_cmd bar_cmd_id;
 sway_cmd bar_cmd_position;
 sway_cmd bar_cmd_separator_symbol;
 sway_cmd bar_cmd_status_command;
+sway_cmd bar_cmd_status_edge_padding;
+sway_cmd bar_cmd_status_padding;
 sway_cmd bar_cmd_pango_markup;
 sway_cmd bar_cmd_strip_workspace_numbers;
 sway_cmd bar_cmd_strip_workspace_name;
diff --git a/include/sway/config.h b/include/sway/config.h
index 29c21afe..a667984d 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -232,6 +232,8 @@ struct bar_config {
 	bool verbose;
 	struct side_gaps gaps;
 	pid_t pid;
+	int status_padding;
+	int status_edge_padding;
 	struct {
 		char *background;
 		char *statusline;
diff --git a/include/swaybar/config.h b/include/swaybar/config.h
index 1f6577bd..add0a1cf 100644
--- a/include/swaybar/config.h
+++ b/include/swaybar/config.h
@@ -43,6 +43,8 @@ struct swaybar_config {
 	struct wl_list outputs; // config_output::link
 	bool all_outputs;
 	int height;
+	int status_padding;
+	int status_edge_padding;
 	struct {
 		int top;
 		int right;
diff --git a/sway/commands/bar.c b/sway/commands/bar.c
index 507ee10a..3e7c1b0f 100644
--- a/sway/commands/bar.c
+++ b/sway/commands/bar.c
@@ -23,6 +23,8 @@ static struct cmd_handler bar_handlers[] = {
 	{ "position", bar_cmd_position },
 	{ "separator_symbol", bar_cmd_separator_symbol },
 	{ "status_command", bar_cmd_status_command },
+	{ "status_edge_padding", bar_cmd_status_edge_padding },
+	{ "status_padding", bar_cmd_status_padding },
 	{ "strip_workspace_name", bar_cmd_strip_workspace_name },
 	{ "strip_workspace_numbers", bar_cmd_strip_workspace_numbers },
 	{ "tray_bindsym", bar_cmd_tray_bindsym },
diff --git a/sway/commands/bar/status_edge_padding.c b/sway/commands/bar/status_edge_padding.c
new file mode 100644
index 00000000..f3b10631
--- /dev/null
+++ b/sway/commands/bar/status_edge_padding.c
@@ -0,0 +1,21 @@
+#include <stdlib.h>
+#include <string.h>
+#include "sway/commands.h"
+#include "log.h"
+
+struct cmd_results *bar_cmd_status_edge_padding(int argc, char **argv) {
+	struct cmd_results *error = NULL;
+	if ((error = checkarg(argc, "status_edge_padding", EXPECTED_EQUAL_TO, 1))) {
+		return error;
+	}
+	char *end;
+	int padding = strtol(argv[0], &end, 10);
+	if (strlen(end) || padding < 0) {
+		return cmd_results_new(CMD_INVALID, "status_edge_padding",
+				"Padding must be a positive integer");
+	}
+	config->current_bar->status_edge_padding = padding;
+	wlr_log(WLR_DEBUG, "Status edge padding on bar %s: %d",
+			config->current_bar->id, config->current_bar->status_edge_padding);
+	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
diff --git a/sway/commands/bar/status_padding.c b/sway/commands/bar/status_padding.c
new file mode 100644
index 00000000..13b8eb6b
--- /dev/null
+++ b/sway/commands/bar/status_padding.c
@@ -0,0 +1,21 @@
+#include <stdlib.h>
+#include <string.h>
+#include "sway/commands.h"
+#include "log.h"
+
+struct cmd_results *bar_cmd_status_padding(int argc, char **argv) {
+	struct cmd_results *error = NULL;
+	if ((error = checkarg(argc, "status_padding", EXPECTED_EQUAL_TO, 1))) {
+		return error;
+	}
+	char *end;
+	int padding = strtol(argv[0], &end, 10);
+	if (strlen(end) || padding < 0) {
+		return cmd_results_new(CMD_INVALID, "status_padding",
+				"Padding must be a positive integer");
+	}
+	config->current_bar->status_padding = padding;
+	wlr_log(WLR_DEBUG, "Status padding on bar %s: %d",
+			config->current_bar->id, config->current_bar->status_padding);
+	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
diff --git a/sway/config/bar.c b/sway/config/bar.c
index 670219f1..101562d1 100644
--- a/sway/config/bar.c
+++ b/sway/config/bar.c
@@ -106,6 +106,8 @@ struct bar_config *default_bar_config(void) {
 	bar->verbose = false;
 	bar->pid = 0;
 	bar->modifier = get_modifier_mask_by_name("Mod4");
+	bar->status_padding = 1;
+	bar->status_edge_padding = 3;
 	if (!(bar->mode = strdup("dock"))) {
 	       goto cleanup;
 	}
diff --git a/sway/ipc-json.c b/sway/ipc-json.c
index 53e0e335..09b65e8d 100644
--- a/sway/ipc-json.c
+++ b/sway/ipc-json.c
@@ -660,6 +660,10 @@ json_object *ipc_json_describe_bar_config(struct bar_config *bar) {
 	}
 	json_object_object_add(json, "bar_height",
 			json_object_new_int(bar->height));
+	json_object_object_add(json, "status_padding",
+			json_object_new_int(bar->status_padding));
+	json_object_object_add(json, "status_edge_padding",
+			json_object_new_int(bar->status_edge_padding));
 	json_object_object_add(json, "wrap_scroll",
 			json_object_new_boolean(bar->wrap_scroll));
 	json_object_object_add(json, "workspace_buttons",
diff --git a/sway/meson.build b/sway/meson.build
index 98676ce0..ab5862c5 100644
--- a/sway/meson.build
+++ b/sway/meson.build
@@ -116,6 +116,8 @@ sway_sources = files(
 	'commands/bar/position.c',
 	'commands/bar/separator_symbol.c',
 	'commands/bar/status_command.c',
+	'commands/bar/status_edge_padding.c',
+	'commands/bar/status_padding.c',
 	'commands/bar/strip_workspace_numbers.c',
 	'commands/bar/strip_workspace_name.c',
 	'commands/bar/swaybar_command.c',
diff --git a/sway/sway-bar.5.scd b/sway/sway-bar.5.scd
index 2357591d..b345b392 100644
--- a/sway/sway-bar.5.scd
+++ b/sway/sway-bar.5.scd
@@ -92,6 +92,16 @@ Sway allows configuring swaybar in the sway configuration file.
 *modifier* <Modifier>|none
 	Specifies the modifier key that shows a hidden bar. Default is _Mod4_.
 
+*status\_padding* <padding>
+	Sets the vertical padding that is used for the status line. The default is
+	_1_. If _padding_ is _0_, blocks will be able to take up the full height of
+	the bar. This value will be multiplied by the output scale.
+
+*status\_edge\_padding* <padding>
+	Sets the padding that is used when the status line is at the right edge of
+	the bar. This value will be multiplied by the output scale. The default is
+	_3_.
+
 ## TRAY
 
 Swaybar provides a system tray where third-party applications may place icons.
diff --git a/swaybar/config.c b/swaybar/config.c
index 9cafe061..d4cc9b1a 100644
--- a/swaybar/config.c
+++ b/swaybar/config.c
@@ -37,6 +37,8 @@ struct swaybar_config *init_config(void) {
 	config->workspace_buttons = true;
 	config->bindings = create_list();
 	wl_list_init(&config->outputs);
+	config->status_padding = 1;
+	config->status_edge_padding = 3;
 
 	/* height */
 	config->height = 0;
diff --git a/swaybar/ipc.c b/swaybar/ipc.c
index 8e7a542e..bc5c28b4 100644
--- a/swaybar/ipc.c
+++ b/swaybar/ipc.c
@@ -157,7 +157,7 @@ static bool ipc_parse_config(
 	json_object *font, *gaps, *bar_height, *wrap_scroll, *workspace_buttons;
 	json_object *strip_workspace_numbers, *strip_workspace_name;
 	json_object *binding_mode_indicator, *verbose, *colors, *sep_symbol;
-	json_object *outputs, *bindings;
+	json_object *outputs, *bindings, *status_padding, *status_edge_padding;
 	json_object_object_get_ex(bar_config, "mode", &mode);
 	json_object_object_get_ex(bar_config, "hidden_state", &hidden_state);
 	json_object_object_get_ex(bar_config, "position", &position);
@@ -176,6 +176,9 @@ static bool ipc_parse_config(
 	json_object_object_get_ex(bar_config, "outputs", &outputs);
 	json_object_object_get_ex(bar_config, "pango_markup", &markup);
 	json_object_object_get_ex(bar_config, "bindings", &bindings);
+	json_object_object_get_ex(bar_config, "status_padding", &status_padding);
+	json_object_object_get_ex(bar_config, "status_edge_padding",
+			&status_edge_padding);
 	if (status_command) {
 		free(config->status_command);
 		config->status_command = strdup(json_object_get_string(status_command));
@@ -209,6 +212,12 @@ static bool ipc_parse_config(
 	if (bar_height) {
 		config->height = json_object_get_int(bar_height);
 	}
+	if (status_padding) {
+		config->status_padding = json_object_get_int(status_padding);
+	}
+	if (status_edge_padding) {
+		config->status_edge_padding = json_object_get_int(status_edge_padding);
+	}
 	if (gaps) {
 		json_object *top = json_object_object_get(gaps, "top");
 		if (top) {
diff --git a/swaybar/render.c b/swaybar/render.c
index 7cbcea07..993c8228 100644
--- a/swaybar/render.c
+++ b/swaybar/render.c
@@ -35,7 +35,8 @@ static uint32_t render_status_line_error(cairo_t *cairo,
 	cairo_set_source_u32(cairo, 0xFF0000FF);
 
 	int margin = 3 * output->scale;
-	int ws_vertical_padding = WS_VERTICAL_PADDING * output->scale;
+	double ws_vertical_padding =
+		output->bar->config->status_padding * output->scale;
 
 	char *font = output->bar->config->font;
 	int text_width, text_height;
@@ -71,7 +72,7 @@ static uint32_t render_status_line_text(cairo_t *cairo,
 	get_text_size(cairo, config->font, &text_width, &text_height, NULL,
 			output->scale, config->pango_markup, "%s", text);
 
-	int ws_vertical_padding = WS_VERTICAL_PADDING * output->scale;
+	double ws_vertical_padding = config->status_padding * output->scale;
 	int margin = 3 * output->scale;
 
 	uint32_t ideal_height = text_height + ws_vertical_padding * 2;
@@ -153,7 +154,7 @@ static uint32_t render_status_block(cairo_t *cairo,
 			output->scale, block->markup, "%s", block->full_text);
 
 	int margin = 3 * output->scale;
-	double ws_vertical_padding = WS_VERTICAL_PADDING * 2 * output->scale;
+	double ws_vertical_padding = config->status_padding * output->scale;
 
 	int width = text_width;
 	if (width < block->min_width) {
@@ -193,8 +194,8 @@ static uint32_t render_status_block(cairo_t *cairo,
 			}
 		}
 		*x -= sep_block_width;
-	} else {
-		*x -= margin;
+	} else if (config->status_edge_padding) {
+		*x -= config->status_edge_padding * output->scale;
 	}
 
 	uint32_t height = output->height * output->scale;
@@ -212,8 +213,8 @@ static uint32_t render_status_block(cairo_t *cairo,
 	}
 
 	double x_pos = *x;
-	double y_pos = WS_VERTICAL_PADDING * output->scale;
-	double render_height = height - ws_vertical_padding + output->scale;
+	double y_pos = ws_vertical_padding;
+	double render_height = height - ws_vertical_padding * 2;
 
 	uint32_t bg_color = block->urgent
 		? config->colors.urgent_workspace.background : block->background;
@@ -286,7 +287,7 @@ static uint32_t render_status_block(cairo_t *cairo,
 static uint32_t render_status_line_i3bar(cairo_t *cairo,
 		struct swaybar_output *output, double *x) {
 	uint32_t max_height = 0;
-	bool edge = true;
+	bool edge = *x == output->width * output->scale;
 	struct i3bar_block *block;
 	wl_list_for_each(block, &output->bar->status->blocks, link) {
 		uint32_t h = render_status_block(cairo, output, block, x, edge);