binding: use plain codes instead of function calls for the jumping keys

Which is possible because those keycodes are hard-bound to the relevant
functions.
master
Benno Schulenberg 2016-12-22 11:42:13 +01:00
parent db897b574f
commit 026393a91a
1 changed files with 16 additions and 16 deletions

View File

@ -508,28 +508,28 @@ int parse_kbinput(WINDOW *win)
#ifndef NANO_TINY #ifndef NANO_TINY
else if (retval == shiftcontrolleft) { else if (retval == shiftcontrolleft) {
shift_held = TRUE; shift_held = TRUE;
return sc_seq_or(do_prev_word_void, shiftcontrolleft); return CONTROL_LEFT;
} else if (retval == shiftcontrolright) { } else if (retval == shiftcontrolright) {
shift_held = TRUE; shift_held = TRUE;
return sc_seq_or(do_next_word_void, shiftcontrolright); return CONTROL_RIGHT;
} else if (retval == shiftcontrolup) { } else if (retval == shiftcontrolup) {
shift_held = TRUE; shift_held = TRUE;
return sc_seq_or(do_prev_block, shiftcontrolup); return CONTROL_UP;
} else if (retval == shiftcontroldown) { } else if (retval == shiftcontroldown) {
shift_held = TRUE; shift_held = TRUE;
return sc_seq_or(do_next_block, shiftcontroldown); return CONTROL_DOWN;
} else if (retval == shiftaltleft) { } else if (retval == shiftaltleft) {
shift_held = TRUE; shift_held = TRUE;
return sc_seq_or(do_home, shiftaltleft); return KEY_HOME;
} else if (retval == shiftaltright) { } else if (retval == shiftaltright) {
shift_held = TRUE; shift_held = TRUE;
return sc_seq_or(do_end, shiftaltright); return KEY_END;
} else if (retval == shiftaltup) { } else if (retval == shiftaltup) {
shift_held = TRUE; shift_held = TRUE;
return sc_seq_or(do_page_up, shiftaltup); return KEY_PPAGE;
} else if (retval == shiftaltdown) { } else if (retval == shiftaltdown) {
shift_held = TRUE; shift_held = TRUE;
return sc_seq_or(do_page_down, shiftaltdown); return KEY_NPAGE;
} }
#endif #endif
@ -547,25 +547,25 @@ int parse_kbinput(WINDOW *win)
/* Is Ctrl being held? */ /* Is Ctrl being held? */
if (modifiers & 0x04) { if (modifiers & 0x04) {
if (retval == KEY_UP) if (retval == KEY_UP)
return sc_seq_or(do_prev_block, controlup); return CONTROL_UP;
else if (retval == KEY_DOWN) else if (retval == KEY_DOWN)
return sc_seq_or(do_next_block, controldown); return CONTROL_DOWN;
else if (retval == KEY_LEFT) else if (retval == KEY_LEFT)
return sc_seq_or(do_prev_word_void, controlleft); return CONTROL_LEFT;
else if (retval == KEY_RIGHT) else if (retval == KEY_RIGHT)
return sc_seq_or(do_next_word_void, controlright); return CONTROL_RIGHT;
} }
#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) if (retval == KEY_UP)
return sc_seq_or(do_page_up, shiftaltup); return KEY_PPAGE;
else if (retval == KEY_DOWN) else if (retval == KEY_DOWN)
return sc_seq_or(do_page_down, shiftaltdown); return KEY_NPAGE;
else if (retval == KEY_LEFT) else if (retval == KEY_LEFT)
return sc_seq_or(do_home, shiftaltleft); return KEY_HOME;
else if (retval == KEY_RIGHT) else if (retval == KEY_RIGHT)
return sc_seq_or(do_end, shiftaltright); return KEY_END;
} }
#endif #endif
} }