output: Support multiple adjacent outputs.

When querying for an adjacent output we now need an absolute position in
order to know which adjacent output that matches. (The position is
either the current mouse position or the center of the currently focused
container, depending on context.)

If two outputs have one edge each that at least partially align with
each other they now count as adjacent.

Seamless mouse is affected by this and now properly moves and positions
itself between outputs with "uneven" placement (as long as they have at
least some part of the edge adjacent to each other).

When focusing or moving a container in a specified direction the center
of the current focused container decides where to look for an adjacent
output. So if e.g. an output has two adjacent outputs to the right and a
"focus right" command is issued then it's the placement of the currently
focused container that decides which output actually gets focused.

Also, if an output has at least one output adjacent in some direction
but the entire edge is not covered (ie. it has "holes" with no outputs),
then the algorithm will choose the output that is closest to the
currently focused container (this does not apply to seamless mouse, the
pointer will just stop at the edge in that case).

1 files changed, 12 insertions, 6 deletions

diff --git a/sway/commands.c b/sway/commands.c
index f194681e..dfb3c12d 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -377,11 +377,13 @@ static struct cmd_results *cmd_focus(int argc, char **argv) {
         struct cmd_results *error = NULL;
         if (argc > 0 && strcasecmp(argv[0], "output") == 0) {
                 swayc_t *output = NULL;
+                struct wlc_point abs_pos;
+                get_absolute_center_position(get_focused_container(&root_container), &abs_pos);
                 if ((error = checkarg(argc, "focus", EXPECTED_EQUAL_TO, 2))) {
                         return error;
-                } else if (!(output = output_by_name(argv[1]))) {
+                } else if (!(output = output_by_name(argv[1], &abs_pos))) {
                         return cmd_results_new(CMD_FAILURE, "focus output",
-                                "Can't find output with name/at direction %s", argv[1]);
+                                "Can't find output with name/at direction '%s' @ (%i,%i)", argv[1], abs_pos.x, abs_pos.y);
                 } else if (!workspace_switch(swayc_active_workspace_for(output))) {
                         return cmd_results_new(CMD_FAILURE, "focus output",
                                 "Switching to workspace on output '%s' was blocked", argv[1]);
@@ -591,11 +593,13 @@ static struct cmd_results *cmd_move(int argc, char **argv) {
                 } else if (strcasecmp(argv[1], "to") == 0 && strcasecmp(argv[2], "output") == 0) {
                         // move container to output x
                         swayc_t *output = NULL;
+                        struct wlc_point abs_pos;
+                        get_absolute_center_position(view, &abs_pos);
                         if (view->type != C_CONTAINER && view->type != C_VIEW) {
                                 return cmd_results_new(CMD_FAILURE, "move", "Can only move containers and views.");
-                        } else if (!(output = output_by_name(argv[3]))) {
+                        } else if (!(output = output_by_name(argv[3], &abs_pos))) {
                                 return cmd_results_new(CMD_FAILURE, "move",
-                                        "Can't find output with name/direction '%s'", argv[3]);
+                                        "Can't find output with name/direction '%s' @ (%i,%i)", argv[3], abs_pos.x, abs_pos.y);
                         } else {
                                 swayc_t *container = get_focused_container(output);
                                 if (container->is_floating) {
@@ -610,13 +614,15 @@ static struct cmd_results *cmd_move(int argc, char **argv) {
         } else if (strcasecmp(argv[0], "workspace") == 0) {
                 // move workspace (to output x)
                 swayc_t *output = NULL;
+                struct wlc_point abs_pos;
+                get_absolute_center_position(view, &abs_pos);
                 if ((error = checkarg(argc, "move workspace", EXPECTED_EQUAL_TO, 4))) {
                         return error;
                 } else if (strcasecmp(argv[1], "to") != 0 || strcasecmp(argv[2], "output") != 0) {
                         return cmd_results_new(CMD_INVALID, "move", expected_syntax);
-                } else if (!(output = output_by_name(argv[3]))) {
+                } else if (!(output = output_by_name(argv[3], &abs_pos))) {
                         return cmd_results_new(CMD_FAILURE, "move workspace",
-                                "Can't find output with name/at direction '%s'", argv[3]);
+                                "Can't find output with name/direction '%s' @ (%i,%i)", argv[3], abs_pos.x, abs_pos.y);
                 }
                 if (view->type == C_WORKSPACE) {
                         // This probably means we're moving an empty workspace, but