Commit 9b8b3701 authored by Chris Allegretta's avatar Chris Allegretta
Browse files

Put 1.0 Hurd fixes in 1.1 tree (function keys, SIGTSTP sigaction

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@908 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
No related merge requests found
Showing with 14 additions and 2 deletions
+14 -2
...@@ -11,6 +11,10 @@ CVS Code - ...@@ -11,6 +11,10 @@ CVS Code -
- nano.c: - nano.c:
main() main()
- Add Esc-[-[IGL] keys for FreeBSD Console (PgUp,PgDn,Insert). - Add Esc-[-[IGL] keys for FreeBSD Console (PgUp,PgDn,Insert).
- Added better Hurd support for function keys (Alt-V,U,9,@,F).
signal_init()
- do SIG_IGN for the SIGTSTP sigaction regardless of whether
we have _POSIX_VDISABLE or not (more Hurd fixes)
help_init() help_init()
- Typo fixes and additions to the new help texts. - Typo fixes and additions to the new help texts.
- po/de.po: - po/de.po:
......
...@@ -2010,10 +2010,11 @@ void signal_init(void) ...@@ -2010,10 +2010,11 @@ void signal_init(void)
tcgetattr(0, &term); tcgetattr(0, &term);
term.c_cc[VSUSP] = _POSIX_VDISABLE; term.c_cc[VSUSP] = _POSIX_VDISABLE;
tcsetattr(0, TCSANOW, &term); tcsetattr(0, TCSANOW, &term);
#else #endif
/* The HURD seems to need this anyway! */
act.sa_handler = SIG_IGN; act.sa_handler = SIG_IGN;
sigaction(SIGTSTP, &act, NULL); sigaction(SIGTSTP, &act, NULL);
#endif
} else { } else {
/* if we don't do this, it seems other stuff interrupts the /* if we don't do this, it seems other stuff interrupts the
...@@ -3027,6 +3028,7 @@ int main(int argc, char *argv[]) ...@@ -3027,6 +3028,7 @@ int main(int argc, char *argv[])
kbinput = KEY_PPAGE; kbinput = KEY_PPAGE;
wgetch(edit); wgetch(edit);
break; break;
case 'V': /* Alt-[-V = Page Up in Hurd Console */
case 'I': /* Alt-[-I = Page Up - FreeBSD Console */ case 'I': /* Alt-[-I = Page Up - FreeBSD Console */
kbinput = KEY_PPAGE; kbinput = KEY_PPAGE;
break; break;
...@@ -3034,6 +3036,7 @@ int main(int argc, char *argv[]) ...@@ -3034,6 +3036,7 @@ int main(int argc, char *argv[])
kbinput = KEY_NPAGE; kbinput = KEY_NPAGE;
wgetch(edit); wgetch(edit);
break; break;
case 'U': /* Alt-[-U = Page Down in Hurd Console */
case 'G': /* Alt-[-G = Page Down - FreeBSD Console */ case 'G': /* Alt-[-G = Page Down - FreeBSD Console */
kbinput = KEY_NPAGE; kbinput = KEY_NPAGE;
break; break;
...@@ -3045,6 +3048,10 @@ int main(int argc, char *argv[]) ...@@ -3045,6 +3048,10 @@ int main(int argc, char *argv[])
kbinput = KEY_END; kbinput = KEY_END;
wgetch(edit); wgetch(edit);
break; break;
case '9': /* Alt-[-9 = Delete in Hurd Console */
kbinput = KEY_DC;
break;
case '@': /* Alt-[-9 = Insert in Hurd Console */
case 'L': /* Insert Key - FreeBSD Console */ case 'L': /* Insert Key - FreeBSD Console */
#ifdef ENABLE_MULTIBUFFER #ifdef ENABLE_MULTIBUFFER
do_insertfile(ISSET(MULTIBUFFER)); do_insertfile(ISSET(MULTIBUFFER));
...@@ -3072,6 +3079,7 @@ int main(int argc, char *argv[]) ...@@ -3072,6 +3079,7 @@ int main(int argc, char *argv[])
kbinput = KEY_HOME; kbinput = KEY_HOME;
break; break;
case 'F': case 'F':
case 'Y': /* End Key in Hurd Console */
kbinput = KEY_END; kbinput = KEY_END;
break; break;
default: default:
......
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