Skip to content

GitLab

Commit 7f3bd265 authored by Benno Schulenberg's avatar Benno Schulenberg
Browse files

Unwrapping a bunch of comments. 

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5220 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
parent 9233c98a
master feature/match-parens refactor/readbility
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 55 additions and 99 deletions
+55 -99
ChangeLog
View file @ 7f3bd265
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
the absolute, canonical path instead of against the path the user gave. the absolute, canonical path instead of against the path the user gave.
This fixes Savannah bug #44288, reported by Mike Frysinger. This fixes Savannah bug #44288, reported by Mike Frysinger.
* doc/syntax/po.nanorc: Improve the colouring of message tags. * doc/syntax/po.nanorc: Improve the colouring of message tags.
* src/winio.c (get_escape_seq_kbinput): Unwrap a bunch of comments.
2015-04-25 Benno Schulenberg <bensberg@justemail.net> 2015-04-25 Benno Schulenberg <bensberg@justemail.net>
* src/search.c (do_replace_loop): Remove the unintended special * src/search.c (do_replace_loop): Remove the unintended special
......
src/winio.c
View file @ 7f3bd265
...@@ -692,20 +692,16 @@ int get_escape_seq_kbinput(const int *seq, size_t seq_len) ...@@ -692,20 +692,16 @@ int get_escape_seq_kbinput(const int *seq, size_t seq_len)
* Terminal. */ * Terminal. */
retval = get_escape_seq_abcd(seq[4]); retval = get_escape_seq_abcd(seq[4]);
break; break;
case 'P': /* Esc O 1 ; 2 P == F13 on case 'P': /* Esc O 1 ; 2 P == F13 on Terminal. */
* Terminal. */
retval = KEY_F(13); retval = KEY_F(13);
break; break;
case 'Q': /* Esc O 1 ; 2 Q == F14 on case 'Q': /* Esc O 1 ; 2 Q == F14 on Terminal. */
* Terminal. */
retval = KEY_F(14); retval = KEY_F(14);
break; break;
case 'R': /* Esc O 1 ; 2 R == F15 on case 'R': /* Esc O 1 ; 2 R == F15 on Terminal. */
* Terminal. */
retval = KEY_F(15); retval = KEY_F(15);
break; break;
case 'S': /* Esc O 1 ; 2 S == F16 on case 'S': /* Esc O 1 ; 2 S == F16 on Terminal. */
* Terminal. */
retval = KEY_F(16); retval = KEY_F(16);
break; break;
} }
...@@ -714,18 +710,14 @@ int get_escape_seq_kbinput(const int *seq, size_t seq_len) ...@@ -714,18 +710,14 @@ int get_escape_seq_kbinput(const int *seq, size_t seq_len)
case '5': case '5':
if (seq_len >= 5) { if (seq_len >= 5) {
switch (seq[4]) { switch (seq[4]) {
case 'A': /* Esc O 1 ; 5 A == Ctrl-Up on case 'A': /* Esc O 1 ; 5 A == Ctrl-Up on Terminal. */
* Terminal. */ case 'B': /* Esc O 1 ; 5 B == Ctrl-Down on Terminal. */
case 'B': /* Esc O 1 ; 5 B == Ctrl-Down on
* Terminal. */
retval = get_escape_seq_abcd(seq[4]); retval = get_escape_seq_abcd(seq[4]);
break; break;
case 'C': /* Esc O 1 ; 5 C == Ctrl-Right on case 'C': /* Esc O 1 ; 5 C == Ctrl-Right on Terminal. */
* Terminal. */
retval = CONTROL_RIGHT; retval = CONTROL_RIGHT;
break; break;
case 'D': /* Esc O 1 ; 5 D == Ctrl-Left on case 'D': /* Esc O 1 ; 5 D == Ctrl-Left on Terminal. */
* Terminal. */
retval = CONTROL_LEFT; retval = CONTROL_LEFT;
break; break;
} }
...@@ -740,32 +732,25 @@ int get_escape_seq_kbinput(const int *seq, size_t seq_len) ...@@ -740,32 +732,25 @@ int get_escape_seq_kbinput(const int *seq, size_t seq_len)
case '2': case '2':
if (seq_len >= 3) { if (seq_len >= 3) {
switch (seq[2]) { switch (seq[2]) {
case 'P': /* Esc O 2 P == F13 on case 'P': /* Esc O 2 P == F13 on xterm. */
* xterm. */
retval = KEY_F(13); retval = KEY_F(13);
break; break;
case 'Q': /* Esc O 2 Q == F14 on case 'Q': /* Esc O 2 Q == F14 on xterm. */
* xterm. */
retval = KEY_F(14); retval = KEY_F(14);
break; break;
case 'R': /* Esc O 2 R == F15 on case 'R': /* Esc O 2 R == F15 on xterm. */
* xterm. */
retval = KEY_F(15); retval = KEY_F(15);
break; break;
case 'S': /* Esc O 2 S == F16 on case 'S': /* Esc O 2 S == F16 on xterm. */
* xterm. */
retval = KEY_F(16); retval = KEY_F(16);
break; break;
} }
} }
break; break;
case 'A': /* Esc O A == Up on VT100/VT320/xterm. */ case 'A': /* Esc O A == Up on VT100/VT320/xterm. */
case 'B': /* Esc O B == Down on case 'B': /* Esc O B == Down on VT100/VT320/xterm. */
* VT100/VT320/xterm. */ case 'C': /* Esc O C == Right on VT100/VT320/xterm. */
case 'C': /* Esc O C == Right on case 'D': /* Esc O D == Left on VT100/VT320/xterm. */
* VT100/VT320/xterm. */
case 'D': /* Esc O D == Left on
* VT100/VT320/xterm. */
retval = get_escape_seq_abcd(seq[1]); retval = get_escape_seq_abcd(seq[1]);
break; break;
case 'E': /* Esc O E == Center (5) on numeric keypad case 'E': /* Esc O E == Center (5) on numeric keypad
...@@ -928,20 +913,16 @@ int get_escape_seq_kbinput(const int *seq, size_t seq_len) ...@@ -928,20 +913,16 @@ int get_escape_seq_kbinput(const int *seq, size_t seq_len)
case '1': case '1':
if (seq_len >= 3) { if (seq_len >= 3) {
switch (seq[2]) { switch (seq[2]) {
case '1': /* Esc [ 1 1 ~ == F1 on rxvt/ case '1': /* Esc [ 1 1 ~ == F1 on rxvt/Eterm. */
* Eterm. */
retval = KEY_F(1); retval = KEY_F(1);
break; break;
case '2': /* Esc [ 1 2 ~ == F2 on rxvt/ case '2': /* Esc [ 1 2 ~ == F2 on rxvt/Eterm. */
* Eterm. */
retval = KEY_F(2); retval = KEY_F(2);
break; break;
case '3': /* Esc [ 1 3 ~ == F3 on rxvt/ case '3': /* Esc [ 1 3 ~ == F3 on rxvt/Eterm. */
* Eterm. */
retval = KEY_F(3); retval = KEY_F(3);
break; break;
case '4': /* Esc [ 1 4 ~ == F4 on rxvt/ case '4': /* Esc [ 1 4 ~ == F4 on rxvt/Eterm. */
* Eterm. */
retval = KEY_F(4); retval = KEY_F(4);
break; break;
case '5': /* Esc [ 1 5 ~ == F5 on xterm/ case '5': /* Esc [ 1 5 ~ == F5 on xterm/
...@@ -969,14 +950,10 @@ int get_escape_seq_kbinput(const int *seq, size_t seq_len) ...@@ -969,14 +950,10 @@ int get_escape_seq_kbinput(const int *seq, size_t seq_len)
case '2': case '2':
if (seq_len >= 5) { if (seq_len >= 5) {
switch (seq[4]) { switch (seq[4]) {
case 'A': /* Esc [ 1 ; 2 A == Shift-Up on case 'A': /* Esc [ 1 ; 2 A == Shift-Up on xterm. */
* xterm. */ case 'B': /* Esc [ 1 ; 2 B == Shift-Down on xterm. */
case 'B': /* Esc [ 1 ; 2 B == Shift-Down on case 'C': /* Esc [ 1 ; 2 C == Shift-Right on xterm. */
* xterm. */ case 'D': /* Esc [ 1 ; 2 D == Shift-Left on xterm. */
case 'C': /* Esc [ 1 ; 2 C == Shift-Right on
* xterm. */
case 'D': /* Esc [ 1 ; 2 D == Shift-Left on
* xterm. */
retval = get_escape_seq_abcd(seq[4]); retval = get_escape_seq_abcd(seq[4]);
break; break;
} }
...@@ -985,18 +962,14 @@ int get_escape_seq_kbinput(const int *seq, size_t seq_len) ...@@ -985,18 +962,14 @@ int get_escape_seq_kbinput(const int *seq, size_t seq_len)
case '5': case '5':
if (seq_len >= 5) { if (seq_len >= 5) {
switch (seq[4]) { switch (seq[4]) {
case 'A': /* Esc [ 1 ; 5 A == Ctrl-Up on case 'A': /* Esc [ 1 ; 5 A == Ctrl-Up on xterm. */
* xterm. */ case 'B': /* Esc [ 1 ; 5 B == Ctrl-Down on xterm. */
case 'B': /* Esc [ 1 ; 5 B == Ctrl-Down on
* xterm. */
retval = get_escape_seq_abcd(seq[4]); retval = get_escape_seq_abcd(seq[4]);
break; break;
case 'C': /* Esc [ 1 ; 5 C == Ctrl-Right on case 'C': /* Esc [ 1 ; 5 C == Ctrl-Right on xterm. */
* xterm. */
retval = CONTROL_RIGHT; retval = CONTROL_RIGHT;
break; break;
case 'D': /* Esc [ 1 ; 5 D == Ctrl-Left on case 'D': /* Esc [ 1 ; 5 D == Ctrl-Left on xterm. */
* xterm. */
retval = CONTROL_LEFT; retval = CONTROL_LEFT;
break; break;
} }
...@@ -1015,49 +988,40 @@ int get_escape_seq_kbinput(const int *seq, size_t seq_len) ...@@ -1015,49 +988,40 @@ int get_escape_seq_kbinput(const int *seq, size_t seq_len)
case '2': case '2':
if (seq_len >= 3) { if (seq_len >= 3) {
switch (seq[2]) { switch (seq[2]) {
case '0': /* Esc [ 2 0 ~ == F9 on case '0': /* Esc [ 2 0 ~ == F9 on VT220/VT320/
* VT220/VT320/Linux console/ * Linux console/xterm/rxvt/Eterm. */
* xterm/rxvt/Eterm. */
retval = KEY_F(9); retval = KEY_F(9);
break; break;
case '1': /* Esc [ 2 1 ~ == F10 on case '1': /* Esc [ 2 1 ~ == F10 on VT220/VT320/
* VT220/VT320/Linux console/ * Linux console/xterm/rxvt/Eterm. */
* xterm/rxvt/Eterm. */
retval = KEY_F(10); retval = KEY_F(10);
break; break;
case '3': /* Esc [ 2 3 ~ == F11 on case '3': /* Esc [ 2 3 ~ == F11 on VT220/VT320/
* VT220/VT320/Linux console/ * Linux console/xterm/rxvt/Eterm. */
* xterm/rxvt/Eterm. */
retval = KEY_F(11); retval = KEY_F(11);
break; break;
case '4': /* Esc [ 2 4 ~ == F12 on case '4': /* Esc [ 2 4 ~ == F12 on VT220/VT320/
* VT220/VT320/Linux console/ * Linux console/xterm/rxvt/Eterm. */
* xterm/rxvt/Eterm. */
retval = KEY_F(12); retval = KEY_F(12);
break; break;
case '5': /* Esc [ 2 5 ~ == F13 on case '5': /* Esc [ 2 5 ~ == F13 on VT220/VT320/
* VT220/VT320/Linux console/ * Linux console/rxvt/Eterm. */
* rxvt/Eterm. */
retval = KEY_F(13); retval = KEY_F(13);
break; break;
case '6': /* Esc [ 2 6 ~ == F14 on case '6': /* Esc [ 2 6 ~ == F14 on VT220/VT320/
* VT220/VT320/Linux console/ * Linux console/rxvt/Eterm. */
* rxvt/Eterm. */
retval = KEY_F(14); retval = KEY_F(14);
break; break;
case '8': /* Esc [ 2 8 ~ == F15 on case '8': /* Esc [ 2 8 ~ == F15 on VT220/VT320/
* VT220/VT320/Linux console/ * Linux console/rxvt/Eterm. */
* rxvt/Eterm. */
retval = KEY_F(15); retval = KEY_F(15);
break; break;
case '9': /* Esc [ 2 9 ~ == F16 on case '9': /* Esc [ 2 9 ~ == F16 on VT220/VT320/
* VT220/VT320/Linux console/ * Linux console/rxvt/Eterm. */
* rxvt/Eterm. */
retval = KEY_F(16); retval = KEY_F(16);
break; break;
default: /* Esc [ 2 ~ == Insert on default: /* Esc [ 2 ~ == Insert on VT220/VT320/
* VT220/VT320/Linux console/ * Linux console/xterm/Terminal. */
* xterm/Terminal. */
retval = sc_seq_or(do_insertfile_void, 0); retval = sc_seq_or(do_insertfile_void, 0);
break; break;
} }
...@@ -1112,24 +1076,20 @@ int get_escape_seq_kbinput(const int *seq, size_t seq_len) ...@@ -1112,24 +1076,20 @@ int get_escape_seq_kbinput(const int *seq, size_t seq_len)
* Terminal. */ * Terminal. */
retval = KEY_B2; retval = KEY_B2;
break; break;
case 'F': /* Esc [ F == End on FreeBSD case 'F': /* Esc [ F == End on FreeBSD console/Eterm. */
* console/Eterm. */
retval = sc_seq_or(do_end, 0); retval = sc_seq_or(do_end, 0);
break; break;
case 'G': /* Esc [ G == PageDown on FreeBSD case 'G': /* Esc [ G == PageDown on FreeBSD console. */
* console. */
retval = sc_seq_or(do_page_down, 0); retval = sc_seq_or(do_page_down, 0);
break; break;
case 'H': /* Esc [ H == Home on ANSI/VT220/FreeBSD case 'H': /* Esc [ H == Home on ANSI/VT220/FreeBSD
* console/Mach console/Eterm. */ * console/Mach console/Eterm. */
retval = sc_seq_or(do_home, 0); retval = sc_seq_or(do_home, 0);
break; break;
case 'I': /* Esc [ I == PageUp on FreeBSD case 'I': /* Esc [ I == PageUp on FreeBSD console. */
* console. */
retval = sc_seq_or(do_page_up, 0); retval = sc_seq_or(do_page_up, 0);
break; break;
case 'L': /* Esc [ L == Insert on ANSI/FreeBSD case 'L': /* Esc [ L == Insert on ANSI/FreeBSD console. */
* console. */
retval = sc_seq_or(do_insertfile_void, 0); retval = sc_seq_or(do_insertfile_void, 0);
break; break;
case 'M': /* Esc [ M == F1 on FreeBSD console. */ case 'M': /* Esc [ M == F1 on FreeBSD console. */
...@@ -1141,20 +1101,16 @@ int get_escape_seq_kbinput(const int *seq, size_t seq_len) ...@@ -1141,20 +1101,16 @@ int get_escape_seq_kbinput(const int *seq, size_t seq_len)
case 'O': case 'O':
if (seq_len >= 3) { if (seq_len >= 3) {
switch (seq[2]) { switch (seq[2]) {
case 'P': /* Esc [ O P == F1 on case 'P': /* Esc [ O P == F1 on xterm. */
* xterm. */
retval = KEY_F(1); retval = KEY_F(1);
break; break;
case 'Q': /* Esc [ O Q == F2 on case 'Q': /* Esc [ O Q == F2 on xterm. */
* xterm. */
retval = KEY_F(2); retval = KEY_F(2);
break; break;
case 'R': /* Esc [ O R == F3 on case 'R': /* Esc [ O R == F3 on xterm. */
* xterm. */
retval = KEY_F(3); retval = KEY_F(3);
break; break;
case 'S': /* Esc [ O S == F4 on case 'S': /* Esc [ O S == F4 on xterm. */
* xterm. */
retval = KEY_F(4); retval = KEY_F(4);
break; break;
} }
...@@ -1197,8 +1153,7 @@ int get_escape_seq_kbinput(const int *seq, size_t seq_len) ...@@ -1197,8 +1153,7 @@ int get_escape_seq_kbinput(const int *seq, size_t seq_len)
break; break;
case 'a': /* Esc [ a == Shift-Up on rxvt/Eterm. */ case 'a': /* Esc [ a == Shift-Up on rxvt/Eterm. */
case 'b': /* Esc [ b == Shift-Down on rxvt/Eterm. */ case 'b': /* Esc [ b == Shift-Down on rxvt/Eterm. */
case 'c': /* Esc [ c == Shift-Right on rxvt/ case 'c': /* Esc [ c == Shift-Right on rxvt/Eterm. */
* Eterm. */
case 'd': /* Esc [ d == Shift-Left on rxvt/Eterm. */ case 'd': /* Esc [ d == Shift-Left on rxvt/Eterm. */
retval = get_escape_seq_abcd(seq[1]); retval = get_escape_seq_abcd(seq[1]);
break; break;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment