From d852178540bbe98c0b88ecc627b0fcfa208d4b24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= Date: Wed, 15 Jun 2022 18:39:46 +0200 Subject: [PATCH] ime: ime_reset_pending_{preedit,commit} is not used outside ime.c --- ime.c | 68 +++++++++++++++++++++++++++++------------------------------ ime.h | 2 -- 2 files changed, 34 insertions(+), 36 deletions(-) diff --git a/ime.c b/ime.c index e7e5937a..a3ca19b2 100644 --- a/ime.c +++ b/ime.c @@ -17,6 +17,40 @@ #include "wayland.h" #include "xmalloc.h" +static void +ime_reset_pending_preedit(struct seat *seat) +{ + free(seat->ime.preedit.pending.text); + seat->ime.preedit.pending.text = NULL; +} + +static void +ime_reset_pending_commit(struct seat *seat) +{ + free(seat->ime.commit.pending.text); + seat->ime.commit.pending.text = NULL; +} + +void +ime_reset_pending(struct seat *seat) +{ + ime_reset_pending_preedit(seat); + ime_reset_pending_commit(seat); +} + +void +ime_reset_preedit(struct seat *seat) +{ + if (seat->ime.preedit.cells == NULL) + return; + + free(seat->ime.preedit.text); + free(seat->ime.preedit.cells); + seat->ime.preedit.text = NULL; + seat->ime.preedit.cells = NULL; + seat->ime.preedit.count = 0; +} + static void enter(void *data, struct zwp_text_input_v3 *zwp_text_input_v3, struct wl_surface *surface) @@ -324,40 +358,6 @@ done(void *data, struct zwp_text_input_v3 *zwp_text_input_v3, } } -void -ime_reset_pending_preedit(struct seat *seat) -{ - free(seat->ime.preedit.pending.text); - seat->ime.preedit.pending.text = NULL; -} - -void -ime_reset_pending_commit(struct seat *seat) -{ - free(seat->ime.commit.pending.text); - seat->ime.commit.pending.text = NULL; -} - -void -ime_reset_pending(struct seat *seat) -{ - ime_reset_pending_preedit(seat); - ime_reset_pending_commit(seat); -} - -void -ime_reset_preedit(struct seat *seat) -{ - if (seat->ime.preedit.cells == NULL) - return; - - free(seat->ime.preedit.text); - free(seat->ime.preedit.cells); - seat->ime.preedit.text = NULL; - seat->ime.preedit.cells = NULL; - seat->ime.preedit.count = 0; -} - static void ime_send_cursor_rect(struct seat *seat) { diff --git a/ime.h b/ime.h index 2aa4efe4..3127f4d7 100644 --- a/ime.h +++ b/ime.h @@ -15,7 +15,5 @@ void ime_enable(struct seat *seat); void ime_disable(struct seat *seat); void ime_update_cursor_rect(struct seat *seat); -void ime_reset_pending_preedit(struct seat *seat); -void ime_reset_pending_commit(struct seat *seat); void ime_reset_pending(struct seat *seat); void ime_reset_preedit(struct seat *seat);