diff options
Diffstat (limited to 'src/hci')
| -rw-r--r-- | src/hci/mucurses/ansi_screen.c | 14 | ||||
| -rw-r--r-- | src/hci/tui/login_ui.c | 8 | ||||
| -rw-r--r-- | src/hci/tui/menu_ui.c | 10 | ||||
| -rw-r--r-- | src/hci/tui/settings_ui.c | 14 |
4 files changed, 11 insertions, 35 deletions
diff --git a/src/hci/mucurses/ansi_screen.c b/src/hci/mucurses/ansi_screen.c index a37daff3..1d3143f8 100644 --- a/src/hci/mucurses/ansi_screen.c +++ b/src/hci/mucurses/ansi_screen.c @@ -1,5 +1,6 @@ #include <stdio.h> #include <curses.h> +#include <ipxe/ansicol.h> #include <ipxe/console.h> FILE_LICENCE ( GPL2_OR_LATER ); @@ -14,14 +15,13 @@ static unsigned int saved_usage; static void ansiscr_attrs ( struct _curses_screen *scr, attr_t attrs ) { int bold = ( attrs & A_BOLD ); attr_t cpair = PAIR_NUMBER ( attrs ); - short fcol; - short bcol; if ( scr->attrs != attrs ) { scr->attrs = attrs; - pair_content ( cpair, &fcol, &bcol ); - /* ANSI escape sequence to update character attributes */ - printf ( "\033[0;%d;3%d;4%dm", ( bold ? 1 : 22 ), fcol, bcol ); + /* Reset attributes and set/clear bold as appropriate */ + printf ( "\033[0;%dm", ( bold ? 1 : 22 ) ); + /* Set foreground and background colours */ + ansicol_set_pair ( cpair ); } } @@ -30,7 +30,9 @@ static void ansiscr_reset ( struct _curses_screen *scr ) { scr->attrs = 0; scr->curs_x = 0; scr->curs_y = 0; - printf ( "\033[0m\033[2J" ); + printf ( "\0330m" ); + ansicol_set_pair ( CPAIR_DEFAULT ); + printf ( "\033[2J" ); } static void ansiscr_init ( struct _curses_screen *scr ) { diff --git a/src/hci/tui/login_ui.c b/src/hci/tui/login_ui.c index 4bf0ad8f..996b68a0 100644 --- a/src/hci/tui/login_ui.c +++ b/src/hci/tui/login_ui.c @@ -32,12 +32,8 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <ipxe/settings.h> #include <ipxe/editbox.h> #include <ipxe/keys.h> +#include <ipxe/ansicol.h> #include <ipxe/login_ui.h> -#include <config/colour.h> - -/* Colour pairs */ -#define CPAIR_NORMAL 1 -#define CPAIR_EDIT 2 /* Screen layout */ #define USERNAME_LABEL_ROW ( ( LINES / 2U ) - 4U ) @@ -66,8 +62,6 @@ int login_ui ( void ) { /* Initialise UI */ initscr(); start_color(); - init_pair ( CPAIR_NORMAL, COLOR_NORMAL_FG, COLOR_NORMAL_BG ); - init_pair ( CPAIR_EDIT, COLOR_EDIT_FG, COLOR_EDIT_BG ); init_editbox ( &username_box, username, sizeof ( username ), NULL, USERNAME_ROW, EDITBOX_COL, EDITBOX_WIDTH, 0 ); init_editbox ( &password_box, password, sizeof ( password ), NULL, diff --git a/src/hci/tui/menu_ui.c b/src/hci/tui/menu_ui.c index d5645b32..0a9566de 100644 --- a/src/hci/tui/menu_ui.c +++ b/src/hci/tui/menu_ui.c @@ -31,13 +31,8 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <ipxe/keys.h> #include <ipxe/timer.h> #include <ipxe/console.h> +#include <ipxe/ansicol.h> #include <ipxe/menu.h> -#include <config/colour.h> - -/* Colour pairs */ -#define CPAIR_NORMAL 1 -#define CPAIR_SELECT 2 -#define CPAIR_SEPARATOR 3 /* Screen layout */ #define TITLE_ROW 1U @@ -345,9 +340,6 @@ int show_menu ( struct menu *menu, unsigned long timeout, /* Initialise screen */ initscr(); start_color(); - init_pair ( CPAIR_NORMAL, COLOR_NORMAL_FG, COLOR_NORMAL_BG ); - init_pair ( CPAIR_SELECT, COLOR_SELECT_FG, COLOR_SELECT_BG ); - init_pair ( CPAIR_SEPARATOR, COLOR_SEPARATOR_FG, COLOR_SEPARATOR_BG ); color_set ( CPAIR_NORMAL, NULL ); curs_set ( 0 ); erase(); diff --git a/src/hci/tui/settings_ui.c b/src/hci/tui/settings_ui.c index 0b93cffc..22183973 100644 --- a/src/hci/tui/settings_ui.c +++ b/src/hci/tui/settings_ui.c @@ -28,8 +28,8 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <ipxe/settings.h> #include <ipxe/editbox.h> #include <ipxe/keys.h> +#include <ipxe/ansicol.h> #include <ipxe/settings_ui.h> -#include <config/colour.h> /** @file * @@ -37,13 +37,6 @@ FILE_LICENCE ( GPL2_OR_LATER ); * */ -/* Colour pairs */ -#define CPAIR_NORMAL 1 -#define CPAIR_SELECT 2 -#define CPAIR_EDIT 3 -#define CPAIR_ALERT 4 -#define CPAIR_URL 5 - /* Screen layout */ #define TITLE_ROW 1U #define SETTINGS_LIST_ROW 3U @@ -598,11 +591,6 @@ int settings_ui ( struct settings *settings ) { initscr(); start_color(); - init_pair ( CPAIR_NORMAL, COLOR_NORMAL_FG, COLOR_NORMAL_BG ); - init_pair ( CPAIR_SELECT, COLOR_SELECT_FG, COLOR_SELECT_BG ); - init_pair ( CPAIR_EDIT, COLOR_EDIT_FG, COLOR_EDIT_BG ); - init_pair ( CPAIR_ALERT, COLOR_ALERT_FG, COLOR_ALERT_BG ); - init_pair ( CPAIR_URL, COLOR_URL_FG, COLOR_URL_BG ); color_set ( CPAIR_NORMAL, NULL ); curs_set ( 0 ); erase(); |