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

Merge pull request #2424 from Yogarine/master

Browse Source 
Fix rwebinput driver
This commit is contained in:
Twinaphex 2015-11-18 02:49:51 +01:00
commit 352a8acdf5
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
input/drivers/rwebinput_input.c
View File

@ -21,6 +21,7 @@
#include "../input_autodetect.h" #include "../input_autodetect.h"
#include "../input_common.h" #include "../input_common.h"
#include "../input_keymaps.h" #include "../input_keymaps.h"
//#include "../input_joypad.h"
#include "../../driver.h" #include "../../driver.h"
@ -102,13 +103,6 @@ static bool rwebinput_is_pressed(rwebinput_input_t *rwebinput,
return false; 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) static int16_t rwebinput_mouse_state(rwebinput_input_t *rwebinput, unsigned id)
{ {
switch (id) switch (id)
@ -146,7 +140,6 @@ static int16_t rwebinput_analog_pressed(rwebinput_input_t *rwebinput,
static int16_t rwebinput_input_state(void *data, const struct retro_keybind **binds, static int16_t rwebinput_input_state(void *data, const struct retro_keybind **binds,
unsigned port, unsigned device, unsigned idx, unsigned id) unsigned port, unsigned device, unsigned idx, unsigned id)
{ {
enum input_device_type device = INPUT_DEVICE_TYPE_NONE;
rwebinput_input_t *rwebinput = (rwebinput_input_t*)data; rwebinput_input_t *rwebinput = (rwebinput_input_t*)data;
switch (device) switch (device)
@ -158,7 +151,7 @@ static int16_t rwebinput_input_state(void *data, const struct retro_keybind **bi
return rwebinput_analog_pressed(rwebinput, binds[port], idx, id); return rwebinput_analog_pressed(rwebinput, binds[port], idx, id);
case RETRO_DEVICE_KEYBOARD: case RETRO_DEVICE_KEYBOARD:
return rwebinput_key_pressed(rwebinput, id, &device); return rwebinput_key_pressed(rwebinput, id);
case RETRO_DEVICE_MOUSE: case RETRO_DEVICE_MOUSE:
return rwebinput_mouse_state(rwebinput, id); return rwebinput_mouse_state(rwebinput, id);