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

Fix display refresh bug in displayHelp()

Browse Source 
Go back to Normal menus for Media and FTP menus rather than
radio menus - the difference in behavior is confusing and sort
of detracts from the added (small) advantage of seeing what you last
picked.
This commit is contained in:
Jordan K. Hubbard 1996-04-26 18:19:38 +00:00
parent 1a0e8e31c6
commit 35ee5f3e57
8 changed files with 63 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
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.33 1996/04/23 01:29:26 jkh Exp $
* $Id: media.c,v 1.34 1996/04/25 17:31:22 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -51,7 +51,7 @@ genericHook(dialogMenuItem *self, DeviceType type)
devs = deviceFind(self->prompt, type);
if (devs)
mediaDevice = devs[0];
return devs ? DITEM_SUCCESS : DITEM_FAILURE;
return (devs ? DITEM_LEAVE_MENU : DITEM_FAILURE);
}
static int
@ -492,9 +492,10 @@ mediaExtractDist(char *dir, int fd)
int
mediaGetType(dialogMenuItem *self)
{
if (!dmenuOpenSimple(&MenuMedia))
return DITEM_FAILURE | DITEM_RESTORE | DITEM_RECREATE;
return DITEM_SUCCESS | DITEM_RESTORE | DITEM_RECREATE;
int i;
i = dmenuOpenSimple(&MenuMedia) ? DITEM_SUCCESS : DITEM_FAILURE;
return i | DITEM_RESTORE | DITEM_RECREATE;
}
/* Return TRUE if all the media variables are set up correctly */

48
release/sysinstall/menus.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: menus.c,v 1.51 1996/04/23 01:29:28 jkh Exp $
* $Id: menus.c,v 1.52 1996/04/25 17:31:23 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -417,35 +417,9 @@ for an ethernet installation.",
{ { NULL } },
};
static int
whichMedia(dialogMenuItem *self)
{
if (!mediaDevice)
return FALSE;
if (!strcmp(self->prompt, "1 CDROM") && mediaDevice->type == DEVICE_TYPE_CDROM)
return TRUE;
else if (!strcmp(self->prompt, "2 DOS") && mediaDevice->type == DEVICE_TYPE_DOS)
return TRUE;
else if (!strcmp(self->prompt, "3 File System") && mediaDevice->type == DEVICE_TYPE_UFS)
return TRUE;
else if (!strcmp(self->prompt, "4 Floppy") && mediaDevice->type == DEVICE_TYPE_FLOPPY)
return TRUE;
else if (!strcmp(self->prompt, "5 FTP") && mediaDevice->type == DEVICE_TYPE_FTP &&
!strcmp(variable_get(VAR_FTP_STATE), "active"))
return TRUE;
else if (!strcmp(self->prompt, "6 FTP Passive") && mediaDevice->type == DEVICE_TYPE_FTP &&
!strcmp(variable_get(VAR_FTP_STATE), "passive"))
return TRUE;
else if (!strcmp(self->prompt, "7 NFS") && mediaDevice->type == DEVICE_TYPE_NFS)
return TRUE;
else if (!strcmp(self->prompt, "8 Tape") && mediaDevice->type == DEVICE_TYPE_TAPE)
return TRUE;
return FALSE;
}
/* The media selection menu */
DMenu MenuMedia = {
DMENU_RADIO_TYPE | DMENU_SELECTION_RETURNS,
DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS,
"Choose Installation Media",
"FreeBSD can be installed from a variety of different installation\n\
media, ranging from floppies to an Internet FTP server. If you're\n\
@ -455,21 +429,21 @@ media.",
"Press F1 for more information on the various media types",
"media",
{ { "1 CDROM", "Install from a FreeBSD CDROM",
whichMedia, mediaSetCDROM },
NULL, mediaSetCDROM },
{ "2 DOS", "Install from a DOS partition",
whichMedia, mediaSetDOS },
NULL, mediaSetDOS },
{ "3 File System", "Install from an existing filesystem",
whichMedia, mediaSetUFS },
NULL, mediaSetUFS },
{ "4 Floppy", "Install from a floppy disk set",
whichMedia, mediaSetFloppy },
NULL, mediaSetFloppy },
{ "5 FTP", "Install from an FTP server",
whichMedia, mediaSetFTPActive },
NULL, mediaSetFTPActive },
{ "6 FTP Passive", "Install from an FTP server through a firewall",
whichMedia, mediaSetFTPPassive },
NULL, mediaSetFTPPassive },
{ "7 NFS", "Install over NFS",
whichMedia, mediaSetNFS },
NULL, mediaSetNFS },
{ "8 Tape", "Install from SCSI or QIC tape",
whichMedia, mediaSetTape },
NULL, mediaSetTape },
{ NULL } },
};
@ -929,7 +903,7 @@ aspects of your system's network configuration.",
};
DMenu MenuNTP = {
DMENU_RADIO_TYPE | DMENU_SELECTION_RETURNS,
DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS,
"NTPDATE Server Selection",
"There are a number of time syncronization servers available\n\
for public use around the Internet. Please select one reasonably\n\

9
release/sysinstall/system.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: system.c,v 1.51 1996/04/23 01:29:33 jkh Exp $
* $Id: system.c,v 1.52 1996/04/25 17:31:27 jkh Exp $
*
* Jordan Hubbard
*
@ -120,6 +120,8 @@ systemDisplayHelp(char *file)
{
char *fname = NULL;
char buf[FILENAME_MAX];
WINDOW *old = savescr();
int ret = 0;
fname = systemHelpFile(file, buf);
if (!fname) {
@ -127,14 +129,15 @@ systemDisplayHelp(char *file)
use_helpfile(NULL);
use_helpline(NULL);
dialog_mesgbox("Sorry!", buf, -1, -1);
return 1;
ret = 1;
}
else {
use_helpfile(NULL);
use_helpline(NULL);
dialog_textbox(file, fname, LINES, COLS);
}
return 0;
restorescr(old);
return ret;
}
char *

48
usr.sbin/sade/menus.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: menus.c,v 1.51 1996/04/23 01:29:28 jkh Exp $
* $Id: menus.c,v 1.52 1996/04/25 17:31:23 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -417,35 +417,9 @@ for an ethernet installation.",
{ { NULL } },
};
static int
whichMedia(dialogMenuItem *self)
{
if (!mediaDevice)
return FALSE;
if (!strcmp(self->prompt, "1 CDROM") && mediaDevice->type == DEVICE_TYPE_CDROM)
return TRUE;
else if (!strcmp(self->prompt, "2 DOS") && mediaDevice->type == DEVICE_TYPE_DOS)
return TRUE;
else if (!strcmp(self->prompt, "3 File System") && mediaDevice->type == DEVICE_TYPE_UFS)
return TRUE;
else if (!strcmp(self->prompt, "4 Floppy") && mediaDevice->type == DEVICE_TYPE_FLOPPY)
return TRUE;
else if (!strcmp(self->prompt, "5 FTP") && mediaDevice->type == DEVICE_TYPE_FTP &&
!strcmp(variable_get(VAR_FTP_STATE), "active"))
return TRUE;
else if (!strcmp(self->prompt, "6 FTP Passive") && mediaDevice->type == DEVICE_TYPE_FTP &&
!strcmp(variable_get(VAR_FTP_STATE), "passive"))
return TRUE;
else if (!strcmp(self->prompt, "7 NFS") && mediaDevice->type == DEVICE_TYPE_NFS)
return TRUE;
else if (!strcmp(self->prompt, "8 Tape") && mediaDevice->type == DEVICE_TYPE_TAPE)
return TRUE;
return FALSE;
}
/* The media selection menu */
DMenu MenuMedia = {
DMENU_RADIO_TYPE | DMENU_SELECTION_RETURNS,
DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS,
"Choose Installation Media",
"FreeBSD can be installed from a variety of different installation\n\
media, ranging from floppies to an Internet FTP server. If you're\n\
@ -455,21 +429,21 @@ media.",
"Press F1 for more information on the various media types",
"media",
{ { "1 CDROM", "Install from a FreeBSD CDROM",
whichMedia, mediaSetCDROM },
NULL, mediaSetCDROM },
{ "2 DOS", "Install from a DOS partition",
whichMedia, mediaSetDOS },
NULL, mediaSetDOS },
{ "3 File System", "Install from an existing filesystem",
whichMedia, mediaSetUFS },
NULL, mediaSetUFS },
{ "4 Floppy", "Install from a floppy disk set",
whichMedia, mediaSetFloppy },
NULL, mediaSetFloppy },
{ "5 FTP", "Install from an FTP server",
whichMedia, mediaSetFTPActive },
NULL, mediaSetFTPActive },
{ "6 FTP Passive", "Install from an FTP server through a firewall",
whichMedia, mediaSetFTPPassive },
NULL, mediaSetFTPPassive },
{ "7 NFS", "Install over NFS",
whichMedia, mediaSetNFS },
NULL, mediaSetNFS },
{ "8 Tape", "Install from SCSI or QIC tape",
whichMedia, mediaSetTape },
NULL, mediaSetTape },
{ NULL } },
};
@ -929,7 +903,7 @@ aspects of your system's network configuration.",
};
DMenu MenuNTP = {
DMENU_RADIO_TYPE | DMENU_SELECTION_RETURNS,
DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS,
"NTPDATE Server Selection",
"There are a number of time syncronization servers available\n\
for public use around the Internet. Please select one reasonably\n\

9
usr.sbin/sade/system.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: system.c,v 1.51 1996/04/23 01:29:33 jkh Exp $
* $Id: system.c,v 1.52 1996/04/25 17:31:27 jkh Exp $
*
* Jordan Hubbard
*
@ -120,6 +120,8 @@ systemDisplayHelp(char *file)
{
char *fname = NULL;
char buf[FILENAME_MAX];
WINDOW *old = savescr();
int ret = 0;
fname = systemHelpFile(file, buf);
if (!fname) {
@ -127,14 +129,15 @@ systemDisplayHelp(char *file)
use_helpfile(NULL);
use_helpline(NULL);
dialog_mesgbox("Sorry!", buf, -1, -1);
return 1;
ret = 1;
}
else {
use_helpfile(NULL);
use_helpline(NULL);
dialog_textbox(file, fname, LINES, COLS);
}
return 0;
restorescr(old);
return ret;
}
char *

11
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.33 1996/04/23 01:29:26 jkh Exp $
* $Id: media.c,v 1.34 1996/04/25 17:31:22 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -51,7 +51,7 @@ genericHook(dialogMenuItem *self, DeviceType type)
devs = deviceFind(self->prompt, type);
if (devs)
mediaDevice = devs[0];
return devs ? DITEM_SUCCESS : DITEM_FAILURE;
return (devs ? DITEM_LEAVE_MENU : DITEM_FAILURE);
}
static int
@ -492,9 +492,10 @@ mediaExtractDist(char *dir, int fd)
int
mediaGetType(dialogMenuItem *self)
{
if (!dmenuOpenSimple(&MenuMedia))
return DITEM_FAILURE | DITEM_RESTORE | DITEM_RECREATE;
return DITEM_SUCCESS | DITEM_RESTORE | DITEM_RECREATE;
int i;
i = dmenuOpenSimple(&MenuMedia) ? DITEM_SUCCESS : DITEM_FAILURE;
return i | DITEM_RESTORE | DITEM_RECREATE;
}
/* Return TRUE if all the media variables are set up correctly */

48
usr.sbin/sysinstall/menus.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: menus.c,v 1.51 1996/04/23 01:29:28 jkh Exp $
* $Id: menus.c,v 1.52 1996/04/25 17:31:23 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -417,35 +417,9 @@ for an ethernet installation.",
{ { NULL } },
};
static int
whichMedia(dialogMenuItem *self)
{
if (!mediaDevice)
return FALSE;
if (!strcmp(self->prompt, "1 CDROM") && mediaDevice->type == DEVICE_TYPE_CDROM)
return TRUE;
else if (!strcmp(self->prompt, "2 DOS") && mediaDevice->type == DEVICE_TYPE_DOS)
return TRUE;
else if (!strcmp(self->prompt, "3 File System") && mediaDevice->type == DEVICE_TYPE_UFS)
return TRUE;
else if (!strcmp(self->prompt, "4 Floppy") && mediaDevice->type == DEVICE_TYPE_FLOPPY)
return TRUE;
else if (!strcmp(self->prompt, "5 FTP") && mediaDevice->type == DEVICE_TYPE_FTP &&
!strcmp(variable_get(VAR_FTP_STATE), "active"))
return TRUE;
else if (!strcmp(self->prompt, "6 FTP Passive") && mediaDevice->type == DEVICE_TYPE_FTP &&
!strcmp(variable_get(VAR_FTP_STATE), "passive"))
return TRUE;
else if (!strcmp(self->prompt, "7 NFS") && mediaDevice->type == DEVICE_TYPE_NFS)
return TRUE;
else if (!strcmp(self->prompt, "8 Tape") && mediaDevice->type == DEVICE_TYPE_TAPE)
return TRUE;
return FALSE;
}
/* The media selection menu */
DMenu MenuMedia = {
DMENU_RADIO_TYPE | DMENU_SELECTION_RETURNS,
DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS,
"Choose Installation Media",
"FreeBSD can be installed from a variety of different installation\n\
media, ranging from floppies to an Internet FTP server. If you're\n\
@ -455,21 +429,21 @@ media.",
"Press F1 for more information on the various media types",
"media",
{ { "1 CDROM", "Install from a FreeBSD CDROM",
whichMedia, mediaSetCDROM },
NULL, mediaSetCDROM },
{ "2 DOS", "Install from a DOS partition",
whichMedia, mediaSetDOS },
NULL, mediaSetDOS },
{ "3 File System", "Install from an existing filesystem",
whichMedia, mediaSetUFS },
NULL, mediaSetUFS },
{ "4 Floppy", "Install from a floppy disk set",
whichMedia, mediaSetFloppy },
NULL, mediaSetFloppy },
{ "5 FTP", "Install from an FTP server",
whichMedia, mediaSetFTPActive },
NULL, mediaSetFTPActive },
{ "6 FTP Passive", "Install from an FTP server through a firewall",
whichMedia, mediaSetFTPPassive },
NULL, mediaSetFTPPassive },
{ "7 NFS", "Install over NFS",
whichMedia, mediaSetNFS },
NULL, mediaSetNFS },
{ "8 Tape", "Install from SCSI or QIC tape",
whichMedia, mediaSetTape },
NULL, mediaSetTape },
{ NULL } },
};
@ -929,7 +903,7 @@ aspects of your system's network configuration.",
};
DMenu MenuNTP = {
DMENU_RADIO_TYPE | DMENU_SELECTION_RETURNS,
DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS,
"NTPDATE Server Selection",
"There are a number of time syncronization servers available\n\
for public use around the Internet. Please select one reasonably\n\

9
usr.sbin/sysinstall/system.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: system.c,v 1.51 1996/04/23 01:29:33 jkh Exp $
* $Id: system.c,v 1.52 1996/04/25 17:31:27 jkh Exp $
*
* Jordan Hubbard
*
@ -120,6 +120,8 @@ systemDisplayHelp(char *file)
{
char *fname = NULL;
char buf[FILENAME_MAX];
WINDOW *old = savescr();
int ret = 0;
fname = systemHelpFile(file, buf);
if (!fname) {
@ -127,14 +129,15 @@ systemDisplayHelp(char *file)
use_helpfile(NULL);
use_helpline(NULL);
dialog_mesgbox("Sorry!", buf, -1, -1);
return 1;
ret = 1;
}
else {
use_helpfile(NULL);
use_helpline(NULL);
dialog_textbox(file, fname, LINES, COLS);
}
return 0;
restorescr(old);
return ret;
}
char *