d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
judicious use of dialog_clear_norefresh().
This commit is contained in:
Jordan K. Hubbard 1996-08-03 10:11:56 +00:00
parent 80550032a8
commit 96a9d7fb41
38 changed files with 140 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
release/sysinstall/anonFTP.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: anonFTP.c,v 1.13 1996/04/28 01:07:19 jkh Exp $
* $Id: anonFTP.c,v 1.14 1996/04/28 03:26:42 jkh Exp $
*
* Copyright (c) 1995
* Coranth Gryphon. All rights reserved.
@ -384,8 +384,7 @@ anonftpOpenDialog(void)
}
/* Clear this crap off the screen */
dialog_clear();
refresh();
dialog_clear_norefresh();
use_helpfile(NULL);
if (cancel)
@ -401,7 +400,7 @@ configAnonFTP(dialogMenuItem *self)
/* Be optimistic */
i = DITEM_SUCCESS;
dialog_clear();
dialog_clear_norefresh();
i = anonftpOpenDialog();
if (DITEM_STATUS(i) != DITEM_SUCCESS) {
msgConfirm("Configuration of Anonymous FTP cancelled per user request.");

9
release/sysinstall/apache.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: apache.c,v 1.24 1996/06/15 17:58:49 jkh Exp $
* $Id: apache.c,v 1.25 1996/07/13 06:05:42 jkh Exp $
*
* Copyright (c) 1995
* Coranth Gryphon. All rights reserved.
@ -383,8 +383,7 @@ apacheOpenDialog(void)
}
/* Clear this crap off the screen */
dialog_clear();
refresh();
dialog_clear_norefresh();
use_helpfile(NULL);
if (cancel)
@ -403,7 +402,7 @@ configApache(dialogMenuItem *self)
/* Be optimistic */
i = DITEM_SUCCESS;
dialog_clear();
dialog_clear_norefresh();
msgConfirm("Since you elected to install the WEB server, we'll now add the\n"
"Apache HTTPD package and set up a few configuration files.");
i = package_add(APACHE_PACKAGE);
@ -415,7 +414,7 @@ configApache(dialogMenuItem *self)
return i | DITEM_RESTORE;
}
dialog_clear();
dialog_clear_norefresh();
i = apacheOpenDialog();
if (DITEM_STATUS(i) != DITEM_SUCCESS) {
msgConfirm("Configuration of the Apache WEB server was cancelled per\n"

10
release/sysinstall/config.c
View File

@ -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"

8
release/sysinstall/disks.c
View File

@ -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);

12
release/sysinstall/dist.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: dist.c,v 1.66 1996/07/12 11:13:58 jkh Exp $
* $Id: dist.c,v 1.67 1996/07/13 05:44:51 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -264,7 +264,7 @@ distMaybeSetDES(dialogMenuItem *self)
{
int i = DITEM_SUCCESS;
dialog_clear();
dialog_clear_norefresh();
if (!msgYesNo("Do wish to install DES cryptographic software?\n\n"
"If you choose No, FreeBSD will use an MD5 based password scheme which,\n"
"while perhaps more secure, is not interoperable with the traditional\n"
@ -338,7 +338,7 @@ distExtract(char *parent, Distribution *me)
struct timeval start, stop;
status = TRUE;
dialog_clear();
dialog_clear_norefresh();
if (isDebug())
msgDebug("distExtract: parent: %s, me: %s\n", parent ? parent : "(none)", me->my_name);
@ -464,7 +464,7 @@ distExtract(char *parent, Distribution *me)
retval = write(fd2, buf, n);
if (retval != n) {
mediaDevice->close(mediaDevice, fd);
dialog_clear();
dialog_clear_norefresh();
msgConfirm("Write failure on transfer! (wrote %d bytes of %d bytes)", retval, n);
goto punt;
}
@ -551,7 +551,7 @@ distExtractAll(dialogMenuItem *self)
if (!mediaDevice->init(mediaDevice))
return DITEM_FAILURE;
dialog_clear();
dialog_clear_norefresh();
msgNotify("Attempting to install all selected distributions..");
/* Try for 3 times around the loop, then give up. */
while (Dists && ++retries < 3)
@ -562,7 +562,7 @@ distExtractAll(dialogMenuItem *self)
buf[0] = '\0';
printSelected(buf, Dists, DistTable, &col);
dialog_clear();
dialog_clear_norefresh();
msgConfirm("Couldn't extract the following distributions. This may\n"
"be because they were not available on the installation\n"
"media you've chosen:\n\n\t%s", buf);

4
release/sysinstall/dmenu.c
View File

@ -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);

4
release/sysinstall/index.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: index.c,v 1.36 1996/06/25 04:28:21 jkh Exp $
* $Id: index.c,v 1.37 1996/08/01 12:02:24 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -502,7 +502,7 @@ index_menu(PkgNodePtr top, PkgNodePtr plist, int *pos, int *scroll)
nitems = item_add(nitems, NULL, NULL, NULL, NULL, NULL, NULL, 0, &curr, &max);
recycle:
dialog_clear();
dialog_clear_norefresh();
if (hasPackages)
rval = dialog_checklist(top->name, top->desc, -1, -1, n > MAX_MENU ? MAX_MENU : n, -n, nitems, NULL);
else /* It's a categories menu */

18
release/sysinstall/install.c
View File

@ -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();
}
}

9
release/sysinstall/installUpgrade.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: installUpgrade.c,v 1.29 1996/07/08 08:54:28 jkh Exp $
* $Id: installUpgrade.c,v 1.30 1996/07/14 01:54:38 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -181,7 +181,7 @@ installUpgrade(dialogMenuItem *self)
variable_set2(SYSTEM_STATE, "upgrade");
systemDisplayHelp("upgrade");
dialog_clear();
dialog_clear_norefresh();
if (msgYesNo("Given all that scary stuff you just read, are you sure you want to\n"
"risk it all and proceed with this upgrade?"))
return DITEM_FAILURE | DITEM_RESTORE;
@ -194,7 +194,7 @@ installUpgrade(dialogMenuItem *self)
"system.");
if (!dmenuOpenSimple(&MenuDistributions, FALSE))
return DITEM_FAILURE | DITEM_RECREATE;
dialog_clear();
dialog_clear_norefresh();
}
/* No bin selected? Not much of an upgrade.. */
@ -205,7 +205,7 @@ installUpgrade(dialogMenuItem *self)
"menu.")) {
if (!dmenuOpenSimple(&MenuDistributions, FALSE))
return DITEM_FAILURE | DITEM_RECREATE;
dialog_clear();
dialog_clear_norefresh();
}
}
@ -361,7 +361,6 @@ installUpgrade(dialogMenuItem *self)
chdir("/");
dialog_clear();
dialog_update();
end_dialog();
DialogActive = FALSE;
endwin();

8
release/sysinstall/label.c
View File

@ -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);
}

6
release/sysinstall/media.c
View File

@ -4,7 +4,7 @@
* This is probably the last attempt in the `sysinstall' line, the next
* generation being slated to essentially a complete rewrite.
*
* $Id: media.c,v 1.50 1996/08/01 12:02:26 jkh Exp $
* $Id: media.c,v 1.51 1996/08/01 12:59:54 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -260,7 +260,7 @@ mediaSetFTP(dialogMenuItem *self)
char *cp, *hostname, *dir;
extern int FtpPort;
dialog_clear();
dialog_clear_norefresh();
if (!dmenuOpenSimple(&MenuMediaFTP, FALSE))
return DITEM_FAILURE | DITEM_RECREATE;
else
@ -271,7 +271,7 @@ mediaSetFTP(dialogMenuItem *self)
}
else if (!strcmp(cp, "other")) {
variable_set2(VAR_FTP_PATH, "ftp://");
dialog_clear();
dialog_clear_norefresh();
cp = variable_get_value(VAR_FTP_PATH, "Please specify the URL of a FreeBSD distribution on a\n"
"remote ftp site. This site must accept either anonymous\n"
"ftp or you should have set an ftp username and password\n"

6
release/sysinstall/msg.c
View File

@ -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);
}

6
release/sysinstall/network.c
View File

@ -4,7 +4,7 @@
* This is probably the last attempt in the `sysinstall' line, the next
* generation being slated to essentially a complete rewrite.
*
* $Id: network.c,v 1.14 1996/07/08 08:54:30 jkh Exp $
* $Id: network.c,v 1.15 1996/07/08 10:08:16 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -76,7 +76,7 @@ mediaInitNetwork(Device *dev)
char *val;
char attach[256];
dialog_clear();
dialog_clear_norefresh();
/* Cheesy slip attach */
snprintf(attach, 256, "slattach -a -h -l -s 9600 %s", dev->devname);
val = msgGetInput(attach,
@ -180,7 +180,7 @@ startPPP(Device *devp)
Mkdir("/var/spool/lock");
Mkdir("/etc/ppp");
dialog_clear();
dialog_clear_norefresh();
if (!variable_get(VAR_SERIAL_SPEED))
variable_set2(VAR_SERIAL_SPEED, "115200");
/* Get any important user values */

4
release/sysinstall/options.c
View File

@ -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: options.c,v 1.40 1996/07/08 10:08:18 jkh Exp $
* $Id: options.c,v 1.41 1996/07/09 14:28:18 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -193,7 +193,7 @@ optionsEditor(dialogMenuItem *self)
int i, optcol, optrow, key;
static int currOpt = 0;
dialog_clear();
dialog_clear_norefresh();
clear();
while (1) {

4
release/sysinstall/package.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: package.c,v 1.43 1996/07/10 11:38:28 jkh Exp $
* $Id: package.c,v 1.44 1996/08/01 12:35:51 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -187,7 +187,7 @@ package_extract(Device *dev, char *name, Boolean depended)
}
else {
msgDebug("pkg_extract: get operation returned %d\n", fd);
dialog_clear();
dialog_clear_norefresh();
if (variable_get(VAR_NO_CONFIRM))
msgNotify("Unable to fetch package %s from selected media.\n"
"No package add will be done.", name);

4
release/sysinstall/samba.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: samba.c,v 1.6 1996/07/10 04:52:27 jkh Exp $
* $Id: samba.c,v 1.7 1996/07/26 08:39:06 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard & Coranth Gryphon. All rights reserved.
@ -115,7 +115,7 @@ configSamba(dialogMenuItem *self)
}
if (variable_get("SAMBA_export")) {
dialog_clear();
dialog_clear_norefresh();
for (tval = 0; ! tval; tval = msgYesNo("Another?")) {
tptr = msgGetInput(NULL,"What directory to export?");
if (tptr && *tptr && (tptr[0] == '/')) {

7
release/sysinstall/tcpip.c
View File

@ -1,5 +1,5 @@
/*
* $Id: tcpip.c,v 1.43 1996/07/02 01:03:55 jkh Exp $
* $Id: tcpip.c,v 1.44 1996/07/08 10:08:22 jkh Exp $
*
* Copyright (c) 1995
* Gary J Palmer. All rights reserved.
@ -235,7 +235,7 @@ tcpOpenDialog(Device *devp)
char title[80];
save = savescr();
dialog_clear();
dialog_clear_norefresh();
/* We need a curses window */
ds_win = newwin(LINES, COLS, 0, 0);
if (ds_win == 0)
@ -466,8 +466,7 @@ tcpOpenDialog(Device *devp)
}
/* Clear this crap off the screen */
dialog_clear();
refresh();
dialog_clear_norefresh();
use_helpfile(NULL);
/* We actually need to inform the rest of sysinstall about this

10
usr.sbin/sade/config.c
View File

@ -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"

8
usr.sbin/sade/disks.c
View File

@ -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);

4
usr.sbin/sade/dmenu.c
View File

@ -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);

18
usr.sbin/sade/install.c
View File

@ -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();
}
}

8
usr.sbin/sade/label.c
View File

@ -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);
}

6
usr.sbin/sade/msg.c
View File

@ -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);
}

7
usr.sbin/sysinstall/anonFTP.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: anonFTP.c,v 1.13 1996/04/28 01:07:19 jkh Exp $
* $Id: anonFTP.c,v 1.14 1996/04/28 03:26:42 jkh Exp $
*
* Copyright (c) 1995
* Coranth Gryphon. All rights reserved.
@ -384,8 +384,7 @@ anonftpOpenDialog(void)
}
/* Clear this crap off the screen */
dialog_clear();
refresh();
dialog_clear_norefresh();
use_helpfile(NULL);
if (cancel)
@ -401,7 +400,7 @@ configAnonFTP(dialogMenuItem *self)
/* Be optimistic */
i = DITEM_SUCCESS;
dialog_clear();
dialog_clear_norefresh();
i = anonftpOpenDialog();
if (DITEM_STATUS(i) != DITEM_SUCCESS) {
msgConfirm("Configuration of Anonymous FTP cancelled per user request.");

10
usr.sbin/sysinstall/config.c
View File

@ -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"

8
usr.sbin/sysinstall/disks.c
View File

@ -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);

12
usr.sbin/sysinstall/dist.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: dist.c,v 1.66 1996/07/12 11:13:58 jkh Exp $
* $Id: dist.c,v 1.67 1996/07/13 05:44:51 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -264,7 +264,7 @@ distMaybeSetDES(dialogMenuItem *self)
{
int i = DITEM_SUCCESS;
dialog_clear();
dialog_clear_norefresh();
if (!msgYesNo("Do wish to install DES cryptographic software?\n\n"
"If you choose No, FreeBSD will use an MD5 based password scheme which,\n"
"while perhaps more secure, is not interoperable with the traditional\n"
@ -338,7 +338,7 @@ distExtract(char *parent, Distribution *me)
struct timeval start, stop;
status = TRUE;
dialog_clear();
dialog_clear_norefresh();
if (isDebug())
msgDebug("distExtract: parent: %s, me: %s\n", parent ? parent : "(none)", me->my_name);
@ -464,7 +464,7 @@ distExtract(char *parent, Distribution *me)
retval = write(fd2, buf, n);
if (retval != n) {
mediaDevice->close(mediaDevice, fd);
dialog_clear();
dialog_clear_norefresh();
msgConfirm("Write failure on transfer! (wrote %d bytes of %d bytes)", retval, n);
goto punt;
}
@ -551,7 +551,7 @@ distExtractAll(dialogMenuItem *self)
if (!mediaDevice->init(mediaDevice))
return DITEM_FAILURE;
dialog_clear();
dialog_clear_norefresh();
msgNotify("Attempting to install all selected distributions..");
/* Try for 3 times around the loop, then give up. */
while (Dists && ++retries < 3)
@ -562,7 +562,7 @@ distExtractAll(dialogMenuItem *self)
buf[0] = '\0';
printSelected(buf, Dists, DistTable, &col);
dialog_clear();
dialog_clear_norefresh();
msgConfirm("Couldn't extract the following distributions. This may\n"
"be because they were not available on the installation\n"
"media you've chosen:\n\n\t%s", buf);

4
usr.sbin/sysinstall/dmenu.c
View File

@ -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);

4
usr.sbin/sysinstall/index.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: index.c,v 1.36 1996/06/25 04:28:21 jkh Exp $
* $Id: index.c,v 1.37 1996/08/01 12:02:24 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -502,7 +502,7 @@ index_menu(PkgNodePtr top, PkgNodePtr plist, int *pos, int *scroll)
nitems = item_add(nitems, NULL, NULL, NULL, NULL, NULL, NULL, 0, &curr, &max);
recycle:
dialog_clear();
dialog_clear_norefresh();
if (hasPackages)
rval = dialog_checklist(top->name, top->desc, -1, -1, n > MAX_MENU ? MAX_MENU : n, -n, nitems, NULL);
else /* It's a categories menu */

18
usr.sbin/sysinstall/install.c
View File

@ -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();
}
}

9
usr.sbin/sysinstall/installUpgrade.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: installUpgrade.c,v 1.29 1996/07/08 08:54:28 jkh Exp $
* $Id: installUpgrade.c,v 1.30 1996/07/14 01:54:38 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -181,7 +181,7 @@ installUpgrade(dialogMenuItem *self)
variable_set2(SYSTEM_STATE, "upgrade");
systemDisplayHelp("upgrade");
dialog_clear();
dialog_clear_norefresh();
if (msgYesNo("Given all that scary stuff you just read, are you sure you want to\n"
"risk it all and proceed with this upgrade?"))
return DITEM_FAILURE | DITEM_RESTORE;
@ -194,7 +194,7 @@ installUpgrade(dialogMenuItem *self)
"system.");
if (!dmenuOpenSimple(&MenuDistributions, FALSE))
return DITEM_FAILURE | DITEM_RECREATE;
dialog_clear();
dialog_clear_norefresh();
}
/* No bin selected? Not much of an upgrade.. */
@ -205,7 +205,7 @@ installUpgrade(dialogMenuItem *self)
"menu.")) {
if (!dmenuOpenSimple(&MenuDistributions, FALSE))
return DITEM_FAILURE | DITEM_RECREATE;
dialog_clear();
dialog_clear_norefresh();
}
}
@ -361,7 +361,6 @@ installUpgrade(dialogMenuItem *self)
chdir("/");
dialog_clear();
dialog_update();
end_dialog();
DialogActive = FALSE;
endwin();

8
usr.sbin/sysinstall/label.c
View File

@ -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);
}

6
usr.sbin/sysinstall/media.c
View File

@ -4,7 +4,7 @@
* This is probably the last attempt in the `sysinstall' line, the next
* generation being slated to essentially a complete rewrite.
*
* $Id: media.c,v 1.50 1996/08/01 12:02:26 jkh Exp $
* $Id: media.c,v 1.51 1996/08/01 12:59:54 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -260,7 +260,7 @@ mediaSetFTP(dialogMenuItem *self)
char *cp, *hostname, *dir;
extern int FtpPort;
dialog_clear();
dialog_clear_norefresh();
if (!dmenuOpenSimple(&MenuMediaFTP, FALSE))
return DITEM_FAILURE | DITEM_RECREATE;
else
@ -271,7 +271,7 @@ mediaSetFTP(dialogMenuItem *self)
}
else if (!strcmp(cp, "other")) {
variable_set2(VAR_FTP_PATH, "ftp://");
dialog_clear();
dialog_clear_norefresh();
cp = variable_get_value(VAR_FTP_PATH, "Please specify the URL of a FreeBSD distribution on a\n"
"remote ftp site. This site must accept either anonymous\n"
"ftp or you should have set an ftp username and password\n"

6
usr.sbin/sysinstall/msg.c
View File

@ -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);
}

6
usr.sbin/sysinstall/network.c
View File

@ -4,7 +4,7 @@
* This is probably the last attempt in the `sysinstall' line, the next
* generation being slated to essentially a complete rewrite.
*
* $Id: network.c,v 1.14 1996/07/08 08:54:30 jkh Exp $
* $Id: network.c,v 1.15 1996/07/08 10:08:16 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -76,7 +76,7 @@ mediaInitNetwork(Device *dev)
char *val;
char attach[256];
dialog_clear();
dialog_clear_norefresh();
/* Cheesy slip attach */
snprintf(attach, 256, "slattach -a -h -l -s 9600 %s", dev->devname);
val = msgGetInput(attach,
@ -180,7 +180,7 @@ startPPP(Device *devp)
Mkdir("/var/spool/lock");
Mkdir("/etc/ppp");
dialog_clear();
dialog_clear_norefresh();
if (!variable_get(VAR_SERIAL_SPEED))
variable_set2(VAR_SERIAL_SPEED, "115200");
/* Get any important user values */

4
usr.sbin/sysinstall/options.c
View File

@ -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: options.c,v 1.40 1996/07/08 10:08:18 jkh Exp $
* $Id: options.c,v 1.41 1996/07/09 14:28:18 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -193,7 +193,7 @@ optionsEditor(dialogMenuItem *self)
int i, optcol, optrow, key;
static int currOpt = 0;
dialog_clear();
dialog_clear_norefresh();
clear();
while (1) {

4
usr.sbin/sysinstall/package.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: package.c,v 1.43 1996/07/10 11:38:28 jkh Exp $
* $Id: package.c,v 1.44 1996/08/01 12:35:51 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -187,7 +187,7 @@ package_extract(Device *dev, char *name, Boolean depended)
}
else {
msgDebug("pkg_extract: get operation returned %d\n", fd);
dialog_clear();
dialog_clear_norefresh();
if (variable_get(VAR_NO_CONFIRM))
msgNotify("Unable to fetch package %s from selected media.\n"
"No package add will be done.", name);

7
usr.sbin/sysinstall/tcpip.c
View File

@ -1,5 +1,5 @@
/*
* $Id: tcpip.c,v 1.43 1996/07/02 01:03:55 jkh Exp $
* $Id: tcpip.c,v 1.44 1996/07/08 10:08:22 jkh Exp $
*
* Copyright (c) 1995
* Gary J Palmer. All rights reserved.
@ -235,7 +235,7 @@ tcpOpenDialog(Device *devp)
char title[80];
save = savescr();
dialog_clear();
dialog_clear_norefresh();
/* We need a curses window */
ds_win = newwin(LINES, COLS, 0, 0);
if (ds_win == 0)
@ -466,8 +466,7 @@ tcpOpenDialog(Device *devp)
}
/* Clear this crap off the screen */
dialog_clear();
refresh();
dialog_clear_norefresh();
use_helpfile(NULL);
/* We actually need to inform the rest of sysinstall about this