Merge ffe1948d52 into ab455bbada

include/sway/commands.h

@@ -117,6 +117,7 @@ sway_cmd cmd_client_focused;
 sway_cmd cmd_client_focused_inactive;
 sway_cmd cmd_client_focused_tab_title;
 sway_cmd cmd_client_unfocused;
+sway_cmd cmd_client_unfocused_tab_title;
 sway_cmd cmd_client_urgent;
 sway_cmd cmd_client_placeholder;
 sway_cmd cmd_client_background;

include/sway/config.h

@@ -569,12 +569,14 @@ struct sway_config {
 		struct border_colors focused_inactive;
 		struct border_colors focused_tab_title;
 		struct border_colors unfocused;
+		struct border_colors unfocused_tab_title;
 		struct border_colors urgent;
 		struct border_colors placeholder;
 		float background[4];
 	} border_colors;
 
 	bool has_focused_tab_title;
+	bool has_unfocused_tab_title;
 
 	// floating view
 	int32_t floating_maximum_width;

sway/commands.c

@@ -54,6 +54,7 @@ static const struct cmd_handler handlers[] = {
 	{ "client.focused_tab_title", cmd_client_focused_tab_title },
 	{ "client.placeholder", cmd_client_noop },
 	{ "client.unfocused", cmd_client_unfocused },
+	{ "client.unfocused_tab_title", cmd_client_unfocused_tab_title },
 	{ "client.urgent", cmd_client_urgent },
 	{ "default_border", cmd_default_border },
 	{ "default_floating_border", cmd_default_floating_border },

sway/commands/client.c

@@ -90,3 +90,13 @@ struct cmd_results *cmd_client_focused_tab_title(int argc, char **argv) {
 	}
 	return result;
 }
+
+struct cmd_results *cmd_client_unfocused_tab_title(int argc, char **argv) {
+	struct cmd_results *result =  handle_command(argc, argv,
+			"client.unfocused_tab_title",
+			&config->border_colors.unfocused_tab_title, "#2e9ef4ff");
+	if (result && result->status == CMD_SUCCESS) {
+		config->has_unfocused_tab_title = true;
+	}
+	return result;
+}

sway/config.c

@@ -309,6 +309,7 @@ static void config_defaults(struct sway_config *config) {
 	config->hide_lone_tab = false;
 
 	config->has_focused_tab_title = false;
+	config->has_unfocused_tab_title = false;
 
 	// border colors
 	color_to_rgba(config->border_colors.focused.border, 0x4C7899FF);

sway/sway.5.scd

@@ -613,6 +613,11 @@ runtime.
 	*client.unfocused*
 		A window that does not have focus.
 
+	*client.unfocused_tab_title*
+		Title of a tab or stack container that does not have focus. Defaults to
+		unfocused if not specified and does not use the indicator and child_border
+		colors.
+
 	*client.urgent*
 		A window with an urgency hint. *Note*: Native Wayland windows do not
 		support urgency. Urgency only works for Xwayland windows.
@@ -674,6 +679,12 @@ The default colors are:
 :  #888888
 :  #292d2e
 :  #222222
+|  *unfocused_tab_title*
+:  #333333
+:  #222222
+:  #888888
+:  n/a
+:  n/a
 |  *urgent*
 :  #2f343a
 :  #900000

sway/tree/container.c

@@ -176,6 +176,14 @@ static bool container_has_focused_child(struct sway_container *con) {
 	return container_find_child(con, container_is_focused, NULL);
 }
 
+static bool container_is_container(struct sway_container *con, void *data) {
+	return true;  // intentional tautology
+}
+
+static bool container_has_child(struct sway_container *con) {
+	return container_find_child(con, container_is_container, NULL);
+}
+
 static bool container_is_current_parent_focused(struct sway_container *con) {
 	if (con->current.parent) {
 		struct sway_container *parent = con->current.parent;
@@ -212,6 +220,8 @@ static struct border_colors *container_get_current_colors(
 		colors = &config->border_colors.focused_tab_title;
 	} else if (con == active_child) {
 		colors = &config->border_colors.focused_inactive;
+	} else if (config->has_unfocused_tab_title && container_has_child(con)) {
+		colors = &config->border_colors.unfocused_tab_title;
 	} else {
 		colors = &config->border_colors.unfocused;
 	}