From 244e99e18c56debcbe6c9a87665385cbb352bfeb Mon Sep 17 00:00:00 2001 From: Derek Foreman Date: Wed, 3 Jun 2015 15:53:26 -0500 Subject: [PATCH] input: clean up notify_modifiers a little We already have a pointer to the keyboard, so we can change all seat->keyboard to keyboard. Signed-off-by: Derek Foreman Reviewed-by: Bryce Harrington --- src/input.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/input.c b/src/input.c index e6b6118d..ac019466 100644 --- a/src/input.c +++ b/src/input.c @@ -1138,19 +1138,19 @@ notify_modifiers(struct weston_seat *seat, uint32_t serial) group = xkb_state_serialize_layout(keyboard->xkb_state.state, XKB_STATE_LAYOUT_EFFECTIVE); - if (mods_depressed != seat->keyboard->modifiers.mods_depressed || - mods_latched != seat->keyboard->modifiers.mods_latched || - mods_locked != seat->keyboard->modifiers.mods_locked || - group != seat->keyboard->modifiers.group) + if (mods_depressed != keyboard->modifiers.mods_depressed || + mods_latched != keyboard->modifiers.mods_latched || + mods_locked != keyboard->modifiers.mods_locked || + group != keyboard->modifiers.group) changed = 1; - run_modifier_bindings(seat, seat->keyboard->modifiers.mods_depressed, + run_modifier_bindings(seat, keyboard->modifiers.mods_depressed, mods_depressed); - seat->keyboard->modifiers.mods_depressed = mods_depressed; - seat->keyboard->modifiers.mods_latched = mods_latched; - seat->keyboard->modifiers.mods_locked = mods_locked; - seat->keyboard->modifiers.group = group; + keyboard->modifiers.mods_depressed = mods_depressed; + keyboard->modifiers.mods_latched = mods_latched; + keyboard->modifiers.mods_locked = mods_locked; + keyboard->modifiers.group = group; /* And update the modifier_state for bindings. */ mods_lookup = mods_depressed | mods_latched;