1 files changed, 38 insertions, 21 deletions

diff --git a/sway/commands/focus.c b/sway/commands/focus.c
index 79b7aed5..facd82de 100644
--- a/sway/commands/focus.c
+++ b/sway/commands/focus.c
@@ -54,7 +54,7 @@ static bool get_direction_from_next_prev(struct sway_container *container,
         } else {
                 return false;
         }
-         
+
         return true;
 }
 
@@ -141,9 +141,9 @@ static struct sway_node *node_get_in_direction_tiling(
         struct sway_container *wrap_candidate = NULL;
         struct sway_container *current = container;
         while (current) {
-                if (current->fullscreen_mode == FULLSCREEN_WORKSPACE) {
+                if (current->pending.fullscreen_mode == FULLSCREEN_WORKSPACE) {
                         // Fullscreen container with a direction - go straight to outputs
-                        struct sway_output *output = current->workspace->output;
+                        struct sway_output *output = current->pending.workspace->output;
                         struct sway_output *new_output =
                                 output_get_in_direction(output, dir);
                         if (!new_output) {
@@ -151,7 +151,7 @@ static struct sway_node *node_get_in_direction_tiling(
                         }
                         return get_node_in_output_direction(new_output, dir);
                 }
-                if (current->fullscreen_mode == FULLSCREEN_GLOBAL) {
+                if (current->pending.fullscreen_mode == FULLSCREEN_GLOBAL) {
                         return NULL;
                 }
 
@@ -202,11 +202,11 @@ static struct sway_node *node_get_in_direction_tiling(
                         }
                 }
 
-                current = current->parent;
+                current = current->pending.parent;
         }
 
         // Check a different output
-        struct sway_output *output = container->workspace->output;
+        struct sway_output *output = container->pending.workspace->output;
         struct sway_output *new_output = output_get_in_direction(output, dir);
         if ((config->focus_wrapping != WRAP_WORKSPACE ||
                                 container->node.type == N_WORKSPACE) && new_output) {
@@ -226,23 +226,23 @@ static struct sway_node *node_get_in_direction_tiling(
 static struct sway_node *node_get_in_direction_floating(
                 struct sway_container *con, struct sway_seat *seat,
                 enum wlr_direction dir) {
-        double ref_lx = con->x + con->width / 2;
-        double ref_ly = con->y + con->height / 2;
+        double ref_lx = con->pending.x + con->pending.width / 2;
+        double ref_ly = con->pending.y + con->pending.height / 2;
         double closest_distance = DBL_MAX;
         struct sway_container *closest_con = NULL;
 
-        if (!con->workspace) {
+        if (!con->pending.workspace) {
                 return NULL;
         }
 
-        for (int i = 0; i < con->workspace->floating->length; i++) {
-                struct sway_container *floater = con->workspace->floating->items[i];
+        for (int i = 0; i < con->pending.workspace->floating->length; i++) {
+                struct sway_container *floater = con->pending.workspace->floating->items[i];
                 if (floater == con) {
                         continue;
                 }
                 float distance = dir == WLR_DIRECTION_LEFT || dir == WLR_DIRECTION_RIGHT
-                        ? (floater->x + floater->width / 2) - ref_lx
-                        : (floater->y + floater->height / 2) - ref_ly;
+                        ? (floater->pending.x + floater->pending.width / 2) - ref_lx
+                        : (floater->pending.y + floater->pending.height / 2) - ref_ly;
                 if (dir == WLR_DIRECTION_LEFT || dir == WLR_DIRECTION_UP) {
                         distance = -distance;
                 }
@@ -267,6 +267,11 @@ static struct cmd_results *focus_mode(struct sway_workspace *ws,
                 new_focus = seat_get_focus_inactive_tiling(seat, ws);
         }
         if (new_focus) {
+                struct sway_container *new_focus_view =
+                        seat_get_focus_inactive_view(seat, &new_focus->node);
+                if (new_focus_view) {
+                        new_focus = new_focus_view;
+                }
                 seat_set_focus_container(seat, new_focus);
 
                 // If we're on the floating layer and the floating container area
@@ -280,7 +285,7 @@ static struct cmd_results *focus_mode(struct sway_workspace *ws,
                 }
         } else {
                 return cmd_results_new(CMD_FAILURE,
-                                "Failed to find a %s container in workspace",
+                                "Failed to find a %s container in workspace.",
                                 floating ? "floating" : "tiling");
         }
         return cmd_results_new(CMD_SUCCESS, NULL);
@@ -290,7 +295,7 @@ static struct cmd_results *focus_output(struct sway_seat *seat,
                 int argc, char **argv) {
         if (!argc) {
                 return cmd_results_new(CMD_INVALID,
-                        "Expected 'focus output <direction|name>'");
+                        "Expected 'focus output <direction|name>'.");
         }
         char *identifier = join_args(argv, argc);
         struct sway_output *output = output_by_name_or_id(identifier);
@@ -300,13 +305,13 @@ static struct cmd_results *focus_output(struct sway_seat *seat,
                 if (!parse_direction(identifier, &direction)) {
                         free(identifier);
                         return cmd_results_new(CMD_INVALID,
-                                "There is no output with that name");
+                                "There is no output with that name.");
                 }
                 struct sway_workspace *ws = seat_get_focused_workspace(seat);
                 if (!ws) {
                         free(identifier);
                         return cmd_results_new(CMD_FAILURE,
-                                "No focused workspace to base directions off of");
+                                "No focused workspace to base directions off of.");
                 }
                 output = output_get_in_direction(ws->output, direction);
 
@@ -334,7 +339,7 @@ static struct cmd_results *focus_output(struct sway_seat *seat,
 static struct cmd_results *focus_parent(void) {
         struct sway_seat *seat = config->handler_context.seat;
         struct sway_container *con = config->handler_context.container;
-        if (!con || con->fullscreen_mode) {
+        if (!con || con->pending.fullscreen_mode) {
                 return cmd_results_new(CMD_SUCCESS, NULL);
         }
         struct sway_node *parent = node_get_parent(&con->node);
@@ -370,13 +375,24 @@ struct cmd_results *cmd_focus(int argc, char **argv) {
         struct sway_seat *seat = config->handler_context.seat;
         if (node->type < N_WORKSPACE) {
                 return cmd_results_new(CMD_FAILURE,
-                        "Command 'focus' cannot be used above the workspace level");
+                        "Command 'focus' cannot be used above the workspace level.");
         }
 
-        if (argc == 0 && container) {
+        if (argc == 0) {
+                if (!container) {
+                        return cmd_results_new(CMD_FAILURE, "No container to focus was specified.");
+                }
+
                 if (container_is_scratchpad_hidden_or_child(container)) {
                         root_scratchpad_show(container);
                 }
+                // if we are switching to a container under a fullscreen window, we first
+                // need to exit fullscreen so that the newly focused container becomes visible
+                struct sway_container *obstructing = container_obstructing_fullscreen_container(container);
+                if (obstructing) {
+                        container_fullscreen_disable(obstructing);
+                        arrange_root();
+                }
                 seat_set_focus_container(seat, container);
                 seat_consider_warp_to_focus(seat);
                 container_raise_floating(container);
@@ -439,7 +455,8 @@ struct cmd_results *cmd_focus(int argc, char **argv) {
                 return cmd_results_new(CMD_FAILURE, "");
         }
         struct sway_node *next_focus = NULL;
-        if (container_is_floating(container)) {
+        if (container_is_floating(container) &&
+                        container->pending.fullscreen_mode == FULLSCREEN_NONE) {
                 next_focus = node_get_in_direction_floating(container, seat, direction);
         } else {
                 next_focus = node_get_in_direction_tiling(container, seat, direction, descend);