[PATCH weston] weston-terminal: Fix crash on first keystroke
Derek Foreman
derekf at osg.samsung.com
Tue Nov 22 19:00:38 UTC 2016
Since 894b3rcc634 weston-terminal will crash on first keystroke if you
fail to create an xkb compose state. This can happen if you don't have
a Compose file.
Instead, no we just return uncomposed symbols.
Signed-off-by: Derek Foreman <derekf at osg.samsung.com>
---
clients/window.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/clients/window.c b/clients/window.c
index a82f05c..7341aed 100644
--- a/clients/window.c
+++ b/clients/window.c
@@ -3108,6 +3108,7 @@ static xkb_keysym_t
process_key_press(xkb_keysym_t sym, struct input *input)
{
#ifdef HAVE_XKBCOMMON_COMPOSE
+ if (!input->xkb.compose_state) return sym;
if (sym == XKB_KEY_NoSymbol)
return sym;
if (xkb_compose_state_feed(input->xkb.compose_state,
--
2.10.2
More information about the wayland-devel
mailing list