seatop_default: handle focus for xwayland_unmanaged views

This commit is contained in:
Ronan Pigott 2019-11-03 12:05:25 -07:00 committed by Simon Ser
parent d159b98744
commit eaee087c17

View file

@ -7,6 +7,9 @@
#include "sway/input/seat.h" #include "sway/input/seat.h"
#include "sway/tree/view.h" #include "sway/tree/view.h"
#include "log.h" #include "log.h"
#if HAVE_XWAYLAND
#include "sway/xwayland.h"
#endif
struct seatop_default_event { struct seatop_default_event {
struct sway_node *previous_node; struct sway_node *previous_node;
@ -292,6 +295,21 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
return; return;
} }
#if HAVE_XWAYLAND
// Handle clicking on xwayland unmanaged view
if (surface && wlr_surface_is_xwayland_surface(surface)) {
struct wlr_xwayland_surface *xsurface =
wlr_xwayland_surface_from_wlr_surface(surface);
if (wlr_xwayland_or_surface_wants_focus(xsurface)) {
struct wlr_xwayland *xwayland = server.xwayland.wlr_xwayland;
wlr_xwayland_set_seat(xwayland, seat->wlr_seat);
seat_set_focus_surface(seat, xsurface->surface, false);
}
seat_pointer_notify_button(seat, time_msec, button, state);
return;
}
#endif
// Handle tiling resize via border // Handle tiling resize via border
if (cont && resize_edge && button == BTN_LEFT && if (cont && resize_edge && button == BTN_LEFT &&
state == WLR_BUTTON_PRESSED && !is_floating) { state == WLR_BUTTON_PRESSED && !is_floating) {