aboutsummaryrefslogtreecommitdiffstats
path: root/swaybar/status_line.c
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2016-04-17 11:35:22 -0400
committerLibravatar Drew DeVault <sir@cmpwn.com>2016-04-17 11:36:03 -0400
commit84fae94ab9ca7fd148c786d224c49205a212882e (patch)
treed3d3e8a16f96e400ee07cc44e2f9110195bea02a /swaybar/status_line.c
parentMerge pull request #590 from mikkeloscar/i686-warnings (diff)
downloadsway-84fae94ab9ca7fd148c786d224c49205a212882e.tar.gz
sway-84fae94ab9ca7fd148c786d224c49205a212882e.tar.zst
sway-84fae94ab9ca7fd148c786d224c49205a212882e.zip
Flesh out pango markup implementation
Diffstat (limited to 'swaybar/status_line.c')
-rw-r--r--swaybar/status_line.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/swaybar/status_line.c b/swaybar/status_line.c
index ba6de6a1..63db702f 100644
--- a/swaybar/status_line.c
+++ b/swaybar/status_line.c
@@ -71,7 +71,7 @@ static void parse_json(struct bar *bar, const char *text) {
71 json_object *full_text, *short_text, *color, *min_width, *align, *urgent; 71 json_object *full_text, *short_text, *color, *min_width, *align, *urgent;
72 json_object *name, *instance, *separator, *separator_block_width; 72 json_object *name, *instance, *separator, *separator_block_width;
73 json_object *background, *border, *border_top, *border_bottom; 73 json_object *background, *border, *border_top, *border_bottom;
74 json_object *border_left, *border_right; 74 json_object *border_left, *border_right, *markup;
75 75
76 json_object *json = json_object_array_get_idx(results, i); 76 json_object *json = json_object_array_get_idx(results, i);
77 if (!json) { 77 if (!json) {
@@ -86,6 +86,7 @@ static void parse_json(struct bar *bar, const char *text) {
86 json_object_object_get_ex(json, "urgent", &urgent); 86 json_object_object_get_ex(json, "urgent", &urgent);
87 json_object_object_get_ex(json, "name", &name); 87 json_object_object_get_ex(json, "name", &name);
88 json_object_object_get_ex(json, "instance", &instance); 88 json_object_object_get_ex(json, "instance", &instance);
89 json_object_object_get_ex(json, "markup", &markup);
89 json_object_object_get_ex(json, "separator", &separator); 90 json_object_object_get_ex(json, "separator", &separator);
90 json_object_object_get_ex(json, "separator_block_width", &separator_block_width); 91 json_object_object_get_ex(json, "separator_block_width", &separator_block_width);
91 json_object_object_get_ex(json, "background", &background); 92 json_object_object_get_ex(json, "background", &background);
@@ -139,6 +140,10 @@ static void parse_json(struct bar *bar, const char *text) {
139 new->instance = strdup(json_object_get_string(instance)); 140 new->instance = strdup(json_object_get_string(instance));
140 } 141 }
141 142
143 if (markup) {
144 new->markup = json_object_get_boolean(markup);
145 }
146
142 if (separator) { 147 if (separator) {
143 new->separator = json_object_get_int(separator); 148 new->separator = json_object_get_int(separator);
144 } else { 149 } else {