diff options
| author | Jonas Ådahl <jadahl@gmail.com> | 2013-12-03 09:14:26 +0100 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2013-12-03 08:38:25 -0800 |
| commit | 7395ea05c7d38a5611572527802a0cffa535529d (patch) | |
| tree | 0f5ff44437a7a4e55c00258d3452e1e0033e01ba /src/compositor-x11.c | |
| parent | 918f2dd4cfb8b177f67b45653efbbe4325cbe9dc (diff) | |
| download | weston-7395ea05c7d38a5611572527802a0cffa535529d.tar.gz | |
input: Move the xkb fields from weston_seat to weston_keyboard
XKB integration is a keyboard feature and should as such be kept track
of in the keyboard struct.
Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
Diffstat (limited to 'src/compositor-x11.c')
| -rw-r--r-- | src/compositor-x11.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/compositor-x11.c b/src/compositor-x11.c index d98e48d0..4c6a959a 100644 --- a/src/compositor-x11.c +++ b/src/compositor-x11.c @@ -162,7 +162,7 @@ x11_compositor_get_keymap(struct x11_compositor *c) static uint32_t get_xkb_mod_mask(struct x11_compositor *c, uint32_t in) { - struct weston_xkb_info *info = c->core_seat.xkb_info; + struct weston_xkb_info *info = c->core_seat.keyboard->xkb_info; uint32_t ret = 0; if ((in & ShiftMask) && info->shift_mod != XKB_MOD_INVALID) @@ -273,7 +273,7 @@ x11_compositor_setup_xkb(struct x11_compositor *c) return; } - xkb_state_update_mask(c->core_seat.xkb_state.state, + xkb_state_update_mask(c->core_seat.keyboard->xkb_state.state, get_xkb_mod_mask(c, state_reply->baseMods), get_xkb_mod_mask(c, state_reply->latchedMods), get_xkb_mod_mask(c, state_reply->lockedMods), @@ -920,7 +920,7 @@ x11_compositor_find_output(struct x11_compositor *c, xcb_window_t window) static void update_xkb_state(struct x11_compositor *c, xcb_xkb_state_notify_event_t *state) { - xkb_state_update_mask(c->core_seat.xkb_state.state, + xkb_state_update_mask(c->core_seat.keyboard->xkb_state.state, get_xkb_mod_mask(c, state->baseMods), get_xkb_mod_mask(c, state->latchedMods), get_xkb_mod_mask(c, state->lockedMods), @@ -950,7 +950,7 @@ 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; - xkb_state_update_mask(c->core_seat.xkb_state.state, + xkb_state_update_mask(c->core_seat.keyboard->xkb_state.state, keyboard->modifiers.mods_depressed & mask, keyboard->modifiers.mods_latched & mask, keyboard->modifiers.mods_locked & mask, |