summaryrefslogtreecommitdiff
path: root/src/compositor-x11.c
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@bitplanet.net>2013-05-06 23:19:49 -0400
committerKristian Høgsberg <krh@bitplanet.net>2013-05-07 09:07:43 -0400
commite314875d00739b9c55a065b96f8040f627edb8e3 (patch)
tree2f11f67afaea905900ca2effcffc313e277775f4 /src/compositor-x11.c
parent4912454ba48b36153011e25eaa840db2a18c7fb7 (diff)
downloadweston-e314875d00739b9c55a065b96f8040f627edb8e3.tar.gz
input: Merge wl_seat into weston_seat
Diffstat (limited to 'src/compositor-x11.c')
-rw-r--r--src/compositor-x11.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compositor-x11.c b/src/compositor-x11.c
index bb8e8925..e827cec0 100644
--- a/src/compositor-x11.c
+++ b/src/compositor-x11.c
@@ -865,7 +865,7 @@ static void
update_xkb_state_from_core(struct x11_compositor *c, uint16_t x11_mask)
{
uint32_t mask = get_xkb_mod_mask(c, x11_mask);
- struct weston_keyboard *keyboard = &c->core_seat.keyboard;
+ struct weston_keyboard *keyboard = &c->core_seat.keyboard_instance;
xkb_state_update_mask(c->core_seat.xkb_state.state,
keyboard->modifiers.mods_depressed & mask,