From: Daniel Stone <daniel@fooishbar.org>
Date: Wed, 30 May 2012 15:32:06 +0000 (+0100)
Subject: Add keymap argument to weston_seat_init_keyboard
X-Git-Tag: 0.1.0~163^2~83
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=37f83e26663a18d0bdd8fe0ac0e6a8ca0126f467;p=platform%2Fupstream%2Flibinput.git

Add keymap argument to weston_seat_init_keyboard

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>
---

diff --git a/src/evdev.c b/src/evdev.c
index 23faaa6..8439eda 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -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);