From 1f08106b0a006d00e7d74701e4196c1f99e4ac36 Mon Sep 17 00:00:00 2001 From: "S. Christoffer Eliesen" Date: Fri, 23 Oct 2015 14:12:53 +0200 Subject: handlers: Don't switch output when mouse button is pressed. (E.g. if the user is using a scrollbar at the edge of the screen then switching workspace would cancel the scroll.) --- sway/handlers.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'sway/handlers.c') diff --git a/sway/handlers.c b/sway/handlers.c index 24105130..5acdd096 100644 --- a/sway/handlers.c +++ b/sway/handlers.c @@ -362,7 +362,8 @@ static bool handle_pointer_motion(wlc_handle handle, uint32_t time, const struct // // Since this doesn't currently support moving windows between outputs we // don't do the switch if the pointer is in a mode. - if (config->seamless_mouse && !pointer_state.mode) { + if (config->seamless_mouse && !pointer_state.mode && + !pointer_state.left.held && !pointer_state.right.held && !pointer_state.scroll.held) { swayc_t *output = swayc_active_output(); // TODO: This implementation is naïve: We assume all outputs are -- cgit v1.2.3 From c1479701dea79aebd2b5fdd83a9b28435f6647fe Mon Sep 17 00:00:00 2001 From: "S. Christoffer Eliesen" Date: Fri, 23 Oct 2015 14:32:17 +0200 Subject: seamless_mouse: Move pointer only if successfully changed workspace. If e.g. a window has a popup open then that will lock the current focus, making a workspace switch denied. So don't move the mouse pointer in such cases. --- sway/handlers.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'sway/handlers.c') diff --git a/sway/handlers.c b/sway/handlers.c index 5acdd096..09c020e9 100644 --- a/sway/handlers.c +++ b/sway/handlers.c @@ -377,8 +377,9 @@ static bool handle_pointer_motion(wlc_handle handle, uint32_t time, const struct } if (c->y == output->y && c->x + c->width == output->x) { sway_log(L_DEBUG, "%s is right of %s", output->name, c->name); - workspace_switch(c); - new_origin.x = c->width; + if (workspace_switch(c)) { + new_origin.x = c->width; + } } } } else if ((double)origin->x == output->width) { // Right edge @@ -389,8 +390,9 @@ static bool handle_pointer_motion(wlc_handle handle, uint32_t time, const struct } if (c->y == output->y && output->x + output->width == c->x) { sway_log(L_DEBUG, "%s is left of %s", output->name, c->name); - workspace_switch(c); - new_origin.x = 0; + if (workspace_switch(c)) { + new_origin.x = 0; + } } } } @@ -402,8 +404,9 @@ static bool handle_pointer_motion(wlc_handle handle, uint32_t time, const struct } if (output->x == c->x && c->y + c->height == output->y) { sway_log(L_DEBUG, "%s is below %s", output->name, c->name); - workspace_switch(c); - new_origin.y = c->height; + if (workspace_switch(c)) { + new_origin.y = c->height; + } } } } else if ((double)origin->y == output->height) { // Bottom edge @@ -414,8 +417,9 @@ static bool handle_pointer_motion(wlc_handle handle, uint32_t time, const struct } if (output->x == c->x && output->y + output->height == c->y) { sway_log(L_DEBUG, "%s is above %s", output->name, c->name); - workspace_switch(c); - new_origin.y = 0; + if (workspace_switch(c)) { + new_origin.y = 0; + } } } } -- cgit v1.2.3