Add keymap argument to weston_seat_init_keyboard
authorDaniel Stone <daniel@fooishbar.org>
Wed, 30 May 2012 15:32:06 +0000 (16:32 +0100)
committerJonas Ådahl <jadahl@gmail.com>
Sun, 10 Nov 2013 16:51:29 +0000 (17:51 +0100)
This allows backends to generate their own keymaps and pass them in for
use rather than always forcing a single global keymap, which is
particularly useful for nested compositors.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
src/evdev.c

index 23faaa6..8439eda 100644 (file)
@@ -444,7 +444,7 @@ evdev_configure_device(struct evdev_input_device *device)
             (EVDEV_MOTION_ABS | EVDEV_MOTION_REL | EVDEV_BUTTON)))
                weston_seat_init_pointer(&device->master->base);
        if ((device->caps & EVDEV_KEYBOARD))
-               weston_seat_init_keyboard(&device->master->base);
+               weston_seat_init_keyboard(&device->master->base, NULL);
        if ((device->caps & EVDEV_TOUCH))
                weston_seat_init_touch(&device->master->base);