diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-04-12 20:19:54 -0400 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2018-04-12 20:19:54 -0400 |
commit | cd1b32453a9296c18b28bff71607aeb22987b5cd (patch) | |
tree | c653c6d525b471914c01a9d7ae543f521b6138ed /sway/commands/bar/mode.c | |
parent | Merge pull request #1634 from aleksander/master (diff) | |
parent | Fix separator height calculation (diff) | |
download | sway-cd1b32453a9296c18b28bff71607aeb22987b5cd.tar.gz sway-cd1b32453a9296c18b28bff71607aeb22987b5cd.tar.zst sway-cd1b32453a9296c18b28bff71607aeb22987b5cd.zip |
Merge branch 'wlroots'
Diffstat (limited to 'sway/commands/bar/mode.c')
-rw-r--r-- | sway/commands/bar/mode.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/sway/commands/bar/mode.c b/sway/commands/bar/mode.c index 36816b93..34bb0a4f 100644 --- a/sway/commands/bar/mode.c +++ b/sway/commands/bar/mode.c | |||
@@ -27,11 +27,8 @@ static struct cmd_results *bar_set_mode(struct bar_config *bar, const char *mode | |||
27 | if (strcmp(old_mode, bar->mode) != 0) { | 27 | if (strcmp(old_mode, bar->mode) != 0) { |
28 | if (!config->reading) { | 28 | if (!config->reading) { |
29 | ipc_event_barconfig_update(bar); | 29 | ipc_event_barconfig_update(bar); |
30 | |||
31 | // active bar modifiers might have changed. | ||
32 | update_active_bar_modifiers(); | ||
33 | } | 30 | } |
34 | sway_log(L_DEBUG, "Setting mode: '%s' for bar: %s", bar->mode, bar->id); | 31 | wlr_log(L_DEBUG, "Setting mode: '%s' for bar: %s", bar->mode, bar->id); |
35 | } | 32 | } |
36 | 33 | ||
37 | // free old mode | 34 | // free old mode |
@@ -47,13 +44,12 @@ struct cmd_results *bar_cmd_mode(int argc, char **argv) { | |||
47 | if ((error = checkarg(argc, "mode", EXPECTED_LESS_THAN, 3))) { | 44 | if ((error = checkarg(argc, "mode", EXPECTED_LESS_THAN, 3))) { |
48 | return error; | 45 | return error; |
49 | } | 46 | } |
50 | |||
51 | if (config->reading && argc > 1) { | 47 | if (config->reading && argc > 1) { |
52 | return cmd_results_new(CMD_INVALID, "mode", "Unexpected value %s in config mode", argv[1]); | 48 | return cmd_results_new(CMD_INVALID, |
49 | "mode", "Unexpected value %s in config mode", argv[1]); | ||
53 | } | 50 | } |
54 | 51 | ||
55 | const char *mode = argv[0]; | 52 | const char *mode = argv[0]; |
56 | |||
57 | if (config->reading) { | 53 | if (config->reading) { |
58 | return bar_set_mode(config->current_bar, mode); | 54 | return bar_set_mode(config->current_bar, mode); |
59 | } | 55 | } |
@@ -63,19 +59,16 @@ struct cmd_results *bar_cmd_mode(int argc, char **argv) { | |||
63 | id = argv[1]; | 59 | id = argv[1]; |
64 | } | 60 | } |
65 | 61 | ||
66 | int i; | ||
67 | struct bar_config *bar; | 62 | struct bar_config *bar; |
68 | for (i = 0; i < config->bars->length; ++i) { | 63 | for (int i = 0; i < config->bars->length; ++i) { |
69 | bar = config->bars->items[i]; | 64 | bar = config->bars->items[i]; |
70 | if (id && strcmp(id, bar->id) == 0) { | 65 | if (id && strcmp(id, bar->id) == 0) { |
71 | return bar_set_mode(bar, mode); | 66 | return bar_set_mode(bar, mode); |
72 | } | 67 | } |
73 | |||
74 | error = bar_set_mode(bar, mode); | 68 | error = bar_set_mode(bar, mode); |
75 | if (error) { | 69 | if (error) { |
76 | return error; | 70 | return error; |
77 | } | 71 | } |
78 | } | 72 | } |
79 | |||
80 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 73 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
81 | } | 74 | } |