sway

commit fa9978ee848a9387a3c3f7eb1017f91f5f77f032
parent 6cd106d23c73c1f5c5f87d4c024400cfd5edc93f
Author: Drew DeVault <sir@cmpwn.com>
Date:   Tue, 27 Oct 2015 18:34:31 -0400

Merge pull request #209 from sce/fix_seamless_mouse

seamless_mouse: Pass workspace to workspace_switch, not output.
Diffstat:
M
sway/handlers.c
 | 
8
++++----

1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/sway/handlers.c b/sway/handlers.c
@@ -369,25 +369,25 @@ static bool handle_pointer_motion(wlc_handle handle, uint32_t time, const struct
 		swayc_t *output = swayc_active_output(), *adjacent = NULL;
 		if (origin->x == 0) { // Left edge
 			if ((adjacent = swayc_adjacent_output(output, MOVE_LEFT))) {
-				if (workspace_switch(adjacent)) {
+				if (workspace_switch(swayc_active_workspace_for(adjacent))) {
 					new_origin.x = adjacent->width;
 				}
 			}
 		} else if ((double)origin->x == output->width) { // Right edge
 			if ((adjacent = swayc_adjacent_output(output, MOVE_RIGHT))) {
-				if (workspace_switch(adjacent)) {
+				if (workspace_switch(swayc_active_workspace_for(adjacent))) {
 					new_origin.x = 0;
 				}
 			}
 		} else if (origin->y == 0) { // Top edge
 			if ((adjacent = swayc_adjacent_output(output, MOVE_UP))) {
-				if (workspace_switch(adjacent)) {
+				if (workspace_switch(swayc_active_workspace_for(adjacent))) {
 					new_origin.y = adjacent->height;
 				}
 			}
 		} else if ((double)origin->y == output->height) { // Bottom edge
 			if ((adjacent = swayc_adjacent_output(output, MOVE_DOWN))) {
-				if (workspace_switch(adjacent)) {
+				if (workspace_switch(swayc_active_workspace_for(adjacent))) {
 					new_origin.y = 0;
 				}
 			}