From 7da1ecbf400567fc18b5fcffa7414c363a429190 Mon Sep 17 00:00:00 2001 From: zoltanvb Date: Tue, 20 Feb 2024 21:21:51 +0100 Subject: [PATCH] Add sublabel for mouse index entry. --- intl/msg_hash_us.h | 4 ++++ menu/cbs/menu_cbs_sublabel.c | 9 +++++---- msg_hash.h | 1 + 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index a4d340a8777..ec9df66f7a9 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -4149,6 +4149,10 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_INPUT_MOUSE_INDEX, "Mouse Index" ) +MSG_HASH( + MENU_ENUM_SUBLABEL_INPUT_MOUSE_INDEX, + "The physical mouse as recognized by RetroArch." + ) MSG_HASH( MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_B, "B Button (Down)" diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c index 2bac88f4224..3951a2a2961 100644 --- a/menu/cbs/menu_cbs_sublabel.c +++ b/menu/cbs/menu_cbs_sublabel.c @@ -478,7 +478,8 @@ DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_netplay_fade_chat_toggle, DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_hotkey_block_delay, MENU_ENUM_SUBLABEL_INPUT_HOTKEY_BLOCK_DELAY) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_hotkey_device_merge, MENU_ENUM_SUBLABEL_INPUT_HOTKEY_DEVICE_MERGE) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_device_type, MENU_ENUM_SUBLABEL_INPUT_DEVICE_TYPE) -DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_device_index, MENU_ENUM_SUBLABEL_INPUT_DEVICE_INDEX) +DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_device_index, MENU_ENUM_SUBLABEL_INPUT_DEVICE_INDEX) +DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_mouse_index, MENU_ENUM_SUBLABEL_INPUT_MOUSE_INDEX) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_adc_type, MENU_ENUM_SUBLABEL_INPUT_ADC_TYPE) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_bind_all, MENU_ENUM_SUBLABEL_INPUT_BIND_ALL) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_save_autoconfig, MENU_ENUM_SUBLABEL_INPUT_SAVE_AUTOCONFIG) @@ -5575,12 +5576,12 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs, /* { MENU_ENUM_LABEL_INPUT_DEVICE_INDEX, NULL - }, + },*/ { MENU_ENUM_LABEL_INPUT_MOUSE_INDEX, - NULL + action_bind_sublabel_input_mouse_index }, - { +/* { MENU_ENUM_LABEL_INPUT_REMAP_PORT, NULL },*/ diff --git a/msg_hash.h b/msg_hash.h index e9127065e3e..521a0cd1ce1 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -1158,6 +1158,7 @@ enum msg_hash_enums MENU_ENUM_SUBLABEL_INPUT_DEVICE_TYPE, MENU_ENUM_SUBLABEL_INPUT_DEVICE_INDEX, + MENU_ENUM_SUBLABEL_INPUT_MOUSE_INDEX, MENU_ENUM_SUBLABEL_INPUT_ADC_TYPE, MENU_ENUM_LABEL_HELP_INPUT_ADC_TYPE, MENU_ENUM_SUBLABEL_INPUT_BIND_ALL,