mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-19 12:41:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

(RARCH_CONSOLE) Remove DECREMENT_BIND/INCREMENT_BIND

Browse Source
This commit is contained in:
twinaphex 2013-10-06 20:01:44 +00:00
parent eba3eabe0a
commit fd053086ef
8 changed files with 0 additions and 210 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
blackberry-qnx/qnx_input.c
View File

@ -646,46 +646,6 @@ static void qnx_input_set_keybinds(void *data, unsigned device, unsigned port,
(void)device;
if (keybind_action & (1ULL << KEYBINDS_ACTION_DECREMENT_BIND))
{
if (joykey == NO_BTN)
*key = platform_keys[arr_size - 1].joykey;
else if (platform_keys[0].joykey == joykey)
*key = NO_BTN;
else
{
*key = NO_BTN;
for (size_t i = 1; i < arr_size; i++)
{
if (platform_keys[i].joykey == joykey)
{
*key = platform_keys[i - 1].joykey;
break;
}
}
}
}
if (keybind_action & (1ULL << KEYBINDS_ACTION_INCREMENT_BIND))
{
if (joykey == NO_BTN)
*key = platform_keys[0].joykey;
else if (platform_keys[arr_size - 1].joykey == joykey)
*key = NO_BTN;
else
{
*key = NO_BTN;
for (size_t i = 0; i < arr_size - 1; i++)
{
if (platform_keys[i].joykey == joykey)
{
*key = platform_keys[i + 1].joykey;
break;
}
}
}
}
if (keybind_action & (1ULL << KEYBINDS_ACTION_SET_DEFAULT_BIND))
*key = g_settings.input.binds[port][id].def_joykey;
#endif

2
driver.h
View File

@ -302,8 +302,6 @@ enum analog_dpad_bind_enums
enum keybind_set_id
{
KEYBINDS_ACTION_NONE = 0,
KEYBINDS_ACTION_DECREMENT_BIND,
KEYBINDS_ACTION_INCREMENT_BIND,
KEYBINDS_ACTION_SET_DEFAULT_BIND,
KEYBINDS_ACTION_SET_DEFAULT_BINDS,
KEYBINDS_ACTION_SET_ANALOG_DPAD_NONE,

4
frontend/menu/menu_settings.c
View File

@ -509,10 +509,6 @@ int menu_set_settings(unsigned setting, unsigned action)
if (action == RGUI_ACTION_START)
keybind_action = (1ULL << KEYBINDS_ACTION_SET_DEFAULT_BIND);
else if (action == RGUI_ACTION_LEFT)
keybind_action = (1ULL << KEYBINDS_ACTION_DECREMENT_BIND);
else if (action == RGUI_ACTION_RIGHT)
keybind_action = (1ULL << KEYBINDS_ACTION_INCREMENT_BIND);
// FIXME: The array indices here look totally wrong ... Fixed it so it looks kind of sane for now.
if (keybind_action != KEYBINDS_ACTION_NONE)

7
frontend/menu/rmenu.c
View File

@ -658,13 +658,6 @@ static void set_keybind_digital(unsigned default_retro_joypad_id, uint64_t actio
switch (action)
{
case RGUI_ACTION_LEFT:
keybind_action = (1ULL << KEYBINDS_ACTION_DECREMENT_BIND);
break;
case RGUI_ACTION_RIGHT:
case RGUI_ACTION_OK:
keybind_action = (1ULL << KEYBINDS_ACTION_INCREMENT_BIND);
break;
case RGUI_ACTION_START:
keybind_action = (1ULL << KEYBINDS_ACTION_SET_DEFAULT_BIND);
break;

37
frontend/menu/rmenu_xui.cpp
View File

@ -618,43 +618,6 @@ HRESULT CRetroArchControls::OnControlNavigate(
case SETTING_CONTROLS_DEFAULT_ALL:
break;
default:
if (action == RGUI_ACTION_LEFT)
{
struct platform_bind key_label;
strlcpy(key_label.desc, "Unknown", sizeof(key_label.desc));
key_label.joykey = g_settings.input.binds[rgui->current_pad][current_index].joykey;
if (driver.input->set_keybinds)
driver.input->set_keybinds(&key_label, 0, 0, 0, (1ULL << KEYBINDS_ACTION_GET_BIND_LABEL));
if (driver.input->set_keybinds)
driver.input->set_keybinds(driver.input_data, g_settings.input.device[rgui->current_pad],
rgui->current_pad, current_index, (1ULL << KEYBINDS_ACTION_DECREMENT_BIND));
snprintf(button, sizeof(button), "%s #%d: %s",
g_settings.input.binds[rgui->current_pad][current_index].desc,
rgui->current_pad, key_label.desc);
mbstowcs(strw_buffer, button, sizeof(strw_buffer) / sizeof(wchar_t));
XuiListSetText(m_menulist, current_index, strw_buffer);
}
else if (action == RGUI_ACTION_RIGHT)
{
struct platform_bind key_label;
strlcpy(key_label.desc, "Unknown", sizeof(key_label.desc));
key_label.joykey = g_settings.input.binds[rgui->current_pad][current_index].joykey;
if (driver.input->set_keybinds)
driver.input->set_keybinds(&key_label, 0, 0, 0, (1ULL << KEYBINDS_ACTION_GET_BIND_LABEL));
if (driver.input->set_keybinds)
driver.input->set_keybinds(driver.input_data, g_settings.input.device[rgui->current_pad],
rgui->current_pad, current_index, (1ULL << KEYBINDS_ACTION_INCREMENT_BIND));
snprintf(button, sizeof(button), "%s #%d: %s",
g_settings.input.binds[rgui->current_pad][current_index].desc, rgui->current_pad,
key_label.desc);
mbstowcs(strw_buffer, button, sizeof(strw_buffer) / sizeof(wchar_t));
XuiListSetText(m_menulist, current_index, strw_buffer);
}
break;
}

40
gx/gx_input.c
View File

@ -185,46 +185,6 @@ static void gx_input_set_keybinds(void *data, unsigned device, unsigned port,
(void)device;
if (keybind_action & (1ULL << KEYBINDS_ACTION_DECREMENT_BIND))
{
if (joykey == NO_BTN)
*key = platform_keys[arr_size - 1].joykey;
else if (platform_keys[0].joykey == joykey)
*key = NO_BTN;
else
{
*key = NO_BTN;
for (size_t i = 1; i < arr_size; i++)
{
if (platform_keys[i].joykey == joykey)
{
*key = platform_keys[i - 1].joykey;
break;
}
}
}
}
if (keybind_action & (1ULL << KEYBINDS_ACTION_INCREMENT_BIND))
{
if (joykey == NO_BTN)
*key = platform_keys[0].joykey;
else if (platform_keys[arr_size - 1].joykey == joykey)
*key = NO_BTN;
else
{
*key = NO_BTN;
for (size_t i = 0; i < arr_size - 1; i++)
{
if (platform_keys[i].joykey == joykey)
{
*key = platform_keys[i + 1].joykey;
break;
}
}
}
}
if (keybind_action & (1ULL << KEYBINDS_ACTION_SET_DEFAULT_BIND))
*key = g_settings.input.binds[port][id].def_joykey;

40
ps3/ps3_input.c
View File

@ -345,46 +345,6 @@ static void ps3_input_set_keybinds(void *data, unsigned device,
(void)device;
if (keybind_action & (1ULL << KEYBINDS_ACTION_DECREMENT_BIND))
{
if (joykey == NO_BTN)
*key = platform_keys[arr_size - 1].joykey;
else if (platform_keys[0].joykey == joykey)
*key = NO_BTN;
else
{
*key = NO_BTN;
for (size_t i = 1; i < arr_size; i++)
{
if (platform_keys[i].joykey == joykey)
{
*key = platform_keys[i - 1].joykey;
break;
}
}
}
}
if (keybind_action & (1ULL << KEYBINDS_ACTION_INCREMENT_BIND))
{
if (joykey == NO_BTN)
*key = platform_keys[0].joykey;
else if (platform_keys[arr_size - 1].joykey == joykey)
*key = NO_BTN;
else
{
*key = NO_BTN;
for (size_t i = 0; i < arr_size - 1; i++)
{
if (platform_keys[i].joykey == joykey)
{
*key = platform_keys[i + 1].joykey;
break;
}
}
}
}
if (keybind_action & (1ULL << KEYBINDS_ACTION_SET_DEFAULT_BIND))
*key = g_settings.input.binds[port][id].def_joykey;

40
xdk/xdk_xinput_input.c
View File

@ -218,46 +218,6 @@ static void xdk_input_set_keybinds(void *data, unsigned device,
(void)device;
if (keybind_action & (1ULL << KEYBINDS_ACTION_DECREMENT_BIND))
{
if (joykey == NO_BTN)
*key = platform_keys[arr_size - 1].joykey;
else if (platform_keys[0].joykey == joykey)
*key = NO_BTN;
else
{
*key = NO_BTN;
for (size_t i = 1; i < arr_size; i++)
{
if (platform_keys[i].joykey == joykey)
{
*key = platform_keys[i - 1].joykey;
break;
}
}
}
}
if (keybind_action & (1ULL << KEYBINDS_ACTION_INCREMENT_BIND))
{
if (joykey == NO_BTN)
*key = platform_keys[0].joykey;
else if (platform_keys[arr_size - 1].joykey == joykey)
*key = NO_BTN;
else
{
*key = NO_BTN;
for (size_t i = 0; i < arr_size - 1; i++)
{
if (platform_keys[i].joykey == joykey)
{
*key = platform_keys[i + 1].joykey;
break;
}
}
}
}
if (keybind_action & (1ULL << KEYBINDS_ACTION_SET_DEFAULT_BIND))
*key = g_settings.input.binds[port][id].def_joykey;