mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-25 17:31:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use new wlroots API for clearing keyboard/pointer focus during grabs

Browse source 
We are not allowed to do what we did in #5222 and pass a `NULL` surface
wlr_seat_pointer_notify_enter(), and it's causing crashes when an
xdg-shell popup is active (see #5294 and swaywm/wlroots#2161).

Instead, solve #5220 using the new wlroots API introduced in
swaywm/wlroots#2217.
This commit is contained in:
Thomas Hebb 2020-05-20 21:20:19 -04:00 committed by Simon Ser
parent e3e548a648
commit 84ec8f92a6
8 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sway/config/output.c
View file

@ -645,7 +645,7 @@ void apply_output_config_to_outputs(struct output_config *oc) {
struct sway_seat *seat; struct sway_seat *seat;
wl_list_for_each(seat, &server.input->seats, link) { wl_list_for_each(seat, &server.input->seats, link) {
wlr_seat_pointer_clear_focus(seat->wlr_seat); wlr_seat_pointer_notify_clear_focus(seat->wlr_seat);
cursor_rebase(seat->cursor); cursor_rebase(seat->cursor);
} }
} }

2
sway/input/cursor.c
View file

@ -236,7 +236,7 @@ void cursor_update_image(struct sway_cursor *cursor,
static void cursor_hide(struct sway_cursor *cursor) { static void cursor_hide(struct sway_cursor *cursor) {
wlr_cursor_set_image(cursor->cursor, NULL, 0, 0, 0, 0, 0, 0); wlr_cursor_set_image(cursor->cursor, NULL, 0, 0, 0, 0, 0, 0);
cursor->hidden = true; cursor->hidden = true;
wlr_seat_pointer_clear_focus(cursor->seat->wlr_seat); wlr_seat_pointer_notify_clear_focus(cursor->seat->wlr_seat);
} }
static int hide_notify(void *data) { static int hide_notify(void *data) {

6
sway/input/seat.c
View file

@ -698,7 +698,7 @@ static void seat_configure_keyboard(struct sway_seat *seat,
struct sway_node *focus = seat_get_focus(seat); struct sway_node *focus = seat_get_focus(seat);
if (focus && node_is_view(focus)) { if (focus && node_is_view(focus)) {
// force notify reenter to pick up the new configuration // force notify reenter to pick up the new configuration
wlr_seat_keyboard_clear_focus(seat->wlr_seat); wlr_seat_keyboard_notify_clear_focus(seat->wlr_seat);
seat_keyboard_notify_enter(seat, focus->sway_container->view->surface); seat_keyboard_notify_enter(seat, focus->sway_container->view->surface);
} }
} }
@ -963,7 +963,7 @@ static void send_unfocus(struct sway_container *con, void *data) {
// Unfocus the container and any children (eg. when leaving `focus parent`) // Unfocus the container and any children (eg. when leaving `focus parent`)
static void seat_send_unfocus(struct sway_node *node, struct sway_seat *seat) { static void seat_send_unfocus(struct sway_node *node, struct sway_seat *seat) {
sway_cursor_constrain(seat->cursor, NULL); sway_cursor_constrain(seat->cursor, NULL);
wlr_seat_keyboard_clear_focus(seat->wlr_seat); wlr_seat_keyboard_notify_clear_focus(seat->wlr_seat);
if (node->type == N_WORKSPACE) { if (node->type == N_WORKSPACE) {
workspace_for_each_container(node->sway_workspace, send_unfocus, seat); workspace_for_each_container(node->sway_workspace, send_unfocus, seat);
} else { } else {
@ -1230,7 +1230,7 @@ void seat_set_exclusive_client(struct sway_seat *seat,
} }
if (seat->wlr_seat->pointer_state.focused_client) { if (seat->wlr_seat->pointer_state.focused_client) {
if (seat->wlr_seat->pointer_state.focused_client->client != client) { if (seat->wlr_seat->pointer_state.focused_client->client != client) {
wlr_seat_pointer_clear_focus(seat->wlr_seat); wlr_seat_pointer_notify_clear_focus(seat->wlr_seat);
} }
} }
struct timespec now; struct timespec now;

6
sway/input/seatop_default.c
View file

@ -483,8 +483,7 @@ static void handle_pointer_motion(struct sway_seat *seat, uint32_t time_msec,
} }
} else { } else {
cursor_update_image(cursor, node); cursor_update_image(cursor, node);
wlr_seat_pointer_notify_enter(seat->wlr_seat, NULL, 0, 0); wlr_seat_pointer_notify_clear_focus(seat->wlr_seat);
wlr_seat_pointer_clear_focus(seat->wlr_seat);
} }
struct sway_drag_icon *drag_icon; struct sway_drag_icon *drag_icon;
@ -664,8 +663,7 @@ static void handle_rebase(struct sway_seat *seat, uint32_t time_msec) {
} }
} else { } else {
cursor_update_image(cursor, e->previous_node); cursor_update_image(cursor, e->previous_node);
wlr_seat_pointer_notify_enter(seat->wlr_seat, NULL, 0, 0); wlr_seat_pointer_notify_clear_focus(seat->wlr_seat);
wlr_seat_pointer_clear_focus(seat->wlr_seat);
} }
} }

2
sway/input/seatop_move_floating.c
View file

@ -65,5 +65,5 @@ void seatop_begin_move_floating(struct sway_seat *seat,
container_raise_floating(con); container_raise_floating(con);
cursor_set_image(cursor, "grab", NULL); cursor_set_image(cursor, "grab", NULL);
wlr_seat_pointer_clear_focus(seat->wlr_seat); wlr_seat_pointer_notify_clear_focus(seat->wlr_seat);
} }

2
sway/input/seatop_move_tiling.c
View file

@ -336,7 +336,7 @@ void seatop_begin_move_tiling_threshold(struct sway_seat *seat,
seat->seatop_data = e; seat->seatop_data = e;
container_raise_floating(con); container_raise_floating(con);
wlr_seat_pointer_clear_focus(seat->wlr_seat); wlr_seat_pointer_notify_clear_focus(seat->wlr_seat);
} }
void seatop_begin_move_tiling(struct sway_seat *seat, void seatop_begin_move_tiling(struct sway_seat *seat,

2
sway/input/seatop_resize_floating.c
View file

@ -175,5 +175,5 @@ void seatop_begin_resize_floating(struct sway_seat *seat,
const char *image = edge == WLR_EDGE_NONE ? const char *image = edge == WLR_EDGE_NONE ?
"se-resize" : wlr_xcursor_get_resize_name(edge); "se-resize" : wlr_xcursor_get_resize_name(edge);
cursor_set_image(seat->cursor, image, NULL); cursor_set_image(seat->cursor, image, NULL);
wlr_seat_pointer_clear_focus(seat->wlr_seat); wlr_seat_pointer_notify_clear_focus(seat->wlr_seat);
} }

2
sway/input/seatop_resize_tiling.c
View file

@ -106,5 +106,5 @@ void seatop_begin_resize_tiling(struct sway_seat *seat,
seat->seatop_impl = &seatop_impl; seat->seatop_impl = &seatop_impl;
seat->seatop_data = e; seat->seatop_data = e;
wlr_seat_pointer_clear_focus(seat->wlr_seat); wlr_seat_pointer_notify_clear_focus(seat->wlr_seat);
} }