simplify the key-interpreting logic in get_shortcut()

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2017 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

simplify the key-interpreting logic in get_shortcut()
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2017 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
9abd1d18 · David Lawrence Ramsey · 7975408f · 9abd1d18
Commit 9abd1d18 authored 20 years ago by David Lawrence Ramsey
Hide whitespace changes
Inline Side-by-side

Showing

with 4 additions and 6 deletions
+4 -6
--- a/src/winio.c
+++ b/src/winio.c
@@ -1415,12 +1415,10 @@ const shortcut *get_shortcut(const shortcut *s_list, int kbinput, bool
 	 * 4. func_key is TRUE and the key is a function key in the
 	 *    shortcut list. */
-	if (kbinput != NANO_NO_KEY && ((*meta_key == FALSE &&
+	if (kbinput != NANO_NO_KEY && kbinput == s->ctrlval ||
-		*func_key == FALSE && kbinput == s->ctrlval) ||
+		(*meta_key == TRUE && (kbinput == s->metaval ||
-		(*meta_key == TRUE && *func_key == FALSE &&
+		kbinput == s->miscval)) || (*func_key == TRUE &&
-		(kbinput == s->metaval || kbinput == s->miscval)) ||
+		kbinput == s->funcval)) {
-		(*meta_key == FALSE && *func_key == TRUE &&
-		kbinput == s->funcval))) {
 	    break;
 	}