diff options
Diffstat (limited to 'sway/desktop/xwayland.c')
-rw-r--r-- | sway/desktop/xwayland.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c index 066556b8..58cb4d07 100644 --- a/sway/desktop/xwayland.c +++ b/sway/desktop/xwayland.c | |||
@@ -70,9 +70,8 @@ static void unmanaged_handle_map(struct wl_listener *listener, void *data) { | |||
70 | desktop_damage_surface(xsurface->surface, surface->lx, surface->ly, true); | 70 | desktop_damage_surface(xsurface->surface, surface->lx, surface->ly, true); |
71 | 71 | ||
72 | if (wlr_xwayland_or_surface_wants_focus(xsurface)) { | 72 | if (wlr_xwayland_or_surface_wants_focus(xsurface)) { |
73 | struct sway_seat *seat = input_manager_current_seat(input_manager); | 73 | struct sway_seat *seat = input_manager_current_seat(); |
74 | struct wlr_xwayland *xwayland = | 74 | struct wlr_xwayland *xwayland = server.xwayland.wlr_xwayland; |
75 | seat->input->server->xwayland.wlr_xwayland; | ||
76 | wlr_xwayland_set_seat(xwayland, seat->wlr_seat); | 75 | wlr_xwayland_set_seat(xwayland, seat->wlr_seat); |
77 | seat_set_focus_surface(seat, xsurface->surface, false); | 76 | seat_set_focus_surface(seat, xsurface->surface, false); |
78 | } | 77 | } |
@@ -86,7 +85,7 @@ static void unmanaged_handle_unmap(struct wl_listener *listener, void *data) { | |||
86 | wl_list_remove(&surface->link); | 85 | wl_list_remove(&surface->link); |
87 | wl_list_remove(&surface->commit.link); | 86 | wl_list_remove(&surface->commit.link); |
88 | 87 | ||
89 | struct sway_seat *seat = input_manager_current_seat(input_manager); | 88 | struct sway_seat *seat = input_manager_current_seat(); |
90 | if (seat->wlr_seat->keyboard_state.focused_surface == | 89 | if (seat->wlr_seat->keyboard_state.focused_surface == |
91 | xsurface->surface) { | 90 | xsurface->surface) { |
92 | // Restore focus | 91 | // Restore focus |
@@ -457,7 +456,7 @@ static void handle_request_move(struct wl_listener *listener, void *data) { | |||
457 | if (!container_is_floating(view->container)) { | 456 | if (!container_is_floating(view->container)) { |
458 | return; | 457 | return; |
459 | } | 458 | } |
460 | struct sway_seat *seat = input_manager_current_seat(input_manager); | 459 | struct sway_seat *seat = input_manager_current_seat(); |
461 | seat_begin_move_floating(seat, view->container, seat->last_button); | 460 | seat_begin_move_floating(seat, view->container, seat->last_button); |
462 | } | 461 | } |
463 | 462 | ||
@@ -473,7 +472,7 @@ static void handle_request_resize(struct wl_listener *listener, void *data) { | |||
473 | return; | 472 | return; |
474 | } | 473 | } |
475 | struct wlr_xwayland_resize_event *e = data; | 474 | struct wlr_xwayland_resize_event *e = data; |
476 | struct sway_seat *seat = input_manager_current_seat(input_manager); | 475 | struct sway_seat *seat = input_manager_current_seat(); |
477 | seat_begin_resize_floating(seat, view->container, | 476 | seat_begin_resize_floating(seat, view->container, |
478 | seat->last_button, e->edges); | 477 | seat->last_button, e->edges); |
479 | } | 478 | } |