projects
/
profile
/
ivi
/
weston-ivi-shell.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c6c2f8e
)
compositor-wayland: Handle keymap changes
author
Rui Matos
<tiagomatos@gmail.com>
Thu, 10 Oct 2013 17:44:21 +0000
(19:44 +0200)
committer
Kristian Høgsberg
<krh@bitplanet.net>
Tue, 22 Oct 2013 22:25:01 +0000
(15:25 -0700)
src/compositor-wayland.c
patch
|
blob
|
history
diff --git
a/src/compositor-wayland.c
b/src/compositor-wayland.c
index
519b1bc
..
21ce5cb
100644
(file)
--- a/
src/compositor-wayland.c
+++ b/
src/compositor-wayland.c
@@
-517,7
+517,11
@@
input_handle_keymap(void *data, struct wl_keyboard *keyboard, uint32_t format,
return;
}
- weston_seat_init_keyboard(&input->base, keymap);
+ if (input->base.keyboard)
+ weston_seat_update_keymap(&input->base, keymap);
+ else
+ weston_seat_init_keyboard(&input->base, keymap);
+
xkb_map_unref(keymap);
}