mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-15 06:59:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix border commands from changing focus

Browse source
This commit is contained in:
Brian Ashworth 2018-05-20 23:12:33 -04:00
parent cf3ab1f45f
commit 82cd55a670
5 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
sway/input/cursor.c
View file

@ -135,7 +135,8 @@ static struct sway_container *container_at_coords(
return output->swayc;
}
void cursor_send_pointer_motion(struct sway_cursor *cursor, uint32_t time_msec) {
void cursor_send_pointer_motion(struct sway_cursor *cursor, uint32_t time_msec,
bool allow_refocusing) {
if (time_msec == 0) {
time_msec = get_current_time_msec();
}
@ -145,7 +146,7 @@ void cursor_send_pointer_motion(struct sway_cursor *cursor, uint32_t time_msec)
double sx, sy;
struct sway_container *c = container_at_coords(cursor->seat,
cursor->cursor->x, cursor->cursor->y, &surface, &sx, &sy);
if (c && config->focus_follows_mouse) {
if (c && config->focus_follows_mouse && allow_refocusing) {
if (c->type == C_WORKSPACE) {
// Only follow the mouse if it would move to a new output
// Otherwise we'll focus the workspace, which is probably wrong
@ -193,7 +194,7 @@ static void handle_cursor_motion(struct wl_listener *listener, void *data) {
struct wlr_event_pointer_motion *event = data;
wlr_cursor_move(cursor->cursor, event->device,
event->delta_x, event->delta_y);
cursor_send_pointer_motion(cursor, event->time_msec);
cursor_send_pointer_motion(cursor, event->time_msec, true);
}
static void handle_cursor_motion_absolute(
@ -203,7 +204,7 @@ static void handle_cursor_motion_absolute(
wlr_idle_notify_activity(cursor->seat->input->server->idle, cursor->seat->wlr_seat);
struct wlr_event_pointer_motion_absolute *event = data;
wlr_cursor_warp_absolute(cursor->cursor, event->device, event->x, event->y);
cursor_send_pointer_motion(cursor, event->time_msec);
cursor_send_pointer_motion(cursor, event->time_msec, true);
}
void dispatch_cursor_button(struct sway_cursor *cursor,
@ -373,7 +374,7 @@ static void handle_tool_axis(struct wl_listener *listener, void *data) {
}
wlr_cursor_warp_absolute(cursor->cursor, event->device, x, y);
cursor_send_pointer_motion(cursor, event->time_msec);
cursor_send_pointer_motion(cursor, event->time_msec, true);
}
static void handle_tool_tip(struct wl_listener *listener, void *data) {