From 2b2914cc04a93ca362e4eb3663061c3039aa4049 Mon Sep 17 00:00:00 2001
From: Guillaume Cottenceau <gc@mandriva.com>
Date: Tue, 12 Dec 2000 21:05:30 +0000
Subject: - add pci probing feature - add listing of available modules and
 insmod'ing on user request - make rescue-stage2 working

---
 mdk-stage1/newt-frontend.c | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

(limited to 'mdk-stage1/newt-frontend.c')

diff --git a/mdk-stage1/newt-frontend.c b/mdk-stage1/newt-frontend.c
index fcaeabcb6..8a057f98e 100644
--- a/mdk-stage1/newt-frontend.c
+++ b/mdk-stage1/newt-frontend.c
@@ -44,7 +44,7 @@ void init_frontend(void)
 	
 	newtDrawRootText(0, 0, "Welcome to Linux-Mandrake (" VERSION ") " __DATE__ " " __TIME__);
 	
-	newtPushHelpLine("  <Tab>/<Alt-Tab> between elements, <Space>/<Enter> selects");
+	newtPushHelpLine(" <Alt-F1> for here, <Alt-F3> to see the logs, <Alt-F4> for kernel msg");
 }
 
 
@@ -54,14 +54,25 @@ void finish_frontend(void)
 }
 
 
-void error_message(char *msg)
+void error_message(char *msg, ...)
 {
-	newtWinMessage("Error", "Ok", msg);
+	va_list args;
+	va_start(args, msg);
+	va_end(args);
+	newtWinMessagev("Error", "Ok", msg, args);
+}
+
+void info_message(char *msg, ...)
+{
+	va_list args;
+	va_start(args, msg);
+	va_end(args);
+	newtWinMessagev("Notice", "Ok", msg, args);
 }
 
 void wait_message(char *msg, ...)
 {
-	int width = strlen(msg) + 12;
+	int width = 8;
 	int height = 3;
 	char * title = "Please wait...";
 	newtComponent t, f;
@@ -77,6 +88,7 @@ void wait_message(char *msg, ...)
 		if (buf) free(buf);
 		buf = malloc(size);
 		i = vsnprintf(buf, size, msg, args);
+		width += i;
 	} while (i == size);
 	
 	va_end(args);
-- 
cgit v1.2.1