Implement focus handling for containers

The previous implementation of focus handling assumed that only views can be
focused. Containers can also be focused with a command like `focus parent` or
`focus child`.

Change `set_focused_container()` to handle the case of the given container
being a container with children and update borders accordingly.

1 files changed, 17 insertions, 3 deletions

diff --git a/sway/border.c b/sway/border.c
index c1a62bc6..c3e1004a 100644
--- a/sway/border.c
+++ b/sway/border.c
@@ -308,6 +308,9 @@ void update_view_border(swayc_t *view) {
         swayc_t *focused = get_focused_view(&root_container);
         swayc_t *container = swayc_parent_by_type(view, C_CONTAINER);
         swayc_t *focused_inactive = NULL;
+
+        bool is_child_of_focused = swayc_is_parent_of(get_focused_container(&root_container), view);
+
         if (container) {
                 focused_inactive = swayc_focus_by_type(container, C_VIEW);
         } else {
@@ -334,7 +337,7 @@ void update_view_border(swayc_t *view) {
                 cr = create_border_buffer(view, g, &surface);
 
                 bool render_top = !should_hide_top_border(view, view->y);
-                if (view == focused) {
+                if (view == focused || is_child_of_focused) {
                         render_borders(view, cr, &config->border_colors.focused, render_top);
                 } else {
                         render_borders(view, cr, &config->border_colors.focused_inactive, render_top);
@@ -360,7 +363,7 @@ void update_view_border(swayc_t *view) {
                                 break;
                         }
 
-                        if (focused == view) {
+                        if (focused == view || is_child_of_focused) {
                                 render_borders(view, cr, &config->border_colors.focused, true);
                         } else if (focused_inactive == view) {
                                 render_borders(view, cr, &config->border_colors.focused_inactive, true);
@@ -375,7 +378,7 @@ void update_view_border(swayc_t *view) {
                                 break;
                         }
 
-                        if (focused == view) {
+                        if (focused == view || is_child_of_focused) {
                                 render_borders(view, cr, &config->border_colors.focused, false);
                                 render_title_bar(view, cr, &view->border_geometry,
                                         &config->border_colors.focused);
@@ -403,6 +406,17 @@ void update_view_border(swayc_t *view) {
         }
 }
 
+void update_container_border(swayc_t *container) {
+        if (container->type == C_VIEW) {
+                update_view_border(container);
+                return;
+        } else {
+                for (int i = 0; i < container->children->length; ++i) {
+                        update_container_border(container->children->items[i]);
+                }
+        }
+}
+
 void render_view_borders(wlc_handle view) {
         swayc_t *c = swayc_by_handle(view);