5 files changed, 20 insertions, 9 deletions

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..fc938c38 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,8 @@ struct config {
         bool strip_workspace_numbers;
         bool binding_mode_indicator;
         bool workspace_buttons;
+        bool all_outputs;
+        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.
diff --git a/include/config.h b/include/config.h
index 655d0a9c..d77872ee 100644
--- a/include/config.h
+++ b/include/config.h
@@ -125,6 +125,7 @@ struct bar_config {
         bool strip_workspace_numbers;
         bool binding_mode_indicator;
         bool verbose;
+        pid_t pid;
         struct {
                 char background[10];
                 char statusline[10];
@@ -192,6 +193,10 @@ bool load_config(const char *file);
  */
 bool read_config(FILE *file, bool is_active);
 /**
+ * Free config struct
+ */
+void free_config(struct sway_config *config);
+/**
  * Does variable replacement for a string based on the config's currently loaded variables.
  */
 char *do_var_replacement(char *str);
@@ -226,8 +231,7 @@ int sway_mouse_binding_cmp_qsort(const void *a, const void *b);
 int sway_mouse_binding_cmp_buttons(const void *a, const void *b);
 void free_sway_mouse_binding(struct sway_mouse_binding *smb);
 
-void load_swaybars(swayc_t *output, int output_idx);
-void terminate_swaybars(list_t *pids);
+void load_swaybars();
 void terminate_swaybg(pid_t pid);
 
 /**
diff --git a/include/container.h b/include/container.h
index d5126e74..a96beab9 100644
--- a/include/container.h
+++ b/include/container.h
@@ -82,9 +82,7 @@ struct sway_container {
         char *class;
         char *app_id;
 
-        // Used by output containers to keep track of swaybar/swaybg child
-        // processes.
-        list_t *bar_pids;
+        // Used by output containers to keep track of swaybg child processes.
         pid_t bg_pid;
 
         int gaps;