aboutsummaryrefslogtreecommitdiffstats
path: root/fbcon.c
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2019-04-15 16:17:54 +0200
committerGerd Hoffmann <kraxel@redhat.com>2019-04-15 16:17:54 +0200
commit168c57b57f2fb4440943d4e672dee4ca34f060b8 (patch)
treedbd07001ebf4927a92a054fd18a613c57173cc4d /fbcon.c
parent2c6f46ddb8c2b76558f5145850fd4d339a66ba3a (diff)
downloadfbida-168c57b57f2fb4440943d4e672dee4ca34f060b8.tar.gz
xkb: add xkb_init() to kbd.c
Diffstat (limited to 'fbcon.c')
-rw-r--r--fbcon.c15
1 files changed, 1 insertions, 14 deletions
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);