summaryrefslogtreecommitdiffstats
path: root/mdk-stage1/newt-frontend.c
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2000-12-12 21:05:30 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2000-12-12 21:05:30 +0000
commit2b2914cc04a93ca362e4eb3663061c3039aa4049 (patch)
tree3f8dbeae1bc114e58f3246cd76b9b0156392b720 /mdk-stage1/newt-frontend.c
parent7852f76ee05551c05a4f833f9a55bec15f44f85d (diff)
downloaddrakx-2b2914cc04a93ca362e4eb3663061c3039aa4049.tar
drakx-2b2914cc04a93ca362e4eb3663061c3039aa4049.tar.gz
drakx-2b2914cc04a93ca362e4eb3663061c3039aa4049.tar.bz2
drakx-2b2914cc04a93ca362e4eb3663061c3039aa4049.tar.xz
drakx-2b2914cc04a93ca362e4eb3663061c3039aa4049.zip
- add pci probing feature
- add listing of available modules and insmod'ing on user request - make rescue-stage2 working
Diffstat (limited to 'mdk-stage1/newt-frontend.c')
-rw-r--r--mdk-stage1/newt-frontend.c20
1 files changed, 16 insertions, 4 deletions
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);