mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 21:32:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3298 from dalter/patch-1

Browse Source 
Fix imput in RetroArch menu
This commit is contained in:
Twinaphex 2016-07-31 17:09:28 +02:00 committed by GitHub
commit f27359f834
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
input/drivers/rwebinput_input.c
View File

@ -67,20 +67,19 @@ error:
return NULL;
}
static bool rwebinput_key_pressed(void *data, int key)
static bool rwebinput_key_pressed__(void *data, int key)
{
unsigned sym;
bool ret;
rwebinput_input_t *rwebinput = (rwebinput_input_t*)data;
if (key >= RETROK_LAST)
return false;
sym = input_keymaps_translate_rk_to_keysym((enum retro_key)key);
ret = rwebinput->state.keys[sym >> 3] & (1 << (sym & 7));
if (rwebinput->state.keys[sym >> 3] & (1 << (sym & 7)))
return true;
return false;
return ret;
}
static bool rwebinput_meta_key_pressed(void *data, int key)
@ -96,12 +95,18 @@ static bool rwebinput_is_pressed(rwebinput_input_t *rwebinput,
if (id < RARCH_BIND_LIST_END)
{
const struct retro_keybind *bind = &binds[id];
return bind->valid && rwebinput_key_pressed(rwebinput, binds[id].key);
return bind->valid && rwebinput_key_pressed__(rwebinput, binds[id].key);
}
return false;
}
static bool rwebinput_key_pressed(void *data, int key)
{
rwebinput_input_t *rwebinput = (rwebinput_input_t*)data;
settings_t *settings = config_get_ptr();
return rwebinput_is_pressed(rwebinput, settings->input.binds[0], key);
}
static int16_t rwebinput_mouse_state(rwebinput_input_t *rwebinput, unsigned id)
{
switch (id)