diff options
author | Daniel Otero <otero.o.daniel@gmail.com> | 2021-03-19 18:02:46 +0100 |
---|---|---|
committer | Simon Ser <contact@emersion.fr> | 2021-06-03 14:18:23 +0200 |
commit | b997147284b9d5632f1f929f02a17936a77cd7ec (patch) | |
tree | 6a2e93690d0dbd3c4eb032ce3d2bbf7e9671af27 /sway/commands/bar | |
parent | Only defer seat attachment during initial startup (diff) | |
download | sway-b997147284b9d5632f1f929f02a17936a77cd7ec.tar.gz sway-b997147284b9d5632f1f929f02a17936a77cd7ec.tar.zst sway-b997147284b9d5632f1f929f02a17936a77cd7ec.zip |
config: Fix swaybar pango_markup inconsistency
Until now, swaybar did not have pango markup enabled by default, even if
the sway config had it on. This patch aims to mimic the i3 behavior, but
maintaining the functionality of the "pango_markup" sway config command.
Diffstat (limited to 'sway/commands/bar')
-rw-r--r-- | sway/commands/bar/font.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/sway/commands/bar/font.c b/sway/commands/bar/font.c index 62987f3e..891c87af 100644 --- a/sway/commands/bar/font.c +++ b/sway/commands/bar/font.c | |||
@@ -11,7 +11,20 @@ struct cmd_results *bar_cmd_font(int argc, char **argv) { | |||
11 | } | 11 | } |
12 | char *font = join_args(argv, argc); | 12 | char *font = join_args(argv, argc); |
13 | free(config->current_bar->font); | 13 | free(config->current_bar->font); |
14 | config->current_bar->font = font; | 14 | |
15 | if (strncmp(font, "pango:", 6) == 0) { | ||
16 | if (config->current_bar->pango_markup == PANGO_MARKUP_DEFAULT) { | ||
17 | config->current_bar->pango_markup = true; | ||
18 | } | ||
19 | config->current_bar->font = strdup(font + 6); | ||
20 | } else { | ||
21 | if (config->current_bar->pango_markup == PANGO_MARKUP_DEFAULT) { | ||
22 | config->current_bar->pango_markup = false; | ||
23 | } | ||
24 | config->current_bar->font = strdup(font); | ||
25 | } | ||
26 | |||
27 | free(font); | ||
15 | sway_log(SWAY_DEBUG, "Settings font '%s' for bar: %s", | 28 | sway_log(SWAY_DEBUG, "Settings font '%s' for bar: %s", |
16 | config->current_bar->font, config->current_bar->id); | 29 | config->current_bar->font, config->current_bar->id); |
17 | return cmd_results_new(CMD_SUCCESS, NULL); | 30 | return cmd_results_new(CMD_SUCCESS, NULL); |