@@ -1935,6 +1935,16 @@ static struct config_bool_setting *populate_settings_bool(
19351935#include "settings/settings_def_video_fullscreen.h"
19361936#define SETTINGS_DEF_CONFIG_PASS
19371937#include "settings/settings_def_video_sync.h"
1938+ #ifdef HAVE_OVERLAY
1939+ #include "settings/settings_def_overlay_mouse.h"
1940+ #endif
1941+ #ifdef HAVE_OVERLAY
1942+ #include "settings/settings_def_overlay_lightgun.h"
1943+ #endif
1944+ #include "settings/settings_def_input_turbo_fire.h"
1945+ #ifdef _3DS
1946+ #include "settings/settings_def_ui_appearance.h"
1947+ #endif
19381948#include "settings/settings_def_menu_entry_display.h"
19391949#include "settings/settings_def_crt_switchres.h"
19401950#include "settings/settings_def_audio_state.h"
@@ -2480,10 +2490,6 @@ static struct config_bool_setting *populate_settings_bool(
24802490 SETTING_BOOL ("input_overlay_auto_rotate" , & settings -> bools .input_overlay_auto_rotate , true, DEFAULT_OVERLAY_AUTO_ROTATE , false);
24812491 SETTING_BOOL ("input_osk_overlay_auto_scale" , & settings -> bools .input_osk_overlay_auto_scale , true, DEFAULT_INPUT_OVERLAY_AUTO_SCALE , false);
24822492 SETTING_BOOL ("input_overlay_pointer_enable" , & settings -> bools .input_overlay_pointer_enable , true, DEFAULT_INPUT_OVERLAY_POINTER_ENABLE , false);
2483- SETTING_BOOL ("input_overlay_lightgun_trigger_on_touch" , & settings -> bools .input_overlay_lightgun_trigger_on_touch , true, DEFAULT_INPUT_OVERLAY_LIGHTGUN_TRIGGER_ON_TOUCH , false);
2484- SETTING_BOOL ("input_overlay_lightgun_allow_offscreen" , & settings -> bools .input_overlay_lightgun_allow_offscreen , true, DEFAULT_INPUT_OVERLAY_LIGHTGUN_ALLOW_OFFSCREEN , false);
2485- SETTING_BOOL ("input_overlay_mouse_hold_to_drag" , & settings -> bools .input_overlay_mouse_hold_to_drag , true, DEFAULT_INPUT_OVERLAY_MOUSE_HOLD_TO_DRAG , false);
2486- SETTING_BOOL ("input_overlay_mouse_dtap_to_drag" , & settings -> bools .input_overlay_mouse_dtap_to_drag , true, DEFAULT_INPUT_OVERLAY_MOUSE_DTAP_TO_DRAG , false);
24872493#endif
24882494#if defined(VITA )
24892495 SETTING_BOOL ("input_backtouch_enable" , & settings -> bools .input_backtouch_enable , false, DEFAULT_INPUT_BACKTOUCH_ENABLE , false);
@@ -2493,8 +2499,6 @@ static struct config_bool_setting *populate_settings_bool(
24932499 SETTING_BOOL ("small_keyboard_enable" , & settings -> bools .input_small_keyboard_enable , true, false, false);
24942500#endif
24952501 SETTING_BOOL ("keyboard_gamepad_enable" , & settings -> bools .input_keyboard_gamepad_enable , true, DEFAULT_INPUT_KEYBOARD_GAMEPAD_ENABLE , false);
2496- SETTING_BOOL ("input_turbo_enable" , & settings -> bools .input_turbo_enable , true, DEFAULT_TURBO_ENABLE , false);
2497- SETTING_BOOL ("input_turbo_allow_dpad" , & settings -> bools .input_turbo_allow_dpad , true, DEFAULT_TURBO_ALLOW_DPAD , false);
24982502#ifdef HAVE_MENU
24992503 SETTING_BOOL ("menu_swap_ok_cancel_buttons" , & settings -> bools .input_menu_swap_ok_cancel_buttons , true, DEFAULT_MENU_SWAP_OK_CANCEL_BUTTONS , false);
25002504 SETTING_BOOL ("menu_swap_scroll_buttons" , & settings -> bools .input_menu_swap_scroll_buttons , true, DEFAULT_MENU_SWAP_SCROLL_BUTTONS , false);
@@ -2544,7 +2548,6 @@ static struct config_bool_setting *populate_settings_bool(
25442548
25452549#ifdef _3DS
25462550 SETTING_BOOL ("new3ds_speedup_enable" , & settings -> bools .new3ds_speedup_enable , true, DEFAULT_NEW_3DS_SPEEDUP_ENABLE , false);
2547- SETTING_BOOL ("bottom_font_enable" , & settings -> bools .bottom_font_enable , true, DEFAULT_BOTTOM_FONT_ENABLE , false);
25482551#endif
25492552
25502553
@@ -2609,6 +2612,16 @@ static struct config_float_setting *populate_settings_float(
26092612#include "settings/settings_def_video_fullscreen.h"
26102613#define SETTINGS_DEF_CONFIG_PASS
26112614#include "settings/settings_def_video_sync.h"
2615+ #ifdef HAVE_OVERLAY
2616+ #include "settings/settings_def_overlay_mouse.h"
2617+ #endif
2618+ #ifdef HAVE_OVERLAY
2619+ #include "settings/settings_def_overlay_lightgun.h"
2620+ #endif
2621+ #include "settings/settings_def_input_turbo_fire.h"
2622+ #ifdef _3DS
2623+ #include "settings/settings_def_ui_appearance.h"
2624+ #endif
26122625#include "settings/settings_def_menu_entry_display.h"
26132626#include "settings/settings_def_crt_switchres.h"
26142627#include "settings/settings_def_audio_state.h"
@@ -3108,13 +3121,8 @@ static struct config_float_setting *populate_settings_float(
31083121 SETTING_FLOAT ("input_overlay_y_separation_portrait" , & settings -> floats .input_overlay_y_separation_portrait , true, DEFAULT_INPUT_OVERLAY_Y_SEPARATION_PORTRAIT , false);
31093122 SETTING_FLOAT ("input_overlay_x_offset_portrait" , & settings -> floats .input_overlay_x_offset_portrait , true, DEFAULT_INPUT_OVERLAY_X_OFFSET_PORTRAIT , false);
31103123 SETTING_FLOAT ("input_overlay_y_offset_portrait" , & settings -> floats .input_overlay_y_offset_portrait , true, DEFAULT_INPUT_OVERLAY_Y_OFFSET_PORTRAIT , false);
3111- SETTING_FLOAT ("input_overlay_mouse_speed" , & settings -> floats .input_overlay_mouse_speed , true, DEFAULT_INPUT_OVERLAY_MOUSE_SPEED , false);
3112- SETTING_FLOAT ("input_overlay_mouse_swipe_threshold" , & settings -> floats .input_overlay_mouse_swipe_threshold , true, DEFAULT_INPUT_OVERLAY_MOUSE_SWIPE_THRESHOLD , false);
31133124#endif
31143125
3115- #ifdef _3DS
3116- SETTING_FLOAT ("bottom_font_scale" , & settings -> floats .bottom_font_scale , true, DEFAULT_BOTTOM_FONT_SCALE , false);
3117- #endif
31183126
31193127 * size = count ;
31203128
@@ -3236,6 +3244,16 @@ static struct config_uint_setting *populate_settings_uint(
32363244#include "settings/settings_def_video_fullscreen.h"
32373245#define SETTINGS_DEF_CONFIG_PASS
32383246#include "settings/settings_def_video_sync.h"
3247+ #ifdef HAVE_OVERLAY
3248+ #include "settings/settings_def_overlay_mouse.h"
3249+ #endif
3250+ #ifdef HAVE_OVERLAY
3251+ #include "settings/settings_def_overlay_lightgun.h"
3252+ #endif
3253+ #include "settings/settings_def_input_turbo_fire.h"
3254+ #ifdef _3DS
3255+ #include "settings/settings_def_ui_appearance.h"
3256+ #endif
32393257#include "settings/settings_def_menu_entry_display.h"
32403258#include "settings/settings_def_crt_switchres.h"
32413259#include "settings/settings_def_audio_state.h"
@@ -3700,10 +3718,6 @@ static struct config_uint_setting *populate_settings_uint(
37003718
37013719 SETTING_UINT ("input_bind_timeout" , & settings -> uints .input_bind_timeout , true, DEFAULT_INPUT_BIND_TIMEOUT , false);
37023720 SETTING_UINT ("input_bind_hold" , & settings -> uints .input_bind_hold , true, DEFAULT_INPUT_BIND_HOLD , false);
3703- SETTING_UINT ("input_turbo_period" , & settings -> uints .input_turbo_period , true, DEFAULT_TURBO_PERIOD , false);
3704- SETTING_UINT ("input_turbo_duty_cycle" , & settings -> uints .input_turbo_duty_cycle , true, DEFAULT_TURBO_DUTY_CYCLE , false);
3705- SETTING_UINT ("input_turbo_mode" , & settings -> uints .input_turbo_mode , true, DEFAULT_TURBO_MODE , false);
3706- SETTING_UINT ("input_turbo_button" , & settings -> uints .input_turbo_button , true, DEFAULT_TURBO_BUTTON , false);
37073721#ifdef ANDROID
37083722 SETTING_UINT ("input_sensor_orientation" , & settings -> uints .input_sensor_orientation , true, 0 , false);
37093723#else
@@ -3779,15 +3793,6 @@ static struct config_uint_setting *populate_settings_uint(
37793793#endif
37803794
37813795
3782- #ifdef HAVE_OVERLAY
3783- SETTING_UINT ("input_overlay_lightgun_trigger_delay" , & settings -> uints .input_overlay_lightgun_trigger_delay , true, DEFAULT_INPUT_OVERLAY_LIGHTGUN_TRIGGER_DELAY , false);
3784- SETTING_UINT ("input_overlay_lightgun_two_touch_input" , & settings -> uints .input_overlay_lightgun_two_touch_input , true, DEFAULT_INPUT_OVERLAY_LIGHTGUN_MULTI_TOUCH_INPUT , false);
3785- SETTING_UINT ("input_overlay_lightgun_three_touch_input" , & settings -> uints .input_overlay_lightgun_three_touch_input , true, DEFAULT_INPUT_OVERLAY_LIGHTGUN_MULTI_TOUCH_INPUT , false);
3786- SETTING_UINT ("input_overlay_lightgun_four_touch_input" , & settings -> uints .input_overlay_lightgun_four_touch_input , true, DEFAULT_INPUT_OVERLAY_LIGHTGUN_MULTI_TOUCH_INPUT , false);
3787- SETTING_UINT ("input_overlay_mouse_hold_msec" , & settings -> uints .input_overlay_mouse_hold_msec , true, DEFAULT_INPUT_OVERLAY_MOUSE_HOLD_MSEC , false);
3788- SETTING_UINT ("input_overlay_mouse_dtap_msec" , & settings -> uints .input_overlay_mouse_dtap_msec , true, DEFAULT_INPUT_OVERLAY_MOUSE_DTAP_MSEC , false);
3789- SETTING_UINT ("input_overlay_mouse_alt_two_touch_input" , & settings -> uints .input_overlay_mouse_alt_two_touch_input , true, DEFAULT_INPUT_OVERLAY_MOUSE_ALT_TWO_TOUCH_INPUT , false);
3790- #endif
37913796
37923797
37933798 * size = count ;
@@ -3866,6 +3871,16 @@ static struct config_int_setting *populate_settings_int(
38663871#include "settings/settings_def_video_fullscreen.h"
38673872#define SETTINGS_DEF_CONFIG_PASS
38683873#include "settings/settings_def_video_sync.h"
3874+ #ifdef HAVE_OVERLAY
3875+ #include "settings/settings_def_overlay_mouse.h"
3876+ #endif
3877+ #ifdef HAVE_OVERLAY
3878+ #include "settings/settings_def_overlay_lightgun.h"
3879+ #endif
3880+ #include "settings/settings_def_input_turbo_fire.h"
3881+ #ifdef _3DS
3882+ #include "settings/settings_def_ui_appearance.h"
3883+ #endif
38693884#include "settings/settings_def_menu_entry_display.h"
38703885#include "settings/settings_def_crt_switchres.h"
38713886#include "settings/settings_def_audio_state.h"
@@ -4352,6 +4367,16 @@ static struct config_int_setting *populate_settings_int(
43524367#include "settings/settings_def_video_fullscreen.h"
43534368#define SETTINGS_DEF_CONFIG_PASS
43544369#include "settings/settings_def_video_sync.h"
4370+ #ifdef HAVE_OVERLAY
4371+ #include "settings/settings_def_overlay_mouse.h"
4372+ #endif
4373+ #ifdef HAVE_OVERLAY
4374+ #include "settings/settings_def_overlay_lightgun.h"
4375+ #endif
4376+ #include "settings/settings_def_input_turbo_fire.h"
4377+ #ifdef _3DS
4378+ #include "settings/settings_def_ui_appearance.h"
4379+ #endif
43554380#include "settings/settings_def_menu_entry_display.h"
43564381#include "settings/settings_def_crt_switchres.h"
43574382#include "settings/settings_def_audio_state.h"
@@ -4823,17 +4848,7 @@ static struct config_int_setting *populate_settings_int(
48234848 SETTING_OVERRIDE (RARCH_OVERRIDE_SETTING_NETPLAY_CHECK_FRAMES );
48244849#endif
48254850
4826- #ifdef _3DS
4827- SETTING_INT ("bottom_font_color_red" , & settings -> ints .bottom_font_color_red , true, DEFAULT_BOTTOM_FONT_COLOR , false);
4828- SETTING_INT ("bottom_font_color_green" , & settings -> ints .bottom_font_color_green , true, DEFAULT_BOTTOM_FONT_COLOR , false);
4829- SETTING_INT ("bottom_font_color_blue" , & settings -> ints .bottom_font_color_blue , true, DEFAULT_BOTTOM_FONT_COLOR , false);
4830- SETTING_INT ("bottom_font_color_opacity" , & settings -> ints .bottom_font_color_opacity , true, DEFAULT_BOTTOM_FONT_COLOR , false);
4831- #endif
48324851
4833- #ifdef HAVE_OVERLAY
4834- SETTING_INT ("input_overlay_lightgun_port" , & settings -> ints .input_overlay_lightgun_port , true, DEFAULT_INPUT_OVERLAY_LIGHTGUN_PORT , false);
4835- #endif
4836- SETTING_INT ("input_turbo_bind" , & settings -> ints .input_turbo_bind , true, DEFAULT_TURBO_BIND , false);
48374852
48384853 * size = count ;
48394854
0 commit comments