Supported to select a keymap for PC-98x1.

4 files changed, 44 insertions, 0 deletions

diff --git a/usr.sbin/sade/Makefile b/usr.sbin/sade/Makefile
index 353523e..946df64 100644
--- a/usr.sbin/sade/Makefile
+++ b/usr.sbin/sade/Makefile
@@ -75,11 +75,15 @@ rtermcap:	rtermcap.c
 	${CC} -o ${.TARGET} ${.ALLSRC} -ltermcap
 
 
+.if ${MACHINE} == "pc98"
+KEYMAPS= jp.pc98 jp.pc98.iso
+.else
 KEYMAPS= be.iso br275.iso danish.iso finnish.iso fr.iso \
 	german.iso hr.iso hu.iso2.101keys it.iso icelandic.iso jp.106 \
 	norwegian.iso pl_PL.ISO8859-2 pt.iso ru.koi8-r si.iso \
 	spanish.iso swedish.iso swissfrench.iso swissgerman.iso ua.koi8-u \
 	ua.koi8-u.shift.alt uk.iso us.dvorak us.iso us.pc-ctrl us.unix
+.endif
 
 keymap.h:
 	rm -f keymap.tmp
diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c
index d95f218..7d850a0 100644
--- a/usr.sbin/sade/menus.c
+++ b/usr.sbin/sade/menus.c
@@ -1432,6 +1432,23 @@ DMenu MenuSyscons = {
       { NULL } },
 };
 
+#ifdef PC98
+DMenu MenuSysconsKeymap = {
+    DMENU_RADIO_TYPE | DMENU_SELECTION_RETURNS,
+    "System Console Keymap",
+    "The default system console driver for FreeBSD (syscons) defaults\n"
+    "to a standard \"PC-98x1\" keyboard map.  Users may wish to choose\n"
+    "one of the other keymaps below.\n"
+    "Note that sysinstall itself only uses the part of the keyboard map\n"
+    "which is required to generate the ANSI character subset, but your\n"
+    "choice of keymap will also be saved for later (fuller) use.",
+    "Choose a keyboard map",
+    NULL,
+    { { "Japanese PC-98x1",		"Japanese PC-98x1 keymap",  dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=jp.pc98" },
+      { " Japanese PC-98x1 (ISO)",	"Japanese PC-98x1 (ISO) keymap",  dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=jp.pc98.iso" },
+      { NULL } },
+};
+#else
 DMenu MenuSysconsKeymap = {
     DMENU_RADIO_TYPE | DMENU_SELECTION_RETURNS,
     "System Console Keymap",
@@ -1496,6 +1513,7 @@ DMenu MenuSysconsKeymap = {
       { " USA UNIX",	"US traditional UNIX-workstation",	dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=us.unix" },
       { NULL } },
 };
+#endif
 
 DMenu MenuSysconsKeyrate = {
     DMENU_RADIO_TYPE | DMENU_SELECTION_RETURNS,
diff --git a/usr.sbin/sysinstall/Makefile b/usr.sbin/sysinstall/Makefile
index 353523e..946df64 100644
--- a/usr.sbin/sysinstall/Makefile
+++ b/usr.sbin/sysinstall/Makefile
@@ -75,11 +75,15 @@ rtermcap:	rtermcap.c
 	${CC} -o ${.TARGET} ${.ALLSRC} -ltermcap
 
 
+.if ${MACHINE} == "pc98"
+KEYMAPS= jp.pc98 jp.pc98.iso
+.else
 KEYMAPS= be.iso br275.iso danish.iso finnish.iso fr.iso \
 	german.iso hr.iso hu.iso2.101keys it.iso icelandic.iso jp.106 \
 	norwegian.iso pl_PL.ISO8859-2 pt.iso ru.koi8-r si.iso \
 	spanish.iso swedish.iso swissfrench.iso swissgerman.iso ua.koi8-u \
 	ua.koi8-u.shift.alt uk.iso us.dvorak us.iso us.pc-ctrl us.unix
+.endif
 
 keymap.h:
 	rm -f keymap.tmp
diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c
index d95f218..7d850a0 100644
--- a/usr.sbin/sysinstall/menus.c
+++ b/usr.sbin/sysinstall/menus.c
@@ -1432,6 +1432,23 @@ DMenu MenuSyscons = {
       { NULL } },
 };
 
+#ifdef PC98
+DMenu MenuSysconsKeymap = {
+    DMENU_RADIO_TYPE | DMENU_SELECTION_RETURNS,
+    "System Console Keymap",
+    "The default system console driver for FreeBSD (syscons) defaults\n"
+    "to a standard \"PC-98x1\" keyboard map.  Users may wish to choose\n"
+    "one of the other keymaps below.\n"
+    "Note that sysinstall itself only uses the part of the keyboard map\n"
+    "which is required to generate the ANSI character subset, but your\n"
+    "choice of keymap will also be saved for later (fuller) use.",
+    "Choose a keyboard map",
+    NULL,
+    { { "Japanese PC-98x1",		"Japanese PC-98x1 keymap",  dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=jp.pc98" },
+      { " Japanese PC-98x1 (ISO)",	"Japanese PC-98x1 (ISO) keymap",  dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=jp.pc98.iso" },
+      { NULL } },
+};
+#else
 DMenu MenuSysconsKeymap = {
     DMENU_RADIO_TYPE | DMENU_SELECTION_RETURNS,
     "System Console Keymap",
@@ -1496,6 +1513,7 @@ DMenu MenuSysconsKeymap = {
       { " USA UNIX",	"US traditional UNIX-workstation",	dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=us.unix" },
       { NULL } },
 };
+#endif
 
 DMenu MenuSysconsKeyrate = {
     DMENU_RADIO_TYPE | DMENU_SELECTION_RETURNS,