From f4b4bc2ee4e3805d04f85f11900e4642de902001 Mon Sep 17 00:00:00 2001 From: David Herrmann Date: Sat, 11 Aug 2012 22:41:53 +0200 Subject: [PATCH] uterm: input: pass xkb parameters from outside Instead of accessing the kmscon configuration from the uterm code, we should pass it in on creation. Otherwise, uterm depends on main.c which would be really ugly. Signed-off-by: David Herrmann --- src/main.c | 5 ++++- src/uterm.h | 5 ++++- src/uterm_input.c | 18 ++++++++++-------- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/src/main.c b/src/main.c index 6f61af2..d958011 100644 --- a/src/main.c +++ b/src/main.c @@ -132,7 +132,10 @@ static void seat_new(struct kmscon_app *app, if (ret) goto err_name; - ret = uterm_input_new(&seat->input, app->eloop); + ret = uterm_input_new(&seat->input, app->eloop, + kmscon_conf.xkb_layout, + kmscon_conf.xkb_variant, + kmscon_conf.xkb_options); if (ret) goto err_vt; diff --git a/src/uterm.h b/src/uterm.h index 3cdc725..346e684 100644 --- a/src/uterm.h +++ b/src/uterm.h @@ -287,7 +287,10 @@ typedef void (*uterm_input_cb) (struct uterm_input *input, struct uterm_input_event *ev, void *data); -int uterm_input_new(struct uterm_input **out, struct ev_eloop *eloop); +int uterm_input_new(struct uterm_input **out, struct ev_eloop *eloop, + const char *layout, + const char *variant, + const char *options); void uterm_input_ref(struct uterm_input *input); void uterm_input_unref(struct uterm_input *input); diff --git a/src/uterm_input.c b/src/uterm_input.c index b6730dd..4360073 100644 --- a/src/uterm_input.c +++ b/src/uterm_input.c @@ -36,7 +36,6 @@ #include #include #include -#include "main.h" #include "eloop.h" #include "log.h" #include "main.h" @@ -234,7 +233,10 @@ static void input_free_dev(struct uterm_input_dev *dev) } int uterm_input_new(struct uterm_input **out, - struct ev_eloop *eloop) + struct ev_eloop *eloop, + const char *layout, + const char *variant, + const char *options) { struct uterm_input *input; int ret; @@ -255,16 +257,16 @@ int uterm_input_new(struct uterm_input **out, goto err_free; ret = kbd_desc_new(&input->desc, - kmscon_conf.xkb_layout, - kmscon_conf.xkb_variant, - kmscon_conf.xkb_options, + layout, + variant, + options, KBD_UXKB); if (ret == -EOPNOTSUPP) { log_info("XKB keyboard backend not available, trying plain backend"); ret = kbd_desc_new(&input->desc, - kmscon_conf.xkb_layout, - kmscon_conf.xkb_variant, - kmscon_conf.xkb_options, + layout, + variant, + options, KBD_PLAIN); if (ret) goto err_hook;