diff options
-rw-r--r-- | sway/config/output.c | 2 | ||||
-rw-r--r-- | sway/input/cursor.c | 2 | ||||
-rw-r--r-- | sway/input/seat.c | 6 | ||||
-rw-r--r-- | sway/input/seatop_default.c | 6 | ||||
-rw-r--r-- | sway/input/seatop_move_floating.c | 2 | ||||
-rw-r--r-- | sway/input/seatop_move_tiling.c | 2 | ||||
-rw-r--r-- | sway/input/seatop_resize_floating.c | 2 | ||||
-rw-r--r-- | sway/input/seatop_resize_tiling.c | 2 |
8 files changed, 11 insertions, 13 deletions
diff --git a/sway/config/output.c b/sway/config/output.c index 5aaa4d93..713cd219 100644 --- a/sway/config/output.c +++ b/sway/config/output.c | |||
@@ -645,7 +645,7 @@ void apply_output_config_to_outputs(struct output_config *oc) { | |||
645 | 645 | ||
646 | struct sway_seat *seat; | 646 | struct sway_seat *seat; |
647 | wl_list_for_each(seat, &server.input->seats, link) { | 647 | wl_list_for_each(seat, &server.input->seats, link) { |
648 | wlr_seat_pointer_clear_focus(seat->wlr_seat); | 648 | wlr_seat_pointer_notify_clear_focus(seat->wlr_seat); |
649 | cursor_rebase(seat->cursor); | 649 | cursor_rebase(seat->cursor); |
650 | } | 650 | } |
651 | } | 651 | } |
diff --git a/sway/input/cursor.c b/sway/input/cursor.c index 1a211c3b..8e39dac1 100644 --- a/sway/input/cursor.c +++ b/sway/input/cursor.c | |||
@@ -236,7 +236,7 @@ void cursor_update_image(struct sway_cursor *cursor, | |||
236 | static void cursor_hide(struct sway_cursor *cursor) { | 236 | static void cursor_hide(struct sway_cursor *cursor) { |
237 | wlr_cursor_set_image(cursor->cursor, NULL, 0, 0, 0, 0, 0, 0); | 237 | wlr_cursor_set_image(cursor->cursor, NULL, 0, 0, 0, 0, 0, 0); |
238 | cursor->hidden = true; | 238 | cursor->hidden = true; |
239 | wlr_seat_pointer_clear_focus(cursor->seat->wlr_seat); | 239 | wlr_seat_pointer_notify_clear_focus(cursor->seat->wlr_seat); |
240 | } | 240 | } |
241 | 241 | ||
242 | static int hide_notify(void *data) { | 242 | static int hide_notify(void *data) { |
diff --git a/sway/input/seat.c b/sway/input/seat.c index e5f15613..73a8deac 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c | |||
@@ -698,7 +698,7 @@ static void seat_configure_keyboard(struct sway_seat *seat, | |||
698 | struct sway_node *focus = seat_get_focus(seat); | 698 | struct sway_node *focus = seat_get_focus(seat); |
699 | if (focus && node_is_view(focus)) { | 699 | if (focus && node_is_view(focus)) { |
700 | // force notify reenter to pick up the new configuration | 700 | // force notify reenter to pick up the new configuration |
701 | wlr_seat_keyboard_clear_focus(seat->wlr_seat); | 701 | wlr_seat_keyboard_notify_clear_focus(seat->wlr_seat); |
702 | seat_keyboard_notify_enter(seat, focus->sway_container->view->surface); | 702 | seat_keyboard_notify_enter(seat, focus->sway_container->view->surface); |
703 | } | 703 | } |
704 | } | 704 | } |
@@ -963,7 +963,7 @@ static void send_unfocus(struct sway_container *con, void *data) { | |||
963 | // Unfocus the container and any children (eg. when leaving `focus parent`) | 963 | // Unfocus the container and any children (eg. when leaving `focus parent`) |
964 | static void seat_send_unfocus(struct sway_node *node, struct sway_seat *seat) { | 964 | static void seat_send_unfocus(struct sway_node *node, struct sway_seat *seat) { |
965 | sway_cursor_constrain(seat->cursor, NULL); | 965 | sway_cursor_constrain(seat->cursor, NULL); |
966 | wlr_seat_keyboard_clear_focus(seat->wlr_seat); | 966 | wlr_seat_keyboard_notify_clear_focus(seat->wlr_seat); |
967 | if (node->type == N_WORKSPACE) { | 967 | if (node->type == N_WORKSPACE) { |
968 | workspace_for_each_container(node->sway_workspace, send_unfocus, seat); | 968 | workspace_for_each_container(node->sway_workspace, send_unfocus, seat); |
969 | } else { | 969 | } else { |
@@ -1230,7 +1230,7 @@ void seat_set_exclusive_client(struct sway_seat *seat, | |||
1230 | } | 1230 | } |
1231 | if (seat->wlr_seat->pointer_state.focused_client) { | 1231 | if (seat->wlr_seat->pointer_state.focused_client) { |
1232 | if (seat->wlr_seat->pointer_state.focused_client->client != client) { | 1232 | if (seat->wlr_seat->pointer_state.focused_client->client != client) { |
1233 | wlr_seat_pointer_clear_focus(seat->wlr_seat); | 1233 | wlr_seat_pointer_notify_clear_focus(seat->wlr_seat); |
1234 | } | 1234 | } |
1235 | } | 1235 | } |
1236 | struct timespec now; | 1236 | struct timespec now; |
diff --git a/sway/input/seatop_default.c b/sway/input/seatop_default.c index 072f4396..2bce2f77 100644 --- a/sway/input/seatop_default.c +++ b/sway/input/seatop_default.c | |||
@@ -483,8 +483,7 @@ static void handle_pointer_motion(struct sway_seat *seat, uint32_t time_msec, | |||
483 | } | 483 | } |
484 | } else { | 484 | } else { |
485 | cursor_update_image(cursor, node); | 485 | cursor_update_image(cursor, node); |
486 | wlr_seat_pointer_notify_enter(seat->wlr_seat, NULL, 0, 0); | 486 | wlr_seat_pointer_notify_clear_focus(seat->wlr_seat); |
487 | wlr_seat_pointer_clear_focus(seat->wlr_seat); | ||
488 | } | 487 | } |
489 | 488 | ||
490 | struct sway_drag_icon *drag_icon; | 489 | struct sway_drag_icon *drag_icon; |
@@ -664,8 +663,7 @@ static void handle_rebase(struct sway_seat *seat, uint32_t time_msec) { | |||
664 | } | 663 | } |
665 | } else { | 664 | } else { |
666 | cursor_update_image(cursor, e->previous_node); | 665 | cursor_update_image(cursor, e->previous_node); |
667 | wlr_seat_pointer_notify_enter(seat->wlr_seat, NULL, 0, 0); | 666 | wlr_seat_pointer_notify_clear_focus(seat->wlr_seat); |
668 | wlr_seat_pointer_clear_focus(seat->wlr_seat); | ||
669 | } | 667 | } |
670 | } | 668 | } |
671 | 669 | ||
diff --git a/sway/input/seatop_move_floating.c b/sway/input/seatop_move_floating.c index a04fd457..21a2a966 100644 --- a/sway/input/seatop_move_floating.c +++ b/sway/input/seatop_move_floating.c | |||
@@ -65,5 +65,5 @@ void seatop_begin_move_floating(struct sway_seat *seat, | |||
65 | container_raise_floating(con); | 65 | container_raise_floating(con); |
66 | 66 | ||
67 | cursor_set_image(cursor, "grab", NULL); | 67 | cursor_set_image(cursor, "grab", NULL); |
68 | wlr_seat_pointer_clear_focus(seat->wlr_seat); | 68 | wlr_seat_pointer_notify_clear_focus(seat->wlr_seat); |
69 | } | 69 | } |
diff --git a/sway/input/seatop_move_tiling.c b/sway/input/seatop_move_tiling.c index 3f31e4b1..a1aa5245 100644 --- a/sway/input/seatop_move_tiling.c +++ b/sway/input/seatop_move_tiling.c | |||
@@ -336,7 +336,7 @@ void seatop_begin_move_tiling_threshold(struct sway_seat *seat, | |||
336 | seat->seatop_data = e; | 336 | seat->seatop_data = e; |
337 | 337 | ||
338 | container_raise_floating(con); | 338 | container_raise_floating(con); |
339 | wlr_seat_pointer_clear_focus(seat->wlr_seat); | 339 | wlr_seat_pointer_notify_clear_focus(seat->wlr_seat); |
340 | } | 340 | } |
341 | 341 | ||
342 | void seatop_begin_move_tiling(struct sway_seat *seat, | 342 | void seatop_begin_move_tiling(struct sway_seat *seat, |
diff --git a/sway/input/seatop_resize_floating.c b/sway/input/seatop_resize_floating.c index 80df63ce..ec10cfc8 100644 --- a/sway/input/seatop_resize_floating.c +++ b/sway/input/seatop_resize_floating.c | |||
@@ -175,5 +175,5 @@ void seatop_begin_resize_floating(struct sway_seat *seat, | |||
175 | const char *image = edge == WLR_EDGE_NONE ? | 175 | const char *image = edge == WLR_EDGE_NONE ? |
176 | "se-resize" : wlr_xcursor_get_resize_name(edge); | 176 | "se-resize" : wlr_xcursor_get_resize_name(edge); |
177 | cursor_set_image(seat->cursor, image, NULL); | 177 | cursor_set_image(seat->cursor, image, NULL); |
178 | wlr_seat_pointer_clear_focus(seat->wlr_seat); | 178 | wlr_seat_pointer_notify_clear_focus(seat->wlr_seat); |
179 | } | 179 | } |
diff --git a/sway/input/seatop_resize_tiling.c b/sway/input/seatop_resize_tiling.c index 825f5044..f6f106ef 100644 --- a/sway/input/seatop_resize_tiling.c +++ b/sway/input/seatop_resize_tiling.c | |||
@@ -106,5 +106,5 @@ void seatop_begin_resize_tiling(struct sway_seat *seat, | |||
106 | seat->seatop_impl = &seatop_impl; | 106 | seat->seatop_impl = &seatop_impl; |
107 | seat->seatop_data = e; | 107 | seat->seatop_data = e; |
108 | 108 | ||
109 | wlr_seat_pointer_clear_focus(seat->wlr_seat); | 109 | wlr_seat_pointer_notify_clear_focus(seat->wlr_seat); |
110 | } | 110 | } |