From c6b13163c93f7464ae21fa238fadc238b8ef2936 Mon Sep 17 00:00:00 2001
From: Mikkel Oscar Lyderik <mikkeloscar@gmail.com>
Date: Mon, 14 Dec 2015 16:24:01 +0100
Subject: [PATCH] Add initial support for custom bar-id

---
 include/config.h |  7 +++++++
 sway/commands.c  | 14 +++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/include/config.h b/include/config.h
index 04528e270..0f3ce5506 100644
--- a/include/config.h
+++ b/include/config.h
@@ -72,6 +72,13 @@ struct bar_config {
 	 * In "show" mode, it will always be shown on top of the active workspace.
 	 */
 	char *hidden_state;
+	/**
+	 * Id name used to identify the bar through IPC.
+	 *
+	 * Defaults to bar-x, where x corresponds to the position of the
+	 * embedding bar block in the config file (bar-0, bar-1, ...).
+	 */
+	char *id;
 	uint32_t modifier;
 	enum desktop_shell_panel_position position;
 	char *status_command;
diff --git a/sway/commands.c b/sway/commands.c
index b0235dba9..ea138dfc1 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -15,6 +15,7 @@
 #include "layout.h"
 #include "focus.h"
 #include "log.h"
+#include "util.h"
 #include "workspace.h"
 #include "commands.h"
 #include "container.h"
@@ -1124,9 +1125,20 @@ static struct cmd_results *cmd_bar(int argc, char **argv) {
 	bar->tray_padding = config->bar.tray_padding;
 	list_add(config->bars, bar);
 
+	// set bar id
+	int i;
+	for (i = 0; i < config->bars->length; ++i) {
+		if (bar == config->bars->items[i]) {
+			const int len = 5 + numlen(i); // "bar-" + i + \0
+			bar->id = malloc(len * sizeof(char));
+			snprintf(bar->id, len, "bar-%d", i);
+			break;
+		}
+	}
+
 	// Set current bar
 	config->current_bar = bar;
-	sway_log(L_DEBUG, "Configuring bar");
+	sway_log(L_DEBUG, "Configuring bar %s", bar->id);
 	return cmd_results_new(CMD_BLOCK_BAR, NULL, NULL);
 }