mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-10 20:44:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Moved visibility check of of loop, added asserts

Browse Source
This commit is contained in:
Ivan Chebykin 2018-05-26 13:34:14 +03:00
parent 740234a4bc
commit 820a8c9c2d
No known key found for this signature in database
GPG Key ID: 34A8A768BB01746F
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sway/input/cursor.c
View File

@ -167,10 +167,12 @@ void cursor_send_pointer_motion(struct sway_cursor *cursor, uint32_t time_msec,
// If pointed container is in nested containers which are // If pointed container is in nested containers which are
// inside tabbed/stacked layout we should skip them // inside tabbed/stacked layout we should skip them
bool do_mouse_focus = true; bool do_mouse_focus = true;
sway_assert(c->type == C_VIEW, "pointed container is not a view");
bool is_visible = view_is_visible(c->sway_view);
struct sway_container *p = c->parent; struct sway_container *p = c->parent;
while (p) { while (p) {
if ((p->layout == L_TABBED || p->layout == L_STACKED) if ((p->layout == L_TABBED || p->layout == L_STACKED)
&& !view_is_visible(c->sway_view)) { && !is_visible) {
do_mouse_focus = false; do_mouse_focus = false;
break; break;
} }
@ -179,6 +181,8 @@ void cursor_send_pointer_motion(struct sway_cursor *cursor, uint32_t time_msec,
if (!do_mouse_focus) { if (!do_mouse_focus) {
struct sway_container *next_focus = seat_get_focus_inactive( struct sway_container *next_focus = seat_get_focus_inactive(
cursor->seat, p); cursor->seat, p);
sway_assert(next_focus->type == C_VIEW,
"focus inactive container is not a view");
if (next_focus && view_is_visible(next_focus->sway_view)) { if (next_focus && view_is_visible(next_focus->sway_view)) {
seat_set_focus_warp(cursor->seat, next_focus, false); seat_set_focus_warp(cursor->seat, next_focus, false);
} }