mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-14 10:09:48 +00:00
Don't use some of the low-contrast text attributes I was using before - they
apparently look bad on some LCD screens. While I'm in there, tweak and adjust a number of other minor interface details which have been bothering me for awhile.
This commit is contained in:
Jordan K. Hubbard
parent
5b28a6011f
commit
bd71bd2513
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=16366
@ -58,6 +58,16 @@ FTP username: Specify username and password instead of anonymous.
|
||||
specify the username and password with this option.
|
||||
|
||||
|
||||
Editor: Specify which screen editor to use.
|
||||
|
||||
At various points during the installation it may be necessary
|
||||
to customize some text file, at which point the user will be
|
||||
thrown unceremoniously into a screen editor. A relatively
|
||||
simplistic editor which shows its command set on-screen is
|
||||
selected by default, but UNIX purists may wish to change this
|
||||
setting to /usr/bin/vi
|
||||
|
||||
|
||||
Tape Blocksize: Specify block size in 512 byte blocks of tape.
|
||||
|
||||
This defaults to 20 blocks, which should work with most
|
||||
@ -79,7 +89,9 @@ Release Name: Which release to attempt to load from installation media.
|
||||
|
||||
You should only change this option if you're really sure you know
|
||||
what you are doing! This will change the release name used by
|
||||
sysinstall when fetching components of any distributions.
|
||||
sysinstall when fetching components of any distributions, and
|
||||
is a useful way of using a more recent installation boot floppy
|
||||
with an older release (say, on CDROM).
|
||||
|
||||
|
||||
Browser Package: Which package to load for an HTML browser.
|
||||
@ -101,12 +113,13 @@ Media Type: Which media type is being used.
|
||||
was last selected in the Media menu. It's also a convenient short-cut
|
||||
to the media menu itself.
|
||||
|
||||
Editor: Which text editor to use.
|
||||
|
||||
The default editor with sysinstall is `ee' - a small editor which
|
||||
also displays its keybindings and is hence often easier to use
|
||||
for the UNIX novice. Those with a preference for, say, vi could
|
||||
enter /usr/bin/vi using this option.
|
||||
Package Temp: Where package temporary files should go
|
||||
|
||||
Some packages, like emacs, can use a LOT of temporary space - up to
|
||||
20 or 30MB. If you are going to configure a small / directory (and
|
||||
hence a small /tmp) then you may wish to set this to point at another
|
||||
location (say, /usr/tmp).
|
||||
|
||||
|
||||
Use Defaults: Use default values.
|
||||
|
||||
@ -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.33 1996/06/08 08:01:49 jkh Exp $
|
||||
* $Id: index.c,v 1.34 1996/06/12 14:02:06 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -43,7 +43,7 @@
|
||||
#include "sysinstall.h"
|
||||
|
||||
/* Macros and magic values */
|
||||
#define MAX_MENU 13
|
||||
#define MAX_MENU 12
|
||||
#define _MAX_DESC 60
|
||||
|
||||
static int index_extract_one(Device *dev, PkgNodePtr top, PkgNodePtr who, Boolean depended);
|
||||
@ -60,7 +60,8 @@ static char *descrs[] = {
|
||||
"To unmark a package, press SPACE again. To go to a previous menu,\n"
|
||||
"select the Cancel button. To search for a package by name, press ESC.\n"
|
||||
"To finally extract packages, you should Cancel all the way out of any\n"
|
||||
"submenus and then this top menu.",
|
||||
"submenus and then this top menu. NOTE: The All category selection\n"
|
||||
"creates a very large submenu. If you select it, please be patient.",
|
||||
"Package Targets", "These are the packages you've selected for extraction.\n\n"
|
||||
"If you're sure of these choices, select OK.\n"
|
||||
"If not, select Cancel to go back to the package selection menu.\n",
|
||||
@ -484,6 +485,7 @@ index_menu(PkgNodePtr top, PkgNodePtr plist, int *pos, int *scroll)
|
||||
/* NULL delimiter so item_free() knows when to stop later */
|
||||
nitems = item_add(nitems, NULL, NULL, NULL, NULL, NULL, NULL, 0, &curr, &max);
|
||||
|
||||
recycle:
|
||||
dialog_clear();
|
||||
if (hasPackages)
|
||||
rval = dialog_checklist(top->name, top->desc, -1, -1, n > MAX_MENU ? MAX_MENU : n, -n, nitems, NULL);
|
||||
@ -508,7 +510,7 @@ index_menu(PkgNodePtr top, PkgNodePtr plist, int *pos, int *scroll)
|
||||
else
|
||||
msgConfirm("Search string: %s yielded no hits.", cp);
|
||||
}
|
||||
continue;
|
||||
goto recycle;
|
||||
}
|
||||
items_free(nitems, &curr, &max);
|
||||
restorescr(w);
|
||||
|
||||
@ -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.100 1996/06/12 14:02:09 jkh Exp $
|
||||
* $Id: install.c,v 1.101 1996/06/13 17:36:28 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -803,6 +803,7 @@ installVarDefaults(dialogMenuItem *self)
|
||||
variable_set2(VAR_FTP_STATE, "passive");
|
||||
variable_set2(VAR_FTP_ONERROR, "abort");
|
||||
variable_set2(VAR_FTP_RETRIES, MAX_FTP_RETRIES);
|
||||
variable_set2(VAR_PKG_TMPDIR, "/usr/tmp");
|
||||
if (getpid() != 1)
|
||||
variable_set2(SYSTEM_STATE, "update");
|
||||
else
|
||||
|
||||
@ -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.34 1996/05/23 16:34:28 jkh Exp $
|
||||
* $Id: msg.c,v 1.35 1996/06/08 09:08:43 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -99,7 +99,7 @@ msgInfo(char *fmt, ...)
|
||||
break;
|
||||
}
|
||||
line[80] = '\0';
|
||||
attrset(title_attr);
|
||||
attrset(ATTR_TITLE);
|
||||
mvaddstr(OnVTY ? VTY_STATLINE : TTY_STATLINE, 0, line);
|
||||
attrset(attrs);
|
||||
move(OnVTY ? VTY_STATLINE : TTY_STATLINE, 79);
|
||||
@ -121,7 +121,7 @@ msgWarn(char *fmt, ...)
|
||||
va_end(args);
|
||||
attrs = getattrs(stdscr);
|
||||
beep();
|
||||
attrset(title_attr);
|
||||
attrset(ATTR_TITLE);
|
||||
mvaddstr(OnVTY ? VTY_STATLINE : TTY_STATLINE, 0, errstr);
|
||||
attrset(attrs);
|
||||
refresh();
|
||||
@ -144,7 +144,7 @@ msgError(char *fmt, ...)
|
||||
va_end(args);
|
||||
beep();
|
||||
attrs = getattrs(stdscr);
|
||||
attrset(title_attr);
|
||||
attrset(ATTR_TITLE);
|
||||
mvaddstr(OnVTY ? VTY_STATLINE : TTY_STATLINE, 0, errstr);
|
||||
attrset(attrs);
|
||||
refresh();
|
||||
@ -167,7 +167,7 @@ msgFatal(char *fmt, ...)
|
||||
va_end(args);
|
||||
beep();
|
||||
attrs = getattrs(stdscr);
|
||||
attrset(title_attr);
|
||||
attrset(ATTR_TITLE);
|
||||
mvaddstr(OnVTY ? VTY_STATLINE : TTY_STATLINE, 0, errstr);
|
||||
addstr(" - ");
|
||||
addstr("PRESS ANY KEY TO ");
|
||||
|
||||
@ -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.37 1996/06/08 08:01:52 jkh Exp $
|
||||
* $Id: options.c,v 1.38 1996/06/08 09:08:45 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -45,7 +45,7 @@ varCheck(Option opt)
|
||||
if (opt.aux)
|
||||
cp = variable_get((char *)opt.aux);
|
||||
if (!cp)
|
||||
return "<default setting>";
|
||||
return "NO";
|
||||
return cp;
|
||||
}
|
||||
|
||||
@ -131,7 +131,7 @@ static Option Options[] = {
|
||||
{ "Media Type", "The current installation media type.",
|
||||
OPT_IS_FUNC, mediaGetType, VAR_MEDIA_TYPE, mediaCheck },
|
||||
{ "Package Temp", "The directory where package temporary files should go",
|
||||
OPT_IS_VAR, PKG_PROMPT, "PKG_TMPDIR", varCheck },
|
||||
OPT_IS_VAR, PKG_PROMPT, VAR_PKG_TMPDIR, varCheck },
|
||||
{ "Use Defaults", "Reset all values to startup defaults",
|
||||
OPT_IS_FUNC, installVarDefaults, 0, resetLogo },
|
||||
{ NULL },
|
||||
@ -209,8 +209,8 @@ optionsEditor(dialogMenuItem *self)
|
||||
mvaddstr(OPT_START_ROW - 1, OPT_VALUE_COL + (i * GROUP_OFFSET), "-----");
|
||||
}
|
||||
/* And the footer */
|
||||
mvprintw(OPT_END_ROW + 0, 0, "Use SPACE to select/toggle an option, arrow keys to move,");
|
||||
mvprintw(OPT_END_ROW + 1, 0, "? or F1 for more help. When you're done, type Q to Quit.");
|
||||
mvprintw(OPT_END_ROW + 1, 0, "Use SPACE to select/toggle an option, arrow keys to move,");
|
||||
mvprintw(OPT_END_ROW + 2, 0, "? or F1 for more help. When you're done, type Q to Quit.");
|
||||
|
||||
optrow = OPT_START_ROW;
|
||||
optcol = OPT_NAME_COL;
|
||||
@ -228,8 +228,8 @@ optionsEditor(dialogMenuItem *self)
|
||||
}
|
||||
clrtoeol();
|
||||
}
|
||||
attrset(item_attr);
|
||||
mvaddstr(OPT_END_ROW + 3, 0, Options[currOpt].desc);
|
||||
attrset(ATTR_TITLE);
|
||||
mvaddstr(OPT_END_ROW + 4, 0, Options[currOpt].desc);
|
||||
attrset(A_NORMAL);
|
||||
clrtoeol();
|
||||
move(0, 14);
|
||||
@ -247,14 +247,14 @@ optionsEditor(dialogMenuItem *self)
|
||||
if (currOpt)
|
||||
--currOpt;
|
||||
else
|
||||
beep();
|
||||
for (currOpt = 0; Options[currOpt + 1].name; currOpt++);
|
||||
continue;
|
||||
|
||||
case KEY_DOWN:
|
||||
if (Options[currOpt + 1].name)
|
||||
++currOpt;
|
||||
else
|
||||
beep();
|
||||
currOpt = 0;
|
||||
continue;
|
||||
|
||||
case KEY_HOME:
|
||||
|
||||
@ -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: sysinstall.h,v 1.59 1996/06/11 09:47:30 jkh Exp $
|
||||
* $Id: sysinstall.h,v 1.60 1996/06/12 14:20:20 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -97,6 +97,7 @@
|
||||
#define VAR_FTP_RETRIES "ftpRetryCount"
|
||||
#define VAR_FTP_STATE "ftpState"
|
||||
#define VAR_FTP_USER "ftpUser"
|
||||
#define VAR_GATED "gated"
|
||||
#define VAR_GATEWAY "defaultrouter"
|
||||
#define VAR_GEOMETRY "geometry"
|
||||
#define VAR_HOSTNAME "hostname"
|
||||
@ -113,19 +114,19 @@
|
||||
#define VAR_NFS_SERVER "nfs_server"
|
||||
#define VAR_NO_CONFIRM "noConfirm"
|
||||
#define VAR_NTPDATE "ntpDate"
|
||||
#define VAR_PCNFSD "pcnfsd"
|
||||
#define VAR_PKG_TMPDIR "PKG_TMPDIR"
|
||||
#define VAR_PORTS_PATH "ports"
|
||||
#define VAR_RELNAME "releaseName"
|
||||
#define VAR_ROOT_SIZE "rootSize"
|
||||
#define VAR_ROUTEDFLAGS "routedflags"
|
||||
#define VAR_GATED "gated"
|
||||
#define VAR_PCNFSD "pcnfsd"
|
||||
#define VAR_SERIAL_SPEED "serialSpeed"
|
||||
#define VAR_SLOW_ETHER "slowEthernetCard"
|
||||
#define VAR_SWAP_SIZE "swapSize"
|
||||
#define VAR_TAPE_BLOCKSIZE "tapeBlocksize"
|
||||
#define VAR_UFS_PATH "ufs"
|
||||
#define VAR_USR_SIZE "usrSize"
|
||||
#define VAR_VAR_SIZE "varSize"
|
||||
#define VAR_SERIAL_SPEED "serialSpeed"
|
||||
|
||||
#define DEFAULT_TAPE_BLOCKSIZE "20"
|
||||
|
||||
@ -134,6 +135,8 @@
|
||||
|
||||
/* Which selection attributes to use */
|
||||
#define ATTR_SELECTED (ColorDisplay ? item_selected_attr : item_attr)
|
||||
#define ATTR_TITLE button_active_attr
|
||||
|
||||
|
||||
/*** Types ***/
|
||||
typedef unsigned int Boolean;
|
||||
|
||||
@ -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.100 1996/06/12 14:02:09 jkh Exp $
|
||||
* $Id: install.c,v 1.101 1996/06/13 17:36:28 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -803,6 +803,7 @@ installVarDefaults(dialogMenuItem *self)
|
||||
variable_set2(VAR_FTP_STATE, "passive");
|
||||
variable_set2(VAR_FTP_ONERROR, "abort");
|
||||
variable_set2(VAR_FTP_RETRIES, MAX_FTP_RETRIES);
|
||||
variable_set2(VAR_PKG_TMPDIR, "/usr/tmp");
|
||||
if (getpid() != 1)
|
||||
variable_set2(SYSTEM_STATE, "update");
|
||||
else
|
||||
|
||||
@ -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.34 1996/05/23 16:34:28 jkh Exp $
|
||||
* $Id: msg.c,v 1.35 1996/06/08 09:08:43 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -99,7 +99,7 @@ msgInfo(char *fmt, ...)
|
||||
break;
|
||||
}
|
||||
line[80] = '\0';
|
||||
attrset(title_attr);
|
||||
attrset(ATTR_TITLE);
|
||||
mvaddstr(OnVTY ? VTY_STATLINE : TTY_STATLINE, 0, line);
|
||||
attrset(attrs);
|
||||
move(OnVTY ? VTY_STATLINE : TTY_STATLINE, 79);
|
||||
@ -121,7 +121,7 @@ msgWarn(char *fmt, ...)
|
||||
va_end(args);
|
||||
attrs = getattrs(stdscr);
|
||||
beep();
|
||||
attrset(title_attr);
|
||||
attrset(ATTR_TITLE);
|
||||
mvaddstr(OnVTY ? VTY_STATLINE : TTY_STATLINE, 0, errstr);
|
||||
attrset(attrs);
|
||||
refresh();
|
||||
@ -144,7 +144,7 @@ msgError(char *fmt, ...)
|
||||
va_end(args);
|
||||
beep();
|
||||
attrs = getattrs(stdscr);
|
||||
attrset(title_attr);
|
||||
attrset(ATTR_TITLE);
|
||||
mvaddstr(OnVTY ? VTY_STATLINE : TTY_STATLINE, 0, errstr);
|
||||
attrset(attrs);
|
||||
refresh();
|
||||
@ -167,7 +167,7 @@ msgFatal(char *fmt, ...)
|
||||
va_end(args);
|
||||
beep();
|
||||
attrs = getattrs(stdscr);
|
||||
attrset(title_attr);
|
||||
attrset(ATTR_TITLE);
|
||||
mvaddstr(OnVTY ? VTY_STATLINE : TTY_STATLINE, 0, errstr);
|
||||
addstr(" - ");
|
||||
addstr("PRESS ANY KEY TO ");
|
||||
|
||||
@ -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: sysinstall.h,v 1.59 1996/06/11 09:47:30 jkh Exp $
|
||||
* $Id: sysinstall.h,v 1.60 1996/06/12 14:20:20 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -97,6 +97,7 @@
|
||||
#define VAR_FTP_RETRIES "ftpRetryCount"
|
||||
#define VAR_FTP_STATE "ftpState"
|
||||
#define VAR_FTP_USER "ftpUser"
|
||||
#define VAR_GATED "gated"
|
||||
#define VAR_GATEWAY "defaultrouter"
|
||||
#define VAR_GEOMETRY "geometry"
|
||||
#define VAR_HOSTNAME "hostname"
|
||||
@ -113,19 +114,19 @@
|
||||
#define VAR_NFS_SERVER "nfs_server"
|
||||
#define VAR_NO_CONFIRM "noConfirm"
|
||||
#define VAR_NTPDATE "ntpDate"
|
||||
#define VAR_PCNFSD "pcnfsd"
|
||||
#define VAR_PKG_TMPDIR "PKG_TMPDIR"
|
||||
#define VAR_PORTS_PATH "ports"
|
||||
#define VAR_RELNAME "releaseName"
|
||||
#define VAR_ROOT_SIZE "rootSize"
|
||||
#define VAR_ROUTEDFLAGS "routedflags"
|
||||
#define VAR_GATED "gated"
|
||||
#define VAR_PCNFSD "pcnfsd"
|
||||
#define VAR_SERIAL_SPEED "serialSpeed"
|
||||
#define VAR_SLOW_ETHER "slowEthernetCard"
|
||||
#define VAR_SWAP_SIZE "swapSize"
|
||||
#define VAR_TAPE_BLOCKSIZE "tapeBlocksize"
|
||||
#define VAR_UFS_PATH "ufs"
|
||||
#define VAR_USR_SIZE "usrSize"
|
||||
#define VAR_VAR_SIZE "varSize"
|
||||
#define VAR_SERIAL_SPEED "serialSpeed"
|
||||
|
||||
#define DEFAULT_TAPE_BLOCKSIZE "20"
|
||||
|
||||
@ -134,6 +135,8 @@
|
||||
|
||||
/* Which selection attributes to use */
|
||||
#define ATTR_SELECTED (ColorDisplay ? item_selected_attr : item_attr)
|
||||
#define ATTR_TITLE button_active_attr
|
||||
|
||||
|
||||
/*** Types ***/
|
||||
typedef unsigned int Boolean;
|
||||
|
||||
@ -58,6 +58,16 @@ FTP username: Specify username and password instead of anonymous.
|
||||
specify the username and password with this option.
|
||||
|
||||
|
||||
Editor: Specify which screen editor to use.
|
||||
|
||||
At various points during the installation it may be necessary
|
||||
to customize some text file, at which point the user will be
|
||||
thrown unceremoniously into a screen editor. A relatively
|
||||
simplistic editor which shows its command set on-screen is
|
||||
selected by default, but UNIX purists may wish to change this
|
||||
setting to /usr/bin/vi
|
||||
|
||||
|
||||
Tape Blocksize: Specify block size in 512 byte blocks of tape.
|
||||
|
||||
This defaults to 20 blocks, which should work with most
|
||||
@ -79,7 +89,9 @@ Release Name: Which release to attempt to load from installation media.
|
||||
|
||||
You should only change this option if you're really sure you know
|
||||
what you are doing! This will change the release name used by
|
||||
sysinstall when fetching components of any distributions.
|
||||
sysinstall when fetching components of any distributions, and
|
||||
is a useful way of using a more recent installation boot floppy
|
||||
with an older release (say, on CDROM).
|
||||
|
||||
|
||||
Browser Package: Which package to load for an HTML browser.
|
||||
@ -101,12 +113,13 @@ Media Type: Which media type is being used.
|
||||
was last selected in the Media menu. It's also a convenient short-cut
|
||||
to the media menu itself.
|
||||
|
||||
Editor: Which text editor to use.
|
||||
|
||||
The default editor with sysinstall is `ee' - a small editor which
|
||||
also displays its keybindings and is hence often easier to use
|
||||
for the UNIX novice. Those with a preference for, say, vi could
|
||||
enter /usr/bin/vi using this option.
|
||||
Package Temp: Where package temporary files should go
|
||||
|
||||
Some packages, like emacs, can use a LOT of temporary space - up to
|
||||
20 or 30MB. If you are going to configure a small / directory (and
|
||||
hence a small /tmp) then you may wish to set this to point at another
|
||||
location (say, /usr/tmp).
|
||||
|
||||
|
||||
Use Defaults: Use default values.
|
||||
|
||||
@ -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.33 1996/06/08 08:01:49 jkh Exp $
|
||||
* $Id: index.c,v 1.34 1996/06/12 14:02:06 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -43,7 +43,7 @@
|
||||
#include "sysinstall.h"
|
||||
|
||||
/* Macros and magic values */
|
||||
#define MAX_MENU 13
|
||||
#define MAX_MENU 12
|
||||
#define _MAX_DESC 60
|
||||
|
||||
static int index_extract_one(Device *dev, PkgNodePtr top, PkgNodePtr who, Boolean depended);
|
||||
@ -60,7 +60,8 @@ static char *descrs[] = {
|
||||
"To unmark a package, press SPACE again. To go to a previous menu,\n"
|
||||
"select the Cancel button. To search for a package by name, press ESC.\n"
|
||||
"To finally extract packages, you should Cancel all the way out of any\n"
|
||||
"submenus and then this top menu.",
|
||||
"submenus and then this top menu. NOTE: The All category selection\n"
|
||||
"creates a very large submenu. If you select it, please be patient.",
|
||||
"Package Targets", "These are the packages you've selected for extraction.\n\n"
|
||||
"If you're sure of these choices, select OK.\n"
|
||||
"If not, select Cancel to go back to the package selection menu.\n",
|
||||
@ -484,6 +485,7 @@ index_menu(PkgNodePtr top, PkgNodePtr plist, int *pos, int *scroll)
|
||||
/* NULL delimiter so item_free() knows when to stop later */
|
||||
nitems = item_add(nitems, NULL, NULL, NULL, NULL, NULL, NULL, 0, &curr, &max);
|
||||
|
||||
recycle:
|
||||
dialog_clear();
|
||||
if (hasPackages)
|
||||
rval = dialog_checklist(top->name, top->desc, -1, -1, n > MAX_MENU ? MAX_MENU : n, -n, nitems, NULL);
|
||||
@ -508,7 +510,7 @@ index_menu(PkgNodePtr top, PkgNodePtr plist, int *pos, int *scroll)
|
||||
else
|
||||
msgConfirm("Search string: %s yielded no hits.", cp);
|
||||
}
|
||||
continue;
|
||||
goto recycle;
|
||||
}
|
||||
items_free(nitems, &curr, &max);
|
||||
restorescr(w);
|
||||
|
||||
@ -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.100 1996/06/12 14:02:09 jkh Exp $
|
||||
* $Id: install.c,v 1.101 1996/06/13 17:36:28 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -803,6 +803,7 @@ installVarDefaults(dialogMenuItem *self)
|
||||
variable_set2(VAR_FTP_STATE, "passive");
|
||||
variable_set2(VAR_FTP_ONERROR, "abort");
|
||||
variable_set2(VAR_FTP_RETRIES, MAX_FTP_RETRIES);
|
||||
variable_set2(VAR_PKG_TMPDIR, "/usr/tmp");
|
||||
if (getpid() != 1)
|
||||
variable_set2(SYSTEM_STATE, "update");
|
||||
else
|
||||
|
||||
@ -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.34 1996/05/23 16:34:28 jkh Exp $
|
||||
* $Id: msg.c,v 1.35 1996/06/08 09:08:43 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -99,7 +99,7 @@ msgInfo(char *fmt, ...)
|
||||
break;
|
||||
}
|
||||
line[80] = '\0';
|
||||
attrset(title_attr);
|
||||
attrset(ATTR_TITLE);
|
||||
mvaddstr(OnVTY ? VTY_STATLINE : TTY_STATLINE, 0, line);
|
||||
attrset(attrs);
|
||||
move(OnVTY ? VTY_STATLINE : TTY_STATLINE, 79);
|
||||
@ -121,7 +121,7 @@ msgWarn(char *fmt, ...)
|
||||
va_end(args);
|
||||
attrs = getattrs(stdscr);
|
||||
beep();
|
||||
attrset(title_attr);
|
||||
attrset(ATTR_TITLE);
|
||||
mvaddstr(OnVTY ? VTY_STATLINE : TTY_STATLINE, 0, errstr);
|
||||
attrset(attrs);
|
||||
refresh();
|
||||
@ -144,7 +144,7 @@ msgError(char *fmt, ...)
|
||||
va_end(args);
|
||||
beep();
|
||||
attrs = getattrs(stdscr);
|
||||
attrset(title_attr);
|
||||
attrset(ATTR_TITLE);
|
||||
mvaddstr(OnVTY ? VTY_STATLINE : TTY_STATLINE, 0, errstr);
|
||||
attrset(attrs);
|
||||
refresh();
|
||||
@ -167,7 +167,7 @@ msgFatal(char *fmt, ...)
|
||||
va_end(args);
|
||||
beep();
|
||||
attrs = getattrs(stdscr);
|
||||
attrset(title_attr);
|
||||
attrset(ATTR_TITLE);
|
||||
mvaddstr(OnVTY ? VTY_STATLINE : TTY_STATLINE, 0, errstr);
|
||||
addstr(" - ");
|
||||
addstr("PRESS ANY KEY TO ");
|
||||
|
||||
@ -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.37 1996/06/08 08:01:52 jkh Exp $
|
||||
* $Id: options.c,v 1.38 1996/06/08 09:08:45 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -45,7 +45,7 @@ varCheck(Option opt)
|
||||
if (opt.aux)
|
||||
cp = variable_get((char *)opt.aux);
|
||||
if (!cp)
|
||||
return "<default setting>";
|
||||
return "NO";
|
||||
return cp;
|
||||
}
|
||||
|
||||
@ -131,7 +131,7 @@ static Option Options[] = {
|
||||
{ "Media Type", "The current installation media type.",
|
||||
OPT_IS_FUNC, mediaGetType, VAR_MEDIA_TYPE, mediaCheck },
|
||||
{ "Package Temp", "The directory where package temporary files should go",
|
||||
OPT_IS_VAR, PKG_PROMPT, "PKG_TMPDIR", varCheck },
|
||||
OPT_IS_VAR, PKG_PROMPT, VAR_PKG_TMPDIR, varCheck },
|
||||
{ "Use Defaults", "Reset all values to startup defaults",
|
||||
OPT_IS_FUNC, installVarDefaults, 0, resetLogo },
|
||||
{ NULL },
|
||||
@ -209,8 +209,8 @@ optionsEditor(dialogMenuItem *self)
|
||||
mvaddstr(OPT_START_ROW - 1, OPT_VALUE_COL + (i * GROUP_OFFSET), "-----");
|
||||
}
|
||||
/* And the footer */
|
||||
mvprintw(OPT_END_ROW + 0, 0, "Use SPACE to select/toggle an option, arrow keys to move,");
|
||||
mvprintw(OPT_END_ROW + 1, 0, "? or F1 for more help. When you're done, type Q to Quit.");
|
||||
mvprintw(OPT_END_ROW + 1, 0, "Use SPACE to select/toggle an option, arrow keys to move,");
|
||||
mvprintw(OPT_END_ROW + 2, 0, "? or F1 for more help. When you're done, type Q to Quit.");
|
||||
|
||||
optrow = OPT_START_ROW;
|
||||
optcol = OPT_NAME_COL;
|
||||
@ -228,8 +228,8 @@ optionsEditor(dialogMenuItem *self)
|
||||
}
|
||||
clrtoeol();
|
||||
}
|
||||
attrset(item_attr);
|
||||
mvaddstr(OPT_END_ROW + 3, 0, Options[currOpt].desc);
|
||||
attrset(ATTR_TITLE);
|
||||
mvaddstr(OPT_END_ROW + 4, 0, Options[currOpt].desc);
|
||||
attrset(A_NORMAL);
|
||||
clrtoeol();
|
||||
move(0, 14);
|
||||
@ -247,14 +247,14 @@ optionsEditor(dialogMenuItem *self)
|
||||
if (currOpt)
|
||||
--currOpt;
|
||||
else
|
||||
beep();
|
||||
for (currOpt = 0; Options[currOpt + 1].name; currOpt++);
|
||||
continue;
|
||||
|
||||
case KEY_DOWN:
|
||||
if (Options[currOpt + 1].name)
|
||||
++currOpt;
|
||||
else
|
||||
beep();
|
||||
currOpt = 0;
|
||||
continue;
|
||||
|
||||
case KEY_HOME:
|
||||
|
||||
@ -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: sysinstall.h,v 1.59 1996/06/11 09:47:30 jkh Exp $
|
||||
* $Id: sysinstall.h,v 1.60 1996/06/12 14:20:20 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -97,6 +97,7 @@
|
||||
#define VAR_FTP_RETRIES "ftpRetryCount"
|
||||
#define VAR_FTP_STATE "ftpState"
|
||||
#define VAR_FTP_USER "ftpUser"
|
||||
#define VAR_GATED "gated"
|
||||
#define VAR_GATEWAY "defaultrouter"
|
||||
#define VAR_GEOMETRY "geometry"
|
||||
#define VAR_HOSTNAME "hostname"
|
||||
@ -113,19 +114,19 @@
|
||||
#define VAR_NFS_SERVER "nfs_server"
|
||||
#define VAR_NO_CONFIRM "noConfirm"
|
||||
#define VAR_NTPDATE "ntpDate"
|
||||
#define VAR_PCNFSD "pcnfsd"
|
||||
#define VAR_PKG_TMPDIR "PKG_TMPDIR"
|
||||
#define VAR_PORTS_PATH "ports"
|
||||
#define VAR_RELNAME "releaseName"
|
||||
#define VAR_ROOT_SIZE "rootSize"
|
||||
#define VAR_ROUTEDFLAGS "routedflags"
|
||||
#define VAR_GATED "gated"
|
||||
#define VAR_PCNFSD "pcnfsd"
|
||||
#define VAR_SERIAL_SPEED "serialSpeed"
|
||||
#define VAR_SLOW_ETHER "slowEthernetCard"
|
||||
#define VAR_SWAP_SIZE "swapSize"
|
||||
#define VAR_TAPE_BLOCKSIZE "tapeBlocksize"
|
||||
#define VAR_UFS_PATH "ufs"
|
||||
#define VAR_USR_SIZE "usrSize"
|
||||
#define VAR_VAR_SIZE "varSize"
|
||||
#define VAR_SERIAL_SPEED "serialSpeed"
|
||||
|
||||
#define DEFAULT_TAPE_BLOCKSIZE "20"
|
||||
|
||||
@ -134,6 +135,8 @@
|
||||
|
||||
/* Which selection attributes to use */
|
||||
#define ATTR_SELECTED (ColorDisplay ? item_selected_attr : item_attr)
|
||||
#define ATTR_TITLE button_active_attr
|
||||
|
||||
|
||||
/*** Types ***/
|
||||
typedef unsigned int Boolean;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user