提交: 741ffcc84dfa04e286c6fcd7b197d7d7bde29e62 - bhyve_keyboard_layout_patch (git)

FreeBSD bhyve keyboard layout patch

Commit MetaInfo

• 修订版: 741ffcc84dfa04e286c6fcd7b197d7d7bde29e62 (tree)
• 时间: 2021-01-24 19:51:56
• 作者: Koine Yuusuke(koinec) <koinec@user...>
• Commiter: Koine Yuusuke(koinec)

Log Message

Fix bugs.

更改概述

• modified: work/generate_keymap_tools/generate_kbdmap.c

差异

--- a/work/generate_keymap_tools/generate_kbdmap.c
+++ b/work/generate_keymap_tools/generate_kbdmap.c
@@ -34,7 +34,9 @@
 #include<unistd.h>
 #include<string.h>
 
-// Dup: 0x41->0x02/0x83, 0x54->0x7f/0x84
+
+// Intel 8042 Keyboard Controler DeTranslation Table ------------------------
+//   XXX: Duplicate: 0x41->0x02/0x83, 0x54->0x7f/0x84
 const uint8_t i8042_detranslation[256] = {
   /*   0     1     2     3     4     5     6     7     8     9     A     B     C     D     E     F */
 	   0, 0x76, 0x16, 0x1E, 0x26, 0x25, 0x2e, 0x36, 0x3d, 0x3e, 0x46, 0x45, 0x4e, 0x55, 0x66, 0x0d,
@@ -58,6 +60,7 @@ const uint8_t i8042_detranslation[256] = {
 	0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0xFa, 0xFb, 0xFc, 0xFd, 0xFe, 0xFf
 };
 
+// FreeBSD VT kbdmap key str => Xorg keysym value Table ---------------------
 struct kbdmap_define {
 	char keyname[8];
 	char lockstate;
@@ -73,10 +76,10 @@ struct kbdmap_define kbdmaps[] = {
 	{"rshift",	'O', {0xffe2,      0,      0}},	/* Right shift */
 	{"lctrl",	'O', {0xffe3,      0,      0}},	/* Left control */
 	{"ctrl",	'O', {0xffe3,      0,      0}},	/* Left control (alias name) */
-	{"rctrl",	'O', {     0,      0, 0xffe4}}, /* Right control */
+	{"rctrl",	'O', {0xffe4,      0,      0}}, /* Right control */
 	{"lalt",	'O', {0xffe9,      0,      0}},	/* Left alt */
 	{"alt",		'O', {0xffe9,      0,      0}},	/* Left alt (alias name) */
-	{"ralt",	'O', {     0,      0, 0xffea}}, /* Right alt */
+	{"ralt",	'O', {0xffea,      0,      0}}, /* Right alt */
 	{"fkey01",	'O', {0xffbe,      0,      0}},	/* F1 */
 	{"fkey02",	'O', {0xffbf,      0,      0}},	/* F2 */
 	{"fkey03",	'O', {0xffc0,      0,      0}},	/* F3 */
@@ -92,21 +95,33 @@ struct kbdmap_define kbdmaps[] = {
 	{"del",		'O', {0xffff,      0,      0}},	/* Del */
 	{"slock",	'O', {0xff14,      0,      0}},	/* ScrollLock */
 	{"nlock",	'O', {0xff7f,      0,      0}}, /* NumLock */
-	{"fkey49",	'N', {0xff95, 0xffb7, 0xff50}}, /* Kyepad home / Keypad 7 / Grey Home */
-	{"fkey50",	'N', {0xff97, 0xffb8, 0xff52}}, /* Keypad up arrow / Keypad 8 / Grey Up arrow */
-	{"fkey51",	'N', {0xff9a, 0xffb9, 0xff55}}, /* Keypad PgUp / Keypad 9 / Grey PgUp*/
+	{"fkey49",	'N', {0xff95, 0xffb7,      0}}, /* Keypad home / Keypad 7 */
+	{"fkey49",	'O', {0xff50,      0,      0}}, /* Grey Home */
+	{"fkey50",	'N', {0xff97, 0xffb8,      0}}, /* Keypad up arrow / Keypad 8 */
+	{"fkey50",	'O', {0xff52,      0,      0}}, /* Grey Up arrow */
+	{"fkey51",	'N', {0xff9a, 0xffb9,      0}}, /* Keypad PgUp / Keypad 9 */
+	{"fkey51",	'O', {0xff55,      0,      0}}, /* Grey PgUp */
 	{"fkey52",	'N', {0xffad,      0,      0}}, /* Keypad minus */
-	{"fkey53",	'N', {0xff96, 0xffb4, 0xff51}}, /* Keypad left arrow / Keypad 4 / Grey Left Arrow*/
+	{"fkey53",	'N', {0xff96, 0xffb4,      0}}, /* Keypad left arrow / Keypad 4 */
+	{"fkey53",	'O', {0xff51,      0,      0}}, /* Grey Left Arrow */
 	{"fkey54",	'N', {0xffb5,      0,      0}}, /* Keypad 5 */
-	{"fkey55",	'N', {0xff98, 0xffb6, 0xff53}}, /* Keypad right arrow / Keypad 6 / Grey Right arrow */
+	{"fkey55",	'N', {0xff98, 0xffb6,      0}}, /* Keypad right arrow / Keypad 6 */
+	{"fkey55",	'O', {0xff53,      0,      0}}, /* Grey Right arrow */
 	{"fkey56",	'N', {0xffab,      0,      0}}, /* Keypad plus */
-	{"fkey57",	'N', {0xff9c, 0xffb1, 0xff57}}, /* Keypad end / Keypad 1 / Grey End */
-	{"fkey58",	'N', {0xff99, 0xffb2, 0xff54}}, /* Keypad down arrow / Keypad 2 / Grey Down arrow */
-	{"fkey59",	'N', {0xff9b, 0xffb3, 0xff56}}, /* Keypad PgDown / Keypad 3 / Grey PgDown */
-	{"fkey60",	'N', {0xff9e, 0xffb0, 0xff63}}, /* Keypad ins / Keypad 0 / Grey Ins */
+	{"fkey57",	'N', {0xff9c, 0xffb1,      0}}, /* Keypad end / Keypad 1 */
+	{"fkey57",	'O', {0xff57,      0,      0}}, /* Grey End */
+	{"fkey58",	'N', {0xff99, 0xffb2,      0}}, /* Keypad down arrow / Keypad 2 */
+	{"fkey58",	'O', {0xff54,      0,      0}}, /* Grey Down arrow */
+	{"fkey59",	'N', {0xff9b, 0xffb3,      0}}, /* Keypad PgDown / Keypad 3 */
+	{"fkey59",	'O', {0xff56,      0,      0}}, /* Grey PgDown */
+	{"fkey60",	'N', {0xff9e, 0xffb0,      0}}, /* Keypad ins / Keypad 0 */
+	{"fkey60",	'O', {0xff63,      0,      0}}, /* Grey Ins */
 	{"fkey61",	'N', {0xff9f,      0,      0}}, /* Keypad del */
+	{"fkey62",	'O', {0xffeb,      0,      0}},	/* Left Windows */
+	{"fkey63",	'O', {0xffec,      0,      0}},	/* Right Windows */
 	{"null",	'E', {     0,      0,      0}} 	/* Array Terminator */
 
+	// Non Use Keysym 
 	//{"fkey54",	'0', {0xff9d,      0,      0}}, /* Keypad empty */
 	//{"",	'0', 0xffaf}, 	/* Keypad slash */
 	//{"",	'0', 0xffaa}, 	/* Keypad asterisk */
@@ -114,193 +129,192 @@ struct kbdmap_define kbdmaps[] = {
 	//{"",	'0', 0xffe7, XXX}, Left meta */
 	//{"",	'0', 0xffe8, XXX}, Right meta */
 	//{"",	'0', 0xfe03}, 	/* AltGr */
-	//{"",	'0', 0xffeb}, 	/* Left Windows */
-	//{"",	'0', 0xffec}, 	/* Right Windows */
 };
 
 
+// Xorg-keysym & Keyboard ScanCode Table (default value is US keyboard layout.) --
 struct keytranslation {
 	uint16_t	keysym;
 	uint8_t		scancode;
 	uint8_t		prefix;
 	uint8_t		mode;
 	uint8_t		uscode;
+	char		comment[32];
 };
 
-
 struct keytranslation keytrans[] = {
 	/* 0x2* */
-	{  0x20, 0x29, 0x00, 0xff, 0x29},
-	{  0x21, 0x16, 0x00, 0xff, 0x16},
-	{  0x22, 0x52, 0x00, 0xff, 0x52},
-	{  0x23, 0x26, 0x00, 0xff, 0x26},
-	{  0x24, 0x25, 0x00, 0xff, 0x25},
-	{  0x25, 0x2e, 0x00, 0xff, 0x2e},
-	{  0x26, 0x3d, 0x00, 0xff, 0x3d},
-	{  0x27, 0x52, 0x00, 0xff, 0x52},
-	{  0x28, 0x46, 0x00, 0xff, 0x46},
-	{  0x29, 0x45, 0x00, 0xff, 0x45},
-	{  0x2a, 0x3e, 0x00, 0xff, 0x3e},
-	{  0x2b, 0x55, 0x00, 0xff, 0x55},
-	{  0x2c, 0x41, 0x00, 0xff, 0x41},
-	{  0x2d, 0x4e, 0x00, 0xff, 0x4e},
-	{  0x2e, 0x49, 0x00, 0xff, 0x49},
-	{  0x2f, 0x4a, 0x00, 0xff, 0x4a},
+	{  0x20, 0x29,    0, 0xff, 0x29, ""},
+	{  0x21, 0x16,    0, 0xff, 0x16, ""},
+	{  0x22, 0x52,    0, 0xff, 0x52, ""},
+	{  0x23, 0x26,    0, 0xff, 0x26, ""},
+	{  0x24, 0x25,    0, 0xff, 0x25, ""},
+	{  0x25, 0x2e,    0, 0xff, 0x2e, ""},
+	{  0x26, 0x3d,    0, 0xff, 0x3d, ""},
+	{  0x27, 0x52,    0, 0xff, 0x52, ""},
+	{  0x28, 0x46,    0, 0xff, 0x46, ""},
+	{  0x29, 0x45,    0, 0xff, 0x45, ""},
+	{  0x2a, 0x3e,    0, 0xff, 0x3e, ""},
+	{  0x2b, 0x55,    0, 0xff, 0x55, ""},
+	{  0x2c, 0x41,    0, 0xff, 0x41, ""},
+	{  0x2d, 0x4e,    0, 0xff, 0x4e, ""},
+	{  0x2e, 0x49,    0, 0xff, 0x49, ""},
+	{  0x2f, 0x4a,    0, 0xff, 0x4a, ""},
 	/* 0x3* */
-	{  0x30, 0x45, 0x00, 0xff, 0x45},
-	{  0x31, 0x16, 0x00, 0xff, 0x16},
-	{  0x32, 0x1e, 0x00, 0xff, 0x1e},
-	{  0x33, 0x26, 0x00, 0xff, 0x26},
-	{  0x34, 0x25, 0x00, 0xff, 0x25},
-	{  0x35, 0x2e, 0x00, 0xff, 0x2e},
-	{  0x36, 0x36, 0x00, 0xff, 0x36},
-	{  0x37, 0x3d, 0x00, 0xff, 0x3d},
-	{  0x38, 0x3e, 0x00, 0xff, 0x3e},
-	{  0x39, 0x46, 0x00, 0xff, 0x46},
-	{  0x3a, 0x4c, 0x00, 0xff, 0x4c},
-	{  0x3b, 0x4c, 0x00, 0xff, 0x4c},
-	{  0x3c, 0x41, 0x00, 0xff, 0x41},
-	{  0x3d, 0x55, 0x00, 0xff, 0x55},
-	{  0x3e, 0x49, 0x00, 0xff, 0x49},
-	{  0x3f, 0x4a, 0x00, 0xff, 0x4a},
+	{  0x30, 0x45,    0, 0xff, 0x45, ""},
+	{  0x31, 0x16,    0, 0xff, 0x16, ""},
+	{  0x32, 0x1e,    0, 0xff, 0x1e, ""},
+	{  0x33, 0x26,    0, 0xff, 0x26, ""},
+	{  0x34, 0x25,    0, 0xff, 0x25, ""},
+	{  0x35, 0x2e,    0, 0xff, 0x2e, ""},
+	{  0x36, 0x36,    0, 0xff, 0x36, ""},
+	{  0x37, 0x3d,    0, 0xff, 0x3d, ""},
+	{  0x38, 0x3e,    0, 0xff, 0x3e, ""},
+	{  0x39, 0x46,    0, 0xff, 0x46, ""},
+	{  0x3a, 0x4c,    0, 0xff, 0x4c, ""},
+	{  0x3b, 0x4c,    0, 0xff, 0x4c, ""},
+	{  0x3c, 0x41,    0, 0xff, 0x41, ""},
+	{  0x3d, 0x55,    0, 0xff, 0x55, ""},
+	{  0x3e, 0x49,    0, 0xff, 0x49, ""},
+	{  0x3f, 0x4a,    0, 0xff, 0x4a, ""},
 	/* 0x4* */
-	{  0x40, 0x1e, 0x00, 0xff, 0x1e},
-	{  0x41, 0x1c, 0x00, 0xff, 0x1c},
-	{  0x42, 0x32, 0x00, 0xff, 0x32},
-	{  0x43, 0x21, 0x00, 0xff, 0x21},
-	{  0x44, 0x23, 0x00, 0xff, 0x23},
-	{  0x45, 0x24, 0x00, 0xff, 0x24},
-	{  0x46, 0x2b, 0x00, 0xff, 0x2b},
-	{  0x47, 0x34, 0x00, 0xff, 0x34},
-	{  0x48, 0x33, 0x00, 0xff, 0x33},
-	{  0x49, 0x43, 0x00, 0xff, 0x43},
-	{  0x4a, 0x3b, 0x00, 0xff, 0x3b},
-	{  0x4b, 0x42, 0x00, 0xff, 0x42},
-	{  0x4c, 0x4b, 0x00, 0xff, 0x4b},
-	{  0x4d, 0x3a, 0x00, 0xff, 0x3a},
-	{  0x4e, 0x31, 0x00, 0xff, 0x31},
-	{  0x4f, 0x44, 0x00, 0xff, 0x44},
+	{  0x40, 0x1e,    0, 0xff, 0x1e, ""},
+	{  0x41, 0x1c,    0, 0xff, 0x1c, ""},
+	{  0x42, 0x32,    0, 0xff, 0x32, ""},
+	{  0x43, 0x21,    0, 0xff, 0x21, ""},
+	{  0x44, 0x23,    0, 0xff, 0x23, ""},
+	{  0x45, 0x24,    0, 0xff, 0x24, ""},
+	{  0x46, 0x2b,    0, 0xff, 0x2b, ""},
+	{  0x47, 0x34,    0, 0xff, 0x34, ""},
+	{  0x48, 0x33,    0, 0xff, 0x33, ""},
+	{  0x49, 0x43,    0, 0xff, 0x43, ""},
+	{  0x4a, 0x3b,    0, 0xff, 0x3b, ""},
+	{  0x4b, 0x42,    0, 0xff, 0x42, ""},
+	{  0x4c, 0x4b,    0, 0xff, 0x4b, ""},
+	{  0x4d, 0x3a,    0, 0xff, 0x3a, ""},
+	{  0x4e, 0x31,    0, 0xff, 0x31, ""},
+	{  0x4f, 0x44,    0, 0xff, 0x44, ""},
 	/* 0x5* */
-	{  0x50, 0x4d, 0x00, 0xff, 0x4d},
-	{  0x51, 0x15, 0x00, 0xff, 0x15},
-	{  0x52, 0x2d, 0x00, 0xff, 0x2d},
-	{  0x53, 0x1b, 0x00, 0xff, 0x1b},
-	{  0x54, 0x2c, 0x00, 0xff, 0x2c},
-	{  0x55, 0x3c, 0x00, 0xff, 0x3c},
-	{  0x56, 0x2a, 0x00, 0xff, 0x2a},
-	{  0x57, 0x1d, 0x00, 0xff, 0x1d},
-	{  0x58, 0x22, 0x00, 0xff, 0x22},
-	{  0x59, 0x35, 0x00, 0xff, 0x35},
-	{  0x5a, 0x1a, 0x00, 0xff, 0x1a},
-	{  0x5b, 0x54, 0x00, 0xff, 0x54},
-	{  0x5c, 0x5d, 0x00, 0xff, 0x5d},
-	{  0x5d, 0x5b, 0x00, 0xff, 0x5b},
-	{  0x5e, 0x36, 0x00, 0xff, 0x36},
-	{  0x5f, 0x4e, 0x00, 0xff, 0x4e},
+	{  0x50, 0x4d,    0, 0xff, 0x4d, ""},
+	{  0x51, 0x15,    0, 0xff, 0x15, ""},
+	{  0x52, 0x2d,    0, 0xff, 0x2d, ""},
+	{  0x53, 0x1b,    0, 0xff, 0x1b, ""},
+	{  0x54, 0x2c,    0, 0xff, 0x2c, ""},
+	{  0x55, 0x3c,    0, 0xff, 0x3c, ""},
+	{  0x56, 0x2a,    0, 0xff, 0x2a, ""},
+	{  0x57, 0x1d,    0, 0xff, 0x1d, ""},
+	{  0x58, 0x22,    0, 0xff, 0x22, ""},
+	{  0x59, 0x35,    0, 0xff, 0x35, ""},
+	{  0x5a, 0x1a,    0, 0xff, 0x1a, ""},
+	{  0x5b, 0x54,    0, 0xff, 0x54, ""},
+	{  0x5c, 0x5d,    0, 0xff, 0x5d, ""},
+	{  0x5d, 0x5b,    0, 0xff, 0x5b, ""},
+	{  0x5e, 0x36,    0, 0xff, 0x36, ""},
+	{  0x5f, 0x4e,    0, 0xff, 0x4e, ""},
 	/* 0x6* */
-	{  0x60, 0x0e, 0x00, 0xff, 0x0e},
-	{  0x61, 0x1c, 0x00, 0xff, 0x1c},
-	{  0x62, 0x32, 0x00, 0xff, 0x32},
-	{  0x63, 0x21, 0x00, 0xff, 0x21},
-	{  0x64, 0x23, 0x00, 0xff, 0x23},
-	{  0x65, 0x24, 0x00, 0xff, 0x24},
-	{  0x66, 0x2b, 0x00, 0xff, 0x2b},
-	{  0x67, 0x34, 0x00, 0xff, 0x34},
-	{  0x68, 0x33, 0x00, 0xff, 0x33},
-	{  0x69, 0x43, 0x00, 0xff, 0x43},
-	{  0x6a, 0x3b, 0x00, 0xff, 0x3b},
-	{  0x6b, 0x42, 0x00, 0xff, 0x42},
-	{  0x6c, 0x4b, 0x00, 0xff, 0x4b},
-	{  0x6d, 0x3a, 0x00, 0xff, 0x3a},
-	{  0x6e, 0x31, 0x00, 0xff, 0x31},
-	{  0x6f, 0x44, 0x00, 0xff, 0x44},
+	{  0x60, 0x0e,    0, 0xff, 0x0e, ""},
+	{  0x61, 0x1c,    0, 0xff, 0x1c, ""},
+	{  0x62, 0x32,    0, 0xff, 0x32, ""},
+	{  0x63, 0x21,    0, 0xff, 0x21, ""},
+	{  0x64, 0x23,    0, 0xff, 0x23, ""},
+	{  0x65, 0x24,    0, 0xff, 0x24, ""},
+	{  0x66, 0x2b,    0, 0xff, 0x2b, ""},
+	{  0x67, 0x34,    0, 0xff, 0x34, ""},
+	{  0x68, 0x33,    0, 0xff, 0x33, ""},
+	{  0x69, 0x43,    0, 0xff, 0x43, ""},
+	{  0x6a, 0x3b,    0, 0xff, 0x3b, ""},
+	{  0x6b, 0x42,    0, 0xff, 0x42, ""},
+	{  0x6c, 0x4b,    0, 0xff, 0x4b, ""},
+	{  0x6d, 0x3a,    0, 0xff, 0x3a, ""},
+	{  0x6e, 0x31,    0, 0xff, 0x31, ""},
+	{  0x6f, 0x44,    0, 0xff, 0x44, ""},
 	/* 0x7* */
-	{  0x70, 0x4d, 0x00, 0xff, 0x4d},
-	{  0x71, 0x15, 0x00, 0xff, 0x15},
-	{  0x72, 0x2d, 0x00, 0xff, 0x2d},
-	{  0x73, 0x1b, 0x00, 0xff, 0x1b},
-	{  0x74, 0x2c, 0x00, 0xff, 0x2c},
-	{  0x75, 0x3c, 0x00, 0xff, 0x3c},
-	{  0x76, 0x2a, 0x00, 0xff, 0x2a},
-	{  0x77, 0x1d, 0x00, 0xff, 0x1d},
-	{  0x78, 0x22, 0x00, 0xff, 0x22},
-	{  0x79, 0x35, 0x00, 0xff, 0x35},
-	{  0x7a, 0x1a, 0x00, 0xff, 0x1a},
-	{  0x7b, 0x54, 0x00, 0xff, 0x54},
-	{  0x7c, 0x5d, 0x00, 0xff, 0x5d},
-	{  0x7d, 0x5b, 0x00, 0xff, 0x5b},
-	{  0x7e, 0x0e, 0x00, 0xff, 0x0e},
-	/*{  0x7f, 0x00, 0x00, 0xff, 0x00}, */
+	{  0x70, 0x4d,    0, 0xff, 0x4d, ""},
+	{  0x71, 0x15,    0, 0xff, 0x15, ""},
+	{  0x72, 0x2d,    0, 0xff, 0x2d, ""},
+	{  0x73, 0x1b,    0, 0xff, 0x1b, ""},
+	{  0x74, 0x2c,    0, 0xff, 0x2c, ""},
+	{  0x75, 0x3c,    0, 0xff, 0x3c, ""},
+	{  0x76, 0x2a,    0, 0xff, 0x2a, ""},
+	{  0x77, 0x1d,    0, 0xff, 0x1d, ""},
+	{  0x78, 0x22,    0, 0xff, 0x22, ""},
+	{  0x79, 0x35,    0, 0xff, 0x35, ""},
+	{  0x7a, 0x1a,    0, 0xff, 0x1a, ""},
+	{  0x7b, 0x54,    0, 0xff, 0x54, ""},
+	{  0x7c, 0x5d,    0, 0xff, 0x5d, ""},
+	{  0x7d, 0x5b,    0, 0xff, 0x5b, ""},
+	{  0x7e, 0x0e,    0, 0xff, 0x0e, ""},
+	/*{  0x7f,    0,    0, 0xff,    0}, */
 
 	/* Functional Key --------------- */
-	{0xff08, 0x66, 0x00, 0xff, 0x66},	/* Back space */
-	{0xff09, 0x0d, 0x00, 0xff, 0x0d},	/* Tab */
-	{0xff0d, 0x5a, 0x00, 0xff, 0x5a},	/* Return */
-	{0xff1b, 0x76, 0x00, 0xff, 0x76},	/* Escape */
-	{0xff50, 0x6c, 0xe0, 0xff, 0x6c}, 	/* Home */
-	{0xff51, 0x6b, 0xe0, 0xff, 0x6b}, 	/* Left arrow */
-	{0xff52, 0x75, 0xe0, 0xff, 0x75}, 	/* Up arrow */
-	{0xff53, 0x74, 0xe0, 0xff, 0x74}, 	/* Right arrow */
-	{0xff54, 0x72, 0xe0, 0xff, 0x72}, 	/* Down arrow */
-	{0xff55, 0x7d, 0xe0, 0xff, 0x7d}, 	/* PgUp */
-	{0xff56, 0x7a, 0xe0, 0xff, 0x7a}, 	/* PgDown */
-	{0xff57, 0x69, 0xe0, 0xff, 0x69}, 	/* End */
-	{0xff63, 0x70, 0xe0, 0xff, 0x70}, 	/* Ins */
-	{0xff8d, 0x5a, 0xe0, 0xff, 0x5a}, 	/* Keypad Enter */
-	{0xffe1, 0x12, 0x00, 0xff, 0x12},	/* Left shift */
-	{0xffe2, 0x59, 0x00, 0xff, 0x59},	/* Right shift */
-	{0xffe3, 0x14, 0x00, 0xff, 0x14},	/* Left control */
-	{0xffe4, 0x14, 0xe0, 0xff, 0x14}, 	/* Right control */
-	/* {0xffe7, XXX}, Left meta */
-	/* {0xffe8, XXX}, Right meta */
-	{0xffe9, 0x11, 0x00, 0xff, 0x11},	/* Left alt */
-	{0xfe03, 0x11, 0xe0, 0xff, 0x11}, 	/* AltGr */
-	{0xffea, 0x11, 0xe0, 0xff, 0x11}, 	/* Right alt */
-	{0xffeb, 0x1f, 0xe0, 0xff, 0x1f}, 	/* Left Windows */
-	{0xffec, 0x27, 0xe0, 0xff, 0x27}, 	/* Right Windows */
-	{0xffbe, 0x05, 0x00, 0xff, 0x05},	/* F1 */
-	{0xffbf, 0x06, 0x00, 0xff, 0x06},	/* F2 */
-	{0xffc0, 0x04, 0x00, 0xff, 0x04},	/* F3 */
-	{0xffc1, 0x0c, 0x00, 0xff, 0x0c},	/* F4 */
-	{0xffc2, 0x03, 0x00, 0xff, 0x03},	/* F5 */
-	{0xffc3, 0x0b, 0x00, 0xff, 0x0b},	/* F6 */
-	{0xffc4, 0x83, 0x00, 0xff, 0x83},	/* F7 */
-	{0xffc5, 0x0a, 0x00, 0xff, 0x0a},	/* F8 */
-	{0xffc6, 0x01, 0x00, 0xff, 0x01},	/* F9 */
-	{0xffc7, 0x09, 0x00, 0xff, 0x09},	/* F10 */
-	{0xffc8, 0x78, 0x00, 0xff, 0x78},	/* F11 */
-	{0xffc9, 0x07, 0x00, 0xff, 0x07},	/* F12 */
-	{0xffff, 0x71, 0xe0, 0xff, 0x71},	/* Del */
-	{0xff14, 0x7e, 0x00, 0xff, 0x7e},	/* ScrollLock */
+	{0xff08, 0x66,    0, 0xff, 0x66, "Back space"},
+	{0xff09, 0x0d,    0, 0xff, 0x0d, "Tab"},
+	{0xff0d, 0x5a,    0, 0xff, 0x5a, "Return"},
+	{0xff1b, 0x76,    0, 0xff, 0x76, "Escape"},
+	{0xff50, 0x6c, 0xe0, 0xff, 0x6c, "Home"},
+	{0xff51, 0x6b, 0xe0, 0xff, 0x6b, "Left arrow"},
+	{0xff52, 0x75, 0xe0, 0xff, 0x75, "Up arrow"},
+	{0xff53, 0x74, 0xe0, 0xff, 0x74, "Right arrow"},
+	{0xff54, 0x72, 0xe0, 0xff, 0x72, "Down arrow"},
+	{0xff55, 0x7d, 0xe0, 0xff, 0x7d, "PgUp"},
+	{0xff56, 0x7a, 0xe0, 0xff, 0x7a, "PgDown"},
+	{0xff57, 0x69, 0xe0, 0xff, 0x69, "End"},
+	{0xff63, 0x70, 0xe0, 0xff, 0x70, "Ins"},
+	{0xff8d, 0x5a, 0xe0, 0xff, 0x5a, "Keypad Enter"},
+	{0xffe1, 0x12,    0, 0xff, 0x12, "Left shift"},
+	{0xffe2, 0x59,    0, 0xff, 0x59, "Right shift"},
+	{0xffe3, 0x14,    0, 0xff, 0x14, "Left control"},
+	{0xffe4, 0x14, 0xe0, 0xff, 0x14, "Right control"},
+/*	{0xffe7,    0,    0, 0xff,    0, XXX}, Left meta */
+/*	{0xffe8,    0,    0, 0xff,    0, XXX}, Right meta */
+	{0xffe9, 0x11,    0, 0xff, 0x11, "Left alt"},
+	{0xfe03, 0x11, 0xe0, 0xff, 0x11, "AltGr"},
+	{0xffea, 0x11, 0xe0, 0xff, 0x11, "Right alt"},
+	{0xffeb, 0x1f, 0xe0, 0xff, 0x1f, "Left Windows"},
+	{0xffec, 0x27, 0xe0, 0xff, 0x27, "Right Windows"},
+	{0xffbe, 0x05,    0, 0xff, 0x05, "F1"},
+	{0xffbf, 0x06,    0, 0xff, 0x06, "F2"},
+	{0xffc0, 0x04,    0, 0xff, 0x04, "F3"},
+	{0xffc1, 0x0c,    0, 0xff, 0x0c, "F4"},
+	{0xffc2, 0x03,    0, 0xff, 0x03, "F5"},
+	{0xffc3, 0x0b,    0, 0xff, 0x0b, "F6"},
+	{0xffc4, 0x83,    0, 0xff, 0x83, "F7"},
+	{0xffc5, 0x0a,    0, 0xff, 0x0a, "F8"},
+	{0xffc6, 0x01,    0, 0xff, 0x01, "F9"},
+	{0xffc7, 0x09,    0, 0xff, 0x09, "F10"},
+	{0xffc8, 0x78,    0, 0xff, 0x78, "F11"},
+	{0xffc9, 0x07,    0, 0xff, 0x07, "F12"},
+	{0xffff, 0x71, 0xe0, 0xff, 0x71, "Del"},
+	{0xff14, 0x7e,    0, 0xff, 0x7e, "ScrollLock"},
 	/* NumLock and Keypads -----------*/
-	{0xff7f, 0x77, 0x00, 0xff, 0x77}, 	/* NumLock */
-	{0xffaf, 0x4a, 0xe0, 0xff, 0x4a}, 	/* Keypad slash */
-	{0xffaa, 0x7c, 0x00, 0xff, 0x7c}, 	/* Keypad asterisk */
-	{0xffad, 0x7b, 0x00, 0xff, 0x7b}, 	/* Keypad minus */
-	{0xffab, 0x79, 0x00, 0xff, 0x79}, 	/* Keypad plus */
-	{0xffb7, 0x6c, 0x00, 0xff, 0x6c}, 	/* Keypad 7 */
-	{0xff95, 0x6c, 0x00, 0xff, 0x6c}, 	/* Keypad home */
-	{0xffb8, 0x75, 0x00, 0xff, 0x75}, 	/* Keypad 8 */
-	{0xff97, 0x75, 0x00, 0xff, 0x75}, 	/* Keypad up arrow */
-	{0xffb9, 0x7d, 0x00, 0xff, 0x7d}, 	/* Keypad 9 */
-	{0xff9a, 0x7d, 0x00, 0xff, 0x7d}, 	/* Keypad PgUp */
-	{0xffb4, 0x6b, 0x00, 0xff, 0x6b}, 	/* Keypad 4 */
-	{0xff96, 0x6b, 0x00, 0xff, 0x6b}, 	/* Keypad left arrow */
-	{0xffb5, 0x73, 0x00, 0xff, 0x73}, 	/* Keypad 5 */
-	{0xff9d, 0x73, 0x00, 0xff, 0x73}, 	/* Keypad empty */
-	{0xffb6, 0x74, 0x00, 0xff, 0x74}, 	/* Keypad 6 */
-	{0xff98, 0x74, 0x00, 0xff, 0x74}, 	/* Keypad right arrow */
-	{0xffb1, 0x69, 0x00, 0xff, 0x69}, 	/* Keypad 1 */
-	{0xff9c, 0x69, 0x00, 0xff, 0x69}, 	/* Keypad end */
-	{0xffb2, 0x72, 0x00, 0xff, 0x72}, 	/* Keypad 2 */
-	{0xff99, 0x72, 0x00, 0xff, 0x72}, 	/* Keypad down arrow */
-	{0xffb3, 0x7a, 0x00, 0xff, 0x7a}, 	/* Keypad 3 */
-	{0xff9b, 0x7a, 0x00, 0xff, 0x7a}, 	/* Keypad PgDown */
-	{0xffb0, 0x70, 0x00, 0xff, 0x70}, 	/* Keypad 0 */
-	{0xff9e, 0x70, 0x00, 0xff, 0x70}, 	/* Keypad ins */
-	{0xffae, 0x71, 0x00, 0xff, 0x71}, 	/* Keypad . */
-	{0xff9f, 0x71, 0x00, 0xff, 0x71}, 	/* Keypad del */
-	{     0,    0,    0, 0xff,    0}	/* Terminator */
+	{0xff7f, 0x77,    0, 0xff, 0x77, "NumLock"},
+	{0xffaf, 0x4a, 0xe0, 0xff, 0x4a, "Keypad slash"},
+	{0xffaa, 0x7c,    0, 0xff, 0x7c, "Keypad asterisk"},
+	{0xffad, 0x7b,    0, 0xff, 0x7b, "Keypad minus"},
+	{0xffab, 0x79,    0, 0xff, 0x79, "Keypad plus"},
+	{0xffb7, 0x6c,    0, 0xff, 0x6c, "Keypad 7"},
+	{0xff95, 0x6c,    0, 0xff, 0x6c, "Keypad home"},
+	{0xffb8, 0x75,    0, 0xff, 0x75, "Keypad 8"},
+	{0xff97, 0x75,    0, 0xff, 0x75, "Keypad up arrow"},
+	{0xffb9, 0x7d,    0, 0xff, 0x7d, "Keypad 9"},
+	{0xff9a, 0x7d,    0, 0xff, 0x7d, "Keypad PgUp"},
+	{0xffb4, 0x6b,    0, 0xff, 0x6b, "Keypad 4"},
+	{0xff96, 0x6b,    0, 0xff, 0x6b, "Keypad left arrow"},
+	{0xffb5, 0x73,    0, 0xff, 0x73, "Keypad 5"},
+	{0xff9d, 0x73,    0, 0xff, 0x73, "Keypad empty"},
+	{0xffb6, 0x74,    0, 0xff, 0x74, "Keypad 6"},
+	{0xff98, 0x74,    0, 0xff, 0x74, "Keypad right arrow"},
+	{0xffb1, 0x69,    0, 0xff, 0x69, "Keypad 1"},
+	{0xff9c, 0x69,    0, 0xff, 0x69, "Keypad end"},
+	{0xffb2, 0x72,    0, 0xff, 0x72, "Keypad 2"},
+	{0xff99, 0x72,    0, 0xff, 0x72, "Keypad down arrow"},
+	{0xffb3, 0x7a,    0, 0xff, 0x7a, "Keypad 3"},
+	{0xff9b, 0x7a,    0, 0xff, 0x7a, "Keypad PgDown"},
+	{0xffb0, 0x70,    0, 0xff, 0x70, "Keypad 0"},
+	{0xff9e, 0x70,    0, 0xff, 0x70, "Keypad ins"},
+	{0xffae, 0x71,    0, 0xff, 0x71, "Keypad ."},
+	{0xff9f, 0x71,    0, 0xff, 0x71, "Keypad del"},
+	{     0,    0,    0, 0xff,    0, "(Terminator)"}
 };
 
 
@@ -319,8 +333,6 @@ int parseline(int *scancode, char keyname[][8], char *lockstate, char *line)
 	if (sscanf((line + 2), "%3d", scancode) != 1)
 		return 3;
 
-	//printf(" test %3d: ", *scancode);
-
 	for(cnt = 0; cnt < 8; cnt++) {
 		start = line + 8 + (cnt * 7);
 		start[6] = '\0';
@@ -331,15 +343,11 @@ int parseline(int *scancode, char keyname[][8], char *lockstate, char *line)
 			keyname[cnt][2] = '\'';
 			keyname[cnt][3] = '\0';
 		}
-		else {
+		else
 			sscanf(start, "%6s", keyname[cnt]);
-		}
-
-		//printf( "[%d] %6s ", cnt, keyname[cnt]);
 	}
 
 	*lockstate = line[65];
-	//printf( "%c\n", *lockstate);
 
 	return 0;
 }
@@ -347,46 +355,67 @@ int parseline(int *scancode, char keyname[][8], char *lockstate, char *line)
 
 uint16_t get_orig_scancode( int scancode )
 {
+	uint16_t prefix = 0;
 	uint16_t origcode = 0;
 
 	if (scancode >= 256)
 		return origcode;
 
-	origcode = i8042_detranslation[scancode];
-	
 	switch (scancode) {
-		case 0x1C:		/* right enter key */
-		case 0x1D:		/* right ctrl key */
-		case 0x35:		/* keypad divide key */
-		case 0x37:		/* print scrn key */
-		case 0x38:		/* right alt key (alt gr) */
+		case 0x59:		/* right enter key */
+			scancode = 0x1C; prefix = 0xE000; break;
+		case 0x5A:		/* right ctrl key */
+			scancode = 0x1D; prefix = 0xE000; break;
+		case 0x5B:		/* keypad divide key */
+			scancode = 0x35; prefix = 0xE000; break;
+		case 0x5C:		/* print scrn key */
+			scancode = 0x37; prefix = 0xE000; break;
+		case 0x5D:		/* right alt key (alt gr) */
+			scancode = 0x38; prefix = 0xE000; break;
 		//case 0x68:	/* ctrl-pause/break on AT 101 */
-		case 0x47:		/* grey home key */
-		case 0x48:		/* grey up arrow key */
-		case 0x49:		/* grey page up key */
-		case 0x4B:		/* grey left arrow key */
-		case 0x4D:		/* grey right arrow key */
-		case 0x4F:		/* grey end key */
-		case 0x50:		/* grey down arrow key */
-		case 0x51:		/* grey page down key */
-		case 0x52:		/* grey insert key */
-		case 0x53:		/* grey delete key */
-		case 0x5B:		/* left Window key */
-		case 0x5C:		/* right Window key */
-		case 0x5D:		/* menu key */
-		case 0x5E:		/* power key */
-		case 0x5F:		/* sleep key */
-		case 0x63:		/* wake key */
-			origcode = 0xE000 | origcode;	break;
+		case 0x5E:		/* grey home key */
+			scancode = 0x47; prefix = 0xE000; break;
+		case 0x5F:		/* grey up arrow key */
+			scancode = 0x48; prefix = 0xE000; break;
+		case 0x60:		/* grey page up key */
+			scancode = 0x49; prefix = 0xE000; break;
+		case 0x61:		/* grey left arrow key */
+			scancode = 0x4B; prefix = 0xE000; break;
+		case 0x62:		/* grey right arrow key */
+			scancode = 0x4D; prefix = 0xE000; break;
+		case 0x63:		/* grey end key */
+			scancode = 0x4F; prefix = 0xE000; break;
+		case 0x64:		/* grey down arrow key */
+			scancode = 0x50; prefix = 0xE000; break;
+		case 0x65:		/* grey page down key */
+			scancode = 0x51; prefix = 0xE000; break;
+		case 0x66:		/* grey insert key */
+			scancode = 0x52; prefix = 0xE000; break;
+		case 0x67:		/* grey delete key */
+			scancode = 0x53; prefix = 0xE000; break;
+		case 0x69:		/* left Window key */
+			scancode = 0x5B; prefix = 0xE000; break;
+		case 0x6A:		/* right Window key */
+			scancode = 0x5C; prefix = 0xE000; break;
+		case 0x6B:		/* menu key */
+			scancode = 0x5D; prefix = 0xE000; break;
+		case 0x6D:		/* power key */
+			scancode = 0x5E; prefix = 0xE000; break;
+		case 0x6E:		/* sleep key */
+			scancode = 0x5F; prefix = 0xE000; break;
+		case 0x6F:		/* wake key */
+			scancode = 0x63; prefix = 0xE000; break;
 		default:
 			break;
 	}
-
+	
+	origcode = i8042_detranslation[scancode] | prefix;
+	
 	return origcode;
 }
 
 
-int get_keysym(uint16_t keysym[3], char *keyname, char lockstate)
+int get_keysym(uint16_t keysym[3], char *keyname, char lockstate, uint16_t scancode)
 {
 	struct kbdmap_define *maptbl;
 
@@ -400,12 +429,23 @@ int get_keysym(uint16_t keysym[3], char *keyname, char lockstate)
 
 	if ((keyname[0] == '\'') && (keyname[2] == '\'') && (keyname[3] == '\0')) {
 		keysym[0] = (uint16_t)keyname[1];
+
+		/* Keypad * */
+		if ((keysym[0] == '*') && (scancode == 0x7c))
+			keysym[0] = 0xffaa;
+		/* Keypad / */
+		else if ((keysym[0] == '/') && (scancode == 0x4a))
+			keysym[0] = 0xffaf;
+		/* Keypad . */
+		else if ((keysym[0] == '.') && (scancode == 0x71))
+			keysym[0] = 0xffae;
+
 		return 1;
 	}
 
 	maptbl = kbdmaps;
 	do {
-		if ((!strncmp(maptbl->keyname, keyname, 7)) && (maptbl->lockstate == lockstate)) {
+		if (!strncmp(maptbl->keyname, keyname, 7)) {
 			keysym[0] = maptbl->keysym[0];
 			keysym[1] = maptbl->keysym[1];
 			keysym[2] = maptbl->keysym[2];
@@ -417,7 +457,7 @@ int get_keysym(uint16_t keysym[3], char *keyname, char lockstate)
 }
 
 
-int update_keytranslation( uint16_t keysym, uint16_t origcode, uint8_t mode, uint8_t flag)
+int update_keytranslation( uint16_t keysym, uint16_t origcode, uint8_t mode)
 {
 	uint8_t scancode;
 	uint8_t prefix;
@@ -436,16 +476,9 @@ int update_keytranslation( uint16_t keysym, uint16_t origcode, uint8_t mode, uin
 
 		if (trans->mode <= mode)
 			continue;
-		/*
-		else if (trans->mode == mode) {
-			if (trans->scancode < scancode)
-				continue;
-		}
-		*/
 
-		//printf(" %02x: %02x %02x %d\n", keysym, scancode, prefix, mode );
 		trans->scancode =scancode;
-		trans->prefix = prefix & flag;
+		trans->prefix = prefix;
 		trans->mode = mode;
 		break;
 
@@ -474,8 +507,12 @@ int output_keytranslation(void)
 			else
 				printf(";\t");
 
-			// for Debug
-			printf(" mode=%x us=%x %x\n", trans->mode, trans->uscode, trans->keysym );
+			if(trans->keysym < 0x80)
+				printf("%c  (0x%02x)\n",
+						(unsigned char)(trans->keysym & 0x00ff),
+						(unsigned char)(trans->keysym & 0x00ff));
+			else
+				printf("%s\n", trans->comment);
 		}
 
 	} while( (++trans)->keysym != 0);
@@ -486,20 +523,17 @@ int output_keytranslation(void)
 
 int main( int argc, char *argv[] )
 {
-	int err;
+	int err, fd, cnt, scancode;
 	int ret = 0;
-	int fd;
 	char *buf, *next, *line;
-	int scancode;
 	char lockstate;
 	char keyname[8][8];
 	struct stat	sb;
 	size_t sz;
 	uint16_t origcode;
-	int cnt;
 	uint16_t keysym[3];
 
-	if( 3 != argc )
+	if( 2 != argc )
 		return 1;
 	
 	err = stat(argv[1], &sb);
@@ -535,27 +569,21 @@ int main( int argc, char *argv[] )
 			origcode = get_orig_scancode(scancode);
 
 			// alt ---
-			cnt = get_keysym(keysym, keyname[4], lockstate);
+			cnt = get_keysym(keysym, keyname[4], lockstate, origcode);
 			for( --cnt; cnt >= 0; cnt-- )
-				update_keytranslation( keysym[cnt], origcode, (uint8_t)4, ((cnt==2) ? 0xff: 0x00));
+				update_keytranslation( keysym[cnt], origcode, (uint8_t)4);
 
 			// shift ---
-			cnt = get_keysym(keysym, keyname[1], lockstate);
+			cnt = get_keysym(keysym, keyname[1], lockstate, origcode);
 			for( --cnt; cnt >= 0; cnt-- )
-				update_keytranslation( keysym[cnt], origcode, (uint8_t)1, ((cnt==2) ? 0xff: 0x00));
+				update_keytranslation( keysym[cnt], origcode, (uint8_t)1);
 
 			// base ---
-			cnt = get_keysym(keysym, keyname[0], lockstate);
+			cnt = get_keysym(keysym, keyname[0], lockstate, origcode);
 			for( --cnt; cnt >= 0; cnt-- )
-				update_keytranslation( keysym[cnt], origcode, (uint8_t)0, ((cnt==2) ? 0xff: 0x00));
-
-
-			//printf(" %2d -> %04x  %7s[%4x : %4x : %4x] %c\n",
-					//scancode, origcode,
-					//keyname[0], keysym[0], keysym[1], keysym[2], lockstate);
+				update_keytranslation( keysym[cnt], origcode, (uint8_t)0);
 		}
 	}
-	
 
 	output_keytranslation();
 
@@ -565,4 +593,3 @@ post:
 	return ret;
 }
 
-