2008-08-20 Miguel de Icaza <miguel@novell.com>

	* console-io.c (sigcont_handler): We need to restore the entire
	termios state, not only the original settings, as things like echo
	can be controlled after this (Booish exposes this issue with its
	own ReadLine implementation).

	Additionally, we need to set the terminal back into keypad_xmit
	mode.

	(ves_icall_System_ConsoleDriver_TtySetup): Take the keypad xmit
	string as a paramter as well.   Otherwise we get different
	keyboard sequences.

svn path=/trunk/mono/; revision=111077

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index 62e4e976c2c2b05d96ad27bda5583a46d9f58871..bc6c531a782ca87c8358dc270c7e082f2d459816 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,17 @@
+2008-08-20  Miguel de Icaza  <miguel@novell.com>
+
+       * console-io.c (sigcont_handler): We need to restore the entire
+       termios state, not only the original settings, as things like echo
+       can be controlled after this (Booish exposes this issue with its
+       own ReadLine implementation).
+
+       Additionally, we need to set the terminal back into keypad_xmit
+       mode.
+       
+       (ves_icall_System_ConsoleDriver_TtySetup): Take the keypad xmit
+       string as a paramter as well.   Otherwise we get different
+       keyboard sequences.
+
 2008-08-20  Zoltan Varga  <vargaz@gmail.com>
 
        * marshal.c (emit_marshal_object): Avoid managed-to-native marshalling of

diff --git a/mono/metadata/console-io.c b/mono/metadata/console-io.c
index 0470f38cd2fae9c64d11ac2ab0b923331c6084dd..4272e1793f932dc067ea393f7ad7e3dd617db464 100644 (file)
--- a/mono/metadata/console-io.c
+++ b/mono/metadata/console-io.c
@@ -52,8 +52,16 @@
 
 static gboolean setup_finished;
 static gboolean atexit_called;
+
+/* The string used to return the terminal to its previous state */
 static gchar *teardown_str;
 
+/* The string used to set the terminal into keypad xmit mode after SIGCONT is received */
+static gchar *keypad_xmit_str;
+
+/* This is the last state used by Mono, used after a CONT signal is received */
+static struct termios mono_attr;
+
 #ifdef PLATFORM_WIN32
 MonoBoolean
 ves_icall_System_ConsoleDriver_Isatty (HANDLE handle)
@@ -131,12 +139,14 @@ set_property (gint property, gboolean value)
        if (tcsetattr (STDIN_FILENO, TCSANOW, &attr) == -1)
                return FALSE;
 
+       mono_attr = attr;
        return TRUE;
 }
 
 MonoBoolean
 ves_icall_System_ConsoleDriver_SetEcho (MonoBoolean want_echo)
 {
+       
        return set_property (ECHO, want_echo);
 }
 
@@ -253,15 +263,11 @@ sigint_handler (int signo)
 static void
 sigcont_handler (int signo)
 {
-       struct termios attr;
-
-       attr = initial_attr;
-       attr.c_lflag &= ~ICANON;
-       attr.c_cc [VMIN] = 1;
-       attr.c_cc [VTIME] = 0;
-
        // Ignore error, there is not much we can do in the sigcont handler.
-       tcsetattr (STDIN_FILENO, TCSANOW, &attr);
+       tcsetattr (STDIN_FILENO, TCSANOW, &mono_attr);
+
+       if (keypad_xmit_str != NULL)
+               write (STDOUT_FILENO, keypad_xmit_str, strlen (keypad_xmit_str));
 }
 
 static struct sigaction save_sigcont, save_sigint;
@@ -269,9 +275,9 @@ static struct sigaction save_sigcont, save_sigint;
 void
 console_set_signal_handlers ()
 {
-       struct sigaction sigcont, sigint;
+       struct sigaction sigcont, sigint, sigstop;
 
-       // Stopping and continuing
+       // Continuing
        sigcont.sa_handler = sigcont_handler;
        sigcont.sa_flags = 0;
        sigemptyset (&sigcont.sa_mask);
@@ -296,10 +302,8 @@ console_restore_signal_handlers ()
 }
 
 MonoBoolean
-ves_icall_System_ConsoleDriver_TtySetup (MonoString *teardown, char *verase, char *vsusp, char*intr)
+ves_icall_System_ConsoleDriver_TtySetup (MonoString *keypad, MonoString *teardown, char *verase, char *vsusp, char*intr)
 {
-       struct termios attr;
-       
        MONO_ARCH_SAVE_REGS;
 
        *verase = '\0';
@@ -308,11 +312,11 @@ ves_icall_System_ConsoleDriver_TtySetup (MonoString *teardown, char *verase, cha
        if (tcgetattr (STDIN_FILENO, &initial_attr) == -1)
                return FALSE;
 
-       attr = initial_attr;
-       attr.c_lflag &= ~ICANON;
-       attr.c_cc [VMIN] = 1;
-       attr.c_cc [VTIME] = 0;
-       if (tcsetattr (STDIN_FILENO, TCSANOW, &attr) == -1)
+       mono_attr = initial_attr;
+       mono_attr.c_lflag &= ~ICANON;
+       mono_attr.c_cc [VMIN] = 1;
+       mono_attr.c_cc [VTIME] = 0;
+       if (tcsetattr (STDIN_FILENO, TCSANOW, &mono_attr) == -1)
                return FALSE;
 
        *verase = initial_attr.c_cc [VERASE];
@@ -322,6 +326,8 @@ ves_icall_System_ConsoleDriver_TtySetup (MonoString *teardown, char *verase, cha
        if (setup_finished)
                return TRUE;
 
+       keypad_xmit_str = keypad != NULL ? mono_string_to_utf8 (keypad) : NULL;
+       
        console_set_signal_handlers ();
        setup_finished = TRUE;
        if (!atexit_called) {

diff --git a/mono/metadata/console-io.h b/mono/metadata/console-io.h
index b28d3f5423edf20a5796c3f5363542417b315658..13351579610519292e22e223f915ea0b6d14e695 100644 (file)
--- a/mono/metadata/console-io.h
+++ b/mono/metadata/console-io.h
@@ -22,7 +22,7 @@ MonoBoolean ves_icall_System_ConsoleDriver_Isatty (HANDLE handle) MONO_INTERNAL;
 gint32 ves_icall_System_ConsoleDriver_InternalKeyAvailable (gint32 timeout) MONO_INTERNAL;
 MonoBoolean ves_icall_System_ConsoleDriver_SetEcho (MonoBoolean echo) MONO_INTERNAL;
 MonoBoolean ves_icall_System_ConsoleDriver_SetBreak (MonoBoolean want_break) MONO_INTERNAL;
-MonoBoolean ves_icall_System_ConsoleDriver_TtySetup (MonoString *teardown, char *verase, char *vsusp, char *intr) MONO_INTERNAL;
+MonoBoolean ves_icall_System_ConsoleDriver_TtySetup (MonoString *keypad, MonoString *teardown, char *verase, char *vsusp, char *intr) MONO_INTERNAL;
 MonoBoolean ves_icall_System_ConsoleDriver_GetTtySize (HANDLE handle, gint32 *width, gint32 *height) MONO_INTERNAL;
 void ves_icall_System_ConsoleDriver_Suspend (void) MONO_INTERNAL;