Saner screen refresh changes, part I.

4 files changed, 33 insertions, 25 deletions

diff --git a/release/sysinstall/disks.c b/release/sysinstall/disks.c
index 115c2a8..d1a7e97 100644
--- a/release/sysinstall/disks.c
+++ b/release/sysinstall/disks.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: disks.c,v 1.63 1996/08/03 10:10:44 jkh Exp $
+ * $Id: disks.c,v 1.64 1996/09/22 00:48:55 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -222,6 +222,7 @@ diskPartition(Device *dev, Disk *d)
 	case KEY_F(1):
 	case '?':
 	    systemDisplayHelp("slice");
+	    clear();
 	    break;
 
 	case 'A': {
@@ -250,6 +251,7 @@ diskPartition(Device *dev, Disk *d)
 	    variable_set2(DISK_PARTITIONED, "yes");
 	    record_chunks(d);
 	}
+	clear();
 	break;
 
 	case 'B':
@@ -263,6 +265,7 @@ diskPartition(Device *dev, Disk *d)
 		else
 		    chunk_info[current_chunk]->flags |= CHUNK_BAD144;
 	    }
+	    clear();
 	    break;
 
 	case 'C':
@@ -299,6 +302,7 @@ diskPartition(Device *dev, Disk *d)
 				 (chunk_info[current_chunk]->flags & CHUNK_ALIGN));
 		    variable_set2(DISK_PARTITIONED, "yes");
 		    record_chunks(d);
+	    	    clear();
 		    }
 		}
 	    }
@@ -327,6 +331,7 @@ diskPartition(Device *dev, Disk *d)
 		d->bios_hd = strtol(val + 1, &val, 0);
 		d->bios_sect = strtol(val + 1, 0, 0);
 	    }
+	    clear();
 	}
 	break;
 
@@ -336,12 +341,14 @@ diskPartition(Device *dev, Disk *d)
 	break;
 	
     case 'U':
-	    clear();
-	    if (msgYesNo("Are you SURE you want to Undo everything?"))
+	    if (msgYesNo("Are you SURE you want to Undo everything?")) {
+		clear();
 		break;
+	    }
 	    d = Open_Disk(d->name);
 	    if (!d) {
 		msgConfirm("Can't reopen disk %s! Internal state is probably corrupted", d->name);
+	    	clear();
 		break;
 	    }
 	    Free_Disk(dev->private);
@@ -349,6 +356,7 @@ diskPartition(Device *dev, Disk *d)
 	    variable_unset(DISK_PARTITIONED);
 	    variable_unset(DISK_LABELLED);
 	    record_chunks(d);
+	    clear();
 	    break;
 
 	case 'W':
@@ -373,6 +381,7 @@ diskPartition(Device *dev, Disk *d)
 		else
 		    msgConfirm("Wrote FDISK partition information out successfully.");
 	    }
+	    clear();
 	    break;
 
 	case '|':
diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c
index 484d0d7..b695c2b 100644
--- a/release/sysinstall/install.c
+++ b/release/sysinstall/install.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: install.c,v 1.118 1996/08/03 10:11:00 jkh Exp $
+ * $Id: install.c,v 1.119 1996/09/29 10:03:30 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -392,13 +392,11 @@ installNovice(dialogMenuItem *self)
 	    break;
     }
 
-    if (!mediaDevice) {
-	msgConfirm("Finally, you must specify an installation medium.");
-	if (!dmenuOpenSimple(&MenuMedia, FALSE) || !mediaDevice)
-	    return DITEM_FAILURE | DITEM_RECREATE;
-    }
+    if (!mediaDevice && !dmenuOpenSimple(&MenuMedia, FALSE))
+	return DITEM_FAILURE | DITEM_RECREATE;
 
     if (DITEM_STATUS((i = installCommit(self))) == DITEM_FAILURE) {
+	dialog_clear();
 	msgConfirm("Installation completed with some errors.  You may wish to\n"
 		   "scroll through the debugging messages on VTY1 with the\n"
 		   "scroll-lock feature.  You can also chose \"No\" at the next\n"
@@ -408,6 +406,7 @@ installNovice(dialogMenuItem *self)
 
     }
     else
+	dialog_clear();
 	msgConfirm("Congratulations!  You now have FreeBSD installed on your system.\n\n"
 		   "We will now move on to the final configuration questions.\n"
 		   "For any option you do not wish to configure, simply select\n"
@@ -416,7 +415,7 @@ installNovice(dialogMenuItem *self)
 		   "may do so by typing: /stand/sysinstall.");
 
     if (mediaDevice->type != DEVICE_TYPE_FTP && mediaDevice->type != DEVICE_TYPE_NFS) {
-	if (!msgYesNo("Does this system have a network interface card?")) {
+	if (!msgYesNo("Would you like to configure any SLIP/PPP or network interface devices?")) {
 	    Device *save = mediaDevice;
 
 	    /* This will also set the media device, which we don't want */
@@ -432,22 +431,28 @@ installNovice(dialogMenuItem *self)
 		  "machines can use NETBUI transport for disk and printer sharing."))
 	configSamba(self);
 
+    dialog_clear_norefresh();
     if (!msgYesNo("Will this machine be an IP gateway (e.g. will it forward packets\n"
 		  "between interfaces)?"))
 	variable_set2("gateway", "YES");
 
+    dialog_clear_norefresh();
     if (!msgYesNo("Do you want to allow anonymous FTP connections to this machine?"))
 	configAnonFTP(self);
 
+    dialog_clear_norefresh();
     if (!msgYesNo("Do you want to configure this machine as an NFS server?"))
 	configNFSServer(self);
 
+    dialog_clear_norefresh();
     if (!msgYesNo("Do you want to configure this machine as an NFS client?"))
 	variable_set2("nfs_client", "YES");
 
+    dialog_clear_norefresh();
     if (!msgYesNo("Do you want to configure this machine as a WEB server?"))
 	configApache(self);
 
+    dialog_clear_norefresh();
     if (!msgYesNo("Would you like to customize your system console settings?")) {
 	WINDOW *w = savescr();
 
@@ -455,6 +460,7 @@ installNovice(dialogMenuItem *self)
 	restorescr(w);
     }
 
+    dialog_clear_norefresh();
     if (!msgYesNo("Would you like to set this machine's time zone now?")) {
 	WINDOW *w = savescr();
 
@@ -463,6 +469,7 @@ installNovice(dialogMenuItem *self)
 	restorescr(w);
     }
 
+    dialog_clear_norefresh();
     if (!msgYesNo("Does this system have a mouse attached to it?")) {
 	WINDOW *w = savescr();
 
@@ -471,11 +478,13 @@ installNovice(dialogMenuItem *self)
     }
 
     if (directory_exists("/usr/X11R6")) {
+	dialog_clear_norefresh();
 	if (!msgYesNo("Would you like to configure your X server at this time?"))
 	    configXFree86(self);
     }
 
     if (cdromMounted) {
+	dialog_clear_norefresh();
 	if (!msgYesNo("Would you like to link to the ports tree on your CDROM?\n\n"
 		      "This will require that you have your FreeBSD CD in the CDROM\n"
 		      "drive to use the ports collection, but at a substantial savings\n"
@@ -484,7 +493,8 @@ installNovice(dialogMenuItem *self)
 	    configPorts(self);
     }
 
-    if (!msgYesNo("The FreeBSD package collection is a collection of over 450 ready-to-run\n"
+    dialog_clear_norefresh();
+    if (!msgYesNo("The FreeBSD package collection is a collection of over 550 ready-to-run\n"
 		  "applications, from text editors to games to WEB servers.  Would you like\n"
 		  "to browse the collection now?"))
 	configPackages(self);
@@ -578,6 +588,7 @@ static void
 installConfigure(void)
 {
     /* Final menu of last resort */
+    dialog_clear_norefresh();
     if (!msgYesNo("Visit the general configuration menu for a chance to set\n"
 		  "any last options?")) {
 	WINDOW *w = savescr();
diff --git a/release/sysinstall/msg.c b/release/sysinstall/msg.c
index fcef6c8..ee79777 100644
--- a/release/sysinstall/msg.c
+++ b/release/sysinstall/msg.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: msg.c,v 1.39 1996/08/01 10:58:52 jkh Exp $
+ * $Id: msg.c,v 1.40 1996/08/03 10:11:21 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -184,7 +184,6 @@ msgConfirm(char *fmt, ...)
 {
     va_list args;
     char *errstr;
-    WINDOW *w;
 
     errstr = (char *)alloca(FILENAME_MAX);
     va_start(args, fmt);
@@ -192,14 +191,12 @@ msgConfirm(char *fmt, ...)
     va_end(args);
     use_helpline(NULL);
     use_helpfile(NULL);
-    w = savescr();
     if (OnVTY) {
 	msgDebug("Switching back to VTY1\n");
 	ioctl(0, VT_ACTIVATE, 1);
 	msgInfo(NULL);
     }
     dialog_notify(errstr);
-    restorescr(w);
 }
 
 /* Put up a message in a popup information box */
@@ -228,7 +225,6 @@ msgYesNo(char *fmt, ...)
     va_list args;
     char *errstr;
     int ret;
-    WINDOW *w;
 
     errstr = (char *)alloca(FILENAME_MAX);
     va_start(args, fmt);
@@ -236,14 +232,12 @@ msgYesNo(char *fmt, ...)
     va_end(args);
     use_helpline(NULL);
     use_helpfile(NULL);
-    w = savescr();
     if (OnVTY) {
 	msgDebug("Switching back to VTY1\n");
 	ioctl(0, VT_ACTIVATE, 1);	/* Switch back */
 	msgInfo(NULL);
     }
     ret = dialog_yesno("User Confirmation Requested", errstr, -1, -1);
-    restorescr(w);
     return ret;
 }
 
@@ -255,7 +249,6 @@ msgGetInput(char *buf, char *fmt, ...)
     char *errstr;
     static char input_buffer[256];
     int rval;
-    WINDOW *w;
 
     errstr = (char *)alloca(FILENAME_MAX);
     va_start(args, fmt);
@@ -267,14 +260,12 @@ msgGetInput(char *buf, char *fmt, ...)
 	strcpy(input_buffer, buf);
     else
 	input_buffer[0] = '\0';
-    w = savescr();
     if (OnVTY) {
 	msgDebug("Switching back to VTY1\n");
 	ioctl(0, VT_ACTIVATE, 1);	/* Switch back */
 	msgInfo(NULL);
     }
     rval = dialog_inputbox("Value Required", errstr, -1, -1, input_buffer);
-    restorescr(w);
     if (!rval)
 	return input_buffer;
     else
diff --git a/release/sysinstall/system.c b/release/sysinstall/system.c
index 80162f1..5aa7f0c 100644
--- a/release/sysinstall/system.c
+++ b/release/sysinstall/system.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: system.c,v 1.63 1996/08/01 10:58:54 jkh Exp $
+ * $Id: system.c,v 1.64 1996/09/26 21:07:08 pst Exp $
  *
  * Jordan Hubbard
  *
@@ -58,7 +58,6 @@ systemInitialize(int argc, char **argv)
 {
     int i;
 
-
     signal(SIGINT, SIG_IGN);
     globalsInit();
 
@@ -158,7 +157,6 @@ systemDisplayHelp(char *file)
 {
     char *fname = NULL;
     char buf[FILENAME_MAX];
-    WINDOW *old = savescr();
     int ret = 0;
 
     fname = systemHelpFile(file, buf);
@@ -174,7 +172,6 @@ systemDisplayHelp(char *file)
 	use_helpline(NULL);
 	dialog_textbox(file, fname, LINES, COLS);
     }
-    restorescr(old);
     return ret;
 }