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

test_input: simplify and drop xkbcommon dependency

Browse Source 
Signed-off-by: Ran Benita <ran234@gmail.com>
This commit is contained in:
Ran Benita 2012-01-18 00:14:16 +02:00
parent 37cbd7d962
commit 84c3fe7ba6
2 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile.am
View File

@ -102,11 +102,6 @@ test_terminal_SOURCES = tests/test_terminal.c
test_terminal_LDADD = libkmscon-core.la
test_input_SOURCES = tests/test_input.c
test_input_LDADD = \
libkmscon-core.la \
$(XKBCOMMON_LIBS)
test_input_CPPFLAGS = \
$(AM_CPPFLAGS) \
$(XKBCOMMON_CFLAGS)
test_input_LDADD = libkmscon-core.la
EXTRA_DIST = README TODO COPYING

19
tests/test_input.c
View File

@ -32,13 +32,12 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <wchar.h>
#include <X11/extensions/XKBcommon.h>
#include <X11/keysym.h>
#include "eloop.h"
#include "input.h"
#include "kbd.h"
#include "log.h"
static bool terminate;
@ -86,27 +85,17 @@ static void print_modifiers(unsigned int mods)
static void input_arrived(struct kmscon_input *input,
struct kmscon_input_event *ev, void *data)
{
int len;
char s[16];
char utf8[MB_CUR_MAX + 1];
if (ev->unicode == KMSCON_INPUT_INVALID) {
xkb_keysym_to_string(ev->keysym, s, sizeof(s));
kmscon_kbd_keysym_to_string(ev->keysym, s, sizeof(s));
printf("sym %s ", s);
} else {
/*
* Just a proof-of-concept hack. This works because glibc uses
* UTF-32 (= UCS-4) as the internal wchar_t encoding.
*/
len = wctomb(utf8, (wchar_t)ev->unicode);
if (len <= 0) {
log_info("Bad unicode char\n");
return;
} else {
utf8[len] = '\0';
}
printf("utf8 %s ", utf8);
printf("unicode %lc ", ev->unicode);
}
print_modifiers(ev->mods);
}
@ -118,7 +107,7 @@ int main(int argc, char **argv)
struct kmscon_input *input;
struct kmscon_signal *sigint, *sigquit;
if (!setlocale(LC_ALL, "en_US.UTF-8")) {
if (!setlocale(LC_ALL, "")) {
log_err("Cannot set locale: %m\n");
ret = -EFAULT;
goto err_out;