Try to make screen update more efficient (less flickering) by more

judicious use of dialog_clear_norefresh().

6 files changed, 26 insertions, 28 deletions

diff --git a/usr.sbin/sade/config.c b/usr.sbin/sade/config.c
index 38b9450..90890e8 100644
--- a/usr.sbin/sade/config.c
+++ b/usr.sbin/sade/config.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: config.c,v 1.45 1996/07/08 08:54:23 jkh Exp $
+ * $Id: config.c,v 1.46 1996/07/16 17:11:39 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -448,7 +448,7 @@ configPackages(dialogMenuItem *self)
 	msgNotify("Attempting to fetch packages/INDEX file from selected media.");
 	fd = mediaDevice->get(mediaDevice, "packages/INDEX", TRUE);
 	if (fd < 0) {
-	    dialog_clear();
+	    dialog_clear_norefresh();
 	    msgConfirm("Unable to get packages/INDEX file from selected media.\n"
 		       "This may be because the packages collection is not available at\n"
 		       "on the distribution media you've chosen (most likely an FTP site\n"
@@ -489,7 +489,7 @@ configPackages(dialogMenuItem *self)
 	    }
 	}
 	else {
-	    dialog_clear();
+	    dialog_clear_norefresh();
 	    msgConfirm("No packages were selected for extraction.");
 	    break;
 	}
@@ -511,10 +511,10 @@ configPorts(dialogMenuItem *self)
     char *cp, *dist = NULL; /* Shut up compiler */
     int status = DITEM_SUCCESS, tries = 0;
 
-    dialog_clear();
+    dialog_clear_norefresh();
     if (!variable_get(VAR_PORTS_PATH))
 	variable_set2(VAR_PORTS_PATH, dist = "/cdrom/ports");
-    dialog_clear();
+    dialog_clear_norefresh();
     while (!directory_exists(dist)) {
 	if (++tries > 2) {
 	    msgConfirm("You appear to be having some problems with your CD drive\n"
diff --git a/usr.sbin/sade/disks.c b/usr.sbin/sade/disks.c
index db49a09..49da635 100644
--- a/usr.sbin/sade/disks.c
+++ b/usr.sbin/sade/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.61 1996/08/01 11:39:47 jkh Exp $
+ * $Id: disks.c,v 1.62 1996/08/03 05:29:24 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -77,7 +77,7 @@ print_chunks(Disk *d)
 	d->bios_hd = d->bios_sect = d->bios_cyl = 1;
     }
     else if (d->bios_cyl > 65536 || d->bios_hd > 256 || d->bios_sect >= 64) {
-	dialog_clear();
+	dialog_clear_norefresh();
 	msgConfirm("WARNING:  A geometry of %d/%d/%d for %s is incorrect.  Using\n"
 		   "a default geometry of 64 heads and 32 sectors.  If this geometry\n"
 		   "is incorrect or you are unsure as to whether or not it's correct,\n"
@@ -391,7 +391,7 @@ diskPartition(Device *dev, Disk *d)
 		DialogActive = FALSE;
 		slice_wizard(d);
 		variable_set2(DISK_PARTITIONED, "yes");
-		dialog_clear();
+		dialog_clear_norefresh();
 		DialogActive = TRUE;
 		record_chunks(d);
 		restorescr(w);
@@ -422,7 +422,7 @@ diskPartition(Device *dev, Disk *d)
     if (p) {
 	char buf[FILENAME_MAX];
 
-	dialog_clear();
+	dialog_clear_norefresh();
         use_helpline("Press F1 to read more about disk partitioning.");
 	use_helpfile(systemHelpFile("partition", buf));
 	dialog_mesgbox("Disk partitioning warning:", p, -1, -1);
diff --git a/usr.sbin/sade/dmenu.c b/usr.sbin/sade/dmenu.c
index dcd742f..5452ed1 100644
--- a/usr.sbin/sade/dmenu.c
+++ b/usr.sbin/sade/dmenu.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated for what's essentially a complete rewrite.
  *
- * $Id: dmenu.c,v 1.23 1996/07/11 18:37:47 jkh Exp $
+ * $Id: dmenu.c,v 1.24 1996/08/01 10:58:50 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -202,7 +202,7 @@ dmenuOpen(DMenu *menu, int *choice, int *scroll, int *curr, int *max, Boolean bu
 	use_helpfile(systemHelpFile(menu->helpfile, buf));
 
 	/* Pop up that dialog! */
-	dialog_clear();
+	dialog_clear_norefresh();
 	if (menu->type & DMENU_NORMAL_TYPE)
 	    rval = dialog_menu((u_char *)menu->title, (u_char *)menu->prompt, -1, -1,
 			       menu_height(menu, n), -n, items, (char *)buttons, choice, scroll);
diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c
index 6c0f2d0..1dab8cb 100644
--- a/usr.sbin/sade/install.c
+++ b/usr.sbin/sade/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.116 1996/07/31 06:20:55 jkh Exp $
+ * $Id: install.c,v 1.117 1996/07/31 09:29:28 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -201,7 +201,7 @@ installInitial(void)
 	variable_set2(DISK_PARTITIONED, "yes");
 
     /* If we refuse to proceed, bail. */
-    dialog_clear();
+    dialog_clear_norefresh();
     if (msgYesNo("Last Chance!  Are you SURE you want continue the installation?\n\n"
 		 "If you're running this on a disk with data you wish to save\n"
 		 "then WE STRONGLY ENCOURAGE YOU TO MAKE PROPER BACKUPS before\n"
@@ -266,7 +266,6 @@ installFixitFloppy(dialogMenuItem *self)
 	    return DITEM_FAILURE;
     }
     dialog_clear();
-    dialog_update();
     end_dialog();
     DialogActive = FALSE;
     if (!directory_exists("/tmp"))
@@ -309,7 +308,6 @@ installFixitFloppy(dialogMenuItem *self)
     DialogActive = TRUE;
     clear();
     dialog_clear();
-    dialog_update();
     unmount("/mnt2", MNT_FORCE);
     msgConfirm("Please remove the fixit floppy now.");
     return DITEM_SUCCESS;
@@ -328,13 +326,13 @@ installExpress(dialogMenuItem *self)
 	return i;
 
     if (!Dists) {
-	dialog_clear();
+	dialog_clear_norefresh();
 	if (!dmenuOpenSimple(&MenuDistributions, FALSE) && !Dists)
 	    return DITEM_FAILURE | DITEM_RECREATE;
     }
 
     if (!mediaDevice) {
-	dialog_clear();
+	dialog_clear_norefresh();
 	if (!dmenuOpenSimple(&MenuMedia, FALSE) || !mediaDevice)
 	    return DITEM_FAILURE | DITEM_RECREATE;
     }
@@ -359,7 +357,7 @@ installNovice(dialogMenuItem *self)
     extern int cdromMounted;
 
     variable_set2(SYSTEM_STATE, "novice");
-    dialog_clear();
+    dialog_clear_norefresh();
     msgConfirm("In the next menu, you will need to set up a DOS-style (\"fdisk\") partitioning\n"
 	       "scheme for your hard disk.  If you simply wish to devote all disk space\n"
 	       "to FreeBSD (overwritting anything else that might be on the disk(s) selected)\n"
@@ -370,7 +368,7 @@ installNovice(dialogMenuItem *self)
     if (DITEM_STATUS(diskPartitionEditor(self)) == DITEM_FAILURE)
 	return DITEM_FAILURE;
     
-    dialog_clear();
+    dialog_clear_norefresh();
     msgConfirm("Next, you need to create BSD partitions inside of the fdisk partition(s)\n"
 	       "just created.  If you have a reasonable amount of disk space (200MB or more)\n"
 	       "and don't have any special requirements, simply use the (A)uto command to\n"
@@ -381,7 +379,7 @@ installNovice(dialogMenuItem *self)
     if (DITEM_STATUS(diskLabelEditor(self)) == DITEM_FAILURE)
 	return DITEM_FAILURE;
 
-    dialog_clear();
+    dialog_clear_norefresh();
     msgConfirm("Now it is time to select an installation subset.  There are a number of\n"
 	       "canned distribution sets, ranging from minimal installation sets to full\n"
 	       "X11 developer oriented configurations.  You can also select a custom set\n"
@@ -425,7 +423,7 @@ installNovice(dialogMenuItem *self)
 	    tcpDeviceSelect();
 	    /* so we restore our saved value below */
 	    mediaDevice = save;
-	    dialog_clear();
+	    dialog_clear_norefresh();
 	}
     }
 
diff --git a/usr.sbin/sade/label.c b/usr.sbin/sade/label.c
index 0c70f36..ad30c72 100644
--- a/usr.sbin/sade/label.c
+++ b/usr.sbin/sade/label.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: label.c,v 1.56 1996/08/01 11:39:49 jkh Exp $
+ * $Id: label.c,v 1.57 1996/08/03 05:25:56 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -321,7 +321,7 @@ get_partition_type(void)
 	"Swap",
 	"A swap partition.",
     };
-    dialog_clear();
+    dialog_clear_norefresh();
     i = dialog_menu("Please choose a partition type",
 		    "If you want to use this partition for swap space, select Swap.\n"
 		    "If you want to put a filesystem on it, choose FS.",
@@ -480,7 +480,7 @@ diskLabel(char *str)
     keypad(stdscr, TRUE);
     record_label_chunks(devs);
 
-    dialog_clear(); clear();
+    dialog_clear_norefresh(); clear();
     while (labeling) {
 	print_label_chunks();
 	if (first_time) {
@@ -851,7 +851,7 @@ diskLabel(char *str)
 		}
 		variable_set2(DISK_LABELLED, "yes");
 		DialogActive = TRUE;
-		dialog_clear();
+		dialog_clear_norefresh();
 		restorescr(save);
 		record_label_chunks(devs);
 	    }
diff --git a/usr.sbin/sade/msg.c b/usr.sbin/sade/msg.c
index d1b6b18..fcef6c8 100644
--- a/usr.sbin/sade/msg.c
+++ b/usr.sbin/sade/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.38 1996/07/31 06:20:58 jkh Exp $
+ * $Id: msg.c,v 1.39 1996/08/01 10:58:52 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -217,7 +217,7 @@ msgNotify(char *fmt, ...)
     use_helpfile(NULL);
     if (isDebug())
 	msgDebug("Notify: %s\n", errstr);
-    dialog_clear();
+    dialog_clear_norefresh();
     dialog_msgbox("Information Dialog", errstr, -1, -1, 0);
 }
 
@@ -312,7 +312,7 @@ msgWeHaveOutput(char *fmt, ...)
     use_helpline(NULL);
     use_helpfile(NULL);
     msgDebug("Notify: %s\n", errstr);
-    dialog_clear();
+    dialog_clear_norefresh();
     dialog_msgbox("Information Dialog", errstr, -1, -1, 0);
 }