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.
---
 swaybar/meson.build | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 swaybar/meson.build

(limited to 'swaybar/meson.build')

diff --git a/swaybar/meson.build b/swaybar/meson.build
new file mode 100644
index 00000000..fd87e51d
--- /dev/null
+++ b/swaybar/meson.build
@@ -0,0 +1,25 @@
+executable(
+	'swaybar',
+	[
+		'bar.c',
+		'config.c',
+		'event_loop.c',
+		'main.c',
+		'render.c',
+	],
+	include_directories: [sway_inc],
+	dependencies: [
+		cairo,
+		client_protos,
+		gdk_pixbuf,
+		jsonc,
+		math,
+		pango,
+		pangocairo,
+		rt,
+		wayland_client,
+		wlroots,
+	],
+	link_with: [lib_sway_common, lib_sway_client],
+	install: true
+)
-- 
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 +-
 swaybar/bar.c            |  11 +++
 swaybar/config.c         |  14 +---
 swaybar/ipc.c            | 199 +++++++++++++++++++++++++++++++++++++++++++++++
 swaybar/meson.build      |   1 +
 7 files changed, 225 insertions(+), 25 deletions(-)
 create mode 100644 swaybar/ipc.c

(limited to 'swaybar/meson.build')

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
diff --git a/swaybar/bar.c b/swaybar/bar.c
index e1d594b4..433e2948 100644
--- a/swaybar/bar.c
+++ b/swaybar/bar.c
@@ -14,6 +14,8 @@
 #include "swaybar/config.h"
 #include "swaybar/event_loop.h"
 #include "swaybar/bar.h"
+#include "swaybar/ipc.h"
+#include "ipc-client.h"
 #include "list.h"
 #include "pango.h"
 #include "pool-buffer.h"
@@ -92,6 +94,10 @@ void bar_setup(struct swaybar *bar,
 	bar_init(bar);
 	init_event_loop();
 
+	bar->ipc_socketfd = ipc_open_socket(socket_path);
+	bar->ipc_event_socketfd = ipc_open_socket(socket_path);
+	ipc_get_config(bar, bar_id);
+
 	assert(bar->display = wl_display_connect(NULL));
 
 	struct wl_registry *registry = wl_display_get_registry(bar->display);
@@ -122,6 +128,11 @@ static void display_in(int fd, short mask, void *_bar) {
 	}
 }
 
+static void ipc_in(int fd, short mask, void *_bar) {
+	struct swaybar *bar = (struct swaybar *)_bar;
+	handle_ipc_event(bar);
+}
+
 void bar_run(struct swaybar *bar) {
 	add_event(wl_display_get_fd(bar->display), POLLIN, display_in, bar);
 	while (1) {
diff --git a/swaybar/config.c b/swaybar/config.c
index 0c2b57e0..83cf2309 100644
--- a/swaybar/config.c
+++ b/swaybar/config.c
@@ -22,17 +22,6 @@ uint32_t parse_position(const char *position) {
 	}
 }
 
-char *parse_font(const char *font) {
-	char *new_font = NULL;
-	if (strncmp("pango:", font, 6) == 0) {
-		font += 6;
-	}
-
-	new_font = strdup(font);
-
-	return new_font;
-}
-
 struct swaybar_config *init_config() {
 	struct swaybar_config *config = calloc(1, sizeof(struct swaybar_config));
 	config->status_command = NULL;
@@ -45,8 +34,7 @@ struct swaybar_config *init_config() {
 	config->binding_mode_indicator = true;
 	config->wrap_scroll = false;
 	config->workspace_buttons = true;
-	config->all_outputs = false;
-	config->outputs = create_list();
+	wl_list_init(&config->outputs);
 
 	/* height */
 	config->height = 0;
diff --git a/swaybar/ipc.c b/swaybar/ipc.c
new file mode 100644
index 00000000..cef784d0
--- /dev/null
+++ b/swaybar/ipc.c
@@ -0,0 +1,199 @@
+#define _XOPEN_SOURCE 500
+#include <string.h>
+#include <strings.h>
+#include <json-c/json.h>
+#include "swaybar/config.h"
+#include "swaybar/ipc.h"
+#include "ipc-client.h"
+
+char *parse_font(const char *font) {
+	char *new_font = NULL;
+	if (strncmp("pango:", font, 6) == 0) {
+		font += 6;
+	}
+	new_font = strdup(font);
+	return new_font;
+}
+
+static void ipc_parse_colors(
+		struct swaybar_config *config, json_object *colors) {
+	json_object *background, *statusline, *separator;
+	json_object *focused_background, *focused_statusline, *focused_separator;
+	json_object *focused_workspace_border, *focused_workspace_bg, *focused_workspace_text;
+	json_object *inactive_workspace_border, *inactive_workspace_bg, *inactive_workspace_text;
+	json_object *active_workspace_border, *active_workspace_bg, *active_workspace_text;
+	json_object *urgent_workspace_border, *urgent_workspace_bg, *urgent_workspace_text;
+	json_object *binding_mode_border, *binding_mode_bg, *binding_mode_text;
+	json_object_object_get_ex(colors, "background", &background);
+	json_object_object_get_ex(colors, "statusline", &statusline);
+	json_object_object_get_ex(colors, "separator", &separator);
+	json_object_object_get_ex(colors, "focused_background", &focused_background);
+	json_object_object_get_ex(colors, "focused_statusline", &focused_statusline);
+	json_object_object_get_ex(colors, "focused_separator", &focused_separator);
+	json_object_object_get_ex(colors, "focused_workspace_border", &focused_workspace_border);
+	json_object_object_get_ex(colors, "focused_workspace_bg", &focused_workspace_bg);
+	json_object_object_get_ex(colors, "focused_workspace_text", &focused_workspace_text);
+	json_object_object_get_ex(colors, "active_workspace_border", &active_workspace_border);
+	json_object_object_get_ex(colors, "active_workspace_bg", &active_workspace_bg);
+	json_object_object_get_ex(colors, "active_workspace_text", &active_workspace_text);
+	json_object_object_get_ex(colors, "inactive_workspace_border", &inactive_workspace_border);
+	json_object_object_get_ex(colors, "inactive_workspace_bg", &inactive_workspace_bg);
+	json_object_object_get_ex(colors, "inactive_workspace_text", &inactive_workspace_text);
+	json_object_object_get_ex(colors, "urgent_workspace_border", &urgent_workspace_border);
+	json_object_object_get_ex(colors, "urgent_workspace_bg", &urgent_workspace_bg);
+	json_object_object_get_ex(colors, "urgent_workspace_text", &urgent_workspace_text);
+	json_object_object_get_ex(colors, "binding_mode_border", &binding_mode_border);
+	json_object_object_get_ex(colors, "binding_mode_bg", &binding_mode_bg);
+	json_object_object_get_ex(colors, "binding_mode_text", &binding_mode_text);
+	if (background) {
+		config->colors.background = parse_color(json_object_get_string(background));
+	}
+	if (statusline) {
+		config->colors.statusline = parse_color(json_object_get_string(statusline));
+	}
+	if (separator) {
+		config->colors.separator = parse_color(json_object_get_string(separator));
+	}
+	if (focused_background) {
+		config->colors.focused_background = parse_color(json_object_get_string(focused_background));
+	}
+	if (focused_statusline) {
+		config->colors.focused_statusline = parse_color(json_object_get_string(focused_statusline));
+	}
+	if (focused_separator) {
+		config->colors.focused_separator = parse_color(json_object_get_string(focused_separator));
+	}
+	if (focused_workspace_border) {
+		config->colors.focused_workspace.border = parse_color(json_object_get_string(focused_workspace_border));
+	}
+	if (focused_workspace_bg) {
+		config->colors.focused_workspace.background = parse_color(json_object_get_string(focused_workspace_bg));
+	}
+	if (focused_workspace_text) {
+		config->colors.focused_workspace.text = parse_color(json_object_get_string(focused_workspace_text));
+	}
+	if (active_workspace_border) {
+		config->colors.active_workspace.border = parse_color(json_object_get_string(active_workspace_border));
+	}
+	if (active_workspace_bg) {
+		config->colors.active_workspace.background = parse_color(json_object_get_string(active_workspace_bg));
+	}
+	if (active_workspace_text) {
+		config->colors.active_workspace.text = parse_color(json_object_get_string(active_workspace_text));
+	}
+	if (inactive_workspace_border) {
+		config->colors.inactive_workspace.border = parse_color(json_object_get_string(inactive_workspace_border));
+	}
+	if (inactive_workspace_bg) {
+		config->colors.inactive_workspace.background = parse_color(json_object_get_string(inactive_workspace_bg));
+	}
+	if (inactive_workspace_text) {
+		config->colors.inactive_workspace.text = parse_color(json_object_get_string(inactive_workspace_text));
+	}
+	if (binding_mode_border) {
+		config->colors.binding_mode.border = parse_color(json_object_get_string(binding_mode_border));
+	}
+	if (binding_mode_bg) {
+		config->colors.binding_mode.background = parse_color(json_object_get_string(binding_mode_bg));
+	}
+	if (binding_mode_text) {
+		config->colors.binding_mode.text = parse_color(json_object_get_string(binding_mode_text));
+	}
+}
+
+static void ipc_parse_config(
+		struct swaybar_config *config, const char *payload) {
+	json_object *bar_config = json_tokener_parse(payload);
+	json_object *markup, *mode, *hidden_bar, *position, *status_command;
+	json_object *font, *bar_height, *wrap_scroll, *workspace_buttons, *strip_workspace_numbers;
+	json_object *binding_mode_indicator, *verbose, *colors, *sep_symbol, *outputs;
+	json_object_object_get_ex(bar_config, "mode", &mode);
+	json_object_object_get_ex(bar_config, "hidden_bar", &hidden_bar);
+	json_object_object_get_ex(bar_config, "position", &position);
+	json_object_object_get_ex(bar_config, "status_command", &status_command);
+	json_object_object_get_ex(bar_config, "font", &font);
+	json_object_object_get_ex(bar_config, "bar_height", &bar_height);
+	json_object_object_get_ex(bar_config, "wrap_scroll", &wrap_scroll);
+	json_object_object_get_ex(bar_config, "workspace_buttons", &workspace_buttons);
+	json_object_object_get_ex(bar_config, "strip_workspace_numbers", &strip_workspace_numbers);
+	json_object_object_get_ex(bar_config, "binding_mode_indicator", &binding_mode_indicator);
+	json_object_object_get_ex(bar_config, "verbose", &verbose);
+	json_object_object_get_ex(bar_config, "separator_symbol", &sep_symbol);
+	json_object_object_get_ex(bar_config, "colors", &colors);
+	json_object_object_get_ex(bar_config, "outputs", &outputs);
+	json_object_object_get_ex(bar_config, "pango_markup", &markup);
+	if (status_command) {
+		free(config->status_command);
+		config->status_command = strdup(json_object_get_string(status_command));
+	}
+	if (position) {
+		config->position = parse_position(json_object_get_string(position));
+	}
+	if (font) {
+		free(config->font);
+		config->font = parse_font(json_object_get_string(font));
+	}
+	if (sep_symbol) {
+		free(config->sep_symbol);
+		config->sep_symbol = strdup(json_object_get_string(sep_symbol));
+	}
+	if (strip_workspace_numbers) {
+		config->strip_workspace_numbers = json_object_get_boolean(strip_workspace_numbers);
+	}
+	if (binding_mode_indicator) {
+		config->binding_mode_indicator = json_object_get_boolean(binding_mode_indicator);
+	}
+	if (wrap_scroll) {
+		config->wrap_scroll = json_object_get_boolean(wrap_scroll);
+	}
+	if (workspace_buttons) {
+		config->workspace_buttons = json_object_get_boolean(workspace_buttons);
+	}
+	if (bar_height) {
+		config->height = json_object_get_int(bar_height);
+	}
+	if (markup) {
+		config->pango_markup = json_object_get_boolean(markup);
+	}
+
+	struct config_output *output, *tmp;
+	wl_list_for_each_safe(output, tmp, &config->outputs, link) {
+		wl_list_remove(&output->link);
+		free(output->name);
+		free(output);
+	}
+	if (outputs) {
+		int length = json_object_array_length(outputs);
+		for (int i = 0; i < length; ++i) {
+			json_object *output = json_object_array_get_idx(outputs, i);
+			const char *name = json_object_get_string(output);
+			if (strcmp("*", name) == 0) {
+				// TODO: do we need to clear out the list here or something
+				break;
+			}
+			struct config_output *coutput = calloc(
+					1, sizeof(struct config_output));
+			coutput->name = strdup(name);
+			wl_list_insert(&config->outputs, &coutput->link);
+		}
+	}
+
+	if (colors) {
+		ipc_parse_colors(config, colors);
+	}
+
+	json_object_put(bar_config);
+}
+
+void ipc_get_config(struct swaybar *bar, const char *bar_id) {
+	uint32_t len = strlen(bar_id);
+	char *res = ipc_single_command(bar->ipc_socketfd,
+			IPC_GET_BAR_CONFIG, bar_id, &len);
+	ipc_parse_config(bar->config, res);
+	free(res);
+}
+
+void handle_ipc_event(struct swaybar *bar) {
+	struct ipc_response *resp = ipc_recv_response(bar->ipc_event_socketfd);
+	free_ipc_response(resp);
+}
diff --git a/swaybar/meson.build b/swaybar/meson.build
index fd87e51d..6dc7c564 100644
--- a/swaybar/meson.build
+++ b/swaybar/meson.build
@@ -4,6 +4,7 @@ executable(
 		'bar.c',
 		'config.c',
 		'event_loop.c',
+		'ipc.c',
 		'main.c',
 		'render.c',
 	],
-- 
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 ++++++++++--------------------------
 swaybar/bar.c                 | 26 ++++++++++++---
 swaybar/config.c              |  1 +
 swaybar/meson.build           |  1 +
 swaybar/render.c              | 56 +++++++++++++++++++++++++++++++
 swaybar/status_line.c         | 78 +++++++++++++++++++++++++++++++++++++++++++
 7 files changed, 176 insertions(+), 52 deletions(-)
 create mode 100644 swaybar/status_line.c

(limited to 'swaybar/meson.build')

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
diff --git a/swaybar/bar.c b/swaybar/bar.c
index 90fd5ad4..72c4be8f 100644
--- a/swaybar/bar.c
+++ b/swaybar/bar.c
@@ -13,6 +13,7 @@
 #include "swaybar/render.h"
 #include "swaybar/config.h"
 #include "swaybar/event_loop.h"
+#include "swaybar/status_line.h"
 #include "swaybar/bar.h"
 #include "swaybar/ipc.h"
 #include "ipc-client.h"
@@ -98,6 +99,9 @@ void bar_setup(struct swaybar *bar,
 	bar->ipc_socketfd = ipc_open_socket(socket_path);
 	bar->ipc_event_socketfd = ipc_open_socket(socket_path);
 	ipc_initialize(bar, bar_id);
+	if (bar->config->status_command) {
+		bar->status = status_line_init(bar->config->status_command);
+	}
 
 	assert(bar->display = wl_display_connect(NULL));
 
@@ -134,6 +138,13 @@ void bar_setup(struct swaybar *bar,
 	}
 }
 
+static void render_all_frames(struct swaybar *bar) {
+	struct swaybar_output *output;
+	wl_list_for_each(output, &bar->outputs, link) {
+		render_frame(bar, output);
+	}
+}
+
 static void display_in(int fd, short mask, void *_bar) {
 	struct swaybar *bar = (struct swaybar *)_bar;
 	if (wl_display_dispatch(bar->display) == -1) {
@@ -144,16 +155,23 @@ static void display_in(int fd, short mask, void *_bar) {
 static void ipc_in(int fd, short mask, void *_bar) {
 	struct swaybar *bar = (struct swaybar *)_bar;
 	if (handle_ipc_event(bar)) {
-		struct swaybar_output *output;
-		wl_list_for_each(output, &bar->outputs, link) {
-			render_frame(bar, output);
-		}
+		render_all_frames(bar);
+	}
+}
+
+static void status_in(int fd, short mask, void *_bar) {
+	struct swaybar *bar = (struct swaybar *)_bar;
+	if (handle_status_readable(bar->status)) {
+		render_all_frames(bar);
 	}
 }
 
 void bar_run(struct swaybar *bar) {
 	add_event(wl_display_get_fd(bar->display), POLLIN, display_in, bar);
 	add_event(bar->ipc_event_socketfd, POLLIN, ipc_in, bar);
+	if (bar->status) {
+		add_event(bar->status->read_fd, POLLIN, status_in, bar);
+	}
 	while (1) {
 		event_loop_poll();
 	}
diff --git a/swaybar/config.c b/swaybar/config.c
index 802d0779..9169ad27 100644
--- a/swaybar/config.c
+++ b/swaybar/config.c
@@ -43,6 +43,7 @@ struct swaybar_config *init_config() {
 	config->colors.background = 0x000000FF;
 	config->colors.focused_background = 0x000000FF;
 	config->colors.statusline = 0xFFFFFFFF;
+	config->colors.focused_statusline = 0xFFFFFFFF;
 	config->colors.separator = 0x666666FF;
 
 	config->colors.focused_workspace.border = 0x4C7899FF;
diff --git a/swaybar/meson.build b/swaybar/meson.build
index 6dc7c564..d15e8b5c 100644
--- a/swaybar/meson.build
+++ b/swaybar/meson.build
@@ -7,6 +7,7 @@ executable(
 		'ipc.c',
 		'main.c',
 		'render.c',
+		'status_line.c',
 	],
 	include_directories: [sway_inc],
 	dependencies: [
diff --git a/swaybar/render.c b/swaybar/render.c
index f797873c..ec1239a1 100644
--- a/swaybar/render.c
+++ b/swaybar/render.c
@@ -9,12 +9,59 @@
 #include "swaybar/bar.h"
 #include "swaybar/config.h"
 #include "swaybar/render.h"
+#include "swaybar/status_line.h"
 #include "wlr-layer-shell-unstable-v1-client-protocol.h"
 
 static const int ws_horizontal_padding = 5;
 static const double ws_vertical_padding = 1.5;
 static const double border_width = 1;
 
+static uint32_t render_status_line_text(cairo_t *cairo,
+		struct swaybar_config *config, struct status_line *status,
+		bool focused, uint32_t width, uint32_t height) {
+	if (!status->text) {
+		return 0;
+	}
+	//wlr_log(L_DEBUG, "focused %d", focused);
+	cairo_set_source_u32(cairo, focused ?
+			config->colors.focused_statusline : config->colors.statusline);
+	static const int margin = 3;
+	int text_width, text_height;
+	get_text_size(cairo, config->font, &text_width, &text_height,
+			1, config->pango_markup, "%s", status->text);
+	uint32_t ideal_height = text_height + ws_vertical_padding * 2;
+	if (height < ideal_height) {
+		height = ideal_height;
+	}
+	double text_y = height / 2.0 - text_height / 2.0;
+	cairo_move_to(cairo, width - text_width - margin, (int)floor(text_y));
+	pango_printf(cairo, config->font, 1, config->pango_markup,
+			"%s", status->text);
+	return ideal_height;
+}
+
+static uint32_t render_status_line_i3bar(cairo_t *cairo,
+		struct swaybar_config *config, struct status_line *status,
+		bool focused, uint32_t width, uint32_t height) {
+	// TODO
+	return 0;
+}
+
+static uint32_t render_status_line(cairo_t *cairo,
+		struct swaybar_config *config, struct status_line *status,
+		bool focused, uint32_t width, uint32_t height) {
+	switch (status->protocol) {
+	case PROTOCOL_TEXT:
+		return render_status_line_text(cairo,
+				config, status, focused, width, height);
+	case PROTOCOL_I3BAR:
+		return render_status_line_i3bar(cairo,
+				config, status, focused, width, height);
+	default:
+		return 0;
+	}
+}
+
 static uint32_t render_binding_mode_indicator(cairo_t *cairo,
 		struct swaybar_config *config, const char *mode, double x,
 		uint32_t height) {
@@ -148,6 +195,11 @@ static uint32_t render_to_cairo(cairo_t *cairo,
 				cairo, config, config->mode, x, output->height);
 		max_height = h > max_height ? h : max_height;
 	}
+	if (bar->status) {
+		uint32_t h = render_status_line(cairo, config, bar->status,
+				output->focused, output->width, output->height);
+		max_height = h > max_height ? h : max_height;
+	}
 
 	return max_height > output->height ? max_height : output->height;
 }
@@ -157,6 +209,10 @@ void render_frame(struct swaybar *bar,
 	cairo_surface_t *recorder = cairo_recording_surface_create(
 			CAIRO_CONTENT_COLOR_ALPHA, NULL);
 	cairo_t *cairo = cairo_create(recorder);
+	cairo_save(cairo);
+	cairo_set_operator(cairo, CAIRO_OPERATOR_CLEAR);
+	cairo_paint(cairo);
+	cairo_restore(cairo);
 	uint32_t height = render_to_cairo(cairo, bar, output);
 	if (bar->config->height >= 0 && height < (uint32_t)bar->config->height) {
 		height = bar->config->height;
diff --git a/swaybar/status_line.c b/swaybar/status_line.c
new file mode 100644
index 00000000..ff668c9c
--- /dev/null
+++ b/swaybar/status_line.c
@@ -0,0 +1,78 @@
+#define _POSIX_C_SOURCE
+#include <fcntl.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <wlr/util/log.h>
+#include "swaybar/config.h"
+#include "swaybar/status_line.h"
+#include "readline.h"
+
+bool handle_status_readable(struct status_line *status) {
+	char *line = read_line_buffer(status->read,
+			status->buffer, status->buffer_size);
+	switch (status->protocol) {
+	case PROTOCOL_I3BAR:
+		// TODO
+		break;
+	case PROTOCOL_TEXT:
+		status->text = line;
+		return true;
+	case PROTOCOL_UNDEF:
+		if (!line) {
+			return false;
+		}
+		if (line[0] == '{') {
+			// TODO: JSON
+		} else {
+			status->text = line;
+			status->protocol = PROTOCOL_TEXT;
+		}
+		return false;
+	}
+	return false;
+}
+
+struct status_line *status_line_init(char *cmd) {
+	struct status_line *status = calloc(1, sizeof(struct status_line));
+	status->buffer_size = 4096;
+	status->buffer = malloc(status->buffer_size);
+
+	int pipe_read_fd[2];
+	int pipe_write_fd[2];
+	if (pipe(pipe_read_fd) != 0 || pipe(pipe_write_fd) != 0) {
+		wlr_log(L_ERROR, "Unable to create pipes for status_command fork");
+		exit(1);
+	}
+
+	status->pid = fork();
+	if (status->pid == 0) {
+		dup2(pipe_read_fd[1], STDOUT_FILENO);
+		close(pipe_read_fd[0]);
+		close(pipe_read_fd[1]);
+
+		dup2(pipe_write_fd[0], STDIN_FILENO);
+		close(pipe_write_fd[0]);
+		close(pipe_write_fd[1]);
+
+		char *const _cmd[] = { "sh", "-c", cmd, NULL, };
+		execvp(_cmd[0], _cmd);
+		exit(1);
+	}
+
+	close(pipe_read_fd[1]);
+	status->read_fd = pipe_read_fd[0];
+	fcntl(status->read_fd, F_SETFL, O_NONBLOCK);
+	close(pipe_write_fd[0]);
+	status->write_fd = pipe_write_fd[1];
+	fcntl(status->write_fd, F_SETFL, O_NONBLOCK);
+
+	status->read = fdopen(status->read_fd, "r");
+	status->write = fdopen(status->write_fd, "w");
+	return status;
+}
+
+void status_line_free(struct status_line *line) {
+	free(line);
+}
-- 
cgit v1.2.3


From 8d1425bde9e7f17a5a9e6bce73dffcf296dad6a1 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Fri, 30 Mar 2018 21:38:28 -0400
Subject: Initialize seat pointer in swaybar

---
 include/swaybar/bar.h |  10 +++++
 meson.build           |   1 +
 swaybar/bar.c         | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++
 swaybar/meson.build   |   4 +-
 4 files changed, 118 insertions(+), 2 deletions(-)

(limited to 'swaybar/meson.build')

diff --git a/include/swaybar/bar.h b/include/swaybar/bar.h
index 1bf2ea2d..0768a683 100644
--- a/include/swaybar/bar.h
+++ b/include/swaybar/bar.h
@@ -8,14 +8,24 @@ struct swaybar_config;
 struct swaybar_output;
 struct swaybar_workspace;
 
+struct swaybar_pointer {
+	struct wl_pointer *pointer;
+	struct wl_cursor_theme *cursor_theme;
+	struct wl_cursor_image *cursor_image;
+	struct wl_surface *cursor_surface;
+	struct swaybar_output *current;
+};
+
 struct swaybar {
 	struct wl_display *display;
 	struct wl_compositor *compositor;
 	struct zwlr_layer_shell_v1 *layer_shell;
 	struct wl_shm *shm;
+	struct wl_seat *seat;
 
 	struct swaybar_config *config;
 	struct swaybar_output *focused_output;
+	struct swaybar_pointer pointer;
 	struct status_line *status;
 
 	int ipc_event_socketfd;
diff --git a/meson.build b/meson.build
index 49824b30..01788fd9 100644
--- a/meson.build
+++ b/meson.build
@@ -24,6 +24,7 @@ pcre           = dependency('libpcre')
 wlroots        = dependency('wlroots', fallback: ['wlroots', 'wlroots'])
 wayland_server = dependency('wayland-server')
 wayland_client = dependency('wayland-client')
+wayland_cursor = dependency('wayland-cursor')
 wayland_egl    = dependency('wayland-egl')
 wayland_protos = dependency('wayland-protocols')
 xkbcommon      = dependency('xkbcommon')
diff --git a/swaybar/bar.c b/swaybar/bar.c
index 0fc41517..e7b8b2ca 100644
--- a/swaybar/bar.c
+++ b/swaybar/bar.c
@@ -9,7 +9,13 @@
 #include <sys/wait.h>
 #include <unistd.h>
 #include <wayland-client.h>
+#include <wayland-cursor.h>
 #include <wlr/util/log.h>
+#ifdef __FreeBSD__
+#include <dev/evdev/input-event-codes.h>
+#else
+#include <linux/input-event-codes.h>
+#endif
 #include "swaybar/render.h"
 #include "swaybar/config.h"
 #include "swaybar/event_loop.h"
@@ -56,12 +62,102 @@ struct zwlr_layer_surface_v1_listener layer_surface_listener = {
 	.closed = layer_surface_closed,
 };
 
+static void wl_pointer_enter(void *data, struct wl_pointer *wl_pointer,
+		uint32_t serial, struct wl_surface *surface,
+		wl_fixed_t surface_x, wl_fixed_t surface_y) {
+	struct swaybar *bar = data;
+	struct swaybar_pointer *pointer = &bar->pointer;
+	wl_surface_attach(pointer->cursor_surface,
+			wl_cursor_image_get_buffer(pointer->cursor_image), 0, 0);
+	wl_pointer_set_cursor(wl_pointer, serial, pointer->cursor_surface,
+			pointer->cursor_image->hotspot_x,
+			pointer->cursor_image->hotspot_y);
+	wl_surface_commit(pointer->cursor_surface);
+}
+
+static void wl_pointer_leave(void *data, struct wl_pointer *wl_pointer,
+		uint32_t serial, struct wl_surface *surface) {
+	// Who cares
+}
+
+static void wl_pointer_motion(void *data, struct wl_pointer *wl_pointer,
+		uint32_t time, wl_fixed_t surface_x, wl_fixed_t surface_y) {
+	wlr_log(L_DEBUG, "motion");
+	// TODO
+}
+
+static void wl_pointer_button(void *data, struct wl_pointer *wl_pointer,
+		uint32_t serial, uint32_t time, uint32_t button, uint32_t state) {
+	wlr_log(L_DEBUG, "button");
+	// TODO
+}
+
+static void wl_pointer_axis(void *data, struct wl_pointer *wl_pointer,
+		uint32_t time, uint32_t axis, wl_fixed_t value) {
+	wlr_log(L_DEBUG, "axis");
+	// TODO
+}
+
+static void wl_pointer_frame(void *data, struct wl_pointer *wl_pointer) {
+	// Who cares
+}
+
+static void wl_pointer_axis_source(void *data, struct wl_pointer *wl_pointer,
+		uint32_t axis_source) {
+	// Who cares
+}
+
+static void wl_pointer_axis_stop(void *data, struct wl_pointer *wl_pointer,
+		uint32_t time, uint32_t axis) {
+	// Who cares
+}
+
+static void wl_pointer_axis_discrete(void *data, struct wl_pointer *wl_pointer,
+		uint32_t axis, int32_t discrete) {
+	// Who cares
+}
+
+struct wl_pointer_listener pointer_listener = {
+	.enter = wl_pointer_enter,
+	.leave = wl_pointer_leave,
+	.motion = wl_pointer_motion,
+	.button = wl_pointer_button,
+	.axis = wl_pointer_axis,
+	.frame = wl_pointer_frame,
+	.axis_source = wl_pointer_axis_source,
+	.axis_stop = wl_pointer_axis_stop,
+	.axis_discrete = wl_pointer_axis_discrete,
+};
+
+static void seat_handle_capabilities(void *data, struct wl_seat *wl_seat,
+		enum wl_seat_capability caps) {
+	struct swaybar *bar = data;
+	if ((caps & WL_SEAT_CAPABILITY_POINTER)) {
+		bar->pointer.pointer = wl_seat_get_pointer(wl_seat);
+		wl_pointer_add_listener(bar->pointer.pointer, &pointer_listener, bar);
+	}
+}
+
+static void seat_handle_name(void *data, struct wl_seat *wl_seat,
+		const char *name) {
+	// Who cares
+}
+
+const struct wl_seat_listener seat_listener = {
+	.capabilities = seat_handle_capabilities,
+	.name = seat_handle_name,
+};
+
 static void handle_global(void *data, struct wl_registry *registry,
 		uint32_t name, const char *interface, uint32_t version) {
 	struct swaybar *bar = data;
 	if (strcmp(interface, wl_compositor_interface.name) == 0) {
 		bar->compositor = wl_registry_bind(registry, name,
 				&wl_compositor_interface, 1);
+	} else if (strcmp(interface, wl_seat_interface.name) == 0) {
+		bar->seat = wl_registry_bind(registry, name,
+				&wl_seat_interface, 1);
+		wl_seat_add_listener(bar->seat, &seat_listener, bar);
 	} else if (strcmp(interface, wl_shm_interface.name) == 0) {
 		bar->shm = wl_registry_bind(registry, name,
 				&wl_shm_interface, 1);
@@ -116,6 +212,15 @@ void bar_setup(struct swaybar *bar,
 	wl_registry_add_listener(registry, &registry_listener, bar);
 	wl_display_roundtrip(bar->display);
 	assert(bar->compositor && bar->layer_shell && bar->shm);
+	struct swaybar_pointer *pointer = &bar->pointer;
+
+	assert(pointer->cursor_theme = wl_cursor_theme_load(NULL, 16, bar->shm));
+	struct wl_cursor *cursor;
+	assert(cursor = wl_cursor_theme_get_cursor(
+				pointer->cursor_theme, "left_ptr"));
+	pointer->cursor_image = cursor->images[0];
+	assert(pointer->cursor_surface =
+			wl_compositor_create_surface(bar->compositor));
 
 	// TODO: we might not necessarily be meant to do all of the outputs
 	struct swaybar_output *output;
diff --git a/swaybar/meson.build b/swaybar/meson.build
index d15e8b5c..bf6f6d7a 100644
--- a/swaybar/meson.build
+++ b/swaybar/meson.build
@@ -1,6 +1,5 @@
 executable(
-	'swaybar',
-	[
+	'swaybar', [
 		'bar.c',
 		'config.c',
 		'event_loop.c',
@@ -20,6 +19,7 @@ executable(
 		pangocairo,
 		rt,
 		wayland_client,
+		wayland_cursor,
 		wlroots,
 	],
 	link_with: [lib_sway_common, lib_sway_client],
-- 
cgit v1.2.3


From ee85c918317ec6a685a999db46f692c7d13cdf2a Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Sat, 31 Mar 2018 13:07:22 -0400
Subject: Demarcate i3bar JSON into individual updates

---
 include/swaybar/status_line.h | 49 +++++++++++++++++++++++-
 swaybar/i3bar.c               | 88 +++++++++++++++++++++++++++++++++++++++++++
 swaybar/meson.build           |  1 +
 swaybar/status_line.c         | 62 +++++++++++++++++++++++++-----
 4 files changed, 189 insertions(+), 11 deletions(-)
 create mode 100644 swaybar/i3bar.c

(limited to 'swaybar/meson.build')

diff --git a/include/swaybar/status_line.h b/include/swaybar/status_line.h
index 6c595df0..3b93e28f 100644
--- a/include/swaybar/status_line.h
+++ b/include/swaybar/status_line.h
@@ -7,10 +7,52 @@
 
 enum status_protocol {
 	PROTOCOL_UNDEF,
+	PROTOCOL_ERROR,
 	PROTOCOL_TEXT,
 	PROTOCOL_I3BAR,
 };
 
+struct text_protocol_state {
+	char *buffer;
+	size_t buffer_size;
+};
+
+enum json_node_type {
+	JSON_NODE_UNKNOWN,
+	JSON_NODE_ARRAY,
+	JSON_NODE_STRING,
+};
+
+struct i3bar_protocol_state {
+	bool click_events;
+	char *buffer;
+	size_t buffer_size;
+	size_t buffer_index;
+	const char *current_node;
+	bool escape;
+	size_t depth;
+	enum json_node_type nodes[16];
+};
+
+struct i3bar_block {
+	struct wl_list link;
+	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;
@@ -18,13 +60,16 @@ struct status_line {
 
 	enum status_protocol protocol;
 	const char *text;
+	struct wl_list blocks; // i3bar_block::link
 
-	char *buffer;
-	size_t buffer_size;
+	struct text_protocol_state text_state;
+	struct i3bar_protocol_state i3bar_state;
 };
 
 struct status_line *status_line_init(char *cmd);
 void status_line_free(struct status_line *status);
 bool handle_status_readable(struct status_line *status);
+int i3bar_readable(struct status_line *status);
+void status_error(struct status_line *status, const char *text);
 
 #endif
diff --git a/swaybar/i3bar.c b/swaybar/i3bar.c
new file mode 100644
index 00000000..5be348b2
--- /dev/null
+++ b/swaybar/i3bar.c
@@ -0,0 +1,88 @@
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <wlr/util/log.h>
+#include "swaybar/config.h"
+#include "swaybar/status_line.h"
+
+static void i3bar_parse_json(struct status_line *status, const char *text) {
+	wlr_log(L_DEBUG, "got json: %s", text);
+}
+
+int i3bar_readable(struct status_line *status) {
+	struct i3bar_protocol_state *state = &status->i3bar_state;
+
+	char *cur = &state->buffer[state->buffer_index];
+	ssize_t n = read(status->read_fd, cur,
+			state->buffer_size - state->buffer_index);
+	if (n == 0) {
+		return 0;
+	}
+
+	if (n == (ssize_t)(state->buffer_size - state->buffer_index)) {
+		state->buffer_size = state->buffer_size * 2;
+		char *new_buffer = realloc(state->buffer, state->buffer_size);
+		if (!new_buffer) {
+			free(state->buffer);
+			status_error(status, "[failed to allocate buffer]");
+			return -1;
+		}
+		state->buffer = new_buffer;
+	}
+
+	int handled = 0;
+	while (*cur) {
+		if (state->nodes[state->depth] == JSON_NODE_STRING) {
+			if (!state->escape && *cur == '"') {
+				--state->depth;
+			}
+			state->escape = !state->escape && *cur == '\\';
+		} else {
+			switch (*cur) {
+			case '[':
+				++state->depth;
+				if (state->depth >
+						sizeof(state->nodes) / sizeof(state->nodes[0])) {
+					status_error(status, "[i3bar json too deep]");
+					return -1;
+				}
+				state->nodes[state->depth] = JSON_NODE_ARRAY;
+				if (state->depth == 1) {
+					state->current_node = cur;
+				}
+				break;
+			case ']':
+				if (state->nodes[state->depth] != JSON_NODE_ARRAY) {
+					status_error(status, "[failed to parse i3bar json]");
+					return -1;
+				}
+				--state->depth;
+				if (state->depth == 0) {
+					// cur[1] is valid since cur[0] != '\0'
+					char p = cur[1];
+					cur[1] = '\0';
+					i3bar_parse_json(status, state->current_node);
+					cur[1] = p;
+					memmove(state->buffer, cur,
+							state->buffer_size - (cur - state->buffer));
+					++handled;
+					cur = state->buffer;
+					state->current_node = cur + 1;
+				}
+				break;
+			case '"':
+				++state->depth;
+				if (state->depth >
+						sizeof(state->nodes) / sizeof(state->nodes[0])) {
+					status_error(status, "[i3bar json too deep]");
+					return -1;
+				}
+				state->nodes[state->depth] = JSON_NODE_STRING;
+				break;
+			}
+		}
+		++cur;
+	}
+	state->buffer_index = cur - state->buffer;
+	return handled;
+}
diff --git a/swaybar/meson.build b/swaybar/meson.build
index bf6f6d7a..d65edb11 100644
--- a/swaybar/meson.build
+++ b/swaybar/meson.build
@@ -3,6 +3,7 @@ executable(
 		'bar.c',
 		'config.c',
 		'event_loop.c',
+		'i3bar.c',
 		'ipc.c',
 		'main.c',
 		'render.c',
diff --git a/swaybar/status_line.c b/swaybar/status_line.c
index 3454f207..c94ac6d4 100644
--- a/swaybar/status_line.c
+++ b/swaybar/status_line.c
@@ -1,5 +1,6 @@
 #define _POSIX_C_SOURCE
 #include <fcntl.h>
+#include <json-c/json.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
@@ -9,35 +10,78 @@
 #include "swaybar/status_line.h"
 #include "readline.h"
 
+void status_error(struct status_line *status, const char *text) {
+	close(status->read_fd);
+	close(status->write_fd);
+	status->protocol = PROTOCOL_ERROR;
+	status->text = text;
+}
+
 bool handle_status_readable(struct status_line *status) {
-	char *line = read_line_buffer(status->read,
-			status->buffer, status->buffer_size);
+	char *line;
 	switch (status->protocol) {
+	case PROTOCOL_ERROR:
+		return false;
 	case PROTOCOL_I3BAR:
-		// TODO
+		if (i3bar_readable(status) > 0) {
+			return true;
+		}
 		break;
 	case PROTOCOL_TEXT:
-		status->text = line;
+		line = read_line_buffer(status->read,
+				status->text_state.buffer, status->text_state.buffer_size);
+		if (!line) {
+			status_error(status, "[error reading from status command]");
+		} else {
+			status->text = line;
+		}
 		return true;
 	case PROTOCOL_UNDEF:
+		line = read_line_buffer(status->read,
+				status->text_state.buffer, status->text_state.buffer_size);
 		if (!line) {
+			status_error(status, "[error reading from status command]");
 			return false;
 		}
 		if (line[0] == '{') {
-			// TODO: JSON
+			json_object *proto = json_tokener_parse(line);
+			if (proto) {
+				json_object *version;
+				if (json_object_object_get_ex(proto, "version", &version)
+							&& json_object_get_int(version) == 1) {
+					wlr_log(L_DEBUG, "Switched to i3bar protocol.");
+					status->protocol = PROTOCOL_I3BAR;
+				}
+				json_object *click_events;
+				if (json_object_object_get_ex(
+							proto, "click_events", &click_events)
+						&& json_object_get_boolean(click_events)) {
+					wlr_log(L_DEBUG, "Enabled click events.");
+					status->i3bar_state.click_events = true;
+					const char *events_array = "[\n";
+					write(status->write_fd, events_array, strlen(events_array));
+				}
+				json_object_put(proto);
+			}
+
+			status->protocol = PROTOCOL_I3BAR;
+			free(status->text_state.buffer);
+			status->i3bar_state.buffer_size = 4096;
+			status->i3bar_state.buffer =
+				malloc(status->i3bar_state.buffer_size);
 		} else {
-			status->text = line;
 			status->protocol = PROTOCOL_TEXT;
+			status->text = line;
 		}
-		return false;
+		return true;
 	}
 	return false;
 }
 
 struct status_line *status_line_init(char *cmd) {
 	struct status_line *status = calloc(1, sizeof(struct status_line));
-	status->buffer_size = 4096;
-	status->buffer = malloc(status->buffer_size);
+	status->text_state.buffer_size = 8192;
+	status->text_state.buffer = malloc(status->text_state.buffer_size);
 
 	int pipe_read_fd[2];
 	int pipe_write_fd[2];
-- 
cgit v1.2.3