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

Fixes 'block hotkey enable'

This commit is contained in:
twinaphex 2014-09-18 04:04:33 +02:00
parent 4eb80db8de
commit f16a065cdd
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
driver.h
View File

@ -667,8 +667,6 @@ extern menu_ctx_driver_t menu_ctx_lakka;
extern menu_ctx_driver_backend_t menu_ctx_backend_common; extern menu_ctx_driver_backend_t menu_ctx_backend_common;
extern menu_ctx_driver_backend_t menu_ctx_backend_lakka; extern menu_ctx_driver_backend_t menu_ctx_backend_lakka;
#define check_block_hotkey_func(input) rarch_check_block_hotkey(BIND_PRESSED(input, RARCH_ENABLE_HOTKEY))
#define check_netplay_flip_func(trigger_input) check_netplay_flip(BIND_PRESSED(trigger_input, RARCH_NETPLAY_FLIP), BIND_PRESSED(trigger_input, RARCH_FULLSCREEN_TOGGLE_KEY)) #define check_netplay_flip_func(trigger_input) check_netplay_flip(BIND_PRESSED(trigger_input, RARCH_NETPLAY_FLIP), BIND_PRESSED(trigger_input, RARCH_FULLSCREEN_TOGGLE_KEY))
#define check_overlay_func(input, old_input) rarch_check_overlay(BIND_PRESSED(input, RARCH_OVERLAY_NEXT), BIND_PRESSED(old_input, RARCH_OVERLAY_NEXT)) #define check_overlay_func(input, old_input) rarch_check_overlay(BIND_PRESSED(input, RARCH_OVERLAY_NEXT), BIND_PRESSED(old_input, RARCH_OVERLAY_NEXT))
#define check_oneshot_func(trigger_input) check_oneshot(BIND_PRESSED(trigger_input, RARCH_FRAMEADVANCE), BIND_PRESSED(trigger_input, RARCH_REWIND)) #define check_oneshot_func(trigger_input) check_oneshot(BIND_PRESSED(trigger_input, RARCH_FRAMEADVANCE), BIND_PRESSED(trigger_input, RARCH_REWIND))

2
frontend/menu/menu_common.c
View File

@ -324,8 +324,6 @@ bool menu_iterate(void)
RARCH_BIND_LIST_END, &old_state); RARCH_BIND_LIST_END, &old_state);
trigger_input = input & ~old_state; trigger_input = input & ~old_state;
check_block_hotkey_func(input);
#ifdef HAVE_OVERLAY #ifdef HAVE_OVERLAY
if (BIND_PRESSED(trigger_input, RARCH_OVERLAY_NEXT)) if (BIND_PRESSED(trigger_input, RARCH_OVERLAY_NEXT))
input_overlay_next(driver.overlay); input_overlay_next(driver.overlay);

7
input/input_common.h
View File

@ -18,6 +18,7 @@
#include "../driver.h" #include "../driver.h"
#include "../conf/config_file.h" #include "../conf/config_file.h"
#include "../general.h"
#include <stdint.h> #include <stdint.h>
#ifdef __cplusplus #ifdef __cplusplus
@ -196,7 +197,6 @@ void input_push_analog_dpad(struct retro_keybind *binds, unsigned mode);
void input_pop_analog_dpad(struct retro_keybind *binds); void input_pop_analog_dpad(struct retro_keybind *binds);
/* Returns a 64-bit mask of all pressed buttons, starting /* Returns a 64-bit mask of all pressed buttons, starting
* from the specified key up until the last queryable key * from the specified key up until the last queryable key
* (key_end). * (key_end).
@ -213,6 +213,11 @@ static inline retro_input_t input_keys_pressed_func(unsigned key,
retro_input_t ret = 0; retro_input_t ret = 0;
*old_state = old_ret; *old_state = old_ret;
#ifdef RARCH_INTERNAL
rarch_check_block_hotkey(driver.input->key_pressed(driver.input_data,
RARCH_ENABLE_HOTKEY));
#endif
for (; key < key_end; key++) for (; key < key_end; key++)
{ {
bool state = false; bool state = false;

2
retroarch.c
View File

@ -2783,8 +2783,6 @@ static void do_state_checks(
retro_input_t input, retro_input_t old_input, retro_input_t input, retro_input_t old_input,
retro_input_t trigger_input) retro_input_t trigger_input)
{ {
check_block_hotkey_func(input);
if (BIND_PRESSED(trigger_input, RARCH_SCREENSHOT)) if (BIND_PRESSED(trigger_input, RARCH_SCREENSHOT))
rarch_main_command(RARCH_CMD_TAKE_SCREENSHOT); rarch_main_command(RARCH_CMD_TAKE_SCREENSHOT);