From cab1352801b62d1b8a12ca1c995cb24445ce4bc9 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Wed, 28 Mar 2018 23:04:20 -0400
Subject: Start port of swaybar to layer shell

This starts up the event loop and wayland display and shims out the
basic top level rendering concepts. Also includes some changes to
incorporate pango into the 1.x codebase properly.
---
 include/pango.h              | 16 ++++++++
 include/sway/config.h        |  7 ++--
 include/swaybar/bar.h        | 89 +++++++++++++++-----------------------------
 include/swaybar/config.h     | 43 +++------------------
 include/swaybar/event_loop.h |  4 +-
 include/swaybar/ipc.h        | 22 ++---------
 include/swaybar/render.h     | 22 +++--------
 7 files changed, 67 insertions(+), 136 deletions(-)
 create mode 100644 include/pango.h

(limited to 'include')

diff --git a/include/pango.h b/include/pango.h
new file mode 100644
index 00000000..f6325f28
--- /dev/null
+++ b/include/pango.h
@@ -0,0 +1,16 @@
+#ifndef _SWAY_PANGO_H
+#define _SWAY_PANGO_H
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <cairo/cairo.h>
+#include <pango/pangocairo.h>
+
+PangoLayout *get_pango_layout(cairo_t *cairo, const char *font,
+		const char *text, int32_t scale, bool markup);
+void get_text_size(cairo_t *cairo, const char *font, int *width, int *height,
+		int32_t scale, bool markup, const char *fmt, ...);
+void pango_printf(cairo_t *cairo, const char *font,
+		int32_t scale, bool markup, const char *fmt, ...);
+
+#endif
diff --git a/include/sway/config.h b/include/sway/config.h
index 48a8b0ab..8c9e04de 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -1,17 +1,16 @@
 #ifndef _SWAY_CONFIG_H
 #define _SWAY_CONFIG_H
-
 #define PID_WORKSPACE_TIMEOUT 60
-
 #include <libinput.h>
 #include <stdint.h>
 #include <string.h>
+#include <time.h>
 #include <wlr/types/wlr_box.h>
 #include <xkbcommon/xkbcommon.h>
-#include <time.h>
 #include "list.h"
 #include "layout.h"
 #include "container.h"
+#include "wlr-layer-shell-unstable-v1-protocol.h"
 
 /**
  * Describes a variable created via the `set` command.
@@ -152,7 +151,7 @@ struct bar_config {
 	char *id;
 	uint32_t modifier;
 	list_t *outputs;
-	//enum desktop_shell_panel_position position; // TODO
+	char *position;
 	list_t *bindings;
 	char *status_command;
 	bool pango_markup;
diff --git a/include/swaybar/bar.h b/include/swaybar/bar.h
index 50d36e76..3ae8c0b3 100644
--- a/include/swaybar/bar.h
+++ b/include/swaybar/bar.h
@@ -1,72 +1,45 @@
 #ifndef _SWAYBAR_BAR_H
 #define _SWAYBAR_BAR_H
-
-#include "client/registry.h"
-#include "client/window.h"
+#include <wayland-client.h>
+#include "pool-buffer.h"
 #include "list.h"
 
-struct bar {
-	struct config *config;
-	struct status_line *status;
-	list_t *outputs;
-	struct output *focused_output;
+struct swaybar_config;
+struct swaybar_output;
+struct swaybar_workspace;
+
+struct swaybar {
+	struct wl_display *display;
+	struct wl_compositor *compositor;
+	struct zwlr_layer_shell_v1 *layer_shell;
+	struct wl_shm *shm;
 
-	int ipc_event_socketfd;
-	int ipc_socketfd;
-	int status_read_fd;
-	int status_write_fd;
-	pid_t status_command_pid;
+	struct swaybar_config *config;
+	struct swaybar_output *focused_output;
+
+	struct wl_list outputs;
 };
 
-struct output {
-	struct window *window;
-	struct registry *registry;
-	list_t *workspaces;
-#ifdef ENABLE_TRAY
-	list_t *items;
-#endif
+struct swaybar_output {
+	struct wl_list link;
+	struct swaybar *bar;
+	struct wl_output *output;
+	struct wl_surface *surface;
+	struct zwlr_layer_surface_v1 *layer_surface;
+
 	char *name;
 	int idx;
 	bool focused;
-};
 
-struct workspace {
-	int num;
-	char *name;
-	bool focused;
-	bool visible;
-	bool urgent;
+	uint32_t width, height;
+	struct pool_buffer buffers[2];
+	struct pool_buffer *current_buffer;
 };
 
-/** Global bar state */
-extern struct bar swaybar;
+void 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);
 
-/** True if sway needs to render */
-extern bool dirty;
-
-/**
- * Setup bar.
- */
-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.
- */
-void bar_run(struct bar *bar);
-
-/**
- * free workspace list.
- */
-void free_workspaces(list_t *workspaces);
-
-/**
- * Teardown bar.
- */
-void bar_teardown(struct bar *bar);
-
-#endif /* _SWAYBAR_BAR_H */
+#endif
diff --git a/include/swaybar/config.h b/include/swaybar/config.h
index 651f0ee3..1bfe4843 100644
--- a/include/swaybar/config.h
+++ b/include/swaybar/config.h
@@ -1,9 +1,7 @@
 #ifndef _SWAYBAR_CONFIG_H
 #define _SWAYBAR_CONFIG_H
-
-#include <stdint.h>
 #include <stdbool.h>
-
+#include <stdint.h>
 #include "list.h"
 #include "util.h"
 
@@ -19,10 +17,10 @@ struct box_colors {
 /**
  * Swaybar config.
  */
-struct config {
+struct swaybar_config {
 	char *status_command;
 	bool pango_markup;
-	uint32_t position;
+	uint32_t position; // zwlr_layer_surface_v1_anchor
 	char *font;
 	char *sep_symbol;
 	char *mode;
@@ -32,18 +30,6 @@ struct config {
 	bool workspace_buttons;
 	bool all_outputs;
 	list_t *outputs;
-
-#ifdef ENABLE_TRAY
-	// Tray
-	char *tray_output;
-	char *icon_theme;
-
-	uint32_t tray_padding;
-	uint32_t activate_button;
-	uint32_t context_button;
-	uint32_t secondary_button;
-#endif
-
 	int height;
 
 	struct {
@@ -63,24 +49,7 @@ struct config {
 	} colors;
 };
 
-/**
- * Parse position top|bottom|left|right.
- */
-uint32_t parse_position(const char *position);
-
-/**
- * Parse font.
- */
-char *parse_font(const char *font);
-
-/**
- * Initialize default sway config.
- */
-struct config *init_config();
-
-/**
- * Free config struct.
- */
-void free_config(struct config *config);
+struct swaybar_config *init_config();
+void free_config(struct swaybar_config *config);
 
-#endif /* _SWAYBAR_CONFIG_H */
+#endif
diff --git a/include/swaybar/event_loop.h b/include/swaybar/event_loop.h
index a0cde07f..99f6ed36 100644
--- a/include/swaybar/event_loop.h
+++ b/include/swaybar/event_loop.h
@@ -1,6 +1,5 @@
 #ifndef _SWAYBAR_EVENT_LOOP_H
 #define _SWAYBAR_EVENT_LOOP_H
-
 #include <stdbool.h>
 #include <time.h>
 
@@ -23,4 +22,5 @@ bool remove_timer(timer_t timer);
 void event_loop_poll();
 
 void init_event_loop();
-#endif /*_SWAYBAR_EVENT_LOOP_H */
+
+#endif
diff --git a/include/swaybar/ipc.h b/include/swaybar/ipc.h
index c11931d0..57a1b925 100644
--- a/include/swaybar/ipc.h
+++ b/include/swaybar/ipc.h
@@ -1,23 +1,9 @@
 #ifndef _SWAYBAR_IPC_H
 #define _SWAYBAR_IPC_H
+#include "swaybar/bar.h"
 
-#include "bar.h"
-
-/**
- * Initialize ipc connection to sway and get sway state, outputs, bar_config.
- */
-void ipc_bar_init(struct bar *bar, const char *bar_id);
-
-/**
- * Handle ipc event from sway.
- */
-bool handle_ipc_event(struct bar *bar);
-
-
-/**
- * Send workspace command to sway
- */
+void ipc_bar_init(struct swaybar *bar, const char *bar_id);
+bool handle_ipc_event(struct swaybar *bar);
 void ipc_send_workspace_command(const char *workspace_name);
 
-#endif /* _SWAYBAR_IPC_H */
-
+#endif
diff --git a/include/swaybar/render.h b/include/swaybar/render.h
index 114f43f4..071e2298 100644
--- a/include/swaybar/render.h
+++ b/include/swaybar/render.h
@@ -1,22 +1,10 @@
 #ifndef _SWAYBAR_RENDER_H
 #define _SWAYBAR_RENDER_H
 
-#include "config.h"
-#include "bar.h"
+struct swaybar;
+struct swaybar_output;
+struct swaybar_config;
 
-/**
- * Render swaybar.
- */
-void render(struct output *output, struct config *config, struct status_line *line);
+void render_frame(struct swaybar *bar, struct swaybar_output *output);
 
-/**
- * Set window height and modify internal spacing accordingly.
- */
-void set_window_height(struct window *window, int height);
-
-/**
- * Compute the size of a workspace name
- */
-void workspace_button_size(struct window *window, const char *workspace_name, int *width, int *height);
-
-#endif /* _SWAYBAR_RENDER_H */
+#endif
-- 
cgit v1.2.3


From 5c9ad035db1bebba3f1954dd1f4328c6421776d4 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Wed, 28 Mar 2018 23:56:02 -0400
Subject: Wire up basic IPC support

---
 include/swaybar/bar.h    |  3 +++
 include/swaybar/config.h | 17 ++++++++---------
 include/swaybar/ipc.h    |  5 ++---
 3 files changed, 13 insertions(+), 12 deletions(-)

(limited to 'include')

diff --git a/include/swaybar/bar.h b/include/swaybar/bar.h
index 3ae8c0b3..df685f47 100644
--- a/include/swaybar/bar.h
+++ b/include/swaybar/bar.h
@@ -17,6 +17,9 @@ struct swaybar {
 	struct swaybar_config *config;
 	struct swaybar_output *focused_output;
 
+	int ipc_event_socketfd;
+	int ipc_socketfd;
+
 	struct wl_list outputs;
 };
 
diff --git a/include/swaybar/config.h b/include/swaybar/config.h
index 1bfe4843..4b3b5b34 100644
--- a/include/swaybar/config.h
+++ b/include/swaybar/config.h
@@ -2,21 +2,20 @@
 #define _SWAYBAR_CONFIG_H
 #include <stdbool.h>
 #include <stdint.h>
-#include "list.h"
+#include <wayland-client.h>
 #include "util.h"
 
-/**
- * Colors for a box with background, border and text colors.
- */
 struct box_colors {
 	uint32_t border;
 	uint32_t background;
 	uint32_t text;
 };
 
-/**
- * Swaybar config.
- */
+struct config_output {
+	struct wl_list link;
+	char *name;
+};
+
 struct swaybar_config {
 	char *status_command;
 	bool pango_markup;
@@ -28,8 +27,7 @@ struct swaybar_config {
 	bool binding_mode_indicator;
 	bool wrap_scroll;
 	bool workspace_buttons;
-	bool all_outputs;
-	list_t *outputs;
+	struct wl_list outputs;
 	int height;
 
 	struct {
@@ -51,5 +49,6 @@ struct swaybar_config {
 
 struct swaybar_config *init_config();
 void free_config(struct swaybar_config *config);
+uint32_t parse_position(const char *position);
 
 #endif
diff --git a/include/swaybar/ipc.h b/include/swaybar/ipc.h
index 57a1b925..7f71a506 100644
--- a/include/swaybar/ipc.h
+++ b/include/swaybar/ipc.h
@@ -2,8 +2,7 @@
 #define _SWAYBAR_IPC_H
 #include "swaybar/bar.h"
 
-void ipc_bar_init(struct swaybar *bar, const char *bar_id);
-bool handle_ipc_event(struct swaybar *bar);
-void ipc_send_workspace_command(const char *workspace_name);
+void ipc_get_config(struct swaybar *bar, const char *bar_id);
+void handle_ipc_event(struct swaybar *bar);
 
 #endif
-- 
cgit v1.2.3


From e5e8094dc3119584ae611c3197b38243b6c016c9 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Thu, 29 Mar 2018 00:07:35 -0400
Subject: Only utilize the configured outputs

---
 include/swaybar/bar.h    | 2 +-
 include/swaybar/config.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/swaybar/bar.h b/include/swaybar/bar.h
index df685f47..6e1ab66d 100644
--- a/include/swaybar/bar.h
+++ b/include/swaybar/bar.h
@@ -31,7 +31,7 @@ struct swaybar_output {
 	struct zwlr_layer_surface_v1 *layer_surface;
 
 	char *name;
-	int idx;
+	size_t index;
 	bool focused;
 
 	uint32_t width, height;
diff --git a/include/swaybar/config.h b/include/swaybar/config.h
index 4b3b5b34..6bcefe64 100644
--- a/include/swaybar/config.h
+++ b/include/swaybar/config.h
@@ -14,6 +14,7 @@ struct box_colors {
 struct config_output {
 	struct wl_list link;
 	char *name;
+	size_t index;
 };
 
 struct swaybar_config {
-- 
cgit v1.2.3


From 3399ad9840f0d3d42b377f4404115d887f65e18a Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Thu, 29 Mar 2018 00:21:05 -0400
Subject: Round up workspaces on each output

---
 include/swaybar/bar.h | 16 ++++++++++++++--
 include/swaybar/ipc.h |  3 ++-
 2 files changed, 16 insertions(+), 3 deletions(-)

(limited to 'include')

diff --git a/include/swaybar/bar.h b/include/swaybar/bar.h
index 6e1ab66d..c89aa61c 100644
--- a/include/swaybar/bar.h
+++ b/include/swaybar/bar.h
@@ -30,6 +30,8 @@ struct swaybar_output {
 	struct wl_surface *surface;
 	struct zwlr_layer_surface_v1 *layer_surface;
 
+	struct wl_list workspaces;
+
 	char *name;
 	size_t index;
 	bool focused;
@@ -39,9 +41,19 @@ struct swaybar_output {
 	struct pool_buffer *current_buffer;
 };
 
+struct swaybar_workspace {
+	struct wl_list link;
+	int num;
+	char *name;
+	bool focused;
+	bool visible;
+	bool urgent;
+};
+
+// TODO: Rename stuff to match wlroots conventions (init/create/etc)
 void bar_setup(struct swaybar *bar,
-		const char *socket_path,
-		const char *bar_id);
+	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/ipc.h b/include/swaybar/ipc.h
index 7f71a506..f3881bd0 100644
--- a/include/swaybar/ipc.h
+++ b/include/swaybar/ipc.h
@@ -2,7 +2,8 @@
 #define _SWAYBAR_IPC_H
 #include "swaybar/bar.h"
 
-void ipc_get_config(struct swaybar *bar, const char *bar_id);
+void ipc_initialize(struct swaybar *bar, const char *bar_id);
 void handle_ipc_event(struct swaybar *bar);
+void ipc_get_workspaces(struct swaybar *bar);
 
 #endif
-- 
cgit v1.2.3


From 86ba0fc15d7615b09f0279616d538af5c23bc551 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Thu, 29 Mar 2018 10:38:17 -0400
Subject: Re-render bar on IPC updates

---
 include/swaybar/ipc.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/swaybar/ipc.h b/include/swaybar/ipc.h
index f3881bd0..278baef0 100644
--- a/include/swaybar/ipc.h
+++ b/include/swaybar/ipc.h
@@ -1,9 +1,10 @@
 #ifndef _SWAYBAR_IPC_H
 #define _SWAYBAR_IPC_H
+#include <stdbool.h>
 #include "swaybar/bar.h"
 
 void ipc_initialize(struct swaybar *bar, const char *bar_id);
-void handle_ipc_event(struct swaybar *bar);
+bool handle_ipc_event(struct swaybar *bar);
 void ipc_get_workspaces(struct swaybar *bar);
 
 #endif
-- 
cgit v1.2.3


From 1e8faeec0263a7da311a13c56a0de34e47e66fa6 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Thu, 29 Mar 2018 11:58:54 -0400
Subject: Pixel-perfect rendering

---
 include/swaybar/config.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'include')

diff --git a/include/swaybar/config.h b/include/swaybar/config.h
index 6bcefe64..7634cb16 100644
--- a/include/swaybar/config.h
+++ b/include/swaybar/config.h
@@ -24,6 +24,7 @@ struct swaybar_config {
 	char *font;
 	char *sep_symbol;
 	char *mode;
+	bool mode_pango_markup;
 	bool strip_workspace_numbers;
 	bool binding_mode_indicator;
 	bool wrap_scroll;
-- 
cgit v1.2.3


From a76829f3756d3df22fe46e6688374497de29c2e1 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Thu, 29 Mar 2018 12:19:20 -0400
Subject: Some layer shell fixes

Based on the corresponding rootston changes
---
 include/sway/layers.h | 2 --
 include/sway/output.h | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/sway/layers.h b/include/sway/layers.h
index 22054be1..ee47c5ad 100644
--- a/include/sway/layers.h
+++ b/include/sway/layers.h
@@ -14,8 +14,6 @@ struct sway_layer_surface {
 	struct wl_listener unmap;
 	struct wl_listener surface_commit;
 	struct wl_listener output_destroy;
-	struct wl_listener output_mode;
-	struct wl_listener output_transform;
 
 	bool configured;
 	struct wlr_box geo;
diff --git a/include/sway/output.h b/include/sway/output.h
index f899230f..6fb79987 100644
--- a/include/sway/output.h
+++ b/include/sway/output.h
@@ -21,6 +21,7 @@ struct sway_output {
 	struct wl_listener frame;
 	struct wl_listener destroy;
 	struct wl_listener mode;
+	struct wl_listener transform;
 
 	pid_t bg_pid;
 };
-- 
cgit v1.2.3


From 0d0ab7c5ce148bce841fa0682d04bc7b6c21b902 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Thu, 29 Mar 2018 15:16:12 -0400
Subject: Implement status line

Does not yet support i3bar json protocol
---
 include/swaybar/bar.h         |  1 +
 include/swaybar/status_line.h | 65 +++++++++++--------------------------------
 2 files changed, 18 insertions(+), 48 deletions(-)

(limited to 'include')

diff --git a/include/swaybar/bar.h b/include/swaybar/bar.h
index c89aa61c..1bf2ea2d 100644
--- a/include/swaybar/bar.h
+++ b/include/swaybar/bar.h
@@ -16,6 +16,7 @@ struct swaybar {
 
 	struct swaybar_config *config;
 	struct swaybar_output *focused_output;
+	struct status_line *status;
 
 	int ipc_event_socketfd;
 	int ipc_socketfd;
diff --git a/include/swaybar/status_line.h b/include/swaybar/status_line.h
index 0664ddee..6c595df0 100644
--- a/include/swaybar/status_line.h
+++ b/include/swaybar/status_line.h
@@ -1,61 +1,30 @@
 #ifndef _SWAYBAR_STATUS_LINE_H
 #define _SWAYBAR_STATUS_LINE_H
-
 #include <stdint.h>
+#include <stdio.h>
 #include <stdbool.h>
-
-#include "list.h"
 #include "bar.h"
 
-typedef enum {UNDEF, TEXT, I3BAR} command_protocol;
+enum status_protocol {
+	PROTOCOL_UNDEF,
+	PROTOCOL_TEXT,
+	PROTOCOL_I3BAR,
+};
 
 struct status_line {
-	list_t *block_line;
-	const char *text_line;
-	command_protocol protocol;
-	bool click_events;
-};
+	pid_t pid;
+	int read_fd, write_fd;
+	FILE *read, *write;
 
-struct status_block {
-	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;
+	enum status_protocol protocol;
+	const char *text;
 
-	// Set during rendering
-	int x;
-	int width;
+	char *buffer;
+	size_t buffer_size;
 };
 
-/**
- * Initialize status line struct.
- */
-struct status_line *init_status_line();
-
-/**
- * handle status line activity.
- */
-bool handle_status_line(struct bar *bar);
-
-/**
- * Handle mouse clicks.
- */
-bool status_line_mouse_event(struct bar *bar, int x, int y, uint32_t button);
-
-/**
- * Free status line struct.
- */
-void free_status_line(struct status_line *line);
+struct status_line *status_line_init(char *cmd);
+void status_line_free(struct status_line *status);
+bool handle_status_readable(struct status_line *status);
 
-#endif /* _SWAYBAR_STATUS_LINE_H */
+#endif
-- 
cgit v1.2.3


From 6836074fed83255438960fdc9597532d8bcae4bd Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Thu, 29 Mar 2018 16:51:36 -0400
Subject: Implement enough IPC for swaybar to work

---
 include/sway/config.h     | 11 -----------
 include/sway/ipc-json.h   |  1 +
 include/sway/ipc-server.h |  1 +
 3 files changed, 2 insertions(+), 11 deletions(-)

(limited to 'include')

diff --git a/include/sway/config.h b/include/sway/config.h
index 8c9e04de..f9ab6778 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -158,17 +158,6 @@ struct bar_config {
 	char *swaybar_command;
 	char *font;
 	int height; // -1 not defined
-
-#ifdef ENABLE_TRAY
-	// Tray
-	char *tray_output;
-	char *icon_theme;
-	uint32_t tray_padding;
-	uint32_t activate_button;
-	uint32_t context_button;
-	uint32_t secondary_button;
-#endif
-
 	bool workspace_buttons;
 	bool wrap_scroll;
 	char *separator_symbol;
diff --git a/include/sway/ipc-json.h b/include/sway/ipc-json.h
index eef5a018..19c5b5bc 100644
--- a/include/sway/ipc-json.h
+++ b/include/sway/ipc-json.h
@@ -9,5 +9,6 @@ json_object *ipc_json_get_version();
 json_object *ipc_json_describe_container(swayc_t *c);
 json_object *ipc_json_describe_container_recursive(swayc_t *c);
 json_object *ipc_json_describe_input(struct sway_input_device *device);
+json_object *ipc_json_describe_bar_config(struct bar_config *bar);
 
 #endif
diff --git a/include/sway/ipc-server.h b/include/sway/ipc-server.h
index bcf1c433..6b7404e5 100644
--- a/include/sway/ipc-server.h
+++ b/include/sway/ipc-server.h
@@ -10,6 +10,7 @@ void ipc_init(struct sway_server *server);
 void ipc_terminate(void);
 struct sockaddr_un *ipc_user_sockaddr(void);
 
+void ipc_event_workspace(swayc_t *old, swayc_t *new, const char *change);
 void ipc_event_window(swayc_t *window, const char *change);
 
 #endif
-- 
cgit v1.2.3


From bf7a4cd0ebd465a0597e9eec0142fad222b396de Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Thu, 29 Mar 2018 17:20:03 -0400
Subject: Add bar configuration commands

---
 include/sway/commands.h   | 3 +++
 include/sway/ipc-server.h | 1 +
 2 files changed, 4 insertions(+)

(limited to 'include')

diff --git a/include/sway/commands.h b/include/sway/commands.h
index 9ff18823..dda286a2 100644
--- a/include/sway/commands.h
+++ b/include/sway/commands.h
@@ -74,6 +74,9 @@ void free_cmd_results(struct cmd_results *results);
  */
 const char *cmd_results_to_json(struct cmd_results *results);
 
+struct cmd_results *add_color(const char *name,
+		char *buffer, const char *color);
+
 typedef struct cmd_results *sway_cmd(int argc, char **argv);
 
 sway_cmd cmd_assign;
diff --git a/include/sway/ipc-server.h b/include/sway/ipc-server.h
index 6b7404e5..1f6fffff 100644
--- a/include/sway/ipc-server.h
+++ b/include/sway/ipc-server.h
@@ -12,5 +12,6 @@ struct sockaddr_un *ipc_user_sockaddr(void);
 
 void ipc_event_workspace(swayc_t *old, swayc_t *new, const char *change);
 void ipc_event_window(swayc_t *window, const char *change);
+void ipc_event_barconfig_update(struct bar_config *bar);
 
 #endif
-- 
cgit v1.2.3


From 569b2bfd5daae5b3be49772bdca4a3f224e20629 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Thu, 29 Mar 2018 17:41:02 -0400
Subject: Move bar config into its own file

---
 include/sway/config.h | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

(limited to 'include')

diff --git a/include/sway/config.h b/include/sway/config.h
index f9ab6778..dbcfc91e 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -12,6 +12,8 @@
 #include "container.h"
 #include "wlr-layer-shell-unstable-v1-protocol.h"
 
+// TODO: Refactor this shit
+
 /**
  * Describes a variable created via the `set` command.
  */
@@ -407,11 +409,6 @@ void merge_output_config(struct output_config *dst, struct output_config *src);
 void apply_output_config(struct output_config *oc, swayc_t *output);
 void free_output_config(struct output_config *oc);
 
-/**
- * Updates the list of active bar modifiers
- */
-void update_active_bar_modifiers(void);
-
 int workspace_output_cmp_workspace(const void *a, const void *b);
 
 int sway_binding_cmp(const void *a, const void *b);
@@ -420,27 +417,16 @@ int sway_binding_cmp_keys(const void *a, const void *b);
 void free_sway_binding(struct sway_binding *sb);
 struct sway_binding *sway_binding_dup(struct sway_binding *sb);
 
-int sway_mouse_binding_cmp(const void *a, const void *b);
-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);
-
+/* Bar stuff */
 void load_swaybars();
 void terminate_swaybg(pid_t pid);
-
-/**
- * Allocate and initialize default bar configuration.
- */
 struct bar_config *default_bar_config(void);
+void free_bar_config(struct bar_config *bar);
 
-/**
- * Global config singleton.
- */
+/* Global config singleton. */
 extern struct sway_config *config;
 
-/**
- * Config file currently being read.
- */
+/* Config file currently being read */
 extern const char *current_config_path;
 
 #endif
-- 
cgit v1.2.3


From 5c9cdbcdd2a07e2ced7b60d629a3e20bd7c8bf68 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Thu, 29 Mar 2018 17:49:44 -0400
Subject: Add swaybg_command

---
 include/sway/commands.h | 1 +
 include/sway/config.h   | 1 +
 2 files changed, 2 insertions(+)

(limited to 'include')

diff --git a/include/sway/commands.h b/include/sway/commands.h
index dda286a2..1291d5fb 100644
--- a/include/sway/commands.h
+++ b/include/sway/commands.h
@@ -141,6 +141,7 @@ sway_cmd cmd_splith;
 sway_cmd cmd_splitt;
 sway_cmd cmd_splitv;
 sway_cmd cmd_sticky;
+sway_cmd cmd_swaybg_command;
 sway_cmd cmd_unmark;
 sway_cmd cmd_workspace;
 sway_cmd cmd_ws_auto_back_and_forth;
diff --git a/include/sway/config.h b/include/sway/config.h
index dbcfc91e..4a7fee0f 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -282,6 +282,7 @@ struct sway_config {
 	list_t *active_bar_modifiers;
 	struct sway_mode *current_mode;
 	struct bar_config *current_bar;
+	char *swaybg_command;
 	uint32_t floating_mod;
 	uint32_t dragging_key;
 	uint32_t resizing_key;
-- 
cgit v1.2.3


From 2719ddfe5e171881f3997f9f853bfca97fe01529 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Thu, 29 Mar 2018 18:07:03 -0400
Subject: Spawn swaybars when outputs are added

---
 include/sway/config.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'include')

diff --git a/include/sway/config.h b/include/sway/config.h
index 4a7fee0f..b7820128 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -420,6 +420,7 @@ struct sway_binding *sway_binding_dup(struct sway_binding *sb);
 
 /* Bar stuff */
 void load_swaybars();
+void invoke_swaybar(struct bar_config *bar);
 void terminate_swaybg(pid_t pid);
 struct bar_config *default_bar_config(void);
 void free_bar_config(struct bar_config *bar);
-- 
cgit v1.2.3


From 8efee109ad2ab4861f25e54e9f6d1ceb06203791 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Thu, 29 Mar 2018 22:10:33 -0400
Subject: Implement modes

---
 include/sway/ipc-server.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'include')

diff --git a/include/sway/ipc-server.h b/include/sway/ipc-server.h
index 1f6fffff..b4db75c3 100644
--- a/include/sway/ipc-server.h
+++ b/include/sway/ipc-server.h
@@ -13,5 +13,6 @@ struct sockaddr_un *ipc_user_sockaddr(void);
 void ipc_event_workspace(swayc_t *old, swayc_t *new, const char *change);
 void ipc_event_window(swayc_t *window, const char *change);
 void ipc_event_barconfig_update(struct bar_config *bar);
+void ipc_event_mode(const char *mode);
 
 #endif
-- 
cgit v1.2.3