ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanups

This commit is contained in:
twinaphex 2017-06-07 00:10:39 +02:00
parent 604a558382
commit afd6a2bec5
1 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
input/drivers/wiiu_input.c
View File

@ -40,31 +40,44 @@ static KBDModifier keyboardModifier = 0x00;
static unsigned char keyboardCode = 0x00; static unsigned char keyboardCode = 0x00;
static KEYState keyboardState[256] = { KBD_WIIU_NULL }; static KEYState keyboardState[256] = { KBD_WIIU_NULL };
void kb_connection_callback(KBDKeyEvent *key) { typedef struct wiiu_input
{
bool blocked;
const input_device_driver_t *joypad;
} wiiu_input_t;
uint64_t lifecycle_state;
void kb_connection_callback(KBDKeyEvent *key)
{
keyboardChannel = keyboardChannel + (key->channel + 0x01); keyboardChannel = keyboardChannel + (key->channel + 0x01);
} }
void kb_disconnection_callback(KBDKeyEvent *key) { void kb_disconnection_callback(KBDKeyEvent *key)
{
keyboardChannel = keyboardChannel - (key->channel + 0x01); keyboardChannel = keyboardChannel - (key->channel + 0x01);
} }
void kb_key_callback(KBDKeyEvent *key) { void kb_key_callback(KBDKeyEvent *key)
{
uint16_t mod = 0;
unsigned code = 0;
keyboardModifier = key->modifier; keyboardModifier = key->modifier;
keyboardCode = key->scancode; keyboardCode = key->scancode;
bool pressed = false; bool pressed = false;
if (key->state > 0) if (key->state > 0)
{
pressed = true; pressed = true;
}
uint16_t mod = 0; code = input_keymaps_translate_keysym_to_rk(key->scancode);
unsigned code = input_keymaps_translate_keysym_to_rk(key->scancode);
keyboardState[code] = key->state; keyboardState[code] = key->state;
if (key->modifier & KBD_WIIU_SHIFT) if (key->modifier & KBD_WIIU_SHIFT)
mod |= RETROKMOD_SHIFT; mod |= RETROKMOD_SHIFT;
if (key->modifier & KBD_WIIU_CTRL) if (key->modifier & KBD_WIIU_CTRL)
mod |= RETROKMOD_CTRL; mod |= RETROKMOD_CTRL;
@ -84,14 +97,6 @@ void kb_key_callback(KBDKeyEvent *key) {
RETRO_DEVICE_KEYBOARD); RETRO_DEVICE_KEYBOARD);
} }
typedef struct wiiu_input
{
bool blocked;
const input_device_driver_t *joypad;
} wiiu_input_t;
uint64_t lifecycle_state;
static void wiiu_input_poll(void *data) static void wiiu_input_poll(void *data)
{ {
wiiu_input_t *wiiu = (wiiu_input_t*)data; wiiu_input_t *wiiu = (wiiu_input_t*)data;