+2008-09-07 Miguel de Icaza <miguel@novell.com>
+
+ * console-io.c: Add support for tracking the window size if it
+ changes.
+
+ The setup is very simple: the TtySetup function will now return a
+ pointer to a location in memory that tracks the current console
+ size. The managed code checks its current value every time its
+ queried against the last value set, and updates accordingly.
+
+ With this setup we can work with multiple consoles, and we do not
+ require to poke into managed code from a signal handler.
+
+ Additionally, the environment for COLUMNS and LINES is now handled
+ in unmanaged code.
+
+ (ves_icall_System_ConsoleDriver_GetTtySize): This is now gone.
+
2008-09-07 Mark Probst <mark.probst@gmail.com>
* marshal.c (mono_type_native_stack_size): Treat
return FALSE;
}
-MonoBoolean
-ves_icall_System_ConsoleDriver_GetTtySize (HANDLE handle, gint32 *width, gint32 *height)
-{
- return FALSE;
-}
-
#else
static struct termios initial_attr;
return (ret > 0) ? ret : 0;
}
+static gint32 cols_and_lines;
+
+#ifdef TIOCGWINSZ
+static int
+terminal_get_dimensions (void)
+{
+ struct winsize ws;
+
+ if (ioctl (STDIN_FILENO, TIOCGWINSZ, &ws) == 0)
+ return (ws.ws_col << 16) | ws.ws_row;
+
+ return -1;
+}
+#else
+static int
+terminal_get_dimensions (void)
+{
+ return -1;
+}
+#endif
+
static void
tty_teardown (void)
{
in_sigint = FALSE;
}
-static struct sigaction save_sigcont, save_sigint;
+static struct sigaction save_sigcont, save_sigint, save_sigwinch;
static void
sigcont_handler (int signo, void *the_siginfo, void *data)
if (keypad_xmit_str != NULL)
write (STDOUT_FILENO, keypad_xmit_str, strlen (keypad_xmit_str));
+ // Call previous handler
if (save_sigcont.sa_sigaction != NULL &&
save_sigcont.sa_sigaction != (void *)SIG_DFL &&
save_sigcont.sa_sigaction != (void *)SIG_IGN)
(*save_sigcont.sa_sigaction) (signo, the_siginfo, data);
}
+static void
+sigwinch_handler (int signo, void *the_siginfo, void *data)
+{
+ int dims = terminal_get_dimensions ();
+ if (dims != -1)
+ cols_and_lines = dims;
+
+ // Call previous handler
+ if (save_sigwinch.sa_sigaction != NULL &&
+ save_sigwinch.sa_sigaction != (void *)SIG_DFL &&
+ save_sigwinch.sa_sigaction != (void *)SIG_IGN)
+ (*save_sigwinch.sa_sigaction) (signo, the_siginfo, data);
+}
+
void
console_set_signal_handlers ()
{
- struct sigaction sigcont, sigint;
+ struct sigaction sigcont, sigint, sigwinch;
memset (&sigcont, 0, sizeof (struct sigaction));
memset (&sigint, 0, sizeof (struct sigaction));
sigint.sa_flags = 0;
sigemptyset (&sigint.sa_mask);
sigaction (SIGINT, &sigint, &save_sigint);
+
+ // Window size changed
+ sigwinch.sa_handler = (void *) sigwinch_handler;
+ sigwinch.sa_flags = 0;
+ sigemptyset (&sigwinch.sa_mask);
+ sigaction (SIGWINCH, &sigwinch, &save_sigwinch);
}
//
{
sigaction (SIGCONT, &save_sigcont, NULL);
sigaction (SIGINT, &save_sigint, NULL);
+ sigaction (SIGWINCH, &save_sigwinch, NULL);
}
MonoBoolean
-ves_icall_System_ConsoleDriver_TtySetup (MonoString *keypad, MonoString *teardown, char *verase, char *vsusp, char*intr)
+ves_icall_System_ConsoleDriver_TtySetup (MonoString *keypad, MonoString *teardown, char *verase, char *vsusp, char*intr, int **size)
{
+ int dims;
+
MONO_ARCH_SAVE_REGS;
+ dims = terminal_get_dimensions ();
+ if (dims == -1){
+ int cols = 0, rows = 0;
+
+ char *str = getenv ("COLUMNS");
+ if (str != NULL)
+ cols = atoi (str);
+ str = getenv ("LINES");
+ if (str != NULL)
+ rows = atoi (str);
+
+ if (cols != 0 && rows != 0)
+ cols_and_lines = (cols << 16) | rows;
+ else
+ cols_and_lines = -1;
+ } else {
+ cols_and_lines = dims;
+ }
+
+ *size = &cols_and_lines;
+
*verase = '\0';
*vsusp = '\0';
*intr = '\0';
return TRUE;
}
-MonoBoolean
-ves_icall_System_ConsoleDriver_GetTtySize (HANDLE handle, gint32 *width, gint32 *height)
-{
-#ifdef TIOCGWINSZ
- struct winsize ws;
- int res;
-
- MONO_ARCH_SAVE_REGS;
-
- res = ioctl (GPOINTER_TO_INT (handle), TIOCGWINSZ, &ws);
-
- if (!res) {
- *width = ws.ws_col;
- *height = ws.ws_row;
- return TRUE;
- }
- else
- return FALSE;
-#else
- return FALSE;
-#endif
-}
-
#endif /* !PLATFORM_WIN32 */
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 *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;
+MonoBoolean ves_icall_System_ConsoleDriver_TtySetup (MonoString *keypad, MonoString *teardown, char *verase, char *vsusp, char *intr, int **size) MONO_INTERNAL;
void ves_icall_System_ConsoleDriver_Suspend (void) MONO_INTERNAL;
void console_restore_signal_handlers (void);
ICALL(INTCFGHOST_1, "get_bundled_machine_config", get_bundled_machine_config)
ICALL_TYPE(CONSOLE, "System.ConsoleDriver", CONSOLE_1)
-ICALL(CONSOLE_1, "GetTtySize", ves_icall_System_ConsoleDriver_GetTtySize )
-ICALL(CONSOLE_2, "InternalKeyAvailable", ves_icall_System_ConsoleDriver_InternalKeyAvailable )
-ICALL(CONSOLE_3, "Isatty", ves_icall_System_ConsoleDriver_Isatty )
-ICALL(CONSOLE_4, "SetBreak", ves_icall_System_ConsoleDriver_SetBreak )
-ICALL(CONSOLE_5, "SetEcho", ves_icall_System_ConsoleDriver_SetEcho )
-ICALL(CONSOLE_6, "TtySetup", ves_icall_System_ConsoleDriver_TtySetup )
+ICALL(CONSOLE_1, "InternalKeyAvailable", ves_icall_System_ConsoleDriver_InternalKeyAvailable )
+ICALL(CONSOLE_2, "Isatty", ves_icall_System_ConsoleDriver_Isatty )
+ICALL(CONSOLE_3, "SetBreak", ves_icall_System_ConsoleDriver_SetBreak )
+ICALL(CONSOLE_4, "SetEcho", ves_icall_System_ConsoleDriver_SetEcho )
+ICALL(CONSOLE_5, "TtySetup", ves_icall_System_ConsoleDriver_TtySetup )
ICALL_TYPE(CONVERT, "System.Convert", CONVERT_1)
ICALL(CONVERT_1, "InternalFromBase64CharArray", InternalFromBase64CharArray )
projects / mono.git / commitdiff