Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "keyremap allow remaps to work when player is locked"

Browse source 
This reverts commit ea7b80dab0.

Reason for revert: Adding Context flags to the keyremap plugin

Change-Id: I056ca2c0ee27e6cc7946166cf52461efda0ee1fb
This commit is contained in:
William Wilgus 2022-12-31 11:00:15 -05:00
parent 484a79fcc0
commit 85410589d1
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
apps/action.c
View file

@ -594,6 +594,13 @@ static inline void action_code_lookup(action_last_t *last, action_cur_t *cur)
int context = cur->context; int context = cur->context;
cur->is_prebutton = false; cur->is_prebutton = false;
#ifdef HAVE_LOCKED_ACTIONS
/* This only applies to the first context, to allow locked contexts to
* specify a fall through to their non-locked version */
if (is_keys_locked())
context |= CONTEXT_LOCKED;
#endif
#ifndef DISABLE_ACTION_REMAP #ifndef DISABLE_ACTION_REMAP
/* attempt to look up the button in user supplied remap */ /* attempt to look up the button in user supplied remap */
if(last->key_remap && (context & CONTEXT_PLUGIN) == 0) if(last->key_remap && (context & CONTEXT_PLUGIN) == 0)
@ -625,13 +632,6 @@ static inline void action_code_lookup(action_last_t *last, action_cur_t *cur)
} }
#endif #endif
#ifdef HAVE_LOCKED_ACTIONS
/* This only applies to the first context, to allow locked contexts to
* specify a fall through to their non-locked version */
if (is_keys_locked())
context |= CONTEXT_LOCKED;
#endif
i = 0; i = 0;
action = ACTION_NONE; action = ACTION_NONE;
/* attempt to look up the button in the in-built keymaps */ /* attempt to look up the button in the in-built keymaps */