blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1303 from dcz-purism/fix_surface_gone 

text-input: fix releasing destroy handlers
This commit is contained in:
emersion 2018-10-12 22:45:42 +02:00 committed by GitHub
parent 4897267bd6 226eedfa2b
commit 3ceb064f02
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rootston/text_input.c
View File

@ -65,6 +65,7 @@ static void text_input_set_pending_focused_surface(
static void text_input_clear_pending_focused_surface( static void text_input_clear_pending_focused_surface(
struct roots_text_input *text_input) { struct roots_text_input *text_input) {
wl_list_remove(&text_input->pending_focused_surface_destroy.link); wl_list_remove(&text_input->pending_focused_surface_destroy.link);
wl_list_init(&text_input->pending_focused_surface_destroy.link);
text_input->pending_focused_surface = NULL; text_input->pending_focused_surface = NULL;
} }
@ -179,7 +180,7 @@ static void handle_text_input_destroy(struct wl_listener *listener,
if (text_input->input->current_enabled) { if (text_input->input->current_enabled) {
relay_disable_text_input(relay, text_input); relay_disable_text_input(relay, text_input);
} }
text_input_clear_pending_focused_surface(text_input);
wl_list_remove(&text_input->link); wl_list_remove(&text_input->link);
text_input->input = NULL; text_input->input = NULL;
free(text_input); free(text_input);
@ -218,6 +219,7 @@ struct roots_text_input *roots_text_input_create(
input->pending_focused_surface_destroy.notify = input->pending_focused_surface_destroy.notify =
handle_pending_focused_surface_destroy; handle_pending_focused_surface_destroy;
wl_list_init(&input->pending_focused_surface_destroy.link);
return input; return input;
} }

13
types/wlr_text_input_v3.c
View File

@ -9,6 +9,12 @@
#include "text-input-unstable-v3-protocol.h" #include "text-input-unstable-v3-protocol.h"
#include "util/signal.h" #include "util/signal.h"
static void text_input_clear_focused_surface(struct wlr_text_input_v3 *text_input) {
wl_list_remove(&text_input->surface_destroy.link);
wl_list_init(&text_input->surface_destroy.link);
text_input->focused_surface = NULL;
}
static const struct zwp_text_input_v3_interface text_input_impl; static const struct zwp_text_input_v3_interface text_input_impl;
static struct wlr_text_input_v3 *text_input_from_resource( static struct wlr_text_input_v3 *text_input_from_resource(
@ -32,8 +38,7 @@ void wlr_text_input_v3_send_enter(struct wlr_text_input_v3 *text_input,
void wlr_text_input_v3_send_leave(struct wlr_text_input_v3 *text_input) { void wlr_text_input_v3_send_leave(struct wlr_text_input_v3 *text_input) {
zwp_text_input_v3_send_leave(text_input->resource, zwp_text_input_v3_send_leave(text_input->resource,
text_input->focused_surface->resource); text_input->focused_surface->resource);
wl_list_remove(&text_input->surface_destroy.link); text_input_clear_focused_surface(text_input);
text_input->focused_surface = NULL;
} }
void wlr_text_input_v3_send_preedit_string(struct wlr_text_input_v3 *text_input, void wlr_text_input_v3_send_preedit_string(struct wlr_text_input_v3 *text_input,
@ -61,6 +66,7 @@ void wlr_text_input_v3_send_done(struct wlr_text_input_v3 *text_input) {
static void wlr_text_input_destroy(struct wlr_text_input_v3 *text_input) { static void wlr_text_input_destroy(struct wlr_text_input_v3 *text_input) {
wlr_signal_emit_safe(&text_input->events.destroy, text_input); wlr_signal_emit_safe(&text_input->events.destroy, text_input);
text_input_clear_focused_surface(text_input);
wl_list_remove(&text_input->seat_destroy.link); wl_list_remove(&text_input->seat_destroy.link);
// remove from manager::text_inputs // remove from manager::text_inputs
wl_list_remove(&text_input->link); wl_list_remove(&text_input->link);
@ -221,7 +227,7 @@ static void text_input_handle_focused_surface_destroy(
struct wl_listener *listener, void *data) { struct wl_listener *listener, void *data) {
struct wlr_text_input_v3 *text_input = wl_container_of(listener, text_input, struct wlr_text_input_v3 *text_input = wl_container_of(listener, text_input,
surface_destroy); surface_destroy);
text_input->focused_surface = NULL; text_input_clear_focused_surface(text_input);
} }
static void text_input_manager_get_text_input(struct wl_client *client, static void text_input_manager_get_text_input(struct wl_client *client,
@ -260,6 +266,7 @@ static void text_input_manager_get_text_input(struct wl_client *client,
text_input_handle_seat_destroy; text_input_handle_seat_destroy;
text_input->surface_destroy.notify = text_input->surface_destroy.notify =
text_input_handle_focused_surface_destroy; text_input_handle_focused_surface_destroy;
wl_list_init(&text_input->surface_destroy.link);
struct wlr_text_input_manager_v3 *manager = struct wlr_text_input_manager_v3 *manager =
text_input_manager_from_resource(resource); text_input_manager_from_resource(resource);