diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2022-06-15 16:39:46 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2022-06-15 17:25:32 +0000 |
| commit | d852178540bbe98c0b88ecc627b0fcfa208d4b24 (patch) | |
| tree | fa01726dd6e4337c40c317e299c2f93f27fda23e | |
| parent | vt: tag collision-count check with ‘unlikely’ (diff) | |
ime: ime_reset_pending_{preedit,commit} is not used outside ime.c
| -rw-r--r-- | ime.c | 68 | ||||
| -rw-r--r-- | ime.h | 2 |
2 files changed, 34 insertions, 36 deletions
@@ -18,6 +18,40 @@ #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) { @@ -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); |
