diff options
51 files changed, 1828 insertions, 1873 deletions
diff --git a/release/sysinstall/anonFTP.c b/release/sysinstall/anonFTP.c index 134c9d3..04f8fbc 100644 --- a/release/sysinstall/anonFTP.c +++ b/release/sysinstall/anonFTP.c @@ -191,12 +191,14 @@ anonftpOpenDialog(void) int n = 0, cancel = FALSE; int max; char title[80]; - + WINDOW *w = savescr(); + /* We need a curses window */ if (!(ds_win = openLayoutDialog(ANONFTP_HELPFILE, " Anonymous FTP Configuration ", ANONFTP_DIALOG_X, ANONFTP_DIALOG_Y, ANONFTP_DIALOG_WIDTH, ANONFTP_DIALOG_HEIGHT))) { beep(); msgConfirm("Cannot open anonymous ftp dialog window!!"); + restorescr(w); return DITEM_FAILURE; } @@ -225,9 +227,8 @@ anonftpOpenDialog(void) /* Clear this crap off the screen */ delwin(ds_win); - dialog_clear_norefresh(); use_helpfile(NULL); - + restorescr(w); if (cancel) return DITEM_FAILURE; return DITEM_SUCCESS; @@ -241,11 +242,10 @@ configAnonFTP(dialogMenuItem *self) /* Be optimistic */ i = DITEM_SUCCESS; - dialog_clear_norefresh(); i = anonftpOpenDialog(); if (DITEM_STATUS(i) != DITEM_SUCCESS) { msgConfirm("Configuration of Anonymous FTP cancelled per user request."); - return i | DITEM_RESTORE; + return i; } /*** Use defaults for any invalid values ***/ @@ -296,7 +296,6 @@ configAnonFTP(dialogMenuItem *self) if (!msgYesNo("Create a welcome message file for anonymous FTP users?")) { char cmd[256]; - dialog_clear(); vsystem("echo Your welcome message here. > %s/etc/%s", tconf.homedir, MOTD_FILE); sprintf(cmd, "%s %s/etc/%s", variable_get(VAR_EDITOR), tconf.homedir, MOTD_FILE); if (!systemExecute(cmd)) @@ -312,5 +311,5 @@ configAnonFTP(dialogMenuItem *self) } if (DITEM_STATUS(i) == DITEM_SUCCESS) variable_set2("anon_ftp", "YES", 0); - return i | DITEM_RESTORE; + return i; } diff --git a/release/sysinstall/config.c b/release/sysinstall/config.c index 32d1161..6fa001f 100644 --- a/release/sysinstall/config.c +++ b/release/sysinstall/config.c @@ -417,7 +417,7 @@ configSaverTimeout(dialogMenuItem *self) { return (variable_get_value(VAR_BLANKTIME, "Enter time-out period in seconds for screen saver", 1) ? - DITEM_SUCCESS : DITEM_FAILURE) | DITEM_RESTORE; + DITEM_SUCCESS : DITEM_FAILURE); } int @@ -436,16 +436,18 @@ configNTP(dialogMenuItem *self) self->data = tmp; dmenuSetVariables(self); } - return status | DITEM_RESTORE; + return status; } int configUsers(dialogMenuItem *self) { + WINDOW *w = savescr(); + dialog_clear_norefresh(); dmenuOpenSimple(&MenuUsermgmt, FALSE); - dialog_clear(); - return DITEM_SUCCESS | DITEM_RESTORE; + restorescr(w); + return DITEM_SUCCESS; } int @@ -498,10 +500,13 @@ configXDesktop(dialogMenuItem *self) { char *desk; int ret = DITEM_SUCCESS; - - if (!dmenuOpenSimple(&MenuXDesktops, FALSE) || - !(desk = variable_get(VAR_DESKSTYLE))) + WINDOW *w = savescr(); + + dialog_clear_norefresh(); + if (!dmenuOpenSimple(&MenuXDesktops, FALSE) || !(desk = variable_get(VAR_DESKSTYLE))) { + restorescr(w); return DITEM_FAILURE; + } if (!strcmp(desk, "kde")) { ret = package_add("kde"); if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("startkde")) @@ -544,6 +549,7 @@ configXDesktop(dialogMenuItem *self) "by this desktop type. Please change installation media\n" "and/or select a different, perhaps simpler, desktop\n" "environment and try again."); + restorescr(w); return ret; } @@ -552,21 +558,27 @@ configXSetup(dialogMenuItem *self) { char *config, *execfile, *style; char *moused; - + WINDOW *w; + setenv("XWINHOME", "/usr/X11R6", 1); tryagain: - dialog_clear_norefresh(); + w = savescr(); variable_unset(VAR_DESKSTYLE); variable_unset(VAR_XF86_CONFIG); - if (!dmenuOpenSimple(&MenuXF86Config, FALSE)) - return DITEM_FAILURE | DITEM_RESTORE; + dialog_clear_norefresh(); + if (!dmenuOpenSimple(&MenuXF86Config, FALSE)) { + restorescr(w); + return DITEM_FAILURE; + } config = variable_get(VAR_XF86_CONFIG); style = variable_get(VAR_DESKSTYLE); if (!config) { if (style) goto config_desktop; - else - return DITEM_FAILURE | DITEM_RESTORE; + else { + restorescr(w); + return DITEM_FAILURE; + } } if (file_readable("/var/run/ld.so.hints")) @@ -577,7 +589,6 @@ tryagain: vsystem("/sbin/ifconfig lo0 127.0.0.1"); execfile = string_concat("/usr/X11R6/bin/", config); if (file_executable(execfile)) { - dialog_clear_norefresh(); moused = variable_get(VAR_MOUSED); while (!moused || strcmp(moused, "YES")) { if (msgYesNo("The X server may access the mouse in two ways: direct access\n" @@ -586,8 +597,8 @@ tryagain: "now? If you intend to let the X server access the mouse\n" "directly, choose \"No\" at this time.")) break; + dialog_clear_norefresh(); dmenuOpenSimple(&MenuMouse, FALSE); - dialog_clear(); moused = variable_get(VAR_MOUSED); } if (moused && !strcmp(moused, "YES")) @@ -595,23 +606,25 @@ tryagain: "Choose \"/dev/sysmouse\" as the mouse port and \"SysMouse\" or\n" "\"MouseSystems\" as the mouse protocol in the X configuration\n" "utility."); - dialog_clear(); systemExecute(execfile); if (!file_readable("/etc/XF86Config")) { if (!msgYesNo("The XFree86 configuration process seems to have\nfailed. Would you like to try again?")) goto tryagain; - else - return DITEM_FAILURE | DITEM_RESTORE; + else { + restorescr(w); + return DITEM_FAILURE; + } } config_desktop: configXDesktop(self); - return DITEM_SUCCESS | DITEM_RESTORE; + restorescr(w); + return DITEM_SUCCESS; } else { - dialog_clear_norefresh(); msgConfirm("The XFree86 setup utility you chose does not appear to be installed!\n" "Please install this before attempting to configure XFree86."); - return DITEM_FAILURE | DITEM_RESTORE; + restorescr(w); + return DITEM_FAILURE; } } @@ -713,7 +726,7 @@ configRouter(dialogMenuItem *self) variable_unset(VAR_ROUTER); } } - return ret | DITEM_RESTORE; + return ret; } /* Shared between us and index_initialize() */ @@ -750,7 +763,6 @@ configPackages(dialogMenuItem *self) } } else { - dialog_clear_norefresh(); msgConfirm("No packages were selected for extraction."); break; } @@ -763,7 +775,7 @@ configPackages(dialogMenuItem *self) tmp = tmp2; } index_init(NULL, &Plist); - return DITEM_SUCCESS | DITEM_RESTORE; + return DITEM_SUCCESS; } /* Load pcnfsd package */ @@ -809,9 +821,9 @@ configNFSServer(dialogMenuItem *self) sprintf(cmd, "%s /etc/exports", variable_get(VAR_EDITOR)); dialog_clear(); systemExecute(cmd); - restorescr(w); } variable_set2(VAR_NFS_SERVER, "YES", 1); + restorescr(w); } else if (variable_get(VAR_NFS_SERVER)) { /* We want to turn it off again? */ vsystem("mv -f /etc/exports /etc/exports.disabled"); diff --git a/release/sysinstall/disks.c b/release/sysinstall/disks.c index 9c736a8..20a7e90 100644 --- a/release/sysinstall/disks.c +++ b/release/sysinstall/disks.c @@ -358,7 +358,6 @@ diskPartition(Device *dev) char *val, tmp[20]; int subtype; chunk_e partitiontype; - WINDOW *save = savescr(); strcpy(tmp, "165"); val = msgGetInput(tmp, "New partition type:\n\n" @@ -380,7 +379,6 @@ diskPartition(Device *dev) chunk_info[current_chunk]->type = partitiontype; chunk_info[current_chunk]->subtype = subtype; } - restorescr(save); } break; @@ -504,7 +502,6 @@ diskPartition(Device *dev) if (p) { char buf[FILENAME_MAX]; - dialog_clear_norefresh(); use_helpline("Press F1 to read more about disk slices."); use_helpfile(systemHelpFile("partition", buf)); if (!variable_get(VAR_NO_WARN)) @@ -562,7 +559,7 @@ partitionHook(dialogMenuItem *selected) } else devs[0]->enabled = FALSE; - return DITEM_SUCCESS | DITEM_RESTORE; + return DITEM_SUCCESS; } static int @@ -626,7 +623,7 @@ diskPartitionEditor(dialogMenuItem *self) i = dmenuOpenSimple(menu, FALSE) ? DITEM_SUCCESS : DITEM_FAILURE; free(menu); } - return i | DITEM_RESTORE; + return i; } } return DITEM_SUCCESS; @@ -716,7 +713,6 @@ diskPartitionNonInteractive(Device *dev) } } if (!chunk_info[i]) { - dialog_clear(); msgConfirm("Unable to find any free space on this disk!"); return; } @@ -746,7 +742,6 @@ diskPartitionNonInteractive(Device *dev) } } if (!chunk_info[i]) { - dialog_clear(); msgConfirm("Unable to find %d free blocks on this disk!", sz); return; } @@ -758,13 +753,11 @@ diskPartitionNonInteractive(Device *dev) break; } if (!chunk_info[i]) { - dialog_clear(); msgConfirm("Unable to find any existing FreeBSD partitions on this disk!"); return; } } else { - dialog_clear(); msgConfirm("`%s' is an invalid value for %s - is config file valid?", cp, VAR_PARTITION); return; } diff --git a/release/sysinstall/dispatch.c b/release/sysinstall/dispatch.c index 3090a27..15c6c27 100644 --- a/release/sysinstall/dispatch.c +++ b/release/sysinstall/dispatch.c @@ -381,15 +381,13 @@ dispatch_load_file(dialogMenuItem *self) int dispatch_load_floppy(dialogMenuItem *self) { - int what = DITEM_RESTORE | DITEM_SUCCESS; + int what = DITEM_SUCCESS; extern char *distWanted; char *cp; FILE *fp; qelement *list; mediaClose(); - dialog_clear_norefresh(); - cp = variable_get_value(VAR_INSTALL_CFG, "Specify the name of a configuration file\n" "residing on a MSDOS or UFS floppy.", 0); @@ -430,7 +428,6 @@ dispatch_load_floppy(dialogMenuItem *self) what |= DITEM_FAILURE; mediaClose(); } - return what; } diff --git a/release/sysinstall/dist.c b/release/sysinstall/dist.c index bb4e6e2..8bcf5ac 100644 --- a/release/sysinstall/dist.c +++ b/release/sysinstall/dist.c @@ -374,22 +374,22 @@ int distSetDES(dialogMenuItem *self) { int i; - + + dialog_clear_norefresh(); if (!dmenuOpenSimple(&MenuDESDistributions, FALSE)) i = DITEM_FAILURE; else i = DITEM_SUCCESS; distVerifyFlags(); - return i | DITEM_RESTORE; + return i | DITEM_REDRAW | DITEM_RESTORE; } static int distMaybeSetDES(dialogMenuItem *self) { - int i = DITEM_SUCCESS; + int i = DITEM_SUCCESS | DITEM_REDRAW; - dialog_clear_norefresh(); - if (!msgYesNo("Do wish to install DES cryptographic software?\n\n" + if (!msgYesNo("Do you 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" "UNIX DES passwords on other non-FreeBSD systems.\n\n" @@ -404,13 +404,12 @@ distMaybeSetDES(dialogMenuItem *self) i = DITEM_FAILURE; } distVerifyFlags(); - return i | DITEM_RESTORE; + return i | DITEM_REDRAW; } static int distMaybeSetPorts(dialogMenuItem *self) { - dialog_clear_norefresh(); if (!msgYesNo("Would you like to install the FreeBSD ports collection?\n\n" "This will give you ready access to over 2000 ported software packages,\n" "though at a cost of around 90MB of disk space when \"clean\" and possibly\n" @@ -424,7 +423,7 @@ distMaybeSetPorts(dialogMenuItem *self) Dists |= DIST_PORTS; else Dists &= ~DIST_PORTS; - return DITEM_SUCCESS | DITEM_RESTORE; + return DITEM_SUCCESS; } static Boolean @@ -530,6 +529,7 @@ distSetSrc(dialogMenuItem *self) { int i; + dialog_clear_norefresh(); if (!dmenuOpenSimple(&MenuSrcDistributions, FALSE)) i = DITEM_FAILURE; else @@ -543,6 +543,7 @@ distSetXF86(dialogMenuItem *self) { int i = DITEM_SUCCESS; + dialog_clear_norefresh(); if (!dmenuOpenSimple(&MenuXF86Select, FALSE)) i = DITEM_FAILURE; distVerifyFlags(); @@ -848,11 +849,12 @@ distExtractAll(dialogMenuItem *self) { int old_dists, retries = 0, status = DITEM_SUCCESS; char buf[512]; + WINDOW *w; /* paranoia */ if (!Dists) { if (!dmenuOpenSimple(&MenuSubDistributions, FALSE) || !Dists) - return DITEM_FAILURE | DITEM_RESTORE; + return DITEM_FAILURE; } if (!mediaVerify() || !mediaDevice->init(mediaDevice)) @@ -863,7 +865,8 @@ distExtractAll(dialogMenuItem *self) dialog_clear_norefresh(); msgNotify("Attempting to install all selected distributions.."); - + w = savescr(); + /* Try for 3 times around the loop, then give up. */ while (Dists && ++retries < 3) distExtract(NULL, DistTable); @@ -886,7 +889,7 @@ distExtractAll(dialogMenuItem *self) 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); - status |= DITEM_RESTORE; } + restorescr(w); return status; } diff --git a/release/sysinstall/dist.h b/release/sysinstall/dist.h index a13f8b7..ccce9d2 100644 --- a/release/sysinstall/dist.h +++ b/release/sysinstall/dist.h @@ -43,6 +43,7 @@ #define DIST_DES_KERBEROS 0x0008 #endif #define DIST_DES_SKERBEROS 0x0010 +#define DIST_DES_ALL 0x001F /* Subtypes for SRC distribution */ #define DIST_SRC_BASE 0x00001 @@ -61,7 +62,7 @@ #define DIST_SRC_UBIN 0x02000 #define DIST_SRC_USBIN 0x04000 #define DIST_SRC_BIN 0x08000 -#define DIST_SRC_ALL 0xFFFF +#define DIST_SRC_ALL 0x0FFFF /* Subtypes for XFree86 distribution */ #define DIST_XF86_BIN 0x0001 diff --git a/release/sysinstall/dmenu.c b/release/sysinstall/dmenu.c index 9e464d9..6f5f4e5 100644 --- a/release/sysinstall/dmenu.c +++ b/release/sysinstall/dmenu.c @@ -45,14 +45,13 @@ int dmenuDisplayFile(dialogMenuItem *tmp) { systemDisplayHelp((char *)tmp->data); - return DITEM_SUCCESS | DITEM_RESTORE; + return DITEM_SUCCESS; } int dmenuSubmenu(dialogMenuItem *tmp) { - return (dmenuOpenSimple((DMenu *)(tmp->data), FALSE) ? DITEM_SUCCESS : DITEM_FAILURE) | - DITEM_RESTORE; + return (dmenuOpenSimple((DMenu *)(tmp->data), FALSE) ? DITEM_SUCCESS : DITEM_FAILURE); } int @@ -72,10 +71,13 @@ dmenuSystemCommand(dialogMenuItem *self) int dmenuSystemCommandBox(dialogMenuItem *tmp) { + WINDOW *w = savescr(); + use_helpfile(NULL); use_helpline("Select OK to dismiss this dialog"); dialog_prgbox(tmp->title, (char *)tmp->data, 22, 76, 1, 1); - return DITEM_SUCCESS | DITEM_RESTORE; + restorescr(w); + return DITEM_SUCCESS; } int @@ -147,15 +149,12 @@ int dmenuISetVariable(dialogMenuItem *tmp) { char *ans, *var; - WINDOW *w = NULL; /* Keep lint happy */ if (!(var = (char *)tmp->data)) { msgConfirm("Incorrect data field for `%s'!", tmp->title); return DITEM_FAILURE; } - w = savescr(); ans = msgGetInput(variable_get(var), tmp->title, 1); - restorescr(w); if (!ans) return DITEM_FAILURE; else if (!*ans) @@ -275,13 +274,13 @@ dmenuOpen(DMenu *menu, int *choice, int *scroll, int *curr, int *max, Boolean bu while (1) { char buf[FILENAME_MAX]; + WINDOW *w = savescr(); /* Any helpful hints, put 'em up! */ use_helpline(menu->helpline); use_helpfile(systemHelpFile(menu->helpfile, buf)); - - /* Pop up that dialog! */ dialog_clear_norefresh(); + /* Pop up that dialog! */ 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); @@ -295,14 +294,18 @@ dmenuOpen(DMenu *menu, int *choice, int *scroll, int *curr, int *max, Boolean bu menu_height(menu, n), -n, items, (char *)buttons); else msgFatal("Menu: `%s' is of an unknown type\n", menu->title); - clearok(stdscr, TRUE); if (exited) { exited = FALSE; + restorescr(w); return TRUE; } - else if (rval) + else if (rval) { + restorescr(w); return FALSE; - else if (menu->type & DMENU_SELECTION_RETURNS) + } + else if (menu->type & DMENU_SELECTION_RETURNS) { + restorescr(w); return TRUE; + } } } diff --git a/release/sysinstall/doc.c b/release/sysinstall/doc.c index 513259a..5a873d1 100644 --- a/release/sysinstall/doc.c +++ b/release/sysinstall/doc.c @@ -72,14 +72,14 @@ docBrowser(dialogMenuItem *self) "not appear to be correct. Would you like me to do that now?", browser, variable_get(VAR_BROWSER_BINARY))) vsystem("pkg_delete %s %s", !strcmp(variable_get(VAR_CPIO_VERBOSITY), "high") ? "-v" : "", browser); - return DITEM_FAILURE | DITEM_RESTORE; + return DITEM_FAILURE; } /* Run browser on the appropriate doc */ if (dmenuOpenSimple(&MenuHTMLDoc, FALSE)) - return DITEM_SUCCESS | DITEM_RESTORE; + return DITEM_SUCCESS; else - return DITEM_FAILURE | DITEM_RESTORE; + return DITEM_FAILURE; } /* Try to show one of the documents requested from the HTML doc menu */ @@ -114,9 +114,8 @@ docShowDocument(dialogMenuItem *self) } if (where) { sprintf(tmp, "%s %s", browser, where); - dialog_clear(); systemExecute(tmp); - return DITEM_SUCCESS | DITEM_RESTORE; + return DITEM_SUCCESS; } else { msgConfirm("Hmmmmm! I can't seem to access the documentation you selected!\n" diff --git a/release/sysinstall/index.c b/release/sysinstall/index.c index cc2193c..034e042 100644 --- a/release/sysinstall/index.c +++ b/release/sysinstall/index.c @@ -480,8 +480,6 @@ pkg_fire(dialogMenuItem *self) msgInfo("Added %s to selection list", kp->name); } else if (ie->depc == 0) { - WINDOW *save = savescr(); - if (!msgYesNo("Do you really want to delete %s from the system?", kp->name)) { if (vsystem("pkg_delete %s %s", isDebug() ? "-v" : "", kp->name)) { msgConfirm("Warning: pkg_delete of %s failed.\n Check debug output for details.", kp->name); @@ -491,7 +489,6 @@ pkg_fire(dialogMenuItem *self) index_recorddeps(FALSE, lists->root, ie); } } - restorescr(save); } else msgConfirm("Warning: Package %s is needed by\n %d other installed package%s.", @@ -537,16 +534,15 @@ index_menu(PkgNodePtr root, PkgNodePtr top, PkgNodePtr plist, int *pos, int *scr dialogMenuItem *nitems; Boolean hasPackages; WINDOW *w; - + lists.root = root; lists.top = top; lists.plist = plist; hasPackages = FALSE; nitems = NULL; - - w = savescr(); n = maxname = 0; + /* Figure out if this menu is full of "leaves" or "branches" */ for (kp = top->kids; kp && kp->name; kp = kp->next) { int len; @@ -560,10 +556,10 @@ index_menu(PkgNodePtr root, PkgNodePtr top, PkgNodePtr plist, int *pos, int *scr } if (!n && plist) { msgConfirm("The %s menu is empty.", top->name); - restorescr(w); return DITEM_LEAVE_MENU; } + w = savescr(); while (1) { n = 0; curr = max = 0; @@ -707,20 +703,27 @@ int index_initialize(char *path) { FILE *fp; + WINDOW *w = NULL; if (!index_initted) { + w = savescr(); + dialog_clear_norefresh(); + /* Got any media? */ - if (!mediaVerify()) + if (!mediaVerify()) { + restorescr(w); return DITEM_FAILURE; + } /* Does it move when you kick it? */ - if (!mediaDevice->init(mediaDevice)) + if (!mediaDevice->init(mediaDevice)) { + restorescr(w); return DITEM_FAILURE; + } msgNotify("Attempting to fetch %s file from selected media.", path); fp = mediaDevice->get(mediaDevice, path, TRUE); if (!fp) { - 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" @@ -729,7 +732,8 @@ index_initialize(char *path) "carry the packages collection, then we recommend either a CD\n" "distribution or the master distribution on ftp.freebsd.org."); mediaDevice->shutdown(mediaDevice); - return DITEM_FAILURE | DITEM_RESTORE; + restorescr(w); + return DITEM_FAILURE; } msgNotify("Located INDEX, now reading package data from it..."); index_init(&Top, &Plist); @@ -737,11 +741,13 @@ index_initialize(char *path) msgConfirm("I/O or format error on packages/INDEX file.\n" "Please verify media (or path to media) and try again."); fclose(fp); - return DITEM_FAILURE | DITEM_RESTORE; + restorescr(w); + return DITEM_FAILURE; } fclose(fp); index_sort(&Top); index_initted = TRUE; } - return DITEM_SUCCESS | DITEM_RESTORE; + restorescr(w); + return DITEM_SUCCESS; } diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c index 4ff5cb2..9271b8b 100644 --- a/release/sysinstall/install.c +++ b/release/sysinstall/install.c @@ -205,7 +205,7 @@ installInitial(void) "then WE STRONGLY ENCOURAGE YOU TO MAKE PROPER BACKUPS before\n" "proceeding!\n\n" "We can take no responsibility for lost disk contents!") != 0) - return DITEM_FAILURE | DITEM_RESTORE; + return DITEM_FAILURE; if (DITEM_STATUS(diskLabelCommit(NULL)) != DITEM_SUCCESS) { msgConfirm("Couldn't make filesystems properly. Aborting."); @@ -440,6 +440,7 @@ installExpress(dialogMenuItem *self) { int i; + dialog_clear_norefresh(); variable_set2(SYSTEM_STATE, "express", 0); #ifndef __alpha__ if (DITEM_STATUS((i = diskPartitionEditor(self))) == DITEM_FAILURE) @@ -449,13 +450,12 @@ installExpress(dialogMenuItem *self) if (DITEM_STATUS((i = diskLabelEditor(self))) == DITEM_FAILURE) return i; - dialog_clear_norefresh(); if (DITEM_STATUS((i = installCommit(self))) == DITEM_SUCCESS) { i |= DITEM_LEAVE_MENU; /* Give user the option of one last configuration spree */ installConfigure(); } - return i | DITEM_RESTORE; + return i; } /* Novice mode installation */ @@ -466,8 +466,8 @@ installNovice(dialogMenuItem *self) Device **devs; variable_set2(SYSTEM_STATE, "novice", 0); -#ifndef __alpha__ dialog_clear_norefresh(); +#ifndef __alpha__ 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 (overwriting anything else that might be on the disk(s) selected)\n" @@ -487,7 +487,6 @@ nodisks: } #endif - dialog_clear_norefresh(); #ifdef __alpha__ msgConfirm("First, you need to create BSD partitions on the disk which you are\n" "installing to. If you have a reasonable amount of disk space (200MB or more)\n" @@ -507,15 +506,13 @@ nodisks: if (DITEM_STATUS(diskLabelEditor(self)) == DITEM_FAILURE) return DITEM_FAILURE; - dialog_clear_norefresh(); if (DITEM_STATUS((i = installCommit(self))) == DITEM_FAILURE) { - dialog_clear_norefresh(); msgConfirm("Installation completed with some errors. You may wish to\n" "scroll through the debugging messages on VTY1 with the\n" "scroll-lock feature. You can also chose \"No\" at the next\n" "prompt and go back into the installation menus to try and retry\n" "whichever operations have failed."); - return i | DITEM_RESTORE; + return i; } else { @@ -529,108 +526,72 @@ nodisks: } if (mediaDevice->type != DEVICE_TYPE_FTP && mediaDevice->type != DEVICE_TYPE_NFS) { if (!msgYesNo("Would you like to configure any Ethernet or SLIP/PPP network devices?")) { - Device *tmp; + Device *tmp = tcpDeviceSelect(); - dialog_clear_norefresh(); - tmp = tcpDeviceSelect(); - dialog_clear_norefresh(); if (tmp && !((DevInfo *)tmp->private)->use_dhcp && !msgYesNo("Would you like to bring the %s interface up right now?", tmp->name)) if (!tmp->init(tmp)) msgConfirm("Initialization of %s device failed.", tmp->name); } } - dialog_clear_norefresh(); if (!msgYesNo("Will this machine be an IP gateway (e.g. will it forward packets\n" "between interfaces)?")) variable_set2("gateway_enable", "YES", 1); - dialog_clear_norefresh(); if (!msgYesNo("Do you want to allow anonymous FTP connections to this machine?")) configAnonFTP(self); - dialog_clear_norefresh(); if (!msgYesNo("Do you want to configure this machine as an NFS server?")) configNFSServer(self); - dialog_clear_norefresh(); if (!msgYesNo("Do you want to configure this machine as an NFS client?")) variable_set2("nfs_client_enable", "YES", 1); - dialog_clear_norefresh(); - if (!msgYesNo("Would you like to customize your system console settings?")) { - WINDOW *w = savescr(); - + if (!msgYesNo("Would you like to customize your system console settings?")) dmenuOpenSimple(&MenuSyscons, FALSE); - restorescr(w); - } - - dialog_clear_norefresh(); - if (!msgYesNo("Would you like to set this machine's time zone now?")) { - WINDOW *w = savescr(); - dialog_clear(); + if (!msgYesNo("Would you like to set this machine's time zone now?")) systemExecute("tzsetup"); - restorescr(w); - } #ifdef __i386__ - dialog_clear_norefresh(); if (!msgYesNo("Would you like to enable Linux binary compatibility?")) (void)configLinux(self); #endif - dialog_clear_norefresh(); - if (!msgYesNo("Does this system have a mouse attached to it?")) { - WINDOW *w = savescr(); - + if (!msgYesNo("Does this system have a mouse attached to it?")) dmenuOpenSimple(&MenuMouse, FALSE); - restorescr(w); - } /* Now would be a good time to checkpoint the configuration data */ configRC_conf(); sync(); if (directory_exists("/usr/X11R6")) { - dialog_clear_norefresh(); if (!msgYesNo("Would you like to configure your X server at this time?")) (void)configXSetup(self); } - dialog_clear_norefresh(); if (!msgYesNo("The FreeBSD package collection is a collection of hundreds of ready-to-run\n" "applications, from text editors to games to WEB servers and more. Would you\n" "like to browse the collection now?")) { - dialog_clear(); (void)configPackages(self); } - dialog_clear_norefresh(); if (!msgYesNo("Would you like to add any initial user accounts to the system?\n" "Adding at least one account for yourself at this stage is suggested\n" "since working as the \"root\" user is dangerous (it is easy to do\n" "things which adversely affect the entire system).")) (void)configUsers(self); - dialog_clear_norefresh(); msgConfirm("Now you must set the system manager's password.\n" "This is the password you'll use to log in as \"root\"."); - { - WINDOW *w = savescr(); - - if (!systemExecute("passwd root")) - variable_set2("root_password", "YES", 0); - restorescr(w); - } + if (!systemExecute("passwd root")) + variable_set2("root_password", "YES", 0); /* XXX Put whatever other nice configuration questions you'd like to ask the user here XXX */ /* Give user the option of one last configuration spree */ - dialog_clear_norefresh(); installConfigure(); - - return DITEM_LEAVE_MENU | DITEM_RESTORE; + return DITEM_LEAVE_MENU; } /* The version of commit we call from the Install Custom menu */ @@ -639,7 +600,6 @@ installCustomCommit(dialogMenuItem *self) { int i; - dialog_clear_norefresh(); i = installCommit(self); if (DITEM_STATUS(i) == DITEM_SUCCESS) { /* Give user the option of one last configuration spree */ @@ -667,15 +627,16 @@ installCommit(dialogMenuItem *self) int i; char *str; + dialog_clear_norefresh(); if (!Dists) distConfig(NULL); if (!Dists) if (!dmenuOpenSimple(&MenuDistributions, FALSE) && !Dists) - return DITEM_FAILURE | DITEM_RESTORE; + return DITEM_FAILURE; if (!mediaVerify()) - return DITEM_FAILURE | DITEM_RESTORE; + return DITEM_FAILURE; str = variable_get(SYSTEM_STATE); if (isDebug()) @@ -691,12 +652,12 @@ try_media: "adjust your media configuration and try again?")) { mediaDevice = NULL; if (!mediaVerify()) - return DITEM_FAILURE | DITEM_RESTORE; + return DITEM_FAILURE; else goto try_media; } else - return DITEM_FAILURE | DITEM_RESTORE; + return DITEM_FAILURE; } /* Now go get it all */ @@ -707,21 +668,16 @@ try_media: variable_set2(SYSTEM_STATE, DITEM_STATUS(i) == DITEM_FAILURE ? "error-install" : "full-install", 0); - return i | DITEM_RESTORE; + return i; } static void installConfigure(void) { /* Final menu of last resort */ - dialog_clear_norefresh(); if (!msgYesNo("Visit the general configuration menu for a chance to set\n" - "any last options?")) { - WINDOW *w = savescr(); - + "any last options?")) dmenuOpenSimple(&MenuConfigure, FALSE); - restorescr(w); - } configRC_conf(); sync(); } diff --git a/release/sysinstall/installUpgrade.c b/release/sysinstall/installUpgrade.c index bde2824..10eede7 100644 --- a/release/sysinstall/installUpgrade.c +++ b/release/sysinstall/installUpgrade.c @@ -162,17 +162,15 @@ installUpgrade(dialogMenuItem *self) variable_set2(SYSTEM_STATE, "upgrade", 0); systemDisplayHelp("UPGRADE"); - 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?") != 0) - return DITEM_FAILURE | DITEM_RESTORE; + return DITEM_FAILURE; if (!Dists) { msgConfirm("First, you must select some distribution components. The upgrade procedure\n" "will only upgrade the distributions you select in the next set of menus."); if (!dmenuOpenSimple(&MenuDistributions, FALSE) || !Dists) - return DITEM_FAILURE | DITEM_RESTORE; - dialog_clear_norefresh(); + return DITEM_FAILURE; } else if (!(Dists & DIST_BIN)) { /* No bin selected? Not much of an upgrade.. */ if (msgYesNo("You didn't select the bin distribution as one of the distributons to load.\n" @@ -180,8 +178,7 @@ installUpgrade(dialogMenuItem *self) "want to select the bin distribution? Chose No to bring up the Distributions\n" "menu again.") != 0) { if (!dmenuOpenSimple(&MenuDistributions, FALSE)) - return DITEM_FAILURE | DITEM_RESTORE; - dialog_clear_norefresh(); + return DITEM_FAILURE; } } @@ -221,7 +218,7 @@ installUpgrade(dialogMenuItem *self) if (DITEM_STATUS(diskLabelEditor(self)) == DITEM_FAILURE) { msgConfirm("The disk label editor returned an error status. Upgrade operation\n" "aborted."); - return DITEM_FAILURE | DITEM_RESTORE; + return DITEM_FAILURE; } /* Don't write out MBR info */ @@ -230,7 +227,7 @@ installUpgrade(dialogMenuItem *self) msgConfirm("Not all file systems were properly mounted. Upgrade operation\n" "aborted."); variable_unset(DISK_PARTITIONED); - return DITEM_FAILURE | DITEM_RESTORE; + return DITEM_FAILURE; } msgNotify("Updating /stand on root filesystem"); @@ -240,7 +237,7 @@ installUpgrade(dialogMenuItem *self) msgConfirm("Unable to chroot to /mnt - something is wrong with the\n" "root partition or the way it's mounted if this doesn't work."); variable_unset(DISK_PARTITIONED); - return DITEM_FAILURE | DITEM_RESTORE; + return DITEM_FAILURE; } chdir("/"); installEnvironment(); @@ -279,7 +276,7 @@ installUpgrade(dialogMenuItem *self) if (vsystem("tar -cBpf - -C /etc . | tar --unlink -xBpf - -C %s", saved_etc)) if (msgYesNo("Unable to backup your /etc into %s.\n" "Do you want to continue anyway?", saved_etc) != 0) - return DITEM_FAILURE | DITEM_RESTORE; + return DITEM_FAILURE; msgNotify("Preserving /root directory.."); vsystem("tar -cBpf - -C / root | tar --unlink -xBpf - -C %s", saved_etc); } @@ -305,7 +302,7 @@ installUpgrade(dialogMenuItem *self) media: /* We do this very late, but we unfortunately need to back up /etc first */ if (!mediaVerify()) - return DITEM_FAILURE | DITEM_RESTORE; + return DITEM_FAILURE; if (!mediaDevice->init(mediaDevice)) { if (!msgYesNo("Couldn't initialize the media. Would you like\n" @@ -412,7 +409,7 @@ installUpgradeNonInteractive(dialogMenuItem *self) if (DITEM_STATUS(diskLabelEditor(self)) == DITEM_FAILURE) { msgConfirm("The disk label editor returned an error status. Upgrade operation\n" "aborted."); - return DITEM_FAILURE | DITEM_RESTORE; + return DITEM_FAILURE; } /* Don't write out MBR info */ @@ -421,7 +418,7 @@ installUpgradeNonInteractive(dialogMenuItem *self) msgConfirm("Not all file systems were properly mounted. Upgrade operation\n" "aborted."); variable_unset(DISK_PARTITIONED); - return DITEM_FAILURE | DITEM_RESTORE; + return DITEM_FAILURE; } if (extractingBin) { @@ -435,7 +432,7 @@ installUpgradeNonInteractive(dialogMenuItem *self) msgConfirm("Unable to chroot to /mnt - something is wrong with the\n" "root partition or the way it's mounted if this doesn't work."); variable_unset(DISK_PARTITIONED); - return DITEM_FAILURE | DITEM_RESTORE; + return DITEM_FAILURE; } chdir("/"); systemCreateHoloshell(); @@ -443,7 +440,7 @@ installUpgradeNonInteractive(dialogMenuItem *self) if (!mediaVerify() || !mediaDevice->init(mediaDevice)) { msgNotify("Upgrade: Couldn't initialize media."); - return DITEM_FAILURE | DITEM_RESTORE; + return DITEM_FAILURE; } saved_etc = "/usr/tmp/etc"; @@ -451,7 +448,7 @@ installUpgradeNonInteractive(dialogMenuItem *self) msgNotify("Preserving /etc directory.."); if (vsystem("tar -cpBf - -C /etc . | tar -xpBf - -C %s", saved_etc)) { msgNotify("Unable to backup your /etc into %s.", saved_etc); - return DITEM_FAILURE | DITEM_RESTORE; + return DITEM_FAILURE; } if (file_readable("/kernel")) { @@ -488,7 +485,7 @@ installUpgradeNonInteractive(dialogMenuItem *self) msgNotify("First stage of upgrade completed successfully."); if (vsystem("tar -cpBf - -C %s . | tar --unlink -xpBf - -C /etc", saved_etc)) { msgNotify("Unable to resurrect your old /etc!"); - return DITEM_FAILURE | DITEM_RESTORE; + return DITEM_FAILURE; } return DITEM_SUCCESS | DITEM_REDRAW; } diff --git a/release/sysinstall/label.c b/release/sysinstall/label.c index ea9d9e7..340d7d9 100644 --- a/release/sysinstall/label.c +++ b/release/sysinstall/label.c @@ -111,7 +111,7 @@ labelHook(dialogMenuItem *selected) } else devs[0]->enabled = FALSE; - return DITEM_SUCCESS | DITEM_RESTORE; + return DITEM_SUCCESS; } static int @@ -171,7 +171,6 @@ diskLabelEditor(dialogMenuItem *self) i = dmenuOpenSimple(menu, FALSE) ? DITEM_SUCCESS : DITEM_FAILURE; free(menu); } - i |= DITEM_RESTORE; } } if (DITEM_STATUS(i) != DITEM_FAILURE) { @@ -384,13 +383,14 @@ get_partition_type(void) { char selection[20]; int i; - static unsigned char *fs_types[] = { "FS", "A file system", "Swap", "A swap partition.", }; + WINDOW *w = savescr(); + DialogX = 7; DialogY = 8; i = dialog_menu("Please choose a partition type", @@ -398,6 +398,7 @@ get_partition_type(void) "If you want to put a filesystem on it, choose FS.", -1, -1, 2, 2, fs_types, selection, NULL, NULL); DialogX = DialogY = 0; + restorescr(w); if (!i) { if (!strcmp(selection, "FS")) return PART_FILESYSTEM; @@ -693,6 +694,7 @@ diskLabel(Device *dev) #ifdef __alpha__ int i; #endif + WINDOW *w = savescr(); label_focus = 0; pslice_focus = 0; @@ -701,6 +703,7 @@ diskLabel(Device *dev) devs = deviceFind(NULL, DEVICE_TYPE_DISK); if (!devs) { msgConfirm("No disks found!"); + restorescr(w); return DITEM_FAILURE; } labeling = TRUE; @@ -1174,7 +1177,8 @@ diskLabel(Device *dev) else label_focus = here; } - return DITEM_SUCCESS | DITEM_RESTORE; + restorescr(w); + return DITEM_SUCCESS; } static int @@ -1187,12 +1191,10 @@ diskLabelNonInteractive(Device *dev) int i, status; Device **devs; Disk *d; - + status = DITEM_SUCCESS; - cp = variable_get(VAR_DISK); if (!cp) { - dialog_clear(); msgConfirm("diskLabel: No disk selected - can't label automatically."); return DITEM_FAILURE; } @@ -1277,7 +1279,6 @@ diskLabelNonInteractive(Device *dev) do_newfs[0] = '\0'; if (sscanf(cp, "%s %s", mpoint, do_newfs) != 2) { - dialog_clear(); msgConfirm("For slice entry %s, got an invalid detail entry of: %s", c1->name, cp); status = DITEM_FAILURE; continue; diff --git a/release/sysinstall/media.c b/release/sysinstall/media.c index 55055ed..1c27a0d 100644 --- a/release/sysinstall/media.c +++ b/release/sysinstall/media.c @@ -159,11 +159,11 @@ mediaSetCDROM(dialogMenuItem *self) status = dmenuOpenSimple(menu, FALSE); free(menu); if (!status) - return DITEM_FAILURE | DITEM_RESTORE; + return DITEM_FAILURE; } else mediaDevice = devs[0]; - return (mediaDevice ? DITEM_SUCCESS | DITEM_LEAVE_MENU : DITEM_FAILURE) | DITEM_RESTORE; + return (mediaDevice ? DITEM_SUCCESS | DITEM_LEAVE_MENU : DITEM_FAILURE); } static int @@ -201,13 +201,13 @@ mediaSetFloppy(dialogMenuItem *self) status = dmenuOpenSimple(menu, FALSE); free(menu); if (!status) - return DITEM_FAILURE | DITEM_RESTORE; + return DITEM_FAILURE; } else mediaDevice = devs[0]; if (mediaDevice) mediaDevice->private = NULL; - return (mediaDevice ? DITEM_LEAVE_MENU : DITEM_FAILURE) | DITEM_RESTORE; + return (mediaDevice ? DITEM_LEAVE_MENU : DITEM_FAILURE); } static int @@ -243,11 +243,11 @@ mediaSetDOS(dialogMenuItem *self) status = dmenuOpenSimple(menu, FALSE); free(menu); if (!status) - return DITEM_FAILURE | DITEM_RESTORE; + return DITEM_FAILURE; } else mediaDevice = devs[0]; - return (mediaDevice ? DITEM_LEAVE_MENU : DITEM_FAILURE) | DITEM_RESTORE; + return (mediaDevice ? DITEM_LEAVE_MENU : DITEM_FAILURE); } static int @@ -285,7 +285,7 @@ mediaSetTape(dialogMenuItem *self) status = dmenuOpenSimple(menu, FALSE); free(menu); if (!status) - return DITEM_FAILURE | DITEM_RESTORE; + return DITEM_FAILURE; } else mediaDevice = devs[0]; @@ -302,7 +302,7 @@ mediaSetTape(dialogMenuItem *self) else mediaDevice->private = strdup(val); } - return (mediaDevice ? DITEM_LEAVE_MENU : DITEM_FAILURE) | DITEM_RESTORE; + return (mediaDevice ? DITEM_LEAVE_MENU : DITEM_FAILURE); } /* @@ -316,7 +316,6 @@ mediaSetFTP(dialogMenuItem *self) char *cp, hostname[MAXHOSTNAMELEN], *dir; extern int FtpPort; static Device *networkDev = NULL; - int what = DITEM_RESTORE; mediaClose(); cp = variable_get(VAR_FTP_PATH); @@ -326,18 +325,15 @@ mediaSetFTP(dialogMenuItem *self) cp = NULL; if (!cp) { - dialog_clear_norefresh(); if (!dmenuOpenSimple(&MenuMediaFTP, FALSE)) - return DITEM_FAILURE | DITEM_RESTORE; + return DITEM_FAILURE; else cp = variable_get(VAR_FTP_PATH); - what = DITEM_RESTORE; } if (!cp) - return DITEM_FAILURE | what; + return DITEM_FAILURE; else if (!strcmp(cp, "other")) { variable_set2(VAR_FTP_PATH, "ftp://", 0); - 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" @@ -347,32 +343,31 @@ mediaSetFTP(dialogMenuItem *self) "home directory of the user being logged in as.", 0); if (!cp || !*cp || !strcmp(cp, "ftp://")) { variable_unset(VAR_FTP_PATH); - return DITEM_FAILURE | what; + return DITEM_FAILURE; } } if (strncmp("ftp://", cp, 6)) { msgConfirm("Sorry, %s is an invalid URL!", cp); variable_unset(VAR_FTP_PATH); - return DITEM_FAILURE | what; + return DITEM_FAILURE; } SAFE_STRCPY(ftpDevice.name, cp); SAFE_STRCPY(hostname, cp + 6); - dialog_clear_norefresh(); if (!networkDev || msgYesNo("You've already done the network configuration once,\n" "would you like to skip over it now?") != 0) { if (networkDev) networkDev->shutdown(networkDev); if (!(networkDev = tcpDeviceSelect())) { variable_unset(VAR_FTP_PATH); - return DITEM_FAILURE | what; + return DITEM_FAILURE; } } if (!networkDev->init(networkDev)) { if (isDebug()) msgDebug("mediaSetFTP: Net device init failed.\n"); variable_unset(VAR_FTP_PATH); - return DITEM_FAILURE | what; + return DITEM_FAILURE; } if ((cp = index(hostname, ':')) != NULL) { *(cp++) = '\0'; @@ -406,7 +401,7 @@ mediaSetFTP(dialogMenuItem *self) networkDev->shutdown(networkDev); networkDev = NULL; variable_unset(VAR_FTP_PATH); - return DITEM_FAILURE | what; + return DITEM_FAILURE; } } if (isDebug()) @@ -421,7 +416,7 @@ mediaSetFTP(dialogMenuItem *self) ftpDevice.shutdown = mediaShutdownFTP; ftpDevice.private = networkDev; mediaDevice = &ftpDevice; - return DITEM_SUCCESS | DITEM_LEAVE_MENU | what; + return DITEM_SUCCESS | DITEM_LEAVE_MENU; } int @@ -446,7 +441,6 @@ mediaSetUFS(dialogMenuItem *self) char *cp; mediaClose(); - dialog_clear_norefresh(); cp = variable_get_value(VAR_UFS_PATH, "Enter a fully qualified pathname for the directory\n" "containing the FreeBSD distribution files:", 0); if (!cp) @@ -474,8 +468,8 @@ mediaSetNFS(dialogMenuItem *self) static Device *networkDev = NULL; char *cp, *idx; char hostname[MAXPATHLEN]; + mediaClose(); - dialog_clear_norefresh(); cp = variable_get_value(VAR_NFS_PATH, "Please enter the full NFS file specification for the remote\n" "host and directory containing the FreeBSD distribution files.\n" "This should be in the format: hostname:/some/freebsd/dir", 0); @@ -725,7 +719,7 @@ mediaExtractDist(char *dir, char *dist, FILE *fp) int mediaGetType(dialogMenuItem *self) { - return ((dmenuOpenSimple(&MenuMedia, FALSE) && mediaDevice) ? DITEM_SUCCESS : DITEM_FAILURE) | DITEM_RESTORE; + return ((dmenuOpenSimple(&MenuMedia, FALSE) && mediaDevice) ? DITEM_SUCCESS : DITEM_FAILURE); } /* Return TRUE if all the media variables are set up correctly */ @@ -743,16 +737,14 @@ mediaSetFTPUserPass(dialogMenuItem *self) { char *pass; - dialog_clear_norefresh(); if (variable_get_value(VAR_FTP_USER, "Please enter the username you wish to login as:", 0)) { - dialog_clear_norefresh(); DialogInputAttrs |= DITEM_NO_ECHO; pass = variable_get_value(VAR_FTP_PASS, "Please enter the password for this user:", 0); DialogInputAttrs &= ~DITEM_NO_ECHO; } else pass = NULL; - return (pass ? DITEM_SUCCESS : DITEM_FAILURE) | DITEM_RESTORE; + return (pass ? DITEM_SUCCESS : DITEM_FAILURE); } /* Set CPIO verbosity level */ diff --git a/release/sysinstall/menus.c b/release/sysinstall/menus.c index c17b9c5..0cc8c0c 100644 --- a/release/sysinstall/menus.c +++ b/release/sysinstall/menus.c @@ -61,6 +61,22 @@ clearSrc(dialogMenuItem *self) } static int +setDES(dialogMenuItem *self) +{ + Dists |= DIST_DES; + DESDists = DIST_DES_ALL; + return DITEM_SUCCESS | DITEM_REDRAW; +} + +static int +clearDES(dialogMenuItem *self) +{ + Dists &= ~DIST_DES; + DESDists = 0; + return DITEM_SUCCESS | DITEM_REDRAW; +} + +static int setX11All(dialogMenuItem *self) { XF86Dists = DIST_XF86_ALL; @@ -227,78 +243,78 @@ DMenu MenuIndex = { "Leave the index page by selecting Cancel [TAB-ENTER].", "Use PageUp or PageDown to move through this menu faster!", NULL, - { { "Anon FTP", "Configure anonymous FTP logins.", dmenuVarCheck, configAnonFTP, NULL, "anon_ftp" }, - { "Commit", "Commit any pending actions (dangerous!)", NULL, installCustomCommit }, - { "Console settings", "Customize system console behavior.", NULL, dmenuSubmenu, NULL, &MenuSyscons }, - { "Configure", "The system configuration menu.", NULL, dmenuSubmenu, NULL, &MenuConfigure }, - { "Defaults, Load", "Load default settings.", NULL, dispatch_load_floppy }, - { "Device, Mouse", "The mouse configuration menu.", NULL, dmenuSubmenu, NULL, &MenuMouse }, - { "Disklabel", "The disk Label editor", NULL, diskLabelEditor }, - { "Dists, All", "Root of the distribution tree.", NULL, dmenuSubmenu, NULL, &MenuDistributions }, - { "Dists, Basic", "Basic FreeBSD distribution menu.", NULL, dmenuSubmenu, NULL, &MenuSubDistributions }, - { "Dists, DES", "DES distribution menu.", NULL, dmenuSubmenu, NULL, &MenuDESDistributions }, - { "Dists, Developer", "Select developer's distribution.", checkDistDeveloper, distSetDeveloper }, - { "Dists, Src", "Src distribution menu.", NULL, dmenuSubmenu, NULL, &MenuSrcDistributions }, - { "Dists, X Developer", "Select X developer's distribution.", checkDistXDeveloper, distSetXDeveloper }, - { "Dists, Kern Developer", "Select kernel developer's distribution.", checkDistKernDeveloper, distSetKernDeveloper }, - { "Dists, User", "Select average user distribution.", checkDistUser, distSetUser }, - { "Dists, X User", "Select average X user distribution.", checkDistXUser, distSetXUser }, - { "Distributions, Adding", "Installing additional distribution sets", NULL, distExtractAll }, - { "Distributions, XFree86","XFree86 distribution menu.", NULL, distSetXF86 }, - { "Documentation", "Installation instructions, README, etc.", NULL, dmenuSubmenu, NULL, &MenuDocumentation }, - { "Doc, README", "The distribution README file.", NULL, dmenuDisplayFile, NULL, "README" }, - { "Doc, Hardware", "The distribution hardware guide.", NULL, dmenuDisplayFile, NULL, "HARDWARE" }, - { "Doc, Install", "The distribution installation guide.", NULL, dmenuDisplayFile, NULL, "INSTALL" }, - { "Doc, Copyright", "The distribution copyright notices.", NULL, dmenuDisplayFile, NULL, "COPYRIGHT" }, - { "Doc, Release", "The distribution release notes.", NULL, dmenuDisplayFile, NULL, "RELNOTES" }, - { "Doc, HTML", "The HTML documentation menu.", NULL, docBrowser }, - { "Dump Vars", "(debugging) dump out internal variables.", NULL, dump_variables }, - { "Emergency shell", "Start an Emergency Holographic shell.", NULL, installFixitHoloShell }, + { { " Anon FTP", "Configure anonymous FTP logins.", dmenuVarCheck, configAnonFTP, NULL, "anon_ftp" }, + { " Commit", "Commit any pending actions (dangerous!)", NULL, installCustomCommit }, + { " Console settings", "Customize system console behavior.", NULL, dmenuSubmenu, NULL, &MenuSyscons }, + { " Configure", "The system configuration menu.", NULL, dmenuSubmenu, NULL, &MenuConfigure }, + { " Defaults, Load", "Load default settings.", NULL, dispatch_load_floppy }, + { " Device, Mouse", "The mouse configuration menu.", NULL, dmenuSubmenu, NULL, &MenuMouse }, + { " Disklabel", "The disk Label editor", NULL, diskLabelEditor }, + { " Dists, All", "Root of the distribution tree.", NULL, dmenuSubmenu, NULL, &MenuDistributions }, + { " Dists, Basic", "Basic FreeBSD distribution menu.", NULL, dmenuSubmenu, NULL, &MenuSubDistributions }, + { " Dists, DES", "DES distribution menu.", NULL, dmenuSubmenu, NULL, &MenuDESDistributions }, + { " Dists, Developer", "Select developer's distribution.", checkDistDeveloper, distSetDeveloper }, + { " Dists, Src", "Src distribution menu.", NULL, dmenuSubmenu, NULL, &MenuSrcDistributions }, + { " Dists, X Developer", "Select X developer's distribution.", checkDistXDeveloper, distSetXDeveloper }, + { " Dists, Kern Developer", "Select kernel developer's distribution.", checkDistKernDeveloper, distSetKernDeveloper }, + { " Dists, User", "Select average user distribution.", checkDistUser, distSetUser }, + { " Dists, X User", "Select average X user distribution.", checkDistXUser, distSetXUser }, + { " Distributions, Adding", "Installing additional distribution sets", NULL, distExtractAll }, + { " Distributions, XFree86","XFree86 distribution menu.", NULL, distSetXF86 }, + { " Documentation", "Installation instructions, README, etc.", NULL, dmenuSubmenu, NULL, &MenuDocumentation }, + { " Doc, README", "The distribution README file.", NULL, dmenuDisplayFile, NULL, "README" }, + { " Doc, Hardware", "The distribution hardware guide.", NULL, dmenuDisplayFile, NULL, "HARDWARE" }, + { " Doc, Install", "The distribution installation guide.", NULL, dmenuDisplayFile, NULL, "INSTALL" }, + { " Doc, Copyright", "The distribution copyright notices.", NULL, dmenuDisplayFile, NULL, "COPYRIGHT" }, + { " Doc, Release", "The distribution release notes.", NULL, dmenuDisplayFile, NULL, "RELNOTES" }, + { " Doc, HTML", "The HTML documentation menu.", NULL, docBrowser }, + { " Dump Vars", "(debugging) dump out internal variables.", NULL, dump_variables }, + { " Emergency shell", "Start an Emergency Holographic shell.", NULL, installFixitHoloShell }, #ifdef __i386__ - { "Fdisk", "The disk Partition Editor", NULL, diskPartitionEditor }, + { " Fdisk", "The disk Partition Editor", NULL, diskPartitionEditor }, #endif - { "Fixit", "Repair mode with CDROM or fixit floppy.", NULL, dmenuSubmenu, NULL, &MenuFixit }, - { "FTP sites", "The FTP mirror site listing.", NULL, dmenuSubmenu, NULL, &MenuMediaFTP }, - { "Gateway", "Set flag to route packets between interfaces.", dmenuVarCheck, dmenuToggleVariable, NULL, "gateway=YES" }, - { "HTML Docs", "The HTML documentation menu", NULL, docBrowser }, - { "Install, Novice", "A novice system installation.", NULL, installNovice }, - { "Install, Express", "An express system installation.", NULL, installExpress }, - { "Install, Custom", "The custom installation menu", NULL, dmenuSubmenu, NULL, &MenuInstallCustom }, - { "Label", "The disk Label editor", NULL, diskLabelEditor }, - { "Media", "Top level media selection menu.", NULL, dmenuSubmenu, NULL, &MenuMedia }, - { "Media, Tape", "Select tape installation media.", NULL, mediaSetTape }, - { "Media, NFS", "Select NFS installation media.", NULL, mediaSetNFS }, - { "Media, Floppy", "Select floppy installation media.", NULL, mediaSetFloppy }, - { "Media, CDROM", "Select CDROM installation media.", NULL, mediaSetCDROM }, - { "Media, DOS", "Select DOS installation media.", NULL, mediaSetDOS }, - { "Media, UFS", "Select UFS installation media.", NULL, mediaSetUFS }, - { "Media, FTP", "Select FTP installation media.", NULL, mediaSetFTP }, - { "Media, FTP Passive", "Select passive FTP installation media.", NULL, mediaSetFTPPassive }, - { "Network Interfaces", "Configure network interfaces", NULL, tcpMenuSelect }, - { "Networking Services", "The network services menu.", NULL, dmenuSubmenu, NULL, &MenuNetworking }, - { "NFS, client", "Set NFS client flag.", dmenuVarCheck, dmenuToggleVariable, NULL, "nfs_client_enable=YES" }, - { "NFS, server", "Set NFS server flag.", dmenuVarCheck, configNFSServer, NULL, "nfs_server_enable=YES" }, - { "NTP Menu", "The NTP configuration menu.", NULL, dmenuSubmenu, NULL, &MenuNTP }, - { "Options", "The options editor.", NULL, optionsEditor }, - { "Packages", "The packages collection", NULL, configPackages }, - { "Partition", "The disk Slice (PC-style partition) Editor", NULL, diskPartitionEditor }, - { "PCNFSD", "Run authentication server for PC-NFS.", dmenuVarCheck, configPCNFSD, NULL, "pcnfsd" }, - { "Root Password", "Set the system manager's password.", NULL, dmenuSystemCommand, NULL, "passwd root" }, - { "Router", "Select routing daemon (default: routed)", NULL, configRouter, NULL, "router" }, - { "Syscons", "The system console configuration menu.", NULL, dmenuSubmenu, NULL, &MenuSyscons }, - { "Syscons, Font", "The console screen font.", NULL, dmenuSubmenu, NULL, &MenuSysconsFont }, - { "Syscons, Keymap", "The console keymap configuration menu.", NULL, dmenuSubmenu, NULL, &MenuSysconsKeymap }, - { "Syscons, Keyrate", "The console key rate configuration menu.", NULL, dmenuSubmenu, NULL, &MenuSysconsKeyrate }, - { "Syscons, Saver", "The console screen saver configuration menu.", NULL, dmenuSubmenu, NULL, &MenuSysconsSaver }, - { "Syscons, Screenmap", "The console screenmap configuration menu.", NULL, dmenuSubmenu, NULL, &MenuSysconsScrnmap }, - { "Time Zone", "Set the system's time zone.", NULL, dmenuSystemCommand, NULL, "tzsetup" }, - { "Upgrade", "Upgrade an existing system.", NULL, installUpgrade }, - { "Usage", "Quick start - How to use this menu system.", NULL, dmenuDisplayFile, NULL, "usage" }, - { "User Management", "Add user and group information.", NULL, dmenuSubmenu, NULL, &MenuUsermgmt }, - { "XFree86, Fonts", "XFree86 Font selection menu.", NULL, dmenuSubmenu, NULL, &MenuXF86SelectFonts }, - { "XFree86, Server", "XFree86 Server selection menu.", NULL, dmenuSubmenu, NULL, &MenuXF86SelectServer }, + { " Fixit", "Repair mode with CDROM or fixit floppy.", NULL, dmenuSubmenu, NULL, &MenuFixit }, + { " FTP sites", "The FTP mirror site listing.", NULL, dmenuSubmenu, NULL, &MenuMediaFTP }, + { " Gateway", "Set flag to route packets between interfaces.", dmenuVarCheck, dmenuToggleVariable, NULL, "gateway=YES" }, + { " HTML Docs", "The HTML documentation menu", NULL, docBrowser }, + { " Install, Novice", "A novice system installation.", NULL, installNovice }, + { " Install, Express", "An express system installation.", NULL, installExpress }, + { " Install, Custom", "The custom installation menu", NULL, dmenuSubmenu, NULL, &MenuInstallCustom }, + { " Label", "The disk Label editor", NULL, diskLabelEditor }, + { " Media", "Top level media selection menu.", NULL, dmenuSubmenu, NULL, &MenuMedia }, + { " Media, Tape", "Select tape installation media.", NULL, mediaSetTape }, + { " Media, NFS", "Select NFS installation media.", NULL, mediaSetNFS }, + { " Media, Floppy", "Select floppy installation media.", NULL, mediaSetFloppy }, + { " Media, CDROM", "Select CDROM installation media.", NULL, mediaSetCDROM }, + { " Media, DOS", "Select DOS installation media.", NULL, mediaSetDOS }, + { " Media, UFS", "Select UFS installation media.", NULL, mediaSetUFS }, + { " Media, FTP", "Select FTP installation media.", NULL, mediaSetFTP }, + { " Media, FTP Passive", "Select passive FTP installation media.", NULL, mediaSetFTPPassive }, + { " Network Interfaces", "Configure network interfaces", NULL, tcpMenuSelect }, + { " Networking Services", "The network services menu.", NULL, dmenuSubmenu, NULL, &MenuNetworking }, + { " NFS, client", "Set NFS client flag.", dmenuVarCheck, dmenuToggleVariable, NULL, "nfs_client_enable=YES" }, + { " NFS, server", "Set NFS server flag.", dmenuVarCheck, configNFSServer, NULL, "nfs_server_enable=YES" }, + { " NTP Menu", "The NTP configuration menu.", NULL, dmenuSubmenu, NULL, &MenuNTP }, + { " Options", "The options editor.", NULL, optionsEditor }, + { " Packages", "The packages collection", NULL, configPackages }, + { " Partition", "The disk Slice (PC-style partition) Editor", NULL, diskPartitionEditor }, + { " PCNFSD", "Run authentication server for PC-NFS.", dmenuVarCheck, configPCNFSD, NULL, "pcnfsd" }, + { " Root Password", "Set the system manager's password.", NULL, dmenuSystemCommand, NULL, "passwd root" }, + { " Router", "Select routing daemon (default: routed)", NULL, configRouter, NULL, "router" }, + { " Syscons", "The system console configuration menu.", NULL, dmenuSubmenu, NULL, &MenuSyscons }, + { " Syscons, Font", "The console screen font.", NULL, dmenuSubmenu, NULL, &MenuSysconsFont }, + { " Syscons, Keymap", "The console keymap configuration menu.", NULL, dmenuSubmenu, NULL, &MenuSysconsKeymap }, + { " Syscons, Keyrate", "The console key rate configuration menu.", NULL, dmenuSubmenu, NULL, &MenuSysconsKeyrate }, + { " Syscons, Saver", "The console screen saver configuration menu.", NULL, dmenuSubmenu, NULL, &MenuSysconsSaver }, + { " Syscons, Screenmap", "The console screenmap configuration menu.", NULL, dmenuSubmenu, NULL, &MenuSysconsScrnmap }, + { " Time Zone", "Set the system's time zone.", NULL, dmenuSystemCommand, NULL, "tzsetup" }, + { " Upgrade", "Upgrade an existing system.", NULL, installUpgrade }, + { " Usage", "Quick start - How to use this menu system.", NULL, dmenuDisplayFile, NULL, "usage" }, + { " User Management", "Add user and group information.", NULL, dmenuSubmenu, NULL, &MenuUsermgmt }, + { " XFree86, Fonts", "XFree86 Font selection menu.", NULL, dmenuSubmenu, NULL, &MenuXF86SelectFonts }, + { " XFree86, Server", "XFree86 Server selection menu.", NULL, dmenuSubmenu, NULL, &MenuXF86SelectServer }, #ifdef __i386__ - { "XFree86, PC98 Server", "XFree86 PC98 Server selection menu.", NULL, dmenuSubmenu, NULL, &MenuXF86SelectPC98Server }, + { " XFree86, PC98 Server", "XFree86 PC98 Server selection menu.", NULL, dmenuSubmenu, NULL, &MenuXF86SelectPC98Server }, #endif { NULL } }, }; @@ -314,19 +330,19 @@ DMenu MenuInitial = { "Press F1 for Installation Guide", /* help line */ "install", /* help file */ { { "Select" }, - { "Exit Install", NULL, NULL, dmenuExit }, - { "1 Usage", "Quick start - How to use this menu system", NULL, dmenuDisplayFile, NULL, "usage" }, - { "2 Novice", "Begin a novice installation (for beginners)", NULL, installNovice }, - { "3 Express", "Begin a quick installation (for the impatient)", NULL, installExpress }, - { "4 Custom", "Begin a custom installation (for experts)", NULL, dmenuSubmenu, NULL, &MenuInstallCustom }, - { "5 Configure", "Do post-install configuration of FreeBSD", NULL, dmenuSubmenu, NULL, &MenuConfigure }, - { "D Doc", "Installation instructions, README, etc.", NULL, dmenuSubmenu, NULL, &MenuDocumentation }, - { "K Keymap", "Select keyboard type", NULL, dmenuSubmenu, NULL, &MenuSysconsKeymap }, - { "O Options", "View/Set various installation options", NULL, optionsEditor }, - { "F Fixit", "Enter repair mode with CDROM/floppy or start shell", NULL, dmenuSubmenu, NULL, &MenuFixit }, - { "U Upgrade", "Upgrade an existing system", NULL, installUpgrade }, - { "L Load Config","Load default install configuration", NULL, dispatch_load_floppy }, - { "I Index", "Glossary of functions", NULL, dmenuSubmenu, NULL, &MenuIndex }, + { "X Exit Install", NULL, NULL, dmenuExit }, + { "? Usage", "Quick start - How to use this menu system", NULL, dmenuDisplayFile, NULL, "usage" }, + { "Novice", "Begin a novice installation (for beginners)", NULL, installNovice }, + { "Express", "Begin a quick installation (for the impatient)", NULL, installExpress }, + { " Custom", "Begin a custom installation (for experts)", NULL, dmenuSubmenu, NULL, &MenuInstallCustom }, + { "Configure", "Do post-install configuration of FreeBSD", NULL, dmenuSubmenu, NULL, &MenuConfigure }, + { "Doc", "Installation instructions, README, etc.", NULL, dmenuSubmenu, NULL, &MenuDocumentation }, + { "Keymap", "Select keyboard type", NULL, dmenuSubmenu, NULL, &MenuSysconsKeymap }, + { "Options", "View/Set various installation options", NULL, optionsEditor }, + { "Fixit", "Enter repair mode with CDROM/floppy or start shell", NULL, dmenuSubmenu, NULL, &MenuFixit }, + { "Upgrade", "Upgrade an existing system", NULL, installUpgrade }, + { "Load Config","Load default install configuration", NULL, dispatch_load_floppy }, + { "Index", "Glossary of functions", NULL, dmenuSubmenu, NULL, &MenuIndex }, { NULL } }, }; @@ -348,7 +364,7 @@ DMenu MenuDocumentation = { { "5 Release" ,"The release notes for this version of FreeBSD.", NULL, dmenuDisplayFile, NULL, "RELNOTES" }, { "6 Shortcuts", "Creating shortcuts to sysinstall.", NULL, dmenuDisplayFile, NULL, "shortcuts" }, { "7 HTML Docs", "Go to the HTML documentation menu (post-install).", NULL, docBrowser }, - { "0 Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, + { "X Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, { NULL } }, }; @@ -363,25 +379,25 @@ DMenu MenuMouseType = { "the mouse has a wheel, it may be compatible with \"IntelliMouse\".", NULL, NULL, - { { "Auto", "Bus mouse, PS/2 style mouse or PnP serial mouse", + { { "1 Auto", "Bus mouse, PS/2 style mouse or PnP serial mouse", dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_TYPE "=auto" }, - { "GlidePoint", "ALPS GlidePoint pad (serial)", + { "2 GlidePoint", "ALPS GlidePoint pad (serial)", dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_TYPE "=glidepoint" }, - { "Hitachi","Hitachi tablet (serial)", + { "3 Hitachi","Hitachi tablet (serial)", dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_TYPE "=mmhittab" }, - { "IntelliMouse", "Microsoft IntelliMouse (serial)", + { "4 IntelliMouse", "Microsoft IntelliMouse (serial)", dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_TYPE "=intellimouse" }, - { "Logitech", "Logitech protocol (old models) (serial)", + { "5 Logitech", "Logitech protocol (old models) (serial)", dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_TYPE "=logitech" }, - { "Microsoft", "Microsoft protocol (serial)", + { "6 Microsoft", "Microsoft protocol (serial)", dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_TYPE "=microsoft" }, - { "MM Series","MM Series protocol (serial)", + { "7 MM Series","MM Series protocol (serial)", dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_TYPE "=mmseries" }, - { "MouseMan", "Logitech MouseMan/TrackMan models (serial)", + { "8 MouseMan", "Logitech MouseMan/TrackMan models (serial)", dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_TYPE "=mouseman" }, - { "MouseSystems", "MouseSystems protocol (serial)", + { "9 MouseSystems", "MouseSystems protocol (serial)", dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_TYPE "=mousesystems" }, - { "ThinkingMouse","Kensington ThinkingMouse (serial)", + { "A ThinkingMouse","Kensington ThinkingMouse (serial)", dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_TYPE "=thinkingmouse" }, { NULL } }, }; @@ -393,17 +409,17 @@ DMenu MenuMousePort = { "a PS/2 style device.", NULL, NULL, - { { "COM1", "Serial mouse on COM1 (/dev/cuaa0)", + { { "1 COM1", "Serial mouse on COM1 (/dev/cuaa0)", dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/cuaa0" }, - { "COM2", "Serial mouse on COM2 (/dev/cuaa1)", + { "2 COM2", "Serial mouse on COM2 (/dev/cuaa1)", dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/cuaa1" }, - { "COM3", "Serial mouse on COM3 (/dev/cuaa2)", + { "3 COM3", "Serial mouse on COM3 (/dev/cuaa2)", dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/cuaa2" }, - { "COM4", "Serial mouse on COM4 (/dev/cuaa3)", + { "4 COM4", "Serial mouse on COM4 (/dev/cuaa3)", dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/cuaa3" }, - { "BusMouse", "Logitech, ATI or MS bus mouse (/dev/mse0)", + { "5 BusMouse", "Logitech, ATI or MS bus mouse (/dev/mse0)", dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/mse0" }, - { "PS/2", "PS/2 style mouse (/dev/psm0)", + { "6 PS/2", "PS/2 style mouse (/dev/psm0)", dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/psm0" }, { NULL } }, }; @@ -425,7 +441,7 @@ DMenu MenuMouse = { { "2 Port", "Select mouse port", NULL, dmenuSubmenu, NULL, &MenuMousePort }, { "3 Enable", "Test and run the mouse daemon", NULL, mousedTest, NULL, NULL }, { "4 Disable", "Disable the mouse daemon", NULL, mousedDisable, NULL, NULL }, - { "0 Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, + { "X Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, { NULL } }, }; @@ -474,17 +490,17 @@ DMenu MenuXDesktops = { "you can choose any one of the following desktops as alternatives.", NULL, NULL, - { { "KDE", "The K Desktop Environment.", + { { "1 KDE", "The K Desktop Environment.", NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=kde" }, - { "GNOME + Afterstep", "GNOME + Afterstep window manager.", + { "2 GNOME + Afterstep", "GNOME + Afterstep window manager.", NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=gnome" }, - { "GNOME + Enlightenment","GNOME + The E window manager", + { "3 GNOME + Enlightenment","GNOME + The E window manager", NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=enlightenment" }, - { "Afterstep", "The Afterstep window manager", + { "4 Afterstep", "The Afterstep window manager", NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=afterstep" }, - { "Windowmaker", "The Windowmaker window manager", + { "5 Windowmaker", "The Windowmaker window manager", NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=windowmaker" }, - { "fvwm2", "The fvwm2 window manager", + { "6 fvwm2", "The fvwm2 window manager", NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=fvwm" }, { NULL } }, }; @@ -540,167 +556,167 @@ DMenu MenuMediaFTP = { VAR_FTP_PATH _AS("=ftp://ftp.freebsd.org/pub/FreeBSD/releases/") }, { "URL", "Specify some other ftp site by URL", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH "=other" }, - { "4.0 SNAP Server", "current.freebsd.org", NULL, dmenuSetVariable, NULL, + { " 4.0 SNAP Server", "current.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AS("=ftp://current.freebsd.org/pub/FreeBSD/snapshots/") }, - { "3.0 SNAP Server", "releng3.freebsd.org", NULL, dmenuSetVariable, NULL, + { " 3.0 SNAP Server", "releng3.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AS("=ftp://releng3.freebsd.org/pub/FreeBSD/snapshots/") }, { "Argentina", "ftp.ar.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.ar.freebsd.org") }, - { "Australia", "ftp.au.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Australia", "ftp.au.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.au.freebsd.org") }, - { "Australia #2", "ftp2.au.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Australia #2","ftp2.au.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp2.au.freebsd.org") }, - { "Australia #3", "ftp3.au.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Australia #3","ftp3.au.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp3.au.freebsd.org") }, - { "Australia #4", "ftp4.au.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Australia #4","ftp4.au.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp4.au.freebsd.org") }, - { "Australia #5", "ftp5.au.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Australia #5","ftp5.au.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp5.au.freebsd.org") }, { "Brazil", "ftp.br.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.br.freebsd.org") }, - { "Brazil #2", "ftp2.br.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Brazil #2", "ftp2.br.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp2.br.freebsd.org") }, - { "Brazil #3", "ftp3.br.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Brazil #3", "ftp3.br.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp3.br.freebsd.org") }, - { "Brazil #4", "ftp4.br.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Brazil #4", "ftp4.br.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp4.br.freebsd.org") }, - { "Brazil #5", "ftp5.br.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Brazil #5", "ftp5.br.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp5.br.freebsd.org") }, - { "Brazil #6", "ftp6.br.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Brazil #6", "ftp6.br.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp6.br.freebsd.org") }, - { "Brazil #7", "ftp7.br.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Brazil #7", "ftp7.br.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp7.br.freebsd.org") }, - { "Canada", "ftp.ca.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Canada", "ftp.ca.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.ca.freebsd.org") }, - { "Czech Republic", "ftp.cz.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Czech Republic", "ftp.cz.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.cz.freebsd.org") }, { "Denmark", "ftp.dk.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.dk.freebsd.org") }, - { "Denmark #2", "ftp2.dk.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Denmark #2", "ftp2.dk.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp2.dk.freebsd.org") }, { "Estonia", "ftp.ee.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.ee.freebsd.org") }, { "Finland", "ftp.fi.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.fi.freebsd.org") }, - { "France", "ftp.fr.freebsd.org", NULL, dmenuSetVariable, NULL, + { " France", "ftp.fr.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.fr.freebsd.org") }, - { "France #2", "ftp2.fr.freebsd.org", NULL, dmenuSetVariable, NULL, + { " France #2", "ftp2.fr.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp2.fr.freebsd.org") }, - { "France #3", "ftp3.fr.freebsd.org", NULL, dmenuSetVariable, NULL, + { " France #3", "ftp3.fr.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp3.fr.freebsd.org") }, { "Germany", "ftp.de.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.de.freebsd.org") }, - { "Germany #2", "ftp2.de.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Germany #2", "ftp2.de.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp2.de.freebsd.org") }, - { "Germany #3", "ftp3.de.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Germany #3", "ftp3.de.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp3.de.freebsd.org") }, - { "Germany #4", "ftp4.de.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Germany #4", "ftp4.de.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp4.de.freebsd.org") }, - { "Germany #5", "ftp5.de.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Germany #5", "ftp5.de.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp5.de.freebsd.org") }, - { "Germany #6", "ftp6.de.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Germany #6", "ftp6.de.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp6.de.freebsd.org") }, - { "Germany #7", "ftp7.de.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Germany #7", "ftp7.de.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp7.de.freebsd.org") }, { "Holland", "ftp.nl.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.nl.freebsd.org") }, - { "Hong Kong", "ftp.hk.super.net", NULL, dmenuSetVariable, NULL, + { " Hong Kong", "ftp.hk.super.net", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.hk.super.net") }, { "Iceland", "ftp.is.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.is.freebsd.org") }, - { "Ireland", "ftp.ie.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Ireland", "ftp.ie.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.ie.freebsd.org") }, - { "Israel", "ftp.il.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Israel", "ftp.il.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.il.freebsd.org") }, - { "Israel #2", "ftp2.il.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Israel #2", "ftp2.il.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp2.il.freebsd.org") }, { "Japan", "ftp.jp.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.jp.freebsd.org") }, - { "Japan #2", "ftp2.jp.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Japan #2", "ftp2.jp.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp2.jp.freebsd.org") }, - { "Japan #3", "ftp3.jp.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Japan #3", "ftp3.jp.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp3.jp.freebsd.org") }, - { "Japan #4", "ftp4.jp.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Japan #4", "ftp4.jp.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp4.jp.freebsd.org") }, - { "Japan #5", "ftp5.jp.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Japan #5", "ftp5.jp.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp5.jp.freebsd.org") }, - { "Japan #6", "ftp6.jp.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Japan #6", "ftp6.jp.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp6.jp.freebsd.org") }, { "Korea", "ftp.kr.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.kr.freebsd.org") }, - { "Korea #2", "ftp2.kr.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Korea #2", "ftp2.kr.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp2.kr.freebsd.org") }, - { "Korea #3", "ftp3.kr.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Korea #3", "ftp3.kr.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp3.kr.freebsd.org") }, - { "Korea #4", "ftp4.kr.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Korea #4", "ftp4.kr.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp4.kr.freebsd.org") }, - { "Korea #5", "ftp5.kr.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Korea #5", "ftp5.kr.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp5.kr.freebsd.org") }, { "New Zealand", "ftp.nz.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.nz.freebsd.org") }, { "Poland", "ftp.pl.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.pl.freebsd.org") }, - { "Portugal", "ftp.pt.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Portugal", "ftp.pt.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.pt.freebsd.org") }, - { "Portugal #2", "ftp2.pt.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Portugal #2", "ftp2.pt.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp2.pt.freebsd.org") }, { "Russia", "ftp.ru.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.ru.freebsd.org") }, - { "Russia #2", "ftp2.ru.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Russia #2", "ftp2.ru.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp2.ru.freebsd.org") }, - { "Russia #3", "ftp3.ru.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Russia #3", "ftp3.ru.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp3.ru.freebsd.org") }, - { "Russia #4", "ftp4.ru.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Russia #4", "ftp4.ru.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp4.ru.freebsd.org") }, { "Slovak Republic", "ftp.sk.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.sk.freebsd.org") }, - { "South Africa", "ftp.za.freebsd.org", NULL, dmenuSetVariable, NULL, + { " South Africa", "ftp.za.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.za.freebsd.org") }, - { "South Africa #2", "ftp2.za.freebsd.org", NULL, dmenuSetVariable, NULL, + { " South Africa #2", "ftp2.za.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp2.za.freebsd.org") }, - { "South Africa #3", "ftp3.za.freebsd.org", NULL, dmenuSetVariable, NULL, + { " South Africa #3", "ftp3.za.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp3.za.freebsd.org") }, - { "South Africa #4", "ftp4.za.freebsd.org", NULL, dmenuSetVariable, NULL, + { " South Africa #4", "ftp4.za.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp4.za.freebsd.org") }, - { "Spain", "ftp.es.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Spain", "ftp.es.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.es.freebsd.org") }, - { "Spain #2", "ftp2.es.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Spain #2", "ftp2.es.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp2.es.freebsd.org") }, - { "Sweden", "ftp.se.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Sweden", "ftp.se.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.se.freebsd.org") }, - { "Sweden #2", "ftp2.se.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Sweden #2", "ftp2.se.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp2.se.freebsd.org") }, - { "Sweden #3", "ftp3.se.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Sweden #3", "ftp3.se.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp3.se.freebsd.org") }, { "Taiwan", "ftp.tw.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.tw.freebsd.org") }, - { "Taiwan #2", "ftp2.tw.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Taiwan #2", "ftp2.tw.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp2.tw.freebsd.org") }, - { "Taiwan #3", "ftp3.tw.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Taiwan #3", "ftp3.tw.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp3.tw.freebsd.org") }, - { "Thailand", "ftp.nectec.or.th", NULL, dmenuSetVariable, NULL, + { " Thailand", "ftp.nectec.or.th", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AS("=ftp://ftp.nectec.or.th/pub/mirrors/FreeBSD/") }, { "UK", "ftp.uk.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.uk.freebsd.org") }, - { "UK #2", "ftp2.uk.freebsd.org", NULL, dmenuSetVariable, NULL, + { " UK #2", "ftp2.uk.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp2.uk.freebsd.org") }, - { "UK #3", "ftp3.uk.freebsd.org", NULL, dmenuSetVariable, NULL, + { " UK #3", "ftp3.uk.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp3.uk.freebsd.org") }, - { "UK #4", "ftp4.uk.freebsd.org", NULL, dmenuSetVariable, NULL, + { " UK #4", "ftp4.uk.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp4.uk.freebsd.org") }, - { "UK #5", "ftp5.uk.freebsd.org", NULL, dmenuSetVariable, NULL, + { " UK #5", "ftp5.uk.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp5.uk.freebsd.org") }, - { "USA", "ftp.freebsd.org", NULL, dmenuSetVariable, NULL, + { " USA", "ftp.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.freebsd.org") }, - { "USA #2", "ftp2.freebsd.org", NULL, dmenuSetVariable, NULL, + { " USA #2", "ftp2.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp2.freebsd.org") }, - { "USA #3", "ftp3.freebsd.org", NULL, dmenuSetVariable, NULL, + { " USA #3", "ftp3.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp3.freebsd.org") }, - { "USA #4", "ftp4.freebsd.org", NULL, dmenuSetVariable, NULL, + { " USA #4", "ftp4.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp4.freebsd.org") }, - { "USA #5", "ftp5.freebsd.org", NULL, dmenuSetVariable, NULL, + { " USA #5", "ftp5.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp5.freebsd.org") }, - { "USA #6", "ftp6.freebsd.org", NULL, dmenuSetVariable, NULL, + { " USA #6", "ftp6.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp6.freebsd.org") }, { NULL } } }; @@ -754,7 +770,7 @@ DMenu MenuMedia = { { "6 File System", "Install from an existing filesystem", NULL, mediaSetUFS }, { "7 Floppy", "Install from a floppy disk set", NULL, mediaSetFloppy }, { "8 Tape", "Install from SCSI or QIC tape", NULL, mediaSetTape }, - { "9 Options", "Go to the Options screen", NULL, optionsEditor }, + { "Options", "Go to the Options screen", NULL, optionsEditor }, { NULL } }, }; @@ -771,7 +787,11 @@ DMenu MenuDistributions = { "item or press [ENTER].", "Press F1 for more information on these options.", "distributions", - { { "1 Developer", "Full sources, binaries and doc but no games", + { { "All", "All system sources, binaries and X Window System)", + checkDistEverything, distSetEverything }, + { "Reset", "Reset selected distribution list to nothing", + NULL, distReset, NULL, NULL, ' ', ' ', ' ' }, + { "1 Developer", "Full sources, binaries and doc but no games", checkDistDeveloper, distSetDeveloper }, { "2 X-Developer", "Same as above + X Window System", checkDistXDeveloper, distSetXDeveloper }, @@ -787,12 +807,6 @@ DMenu MenuDistributions = { checkDistMinimum, distSetMinimum }, { "8 Custom", "Specify your own distribution set", NULL, dmenuSubmenu, NULL, &MenuSubDistributions, '>', '>', '>' }, - { "8 All", "All sources and binaries (incl X Window System)", - checkDistEverything, distSetEverything }, - { "9 Clear", "Reset selected distribution list to nothing", - NULL, distReset, NULL, NULL, ' ', ' ', ' ' }, - { "0 Exit", "Exit this menu (returning to previous)", - checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, { NULL } }, }; @@ -804,52 +818,50 @@ DMenu MenuSubDistributions = { "DES distribution out of the U.S.! It is for U.S. customers only.", NULL, NULL, - { { "bin", "Binary base distribution (required)", + { { "All", "All system sources, binaries and X Window System", + NULL, distSetEverything, NULL, NULL, ' ', ' ', ' ' }, + { "Reset", "Reset all of the below", + NULL, distReset, NULL, NULL, ' ', ' ', ' ' }, + { " bin", "Binary base distribution (required)", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_BIN }, #ifdef __i386__ - { "compat1x", "FreeBSD 1.x binary compatibility", + { " compat1x", "FreeBSD 1.x binary compatibility", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT1X }, - { "compat20", "FreeBSD 2.0 binary compatibility", + { " compat20", "FreeBSD 2.0 binary compatibility", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT20 }, - { "compat21", "FreeBSD 2.1 binary compatibility", + { " compat21", "FreeBSD 2.1 binary compatibility", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT21 }, - { "compat22", "FreeBSD 2.2.x and 3.0 a.out binary compatibility", + { " compat22", "FreeBSD 2.2.x and 3.0 a.out binary compatibility", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT22 }, #if __FreeBSD__ > 3 - { "compat3x", "FreeBSD 3.x binary compatibility", + { " compat3x", "FreeBSD 3.x binary compatibility", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT3X }, #endif #endif - { "DES", "DES encryption code - NOT FOR EXPORT!", + { " DES", "DES encryption code - NOT FOR EXPORT!", DESFlagCheck, distSetDES }, - { "dict", "Spelling checker dictionary files", + { " dict", "Spelling checker dictionary files", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_DICT }, - { "doc", "Miscellaneous FreeBSD online docs", + { " doc", "Miscellaneous FreeBSD online docs", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_DOC }, - { "games", "Games (non-commercial)", + { " games", "Games (non-commercial)", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_GAMES }, - { "info", "GNU info files", + { " info", "GNU info files", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_INFO }, - { "man", "System manual pages - recommended", + { " man", "System manual pages - recommended", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_MANPAGES }, - { "catman", "Preformatted system manual pages", + { " catman", "Preformatted system manual pages", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_CATPAGES }, - { "proflibs", "Profiled versions of the libraries", + { " proflibs", "Profiled versions of the libraries", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_PROFLIBS }, - { "src", "Sources for everything but DES", + { " src", "Sources for everything but DES", srcFlagCheck, distSetSrc }, - { "ports", "The FreeBSD Ports collection", + { " ports", "The FreeBSD Ports collection", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_PORTS }, - { "local", "Local additions collection", + { " local", "Local additions collection", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_LOCAL}, - { "XFree86", "The XFree86 3.3.5 distribution", + { " XFree86", "The XFree86 3.3.5 distribution", x11FlagCheck, distSetXF86 }, - { "All", "All sources, binaries and X Window System binaries", - NULL, distSetEverything, NULL, NULL, ' ', ' ', ' ' }, - { "Clear", "Reset all of the above", - NULL, distReset, NULL, NULL, ' ', ' ', ' ' }, - { "Exit", "Exit this menu (returning to previous)", - checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, { NULL } }, }; @@ -862,28 +874,30 @@ DMenu MenuDESDistributions = { "distributions of this software, please consult the release notes.", NULL, NULL, - { { "des", "Basic DES encryption services", + { { "All", "Select all of the below", + NULL, setDES, NULL, NULL, ' ', ' ', ' ' }, + { "Reset", "Reset all of the below", + NULL, clearDES, NULL, NULL, ' ', ' ', ' ' }, + { " des", "Basic DES encryption services", dmenuFlagCheck, dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_DES, }, #if __FreeBSD__ > 3 - { "krb4", "KerberosIV authentication services", + { " krb4", "KerberosIV authentication services", dmenuFlagCheck, dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_KERBEROS4 }, #else - { "krb", "KerberosIV authentication services", + { " krb", "KerberosIV authentication services", dmenuFlagCheck, dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_KERBEROS }, #endif - { "skerbero", "Sources for Kerberos", + { " skerbero", "Sources for Kerberos", dmenuFlagCheck, dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_SKERBEROS }, - { "ssecure", "Sources for DES", + { " ssecure", "Sources for DES", dmenuFlagCheck, dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_SSECURE }, - { "scrypto", "Export controlled crypto sources", + { " scrypto", "Export controlled crypto sources", dmenuFlagCheck, dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_SCRYPTO }, - { "Exit", "Exit this menu (returning to previous)", - checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, { NULL } }, }; DMenu MenuSrcDistributions = { - DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS , + DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS, "Select the sub-components of src you wish to install.", "Please check off those portions of the FreeBSD source tree\n" "you wish to install (remember to use SPACE, not ENTER!).", @@ -891,40 +905,38 @@ DMenu MenuSrcDistributions = { NULL, { { "All", "Select all of the below", NULL, setSrc, NULL, NULL, ' ', ' ', ' ' }, - { "Clear", "Reset all of the below", + { "Reset", "Reset all of the below", NULL, clearSrc, NULL, NULL, ' ', ' ', ' ' }, - { "base", "top-level files in /usr/src", + { " base", "top-level files in /usr/src", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_BASE }, - { "contrib", "/usr/src/contrib (contributed software)", + { " contrib", "/usr/src/contrib (contributed software)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_CONTRIB }, - { "gnu", "/usr/src/gnu (software from the GNU Project)", + { " gnu", "/usr/src/gnu (software from the GNU Project)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_GNU }, - { "etc", "/usr/src/etc (miscellaneous system files)", + { " etc", "/usr/src/etc (miscellaneous system files)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_ETC }, - { "games", "/usr/src/games (the obvious!)", + { " games", "/usr/src/games (the obvious!)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_GAMES }, - { "include", "/usr/src/include (header files)", + { " include", "/usr/src/include (header files)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_INCLUDE }, - { "lib", "/usr/src/lib (system libraries)", + { " lib", "/usr/src/lib (system libraries)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_LIB }, - { "libexec", "/usr/src/libexec (system programs)", + { " libexec", "/usr/src/libexec (system programs)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_LIBEXEC }, - { "release", "/usr/src/release (release-generation tools)", + { " release", "/usr/src/release (release-generation tools)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_RELEASE }, - { "bin", "/usr/src/bin (system binaries)", + { " bin", "/usr/src/bin (system binaries)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_BIN }, - { "sbin", "/usr/src/sbin (system binaries)", + { " sbin", "/usr/src/sbin (system binaries)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SBIN }, - { "share", "/usr/src/share (documents and shared files)", + { " share", "/usr/src/share (documents and shared files)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SHARE }, - { "sys", "/usr/src/sys (FreeBSD kernel)", + { " sys", "/usr/src/sys (FreeBSD kernel)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SYS }, - { "ubin", "/usr/src/usr.bin (user binaries)", + { " ubin", "/usr/src/usr.bin (user binaries)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_UBIN }, - { "usbin", "/usr/src/usr.sbin (aux system binaries)", + { " usbin", "/usr/src/usr.sbin (aux system binaries)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_USBIN }, - { "Exit", "Exit this menu (returning to previous)", - checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, { NULL } }, }; @@ -935,12 +947,12 @@ DMenu MenuXF86Select = { "distribution sets.", NULL, NULL, - { { "Basic", "Basic component menu (required)", NULL, dmenuSubmenu, NULL, &MenuXF86SelectCore }, + { { "All", "Select all XFree86 distribution sets", NULL, setX11All }, + { "Reset", "Reset XFree86 distribution sets", NULL, clearX11All }, + { "Basic", "Basic component menu (required)", NULL, dmenuSubmenu, NULL, &MenuXF86SelectCore }, { "Server", "X server menu", NULL, dmenuSubmenu, NULL, &MenuXF86SelectServer }, { "Fonts", "Font set menu", NULL, dmenuSubmenu, NULL, &MenuXF86SelectFonts }, - { "All", "Select all XFree86 distribution sets", NULL, setX11All }, - { "Clear", "Reset XFree86 distribution list", NULL, clearX11All }, - { "Exit", "Exit this menu (returning to previous)", checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, + { "X Exit", "Exit this menu (returning to previous)", checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, { NULL } }, }; @@ -951,47 +963,43 @@ DMenu MenuXF86SelectCore = { "Bin, lib, and set are recommended for a minimum installaion.", NULL, NULL, - { { "bin", "Client applications and shared libs", + { { "All", "Select all below", + NULL, setX11Misc, NULL, NULL, ' ', ' ', ' ' }, + { "Reset", "Reset all below", + NULL, clearX11Misc, NULL, NULL, ' ', ' ', ' ' }, + { " bin", "Client applications and shared libs", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_BIN }, - { "cfg", "Configuration files", + { " cfg", "Configuration files", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_CFG }, - { "doc", "READMEs and release notes", + { " doc", "READMEs and release notes", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_DOC }, - { "html", "HTML documentation files", + { " html", "HTML documentation files", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_HTML }, - { "lib", "Data files needed at runtime", + { " lib", "Data files needed at runtime", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LIB }, -#ifdef __i386__ - { "lk98", "Server link kit for PC98 machines", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LKIT98 }, -#endif - { "lkit", "Server link kit for all other machines", + { " lkit", "Server link kit for all other machines", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LKIT }, - { "man", "Manual pages", + { " man", "Manual pages", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_MAN }, - { "prog", "Programmer's header and library files", + { " prog", "Programmer's header and library files", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_PROG }, - { "set", "XFree86 Setup Utility", + { " set", "XFree86 Setup Utility", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SET }, #ifdef __i386__ - { "9set", "XFree86 Setup Utility for PC98 machines", + { " 9set", "XFree86 Setup Utility for PC98 machines", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_9SET }, + { " lk98", "Server link kit for PC98 machines", + dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LKIT98 }, #endif - { "sources", "XFree86 3.3.5 standard sources", + { " sources", "XFree86 3.3.5 standard sources", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SRC }, - { "csources", "XFree86 3.3.5 contrib sources", + { " csources", "XFree86 3.3.5 contrib sources", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_CSRC }, - { "All", "Select all of the above", - NULL, setX11Misc, NULL, NULL, ' ', ' ', ' ' }, - { "Clear", "Reset all of the above", - NULL, clearX11Misc, NULL, NULL, ' ', ' ', ' ' }, - { "Exit", "Exit this menu (returning to previous)", - checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, { NULL } }, }; DMenu MenuXF86SelectFonts = { - DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS , + DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS, "Font distribution selection.", "Please check off the individual font distributions you wish to\n\ install. At the minimum, you should install the standard\n\ @@ -999,24 +1007,22 @@ install. At the minimum, you should install the standard\n\ (these are selected by default).", NULL, NULL, - { { "fnts", "Standard 75 DPI and miscellaneous fonts", + { { "All", "All fonts", + NULL, setX11Fonts, NULL, NULL, ' ', ' ', ' ' }, + { "Reset", "Reset font selections", + NULL, clearX11Fonts, NULL, NULL, ' ', ' ', ' ' }, + { " fnts", "Standard 75 DPI and miscellaneous fonts", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_MISC }, - { "f100", "100 DPI fonts", + { " f100", "100 DPI fonts", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_100 }, - { "fcyr", "Cyrillic Fonts", + { " fcyr", "Cyrillic Fonts", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_CYR }, - { "fscl", "Speedo and Type scalable fonts", + { " fscl", "Speedo and Type scalable fonts", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_SCALE }, - { "non", "Japanese, Chinese and other non-english fonts", + { " non", "Japanese, Chinese and other non-english fonts", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_NON }, - { "server", "Font server", + { " server", "Font server", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_SERVER }, - { "All", "All fonts", - NULL, setX11Fonts, NULL, NULL, ' ', ' ', ' ' }, - { "Clear", "Reset font selections", - NULL, clearX11Fonts, NULL, NULL, ' ', ' ', ' ' }, - { "Exit", "Exit this menu (returning to previous)", - checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, { NULL } }, }; @@ -1029,47 +1035,45 @@ DMenu MenuXF86SelectServer = { "machines, the 9EGC or 9840 servers.", NULL, NULL, - { { "SVGA", "Standard VGA or Super VGA card", + { { "All", "Select all of the above", + NULL, setX11Servers, NULL, NULL, ' ', ' ', ' ' }, + { "Reset", "Reset all of the above", + NULL, clearX11Servers, NULL, NULL, ' ', ' ', ' ' }, + { " SVGA", "Standard VGA or Super VGA card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_SVGA }, - { "VGA16", "Standard 16 color VGA card", + { " VGA16", "Standard 16 color VGA card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_VGA16 }, - { "Mono", "Standard Monochrome card", + { " Mono", "Standard Monochrome card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_MONO }, - { "3DL", "8, 16 and 24 bit color 3D Labs boards", + { " 3DL", "8, 16 and 24 bit color 3D Labs boards", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_3DL }, - { "8514", "8-bit (256 color) IBM 8514 or compatible card", + { " 8514", "8-bit (256 color) IBM 8514 or compatible card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_8514 }, - { "AGX", "8-bit AGX card", + { " AGX", "8-bit AGX card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_AGX }, - { "I128", "8, 16 and 24-bit #9 Imagine I128 card", + { " I128", "8, 16 and 24-bit #9 Imagine I128 card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_I128 }, - { "Ma8", "8-bit ATI Mach8 card", + { " Ma8", "8-bit ATI Mach8 card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_MACH8 }, - { "Ma32", "8 and 16-bit (65K color) ATI Mach32 card", + { " Ma32", "8 and 16-bit (65K color) ATI Mach32 card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_MACH32 }, - { "Ma64", "8 and 16-bit (65K color) ATI Mach64 card", + { " Ma64", "8 and 16-bit (65K color) ATI Mach64 card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_MACH64 }, - { "P9K", "8, 16, and 24-bit color Weitek P9000 based boards", + { " P9K", "8, 16, and 24-bit color Weitek P9000 based boards", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_P9000 }, - { "S3", "8, 16 and 24-bit color S3 based boards", + { " S3", "8, 16 and 24-bit color S3 based boards", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_S3 }, - { "S3V", "8, 16 and 24-bit color S3 Virge based boards", + { " S3V", "8, 16 and 24-bit color S3 Virge based boards", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_S3V }, - { "W32", "8-bit ET4000/W32, /W32i and /W32p cards", + { " W32", "8-bit ET4000/W32, /W32i and /W32p cards", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_W32 }, #ifdef __i386__ - { "PC98", "Select an X server for a NEC PC98 [Submenu]", + { " PC98", "Select an X server for a NEC PC98 [Submenu]", NULL, dmenuSubmenu, NULL, &MenuXF86SelectPC98Server, '>', ' ', '>', 0 }, #elif __alpha__ - { "TGA", "TGA cards (alpha architecture only)", + { " TGA", "TGA cards (alpha architecture only)", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_TGA }, #endif - { "All", "Select all of the above", - NULL, setX11Servers, NULL, NULL, ' ', ' ', ' ' }, - { "Clear", "Reset all of the above", - NULL, clearX11Servers, NULL, NULL, ' ', ' ', ' ' }, - { "Exit", "Exit this menu (returning to previous)", - checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, { NULL } }, }; @@ -1083,36 +1087,34 @@ it is recommended that try the SVGA or VGA16 servers (the VGA16 and\n\ Mono servers are particularly well-suited to most LCD displays).", NULL, NULL, - { { "9480", "PC98 8-bit (256 color) PEGC-480 card", + { { " 9480", "PC98 8-bit (256 color) PEGC-480 card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9480 }, - { "9EGC", "PC98 4-bit (16 color) EGC card", + { " 9EGC", "PC98 4-bit (16 color) EGC card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9EGC }, - { "9GA9", "PC98 GA-968V4/PCI (S3 968) card", + { " 9GA9", "PC98 GA-968V4/PCI (S3 968) card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9GA9 }, - { "9GAN", "PC98 GANB-WAP (cirrus) card", + { " 9GAN", "PC98 GANB-WAP (cirrus) card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9GAN }, - { "9LPW", "PC98 PowerWindowLB (S3) card", + { " 9LPW", "PC98 PowerWindowLB (S3) card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9LPW }, - { "9MGA", "PC98 MGA (Matrox) card", + { " 9MGA", "PC98 MGA (Matrox) card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9MGA }, - { "9NKV", "PC98 NKV-NEC (cirrus) card", + { " 9NKV", "PC98 NKV-NEC (cirrus) card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9NKV }, - { "9NS3", "PC98 NEC (S3) card", + { " 9NS3", "PC98 NEC (S3) card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9NS3 }, - { "9SPW", "PC98 SKB-PowerWindow (S3) card", + { " 9SPW", "PC98 SKB-PowerWindow (S3) card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9SPW }, - { "9SVG", "PC98 generic SVGA card", + { " 9SVG", "PC98 generic SVGA card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9SVG }, - { "9TGU", "PC98 Cyber9320 and TGUI9680 cards", + { " 9TGU", "PC98 Cyber9320 and TGUI9680 cards", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9TGU }, - { "9WEP", "PC98 WAB-EP (cirrus) card", + { " 9WEP", "PC98 WAB-EP (cirrus) card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9WEP }, - { "9WS", "PC98 WABS (cirrus) card", + { " 9WS", "PC98 WABS (cirrus) card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9WS }, - { "9WSN", "PC98 WSN-A2F (cirrus) card", + { " 9WSN", "PC98 WSN-A2F (cirrus) card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9WSN }, - { "Exit", "Exit this menu (returning to previous)", - checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, { NULL } } }; #endif @@ -1140,10 +1142,11 @@ DMenu MenuHTMLDoc = { "to enter an arbitrary URL for browsing.", "Press F1 for more help on what you see here.", "html", - { { "Handbook", "The FreeBSD Handbook.", NULL, docShowDocument }, - { "FAQ", "The Frequently Asked Questions guide.", NULL, docShowDocument }, - { "Home", "The Home Pages for the FreeBSD Project (requires net)", NULL, docShowDocument }, - { "Other", "Enter a URL.", NULL, docShowDocument }, + { { "1 Handbook", "The FreeBSD Handbook.", NULL, docShowDocument }, + { "2 FAQ", "The Frequently Asked Questions guide.", NULL, docShowDocument }, + { "3 Home", "The Home Pages for the FreeBSD Project (requires net)", NULL, docShowDocument }, + { "4 Other", "Enter a URL.", NULL, docShowDocument }, + { "X Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, { NULL } }, }; @@ -1169,7 +1172,7 @@ DMenu MenuInstallCustom = { { "5 Media", "Choose the installation media type", NULL, dmenuSubmenu, NULL, &MenuMedia }, { "6 Commit", "Perform any pending Partition/Label/Extract actions", NULL, installCustomCommit }, #endif - { "0 Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, + { "X Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, { NULL } }, }; @@ -1207,41 +1210,41 @@ DMenu MenuConfigure = { "software not provided in the base distributions.", "Press F1 for more information on these options", "configure", - { { "D Distributions", "Install additional distribution sets", + { { " Distributions", "Install additional distribution sets", NULL, distExtractAll }, - { "P Packages", "Install pre-packaged software for FreeBSD", + { " Packages", "Install pre-packaged software for FreeBSD", NULL, configPackages }, - { "R Root Password", "Set the system manager's password", + { " Root Password", "Set the system manager's password", NULL, dmenuSystemCommand, NULL, "passwd root" }, - { "L Label", "The disk Label editor", + { " Label", "The disk Label editor", NULL, diskLabelEditor }, #ifdef __i386__ - { "F Fdisk", "The disk Slice (PC-style partition) Editor", + { " Fdisk", "The disk Slice (PC-style partition) Editor", NULL, diskPartitionEditor }, #endif - { "1 User Management", "Add user and group information", + { " User Management", "Add user and group information", NULL, dmenuSubmenu, NULL, &MenuUsermgmt }, - { "2 Console", "Customize system console behavior", + { " Console", "Customize system console behavior", NULL, dmenuSubmenu, NULL, &MenuSyscons }, - { "3 Time Zone", "Set which time zone you're in", + { " Time Zone", "Set which time zone you're in", NULL, dmenuSystemCommand, NULL, "tzsetup" }, - { "4 Media", "Change the installation media type", - NULL, dmenuSubmenu, NULL, &MenuMedia }, - { "5 Mouse", "Configure your mouse", + { " Media", "Change the installation media type", + NULL, dmenuSubmenu, NULL, &MenuMedia }, + { " Mouse", "Configure your mouse", NULL, dmenuSubmenu, NULL, &MenuMouse, NULL }, - { "6 Networking", "Configure additional network services", + { " Networking", "Configure additional network services", NULL, dmenuSubmenu, NULL, &MenuNetworking }, - { "7 Startup", "Configure system startup options", + { " Startup", "Configure system startup options", NULL, dmenuSubmenu, NULL, &MenuStartup }, - { "8 Options", "View/Set various installation options", + { " Options", "View/Set various installation options", NULL, optionsEditor }, - { "X XFree86", "Configure XFree86 Server", + { " XFree86", "Configure XFree86 Server", NULL, configXSetup }, - { "D Desktop", "Configure XFree86 Desktop", + { " Desktop", "Configure XFree86 Desktop", NULL, configXDesktop }, - { "H HTML Docs", "Go to the HTML documentation menu (post-install)", + { " HTML Docs", "Go to the HTML documentation menu (post-install)", NULL, docBrowser }, - { "E Exit", "Exit this menu (returning to previous)", + { "X Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, { NULL } }, }; @@ -1254,42 +1257,40 @@ DMenu MenuStartup = { "RETURN key will leave this menu (as with all checkbox menus).", NULL, NULL, - { { "APM", "Auto-power management services (typically laptops)", + { { " APM", "Auto-power management services (typically laptops)", dmenuVarCheck, dmenuToggleVariable, NULL, "apm_enable=YES" }, - { "pccard", "Enable PCCARD (AKA PCMCIA) services (also laptops)", + { " pccard", "Enable PCCARD (AKA PCMCIA) services (also laptops)", dmenuVarCheck, dmenuToggleVariable, NULL, "pccard_enable=YES" }, - { "pccard mem", "Set PCCARD memory address (if enabled)", + { " pccard mem", "Set PCCARD memory address (if enabled)", dmenuVarCheck, dmenuISetVariable, NULL, "pccard_mem" }, - { "pccard ifconfig", "List of PCCARD ethernet devices to configure", + { " pccard ifconfig", "List of PCCARD ethernet devices to configure", dmenuVarCheck, dmenuISetVariable, NULL, "pccard_ifconfig" }, { " ", " -- ", NULL, NULL, NULL, NULL, ' ', ' ', ' ' }, - { "startup dirs", "Set the list of dirs to look for startup scripts", + { " startup dirs", "Set the list of dirs to look for startup scripts", dmenuVarCheck, dmenuISetVariable, NULL, "local_startup" }, - { "named", "Run a local name server on this host", + { " named", "Run a local name server on this host", dmenuVarCheck, dmenuToggleVariable, NULL, "named_enable=YES" }, - { "named flags", "Set default flags to named (if enabled)", + { " named flags", "Set default flags to named (if enabled)", dmenuVarCheck, dmenuISetVariable, NULL, "named_flags" }, - { "nis client", "This host wishes to be an NIS client.", + { " nis client", "This host wishes to be an NIS client.", dmenuVarCheck, dmenuToggleVariable, NULL, "nis_client_enable=YES" }, - { "nis domainname", "Set NIS domainname (if enabled)", + { " nis domainname", "Set NIS domainname (if enabled)", dmenuVarCheck, dmenuISetVariable, NULL, "nisdomainname" }, - { "nis server", "This host wishes to be an NIS server.", + { " nis server", "This host wishes to be an NIS server.", dmenuVarCheck, dmenuToggleVariable, NULL, "nis_server_enable=YES" }, { " ", " -- ", NULL, NULL, NULL, NULL, ' ', ' ', ' ' }, - { "accounting", "This host wishes to run process accounting.", + { " accounting", "This host wishes to run process accounting.", dmenuVarCheck, dmenuToggleVariable, NULL, "accounting_enable=YES" }, - { "lpd", "This host has a printer and wants to run lpd.", + { " lpd", "This host has a printer and wants to run lpd.", dmenuVarCheck, dmenuToggleVariable, NULL, "lpd_enable=YES" }, #ifdef __i386__ - { "linux", "This host wants to be able to run linux binaries.", + { " linux", "This host wants to be able to run linux binaries.", dmenuVarCheck, configLinux, NULL, VAR_LINUX_ENABLE "=YES" }, - { "SCO", "This host wants to be able to run IBCS2 binaries.", + { " SCO", "This host wants to be able to run IBCS2 binaries.", dmenuVarCheck, dmenuToggleVariable, NULL, "ibcs2_enable=YES" }, #endif - { "quotas", "This host wishes to check quotas on startup.", + { " quotas", "This host wishes to check quotas on startup.", dmenuVarCheck, dmenuToggleVariable, NULL, "check_quotas=YES" }, - { "Exit", "Exit this menu (returning to previous)", - checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, { NULL } }, }; @@ -1302,32 +1303,30 @@ DMenu MenuNetworking = { "aspects of your system's network configuration.", NULL, NULL, - { { "Interfaces", "Configure additional network interfaces", + { { " Interfaces", "Configure additional network interfaces", NULL, tcpMenuSelect }, - { "NFS client", "This machine will be an NFS client", + { " NFS client", "This machine will be an NFS client", dmenuVarCheck, dmenuToggleVariable, NULL, "nfs_client_enable=YES" }, - { "NFS server", "This machine will be an NFS server", - dmenuVarCheck, configNFSServer, NULL, "nfs_server_enable=YES" }, - { "AMD", "This machine wants to run the auto-mounter service", - dmenuVarCheck, dmenuToggleVariable, NULL, "amd_enable=YES" }, - { "AMD Flags", "Set flags to AMD service (if enabled)", - dmenuVarCheck, dmenuISetVariable, NULL, "amd_flags" }, - { "TCP Extensions", "Allow RFC1323 and RFC1644 TCP extensions?", - dmenuVarCheck, dmenuToggleVariable, NULL, "tcp_extensions=YES" }, - { "Gateway", "This machine will route packets between interfaces", + { " NFS server", "This machine will be an NFS server", + dmenuVarCheck, configNFSServer, NULL, "nfs_server_enable=YES" }, + { " AMD", "This machine wants to run the auto-mounter service", + dmenuVarCheck, dmenuToggleVariable, NULL, "amd_enable=YES" }, + { " AMD Flags", "Set flags to AMD service (if enabled)", + dmenuVarCheck, dmenuISetVariable, NULL, "amd_flags" }, + { " TCP Extensions", "Allow RFC1323 and RFC1644 TCP extensions?", + dmenuVarCheck, dmenuToggleVariable, NULL, "tcp_extensions=YES" }, + { " Gateway", "This machine will route packets between interfaces", dmenuVarCheck, dmenuToggleVariable, NULL, "gateway_enable=YES" }, - { "Ntpdate", "Select a clock-synchronization server", + { " Ntpdate", "Select a clock-synchronization server", dmenuVarCheck, dmenuSubmenu, NULL, &MenuNTP, '[', 'X', ']', "ntpdate_enable=YES" }, - { "router", "Select routing daemon (default: routed)", - dmenuVarCheck, configRouter, NULL, "router" }, - { "Rwhod", "This machine wants to run the rwho daemon", + { " router", "Select routing daemon (default: routed)", + dmenuVarCheck, configRouter, NULL, "router" }, + { " Rwhod", "This machine wants to run the rwho daemon", dmenuVarCheck, dmenuToggleVariable, NULL, "rwhod_enable=YES" }, - { "Anon FTP", "This machine wishes to allow anonymous FTP.", - dmenuVarCheck, configAnonFTP, NULL, "anon_ftp" }, - { "PCNFSD", "Run authentication server for clients with PC-NFS.", - dmenuVarCheck, configPCNFSD, NULL, "pcnfsd" }, - { "Exit", "Exit this menu (returning to previous)", - checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, + { " Anon FTP", "This machine wishes to allow anonymous FTP.", + dmenuVarCheck, configAnonFTP, NULL, "anon_ftp" }, + { " PCNFSD", "Run authentication server for clients with PC-NFS.", + dmenuVarCheck, configPCNFSD, NULL, "pcnfsd" }, { NULL } }, }; @@ -1347,7 +1346,7 @@ DMenu MenuNTP = { { "Australia", "ntp.syd.dms.csiro.au (HP 5061 Cesium Beam)", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp.syd.dms.csiro.au" }, - { "Canada", "tick.usask.ca (GOES clock)", + { " Canada", "tick.usask.ca (GOES clock)", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=tick.usask.ca" }, { "France", "canon.inria.fr (TDF clock)", @@ -1356,40 +1355,40 @@ DMenu MenuNTP = { { "Germany", "ntps1-{0,1,2}.uni-erlangen.de (GPS)", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntps1-0.uni-erlangen.de" }, - { "Germany #2", "ntps1-0.cs.tu-berlin.de (GPS)", + { " Germany #2", "ntps1-0.cs.tu-berlin.de (GPS)", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntps1-0.cs.tu-berlin.de" }, { "Japan", "clock.nc.fukuoka-u.ac.jp (GPS clock)", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=clock.nc.fukuoka-u.ac.jp" }, - { "Japan #2", "clock.tl.fukuoka-u.ac.jp (GPS clock)", + { " Japan #2", "clock.tl.fukuoka-u.ac.jp (GPS clock)", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=clock.tl.fukuoka-u.ac.jp" }, { "Netherlands", "ntp0.nl.net (GPS clock)", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp0.nl.net" }, - { "Norway", "timehost.ifi.uio.no (NTP clock)", + { " Norway", "timehost.ifi.uio.no (NTP clock)", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=timehost.ifi.uio.no" }, { "Sweden", "Time1.Stupi.SE (Cesium/GPS)", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=Time1.Stupi.SE" }, - { "Switzerland", "swisstime.ethz.ch (DCF77 clock)", + { " Switzerland", "swisstime.ethz.ch (DCF77 clock)", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=swisstime.ethz.ch" }, { "U.S. East Coast", "bitsy.mit.edu (WWV clock)", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=bitsy.mit.edu" }, - { "U.S. East Coast #2", "otc1.psu.edu (WWV clock)", + { " U.S. East Coast #2", "otc1.psu.edu (WWV clock)", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=otc1.psu.edu" }, - { "U.S. West Coast #1", "clepsydra.dec.com (GOES clock)", + { " U.S. West Coast #1", "clepsydra.dec.com (GOES clock)", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=clepsydra.dec.com" }, - { "U.S. West Coast #2", "clock.llnl.gov (WWVB clock)", + { " U.S. West Coast #2", "clock.llnl.gov (WWVB clock)", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=clock.llnl.gov" }, - { "U.S. Midwest", "ncar.ucar.edu (WWVB clock)", + { " U.S. Midwest", "ncar.ucar.edu (WWVB clock)", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ncar.ucar.edu" }, { NULL } }, @@ -1404,12 +1403,12 @@ DMenu MenuSyscons = { "When you are done setting configuration options, select Cancel.", "Configure your system console settings", NULL, - { { "Font", "Choose an alternate screen font", NULL, dmenuSubmenu, NULL, &MenuSysconsFont }, - { "Keymap", "Choose an alternate keyboard map", NULL, dmenuSubmenu, NULL, &MenuSysconsKeymap }, - { "Repeat", "Set the rate at which keys repeat", NULL, dmenuSubmenu, NULL, &MenuSysconsKeyrate }, - { "Saver", "Configure the screen saver", NULL, dmenuSubmenu, NULL, &MenuSysconsSaver }, - { "Screenmap", "Choose an alternate screenmap", NULL, dmenuSubmenu, NULL, &MenuSysconsScrnmap }, - { "Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, + { { "1 Font", "Choose an alternate screen font", NULL, dmenuSubmenu, NULL, &MenuSysconsFont }, + { "2 Keymap", "Choose an alternate keyboard map", NULL, dmenuSubmenu, NULL, &MenuSysconsKeymap }, + { "3 Repeat", "Set the rate at which keys repeat", NULL, dmenuSubmenu, NULL, &MenuSysconsKeyrate }, + { "4 Saver", "Configure the screen saver", NULL, dmenuSubmenu, NULL, &MenuSysconsSaver }, + { "5 Screenmap", "Choose an alternate screenmap", NULL, dmenuSubmenu, NULL, &MenuSysconsScrnmap }, + { "X Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, { NULL } }, }; @@ -1426,49 +1425,49 @@ DMenu MenuSysconsKeymap = { "Choose a keyboard map", NULL, { { "Belgian", "Belgian ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=be.iso" }, - { "Brazil CP850", "Brazil CP850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=br275.cp850" }, - { "Brazil ISO (accent)", "Brazil ISO keymap (accent keys)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=br275.iso.acc" }, - { "Brazil ISO", "Brazil ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=br275.iso" }, - { "Croatian ISO", "Croatian ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=hr.iso" }, + { " Brazil CP850", "Brazil CP850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=br275.cp850" }, + { " Brazil ISO (accent)", "Brazil ISO keymap (accent keys)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=br275.iso.acc" }, + { " Brazil ISO", "Brazil ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=br275.iso" }, + { " Croatian ISO", "Croatian ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=hr.iso" }, { "Danish CP865", "Danish Code Page 865 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=danish.cp865" }, - { "Danish ISO", "Danish ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=danish.iso" }, + { " Danish ISO", "Danish ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=danish.iso" }, { "Estonian ISO", "Estonian ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=estonian.iso" }, - { "Estonian ISO 15", "Estonian ISO 8859-15 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=estonian.iso15" }, - { "Estonian CP850", "Estonian Code Page 850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=estonian.cp850" }, - { "Finnish CP850","Finnish Code Page 850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=finnish.cp850" }, - { "Finnish ISO", "Finnish ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=finnish.iso" }, - { "French ISO (accent)", "French ISO keymap (accent keys)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=fr.iso.acc" }, - { "French ISO", "French ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=fr.iso" }, + { " Estonian ISO 15", "Estonian ISO 8859-15 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=estonian.iso15" }, + { " Estonian CP850", "Estonian Code Page 850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=estonian.cp850" }, + { " Finnish CP850","Finnish Code Page 850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=finnish.cp850" }, + { " Finnish ISO", "Finnish ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=finnish.iso" }, + { " French ISO (accent)", "French ISO keymap (accent keys)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=fr.iso.acc" }, + { " French ISO", "French ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=fr.iso" }, { "German CP850", "German Code Page 850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=german.cp850" }, - { "German ISO", "German ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=german.iso" }, + { " German ISO", "German ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=german.iso" }, { "Hungarian 101", "Hungarian ISO keymap (101 key)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=hu.iso2.101keys" }, - { "Hungarian 102", "Hungarian ISO keymap (102 key)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=hu.iso2.102keys" }, + { " Hungarian 102", "Hungarian ISO keymap (102 key)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=hu.iso2.102keys" }, { "Icelandic (accent)", "Icelandic ISO keymap (accent keys)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=icelandic.iso.acc" }, - { "Icelandic", "Icelandic ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=icelandic.iso" }, - { "Italian", "Italian ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=it.iso" }, + { " Icelandic", "Icelandic ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=icelandic.iso" }, + { " Italian", "Italian ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=it.iso" }, { "Latin American", "Latin American ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=lat-amer" }, { "Japanese 106", "Japanese 106 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=jp.106" }, { "Norway ISO", "Norwegian ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=norwegian.iso" }, { "Polish ISO", "Polish ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=pl_PL.ISO_8859-2" }, - { "Portuguese (accent)", "Portuguese ISO keymap (accent keys)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=pt.iso.acc" }, - { "Portuguese", "Portuguese ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=pt.iso" }, + { " Portuguese (accent)", "Portuguese ISO keymap (accent keys)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=pt.iso.acc" }, + { " Portuguese", "Portuguese ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=pt.iso" }, { "Russia CP866", "Russian CP866 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=ru.cp866" }, - { "Russia KOI8-R", "Russian KOI8-R keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=ru.koi8-r" }, + { " Russia KOI8-R", "Russian KOI8-R keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=ru.koi8-r" }, { "Slovenian", "Slovenian ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=si.iso.acc" }, - { "Spanish (accent)", "Spanish ISO keymap (accent keys)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=spanish.iso.acc" }, - { "Spanish", "Spanish ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=spanish.iso" }, - { "Swedish CP850", "Swedish Code Page 850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swedish.cp850" }, - { "Swedish ISO", "Swedish ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swedish.iso" }, - { "Swiss French ISO (accent)", "Swiss French ISO keymap (accent keys)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swissfrench.iso.acc" }, - { "Swiss French ISO", "Swiss French ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swissfrench.iso" }, - { "Swiss French CP850", "Swiss French Code Page 850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swissfrench.cp850" }, - { "Swiss German ISO (accent)", "Swiss German ISO keymap (accent keys)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swissgerman.iso.acc" }, - { "Swiss German ISO", "Swiss German ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swissgerman.iso" }, - { "Swiss German CP850", "Swiss German Code Page 850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swissgerman.cp850" }, + { " Spanish (accent)", "Spanish ISO keymap (accent keys)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=spanish.iso.acc" }, + { " Spanish", "Spanish ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=spanish.iso" }, + { " Swedish CP850", "Swedish Code Page 850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swedish.cp850" }, + { " Swedish ISO", "Swedish ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swedish.iso" }, + { " Swiss French ISO (accent)", "Swiss French ISO keymap (accent keys)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swissfrench.iso.acc" }, + { " Swiss French ISO", "Swiss French ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swissfrench.iso" }, + { " Swiss French CP850", "Swiss French Code Page 850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swissfrench.cp850" }, + { " Swiss German ISO (accent)", "Swiss German ISO keymap (accent keys)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swissgerman.iso.acc" }, + { " Swiss German ISO", "Swiss German ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swissgerman.iso" }, + { " Swiss German CP850", "Swiss German Code Page 850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swissgerman.cp850" }, { "U.K. CP850", "United Kingdom Code Page 850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=uk.cp850" }, - { "U.K. ISO", "United Kingdom ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=uk.iso" }, - { "U.S. Dvorak", "United States Dvorak keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=us.dvorak" }, - { "U.S. ISO", "United States ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=us.iso" }, + { " U.K. ISO", "United Kingdom ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=uk.iso" }, + { " U.S. Dvorak", "United States Dvorak keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=us.dvorak" }, + { " U.S. ISO", "United States ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=us.iso" }, { NULL } }, }; @@ -1495,23 +1494,23 @@ DMenu MenuSysconsSaver = { "probably enable one of these screen savers to prevent phosphor burn-in.", "Choose a nifty-looking screen saver", NULL, - { { "Blank", "Simply blank the screen", + { { "1 Blank", "Simply blank the screen", dmenuVarCheck, configSaver, NULL, "saver=blank" }, - { "Daemon", "\"BSD Daemon\" animated screen saver (text)", + { "2 Daemon", "\"BSD Daemon\" animated screen saver (text)", dmenuVarCheck, configSaver, NULL, "saver=daemon" }, - { "Fade", "Fade out effect screen saver", + { "3 Fade", "Fade out effect screen saver", dmenuVarCheck, configSaver, NULL, "saver=fade" }, - { "Fire", "Flames effect screen saver", + { "4 Fire", "Flames effect screen saver", dmenuVarCheck, configSaver, NULL, "saver=fire" }, - { "Green", "\"Green\" power saving mode (if supported by monitor)", + { "5 Green", "\"Green\" power saving mode (if supported by monitor)", dmenuVarCheck, configSaver, NULL, "saver=green" }, - { "Logo", "\"BSD Daemon\" animated screen saver (graphics)", + { "6 Logo", "\"BSD Daemon\" animated screen saver (graphics)", dmenuVarCheck, configSaver, NULL, "saver=logo" }, - { "Rain", "Rain drops screen saver", + { "7 Rain", "Rain drops screen saver", dmenuVarCheck, configSaver, NULL, "saver=rain" }, - { "Snake", "Draw a FreeBSD \"snake\" on your screen", + { "8 Snake", "Draw a FreeBSD \"snake\" on your screen", dmenuVarCheck, configSaver, NULL, "saver=snake" }, - { "Star", "A \"twinkling stars\" effect", + { "9 Star", "A \"twinkling stars\" effect", dmenuVarCheck, configSaver, NULL, "saver=star" }, { "Warp", "A \"stars warping\" effect", dmenuVarCheck, configSaver, NULL, "saver=warp" }, @@ -1556,21 +1555,21 @@ DMenu MenuSysconsFont = { "you can select the appropriate font below.", "Choose a font", NULL, - { { "None", "Use default font", dmenuVarCheck, dmenuSetVariables, NULL, + { { "1 None", "Use default font", dmenuVarCheck, dmenuSetVariables, NULL, "font8x8=NO,font8x14=NO,font8x16=NO" }, - { "IBM 437", "English", dmenuVarCheck, dmenuSetVariables, NULL, + { "2 IBM 437", "English", dmenuVarCheck, dmenuSetVariables, NULL, "font8x8=cp437-8x8,font8x14=cp437-8x14,font8x16=cp437-8x16" }, - { "IBM 850", "Western Europe, IBM encoding", dmenuVarCheck, dmenuSetVariables, NULL, + { "3 IBM 850", "Western Europe, IBM encoding", dmenuVarCheck, dmenuSetVariables, NULL, "font8x8=cp850-8x8,font8x14=cp850-8x14,font8x16=cp850-8x16" }, - { "IBM 865", "Norwegian, IBM encoding", dmenuVarCheck, dmenuSetVariables, NULL, + { "4 IBM 865", "Norwegian, IBM encoding", dmenuVarCheck, dmenuSetVariables, NULL, "font8x8=cp865-8x8,font8x14=cp865-8x14,font8x16=cp865-8x16" }, - { "IBM 866", "Russian, IBM encoding", dmenuVarCheck, dmenuSetVariables, NULL, + { "5 IBM 866", "Russian, IBM encoding", dmenuVarCheck, dmenuSetVariables, NULL, "font8x8=cp866-8x8,font8x14=cp866-8x14,font8x16=cp866-8x16" }, - { "ISO 8859-1", "Western Europe, ISO encoding", dmenuVarCheck, dmenuSetVariables, NULL, + { "6 ISO 8859-1", "Western Europe, ISO encoding", dmenuVarCheck, dmenuSetVariables, NULL, "font8x8=iso-8x8,font8x14=iso-8x14,font8x16=iso-8x16" }, - { "KOI8-R", "Russian, KOI8-R encoding", dmenuVarCheck, dmenuSetVariables, NULL, + { "7 KOI8-R", "Russian, KOI8-R encoding", dmenuVarCheck, dmenuSetVariables, NULL, "font8x8=koi8-r-8x8,font8x14=koi8-r-8x14,font8x16=koi8-r-8x16" }, - { "SWISS", "English, better resolution", dmenuVarCheck, dmenuSetVariables, NULL, + { "8 SWISS", "English, better resolution", dmenuVarCheck, dmenuSetVariables, NULL, "font8x8=swiss-8x8,font8x14=NO,font8x16=swiss-8x16" }, { NULL } }, }; @@ -1582,9 +1581,9 @@ DMenu MenuUsermgmt = { "login accounts.\n", "Configure your user groups and users", NULL, - { { "Add user", "Add a new user to the system.", NULL, userAddUser }, - { "Add group", "Add a new user group to the system.", NULL, userAddGroup }, - { "Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, + { { "User", "Add a new user to the system.", NULL, userAddUser }, + { "Group", "Add a new user group to the system.", NULL, userAddGroup }, + { "X Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, { NULL } }, }; @@ -1602,6 +1601,7 @@ DMenu MenuFixit = { { { "1 CDROM", "Use the 2nd \"live\" CDROM from the distribution", NULL, installFixitCDROM }, { "2 Floppy", "Use a floppy generated from the fixit image", NULL, installFixitFloppy }, { "3 Shell", "Start an Emergency Holographic Shell", NULL, installFixitHoloShell }, + { "X Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, { NULL } }, }; diff --git a/release/sysinstall/msg.c b/release/sysinstall/msg.c index 2986779..3d7affe 100644 --- a/release/sysinstall/msg.c +++ b/release/sysinstall/msg.c @@ -184,6 +184,7 @@ msgConfirm(char *fmt, ...) { va_list args; char *errstr; + WINDOW *w = savescr(); errstr = (char *)alloca(FILENAME_MAX); va_start(args, fmt); @@ -196,6 +197,7 @@ msgConfirm(char *fmt, ...) msgInfo(NULL); } dialog_notify(errstr); + restorescr(w); } /* Put up a message in a popup information box */ @@ -204,6 +206,7 @@ msgNotify(char *fmt, ...) { va_list args; char *errstr; + WINDOW *w = savescr(); errstr = (char *)alloca(FILENAME_MAX); va_start(args, fmt); @@ -213,8 +216,9 @@ msgNotify(char *fmt, ...) use_helpfile(NULL); if (isDebug()) msgDebug("Notify: %s\n", errstr); - dialog_clear_norefresh(); dialog_msgbox(NULL, errstr, -1, -1, 0); + sleep(1); + restorescr(w); } /* Put up a message in a popup yes/no box and return 1 for YES, 0 for NO */ @@ -224,7 +228,8 @@ msgYesNo(char *fmt, ...) va_list args; char *errstr; int ret; - + WINDOW *w = savescr(); + errstr = (char *)alloca(FILENAME_MAX); va_start(args, fmt); vsnprintf(errstr, FILENAME_MAX, fmt, args); @@ -236,6 +241,7 @@ msgYesNo(char *fmt, ...) msgInfo(NULL); } ret = dialog_yesno("User Confirmation Requested", errstr, -1, -1); + restorescr(w); return ret; } @@ -247,6 +253,7 @@ msgGetInput(char *buf, char *fmt, ...) char *errstr; static char input_buffer[256]; int rval; + WINDOW *w = savescr(); errstr = (char *)alloca(FILENAME_MAX); va_start(args, fmt); @@ -263,6 +270,7 @@ msgGetInput(char *buf, char *fmt, ...) msgInfo(NULL); } rval = dialog_inputbox("Value Required", errstr, -1, -1, input_buffer); + restorescr(w); if (!rval) return input_buffer; else @@ -292,7 +300,8 @@ msgWeHaveOutput(char *fmt, ...) { va_list args; char *errstr; - + WINDOW *w = savescr(); + errstr = (char *)alloca(FILENAME_MAX); va_start(args, fmt); vsnprintf(errstr, FILENAME_MAX, fmt, args); @@ -302,6 +311,7 @@ msgWeHaveOutput(char *fmt, ...) msgDebug("Notify: %s\n", errstr); dialog_clear_norefresh(); dialog_msgbox(NULL, errstr, -1, -1, 0); + restorescr(w); } /* Simple versions of msgConfirm() and msgNotify() for calling from scripts */ diff --git a/release/sysinstall/network.c b/release/sysinstall/network.c index adffa4d..b92e37b 100644 --- a/release/sysinstall/network.c +++ b/release/sysinstall/network.c @@ -55,7 +55,8 @@ mediaInitNetwork(Device *dev) int i; char *rp; char *cp, ifconfig[255]; - + WINDOW *w; + if (!RunningAsInit || networkInitialized) return TRUE; @@ -87,6 +88,7 @@ mediaInitNetwork(Device *dev) char *val; char attach[256]; + w = savescr(); dialog_clear_norefresh(); /* Cheesy slip attach */ snprintf(attach, 256, "slattach -a -h -l -s 9600 %s", dev->devname); @@ -101,6 +103,7 @@ mediaInitNetwork(Device *dev) "ready, press [ENTER] to execute it."); if (!val) { msgConfirm("slattach command was empty. Try again!"); + restorescr(w); return FALSE; } else @@ -113,8 +116,10 @@ mediaInitNetwork(Device *dev) if (vsystem(attach)) { msgConfirm("slattach returned a bad status! Please verify that\n" "the command is correct and try this operation again."); + restorescr(w); return FALSE; } + restorescr(w); } snprintf(ifconfig, 255, "%s%s", VAR_IFCONFIG, dev->name); @@ -196,7 +201,8 @@ startPPP(Device *devp) pid_t pid = 0; char myaddr[16], provider[16], speed[16], authname[32], authkey[16]; char phone[16]; - + WINDOW *w = savescr(); + /* These are needed to make ppp work */ Mkdir("/var/log"); Mkdir("/var/run"); @@ -252,6 +258,7 @@ startPPP(Device *devp) fp = fopen("/dev/stderr", "w"); if (!fp) { msgConfirm("Couldn't open /etc/ppp/ppp.conf file! This isn't going to work"); + restorescr(w); return 0; } authname[0] = '\0'; @@ -293,6 +300,7 @@ startPPP(Device *devp) if (!Fake && !file_readable("/dev/tun0") && mknod("/dev/tun0", 0600 | S_IFCHR, makedev(52, 0))) { msgConfirm("Warning: No /dev/tun0 device. PPP will not work!"); + restorescr(w); return 0; } @@ -339,5 +347,6 @@ startPPP(Device *devp) "DO NOT PRESS [ENTER] HERE UNTIL THE CONNECTION IS FULLY\n" "ESTABLISHED!"); } + restorescr(w); return pid; } diff --git a/release/sysinstall/options.c b/release/sysinstall/options.c index 469841d..6113e12 100644 --- a/release/sysinstall/options.c +++ b/release/sysinstall/options.c @@ -215,7 +215,8 @@ optionsEditor(dialogMenuItem *self) { int i, optcol, optrow, key; static int currOpt = 0; - + WINDOW *w = savescr(); + dialog_clear_norefresh(); clear(); @@ -299,13 +300,14 @@ optionsEditor(dialogMenuItem *self) case 'Q': clear(); dialog_clear(); - return DITEM_SUCCESS | DITEM_RESTORE; + restorescr(w); + return DITEM_SUCCESS; default: beep(); } } /* NOTREACHED */ - return DITEM_SUCCESS | DITEM_RESTORE; + return DITEM_SUCCESS; } diff --git a/release/sysinstall/package.c b/release/sysinstall/package.c index 185956f..e11a2c7 100644 --- a/release/sysinstall/package.c +++ b/release/sysinstall/package.c @@ -74,7 +74,7 @@ package_add(char *name) return index_extract(mediaDevice, &Top, tmp, FALSE); else { msgConfirm("Sorry, package %s was not found in the INDEX.", name); - return DITEM_FAILURE | DITEM_RESTORE; + return DITEM_FAILURE; } } @@ -134,7 +134,7 @@ package_extract(Device *dev, char *name, Boolean depended) vsystem("/sbin/ldconfig -aout /usr/lib/compat/aout /usr/lib/aout /usr/X11R6/lib/aout /usr/local/lib/aout"); /* Be initially optimistic */ - ret = DITEM_SUCCESS | DITEM_RESTORE; + ret = DITEM_SUCCESS; /* Make a couple of paranoid locations for temp files to live if user specified none */ if (!variable_get(VAR_PKG_TMPDIR)) { /* Set it to a location with as much space as possible */ @@ -217,7 +217,7 @@ package_extract(Device *dev, char *name, Boolean depended) refresh(); i = waitpid(pid, &tot, 0); if (sigpipe_caught || i < 0 || WEXITSTATUS(tot)) { - ret = DITEM_FAILURE | DITEM_RESTORE; + ret = DITEM_FAILURE; if (variable_get(VAR_NO_CONFIRM)) msgNotify("Add of package %s aborted, error code %d -\n" "Please check the debug screen for more info.", name, WEXITSTATUS(tot)); @@ -236,14 +236,13 @@ package_extract(Device *dev, char *name, Boolean depended) } } else { - 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); else msgConfirm("Unable to fetch package %s from selected media.\n" "No package add will be done.", name); - ret = DITEM_FAILURE | DITEM_RESTORE; + ret = DITEM_FAILURE; } signal(SIGPIPE, SIG_IGN); return ret; diff --git a/release/sysinstall/pccard.c b/release/sysinstall/pccard.c index 0ea2025..db18ab4 100644 --- a/release/sysinstall/pccard.c +++ b/release/sysinstall/pccard.c @@ -74,7 +74,8 @@ pccardInitialize(void) char *scard_irq; char pccardd_flags[128]; char pccardd_cmd[256]; - + WINDOW *w; + pccard_mode = 1; if (!RunningAsInit && !Fake) { @@ -122,15 +123,16 @@ pccardInitialize(void) } sprintf(card_device, CARD_DEVICE, 0); - - dialog_clear(); - msgConfirm("Now starts initializing PC-card controller and cards.\n" - "If you've executed this installer from PC-card floppy\n" + + w = savescr(); + dialog_clear_norefresh(); + msgConfirm("Now we start initializing PC-card controller and cards.\n" + "If you've executed this installer from a PC-card floppy\n" "drive, this is the last chance to replace it with\n" "installation media (PC-card Ethernet, CDROM, etc.).\n" "Please insert installation media and press [Enter].\n" "If you've not plugged the PC-card installation media\n" - "yet, please plug it now and press [Enter].\n" + "in yet, please plug it in now and press [Enter].\n" "Otherwise, just press [Enter] to proceed."); dialog_clear(); @@ -140,11 +142,13 @@ pccardInitialize(void) if ((fd = open(card_device, O_RDWR)) < 1) { msgNotify("Can't open PC-card controller %s.\n", card_device); + restorescr(w); return; } if (ioctl(fd, PIOCRWMEM, &pcic_mem) < 0){ msgNotify("ioctl %s failed.\n", card_device); + restorescr(w); return; } } @@ -157,6 +161,7 @@ pccardInitialize(void) variable_set2("pccardd_flags", card_irq, 1); vsystem(pccardd_cmd); + restorescr(w); } #endif /* PCCARD */ diff --git a/release/sysinstall/system.c b/release/sysinstall/system.c index 0353fc6..c03d211 100644 --- a/release/sysinstall/system.c +++ b/release/sysinstall/system.c @@ -191,7 +191,9 @@ systemExecute(char *command) { int status; struct termios foo; + WINDOW *w = savescr(); + dialog_clear(); dialog_update(); end_dialog(); DialogActive = FALSE; @@ -206,6 +208,7 @@ systemExecute(char *command) msgDebug("systemExecute: Faked execution of `%s'\n", command); } DialogActive = TRUE; + restorescr(w); return status; } @@ -216,7 +219,8 @@ systemDisplayHelp(char *file) char *fname = NULL; char buf[FILENAME_MAX]; int ret = 0; - + WINDOW *w = savescr(); + fname = systemHelpFile(file, buf); if (!fname) { snprintf(buf, FILENAME_MAX, "The %s file is not provided on this particular floppy image.", file); @@ -230,6 +234,7 @@ systemDisplayHelp(char *file) use_helpline(NULL); dialog_textbox(file, fname, LINES, COLS); } + restorescr(w); return ret; } diff --git a/release/sysinstall/tcpip.c b/release/sysinstall/tcpip.c index 6c07ca5..28273f3 100644 --- a/release/sysinstall/tcpip.c +++ b/release/sysinstall/tcpip.c @@ -479,5 +479,5 @@ tcpMenuSelect(dialogMenuItem *self) if (tmp && tmp->private && !((DevInfo *)tmp->private)->use_dhcp && !msgYesNo("Would you like to bring the %s interface up right now?", tmp->name)) if (!tmp->init(tmp)) msgConfirm("Initialization of %s device failed.", tmp->name); - return DITEM_SUCCESS | DITEM_RESTORE; + return DITEM_SUCCESS; } diff --git a/usr.sbin/sade/config.c b/usr.sbin/sade/config.c index 32d1161..6fa001f 100644 --- a/usr.sbin/sade/config.c +++ b/usr.sbin/sade/config.c @@ -417,7 +417,7 @@ configSaverTimeout(dialogMenuItem *self) { return (variable_get_value(VAR_BLANKTIME, "Enter time-out period in seconds for screen saver", 1) ? - DITEM_SUCCESS : DITEM_FAILURE) | DITEM_RESTORE; + DITEM_SUCCESS : DITEM_FAILURE); } int @@ -436,16 +436,18 @@ configNTP(dialogMenuItem *self) self->data = tmp; dmenuSetVariables(self); } - return status | DITEM_RESTORE; + return status; } int configUsers(dialogMenuItem *self) { + WINDOW *w = savescr(); + dialog_clear_norefresh(); dmenuOpenSimple(&MenuUsermgmt, FALSE); - dialog_clear(); - return DITEM_SUCCESS | DITEM_RESTORE; + restorescr(w); + return DITEM_SUCCESS; } int @@ -498,10 +500,13 @@ configXDesktop(dialogMenuItem *self) { char *desk; int ret = DITEM_SUCCESS; - - if (!dmenuOpenSimple(&MenuXDesktops, FALSE) || - !(desk = variable_get(VAR_DESKSTYLE))) + WINDOW *w = savescr(); + + dialog_clear_norefresh(); + if (!dmenuOpenSimple(&MenuXDesktops, FALSE) || !(desk = variable_get(VAR_DESKSTYLE))) { + restorescr(w); return DITEM_FAILURE; + } if (!strcmp(desk, "kde")) { ret = package_add("kde"); if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("startkde")) @@ -544,6 +549,7 @@ configXDesktop(dialogMenuItem *self) "by this desktop type. Please change installation media\n" "and/or select a different, perhaps simpler, desktop\n" "environment and try again."); + restorescr(w); return ret; } @@ -552,21 +558,27 @@ configXSetup(dialogMenuItem *self) { char *config, *execfile, *style; char *moused; - + WINDOW *w; + setenv("XWINHOME", "/usr/X11R6", 1); tryagain: - dialog_clear_norefresh(); + w = savescr(); variable_unset(VAR_DESKSTYLE); variable_unset(VAR_XF86_CONFIG); - if (!dmenuOpenSimple(&MenuXF86Config, FALSE)) - return DITEM_FAILURE | DITEM_RESTORE; + dialog_clear_norefresh(); + if (!dmenuOpenSimple(&MenuXF86Config, FALSE)) { + restorescr(w); + return DITEM_FAILURE; + } config = variable_get(VAR_XF86_CONFIG); style = variable_get(VAR_DESKSTYLE); if (!config) { if (style) goto config_desktop; - else - return DITEM_FAILURE | DITEM_RESTORE; + else { + restorescr(w); + return DITEM_FAILURE; + } } if (file_readable("/var/run/ld.so.hints")) @@ -577,7 +589,6 @@ tryagain: vsystem("/sbin/ifconfig lo0 127.0.0.1"); execfile = string_concat("/usr/X11R6/bin/", config); if (file_executable(execfile)) { - dialog_clear_norefresh(); moused = variable_get(VAR_MOUSED); while (!moused || strcmp(moused, "YES")) { if (msgYesNo("The X server may access the mouse in two ways: direct access\n" @@ -586,8 +597,8 @@ tryagain: "now? If you intend to let the X server access the mouse\n" "directly, choose \"No\" at this time.")) break; + dialog_clear_norefresh(); dmenuOpenSimple(&MenuMouse, FALSE); - dialog_clear(); moused = variable_get(VAR_MOUSED); } if (moused && !strcmp(moused, "YES")) @@ -595,23 +606,25 @@ tryagain: "Choose \"/dev/sysmouse\" as the mouse port and \"SysMouse\" or\n" "\"MouseSystems\" as the mouse protocol in the X configuration\n" "utility."); - dialog_clear(); systemExecute(execfile); if (!file_readable("/etc/XF86Config")) { if (!msgYesNo("The XFree86 configuration process seems to have\nfailed. Would you like to try again?")) goto tryagain; - else - return DITEM_FAILURE | DITEM_RESTORE; + else { + restorescr(w); + return DITEM_FAILURE; + } } config_desktop: configXDesktop(self); - return DITEM_SUCCESS | DITEM_RESTORE; + restorescr(w); + return DITEM_SUCCESS; } else { - dialog_clear_norefresh(); msgConfirm("The XFree86 setup utility you chose does not appear to be installed!\n" "Please install this before attempting to configure XFree86."); - return DITEM_FAILURE | DITEM_RESTORE; + restorescr(w); + return DITEM_FAILURE; } } @@ -713,7 +726,7 @@ configRouter(dialogMenuItem *self) variable_unset(VAR_ROUTER); } } - return ret | DITEM_RESTORE; + return ret; } /* Shared between us and index_initialize() */ @@ -750,7 +763,6 @@ configPackages(dialogMenuItem *self) } } else { - dialog_clear_norefresh(); msgConfirm("No packages were selected for extraction."); break; } @@ -763,7 +775,7 @@ configPackages(dialogMenuItem *self) tmp = tmp2; } index_init(NULL, &Plist); - return DITEM_SUCCESS | DITEM_RESTORE; + return DITEM_SUCCESS; } /* Load pcnfsd package */ @@ -809,9 +821,9 @@ configNFSServer(dialogMenuItem *self) sprintf(cmd, "%s /etc/exports", variable_get(VAR_EDITOR)); dialog_clear(); systemExecute(cmd); - restorescr(w); } variable_set2(VAR_NFS_SERVER, "YES", 1); + restorescr(w); } else if (variable_get(VAR_NFS_SERVER)) { /* We want to turn it off again? */ vsystem("mv -f /etc/exports /etc/exports.disabled"); diff --git a/usr.sbin/sade/disks.c b/usr.sbin/sade/disks.c index 9c736a8..20a7e90 100644 --- a/usr.sbin/sade/disks.c +++ b/usr.sbin/sade/disks.c @@ -358,7 +358,6 @@ diskPartition(Device *dev) char *val, tmp[20]; int subtype; chunk_e partitiontype; - WINDOW *save = savescr(); strcpy(tmp, "165"); val = msgGetInput(tmp, "New partition type:\n\n" @@ -380,7 +379,6 @@ diskPartition(Device *dev) chunk_info[current_chunk]->type = partitiontype; chunk_info[current_chunk]->subtype = subtype; } - restorescr(save); } break; @@ -504,7 +502,6 @@ diskPartition(Device *dev) if (p) { char buf[FILENAME_MAX]; - dialog_clear_norefresh(); use_helpline("Press F1 to read more about disk slices."); use_helpfile(systemHelpFile("partition", buf)); if (!variable_get(VAR_NO_WARN)) @@ -562,7 +559,7 @@ partitionHook(dialogMenuItem *selected) } else devs[0]->enabled = FALSE; - return DITEM_SUCCESS | DITEM_RESTORE; + return DITEM_SUCCESS; } static int @@ -626,7 +623,7 @@ diskPartitionEditor(dialogMenuItem *self) i = dmenuOpenSimple(menu, FALSE) ? DITEM_SUCCESS : DITEM_FAILURE; free(menu); } - return i | DITEM_RESTORE; + return i; } } return DITEM_SUCCESS; @@ -716,7 +713,6 @@ diskPartitionNonInteractive(Device *dev) } } if (!chunk_info[i]) { - dialog_clear(); msgConfirm("Unable to find any free space on this disk!"); return; } @@ -746,7 +742,6 @@ diskPartitionNonInteractive(Device *dev) } } if (!chunk_info[i]) { - dialog_clear(); msgConfirm("Unable to find %d free blocks on this disk!", sz); return; } @@ -758,13 +753,11 @@ diskPartitionNonInteractive(Device *dev) break; } if (!chunk_info[i]) { - dialog_clear(); msgConfirm("Unable to find any existing FreeBSD partitions on this disk!"); return; } } else { - dialog_clear(); msgConfirm("`%s' is an invalid value for %s - is config file valid?", cp, VAR_PARTITION); return; } diff --git a/usr.sbin/sade/dispatch.c b/usr.sbin/sade/dispatch.c index 3090a27..15c6c27 100644 --- a/usr.sbin/sade/dispatch.c +++ b/usr.sbin/sade/dispatch.c @@ -381,15 +381,13 @@ dispatch_load_file(dialogMenuItem *self) int dispatch_load_floppy(dialogMenuItem *self) { - int what = DITEM_RESTORE | DITEM_SUCCESS; + int what = DITEM_SUCCESS; extern char *distWanted; char *cp; FILE *fp; qelement *list; mediaClose(); - dialog_clear_norefresh(); - cp = variable_get_value(VAR_INSTALL_CFG, "Specify the name of a configuration file\n" "residing on a MSDOS or UFS floppy.", 0); @@ -430,7 +428,6 @@ dispatch_load_floppy(dialogMenuItem *self) what |= DITEM_FAILURE; mediaClose(); } - return what; } diff --git a/usr.sbin/sade/dmenu.c b/usr.sbin/sade/dmenu.c index 9e464d9..6f5f4e5 100644 --- a/usr.sbin/sade/dmenu.c +++ b/usr.sbin/sade/dmenu.c @@ -45,14 +45,13 @@ int dmenuDisplayFile(dialogMenuItem *tmp) { systemDisplayHelp((char *)tmp->data); - return DITEM_SUCCESS | DITEM_RESTORE; + return DITEM_SUCCESS; } int dmenuSubmenu(dialogMenuItem *tmp) { - return (dmenuOpenSimple((DMenu *)(tmp->data), FALSE) ? DITEM_SUCCESS : DITEM_FAILURE) | - DITEM_RESTORE; + return (dmenuOpenSimple((DMenu *)(tmp->data), FALSE) ? DITEM_SUCCESS : DITEM_FAILURE); } int @@ -72,10 +71,13 @@ dmenuSystemCommand(dialogMenuItem *self) int dmenuSystemCommandBox(dialogMenuItem *tmp) { + WINDOW *w = savescr(); + use_helpfile(NULL); use_helpline("Select OK to dismiss this dialog"); dialog_prgbox(tmp->title, (char *)tmp->data, 22, 76, 1, 1); - return DITEM_SUCCESS | DITEM_RESTORE; + restorescr(w); + return DITEM_SUCCESS; } int @@ -147,15 +149,12 @@ int dmenuISetVariable(dialogMenuItem *tmp) { char *ans, *var; - WINDOW *w = NULL; /* Keep lint happy */ if (!(var = (char *)tmp->data)) { msgConfirm("Incorrect data field for `%s'!", tmp->title); return DITEM_FAILURE; } - w = savescr(); ans = msgGetInput(variable_get(var), tmp->title, 1); - restorescr(w); if (!ans) return DITEM_FAILURE; else if (!*ans) @@ -275,13 +274,13 @@ dmenuOpen(DMenu *menu, int *choice, int *scroll, int *curr, int *max, Boolean bu while (1) { char buf[FILENAME_MAX]; + WINDOW *w = savescr(); /* Any helpful hints, put 'em up! */ use_helpline(menu->helpline); use_helpfile(systemHelpFile(menu->helpfile, buf)); - - /* Pop up that dialog! */ dialog_clear_norefresh(); + /* Pop up that dialog! */ 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); @@ -295,14 +294,18 @@ dmenuOpen(DMenu *menu, int *choice, int *scroll, int *curr, int *max, Boolean bu menu_height(menu, n), -n, items, (char *)buttons); else msgFatal("Menu: `%s' is of an unknown type\n", menu->title); - clearok(stdscr, TRUE); if (exited) { exited = FALSE; + restorescr(w); return TRUE; } - else if (rval) + else if (rval) { + restorescr(w); return FALSE; - else if (menu->type & DMENU_SELECTION_RETURNS) + } + else if (menu->type & DMENU_SELECTION_RETURNS) { + restorescr(w); return TRUE; + } } } diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c index 4ff5cb2..9271b8b 100644 --- a/usr.sbin/sade/install.c +++ b/usr.sbin/sade/install.c @@ -205,7 +205,7 @@ installInitial(void) "then WE STRONGLY ENCOURAGE YOU TO MAKE PROPER BACKUPS before\n" "proceeding!\n\n" "We can take no responsibility for lost disk contents!") != 0) - return DITEM_FAILURE | DITEM_RESTORE; + return DITEM_FAILURE; if (DITEM_STATUS(diskLabelCommit(NULL)) != DITEM_SUCCESS) { msgConfirm("Couldn't make filesystems properly. Aborting."); @@ -440,6 +440,7 @@ installExpress(dialogMenuItem *self) { int i; + dialog_clear_norefresh(); variable_set2(SYSTEM_STATE, "express", 0); #ifndef __alpha__ if (DITEM_STATUS((i = diskPartitionEditor(self))) == DITEM_FAILURE) @@ -449,13 +450,12 @@ installExpress(dialogMenuItem *self) if (DITEM_STATUS((i = diskLabelEditor(self))) == DITEM_FAILURE) return i; - dialog_clear_norefresh(); if (DITEM_STATUS((i = installCommit(self))) == DITEM_SUCCESS) { i |= DITEM_LEAVE_MENU; /* Give user the option of one last configuration spree */ installConfigure(); } - return i | DITEM_RESTORE; + return i; } /* Novice mode installation */ @@ -466,8 +466,8 @@ installNovice(dialogMenuItem *self) Device **devs; variable_set2(SYSTEM_STATE, "novice", 0); -#ifndef __alpha__ dialog_clear_norefresh(); +#ifndef __alpha__ 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 (overwriting anything else that might be on the disk(s) selected)\n" @@ -487,7 +487,6 @@ nodisks: } #endif - dialog_clear_norefresh(); #ifdef __alpha__ msgConfirm("First, you need to create BSD partitions on the disk which you are\n" "installing to. If you have a reasonable amount of disk space (200MB or more)\n" @@ -507,15 +506,13 @@ nodisks: if (DITEM_STATUS(diskLabelEditor(self)) == DITEM_FAILURE) return DITEM_FAILURE; - dialog_clear_norefresh(); if (DITEM_STATUS((i = installCommit(self))) == DITEM_FAILURE) { - dialog_clear_norefresh(); msgConfirm("Installation completed with some errors. You may wish to\n" "scroll through the debugging messages on VTY1 with the\n" "scroll-lock feature. You can also chose \"No\" at the next\n" "prompt and go back into the installation menus to try and retry\n" "whichever operations have failed."); - return i | DITEM_RESTORE; + return i; } else { @@ -529,108 +526,72 @@ nodisks: } if (mediaDevice->type != DEVICE_TYPE_FTP && mediaDevice->type != DEVICE_TYPE_NFS) { if (!msgYesNo("Would you like to configure any Ethernet or SLIP/PPP network devices?")) { - Device *tmp; + Device *tmp = tcpDeviceSelect(); - dialog_clear_norefresh(); - tmp = tcpDeviceSelect(); - dialog_clear_norefresh(); if (tmp && !((DevInfo *)tmp->private)->use_dhcp && !msgYesNo("Would you like to bring the %s interface up right now?", tmp->name)) if (!tmp->init(tmp)) msgConfirm("Initialization of %s device failed.", tmp->name); } } - dialog_clear_norefresh(); if (!msgYesNo("Will this machine be an IP gateway (e.g. will it forward packets\n" "between interfaces)?")) variable_set2("gateway_enable", "YES", 1); - dialog_clear_norefresh(); if (!msgYesNo("Do you want to allow anonymous FTP connections to this machine?")) configAnonFTP(self); - dialog_clear_norefresh(); if (!msgYesNo("Do you want to configure this machine as an NFS server?")) configNFSServer(self); - dialog_clear_norefresh(); if (!msgYesNo("Do you want to configure this machine as an NFS client?")) variable_set2("nfs_client_enable", "YES", 1); - dialog_clear_norefresh(); - if (!msgYesNo("Would you like to customize your system console settings?")) { - WINDOW *w = savescr(); - + if (!msgYesNo("Would you like to customize your system console settings?")) dmenuOpenSimple(&MenuSyscons, FALSE); - restorescr(w); - } - - dialog_clear_norefresh(); - if (!msgYesNo("Would you like to set this machine's time zone now?")) { - WINDOW *w = savescr(); - dialog_clear(); + if (!msgYesNo("Would you like to set this machine's time zone now?")) systemExecute("tzsetup"); - restorescr(w); - } #ifdef __i386__ - dialog_clear_norefresh(); if (!msgYesNo("Would you like to enable Linux binary compatibility?")) (void)configLinux(self); #endif - dialog_clear_norefresh(); - if (!msgYesNo("Does this system have a mouse attached to it?")) { - WINDOW *w = savescr(); - + if (!msgYesNo("Does this system have a mouse attached to it?")) dmenuOpenSimple(&MenuMouse, FALSE); - restorescr(w); - } /* Now would be a good time to checkpoint the configuration data */ configRC_conf(); sync(); if (directory_exists("/usr/X11R6")) { - dialog_clear_norefresh(); if (!msgYesNo("Would you like to configure your X server at this time?")) (void)configXSetup(self); } - dialog_clear_norefresh(); if (!msgYesNo("The FreeBSD package collection is a collection of hundreds of ready-to-run\n" "applications, from text editors to games to WEB servers and more. Would you\n" "like to browse the collection now?")) { - dialog_clear(); (void)configPackages(self); } - dialog_clear_norefresh(); if (!msgYesNo("Would you like to add any initial user accounts to the system?\n" "Adding at least one account for yourself at this stage is suggested\n" "since working as the \"root\" user is dangerous (it is easy to do\n" "things which adversely affect the entire system).")) (void)configUsers(self); - dialog_clear_norefresh(); msgConfirm("Now you must set the system manager's password.\n" "This is the password you'll use to log in as \"root\"."); - { - WINDOW *w = savescr(); - - if (!systemExecute("passwd root")) - variable_set2("root_password", "YES", 0); - restorescr(w); - } + if (!systemExecute("passwd root")) + variable_set2("root_password", "YES", 0); /* XXX Put whatever other nice configuration questions you'd like to ask the user here XXX */ /* Give user the option of one last configuration spree */ - dialog_clear_norefresh(); installConfigure(); - - return DITEM_LEAVE_MENU | DITEM_RESTORE; + return DITEM_LEAVE_MENU; } /* The version of commit we call from the Install Custom menu */ @@ -639,7 +600,6 @@ installCustomCommit(dialogMenuItem *self) { int i; - dialog_clear_norefresh(); i = installCommit(self); if (DITEM_STATUS(i) == DITEM_SUCCESS) { /* Give user the option of one last configuration spree */ @@ -667,15 +627,16 @@ installCommit(dialogMenuItem *self) int i; char *str; + dialog_clear_norefresh(); if (!Dists) distConfig(NULL); if (!Dists) if (!dmenuOpenSimple(&MenuDistributions, FALSE) && !Dists) - return DITEM_FAILURE | DITEM_RESTORE; + return DITEM_FAILURE; if (!mediaVerify()) - return DITEM_FAILURE | DITEM_RESTORE; + return DITEM_FAILURE; str = variable_get(SYSTEM_STATE); if (isDebug()) @@ -691,12 +652,12 @@ try_media: "adjust your media configuration and try again?")) { mediaDevice = NULL; if (!mediaVerify()) - return DITEM_FAILURE | DITEM_RESTORE; + return DITEM_FAILURE; else goto try_media; } else - return DITEM_FAILURE | DITEM_RESTORE; + return DITEM_FAILURE; } /* Now go get it all */ @@ -707,21 +668,16 @@ try_media: variable_set2(SYSTEM_STATE, DITEM_STATUS(i) == DITEM_FAILURE ? "error-install" : "full-install", 0); - return i | DITEM_RESTORE; + return i; } static void installConfigure(void) { /* Final menu of last resort */ - dialog_clear_norefresh(); if (!msgYesNo("Visit the general configuration menu for a chance to set\n" - "any last options?")) { - WINDOW *w = savescr(); - + "any last options?")) dmenuOpenSimple(&MenuConfigure, FALSE); - restorescr(w); - } configRC_conf(); sync(); } diff --git a/usr.sbin/sade/label.c b/usr.sbin/sade/label.c index ea9d9e7..340d7d9 100644 --- a/usr.sbin/sade/label.c +++ b/usr.sbin/sade/label.c @@ -111,7 +111,7 @@ labelHook(dialogMenuItem *selected) } else devs[0]->enabled = FALSE; - return DITEM_SUCCESS | DITEM_RESTORE; + return DITEM_SUCCESS; } static int @@ -171,7 +171,6 @@ diskLabelEditor(dialogMenuItem *self) i = dmenuOpenSimple(menu, FALSE) ? DITEM_SUCCESS : DITEM_FAILURE; free(menu); } - i |= DITEM_RESTORE; } } if (DITEM_STATUS(i) != DITEM_FAILURE) { @@ -384,13 +383,14 @@ get_partition_type(void) { char selection[20]; int i; - static unsigned char *fs_types[] = { "FS", "A file system", "Swap", "A swap partition.", }; + WINDOW *w = savescr(); + DialogX = 7; DialogY = 8; i = dialog_menu("Please choose a partition type", @@ -398,6 +398,7 @@ get_partition_type(void) "If you want to put a filesystem on it, choose FS.", -1, -1, 2, 2, fs_types, selection, NULL, NULL); DialogX = DialogY = 0; + restorescr(w); if (!i) { if (!strcmp(selection, "FS")) return PART_FILESYSTEM; @@ -693,6 +694,7 @@ diskLabel(Device *dev) #ifdef __alpha__ int i; #endif + WINDOW *w = savescr(); label_focus = 0; pslice_focus = 0; @@ -701,6 +703,7 @@ diskLabel(Device *dev) devs = deviceFind(NULL, DEVICE_TYPE_DISK); if (!devs) { msgConfirm("No disks found!"); + restorescr(w); return DITEM_FAILURE; } labeling = TRUE; @@ -1174,7 +1177,8 @@ diskLabel(Device *dev) else label_focus = here; } - return DITEM_SUCCESS | DITEM_RESTORE; + restorescr(w); + return DITEM_SUCCESS; } static int @@ -1187,12 +1191,10 @@ diskLabelNonInteractive(Device *dev) int i, status; Device **devs; Disk *d; - + status = DITEM_SUCCESS; - cp = variable_get(VAR_DISK); if (!cp) { - dialog_clear(); msgConfirm("diskLabel: No disk selected - can't label automatically."); return DITEM_FAILURE; } @@ -1277,7 +1279,6 @@ diskLabelNonInteractive(Device *dev) do_newfs[0] = '\0'; if (sscanf(cp, "%s %s", mpoint, do_newfs) != 2) { - dialog_clear(); msgConfirm("For slice entry %s, got an invalid detail entry of: %s", c1->name, cp); status = DITEM_FAILURE; continue; diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c index c17b9c5..0cc8c0c 100644 --- a/usr.sbin/sade/menus.c +++ b/usr.sbin/sade/menus.c @@ -61,6 +61,22 @@ clearSrc(dialogMenuItem *self) } static int +setDES(dialogMenuItem *self) +{ + Dists |= DIST_DES; + DESDists = DIST_DES_ALL; + return DITEM_SUCCESS | DITEM_REDRAW; +} + +static int +clearDES(dialogMenuItem *self) +{ + Dists &= ~DIST_DES; + DESDists = 0; + return DITEM_SUCCESS | DITEM_REDRAW; +} + +static int setX11All(dialogMenuItem *self) { XF86Dists = DIST_XF86_ALL; @@ -227,78 +243,78 @@ DMenu MenuIndex = { "Leave the index page by selecting Cancel [TAB-ENTER].", "Use PageUp or PageDown to move through this menu faster!", NULL, - { { "Anon FTP", "Configure anonymous FTP logins.", dmenuVarCheck, configAnonFTP, NULL, "anon_ftp" }, - { "Commit", "Commit any pending actions (dangerous!)", NULL, installCustomCommit }, - { "Console settings", "Customize system console behavior.", NULL, dmenuSubmenu, NULL, &MenuSyscons }, - { "Configure", "The system configuration menu.", NULL, dmenuSubmenu, NULL, &MenuConfigure }, - { "Defaults, Load", "Load default settings.", NULL, dispatch_load_floppy }, - { "Device, Mouse", "The mouse configuration menu.", NULL, dmenuSubmenu, NULL, &MenuMouse }, - { "Disklabel", "The disk Label editor", NULL, diskLabelEditor }, - { "Dists, All", "Root of the distribution tree.", NULL, dmenuSubmenu, NULL, &MenuDistributions }, - { "Dists, Basic", "Basic FreeBSD distribution menu.", NULL, dmenuSubmenu, NULL, &MenuSubDistributions }, - { "Dists, DES", "DES distribution menu.", NULL, dmenuSubmenu, NULL, &MenuDESDistributions }, - { "Dists, Developer", "Select developer's distribution.", checkDistDeveloper, distSetDeveloper }, - { "Dists, Src", "Src distribution menu.", NULL, dmenuSubmenu, NULL, &MenuSrcDistributions }, - { "Dists, X Developer", "Select X developer's distribution.", checkDistXDeveloper, distSetXDeveloper }, - { "Dists, Kern Developer", "Select kernel developer's distribution.", checkDistKernDeveloper, distSetKernDeveloper }, - { "Dists, User", "Select average user distribution.", checkDistUser, distSetUser }, - { "Dists, X User", "Select average X user distribution.", checkDistXUser, distSetXUser }, - { "Distributions, Adding", "Installing additional distribution sets", NULL, distExtractAll }, - { "Distributions, XFree86","XFree86 distribution menu.", NULL, distSetXF86 }, - { "Documentation", "Installation instructions, README, etc.", NULL, dmenuSubmenu, NULL, &MenuDocumentation }, - { "Doc, README", "The distribution README file.", NULL, dmenuDisplayFile, NULL, "README" }, - { "Doc, Hardware", "The distribution hardware guide.", NULL, dmenuDisplayFile, NULL, "HARDWARE" }, - { "Doc, Install", "The distribution installation guide.", NULL, dmenuDisplayFile, NULL, "INSTALL" }, - { "Doc, Copyright", "The distribution copyright notices.", NULL, dmenuDisplayFile, NULL, "COPYRIGHT" }, - { "Doc, Release", "The distribution release notes.", NULL, dmenuDisplayFile, NULL, "RELNOTES" }, - { "Doc, HTML", "The HTML documentation menu.", NULL, docBrowser }, - { "Dump Vars", "(debugging) dump out internal variables.", NULL, dump_variables }, - { "Emergency shell", "Start an Emergency Holographic shell.", NULL, installFixitHoloShell }, + { { " Anon FTP", "Configure anonymous FTP logins.", dmenuVarCheck, configAnonFTP, NULL, "anon_ftp" }, + { " Commit", "Commit any pending actions (dangerous!)", NULL, installCustomCommit }, + { " Console settings", "Customize system console behavior.", NULL, dmenuSubmenu, NULL, &MenuSyscons }, + { " Configure", "The system configuration menu.", NULL, dmenuSubmenu, NULL, &MenuConfigure }, + { " Defaults, Load", "Load default settings.", NULL, dispatch_load_floppy }, + { " Device, Mouse", "The mouse configuration menu.", NULL, dmenuSubmenu, NULL, &MenuMouse }, + { " Disklabel", "The disk Label editor", NULL, diskLabelEditor }, + { " Dists, All", "Root of the distribution tree.", NULL, dmenuSubmenu, NULL, &MenuDistributions }, + { " Dists, Basic", "Basic FreeBSD distribution menu.", NULL, dmenuSubmenu, NULL, &MenuSubDistributions }, + { " Dists, DES", "DES distribution menu.", NULL, dmenuSubmenu, NULL, &MenuDESDistributions }, + { " Dists, Developer", "Select developer's distribution.", checkDistDeveloper, distSetDeveloper }, + { " Dists, Src", "Src distribution menu.", NULL, dmenuSubmenu, NULL, &MenuSrcDistributions }, + { " Dists, X Developer", "Select X developer's distribution.", checkDistXDeveloper, distSetXDeveloper }, + { " Dists, Kern Developer", "Select kernel developer's distribution.", checkDistKernDeveloper, distSetKernDeveloper }, + { " Dists, User", "Select average user distribution.", checkDistUser, distSetUser }, + { " Dists, X User", "Select average X user distribution.", checkDistXUser, distSetXUser }, + { " Distributions, Adding", "Installing additional distribution sets", NULL, distExtractAll }, + { " Distributions, XFree86","XFree86 distribution menu.", NULL, distSetXF86 }, + { " Documentation", "Installation instructions, README, etc.", NULL, dmenuSubmenu, NULL, &MenuDocumentation }, + { " Doc, README", "The distribution README file.", NULL, dmenuDisplayFile, NULL, "README" }, + { " Doc, Hardware", "The distribution hardware guide.", NULL, dmenuDisplayFile, NULL, "HARDWARE" }, + { " Doc, Install", "The distribution installation guide.", NULL, dmenuDisplayFile, NULL, "INSTALL" }, + { " Doc, Copyright", "The distribution copyright notices.", NULL, dmenuDisplayFile, NULL, "COPYRIGHT" }, + { " Doc, Release", "The distribution release notes.", NULL, dmenuDisplayFile, NULL, "RELNOTES" }, + { " Doc, HTML", "The HTML documentation menu.", NULL, docBrowser }, + { " Dump Vars", "(debugging) dump out internal variables.", NULL, dump_variables }, + { " Emergency shell", "Start an Emergency Holographic shell.", NULL, installFixitHoloShell }, #ifdef __i386__ - { "Fdisk", "The disk Partition Editor", NULL, diskPartitionEditor }, + { " Fdisk", "The disk Partition Editor", NULL, diskPartitionEditor }, #endif - { "Fixit", "Repair mode with CDROM or fixit floppy.", NULL, dmenuSubmenu, NULL, &MenuFixit }, - { "FTP sites", "The FTP mirror site listing.", NULL, dmenuSubmenu, NULL, &MenuMediaFTP }, - { "Gateway", "Set flag to route packets between interfaces.", dmenuVarCheck, dmenuToggleVariable, NULL, "gateway=YES" }, - { "HTML Docs", "The HTML documentation menu", NULL, docBrowser }, - { "Install, Novice", "A novice system installation.", NULL, installNovice }, - { "Install, Express", "An express system installation.", NULL, installExpress }, - { "Install, Custom", "The custom installation menu", NULL, dmenuSubmenu, NULL, &MenuInstallCustom }, - { "Label", "The disk Label editor", NULL, diskLabelEditor }, - { "Media", "Top level media selection menu.", NULL, dmenuSubmenu, NULL, &MenuMedia }, - { "Media, Tape", "Select tape installation media.", NULL, mediaSetTape }, - { "Media, NFS", "Select NFS installation media.", NULL, mediaSetNFS }, - { "Media, Floppy", "Select floppy installation media.", NULL, mediaSetFloppy }, - { "Media, CDROM", "Select CDROM installation media.", NULL, mediaSetCDROM }, - { "Media, DOS", "Select DOS installation media.", NULL, mediaSetDOS }, - { "Media, UFS", "Select UFS installation media.", NULL, mediaSetUFS }, - { "Media, FTP", "Select FTP installation media.", NULL, mediaSetFTP }, - { "Media, FTP Passive", "Select passive FTP installation media.", NULL, mediaSetFTPPassive }, - { "Network Interfaces", "Configure network interfaces", NULL, tcpMenuSelect }, - { "Networking Services", "The network services menu.", NULL, dmenuSubmenu, NULL, &MenuNetworking }, - { "NFS, client", "Set NFS client flag.", dmenuVarCheck, dmenuToggleVariable, NULL, "nfs_client_enable=YES" }, - { "NFS, server", "Set NFS server flag.", dmenuVarCheck, configNFSServer, NULL, "nfs_server_enable=YES" }, - { "NTP Menu", "The NTP configuration menu.", NULL, dmenuSubmenu, NULL, &MenuNTP }, - { "Options", "The options editor.", NULL, optionsEditor }, - { "Packages", "The packages collection", NULL, configPackages }, - { "Partition", "The disk Slice (PC-style partition) Editor", NULL, diskPartitionEditor }, - { "PCNFSD", "Run authentication server for PC-NFS.", dmenuVarCheck, configPCNFSD, NULL, "pcnfsd" }, - { "Root Password", "Set the system manager's password.", NULL, dmenuSystemCommand, NULL, "passwd root" }, - { "Router", "Select routing daemon (default: routed)", NULL, configRouter, NULL, "router" }, - { "Syscons", "The system console configuration menu.", NULL, dmenuSubmenu, NULL, &MenuSyscons }, - { "Syscons, Font", "The console screen font.", NULL, dmenuSubmenu, NULL, &MenuSysconsFont }, - { "Syscons, Keymap", "The console keymap configuration menu.", NULL, dmenuSubmenu, NULL, &MenuSysconsKeymap }, - { "Syscons, Keyrate", "The console key rate configuration menu.", NULL, dmenuSubmenu, NULL, &MenuSysconsKeyrate }, - { "Syscons, Saver", "The console screen saver configuration menu.", NULL, dmenuSubmenu, NULL, &MenuSysconsSaver }, - { "Syscons, Screenmap", "The console screenmap configuration menu.", NULL, dmenuSubmenu, NULL, &MenuSysconsScrnmap }, - { "Time Zone", "Set the system's time zone.", NULL, dmenuSystemCommand, NULL, "tzsetup" }, - { "Upgrade", "Upgrade an existing system.", NULL, installUpgrade }, - { "Usage", "Quick start - How to use this menu system.", NULL, dmenuDisplayFile, NULL, "usage" }, - { "User Management", "Add user and group information.", NULL, dmenuSubmenu, NULL, &MenuUsermgmt }, - { "XFree86, Fonts", "XFree86 Font selection menu.", NULL, dmenuSubmenu, NULL, &MenuXF86SelectFonts }, - { "XFree86, Server", "XFree86 Server selection menu.", NULL, dmenuSubmenu, NULL, &MenuXF86SelectServer }, + { " Fixit", "Repair mode with CDROM or fixit floppy.", NULL, dmenuSubmenu, NULL, &MenuFixit }, + { " FTP sites", "The FTP mirror site listing.", NULL, dmenuSubmenu, NULL, &MenuMediaFTP }, + { " Gateway", "Set flag to route packets between interfaces.", dmenuVarCheck, dmenuToggleVariable, NULL, "gateway=YES" }, + { " HTML Docs", "The HTML documentation menu", NULL, docBrowser }, + { " Install, Novice", "A novice system installation.", NULL, installNovice }, + { " Install, Express", "An express system installation.", NULL, installExpress }, + { " Install, Custom", "The custom installation menu", NULL, dmenuSubmenu, NULL, &MenuInstallCustom }, + { " Label", "The disk Label editor", NULL, diskLabelEditor }, + { " Media", "Top level media selection menu.", NULL, dmenuSubmenu, NULL, &MenuMedia }, + { " Media, Tape", "Select tape installation media.", NULL, mediaSetTape }, + { " Media, NFS", "Select NFS installation media.", NULL, mediaSetNFS }, + { " Media, Floppy", "Select floppy installation media.", NULL, mediaSetFloppy }, + { " Media, CDROM", "Select CDROM installation media.", NULL, mediaSetCDROM }, + { " Media, DOS", "Select DOS installation media.", NULL, mediaSetDOS }, + { " Media, UFS", "Select UFS installation media.", NULL, mediaSetUFS }, + { " Media, FTP", "Select FTP installation media.", NULL, mediaSetFTP }, + { " Media, FTP Passive", "Select passive FTP installation media.", NULL, mediaSetFTPPassive }, + { " Network Interfaces", "Configure network interfaces", NULL, tcpMenuSelect }, + { " Networking Services", "The network services menu.", NULL, dmenuSubmenu, NULL, &MenuNetworking }, + { " NFS, client", "Set NFS client flag.", dmenuVarCheck, dmenuToggleVariable, NULL, "nfs_client_enable=YES" }, + { " NFS, server", "Set NFS server flag.", dmenuVarCheck, configNFSServer, NULL, "nfs_server_enable=YES" }, + { " NTP Menu", "The NTP configuration menu.", NULL, dmenuSubmenu, NULL, &MenuNTP }, + { " Options", "The options editor.", NULL, optionsEditor }, + { " Packages", "The packages collection", NULL, configPackages }, + { " Partition", "The disk Slice (PC-style partition) Editor", NULL, diskPartitionEditor }, + { " PCNFSD", "Run authentication server for PC-NFS.", dmenuVarCheck, configPCNFSD, NULL, "pcnfsd" }, + { " Root Password", "Set the system manager's password.", NULL, dmenuSystemCommand, NULL, "passwd root" }, + { " Router", "Select routing daemon (default: routed)", NULL, configRouter, NULL, "router" }, + { " Syscons", "The system console configuration menu.", NULL, dmenuSubmenu, NULL, &MenuSyscons }, + { " Syscons, Font", "The console screen font.", NULL, dmenuSubmenu, NULL, &MenuSysconsFont }, + { " Syscons, Keymap", "The console keymap configuration menu.", NULL, dmenuSubmenu, NULL, &MenuSysconsKeymap }, + { " Syscons, Keyrate", "The console key rate configuration menu.", NULL, dmenuSubmenu, NULL, &MenuSysconsKeyrate }, + { " Syscons, Saver", "The console screen saver configuration menu.", NULL, dmenuSubmenu, NULL, &MenuSysconsSaver }, + { " Syscons, Screenmap", "The console screenmap configuration menu.", NULL, dmenuSubmenu, NULL, &MenuSysconsScrnmap }, + { " Time Zone", "Set the system's time zone.", NULL, dmenuSystemCommand, NULL, "tzsetup" }, + { " Upgrade", "Upgrade an existing system.", NULL, installUpgrade }, + { " Usage", "Quick start - How to use this menu system.", NULL, dmenuDisplayFile, NULL, "usage" }, + { " User Management", "Add user and group information.", NULL, dmenuSubmenu, NULL, &MenuUsermgmt }, + { " XFree86, Fonts", "XFree86 Font selection menu.", NULL, dmenuSubmenu, NULL, &MenuXF86SelectFonts }, + { " XFree86, Server", "XFree86 Server selection menu.", NULL, dmenuSubmenu, NULL, &MenuXF86SelectServer }, #ifdef __i386__ - { "XFree86, PC98 Server", "XFree86 PC98 Server selection menu.", NULL, dmenuSubmenu, NULL, &MenuXF86SelectPC98Server }, + { " XFree86, PC98 Server", "XFree86 PC98 Server selection menu.", NULL, dmenuSubmenu, NULL, &MenuXF86SelectPC98Server }, #endif { NULL } }, }; @@ -314,19 +330,19 @@ DMenu MenuInitial = { "Press F1 for Installation Guide", /* help line */ "install", /* help file */ { { "Select" }, - { "Exit Install", NULL, NULL, dmenuExit }, - { "1 Usage", "Quick start - How to use this menu system", NULL, dmenuDisplayFile, NULL, "usage" }, - { "2 Novice", "Begin a novice installation (for beginners)", NULL, installNovice }, - { "3 Express", "Begin a quick installation (for the impatient)", NULL, installExpress }, - { "4 Custom", "Begin a custom installation (for experts)", NULL, dmenuSubmenu, NULL, &MenuInstallCustom }, - { "5 Configure", "Do post-install configuration of FreeBSD", NULL, dmenuSubmenu, NULL, &MenuConfigure }, - { "D Doc", "Installation instructions, README, etc.", NULL, dmenuSubmenu, NULL, &MenuDocumentation }, - { "K Keymap", "Select keyboard type", NULL, dmenuSubmenu, NULL, &MenuSysconsKeymap }, - { "O Options", "View/Set various installation options", NULL, optionsEditor }, - { "F Fixit", "Enter repair mode with CDROM/floppy or start shell", NULL, dmenuSubmenu, NULL, &MenuFixit }, - { "U Upgrade", "Upgrade an existing system", NULL, installUpgrade }, - { "L Load Config","Load default install configuration", NULL, dispatch_load_floppy }, - { "I Index", "Glossary of functions", NULL, dmenuSubmenu, NULL, &MenuIndex }, + { "X Exit Install", NULL, NULL, dmenuExit }, + { "? Usage", "Quick start - How to use this menu system", NULL, dmenuDisplayFile, NULL, "usage" }, + { "Novice", "Begin a novice installation (for beginners)", NULL, installNovice }, + { "Express", "Begin a quick installation (for the impatient)", NULL, installExpress }, + { " Custom", "Begin a custom installation (for experts)", NULL, dmenuSubmenu, NULL, &MenuInstallCustom }, + { "Configure", "Do post-install configuration of FreeBSD", NULL, dmenuSubmenu, NULL, &MenuConfigure }, + { "Doc", "Installation instructions, README, etc.", NULL, dmenuSubmenu, NULL, &MenuDocumentation }, + { "Keymap", "Select keyboard type", NULL, dmenuSubmenu, NULL, &MenuSysconsKeymap }, + { "Options", "View/Set various installation options", NULL, optionsEditor }, + { "Fixit", "Enter repair mode with CDROM/floppy or start shell", NULL, dmenuSubmenu, NULL, &MenuFixit }, + { "Upgrade", "Upgrade an existing system", NULL, installUpgrade }, + { "Load Config","Load default install configuration", NULL, dispatch_load_floppy }, + { "Index", "Glossary of functions", NULL, dmenuSubmenu, NULL, &MenuIndex }, { NULL } }, }; @@ -348,7 +364,7 @@ DMenu MenuDocumentation = { { "5 Release" ,"The release notes for this version of FreeBSD.", NULL, dmenuDisplayFile, NULL, "RELNOTES" }, { "6 Shortcuts", "Creating shortcuts to sysinstall.", NULL, dmenuDisplayFile, NULL, "shortcuts" }, { "7 HTML Docs", "Go to the HTML documentation menu (post-install).", NULL, docBrowser }, - { "0 Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, + { "X Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, { NULL } }, }; @@ -363,25 +379,25 @@ DMenu MenuMouseType = { "the mouse has a wheel, it may be compatible with \"IntelliMouse\".", NULL, NULL, - { { "Auto", "Bus mouse, PS/2 style mouse or PnP serial mouse", + { { "1 Auto", "Bus mouse, PS/2 style mouse or PnP serial mouse", dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_TYPE "=auto" }, - { "GlidePoint", "ALPS GlidePoint pad (serial)", + { "2 GlidePoint", "ALPS GlidePoint pad (serial)", dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_TYPE "=glidepoint" }, - { "Hitachi","Hitachi tablet (serial)", + { "3 Hitachi","Hitachi tablet (serial)", dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_TYPE "=mmhittab" }, - { "IntelliMouse", "Microsoft IntelliMouse (serial)", + { "4 IntelliMouse", "Microsoft IntelliMouse (serial)", dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_TYPE "=intellimouse" }, - { "Logitech", "Logitech protocol (old models) (serial)", + { "5 Logitech", "Logitech protocol (old models) (serial)", dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_TYPE "=logitech" }, - { "Microsoft", "Microsoft protocol (serial)", + { "6 Microsoft", "Microsoft protocol (serial)", dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_TYPE "=microsoft" }, - { "MM Series","MM Series protocol (serial)", + { "7 MM Series","MM Series protocol (serial)", dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_TYPE "=mmseries" }, - { "MouseMan", "Logitech MouseMan/TrackMan models (serial)", + { "8 MouseMan", "Logitech MouseMan/TrackMan models (serial)", dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_TYPE "=mouseman" }, - { "MouseSystems", "MouseSystems protocol (serial)", + { "9 MouseSystems", "MouseSystems protocol (serial)", dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_TYPE "=mousesystems" }, - { "ThinkingMouse","Kensington ThinkingMouse (serial)", + { "A ThinkingMouse","Kensington ThinkingMouse (serial)", dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_TYPE "=thinkingmouse" }, { NULL } }, }; @@ -393,17 +409,17 @@ DMenu MenuMousePort = { "a PS/2 style device.", NULL, NULL, - { { "COM1", "Serial mouse on COM1 (/dev/cuaa0)", + { { "1 COM1", "Serial mouse on COM1 (/dev/cuaa0)", dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/cuaa0" }, - { "COM2", "Serial mouse on COM2 (/dev/cuaa1)", + { "2 COM2", "Serial mouse on COM2 (/dev/cuaa1)", dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/cuaa1" }, - { "COM3", "Serial mouse on COM3 (/dev/cuaa2)", + { "3 COM3", "Serial mouse on COM3 (/dev/cuaa2)", dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/cuaa2" }, - { "COM4", "Serial mouse on COM4 (/dev/cuaa3)", + { "4 COM4", "Serial mouse on COM4 (/dev/cuaa3)", dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/cuaa3" }, - { "BusMouse", "Logitech, ATI or MS bus mouse (/dev/mse0)", + { "5 BusMouse", "Logitech, ATI or MS bus mouse (/dev/mse0)", dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/mse0" }, - { "PS/2", "PS/2 style mouse (/dev/psm0)", + { "6 PS/2", "PS/2 style mouse (/dev/psm0)", dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/psm0" }, { NULL } }, }; @@ -425,7 +441,7 @@ DMenu MenuMouse = { { "2 Port", "Select mouse port", NULL, dmenuSubmenu, NULL, &MenuMousePort }, { "3 Enable", "Test and run the mouse daemon", NULL, mousedTest, NULL, NULL }, { "4 Disable", "Disable the mouse daemon", NULL, mousedDisable, NULL, NULL }, - { "0 Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, + { "X Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, { NULL } }, }; @@ -474,17 +490,17 @@ DMenu MenuXDesktops = { "you can choose any one of the following desktops as alternatives.", NULL, NULL, - { { "KDE", "The K Desktop Environment.", + { { "1 KDE", "The K Desktop Environment.", NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=kde" }, - { "GNOME + Afterstep", "GNOME + Afterstep window manager.", + { "2 GNOME + Afterstep", "GNOME + Afterstep window manager.", NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=gnome" }, - { "GNOME + Enlightenment","GNOME + The E window manager", + { "3 GNOME + Enlightenment","GNOME + The E window manager", NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=enlightenment" }, - { "Afterstep", "The Afterstep window manager", + { "4 Afterstep", "The Afterstep window manager", NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=afterstep" }, - { "Windowmaker", "The Windowmaker window manager", + { "5 Windowmaker", "The Windowmaker window manager", NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=windowmaker" }, - { "fvwm2", "The fvwm2 window manager", + { "6 fvwm2", "The fvwm2 window manager", NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=fvwm" }, { NULL } }, }; @@ -540,167 +556,167 @@ DMenu MenuMediaFTP = { VAR_FTP_PATH _AS("=ftp://ftp.freebsd.org/pub/FreeBSD/releases/") }, { "URL", "Specify some other ftp site by URL", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH "=other" }, - { "4.0 SNAP Server", "current.freebsd.org", NULL, dmenuSetVariable, NULL, + { " 4.0 SNAP Server", "current.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AS("=ftp://current.freebsd.org/pub/FreeBSD/snapshots/") }, - { "3.0 SNAP Server", "releng3.freebsd.org", NULL, dmenuSetVariable, NULL, + { " 3.0 SNAP Server", "releng3.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AS("=ftp://releng3.freebsd.org/pub/FreeBSD/snapshots/") }, { "Argentina", "ftp.ar.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.ar.freebsd.org") }, - { "Australia", "ftp.au.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Australia", "ftp.au.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.au.freebsd.org") }, - { "Australia #2", "ftp2.au.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Australia #2","ftp2.au.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp2.au.freebsd.org") }, - { "Australia #3", "ftp3.au.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Australia #3","ftp3.au.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp3.au.freebsd.org") }, - { "Australia #4", "ftp4.au.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Australia #4","ftp4.au.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp4.au.freebsd.org") }, - { "Australia #5", "ftp5.au.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Australia #5","ftp5.au.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp5.au.freebsd.org") }, { "Brazil", "ftp.br.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.br.freebsd.org") }, - { "Brazil #2", "ftp2.br.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Brazil #2", "ftp2.br.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp2.br.freebsd.org") }, - { "Brazil #3", "ftp3.br.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Brazil #3", "ftp3.br.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp3.br.freebsd.org") }, - { "Brazil #4", "ftp4.br.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Brazil #4", "ftp4.br.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp4.br.freebsd.org") }, - { "Brazil #5", "ftp5.br.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Brazil #5", "ftp5.br.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp5.br.freebsd.org") }, - { "Brazil #6", "ftp6.br.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Brazil #6", "ftp6.br.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp6.br.freebsd.org") }, - { "Brazil #7", "ftp7.br.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Brazil #7", "ftp7.br.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp7.br.freebsd.org") }, - { "Canada", "ftp.ca.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Canada", "ftp.ca.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.ca.freebsd.org") }, - { "Czech Republic", "ftp.cz.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Czech Republic", "ftp.cz.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.cz.freebsd.org") }, { "Denmark", "ftp.dk.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.dk.freebsd.org") }, - { "Denmark #2", "ftp2.dk.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Denmark #2", "ftp2.dk.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp2.dk.freebsd.org") }, { "Estonia", "ftp.ee.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.ee.freebsd.org") }, { "Finland", "ftp.fi.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.fi.freebsd.org") }, - { "France", "ftp.fr.freebsd.org", NULL, dmenuSetVariable, NULL, + { " France", "ftp.fr.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.fr.freebsd.org") }, - { "France #2", "ftp2.fr.freebsd.org", NULL, dmenuSetVariable, NULL, + { " France #2", "ftp2.fr.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp2.fr.freebsd.org") }, - { "France #3", "ftp3.fr.freebsd.org", NULL, dmenuSetVariable, NULL, + { " France #3", "ftp3.fr.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp3.fr.freebsd.org") }, { "Germany", "ftp.de.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.de.freebsd.org") }, - { "Germany #2", "ftp2.de.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Germany #2", "ftp2.de.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp2.de.freebsd.org") }, - { "Germany #3", "ftp3.de.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Germany #3", "ftp3.de.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp3.de.freebsd.org") }, - { "Germany #4", "ftp4.de.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Germany #4", "ftp4.de.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp4.de.freebsd.org") }, - { "Germany #5", "ftp5.de.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Germany #5", "ftp5.de.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp5.de.freebsd.org") }, - { "Germany #6", "ftp6.de.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Germany #6", "ftp6.de.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp6.de.freebsd.org") }, - { "Germany #7", "ftp7.de.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Germany #7", "ftp7.de.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp7.de.freebsd.org") }, { "Holland", "ftp.nl.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.nl.freebsd.org") }, - { "Hong Kong", "ftp.hk.super.net", NULL, dmenuSetVariable, NULL, + { " Hong Kong", "ftp.hk.super.net", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.hk.super.net") }, { "Iceland", "ftp.is.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.is.freebsd.org") }, - { "Ireland", "ftp.ie.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Ireland", "ftp.ie.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.ie.freebsd.org") }, - { "Israel", "ftp.il.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Israel", "ftp.il.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.il.freebsd.org") }, - { "Israel #2", "ftp2.il.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Israel #2", "ftp2.il.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp2.il.freebsd.org") }, { "Japan", "ftp.jp.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.jp.freebsd.org") }, - { "Japan #2", "ftp2.jp.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Japan #2", "ftp2.jp.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp2.jp.freebsd.org") }, - { "Japan #3", "ftp3.jp.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Japan #3", "ftp3.jp.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp3.jp.freebsd.org") }, - { "Japan #4", "ftp4.jp.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Japan #4", "ftp4.jp.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp4.jp.freebsd.org") }, - { "Japan #5", "ftp5.jp.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Japan #5", "ftp5.jp.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp5.jp.freebsd.org") }, - { "Japan #6", "ftp6.jp.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Japan #6", "ftp6.jp.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp6.jp.freebsd.org") }, { "Korea", "ftp.kr.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.kr.freebsd.org") }, - { "Korea #2", "ftp2.kr.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Korea #2", "ftp2.kr.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp2.kr.freebsd.org") }, - { "Korea #3", "ftp3.kr.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Korea #3", "ftp3.kr.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp3.kr.freebsd.org") }, - { "Korea #4", "ftp4.kr.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Korea #4", "ftp4.kr.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp4.kr.freebsd.org") }, - { "Korea #5", "ftp5.kr.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Korea #5", "ftp5.kr.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp5.kr.freebsd.org") }, { "New Zealand", "ftp.nz.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.nz.freebsd.org") }, { "Poland", "ftp.pl.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.pl.freebsd.org") }, - { "Portugal", "ftp.pt.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Portugal", "ftp.pt.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.pt.freebsd.org") }, - { "Portugal #2", "ftp2.pt.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Portugal #2", "ftp2.pt.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp2.pt.freebsd.org") }, { "Russia", "ftp.ru.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.ru.freebsd.org") }, - { "Russia #2", "ftp2.ru.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Russia #2", "ftp2.ru.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp2.ru.freebsd.org") }, - { "Russia #3", "ftp3.ru.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Russia #3", "ftp3.ru.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp3.ru.freebsd.org") }, - { "Russia #4", "ftp4.ru.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Russia #4", "ftp4.ru.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp4.ru.freebsd.org") }, { "Slovak Republic", "ftp.sk.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.sk.freebsd.org") }, - { "South Africa", "ftp.za.freebsd.org", NULL, dmenuSetVariable, NULL, + { " South Africa", "ftp.za.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.za.freebsd.org") }, - { "South Africa #2", "ftp2.za.freebsd.org", NULL, dmenuSetVariable, NULL, + { " South Africa #2", "ftp2.za.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp2.za.freebsd.org") }, - { "South Africa #3", "ftp3.za.freebsd.org", NULL, dmenuSetVariable, NULL, + { " South Africa #3", "ftp3.za.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp3.za.freebsd.org") }, - { "South Africa #4", "ftp4.za.freebsd.org", NULL, dmenuSetVariable, NULL, + { " South Africa #4", "ftp4.za.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp4.za.freebsd.org") }, - { "Spain", "ftp.es.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Spain", "ftp.es.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.es.freebsd.org") }, - { "Spain #2", "ftp2.es.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Spain #2", "ftp2.es.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp2.es.freebsd.org") }, - { "Sweden", "ftp.se.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Sweden", "ftp.se.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.se.freebsd.org") }, - { "Sweden #2", "ftp2.se.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Sweden #2", "ftp2.se.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp2.se.freebsd.org") }, - { "Sweden #3", "ftp3.se.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Sweden #3", "ftp3.se.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp3.se.freebsd.org") }, { "Taiwan", "ftp.tw.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.tw.freebsd.org") }, - { "Taiwan #2", "ftp2.tw.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Taiwan #2", "ftp2.tw.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp2.tw.freebsd.org") }, - { "Taiwan #3", "ftp3.tw.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Taiwan #3", "ftp3.tw.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp3.tw.freebsd.org") }, - { "Thailand", "ftp.nectec.or.th", NULL, dmenuSetVariable, NULL, + { " Thailand", "ftp.nectec.or.th", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AS("=ftp://ftp.nectec.or.th/pub/mirrors/FreeBSD/") }, { "UK", "ftp.uk.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.uk.freebsd.org") }, - { "UK #2", "ftp2.uk.freebsd.org", NULL, dmenuSetVariable, NULL, + { " UK #2", "ftp2.uk.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp2.uk.freebsd.org") }, - { "UK #3", "ftp3.uk.freebsd.org", NULL, dmenuSetVariable, NULL, + { " UK #3", "ftp3.uk.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp3.uk.freebsd.org") }, - { "UK #4", "ftp4.uk.freebsd.org", NULL, dmenuSetVariable, NULL, + { " UK #4", "ftp4.uk.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp4.uk.freebsd.org") }, - { "UK #5", "ftp5.uk.freebsd.org", NULL, dmenuSetVariable, NULL, + { " UK #5", "ftp5.uk.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp5.uk.freebsd.org") }, - { "USA", "ftp.freebsd.org", NULL, dmenuSetVariable, NULL, + { " USA", "ftp.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.freebsd.org") }, - { "USA #2", "ftp2.freebsd.org", NULL, dmenuSetVariable, NULL, + { " USA #2", "ftp2.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp2.freebsd.org") }, - { "USA #3", "ftp3.freebsd.org", NULL, dmenuSetVariable, NULL, + { " USA #3", "ftp3.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp3.freebsd.org") }, - { "USA #4", "ftp4.freebsd.org", NULL, dmenuSetVariable, NULL, + { " USA #4", "ftp4.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp4.freebsd.org") }, - { "USA #5", "ftp5.freebsd.org", NULL, dmenuSetVariable, NULL, + { " USA #5", "ftp5.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp5.freebsd.org") }, - { "USA #6", "ftp6.freebsd.org", NULL, dmenuSetVariable, NULL, + { " USA #6", "ftp6.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp6.freebsd.org") }, { NULL } } }; @@ -754,7 +770,7 @@ DMenu MenuMedia = { { "6 File System", "Install from an existing filesystem", NULL, mediaSetUFS }, { "7 Floppy", "Install from a floppy disk set", NULL, mediaSetFloppy }, { "8 Tape", "Install from SCSI or QIC tape", NULL, mediaSetTape }, - { "9 Options", "Go to the Options screen", NULL, optionsEditor }, + { "Options", "Go to the Options screen", NULL, optionsEditor }, { NULL } }, }; @@ -771,7 +787,11 @@ DMenu MenuDistributions = { "item or press [ENTER].", "Press F1 for more information on these options.", "distributions", - { { "1 Developer", "Full sources, binaries and doc but no games", + { { "All", "All system sources, binaries and X Window System)", + checkDistEverything, distSetEverything }, + { "Reset", "Reset selected distribution list to nothing", + NULL, distReset, NULL, NULL, ' ', ' ', ' ' }, + { "1 Developer", "Full sources, binaries and doc but no games", checkDistDeveloper, distSetDeveloper }, { "2 X-Developer", "Same as above + X Window System", checkDistXDeveloper, distSetXDeveloper }, @@ -787,12 +807,6 @@ DMenu MenuDistributions = { checkDistMinimum, distSetMinimum }, { "8 Custom", "Specify your own distribution set", NULL, dmenuSubmenu, NULL, &MenuSubDistributions, '>', '>', '>' }, - { "8 All", "All sources and binaries (incl X Window System)", - checkDistEverything, distSetEverything }, - { "9 Clear", "Reset selected distribution list to nothing", - NULL, distReset, NULL, NULL, ' ', ' ', ' ' }, - { "0 Exit", "Exit this menu (returning to previous)", - checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, { NULL } }, }; @@ -804,52 +818,50 @@ DMenu MenuSubDistributions = { "DES distribution out of the U.S.! It is for U.S. customers only.", NULL, NULL, - { { "bin", "Binary base distribution (required)", + { { "All", "All system sources, binaries and X Window System", + NULL, distSetEverything, NULL, NULL, ' ', ' ', ' ' }, + { "Reset", "Reset all of the below", + NULL, distReset, NULL, NULL, ' ', ' ', ' ' }, + { " bin", "Binary base distribution (required)", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_BIN }, #ifdef __i386__ - { "compat1x", "FreeBSD 1.x binary compatibility", + { " compat1x", "FreeBSD 1.x binary compatibility", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT1X }, - { "compat20", "FreeBSD 2.0 binary compatibility", + { " compat20", "FreeBSD 2.0 binary compatibility", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT20 }, - { "compat21", "FreeBSD 2.1 binary compatibility", + { " compat21", "FreeBSD 2.1 binary compatibility", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT21 }, - { "compat22", "FreeBSD 2.2.x and 3.0 a.out binary compatibility", + { " compat22", "FreeBSD 2.2.x and 3.0 a.out binary compatibility", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT22 }, #if __FreeBSD__ > 3 - { "compat3x", "FreeBSD 3.x binary compatibility", + { " compat3x", "FreeBSD 3.x binary compatibility", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT3X }, #endif #endif - { "DES", "DES encryption code - NOT FOR EXPORT!", + { " DES", "DES encryption code - NOT FOR EXPORT!", DESFlagCheck, distSetDES }, - { "dict", "Spelling checker dictionary files", + { " dict", "Spelling checker dictionary files", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_DICT }, - { "doc", "Miscellaneous FreeBSD online docs", + { " doc", "Miscellaneous FreeBSD online docs", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_DOC }, - { "games", "Games (non-commercial)", + { " games", "Games (non-commercial)", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_GAMES }, - { "info", "GNU info files", + { " info", "GNU info files", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_INFO }, - { "man", "System manual pages - recommended", + { " man", "System manual pages - recommended", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_MANPAGES }, - { "catman", "Preformatted system manual pages", + { " catman", "Preformatted system manual pages", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_CATPAGES }, - { "proflibs", "Profiled versions of the libraries", + { " proflibs", "Profiled versions of the libraries", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_PROFLIBS }, - { "src", "Sources for everything but DES", + { " src", "Sources for everything but DES", srcFlagCheck, distSetSrc }, - { "ports", "The FreeBSD Ports collection", + { " ports", "The FreeBSD Ports collection", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_PORTS }, - { "local", "Local additions collection", + { " local", "Local additions collection", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_LOCAL}, - { "XFree86", "The XFree86 3.3.5 distribution", + { " XFree86", "The XFree86 3.3.5 distribution", x11FlagCheck, distSetXF86 }, - { "All", "All sources, binaries and X Window System binaries", - NULL, distSetEverything, NULL, NULL, ' ', ' ', ' ' }, - { "Clear", "Reset all of the above", - NULL, distReset, NULL, NULL, ' ', ' ', ' ' }, - { "Exit", "Exit this menu (returning to previous)", - checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, { NULL } }, }; @@ -862,28 +874,30 @@ DMenu MenuDESDistributions = { "distributions of this software, please consult the release notes.", NULL, NULL, - { { "des", "Basic DES encryption services", + { { "All", "Select all of the below", + NULL, setDES, NULL, NULL, ' ', ' ', ' ' }, + { "Reset", "Reset all of the below", + NULL, clearDES, NULL, NULL, ' ', ' ', ' ' }, + { " des", "Basic DES encryption services", dmenuFlagCheck, dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_DES, }, #if __FreeBSD__ > 3 - { "krb4", "KerberosIV authentication services", + { " krb4", "KerberosIV authentication services", dmenuFlagCheck, dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_KERBEROS4 }, #else - { "krb", "KerberosIV authentication services", + { " krb", "KerberosIV authentication services", dmenuFlagCheck, dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_KERBEROS }, #endif - { "skerbero", "Sources for Kerberos", + { " skerbero", "Sources for Kerberos", dmenuFlagCheck, dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_SKERBEROS }, - { "ssecure", "Sources for DES", + { " ssecure", "Sources for DES", dmenuFlagCheck, dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_SSECURE }, - { "scrypto", "Export controlled crypto sources", + { " scrypto", "Export controlled crypto sources", dmenuFlagCheck, dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_SCRYPTO }, - { "Exit", "Exit this menu (returning to previous)", - checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, { NULL } }, }; DMenu MenuSrcDistributions = { - DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS , + DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS, "Select the sub-components of src you wish to install.", "Please check off those portions of the FreeBSD source tree\n" "you wish to install (remember to use SPACE, not ENTER!).", @@ -891,40 +905,38 @@ DMenu MenuSrcDistributions = { NULL, { { "All", "Select all of the below", NULL, setSrc, NULL, NULL, ' ', ' ', ' ' }, - { "Clear", "Reset all of the below", + { "Reset", "Reset all of the below", NULL, clearSrc, NULL, NULL, ' ', ' ', ' ' }, - { "base", "top-level files in /usr/src", + { " base", "top-level files in /usr/src", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_BASE }, - { "contrib", "/usr/src/contrib (contributed software)", + { " contrib", "/usr/src/contrib (contributed software)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_CONTRIB }, - { "gnu", "/usr/src/gnu (software from the GNU Project)", + { " gnu", "/usr/src/gnu (software from the GNU Project)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_GNU }, - { "etc", "/usr/src/etc (miscellaneous system files)", + { " etc", "/usr/src/etc (miscellaneous system files)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_ETC }, - { "games", "/usr/src/games (the obvious!)", + { " games", "/usr/src/games (the obvious!)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_GAMES }, - { "include", "/usr/src/include (header files)", + { " include", "/usr/src/include (header files)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_INCLUDE }, - { "lib", "/usr/src/lib (system libraries)", + { " lib", "/usr/src/lib (system libraries)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_LIB }, - { "libexec", "/usr/src/libexec (system programs)", + { " libexec", "/usr/src/libexec (system programs)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_LIBEXEC }, - { "release", "/usr/src/release (release-generation tools)", + { " release", "/usr/src/release (release-generation tools)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_RELEASE }, - { "bin", "/usr/src/bin (system binaries)", + { " bin", "/usr/src/bin (system binaries)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_BIN }, - { "sbin", "/usr/src/sbin (system binaries)", + { " sbin", "/usr/src/sbin (system binaries)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SBIN }, - { "share", "/usr/src/share (documents and shared files)", + { " share", "/usr/src/share (documents and shared files)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SHARE }, - { "sys", "/usr/src/sys (FreeBSD kernel)", + { " sys", "/usr/src/sys (FreeBSD kernel)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SYS }, - { "ubin", "/usr/src/usr.bin (user binaries)", + { " ubin", "/usr/src/usr.bin (user binaries)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_UBIN }, - { "usbin", "/usr/src/usr.sbin (aux system binaries)", + { " usbin", "/usr/src/usr.sbin (aux system binaries)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_USBIN }, - { "Exit", "Exit this menu (returning to previous)", - checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, { NULL } }, }; @@ -935,12 +947,12 @@ DMenu MenuXF86Select = { "distribution sets.", NULL, NULL, - { { "Basic", "Basic component menu (required)", NULL, dmenuSubmenu, NULL, &MenuXF86SelectCore }, + { { "All", "Select all XFree86 distribution sets", NULL, setX11All }, + { "Reset", "Reset XFree86 distribution sets", NULL, clearX11All }, + { "Basic", "Basic component menu (required)", NULL, dmenuSubmenu, NULL, &MenuXF86SelectCore }, { "Server", "X server menu", NULL, dmenuSubmenu, NULL, &MenuXF86SelectServer }, { "Fonts", "Font set menu", NULL, dmenuSubmenu, NULL, &MenuXF86SelectFonts }, - { "All", "Select all XFree86 distribution sets", NULL, setX11All }, - { "Clear", "Reset XFree86 distribution list", NULL, clearX11All }, - { "Exit", "Exit this menu (returning to previous)", checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, + { "X Exit", "Exit this menu (returning to previous)", checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, { NULL } }, }; @@ -951,47 +963,43 @@ DMenu MenuXF86SelectCore = { "Bin, lib, and set are recommended for a minimum installaion.", NULL, NULL, - { { "bin", "Client applications and shared libs", + { { "All", "Select all below", + NULL, setX11Misc, NULL, NULL, ' ', ' ', ' ' }, + { "Reset", "Reset all below", + NULL, clearX11Misc, NULL, NULL, ' ', ' ', ' ' }, + { " bin", "Client applications and shared libs", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_BIN }, - { "cfg", "Configuration files", + { " cfg", "Configuration files", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_CFG }, - { "doc", "READMEs and release notes", + { " doc", "READMEs and release notes", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_DOC }, - { "html", "HTML documentation files", + { " html", "HTML documentation files", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_HTML }, - { "lib", "Data files needed at runtime", + { " lib", "Data files needed at runtime", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LIB }, -#ifdef __i386__ - { "lk98", "Server link kit for PC98 machines", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LKIT98 }, -#endif - { "lkit", "Server link kit for all other machines", + { " lkit", "Server link kit for all other machines", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LKIT }, - { "man", "Manual pages", + { " man", "Manual pages", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_MAN }, - { "prog", "Programmer's header and library files", + { " prog", "Programmer's header and library files", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_PROG }, - { "set", "XFree86 Setup Utility", + { " set", "XFree86 Setup Utility", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SET }, #ifdef __i386__ - { "9set", "XFree86 Setup Utility for PC98 machines", + { " 9set", "XFree86 Setup Utility for PC98 machines", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_9SET }, + { " lk98", "Server link kit for PC98 machines", + dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LKIT98 }, #endif - { "sources", "XFree86 3.3.5 standard sources", + { " sources", "XFree86 3.3.5 standard sources", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SRC }, - { "csources", "XFree86 3.3.5 contrib sources", + { " csources", "XFree86 3.3.5 contrib sources", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_CSRC }, - { "All", "Select all of the above", - NULL, setX11Misc, NULL, NULL, ' ', ' ', ' ' }, - { "Clear", "Reset all of the above", - NULL, clearX11Misc, NULL, NULL, ' ', ' ', ' ' }, - { "Exit", "Exit this menu (returning to previous)", - checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, { NULL } }, }; DMenu MenuXF86SelectFonts = { - DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS , + DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS, "Font distribution selection.", "Please check off the individual font distributions you wish to\n\ install. At the minimum, you should install the standard\n\ @@ -999,24 +1007,22 @@ install. At the minimum, you should install the standard\n\ (these are selected by default).", NULL, NULL, - { { "fnts", "Standard 75 DPI and miscellaneous fonts", + { { "All", "All fonts", + NULL, setX11Fonts, NULL, NULL, ' ', ' ', ' ' }, + { "Reset", "Reset font selections", + NULL, clearX11Fonts, NULL, NULL, ' ', ' ', ' ' }, + { " fnts", "Standard 75 DPI and miscellaneous fonts", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_MISC }, - { "f100", "100 DPI fonts", + { " f100", "100 DPI fonts", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_100 }, - { "fcyr", "Cyrillic Fonts", + { " fcyr", "Cyrillic Fonts", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_CYR }, - { "fscl", "Speedo and Type scalable fonts", + { " fscl", "Speedo and Type scalable fonts", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_SCALE }, - { "non", "Japanese, Chinese and other non-english fonts", + { " non", "Japanese, Chinese and other non-english fonts", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_NON }, - { "server", "Font server", + { " server", "Font server", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_SERVER }, - { "All", "All fonts", - NULL, setX11Fonts, NULL, NULL, ' ', ' ', ' ' }, - { "Clear", "Reset font selections", - NULL, clearX11Fonts, NULL, NULL, ' ', ' ', ' ' }, - { "Exit", "Exit this menu (returning to previous)", - checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, { NULL } }, }; @@ -1029,47 +1035,45 @@ DMenu MenuXF86SelectServer = { "machines, the 9EGC or 9840 servers.", NULL, NULL, - { { "SVGA", "Standard VGA or Super VGA card", + { { "All", "Select all of the above", + NULL, setX11Servers, NULL, NULL, ' ', ' ', ' ' }, + { "Reset", "Reset all of the above", + NULL, clearX11Servers, NULL, NULL, ' ', ' ', ' ' }, + { " SVGA", "Standard VGA or Super VGA card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_SVGA }, - { "VGA16", "Standard 16 color VGA card", + { " VGA16", "Standard 16 color VGA card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_VGA16 }, - { "Mono", "Standard Monochrome card", + { " Mono", "Standard Monochrome card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_MONO }, - { "3DL", "8, 16 and 24 bit color 3D Labs boards", + { " 3DL", "8, 16 and 24 bit color 3D Labs boards", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_3DL }, - { "8514", "8-bit (256 color) IBM 8514 or compatible card", + { " 8514", "8-bit (256 color) IBM 8514 or compatible card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_8514 }, - { "AGX", "8-bit AGX card", + { " AGX", "8-bit AGX card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_AGX }, - { "I128", "8, 16 and 24-bit #9 Imagine I128 card", + { " I128", "8, 16 and 24-bit #9 Imagine I128 card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_I128 }, - { "Ma8", "8-bit ATI Mach8 card", + { " Ma8", "8-bit ATI Mach8 card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_MACH8 }, - { "Ma32", "8 and 16-bit (65K color) ATI Mach32 card", + { " Ma32", "8 and 16-bit (65K color) ATI Mach32 card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_MACH32 }, - { "Ma64", "8 and 16-bit (65K color) ATI Mach64 card", + { " Ma64", "8 and 16-bit (65K color) ATI Mach64 card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_MACH64 }, - { "P9K", "8, 16, and 24-bit color Weitek P9000 based boards", + { " P9K", "8, 16, and 24-bit color Weitek P9000 based boards", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_P9000 }, - { "S3", "8, 16 and 24-bit color S3 based boards", + { " S3", "8, 16 and 24-bit color S3 based boards", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_S3 }, - { "S3V", "8, 16 and 24-bit color S3 Virge based boards", + { " S3V", "8, 16 and 24-bit color S3 Virge based boards", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_S3V }, - { "W32", "8-bit ET4000/W32, /W32i and /W32p cards", + { " W32", "8-bit ET4000/W32, /W32i and /W32p cards", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_W32 }, #ifdef __i386__ - { "PC98", "Select an X server for a NEC PC98 [Submenu]", + { " PC98", "Select an X server for a NEC PC98 [Submenu]", NULL, dmenuSubmenu, NULL, &MenuXF86SelectPC98Server, '>', ' ', '>', 0 }, #elif __alpha__ - { "TGA", "TGA cards (alpha architecture only)", + { " TGA", "TGA cards (alpha architecture only)", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_TGA }, #endif - { "All", "Select all of the above", - NULL, setX11Servers, NULL, NULL, ' ', ' ', ' ' }, - { "Clear", "Reset all of the above", - NULL, clearX11Servers, NULL, NULL, ' ', ' ', ' ' }, - { "Exit", "Exit this menu (returning to previous)", - checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, { NULL } }, }; @@ -1083,36 +1087,34 @@ it is recommended that try the SVGA or VGA16 servers (the VGA16 and\n\ Mono servers are particularly well-suited to most LCD displays).", NULL, NULL, - { { "9480", "PC98 8-bit (256 color) PEGC-480 card", + { { " 9480", "PC98 8-bit (256 color) PEGC-480 card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9480 }, - { "9EGC", "PC98 4-bit (16 color) EGC card", + { " 9EGC", "PC98 4-bit (16 color) EGC card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9EGC }, - { "9GA9", "PC98 GA-968V4/PCI (S3 968) card", + { " 9GA9", "PC98 GA-968V4/PCI (S3 968) card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9GA9 }, - { "9GAN", "PC98 GANB-WAP (cirrus) card", + { " 9GAN", "PC98 GANB-WAP (cirrus) card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9GAN }, - { "9LPW", "PC98 PowerWindowLB (S3) card", + { " 9LPW", "PC98 PowerWindowLB (S3) card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9LPW }, - { "9MGA", "PC98 MGA (Matrox) card", + { " 9MGA", "PC98 MGA (Matrox) card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9MGA }, - { "9NKV", "PC98 NKV-NEC (cirrus) card", + { " 9NKV", "PC98 NKV-NEC (cirrus) card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9NKV }, - { "9NS3", "PC98 NEC (S3) card", + { " 9NS3", "PC98 NEC (S3) card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9NS3 }, - { "9SPW", "PC98 SKB-PowerWindow (S3) card", + { " 9SPW", "PC98 SKB-PowerWindow (S3) card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9SPW }, - { "9SVG", "PC98 generic SVGA card", + { " 9SVG", "PC98 generic SVGA card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9SVG }, - { "9TGU", "PC98 Cyber9320 and TGUI9680 cards", + { " 9TGU", "PC98 Cyber9320 and TGUI9680 cards", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9TGU }, - { "9WEP", "PC98 WAB-EP (cirrus) card", + { " 9WEP", "PC98 WAB-EP (cirrus) card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9WEP }, - { "9WS", "PC98 WABS (cirrus) card", + { " 9WS", "PC98 WABS (cirrus) card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9WS }, - { "9WSN", "PC98 WSN-A2F (cirrus) card", + { " 9WSN", "PC98 WSN-A2F (cirrus) card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9WSN }, - { "Exit", "Exit this menu (returning to previous)", - checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, { NULL } } }; #endif @@ -1140,10 +1142,11 @@ DMenu MenuHTMLDoc = { "to enter an arbitrary URL for browsing.", "Press F1 for more help on what you see here.", "html", - { { "Handbook", "The FreeBSD Handbook.", NULL, docShowDocument }, - { "FAQ", "The Frequently Asked Questions guide.", NULL, docShowDocument }, - { "Home", "The Home Pages for the FreeBSD Project (requires net)", NULL, docShowDocument }, - { "Other", "Enter a URL.", NULL, docShowDocument }, + { { "1 Handbook", "The FreeBSD Handbook.", NULL, docShowDocument }, + { "2 FAQ", "The Frequently Asked Questions guide.", NULL, docShowDocument }, + { "3 Home", "The Home Pages for the FreeBSD Project (requires net)", NULL, docShowDocument }, + { "4 Other", "Enter a URL.", NULL, docShowDocument }, + { "X Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, { NULL } }, }; @@ -1169,7 +1172,7 @@ DMenu MenuInstallCustom = { { "5 Media", "Choose the installation media type", NULL, dmenuSubmenu, NULL, &MenuMedia }, { "6 Commit", "Perform any pending Partition/Label/Extract actions", NULL, installCustomCommit }, #endif - { "0 Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, + { "X Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, { NULL } }, }; @@ -1207,41 +1210,41 @@ DMenu MenuConfigure = { "software not provided in the base distributions.", "Press F1 for more information on these options", "configure", - { { "D Distributions", "Install additional distribution sets", + { { " Distributions", "Install additional distribution sets", NULL, distExtractAll }, - { "P Packages", "Install pre-packaged software for FreeBSD", + { " Packages", "Install pre-packaged software for FreeBSD", NULL, configPackages }, - { "R Root Password", "Set the system manager's password", + { " Root Password", "Set the system manager's password", NULL, dmenuSystemCommand, NULL, "passwd root" }, - { "L Label", "The disk Label editor", + { " Label", "The disk Label editor", NULL, diskLabelEditor }, #ifdef __i386__ - { "F Fdisk", "The disk Slice (PC-style partition) Editor", + { " Fdisk", "The disk Slice (PC-style partition) Editor", NULL, diskPartitionEditor }, #endif - { "1 User Management", "Add user and group information", + { " User Management", "Add user and group information", NULL, dmenuSubmenu, NULL, &MenuUsermgmt }, - { "2 Console", "Customize system console behavior", + { " Console", "Customize system console behavior", NULL, dmenuSubmenu, NULL, &MenuSyscons }, - { "3 Time Zone", "Set which time zone you're in", + { " Time Zone", "Set which time zone you're in", NULL, dmenuSystemCommand, NULL, "tzsetup" }, - { "4 Media", "Change the installation media type", - NULL, dmenuSubmenu, NULL, &MenuMedia }, - { "5 Mouse", "Configure your mouse", + { " Media", "Change the installation media type", + NULL, dmenuSubmenu, NULL, &MenuMedia }, + { " Mouse", "Configure your mouse", NULL, dmenuSubmenu, NULL, &MenuMouse, NULL }, - { "6 Networking", "Configure additional network services", + { " Networking", "Configure additional network services", NULL, dmenuSubmenu, NULL, &MenuNetworking }, - { "7 Startup", "Configure system startup options", + { " Startup", "Configure system startup options", NULL, dmenuSubmenu, NULL, &MenuStartup }, - { "8 Options", "View/Set various installation options", + { " Options", "View/Set various installation options", NULL, optionsEditor }, - { "X XFree86", "Configure XFree86 Server", + { " XFree86", "Configure XFree86 Server", NULL, configXSetup }, - { "D Desktop", "Configure XFree86 Desktop", + { " Desktop", "Configure XFree86 Desktop", NULL, configXDesktop }, - { "H HTML Docs", "Go to the HTML documentation menu (post-install)", + { " HTML Docs", "Go to the HTML documentation menu (post-install)", NULL, docBrowser }, - { "E Exit", "Exit this menu (returning to previous)", + { "X Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, { NULL } }, }; @@ -1254,42 +1257,40 @@ DMenu MenuStartup = { "RETURN key will leave this menu (as with all checkbox menus).", NULL, NULL, - { { "APM", "Auto-power management services (typically laptops)", + { { " APM", "Auto-power management services (typically laptops)", dmenuVarCheck, dmenuToggleVariable, NULL, "apm_enable=YES" }, - { "pccard", "Enable PCCARD (AKA PCMCIA) services (also laptops)", + { " pccard", "Enable PCCARD (AKA PCMCIA) services (also laptops)", dmenuVarCheck, dmenuToggleVariable, NULL, "pccard_enable=YES" }, - { "pccard mem", "Set PCCARD memory address (if enabled)", + { " pccard mem", "Set PCCARD memory address (if enabled)", dmenuVarCheck, dmenuISetVariable, NULL, "pccard_mem" }, - { "pccard ifconfig", "List of PCCARD ethernet devices to configure", + { " pccard ifconfig", "List of PCCARD ethernet devices to configure", dmenuVarCheck, dmenuISetVariable, NULL, "pccard_ifconfig" }, { " ", " -- ", NULL, NULL, NULL, NULL, ' ', ' ', ' ' }, - { "startup dirs", "Set the list of dirs to look for startup scripts", + { " startup dirs", "Set the list of dirs to look for startup scripts", dmenuVarCheck, dmenuISetVariable, NULL, "local_startup" }, - { "named", "Run a local name server on this host", + { " named", "Run a local name server on this host", dmenuVarCheck, dmenuToggleVariable, NULL, "named_enable=YES" }, - { "named flags", "Set default flags to named (if enabled)", + { " named flags", "Set default flags to named (if enabled)", dmenuVarCheck, dmenuISetVariable, NULL, "named_flags" }, - { "nis client", "This host wishes to be an NIS client.", + { " nis client", "This host wishes to be an NIS client.", dmenuVarCheck, dmenuToggleVariable, NULL, "nis_client_enable=YES" }, - { "nis domainname", "Set NIS domainname (if enabled)", + { " nis domainname", "Set NIS domainname (if enabled)", dmenuVarCheck, dmenuISetVariable, NULL, "nisdomainname" }, - { "nis server", "This host wishes to be an NIS server.", + { " nis server", "This host wishes to be an NIS server.", dmenuVarCheck, dmenuToggleVariable, NULL, "nis_server_enable=YES" }, { " ", " -- ", NULL, NULL, NULL, NULL, ' ', ' ', ' ' }, - { "accounting", "This host wishes to run process accounting.", + { " accounting", "This host wishes to run process accounting.", dmenuVarCheck, dmenuToggleVariable, NULL, "accounting_enable=YES" }, - { "lpd", "This host has a printer and wants to run lpd.", + { " lpd", "This host has a printer and wants to run lpd.", dmenuVarCheck, dmenuToggleVariable, NULL, "lpd_enable=YES" }, #ifdef __i386__ - { "linux", "This host wants to be able to run linux binaries.", + { " linux", "This host wants to be able to run linux binaries.", dmenuVarCheck, configLinux, NULL, VAR_LINUX_ENABLE "=YES" }, - { "SCO", "This host wants to be able to run IBCS2 binaries.", + { " SCO", "This host wants to be able to run IBCS2 binaries.", dmenuVarCheck, dmenuToggleVariable, NULL, "ibcs2_enable=YES" }, #endif - { "quotas", "This host wishes to check quotas on startup.", + { " quotas", "This host wishes to check quotas on startup.", dmenuVarCheck, dmenuToggleVariable, NULL, "check_quotas=YES" }, - { "Exit", "Exit this menu (returning to previous)", - checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, { NULL } }, }; @@ -1302,32 +1303,30 @@ DMenu MenuNetworking = { "aspects of your system's network configuration.", NULL, NULL, - { { "Interfaces", "Configure additional network interfaces", + { { " Interfaces", "Configure additional network interfaces", NULL, tcpMenuSelect }, - { "NFS client", "This machine will be an NFS client", + { " NFS client", "This machine will be an NFS client", dmenuVarCheck, dmenuToggleVariable, NULL, "nfs_client_enable=YES" }, - { "NFS server", "This machine will be an NFS server", - dmenuVarCheck, configNFSServer, NULL, "nfs_server_enable=YES" }, - { "AMD", "This machine wants to run the auto-mounter service", - dmenuVarCheck, dmenuToggleVariable, NULL, "amd_enable=YES" }, - { "AMD Flags", "Set flags to AMD service (if enabled)", - dmenuVarCheck, dmenuISetVariable, NULL, "amd_flags" }, - { "TCP Extensions", "Allow RFC1323 and RFC1644 TCP extensions?", - dmenuVarCheck, dmenuToggleVariable, NULL, "tcp_extensions=YES" }, - { "Gateway", "This machine will route packets between interfaces", + { " NFS server", "This machine will be an NFS server", + dmenuVarCheck, configNFSServer, NULL, "nfs_server_enable=YES" }, + { " AMD", "This machine wants to run the auto-mounter service", + dmenuVarCheck, dmenuToggleVariable, NULL, "amd_enable=YES" }, + { " AMD Flags", "Set flags to AMD service (if enabled)", + dmenuVarCheck, dmenuISetVariable, NULL, "amd_flags" }, + { " TCP Extensions", "Allow RFC1323 and RFC1644 TCP extensions?", + dmenuVarCheck, dmenuToggleVariable, NULL, "tcp_extensions=YES" }, + { " Gateway", "This machine will route packets between interfaces", dmenuVarCheck, dmenuToggleVariable, NULL, "gateway_enable=YES" }, - { "Ntpdate", "Select a clock-synchronization server", + { " Ntpdate", "Select a clock-synchronization server", dmenuVarCheck, dmenuSubmenu, NULL, &MenuNTP, '[', 'X', ']', "ntpdate_enable=YES" }, - { "router", "Select routing daemon (default: routed)", - dmenuVarCheck, configRouter, NULL, "router" }, - { "Rwhod", "This machine wants to run the rwho daemon", + { " router", "Select routing daemon (default: routed)", + dmenuVarCheck, configRouter, NULL, "router" }, + { " Rwhod", "This machine wants to run the rwho daemon", dmenuVarCheck, dmenuToggleVariable, NULL, "rwhod_enable=YES" }, - { "Anon FTP", "This machine wishes to allow anonymous FTP.", - dmenuVarCheck, configAnonFTP, NULL, "anon_ftp" }, - { "PCNFSD", "Run authentication server for clients with PC-NFS.", - dmenuVarCheck, configPCNFSD, NULL, "pcnfsd" }, - { "Exit", "Exit this menu (returning to previous)", - checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, + { " Anon FTP", "This machine wishes to allow anonymous FTP.", + dmenuVarCheck, configAnonFTP, NULL, "anon_ftp" }, + { " PCNFSD", "Run authentication server for clients with PC-NFS.", + dmenuVarCheck, configPCNFSD, NULL, "pcnfsd" }, { NULL } }, }; @@ -1347,7 +1346,7 @@ DMenu MenuNTP = { { "Australia", "ntp.syd.dms.csiro.au (HP 5061 Cesium Beam)", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp.syd.dms.csiro.au" }, - { "Canada", "tick.usask.ca (GOES clock)", + { " Canada", "tick.usask.ca (GOES clock)", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=tick.usask.ca" }, { "France", "canon.inria.fr (TDF clock)", @@ -1356,40 +1355,40 @@ DMenu MenuNTP = { { "Germany", "ntps1-{0,1,2}.uni-erlangen.de (GPS)", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntps1-0.uni-erlangen.de" }, - { "Germany #2", "ntps1-0.cs.tu-berlin.de (GPS)", + { " Germany #2", "ntps1-0.cs.tu-berlin.de (GPS)", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntps1-0.cs.tu-berlin.de" }, { "Japan", "clock.nc.fukuoka-u.ac.jp (GPS clock)", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=clock.nc.fukuoka-u.ac.jp" }, - { "Japan #2", "clock.tl.fukuoka-u.ac.jp (GPS clock)", + { " Japan #2", "clock.tl.fukuoka-u.ac.jp (GPS clock)", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=clock.tl.fukuoka-u.ac.jp" }, { "Netherlands", "ntp0.nl.net (GPS clock)", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp0.nl.net" }, - { "Norway", "timehost.ifi.uio.no (NTP clock)", + { " Norway", "timehost.ifi.uio.no (NTP clock)", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=timehost.ifi.uio.no" }, { "Sweden", "Time1.Stupi.SE (Cesium/GPS)", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=Time1.Stupi.SE" }, - { "Switzerland", "swisstime.ethz.ch (DCF77 clock)", + { " Switzerland", "swisstime.ethz.ch (DCF77 clock)", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=swisstime.ethz.ch" }, { "U.S. East Coast", "bitsy.mit.edu (WWV clock)", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=bitsy.mit.edu" }, - { "U.S. East Coast #2", "otc1.psu.edu (WWV clock)", + { " U.S. East Coast #2", "otc1.psu.edu (WWV clock)", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=otc1.psu.edu" }, - { "U.S. West Coast #1", "clepsydra.dec.com (GOES clock)", + { " U.S. West Coast #1", "clepsydra.dec.com (GOES clock)", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=clepsydra.dec.com" }, - { "U.S. West Coast #2", "clock.llnl.gov (WWVB clock)", + { " U.S. West Coast #2", "clock.llnl.gov (WWVB clock)", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=clock.llnl.gov" }, - { "U.S. Midwest", "ncar.ucar.edu (WWVB clock)", + { " U.S. Midwest", "ncar.ucar.edu (WWVB clock)", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ncar.ucar.edu" }, { NULL } }, @@ -1404,12 +1403,12 @@ DMenu MenuSyscons = { "When you are done setting configuration options, select Cancel.", "Configure your system console settings", NULL, - { { "Font", "Choose an alternate screen font", NULL, dmenuSubmenu, NULL, &MenuSysconsFont }, - { "Keymap", "Choose an alternate keyboard map", NULL, dmenuSubmenu, NULL, &MenuSysconsKeymap }, - { "Repeat", "Set the rate at which keys repeat", NULL, dmenuSubmenu, NULL, &MenuSysconsKeyrate }, - { "Saver", "Configure the screen saver", NULL, dmenuSubmenu, NULL, &MenuSysconsSaver }, - { "Screenmap", "Choose an alternate screenmap", NULL, dmenuSubmenu, NULL, &MenuSysconsScrnmap }, - { "Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, + { { "1 Font", "Choose an alternate screen font", NULL, dmenuSubmenu, NULL, &MenuSysconsFont }, + { "2 Keymap", "Choose an alternate keyboard map", NULL, dmenuSubmenu, NULL, &MenuSysconsKeymap }, + { "3 Repeat", "Set the rate at which keys repeat", NULL, dmenuSubmenu, NULL, &MenuSysconsKeyrate }, + { "4 Saver", "Configure the screen saver", NULL, dmenuSubmenu, NULL, &MenuSysconsSaver }, + { "5 Screenmap", "Choose an alternate screenmap", NULL, dmenuSubmenu, NULL, &MenuSysconsScrnmap }, + { "X Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, { NULL } }, }; @@ -1426,49 +1425,49 @@ DMenu MenuSysconsKeymap = { "Choose a keyboard map", NULL, { { "Belgian", "Belgian ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=be.iso" }, - { "Brazil CP850", "Brazil CP850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=br275.cp850" }, - { "Brazil ISO (accent)", "Brazil ISO keymap (accent keys)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=br275.iso.acc" }, - { "Brazil ISO", "Brazil ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=br275.iso" }, - { "Croatian ISO", "Croatian ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=hr.iso" }, + { " Brazil CP850", "Brazil CP850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=br275.cp850" }, + { " Brazil ISO (accent)", "Brazil ISO keymap (accent keys)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=br275.iso.acc" }, + { " Brazil ISO", "Brazil ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=br275.iso" }, + { " Croatian ISO", "Croatian ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=hr.iso" }, { "Danish CP865", "Danish Code Page 865 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=danish.cp865" }, - { "Danish ISO", "Danish ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=danish.iso" }, + { " Danish ISO", "Danish ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=danish.iso" }, { "Estonian ISO", "Estonian ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=estonian.iso" }, - { "Estonian ISO 15", "Estonian ISO 8859-15 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=estonian.iso15" }, - { "Estonian CP850", "Estonian Code Page 850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=estonian.cp850" }, - { "Finnish CP850","Finnish Code Page 850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=finnish.cp850" }, - { "Finnish ISO", "Finnish ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=finnish.iso" }, - { "French ISO (accent)", "French ISO keymap (accent keys)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=fr.iso.acc" }, - { "French ISO", "French ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=fr.iso" }, + { " Estonian ISO 15", "Estonian ISO 8859-15 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=estonian.iso15" }, + { " Estonian CP850", "Estonian Code Page 850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=estonian.cp850" }, + { " Finnish CP850","Finnish Code Page 850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=finnish.cp850" }, + { " Finnish ISO", "Finnish ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=finnish.iso" }, + { " French ISO (accent)", "French ISO keymap (accent keys)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=fr.iso.acc" }, + { " French ISO", "French ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=fr.iso" }, { "German CP850", "German Code Page 850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=german.cp850" }, - { "German ISO", "German ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=german.iso" }, + { " German ISO", "German ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=german.iso" }, { "Hungarian 101", "Hungarian ISO keymap (101 key)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=hu.iso2.101keys" }, - { "Hungarian 102", "Hungarian ISO keymap (102 key)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=hu.iso2.102keys" }, + { " Hungarian 102", "Hungarian ISO keymap (102 key)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=hu.iso2.102keys" }, { "Icelandic (accent)", "Icelandic ISO keymap (accent keys)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=icelandic.iso.acc" }, - { "Icelandic", "Icelandic ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=icelandic.iso" }, - { "Italian", "Italian ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=it.iso" }, + { " Icelandic", "Icelandic ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=icelandic.iso" }, + { " Italian", "Italian ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=it.iso" }, { "Latin American", "Latin American ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=lat-amer" }, { "Japanese 106", "Japanese 106 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=jp.106" }, { "Norway ISO", "Norwegian ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=norwegian.iso" }, { "Polish ISO", "Polish ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=pl_PL.ISO_8859-2" }, - { "Portuguese (accent)", "Portuguese ISO keymap (accent keys)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=pt.iso.acc" }, - { "Portuguese", "Portuguese ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=pt.iso" }, + { " Portuguese (accent)", "Portuguese ISO keymap (accent keys)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=pt.iso.acc" }, + { " Portuguese", "Portuguese ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=pt.iso" }, { "Russia CP866", "Russian CP866 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=ru.cp866" }, - { "Russia KOI8-R", "Russian KOI8-R keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=ru.koi8-r" }, + { " Russia KOI8-R", "Russian KOI8-R keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=ru.koi8-r" }, { "Slovenian", "Slovenian ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=si.iso.acc" }, - { "Spanish (accent)", "Spanish ISO keymap (accent keys)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=spanish.iso.acc" }, - { "Spanish", "Spanish ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=spanish.iso" }, - { "Swedish CP850", "Swedish Code Page 850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swedish.cp850" }, - { "Swedish ISO", "Swedish ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swedish.iso" }, - { "Swiss French ISO (accent)", "Swiss French ISO keymap (accent keys)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swissfrench.iso.acc" }, - { "Swiss French ISO", "Swiss French ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swissfrench.iso" }, - { "Swiss French CP850", "Swiss French Code Page 850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swissfrench.cp850" }, - { "Swiss German ISO (accent)", "Swiss German ISO keymap (accent keys)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swissgerman.iso.acc" }, - { "Swiss German ISO", "Swiss German ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swissgerman.iso" }, - { "Swiss German CP850", "Swiss German Code Page 850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swissgerman.cp850" }, + { " Spanish (accent)", "Spanish ISO keymap (accent keys)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=spanish.iso.acc" }, + { " Spanish", "Spanish ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=spanish.iso" }, + { " Swedish CP850", "Swedish Code Page 850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swedish.cp850" }, + { " Swedish ISO", "Swedish ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swedish.iso" }, + { " Swiss French ISO (accent)", "Swiss French ISO keymap (accent keys)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swissfrench.iso.acc" }, + { " Swiss French ISO", "Swiss French ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swissfrench.iso" }, + { " Swiss French CP850", "Swiss French Code Page 850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swissfrench.cp850" }, + { " Swiss German ISO (accent)", "Swiss German ISO keymap (accent keys)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swissgerman.iso.acc" }, + { " Swiss German ISO", "Swiss German ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swissgerman.iso" }, + { " Swiss German CP850", "Swiss German Code Page 850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swissgerman.cp850" }, { "U.K. CP850", "United Kingdom Code Page 850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=uk.cp850" }, - { "U.K. ISO", "United Kingdom ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=uk.iso" }, - { "U.S. Dvorak", "United States Dvorak keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=us.dvorak" }, - { "U.S. ISO", "United States ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=us.iso" }, + { " U.K. ISO", "United Kingdom ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=uk.iso" }, + { " U.S. Dvorak", "United States Dvorak keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=us.dvorak" }, + { " U.S. ISO", "United States ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=us.iso" }, { NULL } }, }; @@ -1495,23 +1494,23 @@ DMenu MenuSysconsSaver = { "probably enable one of these screen savers to prevent phosphor burn-in.", "Choose a nifty-looking screen saver", NULL, - { { "Blank", "Simply blank the screen", + { { "1 Blank", "Simply blank the screen", dmenuVarCheck, configSaver, NULL, "saver=blank" }, - { "Daemon", "\"BSD Daemon\" animated screen saver (text)", + { "2 Daemon", "\"BSD Daemon\" animated screen saver (text)", dmenuVarCheck, configSaver, NULL, "saver=daemon" }, - { "Fade", "Fade out effect screen saver", + { "3 Fade", "Fade out effect screen saver", dmenuVarCheck, configSaver, NULL, "saver=fade" }, - { "Fire", "Flames effect screen saver", + { "4 Fire", "Flames effect screen saver", dmenuVarCheck, configSaver, NULL, "saver=fire" }, - { "Green", "\"Green\" power saving mode (if supported by monitor)", + { "5 Green", "\"Green\" power saving mode (if supported by monitor)", dmenuVarCheck, configSaver, NULL, "saver=green" }, - { "Logo", "\"BSD Daemon\" animated screen saver (graphics)", + { "6 Logo", "\"BSD Daemon\" animated screen saver (graphics)", dmenuVarCheck, configSaver, NULL, "saver=logo" }, - { "Rain", "Rain drops screen saver", + { "7 Rain", "Rain drops screen saver", dmenuVarCheck, configSaver, NULL, "saver=rain" }, - { "Snake", "Draw a FreeBSD \"snake\" on your screen", + { "8 Snake", "Draw a FreeBSD \"snake\" on your screen", dmenuVarCheck, configSaver, NULL, "saver=snake" }, - { "Star", "A \"twinkling stars\" effect", + { "9 Star", "A \"twinkling stars\" effect", dmenuVarCheck, configSaver, NULL, "saver=star" }, { "Warp", "A \"stars warping\" effect", dmenuVarCheck, configSaver, NULL, "saver=warp" }, @@ -1556,21 +1555,21 @@ DMenu MenuSysconsFont = { "you can select the appropriate font below.", "Choose a font", NULL, - { { "None", "Use default font", dmenuVarCheck, dmenuSetVariables, NULL, + { { "1 None", "Use default font", dmenuVarCheck, dmenuSetVariables, NULL, "font8x8=NO,font8x14=NO,font8x16=NO" }, - { "IBM 437", "English", dmenuVarCheck, dmenuSetVariables, NULL, + { "2 IBM 437", "English", dmenuVarCheck, dmenuSetVariables, NULL, "font8x8=cp437-8x8,font8x14=cp437-8x14,font8x16=cp437-8x16" }, - { "IBM 850", "Western Europe, IBM encoding", dmenuVarCheck, dmenuSetVariables, NULL, + { "3 IBM 850", "Western Europe, IBM encoding", dmenuVarCheck, dmenuSetVariables, NULL, "font8x8=cp850-8x8,font8x14=cp850-8x14,font8x16=cp850-8x16" }, - { "IBM 865", "Norwegian, IBM encoding", dmenuVarCheck, dmenuSetVariables, NULL, + { "4 IBM 865", "Norwegian, IBM encoding", dmenuVarCheck, dmenuSetVariables, NULL, "font8x8=cp865-8x8,font8x14=cp865-8x14,font8x16=cp865-8x16" }, - { "IBM 866", "Russian, IBM encoding", dmenuVarCheck, dmenuSetVariables, NULL, + { "5 IBM 866", "Russian, IBM encoding", dmenuVarCheck, dmenuSetVariables, NULL, "font8x8=cp866-8x8,font8x14=cp866-8x14,font8x16=cp866-8x16" }, - { "ISO 8859-1", "Western Europe, ISO encoding", dmenuVarCheck, dmenuSetVariables, NULL, + { "6 ISO 8859-1", "Western Europe, ISO encoding", dmenuVarCheck, dmenuSetVariables, NULL, "font8x8=iso-8x8,font8x14=iso-8x14,font8x16=iso-8x16" }, - { "KOI8-R", "Russian, KOI8-R encoding", dmenuVarCheck, dmenuSetVariables, NULL, + { "7 KOI8-R", "Russian, KOI8-R encoding", dmenuVarCheck, dmenuSetVariables, NULL, "font8x8=koi8-r-8x8,font8x14=koi8-r-8x14,font8x16=koi8-r-8x16" }, - { "SWISS", "English, better resolution", dmenuVarCheck, dmenuSetVariables, NULL, + { "8 SWISS", "English, better resolution", dmenuVarCheck, dmenuSetVariables, NULL, "font8x8=swiss-8x8,font8x14=NO,font8x16=swiss-8x16" }, { NULL } }, }; @@ -1582,9 +1581,9 @@ DMenu MenuUsermgmt = { "login accounts.\n", "Configure your user groups and users", NULL, - { { "Add user", "Add a new user to the system.", NULL, userAddUser }, - { "Add group", "Add a new user group to the system.", NULL, userAddGroup }, - { "Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, + { { "User", "Add a new user to the system.", NULL, userAddUser }, + { "Group", "Add a new user group to the system.", NULL, userAddGroup }, + { "X Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, { NULL } }, }; @@ -1602,6 +1601,7 @@ DMenu MenuFixit = { { { "1 CDROM", "Use the 2nd \"live\" CDROM from the distribution", NULL, installFixitCDROM }, { "2 Floppy", "Use a floppy generated from the fixit image", NULL, installFixitFloppy }, { "3 Shell", "Start an Emergency Holographic Shell", NULL, installFixitHoloShell }, + { "X Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, { NULL } }, }; diff --git a/usr.sbin/sade/msg.c b/usr.sbin/sade/msg.c index 2986779..3d7affe 100644 --- a/usr.sbin/sade/msg.c +++ b/usr.sbin/sade/msg.c @@ -184,6 +184,7 @@ msgConfirm(char *fmt, ...) { va_list args; char *errstr; + WINDOW *w = savescr(); errstr = (char *)alloca(FILENAME_MAX); va_start(args, fmt); @@ -196,6 +197,7 @@ msgConfirm(char *fmt, ...) msgInfo(NULL); } dialog_notify(errstr); + restorescr(w); } /* Put up a message in a popup information box */ @@ -204,6 +206,7 @@ msgNotify(char *fmt, ...) { va_list args; char *errstr; + WINDOW *w = savescr(); errstr = (char *)alloca(FILENAME_MAX); va_start(args, fmt); @@ -213,8 +216,9 @@ msgNotify(char *fmt, ...) use_helpfile(NULL); if (isDebug()) msgDebug("Notify: %s\n", errstr); - dialog_clear_norefresh(); dialog_msgbox(NULL, errstr, -1, -1, 0); + sleep(1); + restorescr(w); } /* Put up a message in a popup yes/no box and return 1 for YES, 0 for NO */ @@ -224,7 +228,8 @@ msgYesNo(char *fmt, ...) va_list args; char *errstr; int ret; - + WINDOW *w = savescr(); + errstr = (char *)alloca(FILENAME_MAX); va_start(args, fmt); vsnprintf(errstr, FILENAME_MAX, fmt, args); @@ -236,6 +241,7 @@ msgYesNo(char *fmt, ...) msgInfo(NULL); } ret = dialog_yesno("User Confirmation Requested", errstr, -1, -1); + restorescr(w); return ret; } @@ -247,6 +253,7 @@ msgGetInput(char *buf, char *fmt, ...) char *errstr; static char input_buffer[256]; int rval; + WINDOW *w = savescr(); errstr = (char *)alloca(FILENAME_MAX); va_start(args, fmt); @@ -263,6 +270,7 @@ msgGetInput(char *buf, char *fmt, ...) msgInfo(NULL); } rval = dialog_inputbox("Value Required", errstr, -1, -1, input_buffer); + restorescr(w); if (!rval) return input_buffer; else @@ -292,7 +300,8 @@ msgWeHaveOutput(char *fmt, ...) { va_list args; char *errstr; - + WINDOW *w = savescr(); + errstr = (char *)alloca(FILENAME_MAX); va_start(args, fmt); vsnprintf(errstr, FILENAME_MAX, fmt, args); @@ -302,6 +311,7 @@ msgWeHaveOutput(char *fmt, ...) msgDebug("Notify: %s\n", errstr); dialog_clear_norefresh(); dialog_msgbox(NULL, errstr, -1, -1, 0); + restorescr(w); } /* Simple versions of msgConfirm() and msgNotify() for calling from scripts */ diff --git a/usr.sbin/sade/system.c b/usr.sbin/sade/system.c index 0353fc6..c03d211 100644 --- a/usr.sbin/sade/system.c +++ b/usr.sbin/sade/system.c @@ -191,7 +191,9 @@ systemExecute(char *command) { int status; struct termios foo; + WINDOW *w = savescr(); + dialog_clear(); dialog_update(); end_dialog(); DialogActive = FALSE; @@ -206,6 +208,7 @@ systemExecute(char *command) msgDebug("systemExecute: Faked execution of `%s'\n", command); } DialogActive = TRUE; + restorescr(w); return status; } @@ -216,7 +219,8 @@ systemDisplayHelp(char *file) char *fname = NULL; char buf[FILENAME_MAX]; int ret = 0; - + WINDOW *w = savescr(); + fname = systemHelpFile(file, buf); if (!fname) { snprintf(buf, FILENAME_MAX, "The %s file is not provided on this particular floppy image.", file); @@ -230,6 +234,7 @@ systemDisplayHelp(char *file) use_helpline(NULL); dialog_textbox(file, fname, LINES, COLS); } + restorescr(w); return ret; } diff --git a/usr.sbin/sysinstall/anonFTP.c b/usr.sbin/sysinstall/anonFTP.c index 134c9d3..04f8fbc 100644 --- a/usr.sbin/sysinstall/anonFTP.c +++ b/usr.sbin/sysinstall/anonFTP.c @@ -191,12 +191,14 @@ anonftpOpenDialog(void) int n = 0, cancel = FALSE; int max; char title[80]; - + WINDOW *w = savescr(); + /* We need a curses window */ if (!(ds_win = openLayoutDialog(ANONFTP_HELPFILE, " Anonymous FTP Configuration ", ANONFTP_DIALOG_X, ANONFTP_DIALOG_Y, ANONFTP_DIALOG_WIDTH, ANONFTP_DIALOG_HEIGHT))) { beep(); msgConfirm("Cannot open anonymous ftp dialog window!!"); + restorescr(w); return DITEM_FAILURE; } @@ -225,9 +227,8 @@ anonftpOpenDialog(void) /* Clear this crap off the screen */ delwin(ds_win); - dialog_clear_norefresh(); use_helpfile(NULL); - + restorescr(w); if (cancel) return DITEM_FAILURE; return DITEM_SUCCESS; @@ -241,11 +242,10 @@ configAnonFTP(dialogMenuItem *self) /* Be optimistic */ i = DITEM_SUCCESS; - dialog_clear_norefresh(); i = anonftpOpenDialog(); if (DITEM_STATUS(i) != DITEM_SUCCESS) { msgConfirm("Configuration of Anonymous FTP cancelled per user request."); - return i | DITEM_RESTORE; + return i; } /*** Use defaults for any invalid values ***/ @@ -296,7 +296,6 @@ configAnonFTP(dialogMenuItem *self) if (!msgYesNo("Create a welcome message file for anonymous FTP users?")) { char cmd[256]; - dialog_clear(); vsystem("echo Your welcome message here. > %s/etc/%s", tconf.homedir, MOTD_FILE); sprintf(cmd, "%s %s/etc/%s", variable_get(VAR_EDITOR), tconf.homedir, MOTD_FILE); if (!systemExecute(cmd)) @@ -312,5 +311,5 @@ configAnonFTP(dialogMenuItem *self) } if (DITEM_STATUS(i) == DITEM_SUCCESS) variable_set2("anon_ftp", "YES", 0); - return i | DITEM_RESTORE; + return i; } diff --git a/usr.sbin/sysinstall/config.c b/usr.sbin/sysinstall/config.c index 32d1161..6fa001f 100644 --- a/usr.sbin/sysinstall/config.c +++ b/usr.sbin/sysinstall/config.c @@ -417,7 +417,7 @@ configSaverTimeout(dialogMenuItem *self) { return (variable_get_value(VAR_BLANKTIME, "Enter time-out period in seconds for screen saver", 1) ? - DITEM_SUCCESS : DITEM_FAILURE) | DITEM_RESTORE; + DITEM_SUCCESS : DITEM_FAILURE); } int @@ -436,16 +436,18 @@ configNTP(dialogMenuItem *self) self->data = tmp; dmenuSetVariables(self); } - return status | DITEM_RESTORE; + return status; } int configUsers(dialogMenuItem *self) { + WINDOW *w = savescr(); + dialog_clear_norefresh(); dmenuOpenSimple(&MenuUsermgmt, FALSE); - dialog_clear(); - return DITEM_SUCCESS | DITEM_RESTORE; + restorescr(w); + return DITEM_SUCCESS; } int @@ -498,10 +500,13 @@ configXDesktop(dialogMenuItem *self) { char *desk; int ret = DITEM_SUCCESS; - - if (!dmenuOpenSimple(&MenuXDesktops, FALSE) || - !(desk = variable_get(VAR_DESKSTYLE))) + WINDOW *w = savescr(); + + dialog_clear_norefresh(); + if (!dmenuOpenSimple(&MenuXDesktops, FALSE) || !(desk = variable_get(VAR_DESKSTYLE))) { + restorescr(w); return DITEM_FAILURE; + } if (!strcmp(desk, "kde")) { ret = package_add("kde"); if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("startkde")) @@ -544,6 +549,7 @@ configXDesktop(dialogMenuItem *self) "by this desktop type. Please change installation media\n" "and/or select a different, perhaps simpler, desktop\n" "environment and try again."); + restorescr(w); return ret; } @@ -552,21 +558,27 @@ configXSetup(dialogMenuItem *self) { char *config, *execfile, *style; char *moused; - + WINDOW *w; + setenv("XWINHOME", "/usr/X11R6", 1); tryagain: - dialog_clear_norefresh(); + w = savescr(); variable_unset(VAR_DESKSTYLE); variable_unset(VAR_XF86_CONFIG); - if (!dmenuOpenSimple(&MenuXF86Config, FALSE)) - return DITEM_FAILURE | DITEM_RESTORE; + dialog_clear_norefresh(); + if (!dmenuOpenSimple(&MenuXF86Config, FALSE)) { + restorescr(w); + return DITEM_FAILURE; + } config = variable_get(VAR_XF86_CONFIG); style = variable_get(VAR_DESKSTYLE); if (!config) { if (style) goto config_desktop; - else - return DITEM_FAILURE | DITEM_RESTORE; + else { + restorescr(w); + return DITEM_FAILURE; + } } if (file_readable("/var/run/ld.so.hints")) @@ -577,7 +589,6 @@ tryagain: vsystem("/sbin/ifconfig lo0 127.0.0.1"); execfile = string_concat("/usr/X11R6/bin/", config); if (file_executable(execfile)) { - dialog_clear_norefresh(); moused = variable_get(VAR_MOUSED); while (!moused || strcmp(moused, "YES")) { if (msgYesNo("The X server may access the mouse in two ways: direct access\n" @@ -586,8 +597,8 @@ tryagain: "now? If you intend to let the X server access the mouse\n" "directly, choose \"No\" at this time.")) break; + dialog_clear_norefresh(); dmenuOpenSimple(&MenuMouse, FALSE); - dialog_clear(); moused = variable_get(VAR_MOUSED); } if (moused && !strcmp(moused, "YES")) @@ -595,23 +606,25 @@ tryagain: "Choose \"/dev/sysmouse\" as the mouse port and \"SysMouse\" or\n" "\"MouseSystems\" as the mouse protocol in the X configuration\n" "utility."); - dialog_clear(); systemExecute(execfile); if (!file_readable("/etc/XF86Config")) { if (!msgYesNo("The XFree86 configuration process seems to have\nfailed. Would you like to try again?")) goto tryagain; - else - return DITEM_FAILURE | DITEM_RESTORE; + else { + restorescr(w); + return DITEM_FAILURE; + } } config_desktop: configXDesktop(self); - return DITEM_SUCCESS | DITEM_RESTORE; + restorescr(w); + return DITEM_SUCCESS; } else { - dialog_clear_norefresh(); msgConfirm("The XFree86 setup utility you chose does not appear to be installed!\n" "Please install this before attempting to configure XFree86."); - return DITEM_FAILURE | DITEM_RESTORE; + restorescr(w); + return DITEM_FAILURE; } } @@ -713,7 +726,7 @@ configRouter(dialogMenuItem *self) variable_unset(VAR_ROUTER); } } - return ret | DITEM_RESTORE; + return ret; } /* Shared between us and index_initialize() */ @@ -750,7 +763,6 @@ configPackages(dialogMenuItem *self) } } else { - dialog_clear_norefresh(); msgConfirm("No packages were selected for extraction."); break; } @@ -763,7 +775,7 @@ configPackages(dialogMenuItem *self) tmp = tmp2; } index_init(NULL, &Plist); - return DITEM_SUCCESS | DITEM_RESTORE; + return DITEM_SUCCESS; } /* Load pcnfsd package */ @@ -809,9 +821,9 @@ configNFSServer(dialogMenuItem *self) sprintf(cmd, "%s /etc/exports", variable_get(VAR_EDITOR)); dialog_clear(); systemExecute(cmd); - restorescr(w); } variable_set2(VAR_NFS_SERVER, "YES", 1); + restorescr(w); } else if (variable_get(VAR_NFS_SERVER)) { /* We want to turn it off again? */ vsystem("mv -f /etc/exports /etc/exports.disabled"); diff --git a/usr.sbin/sysinstall/disks.c b/usr.sbin/sysinstall/disks.c index 9c736a8..20a7e90 100644 --- a/usr.sbin/sysinstall/disks.c +++ b/usr.sbin/sysinstall/disks.c @@ -358,7 +358,6 @@ diskPartition(Device *dev) char *val, tmp[20]; int subtype; chunk_e partitiontype; - WINDOW *save = savescr(); strcpy(tmp, "165"); val = msgGetInput(tmp, "New partition type:\n\n" @@ -380,7 +379,6 @@ diskPartition(Device *dev) chunk_info[current_chunk]->type = partitiontype; chunk_info[current_chunk]->subtype = subtype; } - restorescr(save); } break; @@ -504,7 +502,6 @@ diskPartition(Device *dev) if (p) { char buf[FILENAME_MAX]; - dialog_clear_norefresh(); use_helpline("Press F1 to read more about disk slices."); use_helpfile(systemHelpFile("partition", buf)); if (!variable_get(VAR_NO_WARN)) @@ -562,7 +559,7 @@ partitionHook(dialogMenuItem *selected) } else devs[0]->enabled = FALSE; - return DITEM_SUCCESS | DITEM_RESTORE; + return DITEM_SUCCESS; } static int @@ -626,7 +623,7 @@ diskPartitionEditor(dialogMenuItem *self) i = dmenuOpenSimple(menu, FALSE) ? DITEM_SUCCESS : DITEM_FAILURE; free(menu); } - return i | DITEM_RESTORE; + return i; } } return DITEM_SUCCESS; @@ -716,7 +713,6 @@ diskPartitionNonInteractive(Device *dev) } } if (!chunk_info[i]) { - dialog_clear(); msgConfirm("Unable to find any free space on this disk!"); return; } @@ -746,7 +742,6 @@ diskPartitionNonInteractive(Device *dev) } } if (!chunk_info[i]) { - dialog_clear(); msgConfirm("Unable to find %d free blocks on this disk!", sz); return; } @@ -758,13 +753,11 @@ diskPartitionNonInteractive(Device *dev) break; } if (!chunk_info[i]) { - dialog_clear(); msgConfirm("Unable to find any existing FreeBSD partitions on this disk!"); return; } } else { - dialog_clear(); msgConfirm("`%s' is an invalid value for %s - is config file valid?", cp, VAR_PARTITION); return; } diff --git a/usr.sbin/sysinstall/dispatch.c b/usr.sbin/sysinstall/dispatch.c index 3090a27..15c6c27 100644 --- a/usr.sbin/sysinstall/dispatch.c +++ b/usr.sbin/sysinstall/dispatch.c @@ -381,15 +381,13 @@ dispatch_load_file(dialogMenuItem *self) int dispatch_load_floppy(dialogMenuItem *self) { - int what = DITEM_RESTORE | DITEM_SUCCESS; + int what = DITEM_SUCCESS; extern char *distWanted; char *cp; FILE *fp; qelement *list; mediaClose(); - dialog_clear_norefresh(); - cp = variable_get_value(VAR_INSTALL_CFG, "Specify the name of a configuration file\n" "residing on a MSDOS or UFS floppy.", 0); @@ -430,7 +428,6 @@ dispatch_load_floppy(dialogMenuItem *self) what |= DITEM_FAILURE; mediaClose(); } - return what; } diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c index bb4e6e2..8bcf5ac 100644 --- a/usr.sbin/sysinstall/dist.c +++ b/usr.sbin/sysinstall/dist.c @@ -374,22 +374,22 @@ int distSetDES(dialogMenuItem *self) { int i; - + + dialog_clear_norefresh(); if (!dmenuOpenSimple(&MenuDESDistributions, FALSE)) i = DITEM_FAILURE; else i = DITEM_SUCCESS; distVerifyFlags(); - return i | DITEM_RESTORE; + return i | DITEM_REDRAW | DITEM_RESTORE; } static int distMaybeSetDES(dialogMenuItem *self) { - int i = DITEM_SUCCESS; + int i = DITEM_SUCCESS | DITEM_REDRAW; - dialog_clear_norefresh(); - if (!msgYesNo("Do wish to install DES cryptographic software?\n\n" + if (!msgYesNo("Do you 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" "UNIX DES passwords on other non-FreeBSD systems.\n\n" @@ -404,13 +404,12 @@ distMaybeSetDES(dialogMenuItem *self) i = DITEM_FAILURE; } distVerifyFlags(); - return i | DITEM_RESTORE; + return i | DITEM_REDRAW; } static int distMaybeSetPorts(dialogMenuItem *self) { - dialog_clear_norefresh(); if (!msgYesNo("Would you like to install the FreeBSD ports collection?\n\n" "This will give you ready access to over 2000 ported software packages,\n" "though at a cost of around 90MB of disk space when \"clean\" and possibly\n" @@ -424,7 +423,7 @@ distMaybeSetPorts(dialogMenuItem *self) Dists |= DIST_PORTS; else Dists &= ~DIST_PORTS; - return DITEM_SUCCESS | DITEM_RESTORE; + return DITEM_SUCCESS; } static Boolean @@ -530,6 +529,7 @@ distSetSrc(dialogMenuItem *self) { int i; + dialog_clear_norefresh(); if (!dmenuOpenSimple(&MenuSrcDistributions, FALSE)) i = DITEM_FAILURE; else @@ -543,6 +543,7 @@ distSetXF86(dialogMenuItem *self) { int i = DITEM_SUCCESS; + dialog_clear_norefresh(); if (!dmenuOpenSimple(&MenuXF86Select, FALSE)) i = DITEM_FAILURE; distVerifyFlags(); @@ -848,11 +849,12 @@ distExtractAll(dialogMenuItem *self) { int old_dists, retries = 0, status = DITEM_SUCCESS; char buf[512]; + WINDOW *w; /* paranoia */ if (!Dists) { if (!dmenuOpenSimple(&MenuSubDistributions, FALSE) || !Dists) - return DITEM_FAILURE | DITEM_RESTORE; + return DITEM_FAILURE; } if (!mediaVerify() || !mediaDevice->init(mediaDevice)) @@ -863,7 +865,8 @@ distExtractAll(dialogMenuItem *self) dialog_clear_norefresh(); msgNotify("Attempting to install all selected distributions.."); - + w = savescr(); + /* Try for 3 times around the loop, then give up. */ while (Dists && ++retries < 3) distExtract(NULL, DistTable); @@ -886,7 +889,7 @@ distExtractAll(dialogMenuItem *self) 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); - status |= DITEM_RESTORE; } + restorescr(w); return status; } diff --git a/usr.sbin/sysinstall/dist.h b/usr.sbin/sysinstall/dist.h index a13f8b7..ccce9d2 100644 --- a/usr.sbin/sysinstall/dist.h +++ b/usr.sbin/sysinstall/dist.h @@ -43,6 +43,7 @@ #define DIST_DES_KERBEROS 0x0008 #endif #define DIST_DES_SKERBEROS 0x0010 +#define DIST_DES_ALL 0x001F /* Subtypes for SRC distribution */ #define DIST_SRC_BASE 0x00001 @@ -61,7 +62,7 @@ #define DIST_SRC_UBIN 0x02000 #define DIST_SRC_USBIN 0x04000 #define DIST_SRC_BIN 0x08000 -#define DIST_SRC_ALL 0xFFFF +#define DIST_SRC_ALL 0x0FFFF /* Subtypes for XFree86 distribution */ #define DIST_XF86_BIN 0x0001 diff --git a/usr.sbin/sysinstall/dmenu.c b/usr.sbin/sysinstall/dmenu.c index 9e464d9..6f5f4e5 100644 --- a/usr.sbin/sysinstall/dmenu.c +++ b/usr.sbin/sysinstall/dmenu.c @@ -45,14 +45,13 @@ int dmenuDisplayFile(dialogMenuItem *tmp) { systemDisplayHelp((char *)tmp->data); - return DITEM_SUCCESS | DITEM_RESTORE; + return DITEM_SUCCESS; } int dmenuSubmenu(dialogMenuItem *tmp) { - return (dmenuOpenSimple((DMenu *)(tmp->data), FALSE) ? DITEM_SUCCESS : DITEM_FAILURE) | - DITEM_RESTORE; + return (dmenuOpenSimple((DMenu *)(tmp->data), FALSE) ? DITEM_SUCCESS : DITEM_FAILURE); } int @@ -72,10 +71,13 @@ dmenuSystemCommand(dialogMenuItem *self) int dmenuSystemCommandBox(dialogMenuItem *tmp) { + WINDOW *w = savescr(); + use_helpfile(NULL); use_helpline("Select OK to dismiss this dialog"); dialog_prgbox(tmp->title, (char *)tmp->data, 22, 76, 1, 1); - return DITEM_SUCCESS | DITEM_RESTORE; + restorescr(w); + return DITEM_SUCCESS; } int @@ -147,15 +149,12 @@ int dmenuISetVariable(dialogMenuItem *tmp) { char *ans, *var; - WINDOW *w = NULL; /* Keep lint happy */ if (!(var = (char *)tmp->data)) { msgConfirm("Incorrect data field for `%s'!", tmp->title); return DITEM_FAILURE; } - w = savescr(); ans = msgGetInput(variable_get(var), tmp->title, 1); - restorescr(w); if (!ans) return DITEM_FAILURE; else if (!*ans) @@ -275,13 +274,13 @@ dmenuOpen(DMenu *menu, int *choice, int *scroll, int *curr, int *max, Boolean bu while (1) { char buf[FILENAME_MAX]; + WINDOW *w = savescr(); /* Any helpful hints, put 'em up! */ use_helpline(menu->helpline); use_helpfile(systemHelpFile(menu->helpfile, buf)); - - /* Pop up that dialog! */ dialog_clear_norefresh(); + /* Pop up that dialog! */ 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); @@ -295,14 +294,18 @@ dmenuOpen(DMenu *menu, int *choice, int *scroll, int *curr, int *max, Boolean bu menu_height(menu, n), -n, items, (char *)buttons); else msgFatal("Menu: `%s' is of an unknown type\n", menu->title); - clearok(stdscr, TRUE); if (exited) { exited = FALSE; + restorescr(w); return TRUE; } - else if (rval) + else if (rval) { + restorescr(w); return FALSE; - else if (menu->type & DMENU_SELECTION_RETURNS) + } + else if (menu->type & DMENU_SELECTION_RETURNS) { + restorescr(w); return TRUE; + } } } diff --git a/usr.sbin/sysinstall/doc.c b/usr.sbin/sysinstall/doc.c index 513259a..5a873d1 100644 --- a/usr.sbin/sysinstall/doc.c +++ b/usr.sbin/sysinstall/doc.c @@ -72,14 +72,14 @@ docBrowser(dialogMenuItem *self) "not appear to be correct. Would you like me to do that now?", browser, variable_get(VAR_BROWSER_BINARY))) vsystem("pkg_delete %s %s", !strcmp(variable_get(VAR_CPIO_VERBOSITY), "high") ? "-v" : "", browser); - return DITEM_FAILURE | DITEM_RESTORE; + return DITEM_FAILURE; } /* Run browser on the appropriate doc */ if (dmenuOpenSimple(&MenuHTMLDoc, FALSE)) - return DITEM_SUCCESS | DITEM_RESTORE; + return DITEM_SUCCESS; else - return DITEM_FAILURE | DITEM_RESTORE; + return DITEM_FAILURE; } /* Try to show one of the documents requested from the HTML doc menu */ @@ -114,9 +114,8 @@ docShowDocument(dialogMenuItem *self) } if (where) { sprintf(tmp, "%s %s", browser, where); - dialog_clear(); systemExecute(tmp); - return DITEM_SUCCESS | DITEM_RESTORE; + return DITEM_SUCCESS; } else { msgConfirm("Hmmmmm! I can't seem to access the documentation you selected!\n" diff --git a/usr.sbin/sysinstall/index.c b/usr.sbin/sysinstall/index.c index cc2193c..034e042 100644 --- a/usr.sbin/sysinstall/index.c +++ b/usr.sbin/sysinstall/index.c @@ -480,8 +480,6 @@ pkg_fire(dialogMenuItem *self) msgInfo("Added %s to selection list", kp->name); } else if (ie->depc == 0) { - WINDOW *save = savescr(); - if (!msgYesNo("Do you really want to delete %s from the system?", kp->name)) { if (vsystem("pkg_delete %s %s", isDebug() ? "-v" : "", kp->name)) { msgConfirm("Warning: pkg_delete of %s failed.\n Check debug output for details.", kp->name); @@ -491,7 +489,6 @@ pkg_fire(dialogMenuItem *self) index_recorddeps(FALSE, lists->root, ie); } } - restorescr(save); } else msgConfirm("Warning: Package %s is needed by\n %d other installed package%s.", @@ -537,16 +534,15 @@ index_menu(PkgNodePtr root, PkgNodePtr top, PkgNodePtr plist, int *pos, int *scr dialogMenuItem *nitems; Boolean hasPackages; WINDOW *w; - + lists.root = root; lists.top = top; lists.plist = plist; hasPackages = FALSE; nitems = NULL; - - w = savescr(); n = maxname = 0; + /* Figure out if this menu is full of "leaves" or "branches" */ for (kp = top->kids; kp && kp->name; kp = kp->next) { int len; @@ -560,10 +556,10 @@ index_menu(PkgNodePtr root, PkgNodePtr top, PkgNodePtr plist, int *pos, int *scr } if (!n && plist) { msgConfirm("The %s menu is empty.", top->name); - restorescr(w); return DITEM_LEAVE_MENU; } + w = savescr(); while (1) { n = 0; curr = max = 0; @@ -707,20 +703,27 @@ int index_initialize(char *path) { FILE *fp; + WINDOW *w = NULL; if (!index_initted) { + w = savescr(); + dialog_clear_norefresh(); + /* Got any media? */ - if (!mediaVerify()) + if (!mediaVerify()) { + restorescr(w); return DITEM_FAILURE; + } /* Does it move when you kick it? */ - if (!mediaDevice->init(mediaDevice)) + if (!mediaDevice->init(mediaDevice)) { + restorescr(w); return DITEM_FAILURE; + } msgNotify("Attempting to fetch %s file from selected media.", path); fp = mediaDevice->get(mediaDevice, path, TRUE); if (!fp) { - 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" @@ -729,7 +732,8 @@ index_initialize(char *path) "carry the packages collection, then we recommend either a CD\n" "distribution or the master distribution on ftp.freebsd.org."); mediaDevice->shutdown(mediaDevice); - return DITEM_FAILURE | DITEM_RESTORE; + restorescr(w); + return DITEM_FAILURE; } msgNotify("Located INDEX, now reading package data from it..."); index_init(&Top, &Plist); @@ -737,11 +741,13 @@ index_initialize(char *path) msgConfirm("I/O or format error on packages/INDEX file.\n" "Please verify media (or path to media) and try again."); fclose(fp); - return DITEM_FAILURE | DITEM_RESTORE; + restorescr(w); + return DITEM_FAILURE; } fclose(fp); index_sort(&Top); index_initted = TRUE; } - return DITEM_SUCCESS | DITEM_RESTORE; + restorescr(w); + return DITEM_SUCCESS; } diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c index 4ff5cb2..9271b8b 100644 --- a/usr.sbin/sysinstall/install.c +++ b/usr.sbin/sysinstall/install.c @@ -205,7 +205,7 @@ installInitial(void) "then WE STRONGLY ENCOURAGE YOU TO MAKE PROPER BACKUPS before\n" "proceeding!\n\n" "We can take no responsibility for lost disk contents!") != 0) - return DITEM_FAILURE | DITEM_RESTORE; + return DITEM_FAILURE; if (DITEM_STATUS(diskLabelCommit(NULL)) != DITEM_SUCCESS) { msgConfirm("Couldn't make filesystems properly. Aborting."); @@ -440,6 +440,7 @@ installExpress(dialogMenuItem *self) { int i; + dialog_clear_norefresh(); variable_set2(SYSTEM_STATE, "express", 0); #ifndef __alpha__ if (DITEM_STATUS((i = diskPartitionEditor(self))) == DITEM_FAILURE) @@ -449,13 +450,12 @@ installExpress(dialogMenuItem *self) if (DITEM_STATUS((i = diskLabelEditor(self))) == DITEM_FAILURE) return i; - dialog_clear_norefresh(); if (DITEM_STATUS((i = installCommit(self))) == DITEM_SUCCESS) { i |= DITEM_LEAVE_MENU; /* Give user the option of one last configuration spree */ installConfigure(); } - return i | DITEM_RESTORE; + return i; } /* Novice mode installation */ @@ -466,8 +466,8 @@ installNovice(dialogMenuItem *self) Device **devs; variable_set2(SYSTEM_STATE, "novice", 0); -#ifndef __alpha__ dialog_clear_norefresh(); +#ifndef __alpha__ 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 (overwriting anything else that might be on the disk(s) selected)\n" @@ -487,7 +487,6 @@ nodisks: } #endif - dialog_clear_norefresh(); #ifdef __alpha__ msgConfirm("First, you need to create BSD partitions on the disk which you are\n" "installing to. If you have a reasonable amount of disk space (200MB or more)\n" @@ -507,15 +506,13 @@ nodisks: if (DITEM_STATUS(diskLabelEditor(self)) == DITEM_FAILURE) return DITEM_FAILURE; - dialog_clear_norefresh(); if (DITEM_STATUS((i = installCommit(self))) == DITEM_FAILURE) { - dialog_clear_norefresh(); msgConfirm("Installation completed with some errors. You may wish to\n" "scroll through the debugging messages on VTY1 with the\n" "scroll-lock feature. You can also chose \"No\" at the next\n" "prompt and go back into the installation menus to try and retry\n" "whichever operations have failed."); - return i | DITEM_RESTORE; + return i; } else { @@ -529,108 +526,72 @@ nodisks: } if (mediaDevice->type != DEVICE_TYPE_FTP && mediaDevice->type != DEVICE_TYPE_NFS) { if (!msgYesNo("Would you like to configure any Ethernet or SLIP/PPP network devices?")) { - Device *tmp; + Device *tmp = tcpDeviceSelect(); - dialog_clear_norefresh(); - tmp = tcpDeviceSelect(); - dialog_clear_norefresh(); if (tmp && !((DevInfo *)tmp->private)->use_dhcp && !msgYesNo("Would you like to bring the %s interface up right now?", tmp->name)) if (!tmp->init(tmp)) msgConfirm("Initialization of %s device failed.", tmp->name); } } - dialog_clear_norefresh(); if (!msgYesNo("Will this machine be an IP gateway (e.g. will it forward packets\n" "between interfaces)?")) variable_set2("gateway_enable", "YES", 1); - dialog_clear_norefresh(); if (!msgYesNo("Do you want to allow anonymous FTP connections to this machine?")) configAnonFTP(self); - dialog_clear_norefresh(); if (!msgYesNo("Do you want to configure this machine as an NFS server?")) configNFSServer(self); - dialog_clear_norefresh(); if (!msgYesNo("Do you want to configure this machine as an NFS client?")) variable_set2("nfs_client_enable", "YES", 1); - dialog_clear_norefresh(); - if (!msgYesNo("Would you like to customize your system console settings?")) { - WINDOW *w = savescr(); - + if (!msgYesNo("Would you like to customize your system console settings?")) dmenuOpenSimple(&MenuSyscons, FALSE); - restorescr(w); - } - - dialog_clear_norefresh(); - if (!msgYesNo("Would you like to set this machine's time zone now?")) { - WINDOW *w = savescr(); - dialog_clear(); + if (!msgYesNo("Would you like to set this machine's time zone now?")) systemExecute("tzsetup"); - restorescr(w); - } #ifdef __i386__ - dialog_clear_norefresh(); if (!msgYesNo("Would you like to enable Linux binary compatibility?")) (void)configLinux(self); #endif - dialog_clear_norefresh(); - if (!msgYesNo("Does this system have a mouse attached to it?")) { - WINDOW *w = savescr(); - + if (!msgYesNo("Does this system have a mouse attached to it?")) dmenuOpenSimple(&MenuMouse, FALSE); - restorescr(w); - } /* Now would be a good time to checkpoint the configuration data */ configRC_conf(); sync(); if (directory_exists("/usr/X11R6")) { - dialog_clear_norefresh(); if (!msgYesNo("Would you like to configure your X server at this time?")) (void)configXSetup(self); } - dialog_clear_norefresh(); if (!msgYesNo("The FreeBSD package collection is a collection of hundreds of ready-to-run\n" "applications, from text editors to games to WEB servers and more. Would you\n" "like to browse the collection now?")) { - dialog_clear(); (void)configPackages(self); } - dialog_clear_norefresh(); if (!msgYesNo("Would you like to add any initial user accounts to the system?\n" "Adding at least one account for yourself at this stage is suggested\n" "since working as the \"root\" user is dangerous (it is easy to do\n" "things which adversely affect the entire system).")) (void)configUsers(self); - dialog_clear_norefresh(); msgConfirm("Now you must set the system manager's password.\n" "This is the password you'll use to log in as \"root\"."); - { - WINDOW *w = savescr(); - - if (!systemExecute("passwd root")) - variable_set2("root_password", "YES", 0); - restorescr(w); - } + if (!systemExecute("passwd root")) + variable_set2("root_password", "YES", 0); /* XXX Put whatever other nice configuration questions you'd like to ask the user here XXX */ /* Give user the option of one last configuration spree */ - dialog_clear_norefresh(); installConfigure(); - - return DITEM_LEAVE_MENU | DITEM_RESTORE; + return DITEM_LEAVE_MENU; } /* The version of commit we call from the Install Custom menu */ @@ -639,7 +600,6 @@ installCustomCommit(dialogMenuItem *self) { int i; - dialog_clear_norefresh(); i = installCommit(self); if (DITEM_STATUS(i) == DITEM_SUCCESS) { /* Give user the option of one last configuration spree */ @@ -667,15 +627,16 @@ installCommit(dialogMenuItem *self) int i; char *str; + dialog_clear_norefresh(); if (!Dists) distConfig(NULL); if (!Dists) if (!dmenuOpenSimple(&MenuDistributions, FALSE) && !Dists) - return DITEM_FAILURE | DITEM_RESTORE; + return DITEM_FAILURE; if (!mediaVerify()) - return DITEM_FAILURE | DITEM_RESTORE; + return DITEM_FAILURE; str = variable_get(SYSTEM_STATE); if (isDebug()) @@ -691,12 +652,12 @@ try_media: "adjust your media configuration and try again?")) { mediaDevice = NULL; if (!mediaVerify()) - return DITEM_FAILURE | DITEM_RESTORE; + return DITEM_FAILURE; else goto try_media; } else - return DITEM_FAILURE | DITEM_RESTORE; + return DITEM_FAILURE; } /* Now go get it all */ @@ -707,21 +668,16 @@ try_media: variable_set2(SYSTEM_STATE, DITEM_STATUS(i) == DITEM_FAILURE ? "error-install" : "full-install", 0); - return i | DITEM_RESTORE; + return i; } static void installConfigure(void) { /* Final menu of last resort */ - dialog_clear_norefresh(); if (!msgYesNo("Visit the general configuration menu for a chance to set\n" - "any last options?")) { - WINDOW *w = savescr(); - + "any last options?")) dmenuOpenSimple(&MenuConfigure, FALSE); - restorescr(w); - } configRC_conf(); sync(); } diff --git a/usr.sbin/sysinstall/installUpgrade.c b/usr.sbin/sysinstall/installUpgrade.c index bde2824..10eede7 100644 --- a/usr.sbin/sysinstall/installUpgrade.c +++ b/usr.sbin/sysinstall/installUpgrade.c @@ -162,17 +162,15 @@ installUpgrade(dialogMenuItem *self) variable_set2(SYSTEM_STATE, "upgrade", 0); systemDisplayHelp("UPGRADE"); - 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?") != 0) - return DITEM_FAILURE | DITEM_RESTORE; + return DITEM_FAILURE; if (!Dists) { msgConfirm("First, you must select some distribution components. The upgrade procedure\n" "will only upgrade the distributions you select in the next set of menus."); if (!dmenuOpenSimple(&MenuDistributions, FALSE) || !Dists) - return DITEM_FAILURE | DITEM_RESTORE; - dialog_clear_norefresh(); + return DITEM_FAILURE; } else if (!(Dists & DIST_BIN)) { /* No bin selected? Not much of an upgrade.. */ if (msgYesNo("You didn't select the bin distribution as one of the distributons to load.\n" @@ -180,8 +178,7 @@ installUpgrade(dialogMenuItem *self) "want to select the bin distribution? Chose No to bring up the Distributions\n" "menu again.") != 0) { if (!dmenuOpenSimple(&MenuDistributions, FALSE)) - return DITEM_FAILURE | DITEM_RESTORE; - dialog_clear_norefresh(); + return DITEM_FAILURE; } } @@ -221,7 +218,7 @@ installUpgrade(dialogMenuItem *self) if (DITEM_STATUS(diskLabelEditor(self)) == DITEM_FAILURE) { msgConfirm("The disk label editor returned an error status. Upgrade operation\n" "aborted."); - return DITEM_FAILURE | DITEM_RESTORE; + return DITEM_FAILURE; } /* Don't write out MBR info */ @@ -230,7 +227,7 @@ installUpgrade(dialogMenuItem *self) msgConfirm("Not all file systems were properly mounted. Upgrade operation\n" "aborted."); variable_unset(DISK_PARTITIONED); - return DITEM_FAILURE | DITEM_RESTORE; + return DITEM_FAILURE; } msgNotify("Updating /stand on root filesystem"); @@ -240,7 +237,7 @@ installUpgrade(dialogMenuItem *self) msgConfirm("Unable to chroot to /mnt - something is wrong with the\n" "root partition or the way it's mounted if this doesn't work."); variable_unset(DISK_PARTITIONED); - return DITEM_FAILURE | DITEM_RESTORE; + return DITEM_FAILURE; } chdir("/"); installEnvironment(); @@ -279,7 +276,7 @@ installUpgrade(dialogMenuItem *self) if (vsystem("tar -cBpf - -C /etc . | tar --unlink -xBpf - -C %s", saved_etc)) if (msgYesNo("Unable to backup your /etc into %s.\n" "Do you want to continue anyway?", saved_etc) != 0) - return DITEM_FAILURE | DITEM_RESTORE; + return DITEM_FAILURE; msgNotify("Preserving /root directory.."); vsystem("tar -cBpf - -C / root | tar --unlink -xBpf - -C %s", saved_etc); } @@ -305,7 +302,7 @@ installUpgrade(dialogMenuItem *self) media: /* We do this very late, but we unfortunately need to back up /etc first */ if (!mediaVerify()) - return DITEM_FAILURE | DITEM_RESTORE; + return DITEM_FAILURE; if (!mediaDevice->init(mediaDevice)) { if (!msgYesNo("Couldn't initialize the media. Would you like\n" @@ -412,7 +409,7 @@ installUpgradeNonInteractive(dialogMenuItem *self) if (DITEM_STATUS(diskLabelEditor(self)) == DITEM_FAILURE) { msgConfirm("The disk label editor returned an error status. Upgrade operation\n" "aborted."); - return DITEM_FAILURE | DITEM_RESTORE; + return DITEM_FAILURE; } /* Don't write out MBR info */ @@ -421,7 +418,7 @@ installUpgradeNonInteractive(dialogMenuItem *self) msgConfirm("Not all file systems were properly mounted. Upgrade operation\n" "aborted."); variable_unset(DISK_PARTITIONED); - return DITEM_FAILURE | DITEM_RESTORE; + return DITEM_FAILURE; } if (extractingBin) { @@ -435,7 +432,7 @@ installUpgradeNonInteractive(dialogMenuItem *self) msgConfirm("Unable to chroot to /mnt - something is wrong with the\n" "root partition or the way it's mounted if this doesn't work."); variable_unset(DISK_PARTITIONED); - return DITEM_FAILURE | DITEM_RESTORE; + return DITEM_FAILURE; } chdir("/"); systemCreateHoloshell(); @@ -443,7 +440,7 @@ installUpgradeNonInteractive(dialogMenuItem *self) if (!mediaVerify() || !mediaDevice->init(mediaDevice)) { msgNotify("Upgrade: Couldn't initialize media."); - return DITEM_FAILURE | DITEM_RESTORE; + return DITEM_FAILURE; } saved_etc = "/usr/tmp/etc"; @@ -451,7 +448,7 @@ installUpgradeNonInteractive(dialogMenuItem *self) msgNotify("Preserving /etc directory.."); if (vsystem("tar -cpBf - -C /etc . | tar -xpBf - -C %s", saved_etc)) { msgNotify("Unable to backup your /etc into %s.", saved_etc); - return DITEM_FAILURE | DITEM_RESTORE; + return DITEM_FAILURE; } if (file_readable("/kernel")) { @@ -488,7 +485,7 @@ installUpgradeNonInteractive(dialogMenuItem *self) msgNotify("First stage of upgrade completed successfully."); if (vsystem("tar -cpBf - -C %s . | tar --unlink -xpBf - -C /etc", saved_etc)) { msgNotify("Unable to resurrect your old /etc!"); - return DITEM_FAILURE | DITEM_RESTORE; + return DITEM_FAILURE; } return DITEM_SUCCESS | DITEM_REDRAW; } diff --git a/usr.sbin/sysinstall/label.c b/usr.sbin/sysinstall/label.c index ea9d9e7..340d7d9 100644 --- a/usr.sbin/sysinstall/label.c +++ b/usr.sbin/sysinstall/label.c @@ -111,7 +111,7 @@ labelHook(dialogMenuItem *selected) } else devs[0]->enabled = FALSE; - return DITEM_SUCCESS | DITEM_RESTORE; + return DITEM_SUCCESS; } static int @@ -171,7 +171,6 @@ diskLabelEditor(dialogMenuItem *self) i = dmenuOpenSimple(menu, FALSE) ? DITEM_SUCCESS : DITEM_FAILURE; free(menu); } - i |= DITEM_RESTORE; } } if (DITEM_STATUS(i) != DITEM_FAILURE) { @@ -384,13 +383,14 @@ get_partition_type(void) { char selection[20]; int i; - static unsigned char *fs_types[] = { "FS", "A file system", "Swap", "A swap partition.", }; + WINDOW *w = savescr(); + DialogX = 7; DialogY = 8; i = dialog_menu("Please choose a partition type", @@ -398,6 +398,7 @@ get_partition_type(void) "If you want to put a filesystem on it, choose FS.", -1, -1, 2, 2, fs_types, selection, NULL, NULL); DialogX = DialogY = 0; + restorescr(w); if (!i) { if (!strcmp(selection, "FS")) return PART_FILESYSTEM; @@ -693,6 +694,7 @@ diskLabel(Device *dev) #ifdef __alpha__ int i; #endif + WINDOW *w = savescr(); label_focus = 0; pslice_focus = 0; @@ -701,6 +703,7 @@ diskLabel(Device *dev) devs = deviceFind(NULL, DEVICE_TYPE_DISK); if (!devs) { msgConfirm("No disks found!"); + restorescr(w); return DITEM_FAILURE; } labeling = TRUE; @@ -1174,7 +1177,8 @@ diskLabel(Device *dev) else label_focus = here; } - return DITEM_SUCCESS | DITEM_RESTORE; + restorescr(w); + return DITEM_SUCCESS; } static int @@ -1187,12 +1191,10 @@ diskLabelNonInteractive(Device *dev) int i, status; Device **devs; Disk *d; - + status = DITEM_SUCCESS; - cp = variable_get(VAR_DISK); if (!cp) { - dialog_clear(); msgConfirm("diskLabel: No disk selected - can't label automatically."); return DITEM_FAILURE; } @@ -1277,7 +1279,6 @@ diskLabelNonInteractive(Device *dev) do_newfs[0] = '\0'; if (sscanf(cp, "%s %s", mpoint, do_newfs) != 2) { - dialog_clear(); msgConfirm("For slice entry %s, got an invalid detail entry of: %s", c1->name, cp); status = DITEM_FAILURE; continue; diff --git a/usr.sbin/sysinstall/media.c b/usr.sbin/sysinstall/media.c index 55055ed..1c27a0d 100644 --- a/usr.sbin/sysinstall/media.c +++ b/usr.sbin/sysinstall/media.c @@ -159,11 +159,11 @@ mediaSetCDROM(dialogMenuItem *self) status = dmenuOpenSimple(menu, FALSE); free(menu); if (!status) - return DITEM_FAILURE | DITEM_RESTORE; + return DITEM_FAILURE; } else mediaDevice = devs[0]; - return (mediaDevice ? DITEM_SUCCESS | DITEM_LEAVE_MENU : DITEM_FAILURE) | DITEM_RESTORE; + return (mediaDevice ? DITEM_SUCCESS | DITEM_LEAVE_MENU : DITEM_FAILURE); } static int @@ -201,13 +201,13 @@ mediaSetFloppy(dialogMenuItem *self) status = dmenuOpenSimple(menu, FALSE); free(menu); if (!status) - return DITEM_FAILURE | DITEM_RESTORE; + return DITEM_FAILURE; } else mediaDevice = devs[0]; if (mediaDevice) mediaDevice->private = NULL; - return (mediaDevice ? DITEM_LEAVE_MENU : DITEM_FAILURE) | DITEM_RESTORE; + return (mediaDevice ? DITEM_LEAVE_MENU : DITEM_FAILURE); } static int @@ -243,11 +243,11 @@ mediaSetDOS(dialogMenuItem *self) status = dmenuOpenSimple(menu, FALSE); free(menu); if (!status) - return DITEM_FAILURE | DITEM_RESTORE; + return DITEM_FAILURE; } else mediaDevice = devs[0]; - return (mediaDevice ? DITEM_LEAVE_MENU : DITEM_FAILURE) | DITEM_RESTORE; + return (mediaDevice ? DITEM_LEAVE_MENU : DITEM_FAILURE); } static int @@ -285,7 +285,7 @@ mediaSetTape(dialogMenuItem *self) status = dmenuOpenSimple(menu, FALSE); free(menu); if (!status) - return DITEM_FAILURE | DITEM_RESTORE; + return DITEM_FAILURE; } else mediaDevice = devs[0]; @@ -302,7 +302,7 @@ mediaSetTape(dialogMenuItem *self) else mediaDevice->private = strdup(val); } - return (mediaDevice ? DITEM_LEAVE_MENU : DITEM_FAILURE) | DITEM_RESTORE; + return (mediaDevice ? DITEM_LEAVE_MENU : DITEM_FAILURE); } /* @@ -316,7 +316,6 @@ mediaSetFTP(dialogMenuItem *self) char *cp, hostname[MAXHOSTNAMELEN], *dir; extern int FtpPort; static Device *networkDev = NULL; - int what = DITEM_RESTORE; mediaClose(); cp = variable_get(VAR_FTP_PATH); @@ -326,18 +325,15 @@ mediaSetFTP(dialogMenuItem *self) cp = NULL; if (!cp) { - dialog_clear_norefresh(); if (!dmenuOpenSimple(&MenuMediaFTP, FALSE)) - return DITEM_FAILURE | DITEM_RESTORE; + return DITEM_FAILURE; else cp = variable_get(VAR_FTP_PATH); - what = DITEM_RESTORE; } if (!cp) - return DITEM_FAILURE | what; + return DITEM_FAILURE; else if (!strcmp(cp, "other")) { variable_set2(VAR_FTP_PATH, "ftp://", 0); - 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" @@ -347,32 +343,31 @@ mediaSetFTP(dialogMenuItem *self) "home directory of the user being logged in as.", 0); if (!cp || !*cp || !strcmp(cp, "ftp://")) { variable_unset(VAR_FTP_PATH); - return DITEM_FAILURE | what; + return DITEM_FAILURE; } } if (strncmp("ftp://", cp, 6)) { msgConfirm("Sorry, %s is an invalid URL!", cp); variable_unset(VAR_FTP_PATH); - return DITEM_FAILURE | what; + return DITEM_FAILURE; } SAFE_STRCPY(ftpDevice.name, cp); SAFE_STRCPY(hostname, cp + 6); - dialog_clear_norefresh(); if (!networkDev || msgYesNo("You've already done the network configuration once,\n" "would you like to skip over it now?") != 0) { if (networkDev) networkDev->shutdown(networkDev); if (!(networkDev = tcpDeviceSelect())) { variable_unset(VAR_FTP_PATH); - return DITEM_FAILURE | what; + return DITEM_FAILURE; } } if (!networkDev->init(networkDev)) { if (isDebug()) msgDebug("mediaSetFTP: Net device init failed.\n"); variable_unset(VAR_FTP_PATH); - return DITEM_FAILURE | what; + return DITEM_FAILURE; } if ((cp = index(hostname, ':')) != NULL) { *(cp++) = '\0'; @@ -406,7 +401,7 @@ mediaSetFTP(dialogMenuItem *self) networkDev->shutdown(networkDev); networkDev = NULL; variable_unset(VAR_FTP_PATH); - return DITEM_FAILURE | what; + return DITEM_FAILURE; } } if (isDebug()) @@ -421,7 +416,7 @@ mediaSetFTP(dialogMenuItem *self) ftpDevice.shutdown = mediaShutdownFTP; ftpDevice.private = networkDev; mediaDevice = &ftpDevice; - return DITEM_SUCCESS | DITEM_LEAVE_MENU | what; + return DITEM_SUCCESS | DITEM_LEAVE_MENU; } int @@ -446,7 +441,6 @@ mediaSetUFS(dialogMenuItem *self) char *cp; mediaClose(); - dialog_clear_norefresh(); cp = variable_get_value(VAR_UFS_PATH, "Enter a fully qualified pathname for the directory\n" "containing the FreeBSD distribution files:", 0); if (!cp) @@ -474,8 +468,8 @@ mediaSetNFS(dialogMenuItem *self) static Device *networkDev = NULL; char *cp, *idx; char hostname[MAXPATHLEN]; + mediaClose(); - dialog_clear_norefresh(); cp = variable_get_value(VAR_NFS_PATH, "Please enter the full NFS file specification for the remote\n" "host and directory containing the FreeBSD distribution files.\n" "This should be in the format: hostname:/some/freebsd/dir", 0); @@ -725,7 +719,7 @@ mediaExtractDist(char *dir, char *dist, FILE *fp) int mediaGetType(dialogMenuItem *self) { - return ((dmenuOpenSimple(&MenuMedia, FALSE) && mediaDevice) ? DITEM_SUCCESS : DITEM_FAILURE) | DITEM_RESTORE; + return ((dmenuOpenSimple(&MenuMedia, FALSE) && mediaDevice) ? DITEM_SUCCESS : DITEM_FAILURE); } /* Return TRUE if all the media variables are set up correctly */ @@ -743,16 +737,14 @@ mediaSetFTPUserPass(dialogMenuItem *self) { char *pass; - dialog_clear_norefresh(); if (variable_get_value(VAR_FTP_USER, "Please enter the username you wish to login as:", 0)) { - dialog_clear_norefresh(); DialogInputAttrs |= DITEM_NO_ECHO; pass = variable_get_value(VAR_FTP_PASS, "Please enter the password for this user:", 0); DialogInputAttrs &= ~DITEM_NO_ECHO; } else pass = NULL; - return (pass ? DITEM_SUCCESS : DITEM_FAILURE) | DITEM_RESTORE; + return (pass ? DITEM_SUCCESS : DITEM_FAILURE); } /* Set CPIO verbosity level */ diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c index c17b9c5..0cc8c0c 100644 --- a/usr.sbin/sysinstall/menus.c +++ b/usr.sbin/sysinstall/menus.c @@ -61,6 +61,22 @@ clearSrc(dialogMenuItem *self) } static int +setDES(dialogMenuItem *self) +{ + Dists |= DIST_DES; + DESDists = DIST_DES_ALL; + return DITEM_SUCCESS | DITEM_REDRAW; +} + +static int +clearDES(dialogMenuItem *self) +{ + Dists &= ~DIST_DES; + DESDists = 0; + return DITEM_SUCCESS | DITEM_REDRAW; +} + +static int setX11All(dialogMenuItem *self) { XF86Dists = DIST_XF86_ALL; @@ -227,78 +243,78 @@ DMenu MenuIndex = { "Leave the index page by selecting Cancel [TAB-ENTER].", "Use PageUp or PageDown to move through this menu faster!", NULL, - { { "Anon FTP", "Configure anonymous FTP logins.", dmenuVarCheck, configAnonFTP, NULL, "anon_ftp" }, - { "Commit", "Commit any pending actions (dangerous!)", NULL, installCustomCommit }, - { "Console settings", "Customize system console behavior.", NULL, dmenuSubmenu, NULL, &MenuSyscons }, - { "Configure", "The system configuration menu.", NULL, dmenuSubmenu, NULL, &MenuConfigure }, - { "Defaults, Load", "Load default settings.", NULL, dispatch_load_floppy }, - { "Device, Mouse", "The mouse configuration menu.", NULL, dmenuSubmenu, NULL, &MenuMouse }, - { "Disklabel", "The disk Label editor", NULL, diskLabelEditor }, - { "Dists, All", "Root of the distribution tree.", NULL, dmenuSubmenu, NULL, &MenuDistributions }, - { "Dists, Basic", "Basic FreeBSD distribution menu.", NULL, dmenuSubmenu, NULL, &MenuSubDistributions }, - { "Dists, DES", "DES distribution menu.", NULL, dmenuSubmenu, NULL, &MenuDESDistributions }, - { "Dists, Developer", "Select developer's distribution.", checkDistDeveloper, distSetDeveloper }, - { "Dists, Src", "Src distribution menu.", NULL, dmenuSubmenu, NULL, &MenuSrcDistributions }, - { "Dists, X Developer", "Select X developer's distribution.", checkDistXDeveloper, distSetXDeveloper }, - { "Dists, Kern Developer", "Select kernel developer's distribution.", checkDistKernDeveloper, distSetKernDeveloper }, - { "Dists, User", "Select average user distribution.", checkDistUser, distSetUser }, - { "Dists, X User", "Select average X user distribution.", checkDistXUser, distSetXUser }, - { "Distributions, Adding", "Installing additional distribution sets", NULL, distExtractAll }, - { "Distributions, XFree86","XFree86 distribution menu.", NULL, distSetXF86 }, - { "Documentation", "Installation instructions, README, etc.", NULL, dmenuSubmenu, NULL, &MenuDocumentation }, - { "Doc, README", "The distribution README file.", NULL, dmenuDisplayFile, NULL, "README" }, - { "Doc, Hardware", "The distribution hardware guide.", NULL, dmenuDisplayFile, NULL, "HARDWARE" }, - { "Doc, Install", "The distribution installation guide.", NULL, dmenuDisplayFile, NULL, "INSTALL" }, - { "Doc, Copyright", "The distribution copyright notices.", NULL, dmenuDisplayFile, NULL, "COPYRIGHT" }, - { "Doc, Release", "The distribution release notes.", NULL, dmenuDisplayFile, NULL, "RELNOTES" }, - { "Doc, HTML", "The HTML documentation menu.", NULL, docBrowser }, - { "Dump Vars", "(debugging) dump out internal variables.", NULL, dump_variables }, - { "Emergency shell", "Start an Emergency Holographic shell.", NULL, installFixitHoloShell }, + { { " Anon FTP", "Configure anonymous FTP logins.", dmenuVarCheck, configAnonFTP, NULL, "anon_ftp" }, + { " Commit", "Commit any pending actions (dangerous!)", NULL, installCustomCommit }, + { " Console settings", "Customize system console behavior.", NULL, dmenuSubmenu, NULL, &MenuSyscons }, + { " Configure", "The system configuration menu.", NULL, dmenuSubmenu, NULL, &MenuConfigure }, + { " Defaults, Load", "Load default settings.", NULL, dispatch_load_floppy }, + { " Device, Mouse", "The mouse configuration menu.", NULL, dmenuSubmenu, NULL, &MenuMouse }, + { " Disklabel", "The disk Label editor", NULL, diskLabelEditor }, + { " Dists, All", "Root of the distribution tree.", NULL, dmenuSubmenu, NULL, &MenuDistributions }, + { " Dists, Basic", "Basic FreeBSD distribution menu.", NULL, dmenuSubmenu, NULL, &MenuSubDistributions }, + { " Dists, DES", "DES distribution menu.", NULL, dmenuSubmenu, NULL, &MenuDESDistributions }, + { " Dists, Developer", "Select developer's distribution.", checkDistDeveloper, distSetDeveloper }, + { " Dists, Src", "Src distribution menu.", NULL, dmenuSubmenu, NULL, &MenuSrcDistributions }, + { " Dists, X Developer", "Select X developer's distribution.", checkDistXDeveloper, distSetXDeveloper }, + { " Dists, Kern Developer", "Select kernel developer's distribution.", checkDistKernDeveloper, distSetKernDeveloper }, + { " Dists, User", "Select average user distribution.", checkDistUser, distSetUser }, + { " Dists, X User", "Select average X user distribution.", checkDistXUser, distSetXUser }, + { " Distributions, Adding", "Installing additional distribution sets", NULL, distExtractAll }, + { " Distributions, XFree86","XFree86 distribution menu.", NULL, distSetXF86 }, + { " Documentation", "Installation instructions, README, etc.", NULL, dmenuSubmenu, NULL, &MenuDocumentation }, + { " Doc, README", "The distribution README file.", NULL, dmenuDisplayFile, NULL, "README" }, + { " Doc, Hardware", "The distribution hardware guide.", NULL, dmenuDisplayFile, NULL, "HARDWARE" }, + { " Doc, Install", "The distribution installation guide.", NULL, dmenuDisplayFile, NULL, "INSTALL" }, + { " Doc, Copyright", "The distribution copyright notices.", NULL, dmenuDisplayFile, NULL, "COPYRIGHT" }, + { " Doc, Release", "The distribution release notes.", NULL, dmenuDisplayFile, NULL, "RELNOTES" }, + { " Doc, HTML", "The HTML documentation menu.", NULL, docBrowser }, + { " Dump Vars", "(debugging) dump out internal variables.", NULL, dump_variables }, + { " Emergency shell", "Start an Emergency Holographic shell.", NULL, installFixitHoloShell }, #ifdef __i386__ - { "Fdisk", "The disk Partition Editor", NULL, diskPartitionEditor }, + { " Fdisk", "The disk Partition Editor", NULL, diskPartitionEditor }, #endif - { "Fixit", "Repair mode with CDROM or fixit floppy.", NULL, dmenuSubmenu, NULL, &MenuFixit }, - { "FTP sites", "The FTP mirror site listing.", NULL, dmenuSubmenu, NULL, &MenuMediaFTP }, - { "Gateway", "Set flag to route packets between interfaces.", dmenuVarCheck, dmenuToggleVariable, NULL, "gateway=YES" }, - { "HTML Docs", "The HTML documentation menu", NULL, docBrowser }, - { "Install, Novice", "A novice system installation.", NULL, installNovice }, - { "Install, Express", "An express system installation.", NULL, installExpress }, - { "Install, Custom", "The custom installation menu", NULL, dmenuSubmenu, NULL, &MenuInstallCustom }, - { "Label", "The disk Label editor", NULL, diskLabelEditor }, - { "Media", "Top level media selection menu.", NULL, dmenuSubmenu, NULL, &MenuMedia }, - { "Media, Tape", "Select tape installation media.", NULL, mediaSetTape }, - { "Media, NFS", "Select NFS installation media.", NULL, mediaSetNFS }, - { "Media, Floppy", "Select floppy installation media.", NULL, mediaSetFloppy }, - { "Media, CDROM", "Select CDROM installation media.", NULL, mediaSetCDROM }, - { "Media, DOS", "Select DOS installation media.", NULL, mediaSetDOS }, - { "Media, UFS", "Select UFS installation media.", NULL, mediaSetUFS }, - { "Media, FTP", "Select FTP installation media.", NULL, mediaSetFTP }, - { "Media, FTP Passive", "Select passive FTP installation media.", NULL, mediaSetFTPPassive }, - { "Network Interfaces", "Configure network interfaces", NULL, tcpMenuSelect }, - { "Networking Services", "The network services menu.", NULL, dmenuSubmenu, NULL, &MenuNetworking }, - { "NFS, client", "Set NFS client flag.", dmenuVarCheck, dmenuToggleVariable, NULL, "nfs_client_enable=YES" }, - { "NFS, server", "Set NFS server flag.", dmenuVarCheck, configNFSServer, NULL, "nfs_server_enable=YES" }, - { "NTP Menu", "The NTP configuration menu.", NULL, dmenuSubmenu, NULL, &MenuNTP }, - { "Options", "The options editor.", NULL, optionsEditor }, - { "Packages", "The packages collection", NULL, configPackages }, - { "Partition", "The disk Slice (PC-style partition) Editor", NULL, diskPartitionEditor }, - { "PCNFSD", "Run authentication server for PC-NFS.", dmenuVarCheck, configPCNFSD, NULL, "pcnfsd" }, - { "Root Password", "Set the system manager's password.", NULL, dmenuSystemCommand, NULL, "passwd root" }, - { "Router", "Select routing daemon (default: routed)", NULL, configRouter, NULL, "router" }, - { "Syscons", "The system console configuration menu.", NULL, dmenuSubmenu, NULL, &MenuSyscons }, - { "Syscons, Font", "The console screen font.", NULL, dmenuSubmenu, NULL, &MenuSysconsFont }, - { "Syscons, Keymap", "The console keymap configuration menu.", NULL, dmenuSubmenu, NULL, &MenuSysconsKeymap }, - { "Syscons, Keyrate", "The console key rate configuration menu.", NULL, dmenuSubmenu, NULL, &MenuSysconsKeyrate }, - { "Syscons, Saver", "The console screen saver configuration menu.", NULL, dmenuSubmenu, NULL, &MenuSysconsSaver }, - { "Syscons, Screenmap", "The console screenmap configuration menu.", NULL, dmenuSubmenu, NULL, &MenuSysconsScrnmap }, - { "Time Zone", "Set the system's time zone.", NULL, dmenuSystemCommand, NULL, "tzsetup" }, - { "Upgrade", "Upgrade an existing system.", NULL, installUpgrade }, - { "Usage", "Quick start - How to use this menu system.", NULL, dmenuDisplayFile, NULL, "usage" }, - { "User Management", "Add user and group information.", NULL, dmenuSubmenu, NULL, &MenuUsermgmt }, - { "XFree86, Fonts", "XFree86 Font selection menu.", NULL, dmenuSubmenu, NULL, &MenuXF86SelectFonts }, - { "XFree86, Server", "XFree86 Server selection menu.", NULL, dmenuSubmenu, NULL, &MenuXF86SelectServer }, + { " Fixit", "Repair mode with CDROM or fixit floppy.", NULL, dmenuSubmenu, NULL, &MenuFixit }, + { " FTP sites", "The FTP mirror site listing.", NULL, dmenuSubmenu, NULL, &MenuMediaFTP }, + { " Gateway", "Set flag to route packets between interfaces.", dmenuVarCheck, dmenuToggleVariable, NULL, "gateway=YES" }, + { " HTML Docs", "The HTML documentation menu", NULL, docBrowser }, + { " Install, Novice", "A novice system installation.", NULL, installNovice }, + { " Install, Express", "An express system installation.", NULL, installExpress }, + { " Install, Custom", "The custom installation menu", NULL, dmenuSubmenu, NULL, &MenuInstallCustom }, + { " Label", "The disk Label editor", NULL, diskLabelEditor }, + { " Media", "Top level media selection menu.", NULL, dmenuSubmenu, NULL, &MenuMedia }, + { " Media, Tape", "Select tape installation media.", NULL, mediaSetTape }, + { " Media, NFS", "Select NFS installation media.", NULL, mediaSetNFS }, + { " Media, Floppy", "Select floppy installation media.", NULL, mediaSetFloppy }, + { " Media, CDROM", "Select CDROM installation media.", NULL, mediaSetCDROM }, + { " Media, DOS", "Select DOS installation media.", NULL, mediaSetDOS }, + { " Media, UFS", "Select UFS installation media.", NULL, mediaSetUFS }, + { " Media, FTP", "Select FTP installation media.", NULL, mediaSetFTP }, + { " Media, FTP Passive", "Select passive FTP installation media.", NULL, mediaSetFTPPassive }, + { " Network Interfaces", "Configure network interfaces", NULL, tcpMenuSelect }, + { " Networking Services", "The network services menu.", NULL, dmenuSubmenu, NULL, &MenuNetworking }, + { " NFS, client", "Set NFS client flag.", dmenuVarCheck, dmenuToggleVariable, NULL, "nfs_client_enable=YES" }, + { " NFS, server", "Set NFS server flag.", dmenuVarCheck, configNFSServer, NULL, "nfs_server_enable=YES" }, + { " NTP Menu", "The NTP configuration menu.", NULL, dmenuSubmenu, NULL, &MenuNTP }, + { " Options", "The options editor.", NULL, optionsEditor }, + { " Packages", "The packages collection", NULL, configPackages }, + { " Partition", "The disk Slice (PC-style partition) Editor", NULL, diskPartitionEditor }, + { " PCNFSD", "Run authentication server for PC-NFS.", dmenuVarCheck, configPCNFSD, NULL, "pcnfsd" }, + { " Root Password", "Set the system manager's password.", NULL, dmenuSystemCommand, NULL, "passwd root" }, + { " Router", "Select routing daemon (default: routed)", NULL, configRouter, NULL, "router" }, + { " Syscons", "The system console configuration menu.", NULL, dmenuSubmenu, NULL, &MenuSyscons }, + { " Syscons, Font", "The console screen font.", NULL, dmenuSubmenu, NULL, &MenuSysconsFont }, + { " Syscons, Keymap", "The console keymap configuration menu.", NULL, dmenuSubmenu, NULL, &MenuSysconsKeymap }, + { " Syscons, Keyrate", "The console key rate configuration menu.", NULL, dmenuSubmenu, NULL, &MenuSysconsKeyrate }, + { " Syscons, Saver", "The console screen saver configuration menu.", NULL, dmenuSubmenu, NULL, &MenuSysconsSaver }, + { " Syscons, Screenmap", "The console screenmap configuration menu.", NULL, dmenuSubmenu, NULL, &MenuSysconsScrnmap }, + { " Time Zone", "Set the system's time zone.", NULL, dmenuSystemCommand, NULL, "tzsetup" }, + { " Upgrade", "Upgrade an existing system.", NULL, installUpgrade }, + { " Usage", "Quick start - How to use this menu system.", NULL, dmenuDisplayFile, NULL, "usage" }, + { " User Management", "Add user and group information.", NULL, dmenuSubmenu, NULL, &MenuUsermgmt }, + { " XFree86, Fonts", "XFree86 Font selection menu.", NULL, dmenuSubmenu, NULL, &MenuXF86SelectFonts }, + { " XFree86, Server", "XFree86 Server selection menu.", NULL, dmenuSubmenu, NULL, &MenuXF86SelectServer }, #ifdef __i386__ - { "XFree86, PC98 Server", "XFree86 PC98 Server selection menu.", NULL, dmenuSubmenu, NULL, &MenuXF86SelectPC98Server }, + { " XFree86, PC98 Server", "XFree86 PC98 Server selection menu.", NULL, dmenuSubmenu, NULL, &MenuXF86SelectPC98Server }, #endif { NULL } }, }; @@ -314,19 +330,19 @@ DMenu MenuInitial = { "Press F1 for Installation Guide", /* help line */ "install", /* help file */ { { "Select" }, - { "Exit Install", NULL, NULL, dmenuExit }, - { "1 Usage", "Quick start - How to use this menu system", NULL, dmenuDisplayFile, NULL, "usage" }, - { "2 Novice", "Begin a novice installation (for beginners)", NULL, installNovice }, - { "3 Express", "Begin a quick installation (for the impatient)", NULL, installExpress }, - { "4 Custom", "Begin a custom installation (for experts)", NULL, dmenuSubmenu, NULL, &MenuInstallCustom }, - { "5 Configure", "Do post-install configuration of FreeBSD", NULL, dmenuSubmenu, NULL, &MenuConfigure }, - { "D Doc", "Installation instructions, README, etc.", NULL, dmenuSubmenu, NULL, &MenuDocumentation }, - { "K Keymap", "Select keyboard type", NULL, dmenuSubmenu, NULL, &MenuSysconsKeymap }, - { "O Options", "View/Set various installation options", NULL, optionsEditor }, - { "F Fixit", "Enter repair mode with CDROM/floppy or start shell", NULL, dmenuSubmenu, NULL, &MenuFixit }, - { "U Upgrade", "Upgrade an existing system", NULL, installUpgrade }, - { "L Load Config","Load default install configuration", NULL, dispatch_load_floppy }, - { "I Index", "Glossary of functions", NULL, dmenuSubmenu, NULL, &MenuIndex }, + { "X Exit Install", NULL, NULL, dmenuExit }, + { "? Usage", "Quick start - How to use this menu system", NULL, dmenuDisplayFile, NULL, "usage" }, + { "Novice", "Begin a novice installation (for beginners)", NULL, installNovice }, + { "Express", "Begin a quick installation (for the impatient)", NULL, installExpress }, + { " Custom", "Begin a custom installation (for experts)", NULL, dmenuSubmenu, NULL, &MenuInstallCustom }, + { "Configure", "Do post-install configuration of FreeBSD", NULL, dmenuSubmenu, NULL, &MenuConfigure }, + { "Doc", "Installation instructions, README, etc.", NULL, dmenuSubmenu, NULL, &MenuDocumentation }, + { "Keymap", "Select keyboard type", NULL, dmenuSubmenu, NULL, &MenuSysconsKeymap }, + { "Options", "View/Set various installation options", NULL, optionsEditor }, + { "Fixit", "Enter repair mode with CDROM/floppy or start shell", NULL, dmenuSubmenu, NULL, &MenuFixit }, + { "Upgrade", "Upgrade an existing system", NULL, installUpgrade }, + { "Load Config","Load default install configuration", NULL, dispatch_load_floppy }, + { "Index", "Glossary of functions", NULL, dmenuSubmenu, NULL, &MenuIndex }, { NULL } }, }; @@ -348,7 +364,7 @@ DMenu MenuDocumentation = { { "5 Release" ,"The release notes for this version of FreeBSD.", NULL, dmenuDisplayFile, NULL, "RELNOTES" }, { "6 Shortcuts", "Creating shortcuts to sysinstall.", NULL, dmenuDisplayFile, NULL, "shortcuts" }, { "7 HTML Docs", "Go to the HTML documentation menu (post-install).", NULL, docBrowser }, - { "0 Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, + { "X Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, { NULL } }, }; @@ -363,25 +379,25 @@ DMenu MenuMouseType = { "the mouse has a wheel, it may be compatible with \"IntelliMouse\".", NULL, NULL, - { { "Auto", "Bus mouse, PS/2 style mouse or PnP serial mouse", + { { "1 Auto", "Bus mouse, PS/2 style mouse or PnP serial mouse", dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_TYPE "=auto" }, - { "GlidePoint", "ALPS GlidePoint pad (serial)", + { "2 GlidePoint", "ALPS GlidePoint pad (serial)", dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_TYPE "=glidepoint" }, - { "Hitachi","Hitachi tablet (serial)", + { "3 Hitachi","Hitachi tablet (serial)", dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_TYPE "=mmhittab" }, - { "IntelliMouse", "Microsoft IntelliMouse (serial)", + { "4 IntelliMouse", "Microsoft IntelliMouse (serial)", dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_TYPE "=intellimouse" }, - { "Logitech", "Logitech protocol (old models) (serial)", + { "5 Logitech", "Logitech protocol (old models) (serial)", dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_TYPE "=logitech" }, - { "Microsoft", "Microsoft protocol (serial)", + { "6 Microsoft", "Microsoft protocol (serial)", dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_TYPE "=microsoft" }, - { "MM Series","MM Series protocol (serial)", + { "7 MM Series","MM Series protocol (serial)", dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_TYPE "=mmseries" }, - { "MouseMan", "Logitech MouseMan/TrackMan models (serial)", + { "8 MouseMan", "Logitech MouseMan/TrackMan models (serial)", dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_TYPE "=mouseman" }, - { "MouseSystems", "MouseSystems protocol (serial)", + { "9 MouseSystems", "MouseSystems protocol (serial)", dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_TYPE "=mousesystems" }, - { "ThinkingMouse","Kensington ThinkingMouse (serial)", + { "A ThinkingMouse","Kensington ThinkingMouse (serial)", dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_TYPE "=thinkingmouse" }, { NULL } }, }; @@ -393,17 +409,17 @@ DMenu MenuMousePort = { "a PS/2 style device.", NULL, NULL, - { { "COM1", "Serial mouse on COM1 (/dev/cuaa0)", + { { "1 COM1", "Serial mouse on COM1 (/dev/cuaa0)", dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/cuaa0" }, - { "COM2", "Serial mouse on COM2 (/dev/cuaa1)", + { "2 COM2", "Serial mouse on COM2 (/dev/cuaa1)", dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/cuaa1" }, - { "COM3", "Serial mouse on COM3 (/dev/cuaa2)", + { "3 COM3", "Serial mouse on COM3 (/dev/cuaa2)", dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/cuaa2" }, - { "COM4", "Serial mouse on COM4 (/dev/cuaa3)", + { "4 COM4", "Serial mouse on COM4 (/dev/cuaa3)", dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/cuaa3" }, - { "BusMouse", "Logitech, ATI or MS bus mouse (/dev/mse0)", + { "5 BusMouse", "Logitech, ATI or MS bus mouse (/dev/mse0)", dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/mse0" }, - { "PS/2", "PS/2 style mouse (/dev/psm0)", + { "6 PS/2", "PS/2 style mouse (/dev/psm0)", dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/psm0" }, { NULL } }, }; @@ -425,7 +441,7 @@ DMenu MenuMouse = { { "2 Port", "Select mouse port", NULL, dmenuSubmenu, NULL, &MenuMousePort }, { "3 Enable", "Test and run the mouse daemon", NULL, mousedTest, NULL, NULL }, { "4 Disable", "Disable the mouse daemon", NULL, mousedDisable, NULL, NULL }, - { "0 Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, + { "X Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, { NULL } }, }; @@ -474,17 +490,17 @@ DMenu MenuXDesktops = { "you can choose any one of the following desktops as alternatives.", NULL, NULL, - { { "KDE", "The K Desktop Environment.", + { { "1 KDE", "The K Desktop Environment.", NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=kde" }, - { "GNOME + Afterstep", "GNOME + Afterstep window manager.", + { "2 GNOME + Afterstep", "GNOME + Afterstep window manager.", NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=gnome" }, - { "GNOME + Enlightenment","GNOME + The E window manager", + { "3 GNOME + Enlightenment","GNOME + The E window manager", NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=enlightenment" }, - { "Afterstep", "The Afterstep window manager", + { "4 Afterstep", "The Afterstep window manager", NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=afterstep" }, - { "Windowmaker", "The Windowmaker window manager", + { "5 Windowmaker", "The Windowmaker window manager", NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=windowmaker" }, - { "fvwm2", "The fvwm2 window manager", + { "6 fvwm2", "The fvwm2 window manager", NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=fvwm" }, { NULL } }, }; @@ -540,167 +556,167 @@ DMenu MenuMediaFTP = { VAR_FTP_PATH _AS("=ftp://ftp.freebsd.org/pub/FreeBSD/releases/") }, { "URL", "Specify some other ftp site by URL", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH "=other" }, - { "4.0 SNAP Server", "current.freebsd.org", NULL, dmenuSetVariable, NULL, + { " 4.0 SNAP Server", "current.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AS("=ftp://current.freebsd.org/pub/FreeBSD/snapshots/") }, - { "3.0 SNAP Server", "releng3.freebsd.org", NULL, dmenuSetVariable, NULL, + { " 3.0 SNAP Server", "releng3.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AS("=ftp://releng3.freebsd.org/pub/FreeBSD/snapshots/") }, { "Argentina", "ftp.ar.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.ar.freebsd.org") }, - { "Australia", "ftp.au.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Australia", "ftp.au.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.au.freebsd.org") }, - { "Australia #2", "ftp2.au.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Australia #2","ftp2.au.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp2.au.freebsd.org") }, - { "Australia #3", "ftp3.au.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Australia #3","ftp3.au.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp3.au.freebsd.org") }, - { "Australia #4", "ftp4.au.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Australia #4","ftp4.au.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp4.au.freebsd.org") }, - { "Australia #5", "ftp5.au.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Australia #5","ftp5.au.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp5.au.freebsd.org") }, { "Brazil", "ftp.br.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.br.freebsd.org") }, - { "Brazil #2", "ftp2.br.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Brazil #2", "ftp2.br.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp2.br.freebsd.org") }, - { "Brazil #3", "ftp3.br.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Brazil #3", "ftp3.br.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp3.br.freebsd.org") }, - { "Brazil #4", "ftp4.br.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Brazil #4", "ftp4.br.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp4.br.freebsd.org") }, - { "Brazil #5", "ftp5.br.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Brazil #5", "ftp5.br.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp5.br.freebsd.org") }, - { "Brazil #6", "ftp6.br.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Brazil #6", "ftp6.br.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp6.br.freebsd.org") }, - { "Brazil #7", "ftp7.br.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Brazil #7", "ftp7.br.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp7.br.freebsd.org") }, - { "Canada", "ftp.ca.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Canada", "ftp.ca.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.ca.freebsd.org") }, - { "Czech Republic", "ftp.cz.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Czech Republic", "ftp.cz.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.cz.freebsd.org") }, { "Denmark", "ftp.dk.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.dk.freebsd.org") }, - { "Denmark #2", "ftp2.dk.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Denmark #2", "ftp2.dk.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp2.dk.freebsd.org") }, { "Estonia", "ftp.ee.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.ee.freebsd.org") }, { "Finland", "ftp.fi.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.fi.freebsd.org") }, - { "France", "ftp.fr.freebsd.org", NULL, dmenuSetVariable, NULL, + { " France", "ftp.fr.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.fr.freebsd.org") }, - { "France #2", "ftp2.fr.freebsd.org", NULL, dmenuSetVariable, NULL, + { " France #2", "ftp2.fr.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp2.fr.freebsd.org") }, - { "France #3", "ftp3.fr.freebsd.org", NULL, dmenuSetVariable, NULL, + { " France #3", "ftp3.fr.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp3.fr.freebsd.org") }, { "Germany", "ftp.de.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.de.freebsd.org") }, - { "Germany #2", "ftp2.de.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Germany #2", "ftp2.de.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp2.de.freebsd.org") }, - { "Germany #3", "ftp3.de.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Germany #3", "ftp3.de.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp3.de.freebsd.org") }, - { "Germany #4", "ftp4.de.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Germany #4", "ftp4.de.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp4.de.freebsd.org") }, - { "Germany #5", "ftp5.de.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Germany #5", "ftp5.de.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp5.de.freebsd.org") }, - { "Germany #6", "ftp6.de.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Germany #6", "ftp6.de.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp6.de.freebsd.org") }, - { "Germany #7", "ftp7.de.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Germany #7", "ftp7.de.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp7.de.freebsd.org") }, { "Holland", "ftp.nl.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.nl.freebsd.org") }, - { "Hong Kong", "ftp.hk.super.net", NULL, dmenuSetVariable, NULL, + { " Hong Kong", "ftp.hk.super.net", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.hk.super.net") }, { "Iceland", "ftp.is.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.is.freebsd.org") }, - { "Ireland", "ftp.ie.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Ireland", "ftp.ie.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.ie.freebsd.org") }, - { "Israel", "ftp.il.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Israel", "ftp.il.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.il.freebsd.org") }, - { "Israel #2", "ftp2.il.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Israel #2", "ftp2.il.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp2.il.freebsd.org") }, { "Japan", "ftp.jp.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.jp.freebsd.org") }, - { "Japan #2", "ftp2.jp.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Japan #2", "ftp2.jp.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp2.jp.freebsd.org") }, - { "Japan #3", "ftp3.jp.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Japan #3", "ftp3.jp.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp3.jp.freebsd.org") }, - { "Japan #4", "ftp4.jp.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Japan #4", "ftp4.jp.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp4.jp.freebsd.org") }, - { "Japan #5", "ftp5.jp.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Japan #5", "ftp5.jp.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp5.jp.freebsd.org") }, - { "Japan #6", "ftp6.jp.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Japan #6", "ftp6.jp.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp6.jp.freebsd.org") }, { "Korea", "ftp.kr.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.kr.freebsd.org") }, - { "Korea #2", "ftp2.kr.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Korea #2", "ftp2.kr.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp2.kr.freebsd.org") }, - { "Korea #3", "ftp3.kr.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Korea #3", "ftp3.kr.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp3.kr.freebsd.org") }, - { "Korea #4", "ftp4.kr.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Korea #4", "ftp4.kr.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp4.kr.freebsd.org") }, - { "Korea #5", "ftp5.kr.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Korea #5", "ftp5.kr.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp5.kr.freebsd.org") }, { "New Zealand", "ftp.nz.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.nz.freebsd.org") }, { "Poland", "ftp.pl.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.pl.freebsd.org") }, - { "Portugal", "ftp.pt.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Portugal", "ftp.pt.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.pt.freebsd.org") }, - { "Portugal #2", "ftp2.pt.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Portugal #2", "ftp2.pt.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp2.pt.freebsd.org") }, { "Russia", "ftp.ru.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.ru.freebsd.org") }, - { "Russia #2", "ftp2.ru.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Russia #2", "ftp2.ru.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp2.ru.freebsd.org") }, - { "Russia #3", "ftp3.ru.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Russia #3", "ftp3.ru.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp3.ru.freebsd.org") }, - { "Russia #4", "ftp4.ru.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Russia #4", "ftp4.ru.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp4.ru.freebsd.org") }, { "Slovak Republic", "ftp.sk.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.sk.freebsd.org") }, - { "South Africa", "ftp.za.freebsd.org", NULL, dmenuSetVariable, NULL, + { " South Africa", "ftp.za.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.za.freebsd.org") }, - { "South Africa #2", "ftp2.za.freebsd.org", NULL, dmenuSetVariable, NULL, + { " South Africa #2", "ftp2.za.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp2.za.freebsd.org") }, - { "South Africa #3", "ftp3.za.freebsd.org", NULL, dmenuSetVariable, NULL, + { " South Africa #3", "ftp3.za.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp3.za.freebsd.org") }, - { "South Africa #4", "ftp4.za.freebsd.org", NULL, dmenuSetVariable, NULL, + { " South Africa #4", "ftp4.za.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp4.za.freebsd.org") }, - { "Spain", "ftp.es.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Spain", "ftp.es.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.es.freebsd.org") }, - { "Spain #2", "ftp2.es.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Spain #2", "ftp2.es.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp2.es.freebsd.org") }, - { "Sweden", "ftp.se.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Sweden", "ftp.se.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.se.freebsd.org") }, - { "Sweden #2", "ftp2.se.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Sweden #2", "ftp2.se.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp2.se.freebsd.org") }, - { "Sweden #3", "ftp3.se.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Sweden #3", "ftp3.se.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp3.se.freebsd.org") }, { "Taiwan", "ftp.tw.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.tw.freebsd.org") }, - { "Taiwan #2", "ftp2.tw.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Taiwan #2", "ftp2.tw.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp2.tw.freebsd.org") }, - { "Taiwan #3", "ftp3.tw.freebsd.org", NULL, dmenuSetVariable, NULL, + { " Taiwan #3", "ftp3.tw.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp3.tw.freebsd.org") }, - { "Thailand", "ftp.nectec.or.th", NULL, dmenuSetVariable, NULL, + { " Thailand", "ftp.nectec.or.th", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AS("=ftp://ftp.nectec.or.th/pub/mirrors/FreeBSD/") }, { "UK", "ftp.uk.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.uk.freebsd.org") }, - { "UK #2", "ftp2.uk.freebsd.org", NULL, dmenuSetVariable, NULL, + { " UK #2", "ftp2.uk.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp2.uk.freebsd.org") }, - { "UK #3", "ftp3.uk.freebsd.org", NULL, dmenuSetVariable, NULL, + { " UK #3", "ftp3.uk.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp3.uk.freebsd.org") }, - { "UK #4", "ftp4.uk.freebsd.org", NULL, dmenuSetVariable, NULL, + { " UK #4", "ftp4.uk.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp4.uk.freebsd.org") }, - { "UK #5", "ftp5.uk.freebsd.org", NULL, dmenuSetVariable, NULL, + { " UK #5", "ftp5.uk.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp5.uk.freebsd.org") }, - { "USA", "ftp.freebsd.org", NULL, dmenuSetVariable, NULL, + { " USA", "ftp.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp.freebsd.org") }, - { "USA #2", "ftp2.freebsd.org", NULL, dmenuSetVariable, NULL, + { " USA #2", "ftp2.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp2.freebsd.org") }, - { "USA #3", "ftp3.freebsd.org", NULL, dmenuSetVariable, NULL, + { " USA #3", "ftp3.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp3.freebsd.org") }, - { "USA #4", "ftp4.freebsd.org", NULL, dmenuSetVariable, NULL, + { " USA #4", "ftp4.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp4.freebsd.org") }, - { "USA #5", "ftp5.freebsd.org", NULL, dmenuSetVariable, NULL, + { " USA #5", "ftp5.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp5.freebsd.org") }, - { "USA #6", "ftp6.freebsd.org", NULL, dmenuSetVariable, NULL, + { " USA #6", "ftp6.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH _AP("=ftp://ftp6.freebsd.org") }, { NULL } } }; @@ -754,7 +770,7 @@ DMenu MenuMedia = { { "6 File System", "Install from an existing filesystem", NULL, mediaSetUFS }, { "7 Floppy", "Install from a floppy disk set", NULL, mediaSetFloppy }, { "8 Tape", "Install from SCSI or QIC tape", NULL, mediaSetTape }, - { "9 Options", "Go to the Options screen", NULL, optionsEditor }, + { "Options", "Go to the Options screen", NULL, optionsEditor }, { NULL } }, }; @@ -771,7 +787,11 @@ DMenu MenuDistributions = { "item or press [ENTER].", "Press F1 for more information on these options.", "distributions", - { { "1 Developer", "Full sources, binaries and doc but no games", + { { "All", "All system sources, binaries and X Window System)", + checkDistEverything, distSetEverything }, + { "Reset", "Reset selected distribution list to nothing", + NULL, distReset, NULL, NULL, ' ', ' ', ' ' }, + { "1 Developer", "Full sources, binaries and doc but no games", checkDistDeveloper, distSetDeveloper }, { "2 X-Developer", "Same as above + X Window System", checkDistXDeveloper, distSetXDeveloper }, @@ -787,12 +807,6 @@ DMenu MenuDistributions = { checkDistMinimum, distSetMinimum }, { "8 Custom", "Specify your own distribution set", NULL, dmenuSubmenu, NULL, &MenuSubDistributions, '>', '>', '>' }, - { "8 All", "All sources and binaries (incl X Window System)", - checkDistEverything, distSetEverything }, - { "9 Clear", "Reset selected distribution list to nothing", - NULL, distReset, NULL, NULL, ' ', ' ', ' ' }, - { "0 Exit", "Exit this menu (returning to previous)", - checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, { NULL } }, }; @@ -804,52 +818,50 @@ DMenu MenuSubDistributions = { "DES distribution out of the U.S.! It is for U.S. customers only.", NULL, NULL, - { { "bin", "Binary base distribution (required)", + { { "All", "All system sources, binaries and X Window System", + NULL, distSetEverything, NULL, NULL, ' ', ' ', ' ' }, + { "Reset", "Reset all of the below", + NULL, distReset, NULL, NULL, ' ', ' ', ' ' }, + { " bin", "Binary base distribution (required)", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_BIN }, #ifdef __i386__ - { "compat1x", "FreeBSD 1.x binary compatibility", + { " compat1x", "FreeBSD 1.x binary compatibility", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT1X }, - { "compat20", "FreeBSD 2.0 binary compatibility", + { " compat20", "FreeBSD 2.0 binary compatibility", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT20 }, - { "compat21", "FreeBSD 2.1 binary compatibility", + { " compat21", "FreeBSD 2.1 binary compatibility", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT21 }, - { "compat22", "FreeBSD 2.2.x and 3.0 a.out binary compatibility", + { " compat22", "FreeBSD 2.2.x and 3.0 a.out binary compatibility", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT22 }, #if __FreeBSD__ > 3 - { "compat3x", "FreeBSD 3.x binary compatibility", + { " compat3x", "FreeBSD 3.x binary compatibility", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT3X }, #endif #endif - { "DES", "DES encryption code - NOT FOR EXPORT!", + { " DES", "DES encryption code - NOT FOR EXPORT!", DESFlagCheck, distSetDES }, - { "dict", "Spelling checker dictionary files", + { " dict", "Spelling checker dictionary files", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_DICT }, - { "doc", "Miscellaneous FreeBSD online docs", + { " doc", "Miscellaneous FreeBSD online docs", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_DOC }, - { "games", "Games (non-commercial)", + { " games", "Games (non-commercial)", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_GAMES }, - { "info", "GNU info files", + { " info", "GNU info files", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_INFO }, - { "man", "System manual pages - recommended", + { " man", "System manual pages - recommended", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_MANPAGES }, - { "catman", "Preformatted system manual pages", + { " catman", "Preformatted system manual pages", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_CATPAGES }, - { "proflibs", "Profiled versions of the libraries", + { " proflibs", "Profiled versions of the libraries", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_PROFLIBS }, - { "src", "Sources for everything but DES", + { " src", "Sources for everything but DES", srcFlagCheck, distSetSrc }, - { "ports", "The FreeBSD Ports collection", + { " ports", "The FreeBSD Ports collection", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_PORTS }, - { "local", "Local additions collection", + { " local", "Local additions collection", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_LOCAL}, - { "XFree86", "The XFree86 3.3.5 distribution", + { " XFree86", "The XFree86 3.3.5 distribution", x11FlagCheck, distSetXF86 }, - { "All", "All sources, binaries and X Window System binaries", - NULL, distSetEverything, NULL, NULL, ' ', ' ', ' ' }, - { "Clear", "Reset all of the above", - NULL, distReset, NULL, NULL, ' ', ' ', ' ' }, - { "Exit", "Exit this menu (returning to previous)", - checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, { NULL } }, }; @@ -862,28 +874,30 @@ DMenu MenuDESDistributions = { "distributions of this software, please consult the release notes.", NULL, NULL, - { { "des", "Basic DES encryption services", + { { "All", "Select all of the below", + NULL, setDES, NULL, NULL, ' ', ' ', ' ' }, + { "Reset", "Reset all of the below", + NULL, clearDES, NULL, NULL, ' ', ' ', ' ' }, + { " des", "Basic DES encryption services", dmenuFlagCheck, dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_DES, }, #if __FreeBSD__ > 3 - { "krb4", "KerberosIV authentication services", + { " krb4", "KerberosIV authentication services", dmenuFlagCheck, dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_KERBEROS4 }, #else - { "krb", "KerberosIV authentication services", + { " krb", "KerberosIV authentication services", dmenuFlagCheck, dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_KERBEROS }, #endif - { "skerbero", "Sources for Kerberos", + { " skerbero", "Sources for Kerberos", dmenuFlagCheck, dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_SKERBEROS }, - { "ssecure", "Sources for DES", + { " ssecure", "Sources for DES", dmenuFlagCheck, dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_SSECURE }, - { "scrypto", "Export controlled crypto sources", + { " scrypto", "Export controlled crypto sources", dmenuFlagCheck, dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_SCRYPTO }, - { "Exit", "Exit this menu (returning to previous)", - checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, { NULL } }, }; DMenu MenuSrcDistributions = { - DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS , + DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS, "Select the sub-components of src you wish to install.", "Please check off those portions of the FreeBSD source tree\n" "you wish to install (remember to use SPACE, not ENTER!).", @@ -891,40 +905,38 @@ DMenu MenuSrcDistributions = { NULL, { { "All", "Select all of the below", NULL, setSrc, NULL, NULL, ' ', ' ', ' ' }, - { "Clear", "Reset all of the below", + { "Reset", "Reset all of the below", NULL, clearSrc, NULL, NULL, ' ', ' ', ' ' }, - { "base", "top-level files in /usr/src", + { " base", "top-level files in /usr/src", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_BASE }, - { "contrib", "/usr/src/contrib (contributed software)", + { " contrib", "/usr/src/contrib (contributed software)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_CONTRIB }, - { "gnu", "/usr/src/gnu (software from the GNU Project)", + { " gnu", "/usr/src/gnu (software from the GNU Project)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_GNU }, - { "etc", "/usr/src/etc (miscellaneous system files)", + { " etc", "/usr/src/etc (miscellaneous system files)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_ETC }, - { "games", "/usr/src/games (the obvious!)", + { " games", "/usr/src/games (the obvious!)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_GAMES }, - { "include", "/usr/src/include (header files)", + { " include", "/usr/src/include (header files)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_INCLUDE }, - { "lib", "/usr/src/lib (system libraries)", + { " lib", "/usr/src/lib (system libraries)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_LIB }, - { "libexec", "/usr/src/libexec (system programs)", + { " libexec", "/usr/src/libexec (system programs)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_LIBEXEC }, - { "release", "/usr/src/release (release-generation tools)", + { " release", "/usr/src/release (release-generation tools)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_RELEASE }, - { "bin", "/usr/src/bin (system binaries)", + { " bin", "/usr/src/bin (system binaries)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_BIN }, - { "sbin", "/usr/src/sbin (system binaries)", + { " sbin", "/usr/src/sbin (system binaries)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SBIN }, - { "share", "/usr/src/share (documents and shared files)", + { " share", "/usr/src/share (documents and shared files)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SHARE }, - { "sys", "/usr/src/sys (FreeBSD kernel)", + { " sys", "/usr/src/sys (FreeBSD kernel)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SYS }, - { "ubin", "/usr/src/usr.bin (user binaries)", + { " ubin", "/usr/src/usr.bin (user binaries)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_UBIN }, - { "usbin", "/usr/src/usr.sbin (aux system binaries)", + { " usbin", "/usr/src/usr.sbin (aux system binaries)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_USBIN }, - { "Exit", "Exit this menu (returning to previous)", - checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, { NULL } }, }; @@ -935,12 +947,12 @@ DMenu MenuXF86Select = { "distribution sets.", NULL, NULL, - { { "Basic", "Basic component menu (required)", NULL, dmenuSubmenu, NULL, &MenuXF86SelectCore }, + { { "All", "Select all XFree86 distribution sets", NULL, setX11All }, + { "Reset", "Reset XFree86 distribution sets", NULL, clearX11All }, + { "Basic", "Basic component menu (required)", NULL, dmenuSubmenu, NULL, &MenuXF86SelectCore }, { "Server", "X server menu", NULL, dmenuSubmenu, NULL, &MenuXF86SelectServer }, { "Fonts", "Font set menu", NULL, dmenuSubmenu, NULL, &MenuXF86SelectFonts }, - { "All", "Select all XFree86 distribution sets", NULL, setX11All }, - { "Clear", "Reset XFree86 distribution list", NULL, clearX11All }, - { "Exit", "Exit this menu (returning to previous)", checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, + { "X Exit", "Exit this menu (returning to previous)", checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, { NULL } }, }; @@ -951,47 +963,43 @@ DMenu MenuXF86SelectCore = { "Bin, lib, and set are recommended for a minimum installaion.", NULL, NULL, - { { "bin", "Client applications and shared libs", + { { "All", "Select all below", + NULL, setX11Misc, NULL, NULL, ' ', ' ', ' ' }, + { "Reset", "Reset all below", + NULL, clearX11Misc, NULL, NULL, ' ', ' ', ' ' }, + { " bin", "Client applications and shared libs", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_BIN }, - { "cfg", "Configuration files", + { " cfg", "Configuration files", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_CFG }, - { "doc", "READMEs and release notes", + { " doc", "READMEs and release notes", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_DOC }, - { "html", "HTML documentation files", + { " html", "HTML documentation files", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_HTML }, - { "lib", "Data files needed at runtime", + { " lib", "Data files needed at runtime", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LIB }, -#ifdef __i386__ - { "lk98", "Server link kit for PC98 machines", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LKIT98 }, -#endif - { "lkit", "Server link kit for all other machines", + { " lkit", "Server link kit for all other machines", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LKIT }, - { "man", "Manual pages", + { " man", "Manual pages", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_MAN }, - { "prog", "Programmer's header and library files", + { " prog", "Programmer's header and library files", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_PROG }, - { "set", "XFree86 Setup Utility", + { " set", "XFree86 Setup Utility", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SET }, #ifdef __i386__ - { "9set", "XFree86 Setup Utility for PC98 machines", + { " 9set", "XFree86 Setup Utility for PC98 machines", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_9SET }, + { " lk98", "Server link kit for PC98 machines", + dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LKIT98 }, #endif - { "sources", "XFree86 3.3.5 standard sources", + { " sources", "XFree86 3.3.5 standard sources", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SRC }, - { "csources", "XFree86 3.3.5 contrib sources", + { " csources", "XFree86 3.3.5 contrib sources", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_CSRC }, - { "All", "Select all of the above", - NULL, setX11Misc, NULL, NULL, ' ', ' ', ' ' }, - { "Clear", "Reset all of the above", - NULL, clearX11Misc, NULL, NULL, ' ', ' ', ' ' }, - { "Exit", "Exit this menu (returning to previous)", - checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, { NULL } }, }; DMenu MenuXF86SelectFonts = { - DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS , + DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS, "Font distribution selection.", "Please check off the individual font distributions you wish to\n\ install. At the minimum, you should install the standard\n\ @@ -999,24 +1007,22 @@ install. At the minimum, you should install the standard\n\ (these are selected by default).", NULL, NULL, - { { "fnts", "Standard 75 DPI and miscellaneous fonts", + { { "All", "All fonts", + NULL, setX11Fonts, NULL, NULL, ' ', ' ', ' ' }, + { "Reset", "Reset font selections", + NULL, clearX11Fonts, NULL, NULL, ' ', ' ', ' ' }, + { " fnts", "Standard 75 DPI and miscellaneous fonts", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_MISC }, - { "f100", "100 DPI fonts", + { " f100", "100 DPI fonts", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_100 }, - { "fcyr", "Cyrillic Fonts", + { " fcyr", "Cyrillic Fonts", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_CYR }, - { "fscl", "Speedo and Type scalable fonts", + { " fscl", "Speedo and Type scalable fonts", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_SCALE }, - { "non", "Japanese, Chinese and other non-english fonts", + { " non", "Japanese, Chinese and other non-english fonts", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_NON }, - { "server", "Font server", + { " server", "Font server", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_SERVER }, - { "All", "All fonts", - NULL, setX11Fonts, NULL, NULL, ' ', ' ', ' ' }, - { "Clear", "Reset font selections", - NULL, clearX11Fonts, NULL, NULL, ' ', ' ', ' ' }, - { "Exit", "Exit this menu (returning to previous)", - checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, { NULL } }, }; @@ -1029,47 +1035,45 @@ DMenu MenuXF86SelectServer = { "machines, the 9EGC or 9840 servers.", NULL, NULL, - { { "SVGA", "Standard VGA or Super VGA card", + { { "All", "Select all of the above", + NULL, setX11Servers, NULL, NULL, ' ', ' ', ' ' }, + { "Reset", "Reset all of the above", + NULL, clearX11Servers, NULL, NULL, ' ', ' ', ' ' }, + { " SVGA", "Standard VGA or Super VGA card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_SVGA }, - { "VGA16", "Standard 16 color VGA card", + { " VGA16", "Standard 16 color VGA card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_VGA16 }, - { "Mono", "Standard Monochrome card", + { " Mono", "Standard Monochrome card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_MONO }, - { "3DL", "8, 16 and 24 bit color 3D Labs boards", + { " 3DL", "8, 16 and 24 bit color 3D Labs boards", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_3DL }, - { "8514", "8-bit (256 color) IBM 8514 or compatible card", + { " 8514", "8-bit (256 color) IBM 8514 or compatible card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_8514 }, - { "AGX", "8-bit AGX card", + { " AGX", "8-bit AGX card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_AGX }, - { "I128", "8, 16 and 24-bit #9 Imagine I128 card", + { " I128", "8, 16 and 24-bit #9 Imagine I128 card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_I128 }, - { "Ma8", "8-bit ATI Mach8 card", + { " Ma8", "8-bit ATI Mach8 card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_MACH8 }, - { "Ma32", "8 and 16-bit (65K color) ATI Mach32 card", + { " Ma32", "8 and 16-bit (65K color) ATI Mach32 card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_MACH32 }, - { "Ma64", "8 and 16-bit (65K color) ATI Mach64 card", + { " Ma64", "8 and 16-bit (65K color) ATI Mach64 card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_MACH64 }, - { "P9K", "8, 16, and 24-bit color Weitek P9000 based boards", + { " P9K", "8, 16, and 24-bit color Weitek P9000 based boards", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_P9000 }, - { "S3", "8, 16 and 24-bit color S3 based boards", + { " S3", "8, 16 and 24-bit color S3 based boards", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_S3 }, - { "S3V", "8, 16 and 24-bit color S3 Virge based boards", + { " S3V", "8, 16 and 24-bit color S3 Virge based boards", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_S3V }, - { "W32", "8-bit ET4000/W32, /W32i and /W32p cards", + { " W32", "8-bit ET4000/W32, /W32i and /W32p cards", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_W32 }, #ifdef __i386__ - { "PC98", "Select an X server for a NEC PC98 [Submenu]", + { " PC98", "Select an X server for a NEC PC98 [Submenu]", NULL, dmenuSubmenu, NULL, &MenuXF86SelectPC98Server, '>', ' ', '>', 0 }, #elif __alpha__ - { "TGA", "TGA cards (alpha architecture only)", + { " TGA", "TGA cards (alpha architecture only)", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_TGA }, #endif - { "All", "Select all of the above", - NULL, setX11Servers, NULL, NULL, ' ', ' ', ' ' }, - { "Clear", "Reset all of the above", - NULL, clearX11Servers, NULL, NULL, ' ', ' ', ' ' }, - { "Exit", "Exit this menu (returning to previous)", - checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, { NULL } }, }; @@ -1083,36 +1087,34 @@ it is recommended that try the SVGA or VGA16 servers (the VGA16 and\n\ Mono servers are particularly well-suited to most LCD displays).", NULL, NULL, - { { "9480", "PC98 8-bit (256 color) PEGC-480 card", + { { " 9480", "PC98 8-bit (256 color) PEGC-480 card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9480 }, - { "9EGC", "PC98 4-bit (16 color) EGC card", + { " 9EGC", "PC98 4-bit (16 color) EGC card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9EGC }, - { "9GA9", "PC98 GA-968V4/PCI (S3 968) card", + { " 9GA9", "PC98 GA-968V4/PCI (S3 968) card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9GA9 }, - { "9GAN", "PC98 GANB-WAP (cirrus) card", + { " 9GAN", "PC98 GANB-WAP (cirrus) card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9GAN }, - { "9LPW", "PC98 PowerWindowLB (S3) card", + { " 9LPW", "PC98 PowerWindowLB (S3) card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9LPW }, - { "9MGA", "PC98 MGA (Matrox) card", + { " 9MGA", "PC98 MGA (Matrox) card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9MGA }, - { "9NKV", "PC98 NKV-NEC (cirrus) card", + { " 9NKV", "PC98 NKV-NEC (cirrus) card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9NKV }, - { "9NS3", "PC98 NEC (S3) card", + { " 9NS3", "PC98 NEC (S3) card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9NS3 }, - { "9SPW", "PC98 SKB-PowerWindow (S3) card", + { " 9SPW", "PC98 SKB-PowerWindow (S3) card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9SPW }, - { "9SVG", "PC98 generic SVGA card", + { " 9SVG", "PC98 generic SVGA card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9SVG }, - { "9TGU", "PC98 Cyber9320 and TGUI9680 cards", + { " 9TGU", "PC98 Cyber9320 and TGUI9680 cards", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9TGU }, - { "9WEP", "PC98 WAB-EP (cirrus) card", + { " 9WEP", "PC98 WAB-EP (cirrus) card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9WEP }, - { "9WS", "PC98 WABS (cirrus) card", + { " 9WS", "PC98 WABS (cirrus) card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9WS }, - { "9WSN", "PC98 WSN-A2F (cirrus) card", + { " 9WSN", "PC98 WSN-A2F (cirrus) card", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9WSN }, - { "Exit", "Exit this menu (returning to previous)", - checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, { NULL } } }; #endif @@ -1140,10 +1142,11 @@ DMenu MenuHTMLDoc = { "to enter an arbitrary URL for browsing.", "Press F1 for more help on what you see here.", "html", - { { "Handbook", "The FreeBSD Handbook.", NULL, docShowDocument }, - { "FAQ", "The Frequently Asked Questions guide.", NULL, docShowDocument }, - { "Home", "The Home Pages for the FreeBSD Project (requires net)", NULL, docShowDocument }, - { "Other", "Enter a URL.", NULL, docShowDocument }, + { { "1 Handbook", "The FreeBSD Handbook.", NULL, docShowDocument }, + { "2 FAQ", "The Frequently Asked Questions guide.", NULL, docShowDocument }, + { "3 Home", "The Home Pages for the FreeBSD Project (requires net)", NULL, docShowDocument }, + { "4 Other", "Enter a URL.", NULL, docShowDocument }, + { "X Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, { NULL } }, }; @@ -1169,7 +1172,7 @@ DMenu MenuInstallCustom = { { "5 Media", "Choose the installation media type", NULL, dmenuSubmenu, NULL, &MenuMedia }, { "6 Commit", "Perform any pending Partition/Label/Extract actions", NULL, installCustomCommit }, #endif - { "0 Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, + { "X Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, { NULL } }, }; @@ -1207,41 +1210,41 @@ DMenu MenuConfigure = { "software not provided in the base distributions.", "Press F1 for more information on these options", "configure", - { { "D Distributions", "Install additional distribution sets", + { { " Distributions", "Install additional distribution sets", NULL, distExtractAll }, - { "P Packages", "Install pre-packaged software for FreeBSD", + { " Packages", "Install pre-packaged software for FreeBSD", NULL, configPackages }, - { "R Root Password", "Set the system manager's password", + { " Root Password", "Set the system manager's password", NULL, dmenuSystemCommand, NULL, "passwd root" }, - { "L Label", "The disk Label editor", + { " Label", "The disk Label editor", NULL, diskLabelEditor }, #ifdef __i386__ - { "F Fdisk", "The disk Slice (PC-style partition) Editor", + { " Fdisk", "The disk Slice (PC-style partition) Editor", NULL, diskPartitionEditor }, #endif - { "1 User Management", "Add user and group information", + { " User Management", "Add user and group information", NULL, dmenuSubmenu, NULL, &MenuUsermgmt }, - { "2 Console", "Customize system console behavior", + { " Console", "Customize system console behavior", NULL, dmenuSubmenu, NULL, &MenuSyscons }, - { "3 Time Zone", "Set which time zone you're in", + { " Time Zone", "Set which time zone you're in", NULL, dmenuSystemCommand, NULL, "tzsetup" }, - { "4 Media", "Change the installation media type", - NULL, dmenuSubmenu, NULL, &MenuMedia }, - { "5 Mouse", "Configure your mouse", + { " Media", "Change the installation media type", + NULL, dmenuSubmenu, NULL, &MenuMedia }, + { " Mouse", "Configure your mouse", NULL, dmenuSubmenu, NULL, &MenuMouse, NULL }, - { "6 Networking", "Configure additional network services", + { " Networking", "Configure additional network services", NULL, dmenuSubmenu, NULL, &MenuNetworking }, - { "7 Startup", "Configure system startup options", + { " Startup", "Configure system startup options", NULL, dmenuSubmenu, NULL, &MenuStartup }, - { "8 Options", "View/Set various installation options", + { " Options", "View/Set various installation options", NULL, optionsEditor }, - { "X XFree86", "Configure XFree86 Server", + { " XFree86", "Configure XFree86 Server", NULL, configXSetup }, - { "D Desktop", "Configure XFree86 Desktop", + { " Desktop", "Configure XFree86 Desktop", NULL, configXDesktop }, - { "H HTML Docs", "Go to the HTML documentation menu (post-install)", + { " HTML Docs", "Go to the HTML documentation menu (post-install)", NULL, docBrowser }, - { "E Exit", "Exit this menu (returning to previous)", + { "X Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, { NULL } }, }; @@ -1254,42 +1257,40 @@ DMenu MenuStartup = { "RETURN key will leave this menu (as with all checkbox menus).", NULL, NULL, - { { "APM", "Auto-power management services (typically laptops)", + { { " APM", "Auto-power management services (typically laptops)", dmenuVarCheck, dmenuToggleVariable, NULL, "apm_enable=YES" }, - { "pccard", "Enable PCCARD (AKA PCMCIA) services (also laptops)", + { " pccard", "Enable PCCARD (AKA PCMCIA) services (also laptops)", dmenuVarCheck, dmenuToggleVariable, NULL, "pccard_enable=YES" }, - { "pccard mem", "Set PCCARD memory address (if enabled)", + { " pccard mem", "Set PCCARD memory address (if enabled)", dmenuVarCheck, dmenuISetVariable, NULL, "pccard_mem" }, - { "pccard ifconfig", "List of PCCARD ethernet devices to configure", + { " pccard ifconfig", "List of PCCARD ethernet devices to configure", dmenuVarCheck, dmenuISetVariable, NULL, "pccard_ifconfig" }, { " ", " -- ", NULL, NULL, NULL, NULL, ' ', ' ', ' ' }, - { "startup dirs", "Set the list of dirs to look for startup scripts", + { " startup dirs", "Set the list of dirs to look for startup scripts", dmenuVarCheck, dmenuISetVariable, NULL, "local_startup" }, - { "named", "Run a local name server on this host", + { " named", "Run a local name server on this host", dmenuVarCheck, dmenuToggleVariable, NULL, "named_enable=YES" }, - { "named flags", "Set default flags to named (if enabled)", + { " named flags", "Set default flags to named (if enabled)", dmenuVarCheck, dmenuISetVariable, NULL, "named_flags" }, - { "nis client", "This host wishes to be an NIS client.", + { " nis client", "This host wishes to be an NIS client.", dmenuVarCheck, dmenuToggleVariable, NULL, "nis_client_enable=YES" }, - { "nis domainname", "Set NIS domainname (if enabled)", + { " nis domainname", "Set NIS domainname (if enabled)", dmenuVarCheck, dmenuISetVariable, NULL, "nisdomainname" }, - { "nis server", "This host wishes to be an NIS server.", + { " nis server", "This host wishes to be an NIS server.", dmenuVarCheck, dmenuToggleVariable, NULL, "nis_server_enable=YES" }, { " ", " -- ", NULL, NULL, NULL, NULL, ' ', ' ', ' ' }, - { "accounting", "This host wishes to run process accounting.", + { " accounting", "This host wishes to run process accounting.", dmenuVarCheck, dmenuToggleVariable, NULL, "accounting_enable=YES" }, - { "lpd", "This host has a printer and wants to run lpd.", + { " lpd", "This host has a printer and wants to run lpd.", dmenuVarCheck, dmenuToggleVariable, NULL, "lpd_enable=YES" }, #ifdef __i386__ - { "linux", "This host wants to be able to run linux binaries.", + { " linux", "This host wants to be able to run linux binaries.", dmenuVarCheck, configLinux, NULL, VAR_LINUX_ENABLE "=YES" }, - { "SCO", "This host wants to be able to run IBCS2 binaries.", + { " SCO", "This host wants to be able to run IBCS2 binaries.", dmenuVarCheck, dmenuToggleVariable, NULL, "ibcs2_enable=YES" }, #endif - { "quotas", "This host wishes to check quotas on startup.", + { " quotas", "This host wishes to check quotas on startup.", dmenuVarCheck, dmenuToggleVariable, NULL, "check_quotas=YES" }, - { "Exit", "Exit this menu (returning to previous)", - checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, { NULL } }, }; @@ -1302,32 +1303,30 @@ DMenu MenuNetworking = { "aspects of your system's network configuration.", NULL, NULL, - { { "Interfaces", "Configure additional network interfaces", + { { " Interfaces", "Configure additional network interfaces", NULL, tcpMenuSelect }, - { "NFS client", "This machine will be an NFS client", + { " NFS client", "This machine will be an NFS client", dmenuVarCheck, dmenuToggleVariable, NULL, "nfs_client_enable=YES" }, - { "NFS server", "This machine will be an NFS server", - dmenuVarCheck, configNFSServer, NULL, "nfs_server_enable=YES" }, - { "AMD", "This machine wants to run the auto-mounter service", - dmenuVarCheck, dmenuToggleVariable, NULL, "amd_enable=YES" }, - { "AMD Flags", "Set flags to AMD service (if enabled)", - dmenuVarCheck, dmenuISetVariable, NULL, "amd_flags" }, - { "TCP Extensions", "Allow RFC1323 and RFC1644 TCP extensions?", - dmenuVarCheck, dmenuToggleVariable, NULL, "tcp_extensions=YES" }, - { "Gateway", "This machine will route packets between interfaces", + { " NFS server", "This machine will be an NFS server", + dmenuVarCheck, configNFSServer, NULL, "nfs_server_enable=YES" }, + { " AMD", "This machine wants to run the auto-mounter service", + dmenuVarCheck, dmenuToggleVariable, NULL, "amd_enable=YES" }, + { " AMD Flags", "Set flags to AMD service (if enabled)", + dmenuVarCheck, dmenuISetVariable, NULL, "amd_flags" }, + { " TCP Extensions", "Allow RFC1323 and RFC1644 TCP extensions?", + dmenuVarCheck, dmenuToggleVariable, NULL, "tcp_extensions=YES" }, + { " Gateway", "This machine will route packets between interfaces", dmenuVarCheck, dmenuToggleVariable, NULL, "gateway_enable=YES" }, - { "Ntpdate", "Select a clock-synchronization server", + { " Ntpdate", "Select a clock-synchronization server", dmenuVarCheck, dmenuSubmenu, NULL, &MenuNTP, '[', 'X', ']', "ntpdate_enable=YES" }, - { "router", "Select routing daemon (default: routed)", - dmenuVarCheck, configRouter, NULL, "router" }, - { "Rwhod", "This machine wants to run the rwho daemon", + { " router", "Select routing daemon (default: routed)", + dmenuVarCheck, configRouter, NULL, "router" }, + { " Rwhod", "This machine wants to run the rwho daemon", dmenuVarCheck, dmenuToggleVariable, NULL, "rwhod_enable=YES" }, - { "Anon FTP", "This machine wishes to allow anonymous FTP.", - dmenuVarCheck, configAnonFTP, NULL, "anon_ftp" }, - { "PCNFSD", "Run authentication server for clients with PC-NFS.", - dmenuVarCheck, configPCNFSD, NULL, "pcnfsd" }, - { "Exit", "Exit this menu (returning to previous)", - checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, + { " Anon FTP", "This machine wishes to allow anonymous FTP.", + dmenuVarCheck, configAnonFTP, NULL, "anon_ftp" }, + { " PCNFSD", "Run authentication server for clients with PC-NFS.", + dmenuVarCheck, configPCNFSD, NULL, "pcnfsd" }, { NULL } }, }; @@ -1347,7 +1346,7 @@ DMenu MenuNTP = { { "Australia", "ntp.syd.dms.csiro.au (HP 5061 Cesium Beam)", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp.syd.dms.csiro.au" }, - { "Canada", "tick.usask.ca (GOES clock)", + { " Canada", "tick.usask.ca (GOES clock)", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=tick.usask.ca" }, { "France", "canon.inria.fr (TDF clock)", @@ -1356,40 +1355,40 @@ DMenu MenuNTP = { { "Germany", "ntps1-{0,1,2}.uni-erlangen.de (GPS)", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntps1-0.uni-erlangen.de" }, - { "Germany #2", "ntps1-0.cs.tu-berlin.de (GPS)", + { " Germany #2", "ntps1-0.cs.tu-berlin.de (GPS)", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntps1-0.cs.tu-berlin.de" }, { "Japan", "clock.nc.fukuoka-u.ac.jp (GPS clock)", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=clock.nc.fukuoka-u.ac.jp" }, - { "Japan #2", "clock.tl.fukuoka-u.ac.jp (GPS clock)", + { " Japan #2", "clock.tl.fukuoka-u.ac.jp (GPS clock)", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=clock.tl.fukuoka-u.ac.jp" }, { "Netherlands", "ntp0.nl.net (GPS clock)", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp0.nl.net" }, - { "Norway", "timehost.ifi.uio.no (NTP clock)", + { " Norway", "timehost.ifi.uio.no (NTP clock)", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=timehost.ifi.uio.no" }, { "Sweden", "Time1.Stupi.SE (Cesium/GPS)", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=Time1.Stupi.SE" }, - { "Switzerland", "swisstime.ethz.ch (DCF77 clock)", + { " Switzerland", "swisstime.ethz.ch (DCF77 clock)", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=swisstime.ethz.ch" }, { "U.S. East Coast", "bitsy.mit.edu (WWV clock)", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=bitsy.mit.edu" }, - { "U.S. East Coast #2", "otc1.psu.edu (WWV clock)", + { " U.S. East Coast #2", "otc1.psu.edu (WWV clock)", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=otc1.psu.edu" }, - { "U.S. West Coast #1", "clepsydra.dec.com (GOES clock)", + { " U.S. West Coast #1", "clepsydra.dec.com (GOES clock)", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=clepsydra.dec.com" }, - { "U.S. West Coast #2", "clock.llnl.gov (WWVB clock)", + { " U.S. West Coast #2", "clock.llnl.gov (WWVB clock)", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=clock.llnl.gov" }, - { "U.S. Midwest", "ncar.ucar.edu (WWVB clock)", + { " U.S. Midwest", "ncar.ucar.edu (WWVB clock)", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ncar.ucar.edu" }, { NULL } }, @@ -1404,12 +1403,12 @@ DMenu MenuSyscons = { "When you are done setting configuration options, select Cancel.", "Configure your system console settings", NULL, - { { "Font", "Choose an alternate screen font", NULL, dmenuSubmenu, NULL, &MenuSysconsFont }, - { "Keymap", "Choose an alternate keyboard map", NULL, dmenuSubmenu, NULL, &MenuSysconsKeymap }, - { "Repeat", "Set the rate at which keys repeat", NULL, dmenuSubmenu, NULL, &MenuSysconsKeyrate }, - { "Saver", "Configure the screen saver", NULL, dmenuSubmenu, NULL, &MenuSysconsSaver }, - { "Screenmap", "Choose an alternate screenmap", NULL, dmenuSubmenu, NULL, &MenuSysconsScrnmap }, - { "Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, + { { "1 Font", "Choose an alternate screen font", NULL, dmenuSubmenu, NULL, &MenuSysconsFont }, + { "2 Keymap", "Choose an alternate keyboard map", NULL, dmenuSubmenu, NULL, &MenuSysconsKeymap }, + { "3 Repeat", "Set the rate at which keys repeat", NULL, dmenuSubmenu, NULL, &MenuSysconsKeyrate }, + { "4 Saver", "Configure the screen saver", NULL, dmenuSubmenu, NULL, &MenuSysconsSaver }, + { "5 Screenmap", "Choose an alternate screenmap", NULL, dmenuSubmenu, NULL, &MenuSysconsScrnmap }, + { "X Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, { NULL } }, }; @@ -1426,49 +1425,49 @@ DMenu MenuSysconsKeymap = { "Choose a keyboard map", NULL, { { "Belgian", "Belgian ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=be.iso" }, - { "Brazil CP850", "Brazil CP850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=br275.cp850" }, - { "Brazil ISO (accent)", "Brazil ISO keymap (accent keys)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=br275.iso.acc" }, - { "Brazil ISO", "Brazil ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=br275.iso" }, - { "Croatian ISO", "Croatian ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=hr.iso" }, + { " Brazil CP850", "Brazil CP850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=br275.cp850" }, + { " Brazil ISO (accent)", "Brazil ISO keymap (accent keys)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=br275.iso.acc" }, + { " Brazil ISO", "Brazil ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=br275.iso" }, + { " Croatian ISO", "Croatian ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=hr.iso" }, { "Danish CP865", "Danish Code Page 865 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=danish.cp865" }, - { "Danish ISO", "Danish ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=danish.iso" }, + { " Danish ISO", "Danish ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=danish.iso" }, { "Estonian ISO", "Estonian ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=estonian.iso" }, - { "Estonian ISO 15", "Estonian ISO 8859-15 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=estonian.iso15" }, - { "Estonian CP850", "Estonian Code Page 850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=estonian.cp850" }, - { "Finnish CP850","Finnish Code Page 850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=finnish.cp850" }, - { "Finnish ISO", "Finnish ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=finnish.iso" }, - { "French ISO (accent)", "French ISO keymap (accent keys)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=fr.iso.acc" }, - { "French ISO", "French ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=fr.iso" }, + { " Estonian ISO 15", "Estonian ISO 8859-15 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=estonian.iso15" }, + { " Estonian CP850", "Estonian Code Page 850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=estonian.cp850" }, + { " Finnish CP850","Finnish Code Page 850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=finnish.cp850" }, + { " Finnish ISO", "Finnish ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=finnish.iso" }, + { " French ISO (accent)", "French ISO keymap (accent keys)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=fr.iso.acc" }, + { " French ISO", "French ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=fr.iso" }, { "German CP850", "German Code Page 850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=german.cp850" }, - { "German ISO", "German ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=german.iso" }, + { " German ISO", "German ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=german.iso" }, { "Hungarian 101", "Hungarian ISO keymap (101 key)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=hu.iso2.101keys" }, - { "Hungarian 102", "Hungarian ISO keymap (102 key)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=hu.iso2.102keys" }, + { " Hungarian 102", "Hungarian ISO keymap (102 key)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=hu.iso2.102keys" }, { "Icelandic (accent)", "Icelandic ISO keymap (accent keys)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=icelandic.iso.acc" }, - { "Icelandic", "Icelandic ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=icelandic.iso" }, - { "Italian", "Italian ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=it.iso" }, + { " Icelandic", "Icelandic ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=icelandic.iso" }, + { " Italian", "Italian ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=it.iso" }, { "Latin American", "Latin American ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=lat-amer" }, { "Japanese 106", "Japanese 106 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=jp.106" }, { "Norway ISO", "Norwegian ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=norwegian.iso" }, { "Polish ISO", "Polish ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=pl_PL.ISO_8859-2" }, - { "Portuguese (accent)", "Portuguese ISO keymap (accent keys)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=pt.iso.acc" }, - { "Portuguese", "Portuguese ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=pt.iso" }, + { " Portuguese (accent)", "Portuguese ISO keymap (accent keys)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=pt.iso.acc" }, + { " Portuguese", "Portuguese ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=pt.iso" }, { "Russia CP866", "Russian CP866 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=ru.cp866" }, - { "Russia KOI8-R", "Russian KOI8-R keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=ru.koi8-r" }, + { " Russia KOI8-R", "Russian KOI8-R keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=ru.koi8-r" }, { "Slovenian", "Slovenian ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=si.iso.acc" }, - { "Spanish (accent)", "Spanish ISO keymap (accent keys)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=spanish.iso.acc" }, - { "Spanish", "Spanish ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=spanish.iso" }, - { "Swedish CP850", "Swedish Code Page 850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swedish.cp850" }, - { "Swedish ISO", "Swedish ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swedish.iso" }, - { "Swiss French ISO (accent)", "Swiss French ISO keymap (accent keys)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swissfrench.iso.acc" }, - { "Swiss French ISO", "Swiss French ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swissfrench.iso" }, - { "Swiss French CP850", "Swiss French Code Page 850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swissfrench.cp850" }, - { "Swiss German ISO (accent)", "Swiss German ISO keymap (accent keys)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swissgerman.iso.acc" }, - { "Swiss German ISO", "Swiss German ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swissgerman.iso" }, - { "Swiss German CP850", "Swiss German Code Page 850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swissgerman.cp850" }, + { " Spanish (accent)", "Spanish ISO keymap (accent keys)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=spanish.iso.acc" }, + { " Spanish", "Spanish ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=spanish.iso" }, + { " Swedish CP850", "Swedish Code Page 850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swedish.cp850" }, + { " Swedish ISO", "Swedish ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swedish.iso" }, + { " Swiss French ISO (accent)", "Swiss French ISO keymap (accent keys)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swissfrench.iso.acc" }, + { " Swiss French ISO", "Swiss French ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swissfrench.iso" }, + { " Swiss French CP850", "Swiss French Code Page 850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swissfrench.cp850" }, + { " Swiss German ISO (accent)", "Swiss German ISO keymap (accent keys)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swissgerman.iso.acc" }, + { " Swiss German ISO", "Swiss German ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swissgerman.iso" }, + { " Swiss German CP850", "Swiss German Code Page 850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swissgerman.cp850" }, { "U.K. CP850", "United Kingdom Code Page 850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=uk.cp850" }, - { "U.K. ISO", "United Kingdom ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=uk.iso" }, - { "U.S. Dvorak", "United States Dvorak keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=us.dvorak" }, - { "U.S. ISO", "United States ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=us.iso" }, + { " U.K. ISO", "United Kingdom ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=uk.iso" }, + { " U.S. Dvorak", "United States Dvorak keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=us.dvorak" }, + { " U.S. ISO", "United States ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=us.iso" }, { NULL } }, }; @@ -1495,23 +1494,23 @@ DMenu MenuSysconsSaver = { "probably enable one of these screen savers to prevent phosphor burn-in.", "Choose a nifty-looking screen saver", NULL, - { { "Blank", "Simply blank the screen", + { { "1 Blank", "Simply blank the screen", dmenuVarCheck, configSaver, NULL, "saver=blank" }, - { "Daemon", "\"BSD Daemon\" animated screen saver (text)", + { "2 Daemon", "\"BSD Daemon\" animated screen saver (text)", dmenuVarCheck, configSaver, NULL, "saver=daemon" }, - { "Fade", "Fade out effect screen saver", + { "3 Fade", "Fade out effect screen saver", dmenuVarCheck, configSaver, NULL, "saver=fade" }, - { "Fire", "Flames effect screen saver", + { "4 Fire", "Flames effect screen saver", dmenuVarCheck, configSaver, NULL, "saver=fire" }, - { "Green", "\"Green\" power saving mode (if supported by monitor)", + { "5 Green", "\"Green\" power saving mode (if supported by monitor)", dmenuVarCheck, configSaver, NULL, "saver=green" }, - { "Logo", "\"BSD Daemon\" animated screen saver (graphics)", + { "6 Logo", "\"BSD Daemon\" animated screen saver (graphics)", dmenuVarCheck, configSaver, NULL, "saver=logo" }, - { "Rain", "Rain drops screen saver", + { "7 Rain", "Rain drops screen saver", dmenuVarCheck, configSaver, NULL, "saver=rain" }, - { "Snake", "Draw a FreeBSD \"snake\" on your screen", + { "8 Snake", "Draw a FreeBSD \"snake\" on your screen", dmenuVarCheck, configSaver, NULL, "saver=snake" }, - { "Star", "A \"twinkling stars\" effect", + { "9 Star", "A \"twinkling stars\" effect", dmenuVarCheck, configSaver, NULL, "saver=star" }, { "Warp", "A \"stars warping\" effect", dmenuVarCheck, configSaver, NULL, "saver=warp" }, @@ -1556,21 +1555,21 @@ DMenu MenuSysconsFont = { "you can select the appropriate font below.", "Choose a font", NULL, - { { "None", "Use default font", dmenuVarCheck, dmenuSetVariables, NULL, + { { "1 None", "Use default font", dmenuVarCheck, dmenuSetVariables, NULL, "font8x8=NO,font8x14=NO,font8x16=NO" }, - { "IBM 437", "English", dmenuVarCheck, dmenuSetVariables, NULL, + { "2 IBM 437", "English", dmenuVarCheck, dmenuSetVariables, NULL, "font8x8=cp437-8x8,font8x14=cp437-8x14,font8x16=cp437-8x16" }, - { "IBM 850", "Western Europe, IBM encoding", dmenuVarCheck, dmenuSetVariables, NULL, + { "3 IBM 850", "Western Europe, IBM encoding", dmenuVarCheck, dmenuSetVariables, NULL, "font8x8=cp850-8x8,font8x14=cp850-8x14,font8x16=cp850-8x16" }, - { "IBM 865", "Norwegian, IBM encoding", dmenuVarCheck, dmenuSetVariables, NULL, + { "4 IBM 865", "Norwegian, IBM encoding", dmenuVarCheck, dmenuSetVariables, NULL, "font8x8=cp865-8x8,font8x14=cp865-8x14,font8x16=cp865-8x16" }, - { "IBM 866", "Russian, IBM encoding", dmenuVarCheck, dmenuSetVariables, NULL, + { "5 IBM 866", "Russian, IBM encoding", dmenuVarCheck, dmenuSetVariables, NULL, "font8x8=cp866-8x8,font8x14=cp866-8x14,font8x16=cp866-8x16" }, - { "ISO 8859-1", "Western Europe, ISO encoding", dmenuVarCheck, dmenuSetVariables, NULL, + { "6 ISO 8859-1", "Western Europe, ISO encoding", dmenuVarCheck, dmenuSetVariables, NULL, "font8x8=iso-8x8,font8x14=iso-8x14,font8x16=iso-8x16" }, - { "KOI8-R", "Russian, KOI8-R encoding", dmenuVarCheck, dmenuSetVariables, NULL, + { "7 KOI8-R", "Russian, KOI8-R encoding", dmenuVarCheck, dmenuSetVariables, NULL, "font8x8=koi8-r-8x8,font8x14=koi8-r-8x14,font8x16=koi8-r-8x16" }, - { "SWISS", "English, better resolution", dmenuVarCheck, dmenuSetVariables, NULL, + { "8 SWISS", "English, better resolution", dmenuVarCheck, dmenuSetVariables, NULL, "font8x8=swiss-8x8,font8x14=NO,font8x16=swiss-8x16" }, { NULL } }, }; @@ -1582,9 +1581,9 @@ DMenu MenuUsermgmt = { "login accounts.\n", "Configure your user groups and users", NULL, - { { "Add user", "Add a new user to the system.", NULL, userAddUser }, - { "Add group", "Add a new user group to the system.", NULL, userAddGroup }, - { "Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, + { { "User", "Add a new user to the system.", NULL, userAddUser }, + { "Group", "Add a new user group to the system.", NULL, userAddGroup }, + { "X Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, { NULL } }, }; @@ -1602,6 +1601,7 @@ DMenu MenuFixit = { { { "1 CDROM", "Use the 2nd \"live\" CDROM from the distribution", NULL, installFixitCDROM }, { "2 Floppy", "Use a floppy generated from the fixit image", NULL, installFixitFloppy }, { "3 Shell", "Start an Emergency Holographic Shell", NULL, installFixitHoloShell }, + { "X Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, { NULL } }, }; diff --git a/usr.sbin/sysinstall/msg.c b/usr.sbin/sysinstall/msg.c index 2986779..3d7affe 100644 --- a/usr.sbin/sysinstall/msg.c +++ b/usr.sbin/sysinstall/msg.c @@ -184,6 +184,7 @@ msgConfirm(char *fmt, ...) { va_list args; char *errstr; + WINDOW *w = savescr(); errstr = (char *)alloca(FILENAME_MAX); va_start(args, fmt); @@ -196,6 +197,7 @@ msgConfirm(char *fmt, ...) msgInfo(NULL); } dialog_notify(errstr); + restorescr(w); } /* Put up a message in a popup information box */ @@ -204,6 +206,7 @@ msgNotify(char *fmt, ...) { va_list args; char *errstr; + WINDOW *w = savescr(); errstr = (char *)alloca(FILENAME_MAX); va_start(args, fmt); @@ -213,8 +216,9 @@ msgNotify(char *fmt, ...) use_helpfile(NULL); if (isDebug()) msgDebug("Notify: %s\n", errstr); - dialog_clear_norefresh(); dialog_msgbox(NULL, errstr, -1, -1, 0); + sleep(1); + restorescr(w); } /* Put up a message in a popup yes/no box and return 1 for YES, 0 for NO */ @@ -224,7 +228,8 @@ msgYesNo(char *fmt, ...) va_list args; char *errstr; int ret; - + WINDOW *w = savescr(); + errstr = (char *)alloca(FILENAME_MAX); va_start(args, fmt); vsnprintf(errstr, FILENAME_MAX, fmt, args); @@ -236,6 +241,7 @@ msgYesNo(char *fmt, ...) msgInfo(NULL); } ret = dialog_yesno("User Confirmation Requested", errstr, -1, -1); + restorescr(w); return ret; } @@ -247,6 +253,7 @@ msgGetInput(char *buf, char *fmt, ...) char *errstr; static char input_buffer[256]; int rval; + WINDOW *w = savescr(); errstr = (char *)alloca(FILENAME_MAX); va_start(args, fmt); @@ -263,6 +270,7 @@ msgGetInput(char *buf, char *fmt, ...) msgInfo(NULL); } rval = dialog_inputbox("Value Required", errstr, -1, -1, input_buffer); + restorescr(w); if (!rval) return input_buffer; else @@ -292,7 +300,8 @@ msgWeHaveOutput(char *fmt, ...) { va_list args; char *errstr; - + WINDOW *w = savescr(); + errstr = (char *)alloca(FILENAME_MAX); va_start(args, fmt); vsnprintf(errstr, FILENAME_MAX, fmt, args); @@ -302,6 +311,7 @@ msgWeHaveOutput(char *fmt, ...) msgDebug("Notify: %s\n", errstr); dialog_clear_norefresh(); dialog_msgbox(NULL, errstr, -1, -1, 0); + restorescr(w); } /* Simple versions of msgConfirm() and msgNotify() for calling from scripts */ diff --git a/usr.sbin/sysinstall/network.c b/usr.sbin/sysinstall/network.c index adffa4d..b92e37b 100644 --- a/usr.sbin/sysinstall/network.c +++ b/usr.sbin/sysinstall/network.c @@ -55,7 +55,8 @@ mediaInitNetwork(Device *dev) int i; char *rp; char *cp, ifconfig[255]; - + WINDOW *w; + if (!RunningAsInit || networkInitialized) return TRUE; @@ -87,6 +88,7 @@ mediaInitNetwork(Device *dev) char *val; char attach[256]; + w = savescr(); dialog_clear_norefresh(); /* Cheesy slip attach */ snprintf(attach, 256, "slattach -a -h -l -s 9600 %s", dev->devname); @@ -101,6 +103,7 @@ mediaInitNetwork(Device *dev) "ready, press [ENTER] to execute it."); if (!val) { msgConfirm("slattach command was empty. Try again!"); + restorescr(w); return FALSE; } else @@ -113,8 +116,10 @@ mediaInitNetwork(Device *dev) if (vsystem(attach)) { msgConfirm("slattach returned a bad status! Please verify that\n" "the command is correct and try this operation again."); + restorescr(w); return FALSE; } + restorescr(w); } snprintf(ifconfig, 255, "%s%s", VAR_IFCONFIG, dev->name); @@ -196,7 +201,8 @@ startPPP(Device *devp) pid_t pid = 0; char myaddr[16], provider[16], speed[16], authname[32], authkey[16]; char phone[16]; - + WINDOW *w = savescr(); + /* These are needed to make ppp work */ Mkdir("/var/log"); Mkdir("/var/run"); @@ -252,6 +258,7 @@ startPPP(Device *devp) fp = fopen("/dev/stderr", "w"); if (!fp) { msgConfirm("Couldn't open /etc/ppp/ppp.conf file! This isn't going to work"); + restorescr(w); return 0; } authname[0] = '\0'; @@ -293,6 +300,7 @@ startPPP(Device *devp) if (!Fake && !file_readable("/dev/tun0") && mknod("/dev/tun0", 0600 | S_IFCHR, makedev(52, 0))) { msgConfirm("Warning: No /dev/tun0 device. PPP will not work!"); + restorescr(w); return 0; } @@ -339,5 +347,6 @@ startPPP(Device *devp) "DO NOT PRESS [ENTER] HERE UNTIL THE CONNECTION IS FULLY\n" "ESTABLISHED!"); } + restorescr(w); return pid; } diff --git a/usr.sbin/sysinstall/options.c b/usr.sbin/sysinstall/options.c index 469841d..6113e12 100644 --- a/usr.sbin/sysinstall/options.c +++ b/usr.sbin/sysinstall/options.c @@ -215,7 +215,8 @@ optionsEditor(dialogMenuItem *self) { int i, optcol, optrow, key; static int currOpt = 0; - + WINDOW *w = savescr(); + dialog_clear_norefresh(); clear(); @@ -299,13 +300,14 @@ optionsEditor(dialogMenuItem *self) case 'Q': clear(); dialog_clear(); - return DITEM_SUCCESS | DITEM_RESTORE; + restorescr(w); + return DITEM_SUCCESS; default: beep(); } } /* NOTREACHED */ - return DITEM_SUCCESS | DITEM_RESTORE; + return DITEM_SUCCESS; } diff --git a/usr.sbin/sysinstall/package.c b/usr.sbin/sysinstall/package.c index 185956f..e11a2c7 100644 --- a/usr.sbin/sysinstall/package.c +++ b/usr.sbin/sysinstall/package.c @@ -74,7 +74,7 @@ package_add(char *name) return index_extract(mediaDevice, &Top, tmp, FALSE); else { msgConfirm("Sorry, package %s was not found in the INDEX.", name); - return DITEM_FAILURE | DITEM_RESTORE; + return DITEM_FAILURE; } } @@ -134,7 +134,7 @@ package_extract(Device *dev, char *name, Boolean depended) vsystem("/sbin/ldconfig -aout /usr/lib/compat/aout /usr/lib/aout /usr/X11R6/lib/aout /usr/local/lib/aout"); /* Be initially optimistic */ - ret = DITEM_SUCCESS | DITEM_RESTORE; + ret = DITEM_SUCCESS; /* Make a couple of paranoid locations for temp files to live if user specified none */ if (!variable_get(VAR_PKG_TMPDIR)) { /* Set it to a location with as much space as possible */ @@ -217,7 +217,7 @@ package_extract(Device *dev, char *name, Boolean depended) refresh(); i = waitpid(pid, &tot, 0); if (sigpipe_caught || i < 0 || WEXITSTATUS(tot)) { - ret = DITEM_FAILURE | DITEM_RESTORE; + ret = DITEM_FAILURE; if (variable_get(VAR_NO_CONFIRM)) msgNotify("Add of package %s aborted, error code %d -\n" "Please check the debug screen for more info.", name, WEXITSTATUS(tot)); @@ -236,14 +236,13 @@ package_extract(Device *dev, char *name, Boolean depended) } } else { - 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); else msgConfirm("Unable to fetch package %s from selected media.\n" "No package add will be done.", name); - ret = DITEM_FAILURE | DITEM_RESTORE; + ret = DITEM_FAILURE; } signal(SIGPIPE, SIG_IGN); return ret; diff --git a/usr.sbin/sysinstall/pccard.c b/usr.sbin/sysinstall/pccard.c index 0ea2025..db18ab4 100644 --- a/usr.sbin/sysinstall/pccard.c +++ b/usr.sbin/sysinstall/pccard.c @@ -74,7 +74,8 @@ pccardInitialize(void) char *scard_irq; char pccardd_flags[128]; char pccardd_cmd[256]; - + WINDOW *w; + pccard_mode = 1; if (!RunningAsInit && !Fake) { @@ -122,15 +123,16 @@ pccardInitialize(void) } sprintf(card_device, CARD_DEVICE, 0); - - dialog_clear(); - msgConfirm("Now starts initializing PC-card controller and cards.\n" - "If you've executed this installer from PC-card floppy\n" + + w = savescr(); + dialog_clear_norefresh(); + msgConfirm("Now we start initializing PC-card controller and cards.\n" + "If you've executed this installer from a PC-card floppy\n" "drive, this is the last chance to replace it with\n" "installation media (PC-card Ethernet, CDROM, etc.).\n" "Please insert installation media and press [Enter].\n" "If you've not plugged the PC-card installation media\n" - "yet, please plug it now and press [Enter].\n" + "in yet, please plug it in now and press [Enter].\n" "Otherwise, just press [Enter] to proceed."); dialog_clear(); @@ -140,11 +142,13 @@ pccardInitialize(void) if ((fd = open(card_device, O_RDWR)) < 1) { msgNotify("Can't open PC-card controller %s.\n", card_device); + restorescr(w); return; } if (ioctl(fd, PIOCRWMEM, &pcic_mem) < 0){ msgNotify("ioctl %s failed.\n", card_device); + restorescr(w); return; } } @@ -157,6 +161,7 @@ pccardInitialize(void) variable_set2("pccardd_flags", card_irq, 1); vsystem(pccardd_cmd); + restorescr(w); } #endif /* PCCARD */ diff --git a/usr.sbin/sysinstall/system.c b/usr.sbin/sysinstall/system.c index 0353fc6..c03d211 100644 --- a/usr.sbin/sysinstall/system.c +++ b/usr.sbin/sysinstall/system.c @@ -191,7 +191,9 @@ systemExecute(char *command) { int status; struct termios foo; + WINDOW *w = savescr(); + dialog_clear(); dialog_update(); end_dialog(); DialogActive = FALSE; @@ -206,6 +208,7 @@ systemExecute(char *command) msgDebug("systemExecute: Faked execution of `%s'\n", command); } DialogActive = TRUE; + restorescr(w); return status; } @@ -216,7 +219,8 @@ systemDisplayHelp(char *file) char *fname = NULL; char buf[FILENAME_MAX]; int ret = 0; - + WINDOW *w = savescr(); + fname = systemHelpFile(file, buf); if (!fname) { snprintf(buf, FILENAME_MAX, "The %s file is not provided on this particular floppy image.", file); @@ -230,6 +234,7 @@ systemDisplayHelp(char *file) use_helpline(NULL); dialog_textbox(file, fname, LINES, COLS); } + restorescr(w); return ret; } diff --git a/usr.sbin/sysinstall/tcpip.c b/usr.sbin/sysinstall/tcpip.c index 6c07ca5..28273f3 100644 --- a/usr.sbin/sysinstall/tcpip.c +++ b/usr.sbin/sysinstall/tcpip.c @@ -479,5 +479,5 @@ tcpMenuSelect(dialogMenuItem *self) if (tmp && tmp->private && !((DevInfo *)tmp->private)->use_dhcp && !msgYesNo("Would you like to bring the %s interface up right now?", tmp->name)) if (!tmp->init(tmp)) msgConfirm("Initialization of %s device failed.", tmp->name); - return DITEM_SUCCESS | DITEM_RESTORE; + return DITEM_SUCCESS; } |
