From bc91e54a8c88d400759fb52cb85182866de585ec Mon Sep 17 00:00:00 2001 From: Derek Foreman Date: Wed, 3 Jun 2015 15:53:27 -0500 Subject: [PATCH] input: clean up update_keymap 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 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/input.c b/src/input.c index adc14712..dee3ca9c 100644 --- a/src/input.c +++ b/src/input.c @@ -1276,9 +1276,9 @@ update_keymap(struct weston_seat *seat) xkb_state_unref(keyboard->xkb_state.state); keyboard->xkb_state.state = state; - wl_resource_for_each(resource, &seat->keyboard->resource_list) + wl_resource_for_each(resource, &keyboard->resource_list) send_keymap(resource, xkb_info); - wl_resource_for_each(resource, &seat->keyboard->focus_resource_list) + wl_resource_for_each(resource, &keyboard->focus_resource_list) send_keymap(resource, xkb_info); notify_modifiers(seat, wl_display_next_serial(seat->compositor->wl_display)); @@ -1286,10 +1286,10 @@ update_keymap(struct weston_seat *seat) if (!latched_mods && !locked_mods) return; - wl_resource_for_each(resource, &seat->keyboard->resource_list) - send_modifiers(resource, wl_display_get_serial(seat->compositor->wl_display), seat->keyboard); - wl_resource_for_each(resource, &seat->keyboard->focus_resource_list) - send_modifiers(resource, wl_display_get_serial(seat->compositor->wl_display), seat->keyboard); + wl_resource_for_each(resource, &keyboard->resource_list) + send_modifiers(resource, wl_display_get_serial(seat->compositor->wl_display), keyboard); + wl_resource_for_each(resource, &keyboard->focus_resource_list) + send_modifiers(resource, wl_display_get_serial(seat->compositor->wl_display), keyboard); } #else WL_EXPORT void