mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-15 14:42:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

(apple_input.c) Refactor away apple_key_pressed

Browse Source
This commit is contained in:
Twinaphex 2014-10-05 20:40:34 +02:00
parent 1ac12083d8
commit bf7e058068
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
input/apple_input.c
View File

@ -364,21 +364,14 @@ int32_t apple_input_find_any_axis(uint32_t port)
return 0;
}
static bool apple_key_pressed(apple_input_data_t *apple,
enum retro_key id)
{
if (id < RETROK_LAST)
return apple->keys[input_translate_rk_to_keysym((enum retro_key)id)];
return false;
}
static int16_t apple_input_is_pressed(apple_input_data_t *apple, unsigned port_num,
const struct retro_keybind *binds, unsigned id)
{
if (id < RARCH_BIND_LIST_END)
{
const struct retro_keybind *bind = &binds[id];
return bind->valid && apple_key_pressed(apple, bind->key);
unsigned bit = input_translate_rk_to_keysym(bind->key);
return bind->valid && apple->keys[bit];
}
return 0;
}
@ -489,7 +482,10 @@ static int16_t apple_input_state(void *data,
return input_joypad_analog(apple->joypad, port,
index, id, binds[port]);
case RETRO_DEVICE_KEYBOARD:
return apple_key_pressed(apple, id);
{
unsigned bit = input_translate_rk_to_keysym((enum retro_key)id);
return (id < RETROK_LAST) && apple->keys[bit];
}
case RETRO_DEVICE_MOUSE:
return apple_mouse_state(apple, id);
case RETRO_DEVICE_POINTER: