From 8b11d9f039a53f109894e0cbba9c684bd576484c Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 23 Feb 2020 05:55:15 +0100 Subject: [PATCH] Cleanups --- input/drivers_keyboard/keyboard_event_apple.c | 17 +++++++------- input/drivers_keyboard/keyboard_event_xkb.c | 22 +++++++++++-------- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/input/drivers_keyboard/keyboard_event_apple.c b/input/drivers_keyboard/keyboard_event_apple.c index 0c698c3a94..f0361ea436 100644 --- a/input/drivers_keyboard/keyboard_event_apple.c +++ b/input/drivers_keyboard/keyboard_event_apple.c @@ -120,10 +120,10 @@ static icade_map_t icade_maps[MAX_ICADE_PROFILES][MAX_ICADE_KEYS]; static bool handle_icade_event(unsigned *code, bool *keydown) { - settings_t *settings = config_get_ptr(); static bool initialized = false; - bool ret = false; - unsigned kb_type_idx = settings->uints.input_keyboard_gamepad_mapping_type; + bool ret = false; + settings_t *settings = config_get_ptr(); + unsigned kb_type_idx = settings->uints.input_keyboard_gamepad_mapping_type; if (!initialized) { @@ -274,20 +274,21 @@ void apple_input_keyboard_event(bool down, unsigned code, uint32_t character, uint32_t mod, unsigned device) { #if TARGET_OS_IPHONE - settings_t *settings = config_get_ptr(); + settings_t *settings = config_get_ptr(); + bool keyboard_gamepad_enable = settings->bools.input_keyboard_gamepad_enable; + bool small_keyboard_enable = settings->bools.input_small_keyboard_enable; #endif - - code = HIDKEY(code); + code = HIDKEY(code); #if TARGET_OS_IPHONE - if (settings->bools.input_keyboard_gamepad_enable) + if (keyboard_gamepad_enable) { if (handle_icade_event(&code, &down)) character = 0; else code = 0; } - else if (settings->bools.input_small_keyboard_enable) + else if (small_keyboard_enable) { if (handle_small_keyboard(&code, down)) character = 0; diff --git a/input/drivers_keyboard/keyboard_event_xkb.c b/input/drivers_keyboard/keyboard_event_xkb.c index b406d12e73..78a5f5d152 100644 --- a/input/drivers_keyboard/keyboard_event_xkb.c +++ b/input/drivers_keyboard/keyboard_event_xkb.c @@ -86,19 +86,23 @@ int init_xkb(int fd, size_t size) } else { - struct string_list *list = NULL; - struct xkb_rule_names rule = {0}; - settings_t *settings = config_get_ptr(); + struct string_list *list = NULL; + struct xkb_rule_names rule = {0}; + settings_t *settings = config_get_ptr(); + const char *input_keyboard_layout = settings->arrays.input_keyboard_layout; rule.rules = "evdev"; - if (*settings->arrays.input_keyboard_layout) + if (*input_keyboard_layout) { - list = string_split(settings->arrays.input_keyboard_layout, ":"); - if (list && list->size >= 2) - rule.variant = list->elems[1].data; - if (list && list->size >= 1) - rule.layout = list->elems[0].data; + list = string_split(input_keyboard_layout, ":"); + if (list) + { + if (list->size >= 2) + rule.variant = list->elems[1].data; + if (list->size >= 1) + rule.layout = list->elems[0].data; + } } xkb_map = xkb_keymap_new_from_names(xkb_ctx,