From 2a40cd5939d268a1335bf019c1c84b3c6f38a96a Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 9 Mar 2015 19:04:10 +0100 Subject: [PATCH] (keyboard_event) Cleanups --- input/keyboard_event_x11.c | 10 ++++++---- input/keyboard_event_xkb.c | 3 +-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/input/keyboard_event_x11.c b/input/keyboard_event_x11.c index a1e7951a7d..dd035e273f 100644 --- a/input/keyboard_event_x11.c +++ b/input/keyboard_event_x11.c @@ -49,18 +49,20 @@ static size_t conv_utf8_utf32(uint32_t *out, size_t ret = 0; while (in_size && out_chars) { + unsigned ones, extra, shift; + uint32_t c; uint8_t first = *in++; - unsigned ones = leading_ones(first); + ones = leading_ones(first); if (ones > 6 || ones == 1) /* Invalid or desync. */ break; - unsigned extra = ones ? ones - 1 : ones; + extra = ones ? ones - 1 : ones; if (1 + extra > in_size) /* Overflow. */ break; - unsigned shift = (extra - 1) * 6; - uint32_t c = (first & ((1 << (7 - ones)) - 1)) << (6 * extra); + shift = (extra - 1) * 6; + c = (first & ((1 << (7 - ones)) - 1)) << (6 * extra); for (i = 0; i < extra; i++, in++, shift -= 6) c |= (*in & 0x3f) << shift; diff --git a/input/keyboard_event_xkb.c b/input/keyboard_event_xkb.c index ac54fcb167..39a980e840 100644 --- a/input/keyboard_event_xkb.c +++ b/input/keyboard_event_xkb.c @@ -55,8 +55,7 @@ void handle_xkb( if (*map_idx != XKB_MOD_INVALID) mod |= xkb_state_mod_index_is_active( - xkb_state, - *map_idx, + xkb_state, *map_idx, (enum xkb_state_component)((XKB_STATE_MODS_EFFECTIVE) > 0)) ? *map_bit : 0; }