mirror of
https://gitlab.freedesktop.org/wlroots/wlroots.git
synced 2025-11-01 22:58:38 -04:00
text-input-v3: Use NULL when emitting signals
Listeners can use `wl_container_of`. Helps: https://gitlab.freedesktop.org/wlroots/wlroots/-/issues/3851 Signed-off-by: Guido Günther <agx@sigxcpu.org>
This commit is contained in:
parent
536100488f
commit
2d5492c737
1 changed files with 5 additions and 5 deletions
|
|
@ -64,7 +64,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) {
|
||||||
wl_signal_emit_mutable(&text_input->events.destroy, text_input);
|
wl_signal_emit_mutable(&text_input->events.destroy, NULL);
|
||||||
|
|
||||||
assert(wl_list_empty(&text_input->events.enable.listener_list));
|
assert(wl_list_empty(&text_input->events.enable.listener_list));
|
||||||
assert(wl_list_empty(&text_input->events.commit.listener_list));
|
assert(wl_list_empty(&text_input->events.commit.listener_list));
|
||||||
|
|
@ -192,12 +192,12 @@ static void text_input_commit(struct wl_client *client,
|
||||||
|
|
||||||
if (!old_enabled && text_input->current_enabled) {
|
if (!old_enabled && text_input->current_enabled) {
|
||||||
text_input->active_features = text_input->current.features;
|
text_input->active_features = text_input->current.features;
|
||||||
wl_signal_emit_mutable(&text_input->events.enable, text_input);
|
wl_signal_emit_mutable(&text_input->events.enable, NULL);
|
||||||
} else if (old_enabled && !text_input->current_enabled) {
|
} else if (old_enabled && !text_input->current_enabled) {
|
||||||
text_input->active_features = 0;
|
text_input->active_features = 0;
|
||||||
wl_signal_emit_mutable(&text_input->events.disable, text_input);
|
wl_signal_emit_mutable(&text_input->events.disable, NULL);
|
||||||
} else { // including never enabled
|
} else { // including never enabled
|
||||||
wl_signal_emit_mutable(&text_input->events.commit, text_input);
|
wl_signal_emit_mutable(&text_input->events.commit, NULL);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -313,7 +313,7 @@ static void text_input_manager_bind(struct wl_client *wl_client, void *data,
|
||||||
static void handle_display_destroy(struct wl_listener *listener, void *data) {
|
static void handle_display_destroy(struct wl_listener *listener, void *data) {
|
||||||
struct wlr_text_input_manager_v3 *manager =
|
struct wlr_text_input_manager_v3 *manager =
|
||||||
wl_container_of(listener, manager, display_destroy);
|
wl_container_of(listener, manager, display_destroy);
|
||||||
wl_signal_emit_mutable(&manager->events.destroy, manager);
|
wl_signal_emit_mutable(&manager->events.destroy, NULL);
|
||||||
|
|
||||||
assert(wl_list_empty(&manager->events.new_text_input.listener_list));
|
assert(wl_list_empty(&manager->events.new_text_input.listener_list));
|
||||||
assert(wl_list_empty(&manager->events.destroy.listener_list));
|
assert(wl_list_empty(&manager->events.destroy.listener_list));
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue