Removed obsolete "Custom Controls" options
This commit is contained in:
Dimitris Panokostas
parent
262f2f1661
commit
a5696b2703
2 changed files with 42 additions and 194 deletions
|
|
@ -419,32 +419,17 @@ struct uae_prefs {
|
|||
int scaling_method;
|
||||
#endif
|
||||
|
||||
bool customControls;
|
||||
TCHAR custom_up[256];
|
||||
TCHAR custom_down[256];
|
||||
TCHAR custom_left[256];
|
||||
TCHAR custom_right[256];
|
||||
TCHAR custom_a[256];
|
||||
TCHAR custom_b[256];
|
||||
TCHAR custom_x[256];
|
||||
TCHAR custom_y[256];
|
||||
TCHAR custom_l[256];
|
||||
TCHAR custom_r[256];
|
||||
TCHAR custom_play[256];
|
||||
|
||||
TCHAR open_gui[256];
|
||||
TCHAR quit_amiberry[256];
|
||||
#endif
|
||||
|
||||
#ifdef PANDORA
|
||||
int pandora_vertical_offset;
|
||||
int pandora_cpu_speed;
|
||||
int pandora_hide_idle_led;
|
||||
|
||||
int pandora_tapDelay;
|
||||
int pandora_customControls;
|
||||
#endif
|
||||
int pandora_vertical_offset;
|
||||
int pandora_cpu_speed;
|
||||
int pandora_hide_idle_led;
|
||||
|
||||
int pandora_tapDelay;
|
||||
#endif
|
||||
|
||||
/* input */
|
||||
|
||||
|
|
@ -460,44 +445,44 @@ int pandora_vertical_offset;
|
|||
int input_mouse_speed;
|
||||
int input_tablet;
|
||||
int input_keyboard_type;
|
||||
|
||||
bool amiberry_use_retroarch_quit;
|
||||
bool amiberry_use_retroarch_menu;
|
||||
bool amiberry_use_retroarch_reset;
|
||||
bool amiberry_use_retroarch_statebuttons;
|
||||
|
||||
/* ANDROID */
|
||||
bool amiberry_use_retroarch_quit;
|
||||
bool amiberry_use_retroarch_menu;
|
||||
bool amiberry_use_retroarch_reset;
|
||||
bool amiberry_use_retroarch_statebuttons;
|
||||
|
||||
/* ANDROID */
|
||||
#ifdef ANDROIDSDL
|
||||
int onScreen;
|
||||
int onScreen_textinput;
|
||||
int onScreen_dpad;
|
||||
int onScreen_button1;
|
||||
int onScreen_button2;
|
||||
int onScreen_button3;
|
||||
int onScreen_button4;
|
||||
int onScreen_button5;
|
||||
int onScreen_button6;
|
||||
int custom_position;
|
||||
int pos_x_textinput;
|
||||
int pos_y_textinput;
|
||||
int pos_x_dpad;
|
||||
int pos_y_dpad;
|
||||
int pos_x_button1;
|
||||
int pos_y_button1;
|
||||
int pos_x_button2;
|
||||
int pos_y_button2;
|
||||
int pos_x_button3;
|
||||
int pos_y_button3;
|
||||
int pos_x_button4;
|
||||
int pos_y_button4;
|
||||
int pos_x_button5;
|
||||
int pos_y_button5;
|
||||
int pos_x_button6;
|
||||
int pos_y_button6;
|
||||
int extfilter;
|
||||
int quickSwitch;
|
||||
int floatingJoystick;
|
||||
int disableMenuVKeyb;
|
||||
int onScreen;
|
||||
int onScreen_textinput;
|
||||
int onScreen_dpad;
|
||||
int onScreen_button1;
|
||||
int onScreen_button2;
|
||||
int onScreen_button3;
|
||||
int onScreen_button4;
|
||||
int onScreen_button5;
|
||||
int onScreen_button6;
|
||||
int custom_position;
|
||||
int pos_x_textinput;
|
||||
int pos_y_textinput;
|
||||
int pos_x_dpad;
|
||||
int pos_y_dpad;
|
||||
int pos_x_button1;
|
||||
int pos_y_button1;
|
||||
int pos_x_button2;
|
||||
int pos_y_button2;
|
||||
int pos_x_button3;
|
||||
int pos_y_button3;
|
||||
int pos_x_button4;
|
||||
int pos_y_button4;
|
||||
int pos_x_button5;
|
||||
int pos_y_button5;
|
||||
int pos_x_button6;
|
||||
int pos_y_button6;
|
||||
int extfilter;
|
||||
int quickSwitch;
|
||||
int floatingJoystick;
|
||||
int disableMenuVKeyb;
|
||||
#endif
|
||||
|
||||
struct uae_input_device joystick_settings[MAX_INPUT_SETTINGS][MAX_INPUT_DEVICES];
|
||||
|
|
|
|||
|
|
@ -57,15 +57,6 @@ static int doStylusRightClick;
|
|||
|
||||
extern void SetLastActiveConfig(const char* filename);
|
||||
|
||||
/* Keyboard */
|
||||
#ifdef USE_SDL1
|
||||
int customControlMap[SDLK_LAST];
|
||||
#endif
|
||||
|
||||
#ifdef USE_SDL2
|
||||
std::map<int, TCHAR[256]> customControlMap; // No SDLK_LAST. SDL2 migration guide suggests std::map
|
||||
#endif
|
||||
|
||||
char start_path_data[MAX_DPATH];
|
||||
char currentDir[MAX_DPATH];
|
||||
|
||||
|
|
@ -259,19 +250,6 @@ void target_default_options(struct uae_prefs* p, int type)
|
|||
p->fast_copper = 0;
|
||||
#endif
|
||||
|
||||
p->customControls = false;
|
||||
_tcscpy(p->custom_up, "");
|
||||
_tcscpy(p->custom_down, "");
|
||||
_tcscpy(p->custom_left, "");
|
||||
_tcscpy(p->custom_right, "");
|
||||
_tcscpy(p->custom_a, "");
|
||||
_tcscpy(p->custom_b, "");
|
||||
_tcscpy(p->custom_x, "");
|
||||
_tcscpy(p->custom_y, "");
|
||||
_tcscpy(p->custom_l, "");
|
||||
_tcscpy(p->custom_r, "");
|
||||
_tcscpy(p->custom_play, "");
|
||||
|
||||
p->picasso96_modeflags = RGBFF_CLUT | RGBFF_R5G6B5 | RGBFF_R8G8B8A8;
|
||||
|
||||
p->kbd_led_num = -1; // No status on numlock
|
||||
|
|
@ -326,10 +304,6 @@ void target_default_options(struct uae_prefs* p, int type)
|
|||
p->disableMenuVKeyb = 0;
|
||||
#endif
|
||||
|
||||
#ifdef USE_SDL1
|
||||
memset(customControlMap, 0, sizeof(customControlMap));
|
||||
#endif
|
||||
|
||||
p->cr[CHIPSET_REFRESH_PAL].locked = true;
|
||||
p->cr[CHIPSET_REFRESH_PAL].vsync = 1;
|
||||
|
||||
|
|
@ -377,19 +351,6 @@ void target_save_options(struct zfile* f, struct uae_prefs* p)
|
|||
cfgfile_write_bool(f, _T("amiberry_use_retroarch_menu"), p->amiberry_use_retroarch_menu);
|
||||
cfgfile_write_bool(f, _T("amiberry_use_retroarch_reset"), p->amiberry_use_retroarch_reset);
|
||||
|
||||
cfgfile_write_bool(f, "amiberry.custom_controls", p->customControls);
|
||||
cfgfile_write(f, "amiberry.custom_up", "%d", p->custom_up);
|
||||
cfgfile_write(f, "amiberry.custom_down", "%d", p->custom_down);
|
||||
cfgfile_write(f, "amiberry.custom_left", "%d", p->custom_left);
|
||||
cfgfile_write(f, "amiberry.custom_right", "%d", p->custom_right);
|
||||
cfgfile_write(f, "amiberry.custom_a", "%d", p->custom_a);
|
||||
cfgfile_write(f, "amiberry.custom_b", "%d", p->custom_b);
|
||||
cfgfile_write(f, "amiberry.custom_x", "%d", p->custom_x);
|
||||
cfgfile_write(f, "amiberry.custom_y", "%d", p->custom_y);
|
||||
cfgfile_write(f, "amiberry.custom_l", "%d", p->custom_l);
|
||||
cfgfile_write(f, "amiberry.custom_r", "%d", p->custom_r);
|
||||
cfgfile_write(f, "amiberry.custom_play", "%d", p->custom_play);
|
||||
|
||||
#ifdef ANDROIDSDL
|
||||
cfgfile_write(f, "pandora.onscreen", "%d", p->onScreen);
|
||||
cfgfile_write(f, "pandora.onscreen_textinput", "%d", p->onScreen_textinput);
|
||||
|
|
@ -512,31 +473,6 @@ int target_parse_option(struct uae_prefs* p, const char* option, const char* val
|
|||
return 1;
|
||||
if (cfgfile_string(option, value, "quit_amiberry", p->quit_amiberry, sizeof p->quit_amiberry))
|
||||
return 1;
|
||||
|
||||
if (cfgfile_yesno(option, value, "custom_controls", &p->customControls))
|
||||
return 1;
|
||||
if (cfgfile_string(option, value, "custom_up", p->custom_up, sizeof p->custom_up))
|
||||
return 1;
|
||||
if (cfgfile_string(option, value, "custom_down", p->custom_down, sizeof p->custom_down))
|
||||
return 1;
|
||||
if (cfgfile_string(option, value, "custom_left", p->custom_left, sizeof p->custom_left))
|
||||
return 1;
|
||||
if (cfgfile_string(option, value, "custom_right", p->custom_right, sizeof p->custom_right))
|
||||
return 1;
|
||||
if (cfgfile_string(option, value, "custom_a", p->custom_a, sizeof p->custom_a))
|
||||
return 1;
|
||||
if (cfgfile_string(option, value, "custom_b", p->custom_b, sizeof p->custom_b))
|
||||
return 1;
|
||||
if (cfgfile_string(option, value, "custom_x", p->custom_x, sizeof p->custom_x))
|
||||
return 1;
|
||||
if (cfgfile_string(option, value, "custom_y", p->custom_y, sizeof p->custom_y))
|
||||
return 1;
|
||||
if (cfgfile_string(option, value, "custom_l", p->custom_l, sizeof p->custom_l))
|
||||
return 1;
|
||||
if (cfgfile_string(option, value, "custom_r", p->custom_r, sizeof p->custom_r))
|
||||
return 1;
|
||||
if (cfgfile_string(option, value, "custom_play", p->custom_play, sizeof p->custom_play))
|
||||
return 1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -1142,23 +1078,6 @@ int main(int argc, char* argv[])
|
|||
return 0;
|
||||
}
|
||||
|
||||
#ifdef USE_SDL2
|
||||
void PopulateCustomControlMap()
|
||||
{
|
||||
strcpy(customControlMap[VK_UP], currprefs.custom_up);
|
||||
strcpy(customControlMap[VK_DOWN], currprefs.custom_down);
|
||||
strcpy(customControlMap[VK_LEFT], currprefs.custom_left);
|
||||
strcpy(customControlMap[VK_RIGHT], currprefs.custom_right);
|
||||
strcpy(customControlMap[VK_Green], currprefs.custom_a);
|
||||
strcpy(customControlMap[VK_Blue], currprefs.custom_b);
|
||||
strcpy(customControlMap[VK_Red], currprefs.custom_x);
|
||||
strcpy(customControlMap[VK_Yellow], currprefs.custom_y);
|
||||
strcpy(customControlMap[VK_LShoulder], currprefs.custom_l);
|
||||
strcpy(customControlMap[VK_RShoulder], currprefs.custom_r);
|
||||
strcpy(customControlMap[VK_Play], currprefs.custom_play);
|
||||
}
|
||||
#endif
|
||||
|
||||
int handle_msgpump()
|
||||
{
|
||||
int got = 0;
|
||||
|
|
@ -1169,10 +1088,7 @@ int handle_msgpump()
|
|||
if (delayed_mousebutton == 0)
|
||||
setmousebuttonstate(0, 0, 1);
|
||||
}
|
||||
#ifdef USE_SDL2
|
||||
if (currprefs.customControls)
|
||||
PopulateCustomControlMap();
|
||||
#endif
|
||||
|
||||
while (SDL_PollEvent(&rEvent))
|
||||
{
|
||||
got = 1;
|
||||
|
|
@ -1214,16 +1130,6 @@ int handle_msgpump()
|
|||
break;
|
||||
}
|
||||
#ifdef USE_SDL1
|
||||
/*}
|
||||
else
|
||||
{
|
||||
if (keystate[SDLK_LCTRL] && keystate[SDLK_LSUPER] && (keystate[SDLK_RSUPER] || keystate[SDLK_MENU]))
|
||||
{
|
||||
uae_reset(0, 1);
|
||||
break;
|
||||
}
|
||||
}*/
|
||||
|
||||
// fix Caps Lock keypress shown as SDLK_UNKNOWN (scancode = 58)
|
||||
if (rEvent.key.keysym.scancode == 58 && rEvent.key.keysym.sym == SDLK_UNKNOWN)
|
||||
rEvent.key.keysym.sym = SDLK_CAPSLOCK;
|
||||
|
|
@ -1269,55 +1175,12 @@ int handle_msgpump()
|
|||
}
|
||||
#endif
|
||||
default:
|
||||
if (currprefs.customControls)
|
||||
{
|
||||
#ifdef USE_SDL1
|
||||
keycode = customControlMap[rEvent.key.keysym.sym];
|
||||
#endif
|
||||
#ifdef USE_SDL2
|
||||
keycode = SDL_GetKeyFromName(customControlMap[rEvent.key.keysym.sym]);
|
||||
#endif
|
||||
if (keycode < 0)
|
||||
{
|
||||
// Simulate mouse or joystick
|
||||
SimulateMouseOrJoy(keycode, 1);
|
||||
break;
|
||||
}
|
||||
if (keycode > 0)
|
||||
{
|
||||
// Send mapped key press
|
||||
inputdevice_do_keyboard(keycode, 1);
|
||||
break;
|
||||
}
|
||||
}
|
||||
translate_amiberry_keys(rEvent.key.keysym.sym, 1);
|
||||
break;
|
||||
}
|
||||
break;
|
||||
|
||||
case SDL_KEYUP:
|
||||
if (currprefs.customControls)
|
||||
{
|
||||
#ifdef USE_SDL1
|
||||
keycode = customControlMap[rEvent.key.keysym.sym];
|
||||
#endif
|
||||
#ifdef USE_SDL2
|
||||
keycode = SDL_GetKeyFromName(customControlMap[rEvent.key.keysym.sym]);
|
||||
#endif
|
||||
if (keycode < 0)
|
||||
{
|
||||
// Simulate mouse or joystick
|
||||
SimulateMouseOrJoy(keycode, 0);
|
||||
break;
|
||||
}
|
||||
if (keycode > 0)
|
||||
{
|
||||
// Send mapped key release
|
||||
inputdevice_do_keyboard(keycode, 0);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
translate_amiberry_keys(rEvent.key.keysym.sym, 0);
|
||||
break;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue