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 <dh.herrmann@googlemail.com>
This commit is contained in:
David Herrmann committed 2012-08-11 22:41:53 +02:00
1 parent c9ccc70fcb
commit f4b4bc2ee4
3 files changed
+18 -10

No files matched your search

+4 -1
View File
@@ -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;
+4 -1
View File
@@ -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);
+10 -8
View File
@@ -36,7 +36,6 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#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;