[src/trunk]: src/distrib/utils/sysinst - Add a message explaining the user ho...

[bouyer <bouyer%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2f80bef75b5d
branches:  trunk
changeset: 471852:2f80bef75b5d
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Tue Apr 13 14:49:56 1999 +0000

description:
- Add a message explaining the user how to specify units for inputs
- in run_prog(), do an explicit wclear(stdscr); wrefresh(stdscr);
  before launching subwindows. This seems to solve all the display
  problems associated with run_prog().

diffstat:

 distrib/utils/sysinst/arch/i386/md.c |  5 +++--
 distrib/utils/sysinst/menus.mi.eng   |  3 ++-
 distrib/utils/sysinst/menus.mi.fr    |  3 ++-
 distrib/utils/sysinst/msg.mi.eng     |  7 ++++++-
 distrib/utils/sysinst/msg.mi.fr      |  7 ++++++-
 distrib/utils/sysinst/net.c          |  4 +---
 distrib/utils/sysinst/run.c          |  7 +++++--
 7 files changed, 25 insertions(+), 11 deletions(-)

diffs (143 lines):

diff -r 5fdfbb619000 -r 2f80bef75b5d distrib/utils/sysinst/arch/i386/md.c
--- a/distrib/utils/sysinst/arch/i386/md.c      Tue Apr 13 14:08:17 1999 +0000
+++ b/distrib/utils/sysinst/arch/i386/md.c      Tue Apr 13 14:49:56 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.c,v 1.23 1999/04/11 22:40:23 bouyer Exp $ */
+/*     $NetBSD: md.c,v 1.24 1999/04/13 14:49:57 bouyer Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -271,6 +271,7 @@
 
        case 3: /* custom: ask user for all sizes */
 custom:                ask_sizemult();
+               msg_display(MSG_defaultunit, multname);
                partstart = ptstart;
                remain = fsptsize;
 
@@ -280,7 +281,7 @@
                                   dlcylsize) - partstart;
                if (partsize > remain)
                        partsize = remain;
-               msg_display(MSG_askfsroot1, remain/sizemult, multname);
+               msg_display_add(MSG_askfsroot1, remain/sizemult, multname);
                partsize = getpartsize(MSG_askfsroot2, partstart, partsize);
                bsdlabel[A].pi_offset = partstart;
                bsdlabel[A].pi_size = partsize;
diff -r 5fdfbb619000 -r 2f80bef75b5d distrib/utils/sysinst/menus.mi.eng
--- a/distrib/utils/sysinst/menus.mi.eng        Tue Apr 13 14:08:17 1999 +0000
+++ b/distrib/utils/sysinst/menus.mi.eng        Tue Apr 13 14:49:56 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: menus.mi.eng,v 1.26 1999/04/11 22:40:20 bouyer Exp $   */
+/*     $NetBSD: menus.mi.eng,v 1.27 1999/04/13 14:49:56 bouyer Exp $   */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -135,6 +135,7 @@
        option "FS kind", sub menu  selfskind;
        option "Offset/size", action  
                {       int start, size;
+                       msg_display_add(MSG_defaultunit, multname);
                        start = getpartoff(MSG_offset, 0);
                        size = getpartsize(MSG_size, start, 0);
                        if (size == -1)
diff -r 5fdfbb619000 -r 2f80bef75b5d distrib/utils/sysinst/menus.mi.fr
--- a/distrib/utils/sysinst/menus.mi.fr Tue Apr 13 14:08:17 1999 +0000
+++ b/distrib/utils/sysinst/menus.mi.fr Tue Apr 13 14:49:56 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: menus.mi.fr,v 1.15 1999/04/11 22:40:20 bouyer Exp $    */
+/*     $NetBSD: menus.mi.fr,v 1.16 1999/04/13 14:49:56 bouyer Exp $    */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -135,6 +135,7 @@
        option "type de FS", sub menu  selfskind;
        option "Offset/taille", action  
                {       int start, size;
+                       msg_display_add(MSG_defaultunit, multname);
                        start = getpartoff(MSG_offset, 0);
                        size = getpartsize(MSG_size, start, 0);
                        if (size == -1)
diff -r 5fdfbb619000 -r 2f80bef75b5d distrib/utils/sysinst/msg.mi.eng
--- a/distrib/utils/sysinst/msg.mi.eng  Tue Apr 13 14:08:17 1999 +0000
+++ b/distrib/utils/sysinst/msg.mi.eng  Tue Apr 13 14:49:56 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: msg.mi.eng,v 1.38 1999/04/11 22:40:21 bouyer Exp $     */
+/*     $NetBSD: msg.mi.eng,v 1.39 1999/04/13 14:49:56 bouyer Exp $     */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -199,6 +199,11 @@
 cylinder size, which is %d sectors.
 }
 
+message defaultunit
+{Unless specified with 'M' (megabytes), 'c' (cylinders) or 's' sector
+at the end of input, sizes and offsets are in %s.
+}
+
 message startoutsidedisk
 {The start value you specified is beyond the end of the disk.
 }
diff -r 5fdfbb619000 -r 2f80bef75b5d distrib/utils/sysinst/msg.mi.fr
--- a/distrib/utils/sysinst/msg.mi.fr   Tue Apr 13 14:08:17 1999 +0000
+++ b/distrib/utils/sysinst/msg.mi.fr   Tue Apr 13 14:49:56 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: msg.mi.fr,v 1.15 1999/04/11 22:40:21 bouyer Exp $      */
+/*     $NetBSD: msg.mi.fr,v 1.16 1999/04/13 14:49:56 bouyer Exp $      */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -203,6 +203,11 @@
 taille d'un cylindre, qui est %d secteurs.
 }
 
+message defaultunit
+{Tailles et offsets sont en %s, sauf si vous spécifiez une unitée ('M' pour
+mégactets, 'c' pour cylindres, 's' pour secteurs) à la fin de votre nombre.
+}
+
 message startoutsidedisk
 {La valeur que vous avez spécifiée est en dehors du disque
 }
diff -r 5fdfbb619000 -r 2f80bef75b5d distrib/utils/sysinst/net.c
--- a/distrib/utils/sysinst/net.c       Tue Apr 13 14:08:17 1999 +0000
+++ b/distrib/utils/sysinst/net.c       Tue Apr 13 14:49:56 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: net.c,v 1.42 1999/04/11 22:40:21 bouyer Exp $  */
+/*     $NetBSD: net.c,v 1.43 1999/04/13 14:49:56 bouyer Exp $  */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -409,8 +409,6 @@
        strncat(ftp_dir, ftp_prefix, STRSIZE - strlen(ftp_dir));
        process_menu(MENU_ftpsource);
 
-       msg_clear();
-       
        list = dist_list;
        while (list->name) {
                if (!list->getit) {
diff -r 5fdfbb619000 -r 2f80bef75b5d distrib/utils/sysinst/run.c
--- a/distrib/utils/sysinst/run.c       Tue Apr 13 14:08:17 1999 +0000
+++ b/distrib/utils/sysinst/run.c       Tue Apr 13 14:49:56 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: run.c,v 1.13 1999/04/11 22:40:21 bouyer Exp $  */
+/*     $NetBSD: run.c,v 1.14 1999/04/13 14:49:56 bouyer Exp $  */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -437,9 +437,12 @@
                win.ws_col = 80;
 
        if (display) {
+               wclear(stdscr); /* XXX shouldn't be needed */
+               wrefresh(stdscr);
                statuswin = subwin(stdscr, win.ws_row, win.ws_col, 0, 0);
                boxwin = subwin(statuswin, win.ws_row - 3, win.ws_col, 3, 0);
-               actionwin = subwin(statuswin, win.ws_row - 5, win.ws_col - 3, 4, 1);
+               actionwin = subwin(statuswin, win.ws_row - 5, win.ws_col - 3,
+                  4, 1);
                scrollok(actionwin, TRUE);
 
                win.ws_col -= 3;