From 44376b8daf1ee6d43c8e47b1f0f83b89e323d293 Mon Sep 17 00:00:00 2001
From: Ran Benita <ran234@gmail.com>
Date: Wed, 27 Jun 2012 13:08:41 +0300
Subject: [PATCH] xkb: use unicode conversion from xkbcommon

Support for this was added upstream, so we should avoid keeping the
entire conversion table twice in (readonly) memory. The old files are
still used by the dumb backend.

Signed-off-by: Ran Benita <ran234@gmail.com>
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
---
 src/uterm_input_xkb.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/uterm_input_xkb.c b/src/uterm_input_xkb.c
index a0693d3..536d1c8 100644
--- a/src/uterm_input_xkb.c
+++ b/src/uterm_input_xkb.c
@@ -31,7 +31,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <xkbcommon/xkbcommon.h>
-#include "imKStoUCS.h"
 #include "log.h"
 #include "uterm.h"
 #include "uterm_internal.h"
@@ -161,7 +160,7 @@ int kbd_dev_process_key(struct kbd_dev *kbd,
 	out->keycode = code;
 	out->keysym = keysyms[0];
 	out->mods = get_effective_modmask(state);;
-	out->unicode = KeysymToUcs4(out->keysym) ?: UTERM_INPUT_INVALID;
+	out->unicode = xkb_keysym_to_utf32(out->keysym) ?: UTERM_INPUT_INVALID;
 
 	return 0;
 }