mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-06-01 21:38:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

ime: make IME compile-time optional

Browse source
This commit is contained in:
Daniel Eklöf 2020-12-03 18:36:56 +01:00
parent 8c3d48c5cd
commit 05083110c3
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
9 changed files with 103 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

14
wayland.c
View file

@ -116,6 +116,7 @@ seat_add_primary_selection(struct seat *seat)
static void
seat_add_text_input(struct seat *seat)
{
#if defined(FOOT_IME_ENABLED) && FOOT_IME_ENABLED
if (seat->wayl->text_input_manager == NULL)
return;
@ -128,6 +129,7 @@ seat_add_text_input(struct seat *seat)
seat->wl_text_input = text_input;
zwp_text_input_v3_add_listener(text_input, &text_input_listener, seat);
#endif
}
static void
@ -184,15 +186,18 @@ seat_destroy(struct seat *seat)
wl_keyboard_release(seat->wl_keyboard);
if (seat->wl_pointer != NULL)
wl_pointer_release(seat->wl_pointer);
#if defined(FOOT_IME_ENABLED) && FOOT_IME_ENABLED
if (seat->wl_text_input != NULL)
zwp_text_input_v3_destroy(seat->wl_text_input);
#endif
if (seat->wl_seat != NULL)
wl_seat_release(seat->wl_seat);
ime_reset(seat);
free(seat->clipboard.text);
free(seat->primary.text);
free(seat->ime.preedit.pending.text);
free(seat->ime.commit.pending.text);
free(seat->name);
}
@ -920,6 +925,7 @@ handle_global(void *data, struct wl_registry *registry,
}
}
#if defined(FOOT_IME_ENABLED) && FOOT_IME_ENABLED
else if (strcmp(interface, zwp_text_input_manager_v3_interface.name) == 0) {
const uint32_t required = 1;
if (!verify_iface_version(interface, version, required))
@ -931,6 +937,7 @@ handle_global(void *data, struct wl_registry *registry,
tll_foreach(wayl->seats, it)
seat_add_text_input(&it->item);
}
#endif
}
static void
@ -1190,8 +1197,11 @@ wayl_destroy(struct wayland *wayl)
seat_destroy(&it->item);
tll_free(wayl->seats);
#if defined(FOOT_IME_ENABLED) && FOOT_IME_ENABLED
if (wayl->text_input_manager != NULL)
zwp_text_input_manager_v3_destroy(wayl->text_input_manager);
#endif
if (wayl->xdg_output_manager != NULL)
zxdg_output_manager_v1_destroy(wayl->xdg_output_manager);
if (wayl->shell != NULL)