summaryrefslogtreecommitdiffstats
path: root/src/hci/mucurses
diff options
context:
space:
mode:
authorMichael Brown2012-03-26 20:02:30 +0200
committerMichael Brown2012-03-26 20:02:30 +0200
commit64d17dbd509d15ddf41bfc5d5b88d53b5af98155 (patch)
tree11cedaa6c5bb817f4094c71eb397bda266736b97 /src/hci/mucurses
parent[console] Allow usage to be defined independently for each console (diff)
downloadipxe-64d17dbd509d15ddf41bfc5d5b88d53b5af98155.tar.gz
ipxe-64d17dbd509d15ddf41bfc5d5b88d53b5af98155.tar.xz
ipxe-64d17dbd509d15ddf41bfc5d5b88d53b5af98155.zip
[console] Exclude text-based UI output from logfile-based consoles
The output from text-based user interfaces such as the "config" command is not generally meaningful for logfile-based consoles such as syslog and vmconsole. Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/hci/mucurses')
-rw-r--r--src/hci/mucurses/ansi_screen.c16
1 files changed, 14 insertions, 2 deletions
diff --git a/src/hci/mucurses/ansi_screen.c b/src/hci/mucurses/ansi_screen.c
index cc342f7c..d952e5f2 100644
--- a/src/hci/mucurses/ansi_screen.c
+++ b/src/hci/mucurses/ansi_screen.c
@@ -12,6 +12,8 @@ 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_reset ( struct _curses_screen *scr ) {
/* Reset terminal attributes and clear screen */
scr->attrs = 0;
@@ -20,6 +22,16 @@ static void ansiscr_reset ( struct _curses_screen *scr ) {
printf ( "\033[0m" );
}
+static void ansiscr_init ( struct _curses_screen *scr ) {
+ saved_usage = console_set_usage ( CONSOLE_USAGE_TUI );
+ ansiscr_reset ( scr );
+}
+
+static void ansiscr_exit ( struct _curses_screen *scr ) {
+ ansiscr_reset ( scr );
+ console_set_usage ( saved_usage );
+}
+
static void ansiscr_movetoyx ( struct _curses_screen *scr,
unsigned int y, unsigned int x ) {
if ( ( x != scr->curs_x ) || ( y != scr->curs_y ) ) {
@@ -65,8 +77,8 @@ static bool ansiscr_peek ( struct _curses_screen *scr __unused ) {
}
SCREEN _ansi_screen = {
- .init = ansiscr_reset,
- .exit = ansiscr_reset,
+ .init = ansiscr_init,
+ .exit = ansiscr_exit,
.movetoyx = ansiscr_movetoyx,
.putc = ansiscr_putc,
.getc = ansiscr_getc,