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

tweaks: exclude word-deletion keystrokes from the tiny version 

Because word deletion is not available there.
master
Benno Schulenberg 2018-10-05 19:09:17 +02:00
parent 915064870f
commit fb8d981bfa
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nano.c
View File

@ -2576,9 +2576,9 @@ int main(int argc, char **argv)
/* Ask for the codes for Control+Home/End. */ /* Ask for the codes for Control+Home/End. */
controlhome = get_keycode("kHOM5", CONTROL_HOME); controlhome = get_keycode("kHOM5", CONTROL_HOME);
controlend = get_keycode("kEND5", CONTROL_END); controlend = get_keycode("kEND5", CONTROL_END);
#ifndef NANO_TINY
controldelete = get_keycode("kDC5", CONTROL_DELETE); controldelete = get_keycode("kDC5", CONTROL_DELETE);
controlshiftdelete = get_keycode("kDC6", CONTROL_SHIFT_DELETE); controlshiftdelete = get_keycode("kDC6", CONTROL_SHIFT_DELETE);
#ifndef NANO_TINY
/* Ask for the codes for Shift+Control+Left/Right/Up/Down. */ /* Ask for the codes for Shift+Control+Left/Right/Up/Down. */
shiftcontrolleft = get_keycode("kLFT6", SHIFT_CONTROL_LEFT); shiftcontrolleft = get_keycode("kLFT6", SHIFT_CONTROL_LEFT);
shiftcontrolright = get_keycode("kRIT6", SHIFT_CONTROL_RIGHT); shiftcontrolright = get_keycode("kRIT6", SHIFT_CONTROL_RIGHT);

2
src/proto.h
View File

@ -61,9 +61,9 @@ extern int controlup;
extern int controldown; extern int controldown;
extern int controlhome; extern int controlhome;
extern int controlend; extern int controlend;
#ifndef NANO_TINY
extern int controldelete; extern int controldelete;
extern int controlshiftdelete; extern int controlshiftdelete;
#ifndef NANO_TINY
extern int shiftcontrolleft; extern int shiftcontrolleft;
extern int shiftcontrolright; extern int shiftcontrolright;
extern int shiftcontrolup; extern int shiftcontrolup;

BIN
src/proto.h.gch Normal file
View File

Binary file not shown.

4
src/winio.c
View File

@ -538,9 +538,9 @@ int parse_kbinput(WINDOW *win)
return CONTROL_HOME; return CONTROL_HOME;
else if (retval == controlend) else if (retval == controlend)
return CONTROL_END; return CONTROL_END;
#ifndef NANO_TINY
else if (retval == controldelete) else if (retval == controldelete)
return CONTROL_DELETE; return CONTROL_DELETE;
#ifndef NANO_TINY
else if (retval == controlshiftdelete) else if (retval == controlshiftdelete)
return CONTROL_SHIFT_DELETE; return CONTROL_SHIFT_DELETE;
else if (retval == shiftcontrolleft) { else if (retval == shiftcontrolleft) {
@ -1093,6 +1093,7 @@ int convert_sequence(const int *seq, size_t length, int *consumed)
* Linux console/xterm/Terminal. */ * Linux console/xterm/Terminal. */
if (length > 2 && seq[2] == '~') if (length > 2 && seq[2] == '~')
return KEY_DC; return KEY_DC;
#ifndef NANO_TINY
if (length > 4 && seq[2] == ';' && seq[4] == '~') { if (length > 4 && seq[2] == ';' && seq[4] == '~') {
*consumed = 5; *consumed = 5;
if (seq[3] == '5') if (seq[3] == '5')
@ -1108,6 +1109,7 @@ int convert_sequence(const int *seq, size_t length, int *consumed)
if (length > 2 && seq[2] == '@') if (length > 2 && seq[2] == '@')
/* Esc [ 3 @ == Ctrl-Shift-Delete on urxvt. */ /* Esc [ 3 @ == Ctrl-Shift-Delete on urxvt. */
return controlshiftdelete; return controlshiftdelete;
#endif
break; break;
case '4': /* Esc [ 4 ~ == End on VT220/VT320/ case '4': /* Esc [ 4 ~ == End on VT220/VT320/
* Linux console/xterm. */ * Linux console/xterm. */