mirror of
https://gitlab.freedesktop.org/wlroots/wlroots.git
synced 2025-11-11 13:29:45 -05:00
Merge branch 'master' into feature/xdg-popup
This commit is contained in:
commit
4657f10dd2
20 changed files with 374 additions and 56 deletions
|
|
@ -306,6 +306,8 @@ static void pointer_surface_destroy_notify(struct wl_listener *listener,
|
|||
void *data) {
|
||||
struct wlr_seat_pointer_state *state = wl_container_of(
|
||||
listener, state, surface_destroy);
|
||||
wl_list_remove(&state->surface_destroy.link);
|
||||
wl_list_init(&state->surface_destroy.link);
|
||||
state->focused_surface = NULL;
|
||||
wlr_seat_pointer_clear_focus(state->wlr_seat);
|
||||
}
|
||||
|
|
@ -314,6 +316,8 @@ static void pointer_resource_destroy_notify(struct wl_listener *listener,
|
|||
void *data) {
|
||||
struct wlr_seat_pointer_state *state = wl_container_of(
|
||||
listener, state, resource_destroy);
|
||||
wl_list_remove(&state->resource_destroy.link);
|
||||
wl_list_init(&state->resource_destroy.link);
|
||||
state->focused_surface = NULL;
|
||||
wlr_seat_pointer_clear_focus(state->wlr_seat);
|
||||
}
|
||||
|
|
@ -579,6 +583,8 @@ static void keyboard_surface_destroy_notify(struct wl_listener *listener,
|
|||
void *data) {
|
||||
struct wlr_seat_keyboard_state *state = wl_container_of(
|
||||
listener, state, surface_destroy);
|
||||
wl_list_remove(&state->surface_destroy.link);
|
||||
wl_list_init(&state->surface_destroy.link);
|
||||
state->focused_surface = NULL;
|
||||
wlr_seat_keyboard_clear_focus(state->wlr_seat);
|
||||
}
|
||||
|
|
@ -587,6 +593,8 @@ static void keyboard_resource_destroy_notify(struct wl_listener *listener,
|
|||
void *data) {
|
||||
struct wlr_seat_keyboard_state *state = wl_container_of(
|
||||
listener, state, resource_destroy);
|
||||
wl_list_remove(&state->resource_destroy.link);
|
||||
wl_list_init(&state->resource_destroy.link);
|
||||
state->focused_surface = NULL;
|
||||
wlr_seat_keyboard_clear_focus(state->wlr_seat);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue