aboutsummaryrefslogtreecommitdiff
path: root/rootston/seat.c
diff options
context:
space:
mode:
authoremersion <contact@emersion.fr>2018-01-28 21:22:50 +0100
committeremersion <contact@emersion.fr>2018-01-28 21:22:50 +0100
commit1ee61dbd0f6ab8cf9dfafb085707bd67cca50e70 (patch)
tree502ff5ebd47df13e8bb432d379cab44532c54deb /rootston/seat.c
parent692d33bf8b752cc3b8a0b7f2b29c2b49dd4f718b (diff)
parentf0b3a71fbc72eeccf44bc6a6f6c39a80af918463 (diff)
Merge remote-tracking branch 'upstream/master' into output-damage
Diffstat (limited to 'rootston/seat.c')
-rw-r--r--rootston/seat.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/rootston/seat.c b/rootston/seat.c
index 7ff46f98..55866ce6 100644
--- a/rootston/seat.c
+++ b/rootston/seat.c
@@ -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);