mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-01 07:16:02 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Handle swaybar status line errors

Browse source 
The event loop API was redesigned to avoid race conditions as well.
Fixes #1583
This commit is contained in:
Calvin Lee 2018-02-04 10:37:46 -07:00
parent 6ffcb031f9
commit a83bca6db5
5 changed files with 94 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

29
swaybar/status_line.c
View file

@ -511,6 +511,35 @@ bool handle_status_line(struct bar *bar) {
return dirty;
}
void handle_status_hup(struct status_line *line) {
// This is somewhat hacky, but free all previous status line state and
// then create a status block that displays an error string. This is so
// we can have pretty error colors.
sway_log(L_ERROR, "Replacing statusline with error string, as the status command has failed");
if (line->block_line) {
list_foreach(line->block_line, free_status_block);
list_free(line->block_line);
}
line->block_line = create_list();
struct status_block *new = calloc(1, sizeof(struct status_block));
new->full_text = strdup("ERROR: swaybar cannot access the statusline");
new->color = 0xff0000ff;
new->min_width = 0;
new->align = strdup("left");
new->markup = false;
new->separator = true;
new->separator_block_width = 9;
new->background = 0x0;
new->border = 0x0;
new->border_top = 1;
new->border_bottom = 1;
new->border_left = 1;
new->border_right = 1;
list_add(line->block_line, new);
line->protocol = I3BAR;
}
struct status_line *init_status_line() {
struct status_line *line = malloc(sizeof(struct status_line));
line->block_line = create_list();