projects
/
sysstatus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change output format from dzen2 to i3bar
[sysstatus.git]
/
src
/
common
/
common.c
diff --git
a/src/common/common.c
b/src/common/common.c
index 9e62259ea2b96374fb38089ee7d1b555a5fa7d79..4133ca858bb7edf4407e06bf8ceaecf838be24fe 100644
(file)
--- 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->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)
{
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) {
if (s->color) {
- line_append_str(g, "
^fg(
");
+ line_append_str(g, "
\"color\":\"
");
line_append_str(g, s->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)
{
}
void line_print(GlobalData *g)
{
+ line_append_str(g, "],");
puts(g->line);
}
puts(g->line);
}