From 168c57b57f2fb4440943d4e672dee4ca34f060b8 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Mon, 15 Apr 2019 16:17:54 +0200 Subject: xkb: add xkb_init() to kbd.c --- fbcon.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'fbcon.c') diff --git a/fbcon.c b/fbcon.c index c63c47f..4965472 100644 --- a/fbcon.c +++ b/fbcon.c @@ -644,20 +644,7 @@ int main(int argc, char *argv[]) /* init udev + xkbcommon */ xkb_configure(); - xkb_ctx = xkb_context_new(XKB_CONTEXT_NO_FLAGS); - xkb_map = xkb_keymap_new_from_names(xkb_ctx, &xkb_layout, - XKB_KEYMAP_COMPILE_NO_FLAGS); - if (!xkb_map) { - xkb_layout.variant = NULL; - xkb_map = xkb_keymap_new_from_names(xkb_ctx, &xkb_layout, - XKB_KEYMAP_COMPILE_NO_FLAGS); - if (!xkb_map) { - xkb_layout.layout = "us"; - xkb_map = xkb_keymap_new_from_names(xkb_ctx, &xkb_layout, - XKB_KEYMAP_COMPILE_NO_FLAGS); - } - } - xkb_state = xkb_state_new(xkb_map); + xkb_init(); /* init terminal emulation */ fbcon_winsize(&win); -- cgit