From: Chris Allegretta <chrisa@asty.org>
Date: Mon, 19 Nov 2001 02:41:53 +0000 (+0000)
Subject: Hurd fixes in main (function keys) and signal_init() (SIGTSTP sigaction)
X-Git-Tag: v1.0.7~8
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=5c15223ae5af1c95b5748a8e39764a5a0f6ee219;p=nano.git

Hurd fixes in main (function keys) and signal_init() (SIGTSTP sigaction)


git-svn-id: svn://svn.savannah.gnu.org/nano/branches/nano_1_0_branch/nano@907 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
---

diff --git a/ChangeLog b/ChangeLog
index 5093c8c9..a528862a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
 CVS code -
 - po/de.po:
 	- Updated German translation (Karl Eichwalder).
+- nano.c:
+  main()
+	- 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)
 
 nano-1.0.6 - 10/29/2001
 - General
diff --git a/nano.c b/nano.c
index ee0a12c6..74e47376 100644
--- a/nano.c
+++ b/nano.c
@@ -1797,10 +1797,11 @@ void signal_init(void)
 	tcgetattr(0, &term);
 	term.c_cc[VSUSP] = _POSIX_VDISABLE;
 	tcsetattr(0, TCSANOW, &term);
-#else
+#endif
+
+	/* The HURD seems to need this anyway! */
 	act.sa_handler = SIG_IGN;
 	sigaction(SIGTSTP, &act, NULL);
-#endif
 
     } else {
 	/* if we don't do this, it seems other stuff interrupts the
@@ -2613,6 +2614,7 @@ int main(int argc, char *argv[])
 		    kbinput = KEY_PPAGE;
 		    wgetch(edit);
 		    break;
+		case 'V':	/* Alt-[-V = Page Up in Hurd Console */
 		case 'I':	/* Alt-[-I = Page Up - FreeBSD Console */
 		    kbinput = KEY_PPAGE;
 		    break;
@@ -2620,6 +2622,7 @@ int main(int argc, char *argv[])
 		    kbinput = KEY_NPAGE;
 		    wgetch(edit);
 		    break;
+		case 'U':	/* Alt-[-U = Page Down in Hurd Console */
 		case 'G':	/* Alt-[-G = Page Down - FreeBSD Console */
 		    kbinput = KEY_NPAGE;
 		    break;
@@ -2631,6 +2634,10 @@ int main(int argc, char *argv[])
 		    kbinput = KEY_END;
 		    wgetch(edit);
 		    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 */
 		    do_insertfile();
 		    keyhandled = 1;
@@ -2654,6 +2661,7 @@ int main(int argc, char *argv[])
 		    kbinput = KEY_HOME;
 		    break;
 		case 'F':
+		case 'Y':		/* End Key in Hurd Console */
 		    kbinput = KEY_END;
 		    break;
 		default: