summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@bitplanet.net>2012-06-02 21:01:54 -0400
committerChristopher James Halse Rogers <christopher.halse.rogers@canonical.com>2012-06-13 15:26:21 +1000
commitafd4a805813ed97e531224bb95152aa82c31037a (patch)
treeadc0ce229895b0781f5a4fc9c075dd1279db6960
parentc0b801d54a4b219a2fed0a3d3de204ea6253337a (diff)
xwayland: Stub out keymap handler so we don't crash
-rw-r--r--hw/xfree86/xwayland/xwayland-input.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/hw/xfree86/xwayland/xwayland-input.c b/hw/xfree86/xwayland/xwayland-input.c
index 12bc4f9c6..517ad30ec 100644
--- a/hw/xfree86/xwayland/xwayland-input.c
+++ b/hw/xfree86/xwayland/xwayland-input.c
@@ -389,6 +389,15 @@ keyboard_handle_key(void *data, struct wl_keyboard *keyboard, uint32_t serial,
}
static void
+keyboard_handle_keymap(void *data, struct wl_keyboard *keyboard,
+ uint32_t format, int fd, uint32_t size)
+{
+ /* FIXME: Handle keymap */
+
+ close(fd);
+}
+
+static void
keyboard_handle_enter(void *data, struct wl_keyboard *keyboard,
uint32_t serial,
struct wl_surface *surface, struct wl_array *keys)
@@ -426,6 +435,7 @@ keyboard_handle_modifiers(void *data, struct wl_keyboard *keyboard,
}
static const struct wl_keyboard_listener keyboard_listener = {
+ keyboard_handle_keymap,
keyboard_handle_enter,
keyboard_handle_leave,
keyboard_handle_key,