aboutsummaryrefslogtreecommitdiff
path: root/include/bar
diff options
context:
space:
mode:
Diffstat (limited to 'include/bar')
-rw-r--r--include/bar/bar.h11
-rw-r--r--include/bar/config.h4
-rw-r--r--include/bar/ipc.h2
3 files changed, 13 insertions, 4 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.