tweaks: reshuffle a couple of conditions, to group things better

This commit is contained in:
Benno Schulenberg 2018-11-06 20:52:02 +01:00
parent 15ec0eb3ee
commit 7ee07af081

View File

@ -602,15 +602,13 @@ int parse_kbinput(WINDOW *win)
return SHIFT_TAB; return SHIFT_TAB;
shift_held = TRUE; shift_held = TRUE;
} }
/* Is Delete pressed together with either Ctrl+Shift or Meta? */ /* Are Ctrl and Shift being held while Delete is pressed? */
if (retval == KEY_DC) { if (modifiers == 0x05 && retval == KEY_DC)
if ((modifiers & 0x05) == 0x05) return CONTROL_SHIFT_DELETE;
return CONTROL_SHIFT_DELETE;
if (modifiers == 0x08)
return ALT_DELETE;
}
/* Is Alt being held? */ /* Is Alt being held? */
if (modifiers == 0x08) { if (modifiers == 0x08) {
if (retval == KEY_DC)
return ALT_DELETE;
if (retval == KEY_UP) if (retval == KEY_UP)
return ALT_UP; return ALT_UP;
if (retval == KEY_DOWN) if (retval == KEY_DOWN)