[console] Allow consoles to update the recorded console size

Provide a mechanism for consoles to update the recorded console width
and height, and use this width and height to provide the curses COLS
and LINES variables.

We choose not to use ANSI escape sequences to obtain the width and
height, for two reasons:

- iPXE's model is that all output is sent to all consoles; we could
  therefore end up with multiple consoles reporting conflicting widths
  and heights

- when a serial console is in use, we probably don't want to resize
  the output shown on the BIOS console to match the size of the serial
  console, since it's likely that the serial console is in use only
  for debugging.

Signed-off-by: Michael Brown <mcb30@ipxe.org>

diff --git a/src/core/console.c b/src/core/console.c
index 5f3c28d849af40cf97dc6d9d20110499ba5cd4b2..141d8f0f09bdf1661291b757647f3bdcd1ecb54f 100644 (file)
--- a/src/core/console.c
+++ b/src/core/console.c
@@ -10,6 +10,12 @@ FILE_LICENCE ( GPL2_OR_LATER );
 /** Current console usage */
 int console_usage = CONSOLE_USAGE_STDOUT;
 
+/** Console width */
+unsigned int console_width = CONSOLE_DEFAULT_WIDTH;
+
+/** Console height */
+unsigned int console_height = CONSOLE_DEFAULT_HEIGHT;
+
 /**
  * Write a single character to each console device
  *
@@ -138,6 +144,9 @@ int console_configure ( struct console_configuration *config ) {
        struct console_driver *console;
        int rc;
 
+       /* Reset console width and height */
+       console_set_size ( CONSOLE_DEFAULT_WIDTH, CONSOLE_DEFAULT_HEIGHT );
+
        /* Try to configure each console */
        for_each_table_entry ( console, CONSOLES ) {
                if ( ( console->configure ) &&

diff --git a/src/hci/mucurses/ansi_screen.c b/src/hci/mucurses/ansi_screen.c
index d3c685ed0d2a63431b6819d9c56ac7310da6884c..a37daff3280221d4cf51cafb24067ff27e06e0d3 100644 (file)
--- a/src/hci/mucurses/ansi_screen.c
+++ b/src/hci/mucurses/ansi_screen.c
@@ -9,9 +9,6 @@ static void ansiscr_movetoyx(struct _curses_screen *scr,
                                unsigned int y, unsigned int x) __nonnull;
 static void ansiscr_putc(struct _curses_screen *scr, chtype c) __nonnull;
 
-unsigned short _COLS = 80;
-unsigned short _LINES = 24;
-
 static unsigned int saved_usage;
 
 static void ansiscr_attrs ( struct _curses_screen *scr, attr_t attrs ) {
@@ -72,7 +69,7 @@ static void ansiscr_putc ( struct _curses_screen *scr, chtype c ) {
        putchar ( character );
 
        /* Update expected cursor position */
-       if ( ++(scr->curs_x) == _COLS ) {
+       if ( ++(scr->curs_x) == COLS ) {
                scr->curs_x = 0;
                ++scr->curs_y;
        }

diff --git a/src/include/curses.h b/src/include/curses.h
index c472d695f2bbee5bf1e47d85950266feae33a4d9..f16f9d7d0b524275d937e7b46333937f857671be 100644 (file)
--- a/src/include/curses.h
+++ b/src/include/curses.h
@@ -3,6 +3,7 @@
 
 #include <stdint.h>
 #include <stdarg.h>
+#include <ipxe/console.h>
 
 /** @file
  *
@@ -105,12 +106,10 @@ typedef struct _curses_window {
 } WINDOW;
 
 extern WINDOW _stdscr;
-extern unsigned short _COLS;
-extern unsigned short _LINES;
 
 #define stdscr ( &_stdscr )
-#define COLS _COLS
-#define LINES _LINES
+#define COLS console_width
+#define LINES console_height
 
 #define MUCURSES_BITS( mask, shift ) (( mask ) << (shift))
 #define CPAIR_SHIFT    8

diff --git a/src/include/ipxe/console.h b/src/include/ipxe/console.h
index 9c2620bc939bdcc88c4a25af0612687bfe7c9e2a..ab39cbfc1b15b74163b959a413b29dc5b48bd846 100644 (file)
--- a/src/include/ipxe/console.h
+++ b/src/include/ipxe/console.h
@@ -159,7 +159,15 @@ struct console_driver {
  */
 #define CONSOLE_EXPLICIT( console ) ( ( 2 * console + 1 ) != 2 )
 
+/** Default console width */
+#define CONSOLE_DEFAULT_WIDTH 80
+
+/** Default console height */
+#define CONSOLE_DEFAULT_HEIGHT 25
+
 extern int console_usage;
+extern unsigned int console_width;
+extern unsigned int console_height;
 
 /**
  * Set console usage
@@ -175,6 +183,18 @@ console_set_usage ( int usage ) {
        return old_usage;
 }
 
+/**
+ * Set console size
+ *
+ * @v width            Width, in characters
+ * @v height           Height, in characters
+ */
+static inline __attribute__ (( always_inline )) void
+console_set_size ( unsigned int width, unsigned int height ) {
+       console_width = width;
+       console_height = height;
+}
+
 extern int iskey ( void );
 extern int getkey ( unsigned long timeout );
 extern int console_configure ( struct console_configuration *config );