aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-12-26 11:10:04 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-12-26 11:10:04 +0000
commit2f867a8c2cbfc419e824fb2c9aa0b5757a1b6d73 (patch)
treee4cd6dc48b1bafe3ecc2203faefa0001cdedef84
parentterminal: reaper callback: don’t close ptmx if already closed (diff)
parentime: don’t call text-input functions when it isn’t available (diff)
Merge branch 'no-ime'
Closes #259
-rw-r--r--CHANGELOG.md2
-rw-r--r--ime.c6
-rw-r--r--wayland.c7
3 files changed, 15 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c86c0eaf..92c35225 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,6 +36,8 @@
* Exit when the client application terminates, not when the TTY file
descriptor is closed.
+* Crash on compositors not implementing the _text input_ interface
+ (https://codeberg.org/dnkl/foot/issues/259).
### Security
diff --git a/ime.c b/ime.c
index 24237d69..9e2699f2 100644
--- a/ime.c
+++ b/ime.c
@@ -327,6 +327,9 @@ ime_reset(struct seat *seat)
void
ime_enable(struct seat *seat)
{
+ if (unlikely(seat->wayl->text_input_manager == NULL))
+ return;
+
struct terminal *term = seat->kbd_focus;
assert(term != NULL);
@@ -348,6 +351,9 @@ ime_enable(struct seat *seat)
void
ime_disable(struct seat *seat)
{
+ if (unlikely(seat->wayl->text_input_manager == NULL))
+ return;
+
ime_reset(seat);
zwp_text_input_v3_disable(seat->wl_text_input);
diff --git a/wayland.c b/wayland.c
index f156533e..7dbf8593 100644
--- a/wayland.c
+++ b/wayland.c
@@ -1130,6 +1130,13 @@ wayl_init(const struct config *conf, struct fdm *fdm)
goto out;
}
+#if defined(FOOT_IME_ENABLED) && FOOT_IME_ENABLED
+ if (wayl->text_input_manager == NULL) {
+ LOG_WARN("text input interface not implemented by compositor; "
+ "IME will be disabled");
+ }
+#endif
+
/* Trigger listeners registered when handling globals */
wl_display_roundtrip(wayl->display);