aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLibravatar Daniel Otero <otero.o.daniel@gmail.com>2021-03-19 18:02:46 +0100
committerLibravatar Simon Ser <contact@emersion.fr>2021-06-03 14:18:23 +0200
commitb997147284b9d5632f1f929f02a17936a77cd7ec (patch)
tree6a2e93690d0dbd3c4eb032ce3d2bbf7e9671af27 /include
parentOnly defer seat attachment during initial startup (diff)
downloadsway-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 'include')
-rw-r--r--include/sway/config.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/include/sway/config.h b/include/sway/config.h
index 2a1df2b6..254fbad0 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -292,6 +292,12 @@ struct workspace_config {
292 struct side_gaps gaps_outer; 292 struct side_gaps gaps_outer;
293}; 293};
294 294
295enum pango_markup_config {
296 PANGO_MARKUP_DISABLED = false,
297 PANGO_MARKUP_ENABLED = true,
298 PANGO_MARKUP_DEFAULT // The default is font dependent ("pango:" prefix)
299};
300
295struct bar_config { 301struct bar_config {
296 char *swaybar_command; 302 char *swaybar_command;
297 struct wl_client *client; 303 struct wl_client *client;
@@ -323,7 +329,7 @@ struct bar_config {
323 char *position; 329 char *position;
324 list_t *bindings; 330 list_t *bindings;
325 char *status_command; 331 char *status_command;
326 bool pango_markup; 332 enum pango_markup_config pango_markup;
327 char *font; 333 char *font;
328 int height; // -1 not defined 334 int height; // -1 not defined
329 bool workspace_buttons; 335 bool workspace_buttons;