Add fonts,screenmaps,console types

2 files changed, 50 insertions, 24 deletions

diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c
index 1e2662a..d0d01df 100644
--- a/usr.sbin/sade/menus.c
+++ b/usr.sbin/sade/menus.c
@@ -1611,10 +1611,11 @@ DMenu MenuSysconsScrnmap = {
     "display at all.",
     "Choose a screen map",
     NULL,
-    { { "None",			"No screenmap, use default font", dmenuVarCheck, dmenuSetVariable, NULL, "scrnmap=NO" },
-      { "KOI8-R to IBM866",	"Russian KOI8-R to IBM 866 screenmap", dmenuVarCheck, dmenuSetVariable, NULL, "scrnmap=koi8-r2cp866" },
-      { "KOI8-U to IBM866u",	"Ukrainian KOI8-U to IBM 866u screenmap", dmenuVarCheck, dmenuSetVariable, NULL, "scrnmap=koi8-u2cp866u" },
-      { "ISO 8859-1 to IBM437",	"W-Europe ISO 8859-1 to IBM 437 screenmap", dmenuVarCheck, dmenuSetVariable, NULL, "scrnmap=iso-8859-1_to_cp437" },
+    { { "1 None",                 "No screenmap, don't touch font", dmenuVarCheck, dmenuSetVariable, NULL, "scrnmap=NO" },
+      { "2 ISO 8859-1 to IBM437", "W-Europe ISO 8859-1 to IBM 437 screenmap", dmenuVarCheck, dmenuSetVariable, NULL, "scrnmap=iso-8859-1_to_cp437" },
+      { "3 ISO 8859-7 to IBM437", "Greek ISO 8859-7 to IBM 437 screenmap", dmenuVarCheck, dmenuSetVariable, NULL, "scrnmap=iso-8859-7_to_cp437" },
+      { "4 KOI8-R to IBM866",     "Russian KOI8-R to IBM 866 screenmap", dmenuVarCheck, dmenuSetVariable, NULL, "scrnmap=koi8-r2cp866" },
+      { "5 KOI8-U to IBM866u",    "Ukrainian KOI8-U to IBM 866u screenmap", dmenuVarCheck, dmenuSetVariable, NULL, "scrnmap=koi8-u2cp866u" },
       { NULL } },
 };
 
@@ -1629,11 +1630,13 @@ DMenu MenuSysconsTtys = {
     "Choose a terminal type",
     NULL,
     { { "1 None",               "Don't touch anything",  dmenuVarCheck, dmenuSetVariable, NULL, VAR_CONSTERM "=NO" },
-      { "2 US-ASCII or IBM437", "cons25", dmenuVarCheck, dmenuSetVariable, NULL, VAR_CONSTERM "=cons25" },
+      { "2 IBM437 (VGA default)", "cons25", dmenuVarCheck, dmenuSetVariable, NULL, VAR_CONSTERM "=cons25" },
       { "3 ISO 8859-1",         "cons25l1", dmenuVarCheck, dmenuSetVariable, NULL, VAR_CONSTERM "=cons25l1" },
       { "4 ISO 8859-2",         "cons25l2", dmenuVarCheck, dmenuSetVariable, NULL, VAR_CONSTERM "=cons25l2" },
-      { "5 KOI8-R",             "cons25r", dmenuVarCheck, dmenuSetVariable, NULL, VAR_CONSTERM "=cons25r" },
-      { "6 KOI8-U",             "cons25u", dmenuVarCheck, dmenuSetVariable, NULL, VAR_CONSTERM "=cons25u" },
+      { "5 ISO 8859-7",         "cons25l7", dmenuVarCheck, dmenuSetVariable, NULL, VAR_CONSTERM "=cons25l7" },
+      { "6 KOI8-R",             "cons25r", dmenuVarCheck, dmenuSetVariable, NULL, VAR_CONSTERM "=cons25r" },
+      { "7 KOI8-U",             "cons25u", dmenuVarCheck, dmenuSetVariable, NULL, VAR_CONSTERM "=cons25u" },
+      { "8 US-ASCII",           "cons25w", dmenuVarCheck, dmenuSetVariable, NULL, VAR_CONSTERM "=cons25w" },
       { NULL } },
 };
 
@@ -1651,9 +1654,9 @@ DMenu MenuSysconsFont = {
     "you can select the appropriate font below.",
     "Choose a font",
     NULL,
-    { { "1 None", "Use default font",	dmenuVarCheck,	dmenuSetVariables, NULL,
+    { { "1 None", "Use hardware default font", dmenuVarCheck, dmenuSetVariables, NULL,
 	"font8x8=NO,font8x14=NO,font8x16=NO" },
-      { "2 IBM 437", "English",	dmenuVarCheck,	dmenuSetVariables, NULL,
+      { "2 IBM 437", "English and others, VGA default", dmenuVarCheck,  dmenuSetVariables, NULL,
 	"font8x8=cp437-8x8,font8x14=cp437-8x14,font8x16=cp437-8x16" },
       { "3 IBM 850", "Western Europe, IBM encoding",	dmenuVarCheck,	dmenuSetVariables, NULL,
 	"font8x8=cp850-8x8,font8x14=cp850-8x14,font8x16=cp850-8x16" },
@@ -1663,11 +1666,21 @@ DMenu MenuSysconsFont = {
 	"font8x8=cp866-8x8,font8x14=cp866-8x14,font8x16=cp866b-8x16,mousechar_start=3" },
       { "6 IBM 866u", "Ukrainian, IBM encoding (use with KOI8-U screenmap)",   dmenuVarCheck,  dmenuSetVariables, NULL,
 	"font8x8=cp866u-8x8,font8x14=cp866u-8x14,font8x16=cp866u-8x16,mousechar_start=3" },
-      { "7 ISO 8859-1", "Western Europe, ISO encoding",	dmenuVarCheck,	dmenuSetVariables, NULL,
+      { "7 IBM 1251", "Cyrillic, MS Windows encoding",  dmenuVarCheck, dmenuSetVariables, NULL,
+	"font8x8=cp1251-8x8,font8x14=cp1251-8x14,font8x16=cp1251-8x16,mousechar_start=3" },
+      { "8 ISO 8859-1", "Western Europe, ISO encoding", dmenuVarCheck,  dmenuSetVariables, NULL,
 	"font8x8=iso-8x8,font8x14=iso-8x14,font8x16=iso-8x16" },
-      { "8 ISO 8859-2", "Eastern Europe, ISO encoding",	dmenuVarCheck,	dmenuSetVariables, NULL,
+      { "9 ISO 8859-2", "Eastern Europe, ISO encoding", dmenuVarCheck,  dmenuSetVariables, NULL,
 	"font8x8=iso02-8x8,font8x14=iso02-8x14,font8x16=iso02-8x16" },
-      { "9 SWISS", "English, better resolution", dmenuVarCheck,	dmenuSetVariables, NULL,
+      { "a ISO 8859-4", "Baltic, ISO encoding", dmenuVarCheck,  dmenuSetVariables, NULL,
+	"font8x8=iso04-8x8,font8x14=iso04-8x14,font8x16=iso04-8x16" },
+      { "b ISO 8859-7", "Greek, ISO encoding", dmenuVarCheck,  dmenuSetVariables, NULL,
+	"font8x8=iso07-8x8,font8x14=iso07-8x14,font8x16=iso07-8x16" },
+      { "c ISO 8859-8", "Hebrew, ISO encoding", dmenuVarCheck,  dmenuSetVariables, NULL,
+	"font8x8=iso08-8x8,font8x14=iso08-8x14,font8x16=iso08-8x16" },
+      { "d ISO 8859-15", "Europe, ISO encoding", dmenuVarCheck,  dmenuSetVariables, NULL,
+	"font8x8=iso15-8x8,font8x14=iso15-8x14,font8x16=iso15-8x16" },
+      { "e SWISS", "English, better resolution", dmenuVarCheck, dmenuSetVariables, NULL,
 	"font8x8=swiss-8x8,font8x14=NO,font8x16=swiss-8x16" },
       { NULL } },
 };
diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c
index 1e2662a..d0d01df 100644
--- a/usr.sbin/sysinstall/menus.c
+++ b/usr.sbin/sysinstall/menus.c
@@ -1611,10 +1611,11 @@ DMenu MenuSysconsScrnmap = {
     "display at all.",
     "Choose a screen map",
     NULL,
-    { { "None",			"No screenmap, use default font", dmenuVarCheck, dmenuSetVariable, NULL, "scrnmap=NO" },
-      { "KOI8-R to IBM866",	"Russian KOI8-R to IBM 866 screenmap", dmenuVarCheck, dmenuSetVariable, NULL, "scrnmap=koi8-r2cp866" },
-      { "KOI8-U to IBM866u",	"Ukrainian KOI8-U to IBM 866u screenmap", dmenuVarCheck, dmenuSetVariable, NULL, "scrnmap=koi8-u2cp866u" },
-      { "ISO 8859-1 to IBM437",	"W-Europe ISO 8859-1 to IBM 437 screenmap", dmenuVarCheck, dmenuSetVariable, NULL, "scrnmap=iso-8859-1_to_cp437" },
+    { { "1 None",                 "No screenmap, don't touch font", dmenuVarCheck, dmenuSetVariable, NULL, "scrnmap=NO" },
+      { "2 ISO 8859-1 to IBM437", "W-Europe ISO 8859-1 to IBM 437 screenmap", dmenuVarCheck, dmenuSetVariable, NULL, "scrnmap=iso-8859-1_to_cp437" },
+      { "3 ISO 8859-7 to IBM437", "Greek ISO 8859-7 to IBM 437 screenmap", dmenuVarCheck, dmenuSetVariable, NULL, "scrnmap=iso-8859-7_to_cp437" },
+      { "4 KOI8-R to IBM866",     "Russian KOI8-R to IBM 866 screenmap", dmenuVarCheck, dmenuSetVariable, NULL, "scrnmap=koi8-r2cp866" },
+      { "5 KOI8-U to IBM866u",    "Ukrainian KOI8-U to IBM 866u screenmap", dmenuVarCheck, dmenuSetVariable, NULL, "scrnmap=koi8-u2cp866u" },
       { NULL } },
 };
 
@@ -1629,11 +1630,13 @@ DMenu MenuSysconsTtys = {
     "Choose a terminal type",
     NULL,
     { { "1 None",               "Don't touch anything",  dmenuVarCheck, dmenuSetVariable, NULL, VAR_CONSTERM "=NO" },
-      { "2 US-ASCII or IBM437", "cons25", dmenuVarCheck, dmenuSetVariable, NULL, VAR_CONSTERM "=cons25" },
+      { "2 IBM437 (VGA default)", "cons25", dmenuVarCheck, dmenuSetVariable, NULL, VAR_CONSTERM "=cons25" },
       { "3 ISO 8859-1",         "cons25l1", dmenuVarCheck, dmenuSetVariable, NULL, VAR_CONSTERM "=cons25l1" },
       { "4 ISO 8859-2",         "cons25l2", dmenuVarCheck, dmenuSetVariable, NULL, VAR_CONSTERM "=cons25l2" },
-      { "5 KOI8-R",             "cons25r", dmenuVarCheck, dmenuSetVariable, NULL, VAR_CONSTERM "=cons25r" },
-      { "6 KOI8-U",             "cons25u", dmenuVarCheck, dmenuSetVariable, NULL, VAR_CONSTERM "=cons25u" },
+      { "5 ISO 8859-7",         "cons25l7", dmenuVarCheck, dmenuSetVariable, NULL, VAR_CONSTERM "=cons25l7" },
+      { "6 KOI8-R",             "cons25r", dmenuVarCheck, dmenuSetVariable, NULL, VAR_CONSTERM "=cons25r" },
+      { "7 KOI8-U",             "cons25u", dmenuVarCheck, dmenuSetVariable, NULL, VAR_CONSTERM "=cons25u" },
+      { "8 US-ASCII",           "cons25w", dmenuVarCheck, dmenuSetVariable, NULL, VAR_CONSTERM "=cons25w" },
       { NULL } },
 };
 
@@ -1651,9 +1654,9 @@ DMenu MenuSysconsFont = {
     "you can select the appropriate font below.",
     "Choose a font",
     NULL,
-    { { "1 None", "Use default font",	dmenuVarCheck,	dmenuSetVariables, NULL,
+    { { "1 None", "Use hardware default font", dmenuVarCheck, dmenuSetVariables, NULL,
 	"font8x8=NO,font8x14=NO,font8x16=NO" },
-      { "2 IBM 437", "English",	dmenuVarCheck,	dmenuSetVariables, NULL,
+      { "2 IBM 437", "English and others, VGA default", dmenuVarCheck,  dmenuSetVariables, NULL,
 	"font8x8=cp437-8x8,font8x14=cp437-8x14,font8x16=cp437-8x16" },
       { "3 IBM 850", "Western Europe, IBM encoding",	dmenuVarCheck,	dmenuSetVariables, NULL,
 	"font8x8=cp850-8x8,font8x14=cp850-8x14,font8x16=cp850-8x16" },
@@ -1663,11 +1666,21 @@ DMenu MenuSysconsFont = {
 	"font8x8=cp866-8x8,font8x14=cp866-8x14,font8x16=cp866b-8x16,mousechar_start=3" },
       { "6 IBM 866u", "Ukrainian, IBM encoding (use with KOI8-U screenmap)",   dmenuVarCheck,  dmenuSetVariables, NULL,
 	"font8x8=cp866u-8x8,font8x14=cp866u-8x14,font8x16=cp866u-8x16,mousechar_start=3" },
-      { "7 ISO 8859-1", "Western Europe, ISO encoding",	dmenuVarCheck,	dmenuSetVariables, NULL,
+      { "7 IBM 1251", "Cyrillic, MS Windows encoding",  dmenuVarCheck, dmenuSetVariables, NULL,
+	"font8x8=cp1251-8x8,font8x14=cp1251-8x14,font8x16=cp1251-8x16,mousechar_start=3" },
+      { "8 ISO 8859-1", "Western Europe, ISO encoding", dmenuVarCheck,  dmenuSetVariables, NULL,
 	"font8x8=iso-8x8,font8x14=iso-8x14,font8x16=iso-8x16" },
-      { "8 ISO 8859-2", "Eastern Europe, ISO encoding",	dmenuVarCheck,	dmenuSetVariables, NULL,
+      { "9 ISO 8859-2", "Eastern Europe, ISO encoding", dmenuVarCheck,  dmenuSetVariables, NULL,
 	"font8x8=iso02-8x8,font8x14=iso02-8x14,font8x16=iso02-8x16" },
-      { "9 SWISS", "English, better resolution", dmenuVarCheck,	dmenuSetVariables, NULL,
+      { "a ISO 8859-4", "Baltic, ISO encoding", dmenuVarCheck,  dmenuSetVariables, NULL,
+	"font8x8=iso04-8x8,font8x14=iso04-8x14,font8x16=iso04-8x16" },
+      { "b ISO 8859-7", "Greek, ISO encoding", dmenuVarCheck,  dmenuSetVariables, NULL,
+	"font8x8=iso07-8x8,font8x14=iso07-8x14,font8x16=iso07-8x16" },
+      { "c ISO 8859-8", "Hebrew, ISO encoding", dmenuVarCheck,  dmenuSetVariables, NULL,
+	"font8x8=iso08-8x8,font8x14=iso08-8x14,font8x16=iso08-8x16" },
+      { "d ISO 8859-15", "Europe, ISO encoding", dmenuVarCheck,  dmenuSetVariables, NULL,
+	"font8x8=iso15-8x8,font8x14=iso15-8x14,font8x16=iso15-8x16" },
+      { "e SWISS", "English, better resolution", dmenuVarCheck, dmenuSetVariables, NULL,
 	"font8x8=swiss-8x8,font8x14=NO,font8x16=swiss-8x16" },
       { NULL } },
 };