diff options
author | Ryan Dwyer <RyanDwyer@users.noreply.github.com> | 2018-08-02 08:17:25 +1000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-02 08:17:25 +1000 |
commit | 4cc0855f21a2704314aa7b8973ceae7a8b463a1a (patch) | |
tree | 92d5b04c01c2da2bce20819ade8ed834bf2e420c /sway/input/cursor.c | |
parent | Merge pull request #2397 from chr0me-sh/hide-cursor-if-no-pointer (diff) | |
parent | ipc: remove extraneous values (diff) | |
download | sway-4cc0855f21a2704314aa7b8973ceae7a8b463a1a.tar.gz sway-4cc0855f21a2704314aa7b8973ceae7a8b463a1a.tar.zst sway-4cc0855f21a2704314aa7b8973ceae7a8b463a1a.zip |
Merge pull request #2264 from ianyfan/ipc
IPC Events (1.0)
Diffstat (limited to 'sway/input/cursor.c')
-rw-r--r-- | sway/input/cursor.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sway/input/cursor.c b/sway/input/cursor.c index 96ac7b33..d6fdc1da 100644 --- a/sway/input/cursor.c +++ b/sway/input/cursor.c | |||
@@ -349,7 +349,7 @@ void cursor_send_pointer_motion(struct sway_cursor *cursor, uint32_t time_msec, | |||
349 | output = container_parent(c, C_OUTPUT); | 349 | output = container_parent(c, C_OUTPUT); |
350 | } | 350 | } |
351 | if (output != focus) { | 351 | if (output != focus) { |
352 | seat_set_focus_warp(seat, c, false); | 352 | seat_set_focus_warp(seat, c, false, true); |
353 | } | 353 | } |
354 | } else if (c->type == C_VIEW) { | 354 | } else if (c->type == C_VIEW) { |
355 | // Focus c if the following are true: | 355 | // Focus c if the following are true: |
@@ -359,13 +359,13 @@ void cursor_send_pointer_motion(struct sway_cursor *cursor, uint32_t time_msec, | |||
359 | if (!wlr_seat_keyboard_has_grab(cursor->seat->wlr_seat) && | 359 | if (!wlr_seat_keyboard_has_grab(cursor->seat->wlr_seat) && |
360 | c != prev_c && | 360 | c != prev_c && |
361 | view_is_visible(c->sway_view)) { | 361 | view_is_visible(c->sway_view)) { |
362 | seat_set_focus_warp(seat, c, false); | 362 | seat_set_focus_warp(seat, c, false, true); |
363 | } else { | 363 | } else { |
364 | struct sway_container *next_focus = | 364 | struct sway_container *next_focus = |
365 | seat_get_focus_inactive(seat, &root_container); | 365 | seat_get_focus_inactive(seat, &root_container); |
366 | if (next_focus && next_focus->type == C_VIEW && | 366 | if (next_focus && next_focus->type == C_VIEW && |
367 | view_is_visible(next_focus->sway_view)) { | 367 | view_is_visible(next_focus->sway_view)) { |
368 | seat_set_focus_warp(seat, next_focus, false); | 368 | seat_set_focus_warp(seat, next_focus, false, true); |
369 | } | 369 | } |
370 | } | 370 | } |
371 | } | 371 | } |