From dfebea910910b9277e02b1706a4e62580f326308 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 26 Nov 2017 22:58:36 +0100 Subject: [PATCH] Cleanups --- input/input_driver.c | 144 ++++++++++++++++++++++------------------- menu/cbs/menu_cbs_ok.c | 2 +- 2 files changed, 80 insertions(+), 66 deletions(-) diff --git a/input/input_driver.c b/input/input_driver.c index 0506b90a23..eabb1bd733 100644 --- a/input/input_driver.c +++ b/input/input_driver.c @@ -1775,9 +1775,8 @@ bool input_mouse_button_raw(unsigned port, unsigned id) settings_t *settings = config_get_ptr(); /*ignore axes*/ - if ( id == RETRO_DEVICE_ID_MOUSE_X || id == RETRO_DEVICE_ID_MOUSE_Y ) { + if ( id == RETRO_DEVICE_ID_MOUSE_X || id == RETRO_DEVICE_ID_MOUSE_Y ) return false; - } joypad_info.axis_threshold = input_driver_axis_threshold; joypad_info.joy_idx = settings->uints.input_joypad_map[port]; @@ -1786,9 +1785,8 @@ bool input_mouse_button_raw(unsigned port, unsigned id) res = current_input->input_state(current_input_data, joypad_info, libretro_input_binds, port, RETRO_DEVICE_MOUSE, 0, id); - if ( res ) { + if (res) return true; - } return false; } @@ -2480,28 +2478,47 @@ void input_config_parse_mouse_button(void *data, const char *prefix, if ( tmp[0]=='w' ) { - switch ( tmp[1] ) { - case 'u': bind->mbutton = RETRO_DEVICE_ID_MOUSE_WHEELUP; break; - case 'd': bind->mbutton = RETRO_DEVICE_ID_MOUSE_WHEELDOWN; break; - case 'h': - { - switch ( tmp[2] ) { - case 'u': bind->mbutton = RETRO_DEVICE_ID_MOUSE_HORIZ_WHEELUP; break; - case 'd': bind->mbutton = RETRO_DEVICE_ID_MOUSE_HORIZ_WHEELDOWN; break; - } - } - break; - } + switch ( tmp[1] ) + { + case 'u': + bind->mbutton = RETRO_DEVICE_ID_MOUSE_WHEELUP; + break; + case 'd': + bind->mbutton = RETRO_DEVICE_ID_MOUSE_WHEELDOWN; + break; + case 'h': + switch ( tmp[2] ) + { + case 'u': + bind->mbutton = RETRO_DEVICE_ID_MOUSE_HORIZ_WHEELUP; + break; + case 'd': + bind->mbutton = RETRO_DEVICE_ID_MOUSE_HORIZ_WHEELDOWN; + break; + } + break; + } } else { val = atoi(tmp); - switch ( val ) { - case 1: bind->mbutton = RETRO_DEVICE_ID_MOUSE_LEFT; break; - case 2: bind->mbutton = RETRO_DEVICE_ID_MOUSE_RIGHT; break; - case 3: bind->mbutton = RETRO_DEVICE_ID_MOUSE_MIDDLE; break; - case 4: bind->mbutton = RETRO_DEVICE_ID_MOUSE_BUTTON_4; break; - case 5: bind->mbutton = RETRO_DEVICE_ID_MOUSE_BUTTON_5; break; + switch ( val ) + { + case 1: + bind->mbutton = RETRO_DEVICE_ID_MOUSE_LEFT; + break; + case 2: + bind->mbutton = RETRO_DEVICE_ID_MOUSE_RIGHT; + break; + case 3: + bind->mbutton = RETRO_DEVICE_ID_MOUSE_MIDDLE; + break; + case 4: + bind->mbutton = RETRO_DEVICE_ID_MOUSE_BUTTON_4; + break; + case 5: + bind->mbutton = RETRO_DEVICE_ID_MOUSE_BUTTON_5; + break; } } } @@ -2605,22 +2622,21 @@ void input_config_get_bind_string(char *buf, const struct retro_keybind *bind, else if (auto_bind && auto_bind->joyaxis != AXIS_NONE) input_config_get_bind_string_joyaxis(buf, "Auto: ", auto_bind, size); - if ( *buf ) { + if (*buf) delim = 1; - } #ifndef RARCH_CONSOLE input_keymaps_translate_rk_to_str(bind->key, key, sizeof(key)); if (string_is_equal(key, file_path_str(FILE_PATH_NUL))) *key = '\0'; /*empty?*/ - if ( *key != '\0' ) { - if ( delim ) { - strlcat(buf, ", ", size); - } - snprintf(keybuf, sizeof(keybuf), msg_hash_to_str(MENU_ENUM_LABEL_VALUE_INPUT_KEY), key); - strlcat(buf, keybuf, size); - delim = 1; + if (*key != '\0') + { + if (delim ) + strlcat(buf, ", ", size); + snprintf(keybuf, sizeof(keybuf), msg_hash_to_str(MENU_ENUM_LABEL_VALUE_INPUT_KEY), key); + strlcat(buf, keybuf, size); + delim = 1; } #endif @@ -2628,35 +2644,35 @@ void input_config_get_bind_string(char *buf, const struct retro_keybind *bind, { int tag = 0; switch ( bind->mbutton ) - { - case RETRO_DEVICE_ID_MOUSE_LEFT: - tag = MENU_ENUM_LABEL_VALUE_INPUT_MOUSE_LEFT; - break; - case RETRO_DEVICE_ID_MOUSE_RIGHT: - tag = MENU_ENUM_LABEL_VALUE_INPUT_MOUSE_RIGHT; - break; - case RETRO_DEVICE_ID_MOUSE_MIDDLE: - tag = MENU_ENUM_LABEL_VALUE_INPUT_MOUSE_MIDDLE; - break; - case RETRO_DEVICE_ID_MOUSE_BUTTON_4: - tag = MENU_ENUM_LABEL_VALUE_INPUT_MOUSE_BUTTON4; - break; - case RETRO_DEVICE_ID_MOUSE_BUTTON_5: - tag = MENU_ENUM_LABEL_VALUE_INPUT_MOUSE_BUTTON5; - break; - case RETRO_DEVICE_ID_MOUSE_WHEELUP: - tag = MENU_ENUM_LABEL_VALUE_INPUT_MOUSE_WHEEL_UP; - break; - case RETRO_DEVICE_ID_MOUSE_WHEELDOWN: - tag = MENU_ENUM_LABEL_VALUE_INPUT_MOUSE_WHEEL_DOWN; - break; - case RETRO_DEVICE_ID_MOUSE_HORIZ_WHEELUP: - tag = MENU_ENUM_LABEL_VALUE_INPUT_MOUSE_HORIZ_WHEEL_UP; - break; - case RETRO_DEVICE_ID_MOUSE_HORIZ_WHEELDOWN: - tag = MENU_ENUM_LABEL_VALUE_INPUT_MOUSE_HORIZ_WHEEL_DOWN; - break; - } /* switch ( bind->mbutton ) */ + { + case RETRO_DEVICE_ID_MOUSE_LEFT: + tag = MENU_ENUM_LABEL_VALUE_INPUT_MOUSE_LEFT; + break; + case RETRO_DEVICE_ID_MOUSE_RIGHT: + tag = MENU_ENUM_LABEL_VALUE_INPUT_MOUSE_RIGHT; + break; + case RETRO_DEVICE_ID_MOUSE_MIDDLE: + tag = MENU_ENUM_LABEL_VALUE_INPUT_MOUSE_MIDDLE; + break; + case RETRO_DEVICE_ID_MOUSE_BUTTON_4: + tag = MENU_ENUM_LABEL_VALUE_INPUT_MOUSE_BUTTON4; + break; + case RETRO_DEVICE_ID_MOUSE_BUTTON_5: + tag = MENU_ENUM_LABEL_VALUE_INPUT_MOUSE_BUTTON5; + break; + case RETRO_DEVICE_ID_MOUSE_WHEELUP: + tag = MENU_ENUM_LABEL_VALUE_INPUT_MOUSE_WHEEL_UP; + break; + case RETRO_DEVICE_ID_MOUSE_WHEELDOWN: + tag = MENU_ENUM_LABEL_VALUE_INPUT_MOUSE_WHEEL_DOWN; + break; + case RETRO_DEVICE_ID_MOUSE_HORIZ_WHEELUP: + tag = MENU_ENUM_LABEL_VALUE_INPUT_MOUSE_HORIZ_WHEEL_UP; + break; + case RETRO_DEVICE_ID_MOUSE_HORIZ_WHEELDOWN: + tag = MENU_ENUM_LABEL_VALUE_INPUT_MOUSE_HORIZ_WHEEL_DOWN; + break; + } /* switch ( bind->mbutton ) */ if (tag != 0) { @@ -2668,9 +2684,8 @@ void input_config_get_bind_string(char *buf, const struct retro_keybind *bind, } /*completely empty?*/ - if ( *buf == '\0' ) { + if ( *buf == '\0' ) strlcat(buf, "---", size); - } } const char *input_config_get_device_name(unsigned port) @@ -2683,11 +2698,9 @@ const char *input_config_get_device_name(unsigned port) void input_config_set_device_name(unsigned port, const char *name) { if (!string_is_empty(name)) - { strlcpy(input_device_names[port], name, sizeof(input_device_names[port])); - } } void input_config_clear_device_name(unsigned port) @@ -2727,7 +2740,8 @@ bool input_config_get_bind_idx(unsigned port, unsigned *joy_idx_real) return true; } -const struct retro_keybind *input_config_get_bind_auto(unsigned port, unsigned id) +const struct retro_keybind *input_config_get_bind_auto( + unsigned port, unsigned id) { settings_t *settings = config_get_ptr(); unsigned joy_idx = settings->uints.input_joypad_map[port]; diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index d5615dabe8..1b8172c6e5 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -1368,7 +1368,7 @@ static int default_action_ok_load_content_with_core_from_menu(const char *_path, content_info.argv = NULL; content_info.args = NULL; content_info.environ_get = NULL; - if (!task_push_load_content_with_core_from_menu(_path, &content_info, (rarch_core_type)_type, NULL, NULL)) + if (!task_push_load_content_with_core_from_menu(_path, &content_info, (enum rarch_core_type)_type, NULL, NULL)) return -1; return 0; }