mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-16 08:43:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Getting ready for an eventual XVideo driver.

Browse Source
This commit is contained in:
Themaister 2011-03-13 00:44:49 +01:00
parent 394de09907
commit bb79dbaa98
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
input/sdl.c
View File

@ -61,6 +61,8 @@ static void* sdl_input_init(void)
} }
} }
sdl->use_keyboard = true;
return sdl; return sdl;
} }
@ -141,7 +143,7 @@ static bool sdl_axis_pressed(sdl_input_t *sdl, int port_num, uint32_t joyaxis)
static bool sdl_is_pressed(sdl_input_t *sdl, int port_num, const struct snes_keybind *key) static bool sdl_is_pressed(sdl_input_t *sdl, int port_num, const struct snes_keybind *key)
{ {
if (sdl_key_pressed(key->key)) if (sdl->use_keyboard && sdl_key_pressed(key->key))
return true; return true;
if (sdl->joysticks[port_num] == NULL) if (sdl->joysticks[port_num] == NULL)
return false; return false;

1
input/ssnes_sdl_input.h
View File

@ -27,6 +27,7 @@ typedef struct sdl_input
unsigned num_buttons[MAX_PLAYERS]; unsigned num_buttons[MAX_PLAYERS];
unsigned num_hats[MAX_PLAYERS]; unsigned num_hats[MAX_PLAYERS];
unsigned num_joysticks; unsigned num_joysticks;
bool use_keyboard;
// A video driver could pre-init with the SDL driver and have it handle resizing events... // A video driver could pre-init with the SDL driver and have it handle resizing events...
bool *quitting; bool *quitting;