From 45579376f0c3f8915ce2daddf2726502ace92435 Mon Sep 17 00:00:00 2001 From: Themaister Date: Sun, 12 Aug 2012 10:01:35 +0200 Subject: [PATCH] Add exception for RETRO_DEVICE_KEYBOARD in input_state callback. --- libretro-test/libretro-test.c | 3 +++ retroarch.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libretro-test/libretro-test.c b/libretro-test/libretro-test.c index f2a9abc931..ff6eef5a54 100644 --- a/libretro-test/libretro-test.c +++ b/libretro-test/libretro-test.c @@ -119,6 +119,9 @@ static void update_input(void) if (input_state_cb(0, RETRO_DEVICE_KEYBOARD, 0, RETROK_RETURN)) 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_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; diff --git a/retroarch.c b/retroarch.c index 3db08f4da5..78f67b615d 100644 --- a/retroarch.c +++ b/retroarch.c @@ -459,7 +459,7 @@ static int16_t input_state(unsigned port, unsigned device, unsigned index, unsig }; 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); #ifdef HAVE_BSV_MOVIE