From 6d57f03028b4b32b4377d869be8de9a7e6aa55ee Mon Sep 17 00:00:00 2001
From: Mikkel Oscar Lyderik <mikkeloscar@gmail.com>
Date: Mon, 22 Feb 2016 17:27:17 +0100
Subject: Make single bar handle multiple outputs

---
 include/bar/bar.h    | 11 ++++++++---
 include/bar/config.h |  3 +++
 include/bar/ipc.h    |  2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'include')

diff --git a/include/bar/bar.h b/include/bar/bar.h
index 89496da6..c20efc55 100644
--- a/include/bar/bar.h
+++ b/include/bar/bar.h
@@ -8,8 +8,7 @@
 struct bar {
 	struct config *config;
 	struct status_line *status;
-	struct output *output;
-	/* list_t *outputs; */
+	list_t *outputs;
 
 	int ipc_event_socketfd;
 	int ipc_socketfd;
@@ -22,6 +21,7 @@ struct output {
 	struct registry *registry;
 	list_t *workspaces;
 	char *name;
+	int idx;
 };
 
 struct workspace {
@@ -35,7 +35,12 @@ struct workspace {
 /**
  * Setup bar.
  */
-void bar_setup(struct bar *bar, const char *socket_path, const char *bar_id, int desired_output);
+void bar_setup(struct bar *bar, const char *socket_path, const char *bar_id);
+
+/**
+ * Create new output struct from name.
+ */
+struct output *new_output(const char *name);
 
 /**
  * Bar mainloop.
diff --git a/include/bar/config.h b/include/bar/config.h
index 508b9c42..dfad0ba4 100644
--- a/include/bar/config.h
+++ b/include/bar/config.h
@@ -4,6 +4,8 @@
 #include <stdint.h>
 #include <stdbool.h>
 
+#include "list.h"
+
 /**
  * Colors for a box with background, border and text colors.
  */
@@ -25,6 +27,7 @@ struct config {
 	bool strip_workspace_numbers;
 	bool binding_mode_indicator;
 	bool workspace_buttons;
+	list_t *outputs;
 
 	int height;
 
diff --git a/include/bar/ipc.h b/include/bar/ipc.h
index c3f661f8..741c067b 100644
--- a/include/bar/ipc.h
+++ b/include/bar/ipc.h
@@ -6,7 +6,7 @@
 /**
  * Initialize ipc connection to sway and get sway state, outputs, bar_config.
  */
-void ipc_bar_init(struct bar *bar, int outputi, const char *bar_id);
+void ipc_bar_init(struct bar *bar, const char *bar_id);
 
 /**
  * Handle ipc event from sway.
-- 
cgit v1.2.3-54-g00ecf