norohind/kmscon
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

test_input: fix using XKB directly

Browse Source 
We removed a lot of helpers from uterm-input because XKB is now a
mandatory dependency. So use it directly from test_input to avoid all the
uterm helpers.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
This commit is contained in:
David Herrmann 2012-10-09 13:56:30 +02:00
parent 1709c64ee6
commit 6648029d5f
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/test_input.c
View File

@ -37,6 +37,7 @@ static void print_help();
#include <sys/signalfd.h> #include <sys/signalfd.h>
#include <unistd.h> #include <unistd.h>
#include <X11/keysym.h> #include <X11/keysym.h>
#include <xkbcommon/xkbcommon.h>
#include "eloop.h" #include "eloop.h"
#include "log.h" #include "log.h"
#include "uterm.h" #include "uterm.h"
@ -89,14 +90,14 @@ static void input_arrived(struct uterm_input *input,
{ {
char s[32]; char s[32];
uterm_input_keysym_to_string(input, ev->keysym, s, sizeof(s)); xkb_keysym_get_name(ev->keysyms[0], s, sizeof(s));
printf("sym %s ", s); printf("sym %s ", s);
if (ev->unicode != UTERM_INPUT_INVALID) { if (ev->codepoints[0] != UTERM_INPUT_INVALID) {
/* /*
* Just a proof-of-concept hack. This works because glibc uses * Just a proof-of-concept hack. This works because glibc uses
* UTF-32 (= UCS-4) as the internal wchar_t encoding. * UTF-32 (= UCS-4) as the internal wchar_t encoding.
*/ */
printf("unicode %lc ", ev->unicode); printf("unicode %lc ", ev->codepoints[0]);
} }
print_modifiers(ev->mods); print_modifiers(ev->mods);
} }
@ -114,7 +115,8 @@ static void monitor_event(struct uterm_monitor *mon,
ret = uterm_input_new(&input, eloop, ret = uterm_input_new(&input, eloop,
input_conf.xkb_layout, input_conf.xkb_layout,
input_conf.xkb_variant, input_conf.xkb_variant,
input_conf.xkb_options); input_conf.xkb_options,
0, 0);
if (ret) if (ret)
return; return;
ret = uterm_input_register_cb(input, input_arrived, NULL); ret = uterm_input_register_cb(input, input_arrived, NULL);