ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reuse input_config_bind_map.

This commit is contained in:
Themaister 2013-09-30 18:08:47 +02:00
parent b4a648ca8a
commit 02cd05550e
5 changed files with 63 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/menu/menu_settings.c
View File

@ -503,7 +503,7 @@ int menu_set_settings(unsigned setting, unsigned action)
struct retro_keybind *target = &g_settings.input.binds[port][0]; struct retro_keybind *target = &g_settings.input.binds[port][0];
rgui->binds.begin = RGUI_SETTINGS_BIND_BEGIN; rgui->binds.begin = RGUI_SETTINGS_BIND_BEGIN;
rgui->binds.last = RGUI_SETTINGS_BIND_LAST; rgui->binds.last = RGUI_SETTINGS_BIND_LAST;
for (unsigned i = RGUI_SETTINGS_BIND_BEGIN; i < RGUI_SETTINGS_BIND_LAST; i++, target++) for (unsigned i = RGUI_SETTINGS_BIND_BEGIN; i <= RGUI_SETTINGS_BIND_LAST; i++, target++)
{ {
target->joykey = NO_BTN; target->joykey = NO_BTN;
target->joyaxis = AXIS_NONE; target->joyaxis = AXIS_NONE;

4
frontend/menu/rgui.c
View File

@ -540,7 +540,7 @@ static void rgui_settings_controller_populate_entries(rgui_handle_t *rgui)
rgui_list_push(rgui->selection_buf, "RGUI Menu Toggle", RGUI_SETTINGS_BIND_MENU_TOGGLE, 0); rgui_list_push(rgui->selection_buf, "RGUI Menu Toggle", RGUI_SETTINGS_BIND_MENU_TOGGLE, 0);
unsigned last = (driver.input && driver.input->set_keybinds) ? RGUI_SETTINGS_BIND_R3 : RGUI_SETTINGS_BIND_LAST; unsigned last = (driver.input && driver.input->set_keybinds) ? RGUI_SETTINGS_BIND_R3 : RGUI_SETTINGS_BIND_LAST;
for (unsigned i = RGUI_SETTINGS_BIND_BEGIN; i <= last; i++) for (unsigned i = RGUI_SETTINGS_BIND_BEGIN; i <= last; i++)
rgui_list_push(rgui->selection_buf, input_bind_to_str[i - RGUI_SETTINGS_BIND_BEGIN], i, 0); rgui_list_push(rgui->selection_buf, input_config_bind_map[i - RGUI_SETTINGS_BIND_BEGIN].desc, i, 0);
} }
// This only makes sense for PC so far. // This only makes sense for PC so far.
@ -552,7 +552,7 @@ static int rgui_custom_bind_iterate(rgui_handle_t *rgui, rgui_action_t action)
render_text(rgui); render_text(rgui);
char msg[256]; char msg[256];
snprintf(msg, sizeof(msg), "[%s] press joypad (RETURN to skip)", input_bind_to_str[rgui->binds.begin - RGUI_SETTINGS_BIND_BEGIN]); snprintf(msg, sizeof(msg), "[%s] press joypad (RETURN to skip)", input_config_bind_map[rgui->binds.begin - RGUI_SETTINGS_BIND_BEGIN].desc);
render_messagebox(rgui, msg); render_messagebox(rgui, msg);
struct rgui_bind_state binds = rgui->binds; struct rgui_bind_state binds = rgui->binds;

40
frontend/menu/rguidisp_bitmap.c
View File

@ -655,43 +655,8 @@ static void render_text(rgui_handle_t *rgui)
} }
else else
{ {
const struct retro_keybind *bind = &g_settings.input.binds[port][type - RGUI_SETTINGS_BIND_B]; const struct retro_keybind *bind = &g_settings.input.binds[port][type - RGUI_SETTINGS_BIND_BEGIN];
if (bind->joykey != NO_BTN) input_get_bind_string(type_str, bind, sizeof(type_str));
{
if (GET_HAT_DIR(bind->joykey))
{
const char *dir;
switch (GET_HAT_DIR(bind->joykey))
{
case HAT_UP_MASK: dir = "up"; break;
case HAT_DOWN_MASK: dir = "down"; break;
case HAT_LEFT_MASK: dir = "left"; break;
case HAT_RIGHT_MASK: dir = "right"; break;
default: dir = "?"; break;
}
snprintf(type_str, sizeof(type_str), "Hat #%u %s", (unsigned)GET_HAT(bind->joykey), dir);
}
else
snprintf(type_str, sizeof(type_str), "%u (btn)", (unsigned)bind->joykey);
}
else if (bind->joyaxis != AXIS_NONE)
{
unsigned axis = 0;
char dir = '\0';
if (AXIS_NEG_GET(bind->joyaxis) != AXIS_DIR_NONE)
{
dir = '-';
axis = AXIS_NEG_GET(bind->joyaxis);
}
else if (AXIS_POS_GET(bind->joyaxis) != AXIS_DIR_NONE)
{
dir = '+';
axis = AXIS_POS_GET(bind->joyaxis);
}
snprintf(type_str, sizeof(type_str), "%c%u (axis)", dir, axis);
}
else
strlcpy(type_str, "<default>", sizeof(type_str));
} }
break; break;
} }
@ -738,3 +703,4 @@ static void render_text(rgui_handle_t *rgui)
render_messagebox(rgui, message_queue); render_messagebox(rgui, message_queue);
#endif #endif
} }

129
input/input_common.c
View File

@ -642,6 +642,14 @@ enum retro_key input_translate_keysym_to_rk(unsigned sym)
return RETROK_UNKNOWN; return RETROK_UNKNOWN;
} }
const char *input_translate_rk_to_str(enum retro_key key)
{
for (unsigned i = 0; input_config_key_map[i].str; i++)
if (input_config_key_map[i].key == key)
return input_config_key_map[i].str;
return NULL;
}
unsigned input_translate_rk_to_keysym(enum retro_key key) unsigned input_translate_rk_to_keysym(enum retro_key key)
{ {
return rarch_keysym_lut[key]; return rarch_keysym_lut[key];
@ -672,12 +680,12 @@ const struct input_bind_map input_config_bind_map[RARCH_BIND_LIST_END_NULL] = {
DECLARE_BIND(right, RETRO_DEVICE_ID_JOYPAD_RIGHT, "Right D-pad"), DECLARE_BIND(right, RETRO_DEVICE_ID_JOYPAD_RIGHT, "Right D-pad"),
DECLARE_BIND(a, RETRO_DEVICE_ID_JOYPAD_A, "A button (right)"), DECLARE_BIND(a, RETRO_DEVICE_ID_JOYPAD_A, "A button (right)"),
DECLARE_BIND(x, RETRO_DEVICE_ID_JOYPAD_X, "X button (top)"), DECLARE_BIND(x, RETRO_DEVICE_ID_JOYPAD_X, "X button (top)"),
DECLARE_BIND(l, RETRO_DEVICE_ID_JOYPAD_L, "L button (left shoulder)"), DECLARE_BIND(l, RETRO_DEVICE_ID_JOYPAD_L, "L button (shoulder)"),
DECLARE_BIND(r, RETRO_DEVICE_ID_JOYPAD_R, "R button (right shoulder)"), DECLARE_BIND(r, RETRO_DEVICE_ID_JOYPAD_R, "R button (shoulder)"),
DECLARE_BIND(l2, RETRO_DEVICE_ID_JOYPAD_L2, "L2 button (left shoulder #2)"), DECLARE_BIND(l2, RETRO_DEVICE_ID_JOYPAD_L2, "L2 button (trigger)"),
DECLARE_BIND(r2, RETRO_DEVICE_ID_JOYPAD_R2, "R2 button (right shoulder #2)"), DECLARE_BIND(r2, RETRO_DEVICE_ID_JOYPAD_R2, "R2 button (trigger)"),
DECLARE_BIND(l3, RETRO_DEVICE_ID_JOYPAD_L3, "L3 button (left analog button)"), DECLARE_BIND(l3, RETRO_DEVICE_ID_JOYPAD_L3, "L3 button (thumb)"),
DECLARE_BIND(r3, RETRO_DEVICE_ID_JOYPAD_R3, "R3 button (right analog button)"), DECLARE_BIND(r3, RETRO_DEVICE_ID_JOYPAD_R3, "R3 button (thumb)"),
DECLARE_BIND(turbo, RARCH_TURBO_ENABLE, "Turbo enable"), DECLARE_BIND(turbo, RARCH_TURBO_ENABLE, "Turbo enable"),
DECLARE_BIND(l_x_plus, RARCH_ANALOG_LEFT_X_PLUS, "Left analog X+ (right)"), DECLARE_BIND(l_x_plus, RARCH_ANALOG_LEFT_X_PLUS, "Left analog X+ (right)"),
DECLARE_BIND(l_x_minus, RARCH_ANALOG_LEFT_X_MINUS, "Left analog X- (left)"), DECLARE_BIND(l_x_minus, RARCH_ANALOG_LEFT_X_MINUS, "Left analog X- (left)"),
@ -794,76 +802,45 @@ const struct input_key_map input_config_key_map[] = {
{ NULL, RETROK_UNKNOWN }, { NULL, RETROK_UNKNOWN },
}; };
const char *input_bind_to_str[] = { void input_get_bind_string(char *buf, const struct retro_keybind *bind, size_t size)
"B (down)", {
"Y (left)", if (bind->joykey != NO_BTN)
"Select", {
"Start", if (GET_HAT_DIR(bind->joykey))
"D-pad Up", {
"D-pad Down", const char *dir;
"D-pad Left", switch (GET_HAT_DIR(bind->joykey))
"D-pad Right", {
"A (right)", case HAT_UP_MASK: dir = "up"; break;
"X (top)", case HAT_DOWN_MASK: dir = "down"; break;
"L (trigger)", case HAT_LEFT_MASK: dir = "left"; break;
"R (trigger)", case HAT_RIGHT_MASK: dir = "right"; break;
"L2 (trigger)", default: dir = "?"; break;
"R2 (trigger)", }
"L3 (thumb)", snprintf(buf, size, "Hat #%u %s", (unsigned)GET_HAT(bind->joykey), dir);
"R3 (thumb)", }
"Left analog X+ (right)", else
"Left analog X- (left)", snprintf(buf, size, "%u (btn)", (unsigned)bind->joykey);
"Left analog Y+ (down)", }
"Left analog Y- (up)", else if (bind->joyaxis != AXIS_NONE)
"Right analog X+ (right)", {
"Right analog X- (left)", unsigned axis = 0;
"Right analog Y+ (down)", char dir = '\0';
"Right analog Y- (up)", if (AXIS_NEG_GET(bind->joyaxis) != AXIS_DIR_NONE)
#ifdef RARCH_CONSOLE {
"Left analog X D-pad left", dir = '-';
"Left analog X D-pad right", axis = AXIS_NEG_GET(bind->joyaxis);
"Left analog Y D-pad up", }
"Left analog Y D-pad down", else if (AXIS_POS_GET(bind->joyaxis) != AXIS_DIR_NONE)
"Right analog X D-pad left", {
"Right analog X D-pad right", dir = '+';
"Right analog Y D-pad up", axis = AXIS_POS_GET(bind->joyaxis);
"Right analog Y D-pad down", }
#endif snprintf(buf, size, "%c%u (axis)", dir, axis);
}
"Turbo enable", else
"Fast forward", strlcpy(buf, "<default>", size);
"Fast forward hold", }
"Load state",
"Save state",
"Fullscreen toggle",
"Quit RetroArch",
"State slot (+)",
"State slot (-)",
"Rewind",
"Movie record toggle",
"Pause toggle",
"Frame advance",
"Reset game",
"Next shader",
"Previous shader",
"Cheat index (+)",
"Cheat index (-)",
"Cheat toggle",
"Take screenshot",
"DSP plugin config",
"Mute audio",
"Netplay flip players",
"Slow motion",
"Hotkey enable",
"Volume (+)",
"Volume (-)",
"Next overlay",
"Disk eject toggle",
"Disk next",
"Grab mouse toggle",
"RGUI menu toggle",
};
static enum retro_key find_sk_bind(const char *str) static enum retro_key find_sk_bind(const char *str)
{ {

5
input/input_common.h
View File

@ -132,8 +132,10 @@ struct input_bind_map
const char *desc; const char *desc;
unsigned retro_key; unsigned retro_key;
}; };
extern const struct input_bind_map input_config_bind_map[]; extern const struct input_bind_map input_config_bind_map[];
extern const char *input_bind_to_str[];
void input_get_bind_string(char *buf, const struct retro_keybind *bind, size_t size);
struct input_key_map struct input_key_map
{ {
@ -141,6 +143,7 @@ struct input_key_map
enum retro_key key; enum retro_key key;
}; };
extern const struct input_key_map input_config_key_map[]; extern const struct input_key_map input_config_key_map[];
const char *input_translate_rk_to_str(enum retro_key key);
extern const char* const input_builtin_autoconfs[]; extern const char* const input_builtin_autoconfs[];