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>
This commit is contained in:
Ran Benita 2012-06-27 13:08:41 +03:00 committed by David Herrmann
parent 34357d21c4
commit 44376b8daf

View File

@ -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;
}