summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--release/sysinstall/dist.c102
-rw-r--r--release/sysinstall/dist.h50
-rw-r--r--release/sysinstall/menus.c16
-rw-r--r--usr.sbin/sade/menus.c16
-rw-r--r--usr.sbin/sysinstall/dist.c102
-rw-r--r--usr.sbin/sysinstall/dist.h50
-rw-r--r--usr.sbin/sysinstall/menus.c16
7 files changed, 189 insertions, 163 deletions
diff --git a/release/sysinstall/dist.c b/release/sysinstall/dist.c
index a60ddf3..c1a7596 100644
--- a/release/sysinstall/dist.c
+++ b/release/sysinstall/dist.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: dist.c,v 1.121 1998/01/23 07:53:44 jkh Exp $
+ * $Id: dist.c,v 1.122 1998/03/09 15:00:48 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -76,7 +76,7 @@ static Distribution DistTable[] = {
{ "compat20", "/", &Dists, DIST_COMPAT20, NULL },
{ "compat21", "/", &Dists, DIST_COMPAT21, NULL },
{ "ports", "/usr", &Dists, DIST_PORTS, NULL },
-{ "XF86331", "/usr", &Dists, DIST_XF86, XF86DistTable },
+{ "XF86332", "/usr", &Dists, DIST_XF86, XF86DistTable },
{ NULL },
};
@@ -114,64 +114,66 @@ static Distribution SrcDistTable[] = {
/* The XFree86 distribution */
static Distribution XF86DistTable[] = {
-{ "XF86331", "/usr/X11R6", &XF86Dists, DIST_XF86_FONTS, XF86FontDistTable },
-{ "XF86331", "/usr/X11R6", &XF86Dists, DIST_XF86_SERVER, XF86ServerDistTable },
-{ "X331src-1", "/usr/X11R6/src", &XF86Dists, DIST_XF86_SRC, NULL },
-{ "X331contrib", "/usr/X11R6/src", &XF86Dists, DIST_XF86_CSRC, NULL },
-{ "X331bin", "/usr/X11R6", &XF86Dists, DIST_XF86_BIN, NULL },
-{ "X331cfg", "/usr/X11R6", &XF86Dists, DIST_XF86_CFG, NULL },
-{ "X331doc", "/usr/X11R6", &XF86Dists, DIST_XF86_DOC, NULL },
-{ "X331html", "/usr/X11R6", &XF86Dists, DIST_XF86_HTML, NULL },
-{ "X331lib", "/usr/X11R6", &XF86Dists, DIST_XF86_LIB, NULL },
-{ "X331lk98", "/usr/X11R6", &XF86Dists, DIST_XF86_LKIT98, NULL },
-{ "X331lkit", "/usr/X11R6", &XF86Dists, DIST_XF86_LKIT, NULL },
-{ "X331man", "/usr/X11R6", &XF86Dists, DIST_XF86_MAN, NULL },
-{ "X331prog", "/usr/X11R6", &XF86Dists, DIST_XF86_PROG, NULL },
-{ "X331ps", "/usr/X11R6", &XF86Dists, DIST_XF86_PS, NULL },
-{ "X331set", "/usr/X11R6", &XF86Dists, DIST_XF86_SET, NULL },
+{ "XF86332", "/usr/X11R6", &XF86Dists, DIST_XF86_FONTS, XF86FontDistTable },
+{ "XF86332", "/usr/X11R6", &XF86Dists, DIST_XF86_SERVER, XF86ServerDistTable },
+{ "X332src-1", "/usr/X11R6/src", &XF86Dists, DIST_XF86_SRC, NULL },
+{ "X332contrib", "/usr/X11R6/src", &XF86Dists, DIST_XF86_CSRC, NULL },
+{ "X332bin", "/usr/X11R6", &XF86Dists, DIST_XF86_BIN, NULL },
+{ "X332cfg", "/usr/X11R6", &XF86Dists, DIST_XF86_CFG, NULL },
+{ "X332doc", "/usr/X11R6", &XF86Dists, DIST_XF86_DOC, NULL },
+{ "X332html", "/usr/X11R6", &XF86Dists, DIST_XF86_HTML, NULL },
+{ "X332lib", "/usr/X11R6", &XF86Dists, DIST_XF86_LIB, NULL },
+{ "X332lk98", "/usr/X11R6", &XF86Dists, DIST_XF86_LKIT98, NULL },
+{ "X332lkit", "/usr/X11R6", &XF86Dists, DIST_XF86_LKIT, NULL },
+{ "X332man", "/usr/X11R6", &XF86Dists, DIST_XF86_MAN, NULL },
+{ "X332prog", "/usr/X11R6", &XF86Dists, DIST_XF86_PROG, NULL },
+{ "X332ps", "/usr/X11R6", &XF86Dists, DIST_XF86_PS, NULL },
+{ "X332set", "/usr/X11R6", &XF86Dists, DIST_XF86_SET, NULL },
+{ "X3329set", "/usr/X11R6", &XF86Dists, DIST_XF86_9SET, NULL },
{ NULL },
};
/* The XFree86 server distribution */
static Distribution XF86ServerDistTable[] = {
-{ "X3318514", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_8514, NULL },
-{ "X3319480", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9480, NULL },
-{ "X3319EGC", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9EGC, NULL },
-{ "X3319GA9", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9GA9, NULL },
-{ "X3319GAN", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9GAN, NULL },
-{ "X3319LPW", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9LPW, NULL },
-{ "X3319NKV", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9NKV, NULL },
-{ "X3319NS3", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9NS3, NULL },
-{ "X3319SPW", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9SPW, NULL },
-{ "X3319TGU", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9TGU, NULL },
-{ "X3319WEP", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9WEP, NULL },
-{ "X3319WS", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9WS, NULL },
-{ "X3319WSN", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9WSN, NULL },
-{ "X331AGX", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_AGX, NULL },
-{ "X331I128", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_I128, NULL },
-{ "X331Ma8", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_MACH8, NULL },
-{ "X331Ma32", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_MACH32,NULL },
-{ "X331Ma64", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_MACH64,NULL },
-{ "X331Mono", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_MONO, NULL },
-{ "X331P9K", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_P9000, NULL },
-{ "X331S3", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_S3, NULL },
-{ "X331S3V", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_S3V, NULL },
-{ "X331SVGA", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_SVGA, NULL },
-{ "X331VG16", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_VGA16, NULL },
-{ "X331W32", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_W32, NULL },
-{ "X331nest", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_NEST, NULL },
-{ "X331vfb", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_VFB, NULL },
+{ "PC98-Servers/X3329480", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9480, NULL },
+{ "PC98-Servers/X3329EGC", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9EGC, NULL },
+{ "PC98-Servers/X3329GA9", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9GA9, NULL },
+{ "PC98-Servers/X3329GAN", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9GAN, NULL },
+{ "PC98-Servers/X3329LPW", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9LPW, NULL },
+{ "PC98-Servers/X3329MGA", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9MGA, NULL },
+{ "PC98-Servers/X3329NKV", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9NKV, NULL },
+{ "PC98-Servers/X3329NS3", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9NS3, NULL },
+{ "PC98-Servers/X3329SPW", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9SPW, NULL },
+{ "PC98-Servers/X3329SVG", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9SVG, NULL },
+{ "PC98-Servers/X3329TGU", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9TGU, NULL },
+{ "PC98-Servers/X3329WEP", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9WEP, NULL },
+{ "PC98-Servers/X3329WS", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9WS, NULL },
+{ "PC98-Servers/X3329WSN", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9WSN, NULL },
+{ "Servers/X3328514", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_8514, NULL },
+{ "Servers/X332AGX", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_AGX, NULL },
+{ "Servers/X332I128", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_I128, NULL },
+{ "Servers/X332Ma8", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_MACH8, NULL },
+{ "Servers/X332Ma32", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_MACH32,NULL },
+{ "Servers/X332Ma64", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_MACH64,NULL },
+{ "Servers/X332Mono", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_MONO, NULL },
+{ "Servers/X332P9K", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_P9000, NULL },
+{ "Servers/X332S3", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_S3, NULL },
+{ "Servers/X332S3V", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_S3V, NULL },
+{ "Servers/X332SVGA", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_SVGA, NULL },
+{ "Servers/X332VG16", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_VGA16, NULL },
+{ "Servers/X332W32", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_W32, NULL },
+{ "X332nest", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_NEST, NULL },
{ NULL },
};
/* The XFree86 font distribution */
static Distribution XF86FontDistTable[] = {
-{ "X331fnts", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_MISC, NULL },
-{ "X331f100", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_100, NULL },
-{ "X331fcyr", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_CYR, NULL },
-{ "X331fscl", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_SCALE, NULL },
-{ "X331fnon", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_NON, NULL },
-{ "X331fsrv", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_SERVER, NULL },
+{ "X332fnts", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_MISC, NULL },
+{ "X332f100", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_100, NULL },
+{ "X332fcyr", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_CYR, NULL },
+{ "X332fscl", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_SCALE, NULL },
+{ "X332fnon", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_NON, NULL },
+{ "X332fsrv", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_SERVER, NULL },
{ NULL },
};
diff --git a/release/sysinstall/dist.h b/release/sysinstall/dist.h
index bdecdbd..c281d42 100644
--- a/release/sysinstall/dist.h
+++ b/release/sysinstall/dist.h
@@ -66,11 +66,12 @@
#define DIST_XF86_PROG 0x0100
#define DIST_XF86_PS 0x0200
#define DIST_XF86_SET 0x0400
-#define DIST_XF86_SRC 0x0800
-#define DIST_XF86_CSRC 0x1000
-#define DIST_XF86_MISC_ALL 0x1FFF
+#define DIST_XF86_9SET 0x0800
+#define DIST_XF86_SRC 0x1000
+#define DIST_XF86_CSRC 0x2000
+#define DIST_XF86_MISC_ALL 0x3FFF
#define DIST_XF86_SERVER 0x8000
-#define DIST_XF86_SERVER_8514 0x0000001
+#define DIST_XF86_SERVER_9MGA 0x0000001
#define DIST_XF86_SERVER_9480 0x0000002
#define DIST_XF86_SERVER_9EGC 0x0000004
#define DIST_XF86_SERVER_9GA9 0x0000008
@@ -78,26 +79,27 @@
#define DIST_XF86_SERVER_9LPW 0x0000020
#define DIST_XF86_SERVER_9NKV 0x0000040
#define DIST_XF86_SERVER_9NS3 0x0000080
-#define DIST_XF86_SERVER_9SPW 0x0000100
-#define DIST_XF86_SERVER_9TGU 0x0000200
-#define DIST_XF86_SERVER_9WEP 0x0000400
-#define DIST_XF86_SERVER_9WS 0x0000800
-#define DIST_XF86_SERVER_9WSN 0x0001000
-#define DIST_XF86_SERVER_AGX 0x0002000
-#define DIST_XF86_SERVER_I128 0x0004000
-#define DIST_XF86_SERVER_MACH8 0x0008000
-#define DIST_XF86_SERVER_MACH32 0x0010000
-#define DIST_XF86_SERVER_MACH64 0x0020000
-#define DIST_XF86_SERVER_MONO 0x0040000
-#define DIST_XF86_SERVER_P9000 0x0080000
-#define DIST_XF86_SERVER_S3 0x0100000
-#define DIST_XF86_SERVER_S3V 0x0200000
-#define DIST_XF86_SERVER_SVGA 0x0400000
-#define DIST_XF86_SERVER_VGA16 0x0800000
-#define DIST_XF86_SERVER_W32 0x1000000
-#define DIST_XF86_SERVER_NEST 0x2000000
-#define DIST_XF86_SERVER_VFB 0x4000000
-#define DIST_XF86_SERVER_ALL 0x7FFFFFF
+#define DIST_XF86_SERVER_9SVG 0x0000100
+#define DIST_XF86_SERVER_9SPW 0x0000200
+#define DIST_XF86_SERVER_9TGU 0x0000400
+#define DIST_XF86_SERVER_9WEP 0x0000800
+#define DIST_XF86_SERVER_9WS 0x0001000
+#define DIST_XF86_SERVER_9WSN 0x0002000
+#define DIST_XF86_SERVER_8514 0x0004001
+#define DIST_XF86_SERVER_AGX 0x0008000
+#define DIST_XF86_SERVER_I128 0x0010000
+#define DIST_XF86_SERVER_MACH8 0x0020000
+#define DIST_XF86_SERVER_MACH32 0x0040000
+#define DIST_XF86_SERVER_MACH64 0x0080000
+#define DIST_XF86_SERVER_MONO 0x0100000
+#define DIST_XF86_SERVER_P9000 0x0200000
+#define DIST_XF86_SERVER_S3 0x0400000
+#define DIST_XF86_SERVER_S3V 0x0800000
+#define DIST_XF86_SERVER_SVGA 0x1000000
+#define DIST_XF86_SERVER_VGA16 0x2000000
+#define DIST_XF86_SERVER_W32 0x4000000
+#define DIST_XF86_SERVER_NEST 0x8000000
+#define DIST_XF86_SERVER_ALL 0xFFFFFFF
#define DIST_XF86_FONTS 0x10000
#define DIST_XF86_FONTS_MISC 0x0001
#define DIST_XF86_FONTS_100 0x0002
diff --git a/release/sysinstall/menus.c b/release/sysinstall/menus.c
index 94f6232..4893112 100644
--- a/release/sysinstall/menus.c
+++ b/release/sysinstall/menus.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: menus.c,v 1.156 1998/03/09 14:24:21 ache Exp $
+ * $Id: menus.c,v 1.157 1998/03/09 15:01:02 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -438,10 +438,12 @@ DMenu MenuXF86Config = {
"does not.",
"Press F1 to read the XFree86 release notes for FreeBSD",
"XF86",
- { { "XF86Setup", "Use the fully graphical XFree86 configuration tool.",
+ { { "XF86Setup", "Fully graphical XFree86 configuration tool.",
NULL, dmenuSetVariable, NULL, VAR_XF86_CONFIG "=XF86Setup" },
- { "xf86config", "Use the shell-script based XFree86 configuration tool.",
+ { "xf86config", "Shell-script based XFree86 configuration tool.",
NULL, dmenuSetVariable, NULL, VAR_XF86_CONFIG "=xf86config" },
+ { "XF98Setup", "Fully graphical XFree86 configuration tool (PC98).",
+ NULL, dmenuSetVariable, NULL, VAR_XF86_CONFIG "=XF98Setup" },
{ NULL } },
};
@@ -894,6 +896,8 @@ DMenu MenuXF86SelectCore = {
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_PS },
{ "set", "XFree86 Setup Utility",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SET },
+ { "9set", "XFree86 Setup Utility (PC98)",
+ dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_9SET },
{ "sources", "XFree86 3.3.1 standard sources",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SRC },
{ "csources", "XFree86 3.3.1 contrib sources",
@@ -974,8 +978,6 @@ DMenu MenuXF86SelectServer = {
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_W32 },
{ "nest", "A nested server for testing purposes",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_NEST },
- { "vfb", "A virtual frame-buffer server",
- dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_VFB },
{ "PC98", "Select an X server for a NEC PC98 [Submenu]",
NULL, dmenuSubmenu, NULL, &MenuXF86SelectPC98Server, '>', ' ', '>', 0 },
{ "All", "Select all of the above",
@@ -1006,12 +1008,16 @@ Mono servers are particularly well-suited to most LCD displays).",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9GAN },
{ "9LPW", "PC98 PowerWindowLB (S3) card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9LPW },
+ { "9MGA", "PC98 MGA (Matrox) card",
+ dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9MGA },
{ "9NKV", "PC98 NKV-NEC (cirrus) card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9NKV },
{ "9NS3", "PC98 NEC (S3) card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9NS3 },
{ "9SPW", "PC98 SKB-PowerWindow (S3) card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9SPW },
+ { "9SVG", "PC98 generic SVGA card",
+ dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9SVG },
{ "9TGU", "PC98 Cyber9320 and TGUI9680 cards",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9TGU },
{ "9WEP", "PC98 WAB-EP (cirrus) card",
diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c
index 94f6232..4893112 100644
--- a/usr.sbin/sade/menus.c
+++ b/usr.sbin/sade/menus.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: menus.c,v 1.156 1998/03/09 14:24:21 ache Exp $
+ * $Id: menus.c,v 1.157 1998/03/09 15:01:02 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -438,10 +438,12 @@ DMenu MenuXF86Config = {
"does not.",
"Press F1 to read the XFree86 release notes for FreeBSD",
"XF86",
- { { "XF86Setup", "Use the fully graphical XFree86 configuration tool.",
+ { { "XF86Setup", "Fully graphical XFree86 configuration tool.",
NULL, dmenuSetVariable, NULL, VAR_XF86_CONFIG "=XF86Setup" },
- { "xf86config", "Use the shell-script based XFree86 configuration tool.",
+ { "xf86config", "Shell-script based XFree86 configuration tool.",
NULL, dmenuSetVariable, NULL, VAR_XF86_CONFIG "=xf86config" },
+ { "XF98Setup", "Fully graphical XFree86 configuration tool (PC98).",
+ NULL, dmenuSetVariable, NULL, VAR_XF86_CONFIG "=XF98Setup" },
{ NULL } },
};
@@ -894,6 +896,8 @@ DMenu MenuXF86SelectCore = {
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_PS },
{ "set", "XFree86 Setup Utility",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SET },
+ { "9set", "XFree86 Setup Utility (PC98)",
+ dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_9SET },
{ "sources", "XFree86 3.3.1 standard sources",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SRC },
{ "csources", "XFree86 3.3.1 contrib sources",
@@ -974,8 +978,6 @@ DMenu MenuXF86SelectServer = {
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_W32 },
{ "nest", "A nested server for testing purposes",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_NEST },
- { "vfb", "A virtual frame-buffer server",
- dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_VFB },
{ "PC98", "Select an X server for a NEC PC98 [Submenu]",
NULL, dmenuSubmenu, NULL, &MenuXF86SelectPC98Server, '>', ' ', '>', 0 },
{ "All", "Select all of the above",
@@ -1006,12 +1008,16 @@ Mono servers are particularly well-suited to most LCD displays).",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9GAN },
{ "9LPW", "PC98 PowerWindowLB (S3) card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9LPW },
+ { "9MGA", "PC98 MGA (Matrox) card",
+ dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9MGA },
{ "9NKV", "PC98 NKV-NEC (cirrus) card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9NKV },
{ "9NS3", "PC98 NEC (S3) card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9NS3 },
{ "9SPW", "PC98 SKB-PowerWindow (S3) card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9SPW },
+ { "9SVG", "PC98 generic SVGA card",
+ dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9SVG },
{ "9TGU", "PC98 Cyber9320 and TGUI9680 cards",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9TGU },
{ "9WEP", "PC98 WAB-EP (cirrus) card",
diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c
index a60ddf3..c1a7596 100644
--- a/usr.sbin/sysinstall/dist.c
+++ b/usr.sbin/sysinstall/dist.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: dist.c,v 1.121 1998/01/23 07:53:44 jkh Exp $
+ * $Id: dist.c,v 1.122 1998/03/09 15:00:48 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -76,7 +76,7 @@ static Distribution DistTable[] = {
{ "compat20", "/", &Dists, DIST_COMPAT20, NULL },
{ "compat21", "/", &Dists, DIST_COMPAT21, NULL },
{ "ports", "/usr", &Dists, DIST_PORTS, NULL },
-{ "XF86331", "/usr", &Dists, DIST_XF86, XF86DistTable },
+{ "XF86332", "/usr", &Dists, DIST_XF86, XF86DistTable },
{ NULL },
};
@@ -114,64 +114,66 @@ static Distribution SrcDistTable[] = {
/* The XFree86 distribution */
static Distribution XF86DistTable[] = {
-{ "XF86331", "/usr/X11R6", &XF86Dists, DIST_XF86_FONTS, XF86FontDistTable },
-{ "XF86331", "/usr/X11R6", &XF86Dists, DIST_XF86_SERVER, XF86ServerDistTable },
-{ "X331src-1", "/usr/X11R6/src", &XF86Dists, DIST_XF86_SRC, NULL },
-{ "X331contrib", "/usr/X11R6/src", &XF86Dists, DIST_XF86_CSRC, NULL },
-{ "X331bin", "/usr/X11R6", &XF86Dists, DIST_XF86_BIN, NULL },
-{ "X331cfg", "/usr/X11R6", &XF86Dists, DIST_XF86_CFG, NULL },
-{ "X331doc", "/usr/X11R6", &XF86Dists, DIST_XF86_DOC, NULL },
-{ "X331html", "/usr/X11R6", &XF86Dists, DIST_XF86_HTML, NULL },
-{ "X331lib", "/usr/X11R6", &XF86Dists, DIST_XF86_LIB, NULL },
-{ "X331lk98", "/usr/X11R6", &XF86Dists, DIST_XF86_LKIT98, NULL },
-{ "X331lkit", "/usr/X11R6", &XF86Dists, DIST_XF86_LKIT, NULL },
-{ "X331man", "/usr/X11R6", &XF86Dists, DIST_XF86_MAN, NULL },
-{ "X331prog", "/usr/X11R6", &XF86Dists, DIST_XF86_PROG, NULL },
-{ "X331ps", "/usr/X11R6", &XF86Dists, DIST_XF86_PS, NULL },
-{ "X331set", "/usr/X11R6", &XF86Dists, DIST_XF86_SET, NULL },
+{ "XF86332", "/usr/X11R6", &XF86Dists, DIST_XF86_FONTS, XF86FontDistTable },
+{ "XF86332", "/usr/X11R6", &XF86Dists, DIST_XF86_SERVER, XF86ServerDistTable },
+{ "X332src-1", "/usr/X11R6/src", &XF86Dists, DIST_XF86_SRC, NULL },
+{ "X332contrib", "/usr/X11R6/src", &XF86Dists, DIST_XF86_CSRC, NULL },
+{ "X332bin", "/usr/X11R6", &XF86Dists, DIST_XF86_BIN, NULL },
+{ "X332cfg", "/usr/X11R6", &XF86Dists, DIST_XF86_CFG, NULL },
+{ "X332doc", "/usr/X11R6", &XF86Dists, DIST_XF86_DOC, NULL },
+{ "X332html", "/usr/X11R6", &XF86Dists, DIST_XF86_HTML, NULL },
+{ "X332lib", "/usr/X11R6", &XF86Dists, DIST_XF86_LIB, NULL },
+{ "X332lk98", "/usr/X11R6", &XF86Dists, DIST_XF86_LKIT98, NULL },
+{ "X332lkit", "/usr/X11R6", &XF86Dists, DIST_XF86_LKIT, NULL },
+{ "X332man", "/usr/X11R6", &XF86Dists, DIST_XF86_MAN, NULL },
+{ "X332prog", "/usr/X11R6", &XF86Dists, DIST_XF86_PROG, NULL },
+{ "X332ps", "/usr/X11R6", &XF86Dists, DIST_XF86_PS, NULL },
+{ "X332set", "/usr/X11R6", &XF86Dists, DIST_XF86_SET, NULL },
+{ "X3329set", "/usr/X11R6", &XF86Dists, DIST_XF86_9SET, NULL },
{ NULL },
};
/* The XFree86 server distribution */
static Distribution XF86ServerDistTable[] = {
-{ "X3318514", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_8514, NULL },
-{ "X3319480", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9480, NULL },
-{ "X3319EGC", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9EGC, NULL },
-{ "X3319GA9", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9GA9, NULL },
-{ "X3319GAN", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9GAN, NULL },
-{ "X3319LPW", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9LPW, NULL },
-{ "X3319NKV", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9NKV, NULL },
-{ "X3319NS3", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9NS3, NULL },
-{ "X3319SPW", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9SPW, NULL },
-{ "X3319TGU", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9TGU, NULL },
-{ "X3319WEP", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9WEP, NULL },
-{ "X3319WS", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9WS, NULL },
-{ "X3319WSN", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9WSN, NULL },
-{ "X331AGX", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_AGX, NULL },
-{ "X331I128", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_I128, NULL },
-{ "X331Ma8", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_MACH8, NULL },
-{ "X331Ma32", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_MACH32,NULL },
-{ "X331Ma64", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_MACH64,NULL },
-{ "X331Mono", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_MONO, NULL },
-{ "X331P9K", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_P9000, NULL },
-{ "X331S3", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_S3, NULL },
-{ "X331S3V", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_S3V, NULL },
-{ "X331SVGA", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_SVGA, NULL },
-{ "X331VG16", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_VGA16, NULL },
-{ "X331W32", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_W32, NULL },
-{ "X331nest", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_NEST, NULL },
-{ "X331vfb", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_VFB, NULL },
+{ "PC98-Servers/X3329480", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9480, NULL },
+{ "PC98-Servers/X3329EGC", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9EGC, NULL },
+{ "PC98-Servers/X3329GA9", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9GA9, NULL },
+{ "PC98-Servers/X3329GAN", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9GAN, NULL },
+{ "PC98-Servers/X3329LPW", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9LPW, NULL },
+{ "PC98-Servers/X3329MGA", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9MGA, NULL },
+{ "PC98-Servers/X3329NKV", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9NKV, NULL },
+{ "PC98-Servers/X3329NS3", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9NS3, NULL },
+{ "PC98-Servers/X3329SPW", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9SPW, NULL },
+{ "PC98-Servers/X3329SVG", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9SVG, NULL },
+{ "PC98-Servers/X3329TGU", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9TGU, NULL },
+{ "PC98-Servers/X3329WEP", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9WEP, NULL },
+{ "PC98-Servers/X3329WS", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9WS, NULL },
+{ "PC98-Servers/X3329WSN", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9WSN, NULL },
+{ "Servers/X3328514", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_8514, NULL },
+{ "Servers/X332AGX", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_AGX, NULL },
+{ "Servers/X332I128", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_I128, NULL },
+{ "Servers/X332Ma8", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_MACH8, NULL },
+{ "Servers/X332Ma32", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_MACH32,NULL },
+{ "Servers/X332Ma64", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_MACH64,NULL },
+{ "Servers/X332Mono", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_MONO, NULL },
+{ "Servers/X332P9K", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_P9000, NULL },
+{ "Servers/X332S3", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_S3, NULL },
+{ "Servers/X332S3V", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_S3V, NULL },
+{ "Servers/X332SVGA", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_SVGA, NULL },
+{ "Servers/X332VG16", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_VGA16, NULL },
+{ "Servers/X332W32", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_W32, NULL },
+{ "X332nest", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_NEST, NULL },
{ NULL },
};
/* The XFree86 font distribution */
static Distribution XF86FontDistTable[] = {
-{ "X331fnts", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_MISC, NULL },
-{ "X331f100", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_100, NULL },
-{ "X331fcyr", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_CYR, NULL },
-{ "X331fscl", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_SCALE, NULL },
-{ "X331fnon", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_NON, NULL },
-{ "X331fsrv", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_SERVER, NULL },
+{ "X332fnts", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_MISC, NULL },
+{ "X332f100", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_100, NULL },
+{ "X332fcyr", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_CYR, NULL },
+{ "X332fscl", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_SCALE, NULL },
+{ "X332fnon", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_NON, NULL },
+{ "X332fsrv", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_SERVER, NULL },
{ NULL },
};
diff --git a/usr.sbin/sysinstall/dist.h b/usr.sbin/sysinstall/dist.h
index bdecdbd..c281d42 100644
--- a/usr.sbin/sysinstall/dist.h
+++ b/usr.sbin/sysinstall/dist.h
@@ -66,11 +66,12 @@
#define DIST_XF86_PROG 0x0100
#define DIST_XF86_PS 0x0200
#define DIST_XF86_SET 0x0400
-#define DIST_XF86_SRC 0x0800
-#define DIST_XF86_CSRC 0x1000
-#define DIST_XF86_MISC_ALL 0x1FFF
+#define DIST_XF86_9SET 0x0800
+#define DIST_XF86_SRC 0x1000
+#define DIST_XF86_CSRC 0x2000
+#define DIST_XF86_MISC_ALL 0x3FFF
#define DIST_XF86_SERVER 0x8000
-#define DIST_XF86_SERVER_8514 0x0000001
+#define DIST_XF86_SERVER_9MGA 0x0000001
#define DIST_XF86_SERVER_9480 0x0000002
#define DIST_XF86_SERVER_9EGC 0x0000004
#define DIST_XF86_SERVER_9GA9 0x0000008
@@ -78,26 +79,27 @@
#define DIST_XF86_SERVER_9LPW 0x0000020
#define DIST_XF86_SERVER_9NKV 0x0000040
#define DIST_XF86_SERVER_9NS3 0x0000080
-#define DIST_XF86_SERVER_9SPW 0x0000100
-#define DIST_XF86_SERVER_9TGU 0x0000200
-#define DIST_XF86_SERVER_9WEP 0x0000400
-#define DIST_XF86_SERVER_9WS 0x0000800
-#define DIST_XF86_SERVER_9WSN 0x0001000
-#define DIST_XF86_SERVER_AGX 0x0002000
-#define DIST_XF86_SERVER_I128 0x0004000
-#define DIST_XF86_SERVER_MACH8 0x0008000
-#define DIST_XF86_SERVER_MACH32 0x0010000
-#define DIST_XF86_SERVER_MACH64 0x0020000
-#define DIST_XF86_SERVER_MONO 0x0040000
-#define DIST_XF86_SERVER_P9000 0x0080000
-#define DIST_XF86_SERVER_S3 0x0100000
-#define DIST_XF86_SERVER_S3V 0x0200000
-#define DIST_XF86_SERVER_SVGA 0x0400000
-#define DIST_XF86_SERVER_VGA16 0x0800000
-#define DIST_XF86_SERVER_W32 0x1000000
-#define DIST_XF86_SERVER_NEST 0x2000000
-#define DIST_XF86_SERVER_VFB 0x4000000
-#define DIST_XF86_SERVER_ALL 0x7FFFFFF
+#define DIST_XF86_SERVER_9SVG 0x0000100
+#define DIST_XF86_SERVER_9SPW 0x0000200
+#define DIST_XF86_SERVER_9TGU 0x0000400
+#define DIST_XF86_SERVER_9WEP 0x0000800
+#define DIST_XF86_SERVER_9WS 0x0001000
+#define DIST_XF86_SERVER_9WSN 0x0002000
+#define DIST_XF86_SERVER_8514 0x0004001
+#define DIST_XF86_SERVER_AGX 0x0008000
+#define DIST_XF86_SERVER_I128 0x0010000
+#define DIST_XF86_SERVER_MACH8 0x0020000
+#define DIST_XF86_SERVER_MACH32 0x0040000
+#define DIST_XF86_SERVER_MACH64 0x0080000
+#define DIST_XF86_SERVER_MONO 0x0100000
+#define DIST_XF86_SERVER_P9000 0x0200000
+#define DIST_XF86_SERVER_S3 0x0400000
+#define DIST_XF86_SERVER_S3V 0x0800000
+#define DIST_XF86_SERVER_SVGA 0x1000000
+#define DIST_XF86_SERVER_VGA16 0x2000000
+#define DIST_XF86_SERVER_W32 0x4000000
+#define DIST_XF86_SERVER_NEST 0x8000000
+#define DIST_XF86_SERVER_ALL 0xFFFFFFF
#define DIST_XF86_FONTS 0x10000
#define DIST_XF86_FONTS_MISC 0x0001
#define DIST_XF86_FONTS_100 0x0002
diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c
index 94f6232..4893112 100644
--- a/usr.sbin/sysinstall/menus.c
+++ b/usr.sbin/sysinstall/menus.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: menus.c,v 1.156 1998/03/09 14:24:21 ache Exp $
+ * $Id: menus.c,v 1.157 1998/03/09 15:01:02 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -438,10 +438,12 @@ DMenu MenuXF86Config = {
"does not.",
"Press F1 to read the XFree86 release notes for FreeBSD",
"XF86",
- { { "XF86Setup", "Use the fully graphical XFree86 configuration tool.",
+ { { "XF86Setup", "Fully graphical XFree86 configuration tool.",
NULL, dmenuSetVariable, NULL, VAR_XF86_CONFIG "=XF86Setup" },
- { "xf86config", "Use the shell-script based XFree86 configuration tool.",
+ { "xf86config", "Shell-script based XFree86 configuration tool.",
NULL, dmenuSetVariable, NULL, VAR_XF86_CONFIG "=xf86config" },
+ { "XF98Setup", "Fully graphical XFree86 configuration tool (PC98).",
+ NULL, dmenuSetVariable, NULL, VAR_XF86_CONFIG "=XF98Setup" },
{ NULL } },
};
@@ -894,6 +896,8 @@ DMenu MenuXF86SelectCore = {
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_PS },
{ "set", "XFree86 Setup Utility",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SET },
+ { "9set", "XFree86 Setup Utility (PC98)",
+ dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_9SET },
{ "sources", "XFree86 3.3.1 standard sources",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SRC },
{ "csources", "XFree86 3.3.1 contrib sources",
@@ -974,8 +978,6 @@ DMenu MenuXF86SelectServer = {
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_W32 },
{ "nest", "A nested server for testing purposes",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_NEST },
- { "vfb", "A virtual frame-buffer server",
- dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_VFB },
{ "PC98", "Select an X server for a NEC PC98 [Submenu]",
NULL, dmenuSubmenu, NULL, &MenuXF86SelectPC98Server, '>', ' ', '>', 0 },
{ "All", "Select all of the above",
@@ -1006,12 +1008,16 @@ Mono servers are particularly well-suited to most LCD displays).",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9GAN },
{ "9LPW", "PC98 PowerWindowLB (S3) card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9LPW },
+ { "9MGA", "PC98 MGA (Matrox) card",
+ dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9MGA },
{ "9NKV", "PC98 NKV-NEC (cirrus) card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9NKV },
{ "9NS3", "PC98 NEC (S3) card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9NS3 },
{ "9SPW", "PC98 SKB-PowerWindow (S3) card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9SPW },
+ { "9SVG", "PC98 generic SVGA card",
+ dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9SVG },
{ "9TGU", "PC98 Cyber9320 and TGUI9680 cards",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9TGU },
{ "9WEP", "PC98 WAB-EP (cirrus) card",
OpenPOWER on IntegriCloud