Simplify logic, remove redundant variables.

This commit is contained in:
Scott Leggett 2018-05-28 01:30:19 +10:00
parent dd86444e59
commit 0039f7a4fd

View file

@ -170,15 +170,10 @@ void cursor_send_pointer_motion(struct sway_cursor *cursor, uint32_t time_msec,
seat_set_focus_warp(cursor->seat, c, false); seat_set_focus_warp(cursor->seat, c, false);
} }
} else if (c->type == C_VIEW) { } else if (c->type == C_VIEW) {
bool do_mouse_focus = true; // Focus c if both of the following are true:
// Don't switch focus if either of the following is true: // - cursor is over a new view, i.e. entered a new window; and
// - the cursor is over the same container as before. i.e. hasn't crossed // - the new view is visible, i.e. not hidden in a stack or tab.
// a window boundary; or if (c != prev_c && view_is_visible(c->sway_view)) {
// - the view is not visible. i.e. in a stack or tab.
if (c == prev_c || !view_is_visible(c->sway_view)) {
do_mouse_focus = false;
}
if (do_mouse_focus) {
seat_set_focus_warp(cursor->seat, c, false); seat_set_focus_warp(cursor->seat, c, false);
} else { } else {
struct sway_container *next_focus = struct sway_container *next_focus =