diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-06-24 17:45:03 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-24 17:45:03 -0700 |
| commit | 59086fabbfaa545641827b0e181100027de08205 (patch) | |
| tree | 25964d55bfcecdcf38f28dc2278cb21b199570ff /sway/input/cursor.c | |
| parent | 5222e1455597c4519869c469978b7d5dce1c8a52 (diff) | |
| parent | e9ad10c2d62146784d7c40015d5ea2a8b5b68865 (diff) | |
Merge pull request #2159 from acrisci/focus-dont-follow-keyboard-grab
dont focus-follow-mouse when keyboard grab
Diffstat (limited to 'sway/input/cursor.c')
| -rw-r--r-- | sway/input/cursor.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sway/input/cursor.c b/sway/input/cursor.c index 37a87756..944e35aa 100644 --- a/sway/input/cursor.c +++ b/sway/input/cursor.c @@ -174,10 +174,13 @@ void cursor_send_pointer_motion(struct sway_cursor *cursor, uint32_t time_msec, seat_set_focus_warp(seat, c, false); } } else if (c->type == C_VIEW) { - // Focus c if both of the following are true: + // Focus c if the following are true: // - cursor is over a new view, i.e. entered a new window; and - // - the new view is visible, i.e. not hidden in a stack or tab. - if (c != prev_c && view_is_visible(c->sway_view)) { + // - the new view is visible, i.e. not hidden in a stack or tab; and + // - the seat does not have a keyboard grab + if (!wlr_seat_keyboard_has_grab(cursor->seat->wlr_seat) && + c != prev_c && + view_is_visible(c->sway_view)) { seat_set_focus_warp(seat, c, false); } else { struct sway_container *next_focus = |