Signed-off-by: Daniel Stone <[email protected]>
---
src/compositor.c | 53 +++++++++++++++++++++++++++++++++--------------------
1 file changed, 33 insertions(+), 20 deletions(-)
diff --git a/src/compositor.c b/src/compositor.c
index 0a2f71d..56094e6 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -2244,6 +2244,28 @@ static int weston_compositor_xkb_init(struct
weston_compositor *ec,
if (!ec->xkb_info.names.layout)
ec->xkb_info.names.layout = strdup("us");
+ return 0;
+}
+
+static void weston_compositor_xkb_destroy(struct weston_compositor *ec)
+{
+ free((char *) ec->xkb_info.names.rules);
+ free((char *) ec->xkb_info.names.model);
+ free((char *) ec->xkb_info.names.layout);
+ free((char *) ec->xkb_info.names.variant);
+ free((char *) ec->xkb_info.names.options);
+
+ if (ec->xkb_info.keymap)
+ xkb_map_unref(ec->xkb_info.keymap);
+ xkb_context_unref(ec->xkb_info.context);
+}
+
+static int
+weston_compositor_build_global_keymap(struct weston_compositor *ec)
+{
+ if (ec->xkb_info.keymap != NULL)
+ return 0;
+
ec->xkb_info.keymap = xkb_map_new_from_names(ec->xkb_info.context,
&ec->xkb_info.names, 0);
if (ec->xkb_info.keymap == NULL) {
@@ -2268,16 +2290,19 @@ static int weston_compositor_xkb_init(struct
weston_compositor *ec,
return 0;
}
-static void weston_compositor_xkb_destroy(struct weston_compositor *ec)
+WL_EXPORT void
+weston_seat_init_keyboard(struct weston_seat *seat)
{
- xkb_map_unref(ec->xkb_info.keymap);
- xkb_context_unref(ec->xkb_info.context);
+ if (seat->has_keyboard)
+ return;
- free((char *) ec->xkb_info.names.rules);
- free((char *) ec->xkb_info.names.model);
- free((char *) ec->xkb_info.names.layout);
- free((char *) ec->xkb_info.names.variant);
- free((char *) ec->xkb_info.names.options);
+ if (weston_compositor_build_global_keymap(seat->compositor) == -1)
+ return;
+
+ wl_keyboard_init(&seat->keyboard);
+ wl_seat_set_keyboard(&seat->seat, &seat->keyboard);
+
+ seat->has_keyboard = 1;
}
WL_EXPORT void
@@ -2293,18 +2318,6 @@ weston_seat_init_pointer(struct weston_seat *seat)
}
WL_EXPORT void
-weston_seat_init_keyboard(struct weston_seat *seat)
-{
- if (seat->has_keyboard)
- return;
-
- wl_keyboard_init(&seat->keyboard);
- wl_seat_set_keyboard(&seat->seat, &seat->keyboard);
-
- seat->has_keyboard = 1;
-}
-
-WL_EXPORT void
weston_seat_init_touch(struct weston_seat *seat)
{
if (seat->has_touch)
--
1.7.10
_______________________________________________
wayland-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/wayland-devel
