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

(input_driver.c) Small cleanups

This commit is contained in:
LibretroAdmin 2022-10-29 18:52:10 +02:00
parent 91d7f5970b
commit 4854643ead
2 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
input/input_driver.c
View File

@ -5664,7 +5664,6 @@ static const char *accessibility_lut_name(char key)
void input_keyboard_event(bool down, unsigned code, void input_keyboard_event(bool down, unsigned code,
uint32_t character, uint16_t mod, unsigned device) uint32_t character, uint16_t mod, unsigned device)
{ {
static bool deferred_wait_keys;
runloop_state_t *runloop_st = runloop_state_get_ptr(); runloop_state_t *runloop_st = runloop_state_get_ptr();
retro_keyboard_event_t retro_keyboard_event_t
*key_event = &runloop_st->key_event; *key_event = &runloop_st->key_event;
@ -5698,9 +5697,9 @@ void input_keyboard_event(bool down, unsigned code,
* is active */ * is active */
if (menu_st->flags & MENU_ST_FLAG_SCREENSAVER_ACTIVE) if (menu_st->flags & MENU_ST_FLAG_SCREENSAVER_ACTIVE)
{ {
if (down && if ( (down)
(code != RETROK_UNKNOWN) && && (code != RETROK_UNKNOWN)
(menu_input_dialog_get_display_kb() || && (menu_input_dialog_get_display_kb() ||
!((code == RETROK_SPACE) || /* RETRO_DEVICE_ID_JOYPAD_START */ !((code == RETROK_SPACE) || /* RETRO_DEVICE_ID_JOYPAD_START */
(code == RETROK_SLASH) || /* RETRO_DEVICE_ID_JOYPAD_X */ (code == RETROK_SLASH) || /* RETRO_DEVICE_ID_JOYPAD_X */
(code == RETROK_RSHIFT) || /* RETRO_DEVICE_ID_JOYPAD_SELECT */ (code == RETROK_RSHIFT) || /* RETRO_DEVICE_ID_JOYPAD_SELECT */
@ -5710,7 +5709,7 @@ void input_keyboard_event(bool down, unsigned code,
(code == RETROK_UP) || /* RETRO_DEVICE_ID_JOYPAD_UP */ (code == RETROK_UP) || /* RETRO_DEVICE_ID_JOYPAD_UP */
(code == RETROK_PAGEUP) || /* RETRO_DEVICE_ID_JOYPAD_L */ (code == RETROK_PAGEUP) || /* RETRO_DEVICE_ID_JOYPAD_L */
(code == RETROK_PAGEDOWN) || /* RETRO_DEVICE_ID_JOYPAD_R */ (code == RETROK_PAGEDOWN) || /* RETRO_DEVICE_ID_JOYPAD_R */
(code == RETROK_BACKSPACE) || /* RETRO_DEVICE_ID_JOYPAD_B */ (code == RETROK_BACKSPACE)|| /* RETRO_DEVICE_ID_JOYPAD_B */
(code == RETROK_RETURN) || /* RETRO_DEVICE_ID_JOYPAD_A */ (code == RETROK_RETURN) || /* RETRO_DEVICE_ID_JOYPAD_A */
(code == RETROK_DELETE) || /* RETRO_DEVICE_ID_JOYPAD_Y */ (code == RETROK_DELETE) || /* RETRO_DEVICE_ID_JOYPAD_Y */
BIT512_GET(input_st->keyboard_mapping_bits, code)))) BIT512_GET(input_st->keyboard_mapping_bits, code))))
@ -5740,7 +5739,7 @@ void input_keyboard_event(bool down, unsigned code,
if (say_char) if (say_char)
{ {
char c = (char) character; char c = (char)character;
*say_char = c; *say_char = c;
say_char[1] = '\0'; say_char[1] = '\0';
@ -5752,7 +5751,6 @@ void input_keyboard_event(bool down, unsigned code,
else else
{ {
const char *lut_name = accessibility_lut_name(c); const char *lut_name = accessibility_lut_name(c);
if (lut_name) if (lut_name)
accessibility_speak_priority( accessibility_speak_priority(
accessibility_enable, accessibility_enable,
@ -5771,15 +5769,15 @@ void input_keyboard_event(bool down, unsigned code,
#endif #endif
#endif #endif
if (deferred_wait_keys) if (input_st->flags & INP_FLAG_DEFERRED_WAIT_KEYS)
{ {
if (down) if (down)
return; return;
input_st->keyboard_press_cb = NULL; input_st->keyboard_press_cb = NULL;
input_st->keyboard_press_data = NULL; input_st->keyboard_press_data = NULL;
input_st->flags &= ~INP_FLAG_KB_MAPPING_BLOCKED; input_st->flags &= ~(INP_FLAG_KB_MAPPING_BLOCKED
deferred_wait_keys = false; | INP_FLAG_DEFERRED_WAIT_KEYS
);
} }
else if (input_st->keyboard_press_cb) else if (input_st->keyboard_press_cb)
{ {
@ -5787,7 +5785,7 @@ void input_keyboard_event(bool down, unsigned code,
return; return;
if (input_st->keyboard_press_cb(input_st->keyboard_press_data, code)) if (input_st->keyboard_press_cb(input_st->keyboard_press_data, code))
return; return;
deferred_wait_keys = true; input_st->flags |= INP_FLAG_DEFERRED_WAIT_KEYS;
} }
else if (input_st->keyboard_line.enabled) else if (input_st->keyboard_line.enabled)
{ {
@ -5839,9 +5837,9 @@ void input_keyboard_event(bool down, unsigned code,
if (!(MAPPER_GET_KEY(handle, code)) && if (!(MAPPER_GET_KEY(handle, code)) &&
!(!hotkey_pressed && ( !(!hotkey_pressed && (
hotkey.key != RETROK_UNKNOWN || (hotkey.key != RETROK_UNKNOWN)
hotkey.joykey != NO_BTN || || (hotkey.joykey != NO_BTN)
hotkey.joyaxis != AXIS_NONE || (hotkey.joyaxis != AXIS_NONE)
))) )))
return; return;
} }

3
input/input_driver.h
View File

@ -391,7 +391,8 @@ enum input_driver_state_flags
INP_FLAG_GRAB_MOUSE_STATE = (1 << 6), INP_FLAG_GRAB_MOUSE_STATE = (1 << 6),
INP_FLAG_OLD_ANALOG_DPAD_MODE_SET = (1 << 7), INP_FLAG_OLD_ANALOG_DPAD_MODE_SET = (1 << 7),
INP_FLAG_OLD_LIBRETRO_DEVICE_SET = (1 << 8), INP_FLAG_OLD_LIBRETRO_DEVICE_SET = (1 << 8),
INP_FLAG_REMAPPING_CACHE_ACTIVE = (1 << 9) INP_FLAG_REMAPPING_CACHE_ACTIVE = (1 << 9),
INP_FLAG_DEFERRED_WAIT_KEYS = (1 << 10)
}; };
typedef struct typedef struct