Merge pull request #368 from acrisci/bug/seat-clear-focus

wlr-seat bug: dont set focus surface to null then clear focus
This commit is contained in:
Drew DeVault 2017-11-01 09:20:49 -04:00 committed by GitHub
commit b2ff9f13b7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -408,7 +408,6 @@ static void pointer_surface_destroy_notify(struct wl_listener *listener,
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->seat);
}
@ -418,7 +417,6 @@ static void pointer_resource_destroy_notify(struct wl_listener *listener,
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->seat);
}
@ -680,7 +678,6 @@ static void keyboard_surface_destroy_notify(struct wl_listener *listener,
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->seat);
}
@ -690,7 +687,6 @@ static void keyboard_resource_destroy_notify(struct wl_listener *listener,
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->seat);
}