Initial pass at shifting sysinstall(8) to install X.org instead of XFree86.
There are still a few nits to work out (graphical config non-functional). Patches by: anholt@, adapted slightly Reviewed by: 'make release'
This commit is contained in:
Ken Smith
parent
0797d69c78
commit
83e386eb06
@ -693,13 +693,13 @@ configXSetup(dialogMenuItem *self)
|
||||
setenv("XWINHOME", "/usr/X11R6", 1);
|
||||
tryagain:
|
||||
variable_unset(VAR_DESKSTYLE);
|
||||
variable_unset(VAR_XF86_CONFIG);
|
||||
variable_unset(VAR_XORG_CONFIG);
|
||||
dialog_clear_norefresh();
|
||||
if (!dmenuOpenSimple(&MenuXF86Config, FALSE)) {
|
||||
if (!dmenuOpenSimple(&MenuXOrgConfig, FALSE)) {
|
||||
restorescr(w);
|
||||
return DITEM_FAILURE;
|
||||
}
|
||||
config = variable_get(VAR_XF86_CONFIG);
|
||||
config = variable_get(VAR_XORG_CONFIG);
|
||||
style = variable_get(VAR_DESKSTYLE);
|
||||
if (!config) {
|
||||
if (style)
|
||||
@ -751,8 +751,8 @@ configXSetup(dialogMenuItem *self)
|
||||
#endif
|
||||
Mkdir("/etc/X11"); /* XXX:Remove this later after we are happy mtree will have created this for us. */
|
||||
systemExecute(execcmd);
|
||||
if (!file_readable("/etc/X11/XF86Config")) {
|
||||
if (!msgYesNo("The XFree86 configuration process seems to have\nfailed. Would you like to try again?"))
|
||||
if (!file_readable("/etc/X11/xorg.conf")) {
|
||||
if (!msgYesNo("The X.Org configuration process seems to have\nfailed. Would you like to try again?"))
|
||||
goto tryagain;
|
||||
else {
|
||||
restorescr(w);
|
||||
@ -766,8 +766,8 @@ configXSetup(dialogMenuItem *self)
|
||||
}
|
||||
else {
|
||||
free(execfile);
|
||||
msgConfirm("The XFree86 setup utility you chose does not appear to be installed!\n"
|
||||
"Please install this before attempting to configure XFree86.");
|
||||
msgConfirm("The X.Org setup utility you chose does not appear to be installed!\n"
|
||||
"Please install this before attempting to configure X.Org.");
|
||||
restorescr(w);
|
||||
return DITEM_FAILURE;
|
||||
}
|
||||
|
||||
@ -59,49 +59,49 @@ clearSrc(dialogMenuItem *self)
|
||||
static int
|
||||
setX11Misc(dialogMenuItem *self)
|
||||
{
|
||||
XF86Dists |= DIST_XF86_MISC_ALL;
|
||||
Dists |= DIST_XF86;
|
||||
XOrgDists |= DIST_XORG_MISC_ALL;
|
||||
Dists |= DIST_XORG;
|
||||
return DITEM_SUCCESS | DITEM_REDRAW;
|
||||
}
|
||||
|
||||
static int
|
||||
clearX11Misc(dialogMenuItem *self)
|
||||
{
|
||||
XF86Dists &= ~DIST_XF86_MISC_ALL;
|
||||
if (!XF86ServerDists && !XF86FontDists)
|
||||
Dists &= ~DIST_XF86;
|
||||
XOrgDists &= ~DIST_XORG_MISC_ALL;
|
||||
if (!XOrgDists)
|
||||
Dists &= ~DIST_XORG;
|
||||
return DITEM_SUCCESS | DITEM_REDRAW;
|
||||
}
|
||||
|
||||
static int
|
||||
setX11Servers(dialogMenuItem *self)
|
||||
{
|
||||
XF86Dists |= DIST_XF86_SERVER;
|
||||
XF86ServerDists = DIST_XF86_SERVER_ALL;
|
||||
XOrgDists |= DIST_XORG_SERVER_ALL;
|
||||
return DITEM_SUCCESS | DITEM_REDRAW;
|
||||
}
|
||||
|
||||
static int
|
||||
clearX11Servers(dialogMenuItem *self)
|
||||
{
|
||||
XF86Dists &= ~DIST_XF86_SERVER;
|
||||
XF86ServerDists = 0;
|
||||
XOrgDists &= ~DIST_XORG_SERVER_ALL;
|
||||
if (!XOrgDists)
|
||||
Dists &= ~DIST_XORG;
|
||||
return DITEM_SUCCESS | DITEM_REDRAW;
|
||||
}
|
||||
|
||||
static int
|
||||
setX11Fonts(dialogMenuItem *self)
|
||||
{
|
||||
XF86Dists |= DIST_XF86_FONTS;
|
||||
XF86FontDists = DIST_XF86_FONTS_ALL;
|
||||
XOrgDists |= DIST_XORG_FONTS_ALL;
|
||||
return DITEM_SUCCESS | DITEM_REDRAW;
|
||||
}
|
||||
|
||||
static int
|
||||
clearX11Fonts(dialogMenuItem *self)
|
||||
{
|
||||
XF86Dists &= ~DIST_XF86_FONTS;
|
||||
XF86FontDists = 0;
|
||||
XOrgDists &= ~DIST_XORG_FONTS_ALL;
|
||||
if (!XOrgDists)
|
||||
Dists &= ~DIST_XORG;
|
||||
return DITEM_SUCCESS | DITEM_REDRAW;
|
||||
}
|
||||
|
||||
@ -122,7 +122,7 @@ checkDistDeveloper(dialogMenuItem *self)
|
||||
static int
|
||||
checkDistXDeveloper(dialogMenuItem *self)
|
||||
{
|
||||
return IS_DEVELOPER(Dists, DIST_XF86) && _IS_SET(SrcDists, DIST_SRC_ALL);
|
||||
return IS_DEVELOPER(Dists, DIST_XORG) && _IS_SET(SrcDists, DIST_SRC_ALL);
|
||||
}
|
||||
|
||||
static int
|
||||
@ -134,7 +134,7 @@ checkDistKernDeveloper(dialogMenuItem *self)
|
||||
static int
|
||||
checkDistXKernDeveloper(dialogMenuItem *self)
|
||||
{
|
||||
return IS_DEVELOPER(Dists, DIST_XF86) && _IS_SET(SrcDists, DIST_SRC_SYS);
|
||||
return IS_DEVELOPER(Dists, DIST_XORG) && _IS_SET(SrcDists, DIST_SRC_SYS);
|
||||
}
|
||||
|
||||
static int
|
||||
@ -146,7 +146,7 @@ checkDistUser(dialogMenuItem *self)
|
||||
static int
|
||||
checkDistXUser(dialogMenuItem *self)
|
||||
{
|
||||
return IS_USER(Dists, DIST_XF86);
|
||||
return IS_USER(Dists, DIST_XORG);
|
||||
}
|
||||
|
||||
static int
|
||||
@ -160,9 +160,7 @@ checkDistEverything(dialogMenuItem *self)
|
||||
{
|
||||
return Dists == DIST_ALL &&
|
||||
_IS_SET(SrcDists, DIST_SRC_ALL) &&
|
||||
_IS_SET(XF86Dists, DIST_XF86_ALL) &&
|
||||
_IS_SET(XF86ServerDists, DIST_XF86_SERVER_ALL) &&
|
||||
_IS_SET(XF86FontDists, DIST_XF86_FONTS_ALL);
|
||||
_IS_SET(XOrgDists, DIST_XORG_ALL);
|
||||
}
|
||||
|
||||
static int
|
||||
@ -174,7 +172,12 @@ srcFlagCheck(dialogMenuItem *item)
|
||||
static int
|
||||
x11FlagCheck(dialogMenuItem *item)
|
||||
{
|
||||
return Dists & DIST_XF86;
|
||||
if (XOrgDists != 0)
|
||||
Dists |= DIST_XORG;
|
||||
else
|
||||
Dists &= ~DIST_XORG;
|
||||
|
||||
return Dists & DIST_XORG;
|
||||
}
|
||||
|
||||
static int
|
||||
@ -218,7 +221,7 @@ DMenu MenuIndex = {
|
||||
{ " 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 },
|
||||
{ " Distributions, X.Org","X.Org distribution menu.", NULL, distSetXOrg },
|
||||
{ " Documentation", "Installation instructions, README, etc.", NULL, dmenuSubmenu, NULL, &MenuDocumentation },
|
||||
{ " Doc, README", "The distribution README file.", NULL, dmenuDisplayFile, NULL, "README" },
|
||||
{ " Doc, Early Adopter's", "Early Adopter's Guide to FreeBSD 5.0.", NULL, dmenuDisplayFile, NULL, "EARLY" },
|
||||
@ -284,8 +287,8 @@ DMenu MenuIndex = {
|
||||
{ " 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 },
|
||||
{ " X.Org, Fonts", "X.Org Font selection menu.", NULL, dmenuSubmenu, NULL, &MenuXOrgSelectFonts },
|
||||
{ " X.Org, Server", "X.Org Server selection menu.", NULL, dmenuSubmenu, NULL, &MenuXOrgSelectServer },
|
||||
{ NULL } },
|
||||
};
|
||||
|
||||
@ -994,8 +997,8 @@ DMenu MenuSubDistributions = {
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_LOCAL},
|
||||
{ " perl", "The Perl distribution",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_PERL },
|
||||
{ " XFree86", "The XFree86 distribution",
|
||||
x11FlagCheck, distSetXF86 },
|
||||
{ " X.Org", "The X.Org distribution",
|
||||
x11FlagCheck, distSetXOrg },
|
||||
{ NULL } },
|
||||
};
|
||||
|
||||
@ -1053,13 +1056,13 @@ DMenu MenuSrcDistributions = {
|
||||
{ NULL } },
|
||||
};
|
||||
|
||||
DMenu MenuXF86Config = {
|
||||
DMenu MenuXOrgConfig = {
|
||||
DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS,
|
||||
"Please select the XFree86 configuration tool you want to use.",
|
||||
"The first option, xf86cfg, is fully graphical.\n"
|
||||
"Please select the X.Org configuration tool you want to use.",
|
||||
"The first option, xorgcfg, is fully graphical.\n"
|
||||
"The second option provides a menu-based interface similar to\n"
|
||||
"what you are currently using. "
|
||||
"The third option, xf86config, is\n"
|
||||
"The third option, xorgconfig, is\n"
|
||||
"a more simplistic shell-script based tool and less friendly to\n"
|
||||
"new users, but it may work in situations where the other options\n"
|
||||
"do not.",
|
||||
@ -1067,12 +1070,12 @@ DMenu MenuXF86Config = {
|
||||
NULL,
|
||||
{ { "X Exit", "Exit this menu (returning to previous)",
|
||||
NULL, dmenuExit },
|
||||
{ "2 xf86cfg", "Fully graphical XFree86 configuration tool.",
|
||||
NULL, dmenuSetVariable, NULL, VAR_XF86_CONFIG "=xf86cfg" },
|
||||
{ "3 xf86cfg -textmode", "ncurses-based XFree86 configuration tool.",
|
||||
NULL, dmenuSetVariable, NULL, VAR_XF86_CONFIG "=xf86cfg -textmode" },
|
||||
{ "4 xf86config", "Shell-script based XFree86 configuration tool.",
|
||||
NULL, dmenuSetVariable, NULL, VAR_XF86_CONFIG "=xf86config" },
|
||||
{ "2 xorgcfg", "Fully graphical X.Org configuration tool.",
|
||||
NULL, dmenuSetVariable, NULL, VAR_XORG_CONFIG "=xorgcfg" },
|
||||
{ "3 xorgcfg -textmode", "ncurses-based X.Org configuration tool.",
|
||||
NULL, dmenuSetVariable, NULL, VAR_XORG_CONFIG "=xorgcfg -textmode" },
|
||||
{ "4 xorgconfig", "Shell-script based X.Org configuration tool.",
|
||||
NULL, dmenuSetVariable, NULL, VAR_XORG_CONFIG "=xorgconfig" },
|
||||
{ "D XDesktop", "X already set up, just do desktop configuration.",
|
||||
NULL, dmenuSubmenu, NULL, &MenuXDesktops },
|
||||
{ NULL } },
|
||||
@ -1081,7 +1084,7 @@ DMenu MenuXF86Config = {
|
||||
DMenu MenuXDesktops = {
|
||||
DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS,
|
||||
"Please select the default X desktop to use.",
|
||||
"By default, XFree86 comes with a fairly vanilla desktop which\n"
|
||||
"By default, X.Org comes with a fairly vanilla desktop which\n"
|
||||
"is based around the twm(1) window manager and does not offer\n"
|
||||
"much in the way of features. It does have the advantage of\n"
|
||||
"being a standard part of X so you don't need to load anything\n"
|
||||
@ -1105,24 +1108,24 @@ DMenu MenuXDesktops = {
|
||||
{ NULL } },
|
||||
};
|
||||
|
||||
DMenu MenuXF86Select = {
|
||||
DMenu MenuXOrgSelect = {
|
||||
DMENU_NORMAL_TYPE,
|
||||
"XFree86 Distribution",
|
||||
"Please select the components you need from the XFree86\n"
|
||||
"X.Org Distribution",
|
||||
"Please select the components you need from the X.Org\n"
|
||||
"distribution sets.",
|
||||
NULL,
|
||||
NULL,
|
||||
{ { "X Exit", "Exit this menu (returning to previous)", NULL, dmenuExit },
|
||||
{ "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 },
|
||||
{ "Basic", "Basic component menu (required)", NULL, dmenuSubmenu, NULL, &MenuXOrgSelectCore },
|
||||
{ "Server", "X server menu", NULL, dmenuSubmenu, NULL, &MenuXOrgSelectServer },
|
||||
{ "Fonts", "Font set menu", NULL, dmenuSubmenu, NULL, &MenuXOrgSelectFonts },
|
||||
{ NULL } },
|
||||
};
|
||||
|
||||
DMenu MenuXF86SelectCore = {
|
||||
DMenu MenuXOrgSelectCore = {
|
||||
DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS,
|
||||
"XFree86 base distribution types",
|
||||
"Please check off the basic XFree86 components you wish to install.\n"
|
||||
"X.Org base distribution types",
|
||||
"Please check off the basic X.Org components you wish to install.\n"
|
||||
"Bin, lib, and set are recommended for a minimum installaion.",
|
||||
NULL,
|
||||
NULL,
|
||||
@ -1132,26 +1135,28 @@ DMenu MenuXF86SelectCore = {
|
||||
NULL, setX11Misc, NULL, NULL, ' ', ' ', ' ' },
|
||||
{ "Reset", "Reset all below",
|
||||
NULL, clearX11Misc, NULL, NULL, ' ', ' ', ' ' },
|
||||
{ " bin", "Client applications",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_CLIENTS },
|
||||
{ " lib", "Shared libraries and data files needed at runtime",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LIB },
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_LIB },
|
||||
{ " bin", "Client applications",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_CLIENTS },
|
||||
{ " man", "Manual pages",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_MAN },
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_MAN },
|
||||
{ " doc", "Documentation",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_DOC },
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_DOC },
|
||||
{ " prog", "Programming tools",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_PROG },
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_IMAKE },
|
||||
{ NULL } },
|
||||
};
|
||||
|
||||
DMenu MenuXF86SelectFonts = {
|
||||
DMenu MenuXOrgSelectFonts = {
|
||||
DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS,
|
||||
"Font distribution selection.",
|
||||
"X.Org Font distribution selection.",
|
||||
"Please check off the individual font distributions you wish to\n\
|
||||
install. At the minimum, you should install the standard\n\
|
||||
75 DPI and misc fonts if you're also installing a server\n\
|
||||
(these are selected by default).",
|
||||
75 DPI and misc fonts if you're also installing an X server\n\
|
||||
(these are selected by default). The TrueType set is also \n\
|
||||
highly recommended. The font server is unnecessary in most\n\
|
||||
configurations.",
|
||||
NULL,
|
||||
NULL,
|
||||
{ { "X Exit", "Exit this menu (returning to previous)",
|
||||
@ -1160,24 +1165,26 @@ install. At the minimum, you should install the standard\n\
|
||||
NULL, setX11Fonts, NULL, NULL, ' ', ' ', ' ' },
|
||||
{ "Reset", "Reset font selections",
|
||||
NULL, clearX11Fonts, NULL, NULL, ' ', ' ', ' ' },
|
||||
{ " fnts", "Standard miscellaneous fonts",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_BITMAPS },
|
||||
{ " fmsc", "Standard miscellaneous fonts",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_FONTS_MISC },
|
||||
{ " f75", "75 DPI fonts",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_75 },
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_FONTS_75 },
|
||||
{ " f100", "100 DPI fonts",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_100 },
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_FONTS_100 },
|
||||
{ " fcyr", "Cyrillic Fonts",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_CYR },
|
||||
{ " fscl", "Speedo and Type scalable fonts",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_SCALE },
|
||||
{ " server", "Font server",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_SERVER },
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_FONTS_CYR },
|
||||
{ " ft1", "Type1 scalable fonts",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_FONTS_T1 },
|
||||
{ " ftt", "TrueType scalable fonts",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_FONTS_TT },
|
||||
{ " fs", "Font server",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_FONTSERVER },
|
||||
{ NULL } },
|
||||
};
|
||||
|
||||
DMenu MenuXF86SelectServer = {
|
||||
DMenu MenuXOrgSelectServer = {
|
||||
DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS,
|
||||
"X Server selection.",
|
||||
"X.Org X Server selection.",
|
||||
"Please check off the types of X servers you wish to install.\n",
|
||||
NULL,
|
||||
NULL,
|
||||
@ -1188,13 +1195,13 @@ DMenu MenuXF86SelectServer = {
|
||||
{ "Reset", "Reset all of the above",
|
||||
NULL, clearX11Servers, NULL, NULL, ' ', ' ', ' ' },
|
||||
{ " srv", "Standard Graphics Framebuffer",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_FB },
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_SERVER },
|
||||
{ " nest", "Nested X Server",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_NEST },
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_NESTSERVER },
|
||||
{ " prt", "X Print Server",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_PRINT },
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_PRINTSERVER },
|
||||
{ " vfb", "Virtual Framebuffer",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_VFB },
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_VFBSERVER },
|
||||
{ NULL } },
|
||||
};
|
||||
|
||||
@ -1346,9 +1353,9 @@ DMenu MenuConfigure = {
|
||||
NULL, configEtcTtys, NULL, "ttys" },
|
||||
{ " Options", "View/Set various installation options",
|
||||
NULL, optionsEditor },
|
||||
{ " XFree86", "Configure XFree86 Server",
|
||||
{ " X.Org", "Configure X.Org Server",
|
||||
NULL, configXSetup },
|
||||
{ " Desktop", "Configure XFree86 Desktop",
|
||||
{ " Desktop", "Configure X Desktop",
|
||||
NULL, configXDesktop },
|
||||
{ " HTML Docs", "Go to the HTML documentation menu (post-install)",
|
||||
NULL, docBrowser },
|
||||
|
||||
@ -496,106 +496,38 @@ The ports collection.
|
||||
/usr/src/usr.sbin
|
||||
.It Li ssmailcf
|
||||
/usr/src/usr.sbin/sendmail/cf
|
||||
.It Li XF86-xc
|
||||
XFree86 official sources.
|
||||
.It Li XF86-co
|
||||
XFree86 contributed sources.
|
||||
.It Li Xbin
|
||||
XFree86 binaries.
|
||||
.It Li Xcfg
|
||||
XFree86 configuration files.
|
||||
.It Li Xdoc
|
||||
XFree86 documentation.
|
||||
.It Li Xhtml
|
||||
XFree86 HTML documentation.
|
||||
X.Org client applications.
|
||||
.It Li Xlib
|
||||
XFree86 libraries.
|
||||
.It Li Xlk98
|
||||
XFree86 server link-kit for PC98 machines.
|
||||
.It Li Xlkit
|
||||
XFree86 server link-kit for standard machines.
|
||||
X.Org libraries.
|
||||
.It Li Xman
|
||||
XFree86 manual pages.
|
||||
X.Org manual pages.
|
||||
.It Li Xdoc
|
||||
X.Org protocol and library documentation.
|
||||
.It Li Xprog
|
||||
XFree86 programmer's distribution.
|
||||
.It Li Xps
|
||||
XFree86 postscript documentation.
|
||||
.It Li Xset
|
||||
XFree86 graphical setup tool.
|
||||
.It Li PC98-Servers/X9480
|
||||
XFree86 PC98 8-bit (256 color) PEGC-480 server.
|
||||
.It Li PC98-Servers/X9EGC
|
||||
XFree86 PC98 4-bit (16 color) EGC server.
|
||||
.It Li PC98-Servers/X9GA9
|
||||
XFree86 PC98 GA-968V4/PCI (S3 968) server.
|
||||
.It Li PC98-Servers/X9GAN
|
||||
XFree86 PC98 GANB-WAP (cirrus) server.
|
||||
.It Li PC98-Servers/X9LPW
|
||||
XFree86 PC98 PowerWindowLB (S3) server.
|
||||
.It Li PC98-Servers/X9MGA
|
||||
[DESCRIPTION MISSING]
|
||||
.It Li PC98-Servers/X9NKV
|
||||
XFree86 PC98 NKV-NEC (cirrus) server.
|
||||
.It Li PC98-Servers/X9NS3
|
||||
XFree86 PC98 NEC (S3) server.
|
||||
.It Li PC98-Servers/X9SPW
|
||||
XFree86 PC98 SKB-PowerWindow (S3) server.
|
||||
.It Li PC98-Servers/X9SVG
|
||||
[DESCRIPTION MISSING]
|
||||
.It Li PC98-Servers/X9TGU
|
||||
XFree86 PC98 Cyber9320 and TGUI9680 server.
|
||||
.It Li PC98-Servers/X9WEP
|
||||
XFree86 PC98 WAB-EP (cirrus) server.
|
||||
.It Li PC98-Servers/X9WS
|
||||
XFree86 PC98 WABS (cirrus) server.
|
||||
.It Li PC98-Servers/X9WSN
|
||||
XFree86 PC98 WSN-A2F (cirrus) server.
|
||||
.It Li Servers/X3DL
|
||||
XFree86 3D Labs server.
|
||||
.It Li Servers/X8514
|
||||
XFree86 8514 server.
|
||||
.It Li Servers/XAGX
|
||||
XFree86 8 bit AGX server.
|
||||
.It Li Servers/XI128
|
||||
XFree86 #9 Imagine I128 server.
|
||||
.It Li Servers/XMa8
|
||||
XFree86 ATI Mach8 server.
|
||||
.It Li Servers/XMa32
|
||||
XFree86 ATI Mach32 server.
|
||||
.It Li Servers/XMa64
|
||||
XFree86 ATI Mach64 server.
|
||||
.It Li Servers/XMono
|
||||
XFree86 monochrome server.
|
||||
.It Li Servers/XP9K
|
||||
XFree86 P9000 server.
|
||||
.It Li Servers/XS3
|
||||
XFree86 S3 server.
|
||||
.It Li Servers/XS3V
|
||||
XFree86 S3 Virge server.
|
||||
.It Li Servers/XSVGA
|
||||
XFree86 SVGA server.
|
||||
.It Li Servers/XVG16
|
||||
XFree86 VGA16 server.
|
||||
.It Li Servers/XW32
|
||||
XFree86 ET4000/W32, /W32i and /W32p server.
|
||||
.It Li Servers/XTGA
|
||||
Server for TGA cards (alpha architecture only).
|
||||
.It Li Servers/Xnest
|
||||
XFree86 nested X server.
|
||||
.It Li Servers/Xvfb
|
||||
XFree86 virtual frame-buffer X server.
|
||||
.It Li Xfnts
|
||||
XFree86 base font set.
|
||||
X.Org imake distribution.
|
||||
.It Li Xsrv
|
||||
X.Org X server.
|
||||
.It Li Xnest
|
||||
X.Org nested X server.
|
||||
.It Li Xprt
|
||||
X.Org print server.
|
||||
.It Li Xvfb
|
||||
X.Org virtual frame-buffer X server.
|
||||
.It Li Xfmsc
|
||||
X.Org miscellaneous font set.
|
||||
.It Li Xf75
|
||||
X.Org 75DPI font set.
|
||||
.It Li Xf100
|
||||
XFree86 100DPI font set.
|
||||
X.Org 100DPI font set.
|
||||
.It Li Xfcyr
|
||||
XFree86 Cyrillic font set.
|
||||
.It Li Xfscl
|
||||
XFree86 scalable font set.
|
||||
.It Li Xfnon
|
||||
XFree86 non-english font set.
|
||||
.It Li Xfsrv
|
||||
XFree86 font server.
|
||||
X.Org Cyrillic font set.
|
||||
.It Li Xft1
|
||||
X.Org Type 1 font set.
|
||||
.It Li Xftt
|
||||
X.Org TrueType font set.
|
||||
.It Li Xfs
|
||||
X.Org font server.
|
||||
.El
|
||||
.El
|
||||
.It distSetDeveloper
|
||||
@ -638,8 +570,8 @@ Interactively select source subcomponents.
|
||||
.Pp
|
||||
.Sy Variables :
|
||||
None
|
||||
.It distSetXF86
|
||||
Interactively select XFree86 subcomponents.
|
||||
.It distSetXOrg
|
||||
Interactively select X.Org subcomponents.
|
||||
.Pp
|
||||
.Sy Variables :
|
||||
None
|
||||
|
||||
@ -110,8 +110,6 @@
|
||||
#define VAR_DIST_MAIN "distMain"
|
||||
#define VAR_DIST_SRC "distSRC"
|
||||
#define VAR_DIST_X11 "distX11"
|
||||
#define VAR_DIST_XSERVER "distXserver"
|
||||
#define VAR_DIST_XFONTS "distXfonts"
|
||||
#define VAR_DEDICATE_DISK "dedicateDisk"
|
||||
#define VAR_DOMAINNAME "domainname"
|
||||
#define VAR_EDITOR "editor"
|
||||
@ -200,7 +198,7 @@
|
||||
#define VAR_VAR_SIZE "varSize"
|
||||
#define VAR_TMP_SIZE "tmpSize"
|
||||
#define VAR_HOME_SIZE "homeSize"
|
||||
#define VAR_XF86_CONFIG "_xf86config"
|
||||
#define VAR_XORG_CONFIG "_xorgconfig"
|
||||
#define VAR_TERM "TERM"
|
||||
#define VAR_CONSTERM "_consterm"
|
||||
|
||||
@ -416,9 +414,7 @@ extern Variable *VarHead; /* The head of the variable chain */
|
||||
extern Device *mediaDevice; /* Where we're getting our distribution from */
|
||||
extern unsigned int Dists; /* Which distributions we want */
|
||||
extern unsigned int SrcDists; /* Which src distributions we want */
|
||||
extern unsigned int XF86Dists; /* Which XFree86 dists we want */
|
||||
extern unsigned int XF86ServerDists; /* The XFree86 servers we want */
|
||||
extern unsigned int XF86FontDists; /* The XFree86 fonts we want */
|
||||
extern unsigned int XOrgDists; /* Which X.Org dists we want */
|
||||
extern int BootMgr; /* Which boot manager to use */
|
||||
extern int StatusLine; /* Where to print our status messages */
|
||||
extern DMenu MenuInitial; /* Initial installation menu */
|
||||
@ -467,16 +463,16 @@ extern DMenu MenuDistributions; /* Distribution menu */
|
||||
extern DMenu MenuDiskDevices; /* Disk type devices */
|
||||
extern DMenu MenuSubDistributions; /* Custom distribution menu */
|
||||
extern DMenu MenuSrcDistributions; /* Source distribution menu */
|
||||
extern DMenu MenuXF86; /* XFree86 main menu */
|
||||
extern DMenu MenuXF86Select; /* XFree86 distribution selection menu */
|
||||
extern DMenu MenuXF86SelectCore; /* XFree86 core distribution menu */
|
||||
extern DMenu MenuXF86SelectServer; /* XFree86 server distribution menu */
|
||||
extern DMenu MenuXF86SelectFonts; /* XFree86 font selection menu */
|
||||
extern DMenu MenuXOrg; /* X.Org main menu */
|
||||
extern DMenu MenuXOrgSelect; /* X.Org distribution selection menu */
|
||||
extern DMenu MenuXOrgSelectCore; /* X.Org core distribution menu */
|
||||
extern DMenu MenuXOrgSelectServer; /* X.Org server distribution menu */
|
||||
extern DMenu MenuXOrgSelectFonts; /* X.Org font selection menu */
|
||||
extern DMenu MenuXDesktops; /* Disk devices menu */
|
||||
extern DMenu MenuHTMLDoc; /* HTML Documentation menu */
|
||||
extern DMenu MenuUsermgmt; /* User management menu */
|
||||
extern DMenu MenuFixit; /* Fixit floppy/CDROM/shell menu */
|
||||
extern DMenu MenuXF86Config; /* Select XFree86 configuration type */
|
||||
extern DMenu MenuXOrgConfig; /* Select X.Org configuration tool */
|
||||
extern int FixItMode; /* FixItMode starts shell onc urrent device (ie Serial port) */
|
||||
extern const char * StartName; /* Which name we were started as */
|
||||
|
||||
@ -603,7 +599,7 @@ extern int distSetXUser(dialogMenuItem *self);
|
||||
extern int distSetMinimum(dialogMenuItem *self);
|
||||
extern int distSetEverything(dialogMenuItem *self);
|
||||
extern int distSetSrc(dialogMenuItem *self);
|
||||
extern int distSetXF86(dialogMenuItem *self);
|
||||
extern int distSetXOrg(dialogMenuItem *self);
|
||||
extern int distExtractAll(dialogMenuItem *self);
|
||||
|
||||
/* dmenu.c */
|
||||
|
||||
@ -693,13 +693,13 @@ configXSetup(dialogMenuItem *self)
|
||||
setenv("XWINHOME", "/usr/X11R6", 1);
|
||||
tryagain:
|
||||
variable_unset(VAR_DESKSTYLE);
|
||||
variable_unset(VAR_XF86_CONFIG);
|
||||
variable_unset(VAR_XORG_CONFIG);
|
||||
dialog_clear_norefresh();
|
||||
if (!dmenuOpenSimple(&MenuXF86Config, FALSE)) {
|
||||
if (!dmenuOpenSimple(&MenuXOrgConfig, FALSE)) {
|
||||
restorescr(w);
|
||||
return DITEM_FAILURE;
|
||||
}
|
||||
config = variable_get(VAR_XF86_CONFIG);
|
||||
config = variable_get(VAR_XORG_CONFIG);
|
||||
style = variable_get(VAR_DESKSTYLE);
|
||||
if (!config) {
|
||||
if (style)
|
||||
@ -751,8 +751,8 @@ configXSetup(dialogMenuItem *self)
|
||||
#endif
|
||||
Mkdir("/etc/X11"); /* XXX:Remove this later after we are happy mtree will have created this for us. */
|
||||
systemExecute(execcmd);
|
||||
if (!file_readable("/etc/X11/XF86Config")) {
|
||||
if (!msgYesNo("The XFree86 configuration process seems to have\nfailed. Would you like to try again?"))
|
||||
if (!file_readable("/etc/X11/xorg.conf")) {
|
||||
if (!msgYesNo("The X.Org configuration process seems to have\nfailed. Would you like to try again?"))
|
||||
goto tryagain;
|
||||
else {
|
||||
restorescr(w);
|
||||
@ -766,8 +766,8 @@ configXSetup(dialogMenuItem *self)
|
||||
}
|
||||
else {
|
||||
free(execfile);
|
||||
msgConfirm("The XFree86 setup utility you chose does not appear to be installed!\n"
|
||||
"Please install this before attempting to configure XFree86.");
|
||||
msgConfirm("The X.Org setup utility you chose does not appear to be installed!\n"
|
||||
"Please install this before attempting to configure X.Org.");
|
||||
restorescr(w);
|
||||
return DITEM_FAILURE;
|
||||
}
|
||||
|
||||
@ -44,9 +44,7 @@
|
||||
|
||||
unsigned int Dists;
|
||||
unsigned int SrcDists;
|
||||
unsigned int XF86Dists;
|
||||
unsigned int XF86ServerDists;
|
||||
unsigned int XF86FontDists;
|
||||
unsigned int XOrgDists;
|
||||
|
||||
enum _disttype { DT_TARBALL, DT_SUBDIST, DT_PACKAGE };
|
||||
|
||||
@ -63,9 +61,7 @@ typedef struct _dist {
|
||||
|
||||
extern Distribution DistTable[];
|
||||
extern Distribution SrcDistTable[];
|
||||
extern Distribution XF86DistTable[];
|
||||
extern Distribution XF86FontDistTable[];
|
||||
extern Distribution XF86ServerDistTable[];
|
||||
extern Distribution XOrgDistTable[];
|
||||
|
||||
#define DTE_TARBALL(name, mask, flag, directory) \
|
||||
{ name, mask, DIST_ ## flag, DT_TARBALL, { directory } }
|
||||
@ -100,7 +96,7 @@ static Distribution DistTable[] = {
|
||||
DTE_TARBALL("ports", &Dists, PORTS, "/usr"),
|
||||
DTE_TARBALL("local", &Dists, LOCAL, "/"),
|
||||
DTE_PACKAGE("perl", &Dists, PERL, "perl"),
|
||||
DTE_SUBDIST("XFree86", &Dists, XF86, XF86DistTable),
|
||||
DTE_SUBDIST("X.Org", &Dists, XORG, XOrgDistTable),
|
||||
{ NULL },
|
||||
};
|
||||
|
||||
@ -128,35 +124,26 @@ static Distribution SrcDistTable[] = {
|
||||
{ NULL },
|
||||
};
|
||||
|
||||
/* The XFree86 distribution */
|
||||
static Distribution XF86DistTable[] = {
|
||||
DTE_SUBDIST("XFree86", &XF86Dists, XF86_FONTS, XF86FontDistTable),
|
||||
DTE_SUBDIST("XFree86", &XF86Dists, XF86_SERVER, XF86ServerDistTable),
|
||||
DTE_PACKAGE("Xbin", &XF86Dists, XF86_CLIENTS, "XFree86-clients"),
|
||||
DTE_PACKAGE("Xdoc", &XF86Dists, XF86_DOC, "XFree86-documents"),
|
||||
DTE_PACKAGE("Xlib", &XF86Dists, XF86_LIB, "XFree86-libraries"),
|
||||
DTE_PACKAGE("Xman", &XF86Dists, XF86_MAN, "XFree86-manuals"),
|
||||
DTE_PACKAGE("Xprog", &XF86Dists, XF86_PROG, "imake"),
|
||||
{ NULL },
|
||||
};
|
||||
/* The X.Org distribution */
|
||||
static Distribution XOrgDistTable[] = {
|
||||
DTE_PACKAGE("Xbin", &XOrgDists, XORG_CLIENTS, "xorg-clients"),
|
||||
DTE_PACKAGE("Xlib", &XOrgDists, XORG_LIB, "xorg-libraries"),
|
||||
DTE_PACKAGE("Xman", &XOrgDists, XORG_MAN, "xorg-manpages"),
|
||||
DTE_PACKAGE("Xdoc", &XOrgDists, XORG_DOC, "xorg-documents"),
|
||||
DTE_PACKAGE("Xprog", &XOrgDists, XORG_IMAKE, "imake"),
|
||||
|
||||
/* The XFree86 server distribution */
|
||||
static Distribution XF86ServerDistTable[] = {
|
||||
DTE_PACKAGE("Xsrv", &XF86ServerDists, XF86_SERVER_FB, "wrapper"),
|
||||
DTE_PACKAGE("Xnest", &XF86ServerDists, XF86_SERVER_NEST, "XFree86-NestServer"),
|
||||
DTE_PACKAGE("Xprt", &XF86ServerDists, XF86_SERVER_PRINT, "XFree86-PrintServer"),
|
||||
DTE_PACKAGE("Xvfb", &XF86ServerDists, XF86_SERVER_VFB, "XFree86-VirtualFramebufferServer"),
|
||||
{ NULL }
|
||||
};
|
||||
DTE_PACKAGE("Xsrv", &XOrgDists, XORG_SERVER, "xorg-server"),
|
||||
DTE_PACKAGE("Xnest", &XOrgDists, XORG_NESTSERVER, "xorg-nestserver"),
|
||||
DTE_PACKAGE("Xprt", &XOrgDists, XORG_PRINTSERVER, "xorg-printserver"),
|
||||
DTE_PACKAGE("Xvfb", &XOrgDists, XORG_VFBSERVER, "xorg-vfbserver"),
|
||||
|
||||
/* The XFree86 font distribution */
|
||||
static Distribution XF86FontDistTable[] = {
|
||||
DTE_PACKAGE("Xf75", &XF86FontDists, XF86_FONTS_75, "XFree86-font75dpi"),
|
||||
DTE_PACKAGE("Xf100", &XF86FontDists, XF86_FONTS_100, "XFree86-font100dpi"),
|
||||
DTE_PACKAGE("Xfcyr", &XF86FontDists, XF86_FONTS_CYR, "XFree86-fontCyrillic"),
|
||||
DTE_PACKAGE("Xfscl", &XF86FontDists, XF86_FONTS_SCALE, "XFree86-fontScalable"),
|
||||
DTE_PACKAGE("Xfnts", &XF86FontDists, XF86_FONTS_BITMAPS, "XFree86-fontDefaultBitmaps"),
|
||||
DTE_PACKAGE("Xfsrv", &XF86FontDists, XF86_FONTS_SERVER, "XFree86-FontServer"),
|
||||
DTE_PACKAGE("Xfmsc", &XOrgDists, XORG_FONTS_MISC, "xorg-fonts-miscbitmaps"),
|
||||
DTE_PACKAGE("Xf75", &XOrgDists, XORG_FONTS_75, "xorg-fonts-75dpi"),
|
||||
DTE_PACKAGE("Xf100", &XOrgDists, XORG_FONTS_100, "xorg-fonts-100dpi"),
|
||||
DTE_PACKAGE("Xfcyr", &XOrgDists, XORG_FONTS_CYR, "xorg-fonts-cyrillic"),
|
||||
DTE_PACKAGE("Xft1", &XOrgDists, XORG_FONTS_T1, "xorg-fonts-type1"),
|
||||
DTE_PACKAGE("Xftt", &XOrgDists, XORG_FONTS_TT, "xorg-fonts-truetype"),
|
||||
DTE_PACKAGE("Xfs", &XOrgDists, XORG_FONTSERVER, "xorg-fontserver"),
|
||||
{ NULL },
|
||||
};
|
||||
|
||||
@ -167,17 +154,12 @@ distVerifyFlags(void)
|
||||
{
|
||||
if (SrcDists)
|
||||
Dists |= DIST_SRC;
|
||||
if (XF86ServerDists)
|
||||
XF86Dists |= DIST_XF86_SERVER;
|
||||
if (XF86FontDists)
|
||||
XF86Dists |= DIST_XF86_FONTS;
|
||||
if (XF86Dists || XF86ServerDists || XF86FontDists)
|
||||
Dists |= DIST_XF86;
|
||||
if (XOrgDists)
|
||||
Dists |= DIST_XORG;
|
||||
if (isDebug()) {
|
||||
msgDebug("Dist Masks: Dists: %0x, Srcs: %0x\n", Dists,
|
||||
SrcDists);
|
||||
msgDebug("XServer: %0x, XFonts: %0x, XDists: %0x\n", XF86ServerDists,
|
||||
XF86FontDists, XF86Dists);
|
||||
msgDebug("XServer: %0x\n", XOrgDists);
|
||||
}
|
||||
}
|
||||
|
||||
@ -186,9 +168,7 @@ distReset(dialogMenuItem *self)
|
||||
{
|
||||
Dists = 0;
|
||||
SrcDists = 0;
|
||||
XF86Dists = 0;
|
||||
XF86ServerDists = 0;
|
||||
XF86FontDists = 0;
|
||||
XOrgDists = 0;
|
||||
return DITEM_SUCCESS | DITEM_REDRAW;
|
||||
}
|
||||
|
||||
@ -206,13 +186,8 @@ distConfig(dialogMenuItem *self)
|
||||
SrcDists = atoi(cp);
|
||||
|
||||
if ((cp = variable_get(VAR_DIST_X11)) != NULL)
|
||||
XF86Dists = atoi(cp);
|
||||
XOrgDists = atoi(cp);
|
||||
|
||||
if ((cp = variable_get(VAR_DIST_XSERVER)) != NULL)
|
||||
XF86ServerDists = atoi(cp);
|
||||
|
||||
if ((cp = variable_get(VAR_DIST_XFONTS)) != NULL)
|
||||
XF86FontDists = atoi(cp);
|
||||
distVerifyFlags();
|
||||
return DITEM_SUCCESS | DITEM_REDRAW;
|
||||
}
|
||||
@ -220,11 +195,9 @@ distConfig(dialogMenuItem *self)
|
||||
static int
|
||||
distSetX(void)
|
||||
{
|
||||
Dists |= DIST_XF86;
|
||||
XF86Dists = DIST_XF86_CLIENTS | DIST_XF86_LIB | DIST_XF86_PROG | DIST_XF86_MAN | DIST_XF86_DOC | DIST_XF86_SERVER | DIST_XF86_FONTS;
|
||||
XF86ServerDists = DIST_XF86_SERVER_FB;
|
||||
XF86FontDists = DIST_XF86_FONTS_BITMAPS | DIST_XF86_FONTS_75 | DIST_XF86_FONTS_100;
|
||||
return distSetXF86(NULL);
|
||||
Dists |= DIST_XORG;
|
||||
XOrgDists = DIST_XORG_MISC_ALL | DIST_XORG_SERVER | _DIST_XORG_FONTS_BASE;
|
||||
return distSetXOrg(NULL);
|
||||
}
|
||||
|
||||
int
|
||||
@ -312,11 +285,9 @@ distSetEverything(dialogMenuItem *self)
|
||||
{
|
||||
int i;
|
||||
|
||||
Dists = DIST_ALL | DIST_XF86;
|
||||
Dists = DIST_ALL;
|
||||
SrcDists = DIST_SRC_ALL;
|
||||
XF86Dists = DIST_XF86_ALL;
|
||||
XF86ServerDists = DIST_XF86_SERVER_ALL;
|
||||
XF86FontDists = DIST_XF86_FONTS_ALL;
|
||||
XOrgDists = DIST_XORG_ALL;
|
||||
i = distMaybeSetPorts(self);
|
||||
distVerifyFlags();
|
||||
return i;
|
||||
@ -459,12 +430,12 @@ distSetSrc(dialogMenuItem *self)
|
||||
}
|
||||
|
||||
int
|
||||
distSetXF86(dialogMenuItem *self)
|
||||
distSetXOrg(dialogMenuItem *self)
|
||||
{
|
||||
int i = DITEM_SUCCESS;
|
||||
|
||||
dialog_clear_norefresh();
|
||||
if (!dmenuOpenSimple(&MenuXF86Select, FALSE))
|
||||
if (!dmenuOpenSimple(&MenuXOrgSelect, FALSE))
|
||||
i = DITEM_FAILURE;
|
||||
distVerifyFlags();
|
||||
return i | DITEM_RESTORE;
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
#if defined(__i386__) || defined(__alpha__)
|
||||
#define DIST_COMPAT4X 0x02000
|
||||
#endif
|
||||
#define DIST_XF86 0x04000
|
||||
#define DIST_XORG 0x04000
|
||||
#define DIST_CATPAGES 0x10000
|
||||
#define DIST_PORTS 0x20000
|
||||
#define DIST_LOCAL 0x40000
|
||||
@ -51,30 +51,38 @@
|
||||
#define DIST_SRC_SKERBEROS5 0x40000
|
||||
#define DIST_SRC_ALL 0x7FFFF
|
||||
|
||||
/* Subtypes for XFree86 packages */
|
||||
#define DIST_XF86_CLIENTS 0x0001
|
||||
#define DIST_XF86_DOC 0x0002
|
||||
#define DIST_XF86_LIB 0x0004
|
||||
#define DIST_XF86_MAN 0x0008
|
||||
#define DIST_XF86_PROG 0x0010
|
||||
#define DIST_XF86_MISC_ALL 0x001F
|
||||
#define DIST_XF86_SERVER 0x0020
|
||||
#define DIST_XF86_SERVER_FB 0x0001
|
||||
#define DIST_XF86_SERVER_NEST 0x0002
|
||||
#define DIST_XF86_SERVER_PRINT 0x0004
|
||||
#define DIST_XF86_SERVER_VFB 0x0008
|
||||
#define DIST_XF86_SERVER_ALL 0x000F
|
||||
#define DIST_XF86_FONTS 0x0040
|
||||
#define DIST_XF86_FONTS_75 0x0001
|
||||
#define DIST_XF86_FONTS_100 0x0002
|
||||
#define DIST_XF86_FONTS_CYR 0x0004
|
||||
#define DIST_XF86_FONTS_SCALE 0x0008
|
||||
#define DIST_XF86_FONTS_BITMAPS 0x0010
|
||||
#define DIST_XF86_FONTS_SERVER 0x0020
|
||||
#define DIST_XF86_FONTS_ALL 0x003F
|
||||
#define DIST_XF86_ALL 0x007F
|
||||
/* Subtypes for X.Org packages */
|
||||
#define DIST_XORG_CLIENTS 0x000001
|
||||
#define DIST_XORG_LIB 0x000002
|
||||
#define DIST_XORG_MAN 0x000004
|
||||
#define DIST_XORG_DOC 0x000008
|
||||
#define DIST_XORG_IMAKE 0x000010
|
||||
|
||||
#define DIST_XORG_SERVER 0x000100
|
||||
#define DIST_XORG_NESTSERVER 0x000200
|
||||
#define DIST_XORG_PRINTSERVER 0x000400
|
||||
#define DIST_XORG_VFBSERVER 0x000800
|
||||
|
||||
#define DIST_XORG_FONTS_MISC 0x010000
|
||||
#define DIST_XORG_FONTS_75 0x020000
|
||||
#define DIST_XORG_FONTS_100 0x040000
|
||||
#define DIST_XORG_FONTS_CYR 0x080000
|
||||
#define DIST_XORG_FONTS_T1 0x100000
|
||||
#define DIST_XORG_FONTS_TT 0x200000
|
||||
#define DIST_XORG_FONTSERVER 0x400000
|
||||
|
||||
#define DIST_XORG_MISC_ALL 0x00001f
|
||||
#define DIST_XORG_SERVER_ALL 0x000f00
|
||||
#define DIST_XORG_FONTS_ALL 0x7f0000
|
||||
#define DIST_XORG_ALL \
|
||||
(DIST_XORG_MISC_ALL | DIST_XORG_SERVER_ALL | DIST_XORG_FONTS_ALL)
|
||||
|
||||
/* Canned distribution sets */
|
||||
|
||||
#define _DIST_XORG_FONTS_BASE \
|
||||
(DIST_XORG_FONTS_MISC | DIST_XORG_FONTS_75 | DIST_XORG_FONTS_100 | \
|
||||
DIST_XORG_FONTS_TT)
|
||||
|
||||
#define _DIST_USER \
|
||||
( DIST_BASE | DIST_DOC | DIST_MANPAGES | DIST_DICT | DIST_PERL )
|
||||
|
||||
|
||||
@ -59,49 +59,49 @@ clearSrc(dialogMenuItem *self)
|
||||
static int
|
||||
setX11Misc(dialogMenuItem *self)
|
||||
{
|
||||
XF86Dists |= DIST_XF86_MISC_ALL;
|
||||
Dists |= DIST_XF86;
|
||||
XOrgDists |= DIST_XORG_MISC_ALL;
|
||||
Dists |= DIST_XORG;
|
||||
return DITEM_SUCCESS | DITEM_REDRAW;
|
||||
}
|
||||
|
||||
static int
|
||||
clearX11Misc(dialogMenuItem *self)
|
||||
{
|
||||
XF86Dists &= ~DIST_XF86_MISC_ALL;
|
||||
if (!XF86ServerDists && !XF86FontDists)
|
||||
Dists &= ~DIST_XF86;
|
||||
XOrgDists &= ~DIST_XORG_MISC_ALL;
|
||||
if (!XOrgDists)
|
||||
Dists &= ~DIST_XORG;
|
||||
return DITEM_SUCCESS | DITEM_REDRAW;
|
||||
}
|
||||
|
||||
static int
|
||||
setX11Servers(dialogMenuItem *self)
|
||||
{
|
||||
XF86Dists |= DIST_XF86_SERVER;
|
||||
XF86ServerDists = DIST_XF86_SERVER_ALL;
|
||||
XOrgDists |= DIST_XORG_SERVER_ALL;
|
||||
return DITEM_SUCCESS | DITEM_REDRAW;
|
||||
}
|
||||
|
||||
static int
|
||||
clearX11Servers(dialogMenuItem *self)
|
||||
{
|
||||
XF86Dists &= ~DIST_XF86_SERVER;
|
||||
XF86ServerDists = 0;
|
||||
XOrgDists &= ~DIST_XORG_SERVER_ALL;
|
||||
if (!XOrgDists)
|
||||
Dists &= ~DIST_XORG;
|
||||
return DITEM_SUCCESS | DITEM_REDRAW;
|
||||
}
|
||||
|
||||
static int
|
||||
setX11Fonts(dialogMenuItem *self)
|
||||
{
|
||||
XF86Dists |= DIST_XF86_FONTS;
|
||||
XF86FontDists = DIST_XF86_FONTS_ALL;
|
||||
XOrgDists |= DIST_XORG_FONTS_ALL;
|
||||
return DITEM_SUCCESS | DITEM_REDRAW;
|
||||
}
|
||||
|
||||
static int
|
||||
clearX11Fonts(dialogMenuItem *self)
|
||||
{
|
||||
XF86Dists &= ~DIST_XF86_FONTS;
|
||||
XF86FontDists = 0;
|
||||
XOrgDists &= ~DIST_XORG_FONTS_ALL;
|
||||
if (!XOrgDists)
|
||||
Dists &= ~DIST_XORG;
|
||||
return DITEM_SUCCESS | DITEM_REDRAW;
|
||||
}
|
||||
|
||||
@ -122,7 +122,7 @@ checkDistDeveloper(dialogMenuItem *self)
|
||||
static int
|
||||
checkDistXDeveloper(dialogMenuItem *self)
|
||||
{
|
||||
return IS_DEVELOPER(Dists, DIST_XF86) && _IS_SET(SrcDists, DIST_SRC_ALL);
|
||||
return IS_DEVELOPER(Dists, DIST_XORG) && _IS_SET(SrcDists, DIST_SRC_ALL);
|
||||
}
|
||||
|
||||
static int
|
||||
@ -134,7 +134,7 @@ checkDistKernDeveloper(dialogMenuItem *self)
|
||||
static int
|
||||
checkDistXKernDeveloper(dialogMenuItem *self)
|
||||
{
|
||||
return IS_DEVELOPER(Dists, DIST_XF86) && _IS_SET(SrcDists, DIST_SRC_SYS);
|
||||
return IS_DEVELOPER(Dists, DIST_XORG) && _IS_SET(SrcDists, DIST_SRC_SYS);
|
||||
}
|
||||
|
||||
static int
|
||||
@ -146,7 +146,7 @@ checkDistUser(dialogMenuItem *self)
|
||||
static int
|
||||
checkDistXUser(dialogMenuItem *self)
|
||||
{
|
||||
return IS_USER(Dists, DIST_XF86);
|
||||
return IS_USER(Dists, DIST_XORG);
|
||||
}
|
||||
|
||||
static int
|
||||
@ -160,9 +160,7 @@ checkDistEverything(dialogMenuItem *self)
|
||||
{
|
||||
return Dists == DIST_ALL &&
|
||||
_IS_SET(SrcDists, DIST_SRC_ALL) &&
|
||||
_IS_SET(XF86Dists, DIST_XF86_ALL) &&
|
||||
_IS_SET(XF86ServerDists, DIST_XF86_SERVER_ALL) &&
|
||||
_IS_SET(XF86FontDists, DIST_XF86_FONTS_ALL);
|
||||
_IS_SET(XOrgDists, DIST_XORG_ALL);
|
||||
}
|
||||
|
||||
static int
|
||||
@ -174,7 +172,12 @@ srcFlagCheck(dialogMenuItem *item)
|
||||
static int
|
||||
x11FlagCheck(dialogMenuItem *item)
|
||||
{
|
||||
return Dists & DIST_XF86;
|
||||
if (XOrgDists != 0)
|
||||
Dists |= DIST_XORG;
|
||||
else
|
||||
Dists &= ~DIST_XORG;
|
||||
|
||||
return Dists & DIST_XORG;
|
||||
}
|
||||
|
||||
static int
|
||||
@ -218,7 +221,7 @@ DMenu MenuIndex = {
|
||||
{ " 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 },
|
||||
{ " Distributions, X.Org","X.Org distribution menu.", NULL, distSetXOrg },
|
||||
{ " Documentation", "Installation instructions, README, etc.", NULL, dmenuSubmenu, NULL, &MenuDocumentation },
|
||||
{ " Doc, README", "The distribution README file.", NULL, dmenuDisplayFile, NULL, "README" },
|
||||
{ " Doc, Early Adopter's", "Early Adopter's Guide to FreeBSD 5.0.", NULL, dmenuDisplayFile, NULL, "EARLY" },
|
||||
@ -284,8 +287,8 @@ DMenu MenuIndex = {
|
||||
{ " 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 },
|
||||
{ " X.Org, Fonts", "X.Org Font selection menu.", NULL, dmenuSubmenu, NULL, &MenuXOrgSelectFonts },
|
||||
{ " X.Org, Server", "X.Org Server selection menu.", NULL, dmenuSubmenu, NULL, &MenuXOrgSelectServer },
|
||||
{ NULL } },
|
||||
};
|
||||
|
||||
@ -994,8 +997,8 @@ DMenu MenuSubDistributions = {
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_LOCAL},
|
||||
{ " perl", "The Perl distribution",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_PERL },
|
||||
{ " XFree86", "The XFree86 distribution",
|
||||
x11FlagCheck, distSetXF86 },
|
||||
{ " X.Org", "The X.Org distribution",
|
||||
x11FlagCheck, distSetXOrg },
|
||||
{ NULL } },
|
||||
};
|
||||
|
||||
@ -1053,13 +1056,13 @@ DMenu MenuSrcDistributions = {
|
||||
{ NULL } },
|
||||
};
|
||||
|
||||
DMenu MenuXF86Config = {
|
||||
DMenu MenuXOrgConfig = {
|
||||
DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS,
|
||||
"Please select the XFree86 configuration tool you want to use.",
|
||||
"The first option, xf86cfg, is fully graphical.\n"
|
||||
"Please select the X.Org configuration tool you want to use.",
|
||||
"The first option, xorgcfg, is fully graphical.\n"
|
||||
"The second option provides a menu-based interface similar to\n"
|
||||
"what you are currently using. "
|
||||
"The third option, xf86config, is\n"
|
||||
"The third option, xorgconfig, is\n"
|
||||
"a more simplistic shell-script based tool and less friendly to\n"
|
||||
"new users, but it may work in situations where the other options\n"
|
||||
"do not.",
|
||||
@ -1067,12 +1070,12 @@ DMenu MenuXF86Config = {
|
||||
NULL,
|
||||
{ { "X Exit", "Exit this menu (returning to previous)",
|
||||
NULL, dmenuExit },
|
||||
{ "2 xf86cfg", "Fully graphical XFree86 configuration tool.",
|
||||
NULL, dmenuSetVariable, NULL, VAR_XF86_CONFIG "=xf86cfg" },
|
||||
{ "3 xf86cfg -textmode", "ncurses-based XFree86 configuration tool.",
|
||||
NULL, dmenuSetVariable, NULL, VAR_XF86_CONFIG "=xf86cfg -textmode" },
|
||||
{ "4 xf86config", "Shell-script based XFree86 configuration tool.",
|
||||
NULL, dmenuSetVariable, NULL, VAR_XF86_CONFIG "=xf86config" },
|
||||
{ "2 xorgcfg", "Fully graphical X.Org configuration tool.",
|
||||
NULL, dmenuSetVariable, NULL, VAR_XORG_CONFIG "=xorgcfg" },
|
||||
{ "3 xorgcfg -textmode", "ncurses-based X.Org configuration tool.",
|
||||
NULL, dmenuSetVariable, NULL, VAR_XORG_CONFIG "=xorgcfg -textmode" },
|
||||
{ "4 xorgconfig", "Shell-script based X.Org configuration tool.",
|
||||
NULL, dmenuSetVariable, NULL, VAR_XORG_CONFIG "=xorgconfig" },
|
||||
{ "D XDesktop", "X already set up, just do desktop configuration.",
|
||||
NULL, dmenuSubmenu, NULL, &MenuXDesktops },
|
||||
{ NULL } },
|
||||
@ -1081,7 +1084,7 @@ DMenu MenuXF86Config = {
|
||||
DMenu MenuXDesktops = {
|
||||
DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS,
|
||||
"Please select the default X desktop to use.",
|
||||
"By default, XFree86 comes with a fairly vanilla desktop which\n"
|
||||
"By default, X.Org comes with a fairly vanilla desktop which\n"
|
||||
"is based around the twm(1) window manager and does not offer\n"
|
||||
"much in the way of features. It does have the advantage of\n"
|
||||
"being a standard part of X so you don't need to load anything\n"
|
||||
@ -1105,24 +1108,24 @@ DMenu MenuXDesktops = {
|
||||
{ NULL } },
|
||||
};
|
||||
|
||||
DMenu MenuXF86Select = {
|
||||
DMenu MenuXOrgSelect = {
|
||||
DMENU_NORMAL_TYPE,
|
||||
"XFree86 Distribution",
|
||||
"Please select the components you need from the XFree86\n"
|
||||
"X.Org Distribution",
|
||||
"Please select the components you need from the X.Org\n"
|
||||
"distribution sets.",
|
||||
NULL,
|
||||
NULL,
|
||||
{ { "X Exit", "Exit this menu (returning to previous)", NULL, dmenuExit },
|
||||
{ "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 },
|
||||
{ "Basic", "Basic component menu (required)", NULL, dmenuSubmenu, NULL, &MenuXOrgSelectCore },
|
||||
{ "Server", "X server menu", NULL, dmenuSubmenu, NULL, &MenuXOrgSelectServer },
|
||||
{ "Fonts", "Font set menu", NULL, dmenuSubmenu, NULL, &MenuXOrgSelectFonts },
|
||||
{ NULL } },
|
||||
};
|
||||
|
||||
DMenu MenuXF86SelectCore = {
|
||||
DMenu MenuXOrgSelectCore = {
|
||||
DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS,
|
||||
"XFree86 base distribution types",
|
||||
"Please check off the basic XFree86 components you wish to install.\n"
|
||||
"X.Org base distribution types",
|
||||
"Please check off the basic X.Org components you wish to install.\n"
|
||||
"Bin, lib, and set are recommended for a minimum installaion.",
|
||||
NULL,
|
||||
NULL,
|
||||
@ -1132,26 +1135,28 @@ DMenu MenuXF86SelectCore = {
|
||||
NULL, setX11Misc, NULL, NULL, ' ', ' ', ' ' },
|
||||
{ "Reset", "Reset all below",
|
||||
NULL, clearX11Misc, NULL, NULL, ' ', ' ', ' ' },
|
||||
{ " bin", "Client applications",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_CLIENTS },
|
||||
{ " lib", "Shared libraries and data files needed at runtime",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LIB },
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_LIB },
|
||||
{ " bin", "Client applications",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_CLIENTS },
|
||||
{ " man", "Manual pages",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_MAN },
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_MAN },
|
||||
{ " doc", "Documentation",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_DOC },
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_DOC },
|
||||
{ " prog", "Programming tools",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_PROG },
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_IMAKE },
|
||||
{ NULL } },
|
||||
};
|
||||
|
||||
DMenu MenuXF86SelectFonts = {
|
||||
DMenu MenuXOrgSelectFonts = {
|
||||
DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS,
|
||||
"Font distribution selection.",
|
||||
"X.Org Font distribution selection.",
|
||||
"Please check off the individual font distributions you wish to\n\
|
||||
install. At the minimum, you should install the standard\n\
|
||||
75 DPI and misc fonts if you're also installing a server\n\
|
||||
(these are selected by default).",
|
||||
75 DPI and misc fonts if you're also installing an X server\n\
|
||||
(these are selected by default). The TrueType set is also \n\
|
||||
highly recommended. The font server is unnecessary in most\n\
|
||||
configurations.",
|
||||
NULL,
|
||||
NULL,
|
||||
{ { "X Exit", "Exit this menu (returning to previous)",
|
||||
@ -1160,24 +1165,26 @@ install. At the minimum, you should install the standard\n\
|
||||
NULL, setX11Fonts, NULL, NULL, ' ', ' ', ' ' },
|
||||
{ "Reset", "Reset font selections",
|
||||
NULL, clearX11Fonts, NULL, NULL, ' ', ' ', ' ' },
|
||||
{ " fnts", "Standard miscellaneous fonts",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_BITMAPS },
|
||||
{ " fmsc", "Standard miscellaneous fonts",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_FONTS_MISC },
|
||||
{ " f75", "75 DPI fonts",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_75 },
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_FONTS_75 },
|
||||
{ " f100", "100 DPI fonts",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_100 },
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_FONTS_100 },
|
||||
{ " fcyr", "Cyrillic Fonts",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_CYR },
|
||||
{ " fscl", "Speedo and Type scalable fonts",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_SCALE },
|
||||
{ " server", "Font server",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_SERVER },
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_FONTS_CYR },
|
||||
{ " ft1", "Type1 scalable fonts",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_FONTS_T1 },
|
||||
{ " ftt", "TrueType scalable fonts",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_FONTS_TT },
|
||||
{ " fs", "Font server",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_FONTSERVER },
|
||||
{ NULL } },
|
||||
};
|
||||
|
||||
DMenu MenuXF86SelectServer = {
|
||||
DMenu MenuXOrgSelectServer = {
|
||||
DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS,
|
||||
"X Server selection.",
|
||||
"X.Org X Server selection.",
|
||||
"Please check off the types of X servers you wish to install.\n",
|
||||
NULL,
|
||||
NULL,
|
||||
@ -1188,13 +1195,13 @@ DMenu MenuXF86SelectServer = {
|
||||
{ "Reset", "Reset all of the above",
|
||||
NULL, clearX11Servers, NULL, NULL, ' ', ' ', ' ' },
|
||||
{ " srv", "Standard Graphics Framebuffer",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_FB },
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_SERVER },
|
||||
{ " nest", "Nested X Server",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_NEST },
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_NESTSERVER },
|
||||
{ " prt", "X Print Server",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_PRINT },
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_PRINTSERVER },
|
||||
{ " vfb", "Virtual Framebuffer",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_VFB },
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_VFBSERVER },
|
||||
{ NULL } },
|
||||
};
|
||||
|
||||
@ -1346,9 +1353,9 @@ DMenu MenuConfigure = {
|
||||
NULL, configEtcTtys, NULL, "ttys" },
|
||||
{ " Options", "View/Set various installation options",
|
||||
NULL, optionsEditor },
|
||||
{ " XFree86", "Configure XFree86 Server",
|
||||
{ " X.Org", "Configure X.Org Server",
|
||||
NULL, configXSetup },
|
||||
{ " Desktop", "Configure XFree86 Desktop",
|
||||
{ " Desktop", "Configure X Desktop",
|
||||
NULL, configXDesktop },
|
||||
{ " HTML Docs", "Go to the HTML documentation menu (post-install)",
|
||||
NULL, docBrowser },
|
||||
|
||||
@ -496,106 +496,38 @@ The ports collection.
|
||||
/usr/src/usr.sbin
|
||||
.It Li ssmailcf
|
||||
/usr/src/usr.sbin/sendmail/cf
|
||||
.It Li XF86-xc
|
||||
XFree86 official sources.
|
||||
.It Li XF86-co
|
||||
XFree86 contributed sources.
|
||||
.It Li Xbin
|
||||
XFree86 binaries.
|
||||
.It Li Xcfg
|
||||
XFree86 configuration files.
|
||||
.It Li Xdoc
|
||||
XFree86 documentation.
|
||||
.It Li Xhtml
|
||||
XFree86 HTML documentation.
|
||||
X.Org client applications.
|
||||
.It Li Xlib
|
||||
XFree86 libraries.
|
||||
.It Li Xlk98
|
||||
XFree86 server link-kit for PC98 machines.
|
||||
.It Li Xlkit
|
||||
XFree86 server link-kit for standard machines.
|
||||
X.Org libraries.
|
||||
.It Li Xman
|
||||
XFree86 manual pages.
|
||||
X.Org manual pages.
|
||||
.It Li Xdoc
|
||||
X.Org protocol and library documentation.
|
||||
.It Li Xprog
|
||||
XFree86 programmer's distribution.
|
||||
.It Li Xps
|
||||
XFree86 postscript documentation.
|
||||
.It Li Xset
|
||||
XFree86 graphical setup tool.
|
||||
.It Li PC98-Servers/X9480
|
||||
XFree86 PC98 8-bit (256 color) PEGC-480 server.
|
||||
.It Li PC98-Servers/X9EGC
|
||||
XFree86 PC98 4-bit (16 color) EGC server.
|
||||
.It Li PC98-Servers/X9GA9
|
||||
XFree86 PC98 GA-968V4/PCI (S3 968) server.
|
||||
.It Li PC98-Servers/X9GAN
|
||||
XFree86 PC98 GANB-WAP (cirrus) server.
|
||||
.It Li PC98-Servers/X9LPW
|
||||
XFree86 PC98 PowerWindowLB (S3) server.
|
||||
.It Li PC98-Servers/X9MGA
|
||||
[DESCRIPTION MISSING]
|
||||
.It Li PC98-Servers/X9NKV
|
||||
XFree86 PC98 NKV-NEC (cirrus) server.
|
||||
.It Li PC98-Servers/X9NS3
|
||||
XFree86 PC98 NEC (S3) server.
|
||||
.It Li PC98-Servers/X9SPW
|
||||
XFree86 PC98 SKB-PowerWindow (S3) server.
|
||||
.It Li PC98-Servers/X9SVG
|
||||
[DESCRIPTION MISSING]
|
||||
.It Li PC98-Servers/X9TGU
|
||||
XFree86 PC98 Cyber9320 and TGUI9680 server.
|
||||
.It Li PC98-Servers/X9WEP
|
||||
XFree86 PC98 WAB-EP (cirrus) server.
|
||||
.It Li PC98-Servers/X9WS
|
||||
XFree86 PC98 WABS (cirrus) server.
|
||||
.It Li PC98-Servers/X9WSN
|
||||
XFree86 PC98 WSN-A2F (cirrus) server.
|
||||
.It Li Servers/X3DL
|
||||
XFree86 3D Labs server.
|
||||
.It Li Servers/X8514
|
||||
XFree86 8514 server.
|
||||
.It Li Servers/XAGX
|
||||
XFree86 8 bit AGX server.
|
||||
.It Li Servers/XI128
|
||||
XFree86 #9 Imagine I128 server.
|
||||
.It Li Servers/XMa8
|
||||
XFree86 ATI Mach8 server.
|
||||
.It Li Servers/XMa32
|
||||
XFree86 ATI Mach32 server.
|
||||
.It Li Servers/XMa64
|
||||
XFree86 ATI Mach64 server.
|
||||
.It Li Servers/XMono
|
||||
XFree86 monochrome server.
|
||||
.It Li Servers/XP9K
|
||||
XFree86 P9000 server.
|
||||
.It Li Servers/XS3
|
||||
XFree86 S3 server.
|
||||
.It Li Servers/XS3V
|
||||
XFree86 S3 Virge server.
|
||||
.It Li Servers/XSVGA
|
||||
XFree86 SVGA server.
|
||||
.It Li Servers/XVG16
|
||||
XFree86 VGA16 server.
|
||||
.It Li Servers/XW32
|
||||
XFree86 ET4000/W32, /W32i and /W32p server.
|
||||
.It Li Servers/XTGA
|
||||
Server for TGA cards (alpha architecture only).
|
||||
.It Li Servers/Xnest
|
||||
XFree86 nested X server.
|
||||
.It Li Servers/Xvfb
|
||||
XFree86 virtual frame-buffer X server.
|
||||
.It Li Xfnts
|
||||
XFree86 base font set.
|
||||
X.Org imake distribution.
|
||||
.It Li Xsrv
|
||||
X.Org X server.
|
||||
.It Li Xnest
|
||||
X.Org nested X server.
|
||||
.It Li Xprt
|
||||
X.Org print server.
|
||||
.It Li Xvfb
|
||||
X.Org virtual frame-buffer X server.
|
||||
.It Li Xfmsc
|
||||
X.Org miscellaneous font set.
|
||||
.It Li Xf75
|
||||
X.Org 75DPI font set.
|
||||
.It Li Xf100
|
||||
XFree86 100DPI font set.
|
||||
X.Org 100DPI font set.
|
||||
.It Li Xfcyr
|
||||
XFree86 Cyrillic font set.
|
||||
.It Li Xfscl
|
||||
XFree86 scalable font set.
|
||||
.It Li Xfnon
|
||||
XFree86 non-english font set.
|
||||
.It Li Xfsrv
|
||||
XFree86 font server.
|
||||
X.Org Cyrillic font set.
|
||||
.It Li Xft1
|
||||
X.Org Type 1 font set.
|
||||
.It Li Xftt
|
||||
X.Org TrueType font set.
|
||||
.It Li Xfs
|
||||
X.Org font server.
|
||||
.El
|
||||
.El
|
||||
.It distSetDeveloper
|
||||
@ -638,8 +570,8 @@ Interactively select source subcomponents.
|
||||
.Pp
|
||||
.Sy Variables :
|
||||
None
|
||||
.It distSetXF86
|
||||
Interactively select XFree86 subcomponents.
|
||||
.It distSetXOrg
|
||||
Interactively select X.Org subcomponents.
|
||||
.Pp
|
||||
.Sy Variables :
|
||||
None
|
||||
|
||||
@ -110,8 +110,6 @@
|
||||
#define VAR_DIST_MAIN "distMain"
|
||||
#define VAR_DIST_SRC "distSRC"
|
||||
#define VAR_DIST_X11 "distX11"
|
||||
#define VAR_DIST_XSERVER "distXserver"
|
||||
#define VAR_DIST_XFONTS "distXfonts"
|
||||
#define VAR_DEDICATE_DISK "dedicateDisk"
|
||||
#define VAR_DOMAINNAME "domainname"
|
||||
#define VAR_EDITOR "editor"
|
||||
@ -200,7 +198,7 @@
|
||||
#define VAR_VAR_SIZE "varSize"
|
||||
#define VAR_TMP_SIZE "tmpSize"
|
||||
#define VAR_HOME_SIZE "homeSize"
|
||||
#define VAR_XF86_CONFIG "_xf86config"
|
||||
#define VAR_XORG_CONFIG "_xorgconfig"
|
||||
#define VAR_TERM "TERM"
|
||||
#define VAR_CONSTERM "_consterm"
|
||||
|
||||
@ -416,9 +414,7 @@ extern Variable *VarHead; /* The head of the variable chain */
|
||||
extern Device *mediaDevice; /* Where we're getting our distribution from */
|
||||
extern unsigned int Dists; /* Which distributions we want */
|
||||
extern unsigned int SrcDists; /* Which src distributions we want */
|
||||
extern unsigned int XF86Dists; /* Which XFree86 dists we want */
|
||||
extern unsigned int XF86ServerDists; /* The XFree86 servers we want */
|
||||
extern unsigned int XF86FontDists; /* The XFree86 fonts we want */
|
||||
extern unsigned int XOrgDists; /* Which X.Org dists we want */
|
||||
extern int BootMgr; /* Which boot manager to use */
|
||||
extern int StatusLine; /* Where to print our status messages */
|
||||
extern DMenu MenuInitial; /* Initial installation menu */
|
||||
@ -467,16 +463,16 @@ extern DMenu MenuDistributions; /* Distribution menu */
|
||||
extern DMenu MenuDiskDevices; /* Disk type devices */
|
||||
extern DMenu MenuSubDistributions; /* Custom distribution menu */
|
||||
extern DMenu MenuSrcDistributions; /* Source distribution menu */
|
||||
extern DMenu MenuXF86; /* XFree86 main menu */
|
||||
extern DMenu MenuXF86Select; /* XFree86 distribution selection menu */
|
||||
extern DMenu MenuXF86SelectCore; /* XFree86 core distribution menu */
|
||||
extern DMenu MenuXF86SelectServer; /* XFree86 server distribution menu */
|
||||
extern DMenu MenuXF86SelectFonts; /* XFree86 font selection menu */
|
||||
extern DMenu MenuXOrg; /* X.Org main menu */
|
||||
extern DMenu MenuXOrgSelect; /* X.Org distribution selection menu */
|
||||
extern DMenu MenuXOrgSelectCore; /* X.Org core distribution menu */
|
||||
extern DMenu MenuXOrgSelectServer; /* X.Org server distribution menu */
|
||||
extern DMenu MenuXOrgSelectFonts; /* X.Org font selection menu */
|
||||
extern DMenu MenuXDesktops; /* Disk devices menu */
|
||||
extern DMenu MenuHTMLDoc; /* HTML Documentation menu */
|
||||
extern DMenu MenuUsermgmt; /* User management menu */
|
||||
extern DMenu MenuFixit; /* Fixit floppy/CDROM/shell menu */
|
||||
extern DMenu MenuXF86Config; /* Select XFree86 configuration type */
|
||||
extern DMenu MenuXOrgConfig; /* Select X.Org configuration tool */
|
||||
extern int FixItMode; /* FixItMode starts shell onc urrent device (ie Serial port) */
|
||||
extern const char * StartName; /* Which name we were started as */
|
||||
|
||||
@ -603,7 +599,7 @@ extern int distSetXUser(dialogMenuItem *self);
|
||||
extern int distSetMinimum(dialogMenuItem *self);
|
||||
extern int distSetEverything(dialogMenuItem *self);
|
||||
extern int distSetSrc(dialogMenuItem *self);
|
||||
extern int distSetXF86(dialogMenuItem *self);
|
||||
extern int distSetXOrg(dialogMenuItem *self);
|
||||
extern int distExtractAll(dialogMenuItem *self);
|
||||
|
||||
/* dmenu.c */
|
||||
|
||||
Loading…
Reference in New Issue
Block a user