mirrors
/
sway
mirror of https://github.com/swaywm/sway.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix usage of sway_assert

This commit is contained in:
Ivan Chebykin 2018-05-26 15:51:36 +03:00
parent 820a8c9c2d
commit 6e6b0decd9
No known key found for this signature in database
GPG Key ID: 34A8A768BB01746F
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sway/input/cursor.c
View File

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