Merge pull request #3408 from RedSoxFan/bar-padding

swaybar: adjustable status padding

7 files changed, 62 insertions, 0 deletions

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.