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

Add exception for RETRO_DEVICE_KEYBOARD in input_state callback.

Browse Source
This commit is contained in:
Themaister 2012-08-12 10:01:35 +02:00
parent 1b6b313787
commit 45579376f0
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libretro-test/libretro-test.c
View File

@ -119,6 +119,9 @@ static void update_input(void)
if (input_state_cb(0, RETRO_DEVICE_KEYBOARD, 0, RETROK_RETURN)) if (input_state_cb(0, RETRO_DEVICE_KEYBOARD, 0, RETROK_RETURN))
fprintf(stderr, "Return key is pressed!\n"); fprintf(stderr, "Return key is pressed!\n");
if (input_state_cb(0, RETRO_DEVICE_KEYBOARD, 0, RETROK_x))
fprintf(stderr, "x key is pressed!\n");
dir_x += input_state_cb(0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_X) / 2000; dir_x += input_state_cb(0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_X) / 2000;
dir_y += input_state_cb(0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_Y) / 2000; dir_y += input_state_cb(0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_Y) / 2000;
//dir_x += input_state_cb(0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_X) / 2000; //dir_x += input_state_cb(0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_X) / 2000;

2
retroarch.c
View File

@ -459,7 +459,7 @@ static int16_t input_state(unsigned port, unsigned device, unsigned index, unsig
}; };
int16_t res = 0; int16_t res = 0;
if (id < RARCH_FIRST_META_KEY) if (id < RARCH_FIRST_META_KEY || device == RETRO_DEVICE_KEYBOARD)
res = input_input_state_func(binds, port, device, index, id); res = input_input_state_func(binds, port, device, index, id);
#ifdef HAVE_BSV_MOVIE #ifdef HAVE_BSV_MOVIE