Skip to content

Commit baf190f

Browse files
libretroadminLibretroAdmin
libretroadmin
authored and
LibretroAdmin
committed
settings: migrate the Windows hotkey passthrough setting to a single-source def file
Performed by tools/settings_migrate_group.py with the standard battery including the platform-profile lanes and the integrated enum consolidation stage; the lookup gate's parent baseline is computed per run.
1 parent 16d080e commit baf190f

8 files changed

Lines changed: 123 additions & 23 deletions

File tree

‎configuration.c‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1964,6 +1964,9 @@ static struct config_bool_setting *populate_settings_bool(
19641964
#include "settings/settings_def_video_fullscreen.h"
19651965
#define SETTINGS_DEF_CONFIG_PASS
19661966
#include "settings/settings_def_video_sync.h"
1967+
#if defined(HAVE_DINPUT) || defined(HAVE_WINRAWINPUT)
1968+
#include "settings/settings_def_input_nowinkey.h"
1969+
#endif
19671970
#include "settings/settings_def_overlay_enable.h"
19681971
#ifdef HAVE_MICROPHONE
19691972
#include "settings/settings_def_microphone.h"
@@ -2232,9 +2235,6 @@ static struct config_bool_setting *populate_settings_bool(
22322235
SETTING_BOOL("menu_swap_scroll_buttons", &settings->bools.input_menu_swap_scroll_buttons, true, DEFAULT_MENU_SWAP_SCROLL_BUTTONS, false);
22332236
SETTING_BOOL("menu_singleclick_playlists", &settings->bools.input_menu_singleclick_playlists, true, DEFAULT_MENU_SINGLECLICK_PLAYLISTS, false);
22342237
SETTING_BOOL("menu_allow_tabs_back", &settings->bools.input_menu_allow_tabs_back, true, DEFAULT_MENU_ALLOW_TABS_BACK, false);
2235-
#endif
2236-
#if defined(HAVE_DINPUT) || defined(HAVE_WINRAWINPUT)
2237-
SETTING_BOOL("input_nowinkey_enable", &settings->bools.input_nowinkey_enable, true, false, false);
22382238
#endif
22392239
SETTING_BOOL("input_sensors_enable", &settings->bools.input_sensors_enable, true, DEFAULT_INPUT_SENSORS_ENABLE, false);
22402240
SETTING_BOOL("vibrate_on_keypress", &settings->bools.vibrate_on_keypress, true, DEFAULT_VIBRATE_ON_KEYPRESS, false);
@@ -2348,6 +2348,9 @@ static struct config_float_setting *populate_settings_float(
23482348
#include "settings/settings_def_video_fullscreen.h"
23492349
#define SETTINGS_DEF_CONFIG_PASS
23502350
#include "settings/settings_def_video_sync.h"
2351+
#if defined(HAVE_DINPUT) || defined(HAVE_WINRAWINPUT)
2352+
#include "settings/settings_def_input_nowinkey.h"
2353+
#endif
23512354
#include "settings/settings_def_overlay_enable.h"
23522355
#ifdef HAVE_MICROPHONE
23532356
#include "settings/settings_def_microphone.h"
@@ -2671,6 +2674,9 @@ static struct config_uint_setting *populate_settings_uint(
26712674
#include "settings/settings_def_video_fullscreen.h"
26722675
#define SETTINGS_DEF_CONFIG_PASS
26732676
#include "settings/settings_def_video_sync.h"
2677+
#if defined(HAVE_DINPUT) || defined(HAVE_WINRAWINPUT)
2678+
#include "settings/settings_def_input_nowinkey.h"
2679+
#endif
26742680
#include "settings/settings_def_overlay_enable.h"
26752681
#ifdef HAVE_MICROPHONE
26762682
#include "settings/settings_def_microphone.h"
@@ -2969,6 +2975,9 @@ static struct config_int_setting *populate_settings_int(
29692975
#include "settings/settings_def_video_fullscreen.h"
29702976
#define SETTINGS_DEF_CONFIG_PASS
29712977
#include "settings/settings_def_video_sync.h"
2978+
#if defined(HAVE_DINPUT) || defined(HAVE_WINRAWINPUT)
2979+
#include "settings/settings_def_input_nowinkey.h"
2980+
#endif
29722981
#include "settings/settings_def_overlay_enable.h"
29732982
#ifdef HAVE_MICROPHONE
29742983
#include "settings/settings_def_microphone.h"

‎intl/msg_hash_lbl.h‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1752,12 +1752,6 @@ MSG_HASH(
17521752
MENU_ENUM_LABEL_INPUT_AUTODETECT_ENABLE,
17531753
MENU_ENUM_LABEL_INPUT_AUTODETECT_ENABLE_STR
17541754
)
1755-
#if defined(HAVE_DINPUT) || defined(HAVE_WINRAWINPUT)
1756-
MSG_HASH(
1757-
MENU_ENUM_LABEL_INPUT_NOWINKEY_ENABLE,
1758-
MENU_ENUM_LABEL_INPUT_NOWINKEY_ENABLE_STR
1759-
)
1760-
#endif
17611755
#ifdef ANDROID
17621756
MSG_HASH(
17631757
MENU_ENUM_LABEL_INPUT_SELECT_PHYSICAL_KEYBOARD,

‎intl/msg_hash_us.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -537,6 +537,7 @@ static const char *const msg_hash_us_lbl_strs[] = {
537537
#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) n,
538538
#include "../settings/settings_def_video_fullscreen.h"
539539
#include "../settings/settings_def_video_sync.h"
540+
#include "../settings/settings_def_input_nowinkey.h"
540541
#include "../settings/settings_def_overlay_enable.h"
541542
#include "../settings/settings_def_microphone.h"
542543
#include "../settings/settings_def_audio_sync.h"
@@ -602,6 +603,7 @@ static const uint32_t msg_hash_us_lbl_ids[] = {
602603
#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) (uint32_t)MENU_ENUM_LABEL_##T,
603604
#include "../settings/settings_def_video_fullscreen.h"
604605
#include "../settings/settings_def_video_sync.h"
606+
#include "../settings/settings_def_input_nowinkey.h"
605607
#include "../settings/settings_def_overlay_enable.h"
606608
#include "../settings/settings_def_microphone.h"
607609
#include "../settings/settings_def_audio_sync.h"

‎intl/msg_hash_us.h‎

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3557,14 +3557,38 @@ MSG_HASH(
35573557
"Automatically configures controllers that have a profile, Plug-and-Play style."
35583558
)
35593559
#if defined(HAVE_DINPUT) || defined(HAVE_WINRAWINPUT)
3560-
MSG_HASH(
3561-
MENU_ENUM_LABEL_VALUE_INPUT_NOWINKEY_ENABLE,
3562-
"Disable Windows Hotkeys (Restart required)"
3563-
)
3564-
MSG_HASH(
3565-
MENU_ENUM_SUBLABEL_INPUT_NOWINKEY_ENABLE,
3566-
"Keep Win-key combinations inside the application."
3567-
)
3560+
/* GENERATED REGION: Windows hotkey passthrough setting (see settings_def_input_nowinkey.h). */
3561+
#define SETTINGS_DEF_STRINGS_PASS
3562+
#define S_BOOL(f, T, n, d, sd, df, c, us, sub) \
3563+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
3564+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
3565+
#define S_BOOL_NS(f, T, n, d, sd, df, c, us) \
3566+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
3567+
#define S_UINT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
3568+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
3569+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
3570+
#define S_UINT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
3571+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
3572+
#define S_INT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
3573+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
3574+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
3575+
#define S_INT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
3576+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
3577+
#define S_FLOAT(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us, sub) \
3578+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
3579+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
3580+
#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) \
3581+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
3582+
#include "../settings/settings_def_input_nowinkey.h"
3583+
#undef S_BOOL
3584+
#undef S_BOOL_NS
3585+
#undef S_UINT
3586+
#undef S_UINT_NS
3587+
#undef S_INT
3588+
#undef S_INT_NS
3589+
#undef S_FLOAT
3590+
#undef S_FLOAT_NS
3591+
#undef SETTINGS_DEF_STRINGS_PASS
35683592
#endif
35693593
#ifdef ANDROID
35703594
MSG_HASH(

‎menu/menu_setting.c‎

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15152,8 +15152,32 @@ static bool setting_append_list(
1515215152
#if defined(HAVE_DINPUT) || defined(HAVE_WINRAWINPUT)
1515315153
{
1515415154
static const setting_desc_t inp_desc_7[] = {
15155-
SDESC_BOOL_ROW(input_nowinkey_enable, INPUT_NOWINKEY_ENABLE,
15156-
false, SD_FLAG_NONE, 0, 0),
15155+
/* GENERATED: rows come from settings_def_input_nowinkey.h in order. */
15156+
#define S_BOOL(f, T, n, d, sd, df, c, us, sub) \
15157+
SDESC_BOOL_ROW(f, T, d, sd, df, c),
15158+
#define S_BOOL_NS(f, T, n, d, sd, df, c, us) \
15159+
SDESC_BOOL_ROW(f, T, d, sd, df, c),
15160+
#define S_UINT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
15161+
SDESC_UINT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
15162+
#define S_UINT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
15163+
SDESC_UINT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
15164+
#define S_INT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
15165+
SDESC_INT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
15166+
#define S_INT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
15167+
SDESC_INT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
15168+
#define S_FLOAT(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us, sub) \
15169+
SDESC_FLOAT_ROW(f, T, d, rnd, sd, df, c, mn, mx, st, ok, rp),
15170+
#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) \
15171+
SDESC_FLOAT_ROW(f, T, d, rnd, sd, df, c, mn, mx, st, ok, rp),
15172+
#include "../settings/settings_def_input_nowinkey.h"
15173+
#undef S_BOOL
15174+
#undef S_BOOL_NS
15175+
#undef S_UINT
15176+
#undef S_UINT_NS
15177+
#undef S_INT
15178+
#undef S_INT_NS
15179+
#undef S_FLOAT
15180+
#undef S_FLOAT_NS
1515715181
};
1515815182
settings_list_add_desc(list, list_info, settings,
1515915183
inp_desc_7, ARRAY_SIZE(inp_desc_7),

‎msg_hash.h‎

Lines changed: 38 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1361,9 +1361,44 @@ enum msg_hash_enums
13611361
MENU_ENUM_SUBLABEL_INPUT_USER_REMAPS,
13621362

13631363
MENU_LABEL(INPUT_AUTODETECT_ENABLE),
1364-
#if defined(HAVE_DINPUT) || defined(HAVE_WINRAWINPUT)
1365-
MENU_LABEL(INPUT_NOWINKEY_ENABLE),
1366-
#endif
1364+
/* GENERATED REGION: Windows hotkey passthrough setting enum rows (see settings/settings_def_input_nowinkey.h). */
1365+
#define SETTINGS_DEF_ENUM_PASS
1366+
#define SETTINGS_DEF_STRINGS_PASS
1367+
#define S_BOOL(f, T, n, d, sd, df, c, us, sub) MENU_LABEL(T),
1368+
#define S_BOOL_NS(f, T, n, d, sd, df, c, us) MENU_LABEL(T),
1369+
#define S_UINT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) MENU_LABEL(T),
1370+
#define S_UINT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) MENU_LABEL(T),
1371+
#define S_INT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) MENU_LABEL(T),
1372+
#define S_INT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) MENU_LABEL(T),
1373+
#define S_FLOAT(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us, sub) MENU_LABEL(T),
1374+
#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) MENU_LABEL(T),
1375+
#define S_BOOL_H(f, T, n, d, sd, df, c, us, sub) MENU_LBL_H(T),
1376+
#define S_UINT_H(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) MENU_LBL_H(T),
1377+
#define S_BOOL_NS_H(f, T, n, d, sd, df, c, us) MENU_LBL_H(T),
1378+
#define S_INT_H(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) MENU_LBL_H(T),
1379+
#define S_FLOAT_H(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us, sub) MENU_LBL_H(T),
1380+
#define S_UINT_NS_H(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) MENU_LBL_H(T),
1381+
#define S_INT_NS_H(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) MENU_LBL_H(T),
1382+
#define S_FLOAT_NS_H(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) MENU_LBL_H(T),
1383+
#include "settings/settings_def_input_nowinkey.h"
1384+
#undef S_BOOL
1385+
#undef S_BOOL_NS
1386+
#undef S_UINT
1387+
#undef S_UINT_NS
1388+
#undef S_INT
1389+
#undef S_INT_NS
1390+
#undef S_FLOAT
1391+
#undef S_FLOAT_NS
1392+
#undef S_BOOL_H
1393+
#undef S_UINT_H
1394+
#undef S_BOOL_NS_H
1395+
#undef S_INT_H
1396+
#undef S_FLOAT_H
1397+
#undef S_UINT_NS_H
1398+
#undef S_INT_NS_H
1399+
#undef S_FLOAT_NS_H
1400+
#undef SETTINGS_DEF_STRINGS_PASS
1401+
#undef SETTINGS_DEF_ENUM_PASS
13671402

13681403
/* GENERATED REGION: Android disconnect workaround setting enum rows (see settings/settings_def_input_android_workaround.h). */
13691404
#define SETTINGS_DEF_ENUM_PASS

‎msg_hash_lbl_str.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,6 @@
443443
#define MENU_ENUM_LABEL_MENU_INPUT_SWAP_OK_CANCEL_STR "menu_swap_ok_cancel"
444444
#define MENU_ENUM_LABEL_MENU_INPUT_SWAP_SCROLL_STR "menu_swap_scroll"
445445
#define MENU_ENUM_LABEL_INPUT_AUTODETECT_ENABLE_STR "input_autodetect_enable"
446-
#define MENU_ENUM_LABEL_INPUT_NOWINKEY_ENABLE_STR "input_nowinkey_enable"
447446
#define MENU_ENUM_LABEL_INPUT_SELECT_PHYSICAL_KEYBOARD_STR "input_android_physical_keyboard"
448447
#define MENU_ENUM_LABEL_INPUT_SENSORS_ENABLE_STR "input_sensors_enable"
449448
#define MENU_ENUM_LABEL_INPUT_AUTO_MOUSE_GRAB_STR "input_auto_mouse_grab"

‎settings/settings_def_input_nowinkey.h‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
/* Single-source definitions: Windows hotkey passthrough setting.
2+
* Grammar identical to settings_def_video_sync.h plus S_FLOAT and
3+
* the _NS no-sublabel variants; the descriptor argument span
4+
* matches SDESC_<kind>_ROW; row order is menu display order;
5+
* h2json.py parses these rows for the Crowdin source upload. */
6+
7+
#if defined(HAVE_DINPUT) || defined(HAVE_WINRAWINPUT)
8+
S_BOOL(input_nowinkey_enable, INPUT_NOWINKEY_ENABLE,
9+
"input_nowinkey_enable",
10+
false, SD_FLAG_NONE, 0, 0,
11+
"Disable Windows Hotkeys (Restart required)",
12+
"Keep Win-key combinations inside the application.")
13+
#endif

0 commit comments

Comments
 (0)