ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tweaks: rename two parameters, to be more general and to sound shorter

master
Benno Schulenberg 2020-02-04 17:31:15 +01:00
parent 07a9477213
commit 04738996fc
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/global.c
View File

@ -446,22 +446,22 @@ size_t shown_entries_for(int menu)
} }
/* Return the first shortcut in the current menu that matches the given input. */ /* Return the first shortcut in the current menu that matches the given input. */
const keystruct *get_shortcut(int *kbinput) const keystruct *get_shortcut(int *keycode)
{ {
/* Plain characters and upper control codes cannot be shortcuts. */ /* Plain characters and upper control codes cannot be shortcuts. */
if (!meta_key && 0x20 <= *kbinput && *kbinput <= 0xFF) if (!meta_key && 0x20 <= *keycode && *keycode <= 0xFF)
return NULL; return NULL;
/* Lower control codes with Meta cannot be shortcuts either. */ /* Lower control codes with Meta cannot be shortcuts either. */
if (meta_key && *kbinput < 0x20) if (meta_key && *keycode < 0x20)
return NULL; return NULL;
/* During a paste at a prompt, ignore all command keycodes. */ /* During a paste at a prompt, ignore all command keycodes. */
if (bracketed_paste && *kbinput != BRACKETED_PASTE_MARKER) if (bracketed_paste && *keycode != BRACKETED_PASTE_MARKER)
return NULL; return NULL;
for (keystruct *sc = sclist; sc != NULL; sc = sc->next) { for (keystruct *sc = sclist; sc != NULL; sc = sc->next) {
if ((sc->menus & currmenu) && *kbinput == sc->keycode) if ((sc->menus & currmenu) && *keycode == sc->keycode)
return sc; return sc;
} }
@ -469,9 +469,9 @@ const keystruct *get_shortcut(int *kbinput)
} }
/* Return a pointer to the function that is bound to the given key. */ /* Return a pointer to the function that is bound to the given key. */
functionptrtype func_from_key(int *kbinput) functionptrtype func_from_key(int *keycode)
{ {
const keystruct *sc = get_shortcut(kbinput); const keystruct *sc = get_shortcut(keycode);
return (sc) ? sc->func : NULL; return (sc) ? sc->func : NULL;
} }