Merge remote-tracking branch 'upstream/master' into output-damage

This commit is contained in:
emersion 2018-01-28 21:22:50 +01:00
commit 1ee61dbd0f
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
11 changed files with 87 additions and 26 deletions

View file

@ -732,10 +732,12 @@ void roots_seat_set_focus(struct roots_seat *seat, struct roots_view *view) {
return;
}
#ifdef WLR_HAS_XWAYLAND
if (view && view->type == ROOTS_XWAYLAND_VIEW &&
view->xwayland_surface->override_redirect) {
return;
}
#endif
struct roots_seat_view *seat_view = NULL;
if (view != NULL) {
seat_view = roots_seat_view_from_view(seat, view);