nordic-dev.net/wlroots
2
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2024-11-25 08:32:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

input-method-v2: don't remove inert role resource

Browse Source
This commit is contained in:
Kirill Primak 2023-07-06 21:57:28 +03:00 committed by Simon Ser
parent fce7cb249f
commit f4eaab12a0
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
types/wlr_input_method_v2.c
View File

@ -19,6 +19,13 @@
static const struct zwp_input_method_v2_interface input_method_impl; static const struct zwp_input_method_v2_interface input_method_impl;
static const struct zwp_input_method_keyboard_grab_v2_interface keyboard_grab_impl; static const struct zwp_input_method_keyboard_grab_v2_interface keyboard_grab_impl;
static void popup_surface_destroy(struct wlr_input_popup_surface_v2 *popup_surface) {
wl_signal_emit_mutable(&popup_surface->events.destroy, NULL);
wl_list_remove(&popup_surface->link);
wl_resource_set_user_data(popup_surface->resource, NULL);
free(popup_surface);
}
static struct wlr_input_method_v2 *input_method_from_resource( static struct wlr_input_method_v2 *input_method_from_resource(
struct wl_resource *resource) { struct wl_resource *resource) {
assert(wl_resource_instance_of(resource, assert(wl_resource_instance_of(resource,
@ -38,7 +45,7 @@ static void input_method_destroy(struct wlr_input_method_v2 *input_method) {
struct wlr_input_popup_surface_v2 *popup_surface, *tmp; struct wlr_input_popup_surface_v2 *popup_surface, *tmp;
wl_list_for_each_safe( wl_list_for_each_safe(
popup_surface, tmp, &input_method->popup_surfaces, link) { popup_surface, tmp, &input_method->popup_surfaces, link) {
wlr_surface_destroy_role_object(popup_surface->surface); popup_surface_destroy(popup_surface);
} }
wl_signal_emit_mutable(&input_method->events.destroy, input_method); wl_signal_emit_mutable(&input_method->events.destroy, input_method);
wl_list_remove(wl_resource_get_link(input_method->resource)); wl_list_remove(wl_resource_get_link(input_method->resource));
@ -140,17 +147,21 @@ static void popup_surface_consider_map(struct wlr_input_popup_surface_v2 *popup_
static void popup_surface_surface_role_commit(struct wlr_surface *surface) { static void popup_surface_surface_role_commit(struct wlr_surface *surface) {
struct wlr_input_popup_surface_v2 *popup_surface = struct wlr_input_popup_surface_v2 *popup_surface =
wlr_input_popup_surface_v2_try_from_wlr_surface(surface); wlr_input_popup_surface_v2_try_from_wlr_surface(surface);
if (popup_surface == NULL) {
return;
}
popup_surface_consider_map(popup_surface); popup_surface_consider_map(popup_surface);
} }
static void popup_surface_surface_role_destroy(struct wlr_surface *surface) { static void popup_surface_surface_role_destroy(struct wlr_surface *surface) {
struct wlr_input_popup_surface_v2 *popup_surface = struct wlr_input_popup_surface_v2 *popup_surface =
wlr_input_popup_surface_v2_try_from_wlr_surface(surface); wlr_input_popup_surface_v2_try_from_wlr_surface(surface);
if (popup_surface == NULL) {
return;
}
wl_signal_emit_mutable(&popup_surface->events.destroy, NULL); popup_surface_destroy(popup_surface);
wl_list_remove(&popup_surface->link);
wl_resource_set_user_data(popup_surface->resource, NULL);
free(popup_surface);
} }
static const struct wlr_surface_role input_popup_surface_v2_role = { static const struct wlr_surface_role input_popup_surface_v2_role = {