tweaks: use three switches instead of cascading ifs, for brevity

master
Benno Schulenberg 2020-07-22 10:51:20 +02:00
parent 832037e2ec
commit 93b2877758
1 changed files with 23 additions and 34 deletions

View File

@ -1139,48 +1139,37 @@ int parse_kbinput(WINDOW *win)
} }
/* Is Alt being held? */ /* Is Alt being held? */
if (modifiers == 0x08) { if (modifiers == 0x08) {
if (retval == KEY_DC) switch (retval) {
return ALT_DELETE; case KEY_UP: return ALT_UP;
if (retval == KEY_UP) case KEY_DOWN: return ALT_DOWN;
return ALT_UP; case KEY_PPAGE: return ALT_PAGEUP;
if (retval == KEY_DOWN) case KEY_NPAGE: return ALT_PAGEDOWN;
return ALT_DOWN; case KEY_DC: return ALT_DELETE;
if (retval == KEY_PPAGE) case KEY_IC: return ALT_INSERT;
return ALT_PAGEUP; }
if (retval == KEY_NPAGE)
return ALT_PAGEDOWN;
if (retval == KEY_IC)
return ALT_INSERT;
} }
#endif #endif
/* Is Ctrl being held? */ /* Is Ctrl being held? */
if (modifiers & 0x04) { if (modifiers & 0x04) {
if (retval == KEY_UP) switch (retval) {
return CONTROL_UP; case KEY_UP: return CONTROL_UP;
else if (retval == KEY_DOWN) case KEY_DOWN: return CONTROL_DOWN;
return CONTROL_DOWN; case KEY_LEFT: return CONTROL_LEFT;
else if (retval == KEY_LEFT) case KEY_RIGHT: return CONTROL_RIGHT;
return CONTROL_LEFT; case KEY_HOME: return CONTROL_HOME;
else if (retval == KEY_RIGHT) case KEY_END: return CONTROL_END;
return CONTROL_RIGHT; case KEY_DC: return CONTROL_DELETE;
else if (retval == KEY_HOME) }
return CONTROL_HOME;
else if (retval == KEY_END)
return CONTROL_END;
else if (retval == KEY_DC)
return CONTROL_DELETE;
} }
#ifndef NANO_TINY #ifndef NANO_TINY
/* Are both Shift and Alt being held? */ /* Are both Shift and Alt being held? */
if ((modifiers & 0x09) == 0x09) { if ((modifiers & 0x09) == 0x09) {
if (retval == KEY_UP) switch (retval) {
return KEY_PPAGE; case KEY_UP: return KEY_PPAGE;
else if (retval == KEY_DOWN) case KEY_DOWN: return KEY_NPAGE;
return KEY_NPAGE; case KEY_LEFT: return KEY_HOME;
else if (retval == KEY_LEFT) case KEY_RIGHT: return KEY_END;
return KEY_HOME; }
else if (retval == KEY_RIGHT)
return KEY_END;
} }
#endif #endif
} }