diff options
author | norly <ny-git@enpas.org> | 2013-10-02 15:43:13 +0200 |
---|---|---|
committer | norly <ny-git@enpas.org> | 2013-10-02 18:10:51 +0200 |
commit | 53266a8bdc96e5313a64fa4aec34c4b0bb61bd47 (patch) | |
tree | 98555bca6372e0232864a56bcf4d1f9ed1c6f89e /src/common/common.c | |
parent | 665fd156d476563148015a174d8c695a1350bfa4 (diff) |
Change output format from dzen2 to i3bar
Diffstat (limited to 'src/common/common.c')
-rw-r--r-- | src/common/common.c | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/src/common/common.c b/src/common/common.c index 9e62259..4133ca8 100644 --- a/src/common/common.c +++ b/src/common/common.c @@ -18,6 +18,9 @@ void line_clear(GlobalData *g) g->line[0] = '\0'; g->linelen = 0; + g->firstItemDone = 0; + + line_append_str(g, "["); } @@ -45,24 +48,31 @@ void line_append_str(GlobalData *g, char *string) void line_append_item(GlobalData *g, StatusItem *s) { - line_append_str(g, " "); + if (g->firstItemDone) { + line_append_str(g, ","); + } + g->firstItemDone = 1; + + line_append_str(g, "{"); if (s->color) { - line_append_str(g, "^fg("); + line_append_str(g, "\"color\":\""); line_append_str(g, s->color); - line_append_str(g, ")"); + line_append_str(g, "\","); } - if (s->text) { - line_append_str(g, s->text); - } + line_append_str(g, "\"full_text\":\""); + assert(s->text); + line_append_str(g, s->text); + line_append_str(g, "\""); - line_append_str(g, " "); + line_append_str(g, "}"); } void line_print(GlobalData *g) { + line_append_str(g, "],"); puts(g->line); } |