sway

commit 2a90d26ebe2af75a19f1850a6a2105170b825e9a
parent 00d450e5540deedd5071b4c4b467dcf0ae82f299
Author: Drew DeVault <sir@cmpwn.com>
Date:   Fri, 30 Mar 2018 00:30:38 -0400

Fix issues with swaybar on DRM

Diffstat:
M
include/swaybar/config.h
 | 
1
+
M
swaybar/ipc.c
 | 
6
++++--

2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/include/swaybar/config.h b/include/swaybar/config.h
@@ -30,6 +30,7 @@ struct swaybar_config {
 	bool wrap_scroll;
 	bool workspace_buttons;
 	struct wl_list outputs;
+	bool all_outputs;
 	int height;
 
 	struct {
diff --git a/swaybar/ipc.c b/swaybar/ipc.c
@@ -188,7 +188,7 @@ static void ipc_parse_config(
 			json_object *output = json_object_array_get_idx(outputs, i);
 			const char *name = json_object_get_string(output);
 			if (strcmp("*", name) == 0) {
-				// TODO: do we need to clear out the list here or something
+				config->all_outputs = true;
 				break;
 			}
 			struct config_output *coutput = calloc(
@@ -197,6 +197,8 @@ static void ipc_parse_config(
 			coutput->index = SIZE_MAX;
 			wl_list_insert(&config->outputs, &coutput->link);
 		}
+	} else {
+		config->all_outputs = true;
 	}
 
 	if (colors) {
@@ -279,7 +281,7 @@ static void ipc_get_outputs(struct swaybar *bar) {
 		if (!active) {
 			continue;
 		}
-		if (wl_list_empty(&bar->config->outputs)) {
+		if (bar->config->all_outputs) {
 			struct config_output *coutput = calloc(
 					1, sizeof(struct config_output));
 			coutput->name = strdup(name);