Merge pull request #2723 from ianyfan/swaybar

swaybar: small fixes and clean-ups

4 files changed, 36 insertions, 31 deletions

diff --git a/include/swaybar/bar.h b/include/swaybar/bar.h
index 29e96159..20992014 100644
--- a/include/swaybar/bar.h
+++ b/include/swaybar/bar.h
@@ -54,7 +54,6 @@ struct swaybar {
         struct wl_seat *seat;
 
         struct swaybar_config *config;
-        struct swaybar_output *focused_output;
         struct swaybar_pointer pointer;
         struct status_line *status;
 
@@ -95,9 +94,7 @@ struct swaybar_workspace {
         bool urgent;
 };
 
-void bar_setup(struct swaybar *bar,
-        const char *socket_path,
-        const char *bar_id);
+bool bar_setup(struct swaybar *bar, const char *socket_path, const char *bar_id);
 void bar_run(struct swaybar *bar);
 void bar_teardown(struct swaybar *bar);
 
diff --git a/include/swaybar/i3bar.h b/include/swaybar/i3bar.h
new file mode 100644
index 00000000..12d9b317
--- /dev/null
+++ b/include/swaybar/i3bar.h
@@ -0,0 +1,34 @@
+#ifndef _SWAYBAR_I3BAR_H
+#define _SWAYBAR_I3BAR_H
+
+#include "bar.h"
+#include "status_line.h"
+
+struct i3bar_block {
+        struct wl_list link;
+        int ref_count;
+        char *full_text, *short_text, *align;
+        bool urgent;
+        uint32_t *color;
+        int min_width;
+        char *name, *instance;
+        bool separator;
+        int separator_block_width;
+        bool markup;
+        // Airblader features
+        uint32_t background;
+        uint32_t border;
+        int border_top;
+        int border_bottom;
+        int border_left;
+        int border_right;
+};
+
+void i3bar_block_unref(struct i3bar_block *block);
+bool i3bar_handle_readable(struct status_line *status);
+enum hotspot_event_handling i3bar_block_send_click(struct status_line *status,
+                struct i3bar_block *block, int x, int y, enum x11_button button);
+enum x11_button wl_button_to_x11_button(uint32_t button);
+enum x11_button wl_axis_to_x11_button(uint32_t axis, wl_fixed_t value);
+
+#endif
diff --git a/include/swaybar/ipc.h b/include/swaybar/ipc.h
index a1696bcf..81e48a6b 100644
--- a/include/swaybar/ipc.h
+++ b/include/swaybar/ipc.h
@@ -3,7 +3,7 @@
 #include <stdbool.h>
 #include "swaybar/bar.h"
 
-void ipc_initialize(struct swaybar *bar, const char *bar_id);
+bool ipc_initialize(struct swaybar *bar, const char *bar_id);
 bool handle_ipc_readable(struct swaybar *bar);
 void ipc_get_workspaces(struct swaybar *bar);
 void ipc_send_workspace_command(struct swaybar *bar, const char *ws);
diff --git a/include/swaybar/status_line.h b/include/swaybar/status_line.h
index d3eabdf6..e6c7dac2 100644
--- a/include/swaybar/status_line.h
+++ b/include/swaybar/status_line.h
@@ -13,26 +13,6 @@ enum status_protocol {
         PROTOCOL_I3BAR,
 };
 
-struct i3bar_block {
-        struct wl_list link;
-        int ref_count;
-        char *full_text, *short_text, *align;
-        bool urgent;
-        uint32_t *color;
-        int min_width;
-        char *name, *instance;
-        bool separator;
-        int separator_block_width;
-        bool markup;
-        // Airblader features
-        uint32_t background;
-        uint32_t border;
-        int border_top;
-        int border_bottom;
-        int border_left;
-        int border_right;
-};
-
 struct status_line {
         pid_t pid;
         int read_fd, write_fd;
@@ -55,11 +35,5 @@ struct status_line *status_line_init(char *cmd);
 void status_error(struct status_line *status, const char *text);
 bool status_handle_readable(struct status_line *status);
 void status_line_free(struct status_line *status);
-bool i3bar_handle_readable(struct status_line *status);
-enum hotspot_event_handling i3bar_block_send_click(struct status_line *status,
-                struct i3bar_block *block, int x, int y, enum x11_button button);
-void i3bar_block_unref(struct i3bar_block *block);
-enum x11_button wl_button_to_x11_button(uint32_t button);
-enum x11_button wl_axis_to_x11_button(uint32_t axis, wl_fixed_t value);
 
 #endif