diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-03-29 22:05:16 -0400 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2018-03-29 22:11:08 -0400 |
commit | 741424c4e7811c12d8cca28466f89bd61eaf3a75 (patch) | |
tree | 37af2aa063d42bf6ef3bc967bb1a5b6b679abbaf /sway/commands/bar/font.c | |
parent | Use statically allocated text buffer (diff) | |
download | sway-741424c4e7811c12d8cca28466f89bd61eaf3a75.tar.gz sway-741424c4e7811c12d8cca28466f89bd61eaf3a75.tar.zst sway-741424c4e7811c12d8cca28466f89bd61eaf3a75.zip |
Clean up imported bar commands
Diffstat (limited to 'sway/commands/bar/font.c')
-rw-r--r-- | sway/commands/bar/font.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/sway/commands/bar/font.c b/sway/commands/bar/font.c index 6d7c533a..80b7a593 100644 --- a/sway/commands/bar/font.c +++ b/sway/commands/bar/font.c | |||
@@ -1,3 +1,4 @@ | |||
1 | #define _POSIX_C_SOURCE 200809L | ||
1 | #include <string.h> | 2 | #include <string.h> |
2 | #include "sway/commands.h" | 3 | #include "sway/commands.h" |
3 | #include "log.h" | 4 | #include "log.h" |
@@ -8,19 +9,13 @@ struct cmd_results *bar_cmd_font(int argc, char **argv) { | |||
8 | if ((error = checkarg(argc, "font", EXPECTED_AT_LEAST, 1))) { | 9 | if ((error = checkarg(argc, "font", EXPECTED_AT_LEAST, 1))) { |
9 | return error; | 10 | return error; |
10 | } | 11 | } |
11 | |||
12 | if (!config->current_bar) { | 12 | if (!config->current_bar) { |
13 | return cmd_results_new(CMD_FAILURE, "font", "No bar defined."); | 13 | return cmd_results_new(CMD_FAILURE, "font", "No bar defined."); |
14 | } | 14 | } |
15 | |||
16 | char *font = join_args(argv, argc); | 15 | char *font = join_args(argv, argc); |
17 | free(config->current_bar->font); | 16 | free(config->current_bar->font); |
18 | if (strlen(font) > 6 && strncmp("pango:", font, 6) == 0) { | 17 | config->current_bar->font = strdup(font); |
19 | config->current_bar->font = font; | 18 | wlr_log(L_DEBUG, "Settings font '%s' for bar: %s", |
20 | } else { | 19 | config->current_bar->font, config->current_bar->id); |
21 | config->current_bar->font = font; | ||
22 | } | ||
23 | |||
24 | wlr_log(L_DEBUG, "Settings font '%s' for bar: %s", config->current_bar->font, config->current_bar->id); | ||
25 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 20 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
26 | } | 21 | } |