3 files changed, 94 insertions, 24 deletions

diff --git a/include/sway/workspace.h b/include/sway/workspace.h
index ca6f9bdb..fee54255 100644
--- a/include/sway/workspace.h
+++ b/include/sway/workspace.h
@@ -1,7 +1,7 @@
 #ifndef _SWAY_WORKSPACE_H
 #define _SWAY_WORKSPACE_H
 
-#include <sway/container.h>
+#include "sway/container.h"
 
 extern char *prev_workspace_name;
 
diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index 7b7fcbb9..a3d9efd8 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -46,18 +46,22 @@ static void render_surface(struct wlr_surface *surface,
         int height = surface->current->height;
         int render_width = width * wlr_output->scale;
         int render_height = height * wlr_output->scale;
-        double ox = lx, oy = ly;
-        wlr_output_layout_output_coords(layout, wlr_output, &ox, &oy);
-        ox *= wlr_output->scale;
-        oy *= wlr_output->scale;
+        int owidth, oheight;
+        wlr_output_effective_resolution(wlr_output, &owidth, &oheight);
 
-        struct wlr_box render_box = {
-                .x = lx, .y = ly,
+        // FIXME: view coords are inconsistently assumed to be in output or layout coords
+        struct wlr_box layout_box = {
+                .x = lx + owidth, .y = ly + oheight,
                 .width = render_width, .height = render_height,
         };
-        if (wlr_output_layout_intersects(layout, wlr_output, &render_box)) {
+        if (wlr_output_layout_intersects(layout, wlr_output, &layout_box)) {
+                struct wlr_box render_box = {
+                        .x = lx, .y = ly,
+                        .width = render_width, .height = render_height
+                };
                 float matrix[16];
-                wlr_matrix_project_box(&matrix, &render_box, surface->current->transform, 0, &wlr_output->transform_matrix);
+                wlr_matrix_project_box(&matrix, &render_box,
+                                surface->current->transform, 0, &wlr_output->transform_matrix);
                 wlr_render_with_matrix(server.renderer, surface->texture,
                         &matrix);
 
diff --git a/sway/tree/layout.c b/sway/tree/layout.c
index 5e8f4c56..be494791 100644
--- a/sway/tree/layout.c
+++ b/sway/tree/layout.c
@@ -364,7 +364,12 @@ static swayc_t *get_swayc_in_output_direction(swayc_t *output,
                 ws = swayc_parent_by_type(ws, C_WORKSPACE);
         }
 
-        if (ws && ws->children->length > 0) {
+        if (ws == NULL) {
+                wlr_log(L_ERROR, "got an output without a workspace");
+                return NULL;
+        }
+
+        if (ws->children->length > 0) {
                 switch (dir) {
                 case MOVE_LEFT:
                         // get most right child of new output
@@ -395,12 +400,61 @@ static swayc_t *get_swayc_in_output_direction(swayc_t *output,
                 }
         }
 
-        return output;
+        return ws;
 }
 
-static void get_absolute_center_position(swayc_t *container, int *x, int *y) {
-        *x = container->x + container->width/2;
-        *y = container->y + container->height/2;
+static void get_layout_center_position(swayc_t *container, int *x, int *y) {
+        // FIXME view coords are inconsistently referred to in layout/output systems
+        if (container->type == C_OUTPUT) {
+                *x = container->x + container->width/2;
+                *y = container->y + container->height/2;
+        } else {
+                swayc_t *output = swayc_parent_by_type(container, C_OUTPUT);
+                if (container->type == C_WORKSPACE) {
+                        // Workspace coordinates are actually wrong/arbitrary, but should
+                        // be same as output.
+                        *x = output->x;
+                        *y = output->y;
+                } else {
+                        *x = output->x + container->x;
+                        *y = output->y + container->y;
+                }
+        }
+}
+
+static bool sway_dir_to_wlr(enum movement_direction dir, enum wlr_direction *out) {
+        *out = 0;
+        switch (dir) {
+        case MOVE_UP:
+                *out = WLR_DIRECTION_UP;
+                break;
+        case MOVE_DOWN:
+                *out = WLR_DIRECTION_DOWN;
+                break;
+        case MOVE_LEFT:
+                *out = WLR_DIRECTION_LEFT;
+                break;
+        case MOVE_RIGHT:
+                *out = WLR_DIRECTION_RIGHT;
+                break;
+        default:
+                break;
+        }
+
+        return *out != 0;
+}
+
+static swayc_t *sway_output_from_wlr(struct wlr_output *output) {
+        if (output == NULL) {
+                return NULL;
+        }
+        for (int i = 0; i < root_container.children->length; ++i) {
+                swayc_t *o = root_container.children->items[i];
+                if (o->type == C_OUTPUT && o->sway_output->wlr_output == output) {
+                        return o;
+                }
+        }
+        return NULL;
 }
 
 static swayc_t *get_swayc_in_direction_under(swayc_t *container,
@@ -435,7 +489,7 @@ static swayc_t *get_swayc_in_direction_under(swayc_t *container,
         // If moving to an adjacent output we need a starting position (since this
         // output might border to multiple outputs).
         //struct wlc_point abs_pos;
-        //get_absolute_center_position(container, &abs_pos);
+        //get_layout_center_position(container, &abs_pos);
 
 
         // TODO WLR fullscreen
@@ -443,7 +497,7 @@ static swayc_t *get_swayc_in_direction_under(swayc_t *container,
         if (container->type == C_VIEW && swayc_is_fullscreen(container)) {
                 wlr_log(L_DEBUG, "Moving from fullscreen view, skipping to output");
                 container = swayc_parent_by_type(container, C_OUTPUT);
-                get_absolute_center_position(container, &abs_pos);
+                get_layout_center_position(container, &abs_pos);
                 swayc_t *output = swayc_adjacent_output(container, dir, &abs_pos, true);
                 return get_swayc_in_output_direction(output, dir);
         }
@@ -460,17 +514,29 @@ static swayc_t *get_swayc_in_direction_under(swayc_t *container,
                 int desired;
                 int idx = index_child(container);
                 if (parent->type == C_ROOT) {
-                        // TODO
-                        /*
+                        enum wlr_direction wlr_dir = 0;
+                        if (!sway_assert(sway_dir_to_wlr(dir, &wlr_dir),
+                                                "got invalid direction: %d", dir)) {
+                                return NULL;
+                        }
+                        int lx, ly;
+                        get_layout_center_position(container, &lx, &ly);
                         struct wlr_output_layout *layout = root_container.sway_root->output_layout;
-                        wlr_output_layout_adjacent_output(layout, container->sway_output->wlr_output);
-                        //swayc_t *output = swayc_adjacent_output(container, dir, &abs_pos, true);
-                        if (!output || output == container) {
+                        struct wlr_output *wlr_adjacent =
+                                wlr_output_layout_adjacent_output(layout, wlr_dir,
+                                        container->sway_output->wlr_output, lx, ly);
+                        swayc_t *adjacent = sway_output_from_wlr(wlr_adjacent);
+
+                        if (!adjacent || adjacent == container) {
                                 return wrap_candidate;
                         }
-                        wlr_log(L_DEBUG, "Moving between outputs");
-                        return get_swayc_in_output_direction(output, dir, seat);
-                        */
+                        swayc_t *next = get_swayc_in_output_direction(adjacent, dir, seat);
+                        if (next->children->length) {
+                                // TODO consider floating children as well
+                                return sway_seat_get_focus_inactive(seat, next);
+                        } else {
+                                return next;
+                        }
                 } else {
                         if (dir == MOVE_LEFT || dir == MOVE_RIGHT) {
                                 if (parent->layout == L_HORIZ || parent->layout == L_TABBED) {