diff options
Diffstat (limited to 'sway')
| -rw-r--r-- | sway/commands/bar.c | 1 | ||||
| -rw-r--r-- | sway/commands/bar/status_edge_padding.c | 21 | ||||
| -rw-r--r-- | sway/config/bar.c | 1 | ||||
| -rw-r--r-- | sway/ipc-json.c | 2 | ||||
| -rw-r--r-- | sway/meson.build | 1 | ||||
| -rw-r--r-- | sway/sway-bar.5.scd | 5 |
6 files changed, 31 insertions, 0 deletions
diff --git a/sway/commands/bar.c b/sway/commands/bar.c index 81d84331..3e7c1b0f 100644 --- a/sway/commands/bar.c +++ b/sway/commands/bar.c @@ -23,6 +23,7 @@ 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 }, 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/config/bar.c b/sway/config/bar.c index ebe81cab..101562d1 100644 --- a/sway/config/bar.c +++ b/sway/config/bar.c @@ -107,6 +107,7 @@ struct bar_config *default_bar_config(void) { 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 a21fb4f6..09b65e8d 100644 --- a/sway/ipc-json.c +++ b/sway/ipc-json.c @@ -662,6 +662,8 @@ json_object *ipc_json_describe_bar_config(struct bar_config *bar) { 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 1f7ae060..ab5862c5 100644 --- a/sway/meson.build +++ b/sway/meson.build @@ -116,6 +116,7 @@ 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', diff --git a/sway/sway-bar.5.scd b/sway/sway-bar.5.scd index 4448e3e8..b345b392 100644 --- a/sway/sway-bar.5.scd +++ b/sway/sway-bar.5.scd @@ -97,6 +97,11 @@ Sway allows configuring swaybar in the sway configuration file. _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. |