diff options
Diffstat (limited to 'usr.sbin/sade/menus.c')
| -rw-r--r-- | usr.sbin/sade/menus.c | 868 |
1 files changed, 434 insertions, 434 deletions
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 } }, }; |
