diff options
author | Tarmack <git@tarmack.eu> | 2020-10-03 15:45:26 +0200 |
---|---|---|
committer | Simon Ser <contact@emersion.fr> | 2020-10-11 19:12:42 +0200 |
commit | 989123a2a5933367e5c7c39c3793f4814e026bf1 (patch) | |
tree | 8a13986177a3380b3d3c965ceb2526e6ceb9c88d /sway | |
parent | xwayland: support views that change override-redirect status (diff) | |
download | sway-989123a2a5933367e5c7c39c3793f4814e026bf1.tar.gz sway-989123a2a5933367e5c7c39c3793f4814e026bf1.tar.zst sway-989123a2a5933367e5c7c39c3793f4814e026bf1.zip |
Add support for workspace_min_width bar option.
Diffstat (limited to 'sway')
-rw-r--r-- | sway/commands/bar.c | 1 | ||||
-rw-r--r-- | sway/commands/bar/workspace_min_width.c | 33 | ||||
-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 | ||||
-rw-r--r-- | sway/sway-ipc.7.scd | 4 |
7 files changed, 47 insertions, 0 deletions
diff --git a/sway/commands/bar.c b/sway/commands/bar.c index 7370910d..d42b7fc2 100644 --- a/sway/commands/bar.c +++ b/sway/commands/bar.c | |||
@@ -36,6 +36,7 @@ static struct cmd_handler bar_handlers[] = { | |||
36 | { "unbindcode", bar_cmd_unbindcode }, | 36 | { "unbindcode", bar_cmd_unbindcode }, |
37 | { "unbindsym", bar_cmd_unbindsym }, | 37 | { "unbindsym", bar_cmd_unbindsym }, |
38 | { "workspace_buttons", bar_cmd_workspace_buttons }, | 38 | { "workspace_buttons", bar_cmd_workspace_buttons }, |
39 | { "workspace_min_width", bar_cmd_workspace_min_width }, | ||
39 | { "wrap_scroll", bar_cmd_wrap_scroll }, | 40 | { "wrap_scroll", bar_cmd_wrap_scroll }, |
40 | }; | 41 | }; |
41 | 42 | ||
diff --git a/sway/commands/bar/workspace_min_width.c b/sway/commands/bar/workspace_min_width.c new file mode 100644 index 00000000..8d65592c --- /dev/null +++ b/sway/commands/bar/workspace_min_width.c | |||
@@ -0,0 +1,33 @@ | |||
1 | #include <stdlib.h> | ||
2 | #include <strings.h> | ||
3 | #include "config.h" | ||
4 | #include "sway/commands.h" | ||
5 | #include "sway/config.h" | ||
6 | #include "log.h" | ||
7 | |||
8 | struct cmd_results *bar_cmd_workspace_min_width(int argc, char **argv) { | ||
9 | struct cmd_results *error = NULL; | ||
10 | if ((error = checkarg(argc, "workspace_min_width", EXPECTED_AT_LEAST, 1))) { | ||
11 | return error; | ||
12 | } | ||
13 | |||
14 | struct bar_config *bar = config->current_bar; | ||
15 | |||
16 | char *end; | ||
17 | int min_width = strtol(argv[0], &end, 10); | ||
18 | if (min_width < 0 || (*end != '\0' && strcasecmp(end, "px") != 0)) { | ||
19 | return cmd_results_new(CMD_INVALID, | ||
20 | "[Bar %s] Invalid minimum workspace button width value: %s", | ||
21 | bar->id, argv[0]); | ||
22 | } | ||
23 | |||
24 | if (argc == 2 && strcasecmp(argv[1], "px") != 0) { | ||
25 | return cmd_results_new(CMD_INVALID, | ||
26 | "Expected 'workspace_min_width <px> [px]'"); | ||
27 | } | ||
28 | |||
29 | sway_log(SWAY_DEBUG, "[Bar %s] Setting minimum workspace button width to %d", | ||
30 | bar->id, min_width); | ||
31 | config->current_bar->workspace_min_width = min_width; | ||
32 | return cmd_results_new(CMD_SUCCESS, NULL); | ||
33 | } | ||
diff --git a/sway/config/bar.c b/sway/config/bar.c index 1c7c13b2..767534a6 100644 --- a/sway/config/bar.c +++ b/sway/config/bar.c | |||
@@ -105,6 +105,7 @@ struct bar_config *default_bar_config(void) { | |||
105 | bar->modifier = get_modifier_mask_by_name("Mod4"); | 105 | bar->modifier = get_modifier_mask_by_name("Mod4"); |
106 | bar->status_padding = 1; | 106 | bar->status_padding = 1; |
107 | bar->status_edge_padding = 3; | 107 | bar->status_edge_padding = 3; |
108 | bar->workspace_min_width = 0; | ||
108 | if (!(bar->mode = strdup("dock"))) { | 109 | if (!(bar->mode = strdup("dock"))) { |
109 | goto cleanup; | 110 | goto cleanup; |
110 | } | 111 | } |
diff --git a/sway/ipc-json.c b/sway/ipc-json.c index 9330de09..fceee84d 100644 --- a/sway/ipc-json.c +++ b/sway/ipc-json.c | |||
@@ -1102,6 +1102,8 @@ json_object *ipc_json_describe_bar_config(struct bar_config *bar) { | |||
1102 | json_object_new_boolean(bar->strip_workspace_numbers)); | 1102 | json_object_new_boolean(bar->strip_workspace_numbers)); |
1103 | json_object_object_add(json, "strip_workspace_name", | 1103 | json_object_object_add(json, "strip_workspace_name", |
1104 | json_object_new_boolean(bar->strip_workspace_name)); | 1104 | json_object_new_boolean(bar->strip_workspace_name)); |
1105 | json_object_object_add(json, "workspace_min_width", | ||
1106 | json_object_new_int(bar->workspace_min_width)); | ||
1105 | json_object_object_add(json, "binding_mode_indicator", | 1107 | json_object_object_add(json, "binding_mode_indicator", |
1106 | json_object_new_boolean(bar->binding_mode_indicator)); | 1108 | json_object_new_boolean(bar->binding_mode_indicator)); |
1107 | json_object_object_add(json, "verbose", | 1109 | json_object_object_add(json, "verbose", |
diff --git a/sway/meson.build b/sway/meson.build index 0db45836..b65a5211 100644 --- a/sway/meson.build +++ b/sway/meson.build | |||
@@ -144,6 +144,7 @@ sway_sources = files( | |||
144 | 'commands/bar/tray_output.c', | 144 | 'commands/bar/tray_output.c', |
145 | 'commands/bar/tray_padding.c', | 145 | 'commands/bar/tray_padding.c', |
146 | 'commands/bar/workspace_buttons.c', | 146 | 'commands/bar/workspace_buttons.c', |
147 | 'commands/bar/workspace_min_width.c', | ||
147 | 'commands/bar/wrap_scroll.c', | 148 | 'commands/bar/wrap_scroll.c', |
148 | 149 | ||
149 | 'commands/input/accel_profile.c', | 150 | 'commands/input/accel_profile.c', |
diff --git a/sway/sway-bar.5.scd b/sway/sway-bar.5.scd index 78124c92..80d08449 100644 --- a/sway/sway-bar.5.scd +++ b/sway/sway-bar.5.scd | |||
@@ -138,6 +138,11 @@ runtime. | |||
138 | *workspace_buttons* yes|no | 138 | *workspace_buttons* yes|no |
139 | Enables or disables workspace buttons on the bar. Default is _yes_. | 139 | Enables or disables workspace buttons on the bar. Default is _yes_. |
140 | 140 | ||
141 | *workspace_min_width* <px> [px] | ||
142 | Specifies the minimum width for the workspace buttons on the bar. Default is _0_. | ||
143 | |||
144 | This setting also applies to the current binding mode indicator. | ||
145 | |||
141 | ## TRAY | 146 | ## TRAY |
142 | 147 | ||
143 | Swaybar provides a system tray where third-party applications may place icons. | 148 | Swaybar provides a system tray where third-party applications may place icons. |
diff --git a/sway/sway-ipc.7.scd b/sway/sway-ipc.7.scd index 495e2e7d..018080fe 100644 --- a/sway/sway-ipc.7.scd +++ b/sway/sway-ipc.7.scd | |||
@@ -829,6 +829,9 @@ their value mean can be found in *sway-bar*(5): | |||
829 | |- workspace_buttons | 829 | |- workspace_buttons |
830 | : boolean | 830 | : boolean |
831 | : Whether to display the workspace buttons on the bar | 831 | : Whether to display the workspace buttons on the bar |
832 | |- workspace_min_width | ||
833 | : integer | ||
834 | : Minimum width in px for the workspace buttons on the bar | ||
832 | |- binding_mode_indicator | 835 | |- binding_mode_indicator |
833 | : boolean | 836 | : boolean |
834 | : Whether to display the current binding mode on the bar | 837 | : Whether to display the current binding mode on the bar |
@@ -931,6 +934,7 @@ containing the _#RRGGBBAA_ representation of the color: | |||
931 | "status_padding": 1, | 934 | "status_padding": 1, |
932 | "status_edge_padding": 3, | 935 | "status_edge_padding": 3, |
933 | "workspace_buttons": true, | 936 | "workspace_buttons": true, |
937 | "workspace_min_width": 0, | ||
934 | "binding_mode_indicator": true, | 938 | "binding_mode_indicator": true, |
935 | "verbose": false, | 939 | "verbose": false, |
936 | "pango_markup": false, | 940 | "pango_markup": false, |