[ui] Allow colours to be configured via config/colour.h

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

diff --git a/src/config/colour.h b/src/config/colour.h
new file mode 100644 (file)
index 0000000..d32d46d
--- /dev/null
+++ b/src/config/colour.h
@@ -0,0 +1,32 @@
+#ifndef CONFIG_COLOUR_H
+#define CONFIG_COLOUR_H
+
+/** @file
+ *
+ * Display colour configuration
+ *
+ */
+
+FILE_LICENCE ( GPL2_OR_LATER );
+
+#define COLOR_NORMAL_FG                COLOR_WHITE
+#define COLOR_NORMAL_BG                COLOR_BLUE
+
+#define COLOR_SELECT_FG                COLOR_WHITE
+#define COLOR_SELECT_BG                COLOR_RED
+
+#define COLOR_SEPARATOR_FG     COLOR_CYAN
+#define COLOR_SEPARATOR_BG     COLOR_BLUE
+
+#define COLOR_EDIT_FG          COLOR_BLACK
+#define COLOR_EDIT_BG          COLOR_CYAN
+
+#define COLOR_ALERT_FG         COLOR_WHITE
+#define COLOR_ALERT_BG         COLOR_RED
+
+#define COLOR_URL_FG           COLOR_CYAN
+#define COLOR_URL_BG           COLOR_BLUE
+
+#include <config/local/colour.h>
+
+#endif /* CONFIG_COLOUR_H */

diff --git a/src/hci/tui/login_ui.c b/src/hci/tui/login_ui.c
index 4143a607eebf4131feb4c324cf4af07d2e0a54f4..c33cbcf2e3d889ded803f7e392b8a14c791143fd 100644 (file)
--- a/src/hci/tui/login_ui.c
+++ b/src/hci/tui/login_ui.c
@@ -32,6 +32,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <ipxe/editbox.h>
 #include <ipxe/keys.h>
 #include <ipxe/login_ui.h>
+#include <config/colour.h>
 
 /* Colour pairs */
 #define CPAIR_NORMAL           1
@@ -64,8 +65,8 @@ int login_ui ( void ) {
        /* Initialise UI */
        initscr();
        start_color();
-       init_pair ( CPAIR_NORMAL, COLOR_WHITE, COLOR_BLUE );
-       init_pair ( CPAIR_EDIT, COLOR_BLACK, COLOR_CYAN );
+       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 30d93ad2fa53fad0953803a2d03f381278aa8cce..616256228a06cb981ea8be528532c6ff675451d9 100644 (file)
--- a/src/hci/tui/menu_ui.c
+++ b/src/hci/tui/menu_ui.c
@@ -31,6 +31,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <ipxe/timer.h>
 #include <ipxe/console.h>
 #include <ipxe/menu.h>
+#include <config/colour.h>
 
 /* Colour pairs */
 #define CPAIR_NORMAL   1
@@ -339,9 +340,9 @@ int show_menu ( struct menu *menu, unsigned int timeout_ms,
        /* Initialise screen */
        initscr();
        start_color();
-       init_pair ( CPAIR_NORMAL, COLOR_WHITE, COLOR_BLUE );
-       init_pair ( CPAIR_SELECT, COLOR_WHITE, COLOR_RED );
-       init_pair ( CPAIR_SEPARATOR, COLOR_CYAN, COLOR_BLUE );
+       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 );
        erase();
 

diff --git a/src/hci/tui/settings_ui.c b/src/hci/tui/settings_ui.c
index ed076101fe019d79e219c034c8785a54370b78b2..258f0cf92d49f915909b77db66b69a8139e6b1ac 100644 (file)
--- a/src/hci/tui/settings_ui.c
+++ b/src/hci/tui/settings_ui.c
@@ -28,6 +28,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <ipxe/editbox.h>
 #include <ipxe/keys.h>
 #include <ipxe/settings_ui.h>
+#include <config/colour.h>
 
 /** @file
  *
@@ -557,11 +558,11 @@ int settings_ui ( struct settings *settings ) {
 
        initscr();
        start_color();
-       init_pair ( CPAIR_NORMAL, COLOR_WHITE, COLOR_BLUE );
-       init_pair ( CPAIR_SELECT, COLOR_WHITE, COLOR_RED );
-       init_pair ( CPAIR_EDIT, COLOR_BLACK, COLOR_CYAN );
-       init_pair ( CPAIR_ALERT, COLOR_WHITE, COLOR_RED );
-       init_pair ( CPAIR_URL, COLOR_CYAN, COLOR_BLUE );
+       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 );
        erase();