aboutsummaryrefslogtreecommitdiffstats
path: root/src/include
diff options
context:
space:
mode:
authorMichael Brown <mcb30@ipxe.org>2013-12-06 17:47:54 +0000
committerMichael Brown <mcb30@ipxe.org>2013-12-06 17:47:54 +0000
commit03401f9d2101b5033c67f6d588152c28a1cc7503 (patch)
treea0885779addd3444b2c5365f04e6a1a95431dd6f /src/include
parent1680d0d14d2bf85ebab6c245b28a7b9dcaa81f53 (diff)
downloadipxe-03401f9d2101b5033c67f6d588152c28a1cc7503.tar.gz
[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>
Diffstat (limited to 'src/include')
-rw-r--r--src/include/curses.h7
-rw-r--r--src/include/ipxe/console.h20
2 files changed, 23 insertions, 4 deletions
diff --git a/src/include/curses.h b/src/include/curses.h
index c472d695f..f16f9d7d0 100644
--- 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 9c2620bc9..ab39cbfc1 100644
--- 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 );