more keycaps for jp106 keyboards -- gotta get myself one of these weird contraptions as a wall hanging; sigh@kuzirabekon.econ.nagasaki-u.ac.jp

1 files changed, 19 insertions, 11 deletions

diff --git a/sys/arch/i386/isa/pcvt/pcvt_kbd.h b/sys/arch/i386/isa/pcvt/pcvt_kbd.h
index 78955573af8..e656bf30528 100644
--- a/sys/arch/i386/isa/pcvt/pcvt_kbd.h
+++ b/sys/arch/i386/isa/pcvt/pcvt_kbd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcvt_kbd.h,v 1.6 2000/10/11 21:24:28 aaron Exp $	*/
+/*	$OpenBSD: pcvt_kbd.h,v 1.7 2000/12/10 18:34:26 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1992, 1995 Hellmuth Michaelis and Joerg Wunsch.
@@ -175,7 +175,11 @@ static u_char scantokey[] = {
 /*40*/  117,118,119,120,121, 90,125, 91,  /* F6  F7  F8  F9  F10 NUM LOC KP7 */
 /*48*/   96,101,105, 92, 97,102,106, 93,  /* KP8 KP9 KP- KP4 KP5 KP6 KP+ KP1 */
 /*50*/   98,103, 99,104,127,  0, 45,122,  /* KP2 KP3 KP0 KP. SyRq??  NL1 F11 */
-/*58*/  123                               /* F12 */
+/*58*/  123,  0,  0,  0,  0,  0,  0,  0,  /* F12 ??  ??  ??  ??  ??  ??  ??  */
+/*60*/    0,  0,  0,  0,  0,  0,  0,  0,  /* ??  ??  ??  ??  ??  ??  ??  ??  */
+/*68*/    0,  0,  0, 59, 63, 65,  0,  0,  /* ??  ??  ??  LWn RWn Men ??  ??  */
+/*70*/   68,  0,  0, 56,  0,  0,  0,  0,  /* H/K ??  ??  RO  ??  ??  ??  ??  */
+/*78*/    0, 67,  0, 66,  0, 14,  0,  0   /* ??  Xfr ??  Nxr ??  \   ??  ??  */
 };
 
 static u_char extscantokey[] = {
@@ -191,7 +195,11 @@ static u_char extscantokey[] = {
 /*40*/  117,118,119,120,121, 90,126, 80,  /* F6  F7  F8  F9  F10 NUM Brk HOM */
 /*48*/   83, 85,105, 79, 97, 89,106, 81,  /* UA  PU  KP- LA  KP5 RA  KP+ END */
 /*50*/   84, 86, 75, 76,  0,  0, 45,122,  /* DA  PD  INS DEL ??  ??  NL1 F11 */
-/*58*/  123,                              /* F12 */
+/*58*/  123,  0,  0,  0,  0,  0,  0,  0,  /* F12 ??  ??  ??  ??  ??  ??  ??  */
+/*60*/    0,  0,  0,  0,  0,  0,  0,  0,  /* ??  ??  ??  ??  ??  ??  ??  ??  */
+/*68*/    0,  0,  0, 59, 63, 65,  0,  0,  /* ??  ??  ??  LWn RWn Men ??  ??  */
+/*70*/   68,  0,  0, 56,  0,  0,  0,  0,  /* H/K ??  ??  RO  ??  ??  ??  ??  */
+/*78*/    0, 67,  0, 66,  0, 14,  0,  0   /* ??  Xfr ??  Nxr ??  \   ??  ??  */
 };
 #endif	/* PCVT_SCANSET == 2 */
 
@@ -382,7 +390,7 @@ static Keycap_def	key2ascii[] =
 /* 11*/ { KBD_ASCII, I, {S, { "0" }},     {S, { ")" }},     {S, { "0" }} },
 /* 12*/ { KBD_ASCII, I, {S, { "-" }},     {S, { "_" }},     {S, { "\037" }} },
 /* 13*/ { KBD_ASCII, I, {S, { "=" }},     {S, { "+" }},     {S, { "=" }} },
-/* 14*/ { KBD_NONE,  I, {S, { "" }},      {S, { "" }},      {S, { "" }} },
+/* 14*/ { KBD_ASCII, I, {S, { "\\" }},    {S, { "|" }},     {S, { "\034" }} }, /* \ in jp106 */
 /* 15*/ { KBD_ASCII, I, {S, { "\177" }},  {S, { "\010" }},  {S, { "\177" }} }, /* BS */
 /* 16*/ { KBD_ASCII, I, {S, { "\t" }},    {S, { "\t" }},    {S, { "\t" }} },   /* TAB */
 /* 17*/ { KBD_ASCII, I, {S, { "q" }},     {S, { "Q" }},     {S, { "\021" }} },
@@ -424,10 +432,10 @@ static Keycap_def	key2ascii[] =
 /* 53*/ { KBD_ASCII, I, {S, { "," }},     {S, { "<" }},     {S, { "," }} },
 /* 54*/ { KBD_ASCII, I, {S, { "." }},     {S, { ">" }},     {S, { "." }} },
 /* 55*/ { KBD_ASCII, I, {S, { "/" }},     {S, { "?" }},     {S, { "/" }} },
-/* 56*/ { KBD_NONE,  I, {S, { "" }},      {S, { "" }},      {S, { "" }} },
+/* 56*/ { KBD_ASCII, I, {S, { "\\" }},    {S, { "_" }},     {S, { "\034" }} }, /* RO in jp106 */
 /* 57*/ { KBD_SHIFT, I, {S, { "" }},      {S, { "" }},      {S, { "" }} }, /* SHIFT right */
 /* 58*/ { KBD_CTL,   I, {S, { "" }},      {S, { "" }},      {S, { "" }} },    /* CTL left */
-/* 59*/ { KBD_ASCII, I, {S, { "" }},      {S, { "" }},      {S, { "" }} },
+/* 59*/ { KBD_NONE,  I, {S, { "" }},      {S, { "" }},      {S, { "" }} }, /* Winkey left */
 /* 60*/ { KBD_META,  I, {S, { "" }},      {S, { "" }},      {S, { "" }} },    /* ALT left */
 #if !PCVT_NULLCHARS
 /* 61*/ { KBD_ASCII, I, {S, { " " }},     {S, { " " }},     {S, { " " }} },      /* SPACE */
@@ -435,12 +443,12 @@ static Keycap_def	key2ascii[] =
 /* 61*/ { KBD_ASCII, I, {S, { " " }},     {S, { " " }},     {S, { "\000" }} },   /* SPACE */
 #endif /* PCVT_NULLCHARS */
 /* 62*/ { KBD_META,  I, {S, { "" }},      {S, { "" }},      {S, { "" }} },   /* ALT right */
-/* 63*/ { KBD_ASCII, I, {S, { "" }},      {S, { "" }},      {S, { "" }} },
+/* 63*/ { KBD_NONE,  I, {S, { "" }},      {S, { "" }},      {S, { "" }} }, /* Winkey right */
 /* 64*/ { KBD_CTL,   I, {S, { "" }},      {S, { "" }},      {S, { "" }} },   /* CTL right */
-/* 65*/ { KBD_NONE,  I, {S, { "" }},      {S, { "" }},      {S, { "" }} },
-/* 66*/ { KBD_NONE,  I, {S, { "" }},      {S, { "" }},      {S, { "" }} },
-/* 67*/ { KBD_NONE,  I, {S, { "" }},      {S, { "" }},      {S, { "" }} },
-/* 68*/ { KBD_NONE,  I, {S, { "" }},      {S, { "" }},      {S, { "" }} },
+/* 65*/ { KBD_NONE,  I, {S, { "" }},      {S, { "" }},      {S, { "" }} }, /* Windows menu */
+/* 66*/ { KBD_NONE,  I, {S, { "" }},      {S, { "" }},      {S, { "" }} }, /* NXfer or Muhenkan in jp106 */
+/* 67*/ { KBD_NONE,  I, {S, { "" }},      {S, { "" }},      {S, { "" }} }, /* Xfer or Henkan_mode in jp106 */
+/* 68*/ { KBD_NONE,  I, {S, { "" }},      {S, { "" }},      {S, { "" }} }, /* Hira/Katakana toggle in jp106 */
 /* 69*/ { KBD_NONE,  I, {S, { "" }},      {S, { "" }},      {S, { "" }} },
 /* 70*/ { KBD_NONE,  I, {S, { "" }},      {S, { "" }},      {S, { "" }} },
 /* 71*/ { KBD_NONE,  I, {S, { "" }},      {S, { "" }},      {S, { "" }} },