libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-28 18:50:29 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

Added support for using keyboards in the Retroarch menu and for mapping to gamepad keys.

Browse Source
This commit is contained in:
Diablodiab 2016-02-08 01:06:15 +01:00
parent cd578521e4
commit bdb9471d13
3 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
input/drivers/android_input.c
View File

@ -977,6 +977,7 @@ static void android_input_poll_input(void *data)
if (is_keyboard_id(id))
{
if (!predispatched) android_input_poll_event_type_keyboard(event, keycode, &handled);
android_input_poll_event_type_key(android_app, event, ANDROID_KEYBOARD_PORT, keycode, source, type_event, &handled);
}
else
android_input_poll_event_type_key(android_app,
@ -1110,7 +1111,10 @@ static int16_t android_input_state(void *data,
switch (device)
{
case RETRO_DEVICE_JOYPAD:
return input_joypad_pressed(android->joypad, port, binds[port], id);
return input_joypad_pressed(android->joypad, port, binds[port], id) ||
android_keyboard_port_input_pressed(binds[port],id);
case RETRO_DEVICE_KEYBOARD:
android_keyboard_port_input_pressed(binds[0],id);
case RETRO_DEVICE_ANALOG:
return input_joypad_analog(android->joypad, port, idx, id,
binds[port]);
@ -1156,6 +1160,9 @@ static bool android_input_key_pressed(void *data, int key)
android_input_t *android = (android_input_t*)data;
settings_t *settings = config_get_ptr();
if(android_keyboard_port_input_pressed(settings->input.binds[0],key))
return true;
if (input_joypad_pressed(android->joypad,
0, settings->input.binds[0], key))
return true;
@ -1198,6 +1205,7 @@ static uint64_t android_input_get_capabilities(void *data)
return
(1 << RETRO_DEVICE_JOYPAD) |
(1 << RETRO_DEVICE_KEYBOARD) |
(1 << RETRO_DEVICE_POINTER) |
(1 << RETRO_DEVICE_ANALOG);
}

14
input/drivers_keyboard/keyboard_event_android.c
View File

@ -21,7 +21,19 @@
#define MAX_KEYS ((LAST_KEYCODE + 7) / 8)
static uint8_t android_key_state[MAX_PADS][MAX_KEYS];
// First ports are used to keeping track of gamepad states. Last port is used for keyboard state
static uint8_t android_key_state[MAX_PADS+1][MAX_KEYS];
bool android_keyboard_port_input_pressed(const struct retro_keybind *binds, unsigned id)
{
if (id < RARCH_BIND_LIST_END)
{
const struct retro_keybind *bind = &binds[id];
unsigned bit = input_keymaps_translate_rk_to_keysym(binds[id].key);
return bind->valid && BIT_GET(android_key_state[ANDROID_KEYBOARD_PORT], bit);
}
return false;
}
bool android_keyboard_input_pressed(unsigned key)
{

4
input/drivers_keyboard/keyboard_event_android.h
View File

@ -135,6 +135,10 @@ enum {
#define MAX_PADS 8
#endif
#define ANDROID_KEYBOARD_PORT MAX_PADS
bool android_keyboard_port_input_pressed(const struct retro_keybind *binds, unsigned id);
bool android_keyboard_input_pressed(unsigned key);
uint8_t *android_keyboard_state_get(unsigned port);