diff options
author | Drew DeVault <sir@cmpwn.com> | 2019-01-13 20:34:13 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-13 20:34:13 -0500 |
commit | 9ce4d53e789b5a3b3f521585a5a0ff62e341468b (patch) | |
tree | d267455e4f5814b7f8f5eae3f85636c90884bcfd /sway | |
parent | Merge pull request #3415 from RedSoxFan/swaybar-output-improved (diff) | |
parent | swaybar: add status_edge_padding command (diff) | |
download | sway-9ce4d53e789b5a3b3f521585a5a0ff62e341468b.tar.gz sway-9ce4d53e789b5a3b3f521585a5a0ff62e341468b.tar.zst sway-9ce4d53e789b5a3b3f521585a5a0ff62e341468b.zip |
Merge pull request #3408 from RedSoxFan/bar-padding
swaybar: adjustable status padding
Diffstat (limited to 'sway')
-rw-r--r-- | sway/commands/bar.c | 2 | ||||
-rw-r--r-- | sway/commands/bar/status_edge_padding.c | 21 | ||||
-rw-r--r-- | sway/commands/bar/status_padding.c | 21 | ||||
-rw-r--r-- | sway/config/bar.c | 2 | ||||
-rw-r--r-- | sway/ipc-json.c | 4 | ||||
-rw-r--r-- | sway/meson.build | 2 | ||||
-rw-r--r-- | sway/sway-bar.5.scd | 10 |
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[] = { | |||
23 | { "position", bar_cmd_position }, | 23 | { "position", bar_cmd_position }, |
24 | { "separator_symbol", bar_cmd_separator_symbol }, | 24 | { "separator_symbol", bar_cmd_separator_symbol }, |
25 | { "status_command", bar_cmd_status_command }, | 25 | { "status_command", bar_cmd_status_command }, |
26 | { "status_edge_padding", bar_cmd_status_edge_padding }, | ||
27 | { "status_padding", bar_cmd_status_padding }, | ||
26 | { "strip_workspace_name", bar_cmd_strip_workspace_name }, | 28 | { "strip_workspace_name", bar_cmd_strip_workspace_name }, |
27 | { "strip_workspace_numbers", bar_cmd_strip_workspace_numbers }, | 29 | { "strip_workspace_numbers", bar_cmd_strip_workspace_numbers }, |
28 | { "tray_bindsym", bar_cmd_tray_bindsym }, | 30 | { "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 @@ | |||
1 | #include <stdlib.h> | ||
2 | #include <string.h> | ||
3 | #include "sway/commands.h" | ||
4 | #include "log.h" | ||
5 | |||
6 | struct cmd_results *bar_cmd_status_edge_padding(int argc, char **argv) { | ||
7 | struct cmd_results *error = NULL; | ||
8 | if ((error = checkarg(argc, "status_edge_padding", EXPECTED_EQUAL_TO, 1))) { | ||
9 | return error; | ||
10 | } | ||
11 | char *end; | ||
12 | int padding = strtol(argv[0], &end, 10); | ||
13 | if (strlen(end) || padding < 0) { | ||
14 | return cmd_results_new(CMD_INVALID, "status_edge_padding", | ||
15 | "Padding must be a positive integer"); | ||
16 | } | ||
17 | config->current_bar->status_edge_padding = padding; | ||
18 | wlr_log(WLR_DEBUG, "Status edge padding on bar %s: %d", | ||
19 | config->current_bar->id, config->current_bar->status_edge_padding); | ||
20 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | ||
21 | } | ||
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 @@ | |||
1 | #include <stdlib.h> | ||
2 | #include <string.h> | ||
3 | #include "sway/commands.h" | ||
4 | #include "log.h" | ||
5 | |||
6 | struct cmd_results *bar_cmd_status_padding(int argc, char **argv) { | ||
7 | struct cmd_results *error = NULL; | ||
8 | if ((error = checkarg(argc, "status_padding", EXPECTED_EQUAL_TO, 1))) { | ||
9 | return error; | ||
10 | } | ||
11 | char *end; | ||
12 | int padding = strtol(argv[0], &end, 10); | ||
13 | if (strlen(end) || padding < 0) { | ||
14 | return cmd_results_new(CMD_INVALID, "status_padding", | ||
15 | "Padding must be a positive integer"); | ||
16 | } | ||
17 | config->current_bar->status_padding = padding; | ||
18 | wlr_log(WLR_DEBUG, "Status padding on bar %s: %d", | ||
19 | config->current_bar->id, config->current_bar->status_padding); | ||
20 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | ||
21 | } | ||
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) { | |||
106 | bar->verbose = false; | 106 | bar->verbose = false; |
107 | bar->pid = 0; | 107 | bar->pid = 0; |
108 | bar->modifier = get_modifier_mask_by_name("Mod4"); | 108 | bar->modifier = get_modifier_mask_by_name("Mod4"); |
109 | bar->status_padding = 1; | ||
110 | bar->status_edge_padding = 3; | ||
109 | if (!(bar->mode = strdup("dock"))) { | 111 | if (!(bar->mode = strdup("dock"))) { |
110 | goto cleanup; | 112 | goto cleanup; |
111 | } | 113 | } |
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) { | |||
660 | } | 660 | } |
661 | json_object_object_add(json, "bar_height", | 661 | json_object_object_add(json, "bar_height", |
662 | json_object_new_int(bar->height)); | 662 | json_object_new_int(bar->height)); |
663 | json_object_object_add(json, "status_padding", | ||
664 | json_object_new_int(bar->status_padding)); | ||
665 | json_object_object_add(json, "status_edge_padding", | ||
666 | json_object_new_int(bar->status_edge_padding)); | ||
663 | json_object_object_add(json, "wrap_scroll", | 667 | json_object_object_add(json, "wrap_scroll", |
664 | json_object_new_boolean(bar->wrap_scroll)); | 668 | json_object_new_boolean(bar->wrap_scroll)); |
665 | json_object_object_add(json, "workspace_buttons", | 669 | 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( | |||
116 | 'commands/bar/position.c', | 116 | 'commands/bar/position.c', |
117 | 'commands/bar/separator_symbol.c', | 117 | 'commands/bar/separator_symbol.c', |
118 | 'commands/bar/status_command.c', | 118 | 'commands/bar/status_command.c', |
119 | 'commands/bar/status_edge_padding.c', | ||
120 | 'commands/bar/status_padding.c', | ||
119 | 'commands/bar/strip_workspace_numbers.c', | 121 | 'commands/bar/strip_workspace_numbers.c', |
120 | 'commands/bar/strip_workspace_name.c', | 122 | 'commands/bar/strip_workspace_name.c', |
121 | 'commands/bar/swaybar_command.c', | 123 | '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. | |||
92 | *modifier* <Modifier>|none | 92 | *modifier* <Modifier>|none |
93 | Specifies the modifier key that shows a hidden bar. Default is _Mod4_. | 93 | Specifies the modifier key that shows a hidden bar. Default is _Mod4_. |
94 | 94 | ||
95 | *status\_padding* <padding> | ||
96 | Sets the vertical padding that is used for the status line. The default is | ||
97 | _1_. If _padding_ is _0_, blocks will be able to take up the full height of | ||
98 | the bar. This value will be multiplied by the output scale. | ||
99 | |||
100 | *status\_edge\_padding* <padding> | ||
101 | Sets the padding that is used when the status line is at the right edge of | ||
102 | the bar. This value will be multiplied by the output scale. The default is | ||
103 | _3_. | ||
104 | |||
95 | ## TRAY | 105 | ## TRAY |
96 | 106 | ||
97 | Swaybar provides a system tray where third-party applications may place icons. | 107 | Swaybar provides a system tray where third-party applications may place icons. |