--- linux_n1/drivers/char/spitz_keymap.c~saner-spitz-keymap 2005-05-04 09:24:39.039602352 +0100 +++ linux_n1/drivers/char/spitz_keymap.c 2005-05-04 09:45:48.879557336 +0100 @@ -10,7 +10,7 @@ 0xf200, 0xfb61, 0xfb62, 0xfb63, 0xfb64, 0xfb65, 0xfb66, 0xfb67, 0xfb68, 0xfb69, 0xfb6a, 0xfb6b, 0xfb6c, 0xfb6d, 0xfb6e, 0xfb6f, 0xfb70, 0xfb71, 0xfb72, 0xfb73, 0xfb74, 0xfb75, 0xfb76, 0xfb77, - 0xfb78, 0xfb79, 0xfb7a, 0xf700, 0xf201, 0xf101, 0xf703, 0xf008, + 0xfb78, 0xfb79, 0xfb7a, 0xf700, 0xf201, 0xf10a, 0xf701, 0xf008, 0xf208, 0xf200, 0xf01b, 0xf601, 0xf603, 0xf600, 0xf602, 0xf201, 0xf200, 0xf031, 0xf032, 0xf033, 0xf034, 0xf035, 0xf036, 0xf037, 0xf038, 0xf039, 0xf030, 0xf02d, 0xf05e, 0xf05c, 0xf05b, 0xf040, @@ -18,7 +18,7 @@ 0xf200, 0xf009, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf301, 0xf302, 0xf303, 0xf304, 0xf305, 0xf306, 0xf307, 0xf308, 0xf309, 0xf300, 0xf07f, 0xf30d, 0xf30c, 0xf201, 0xf30b, 0xf30a, 0xf30e, - 0xf702, 0xf703, 0xf01b, 0xf200, 0xf020, 0xf310, 0xf200, 0xf03b, + 0xf108, 0xf109, 0xf10c, 0xf200, 0xf020, 0xf310, 0xf200, 0xf03b, 0xf03a, 0xf05d, 0xf02c, 0xf02e, 0xf02f, 0xf05f, 0xf200, 0xf02e, 0xf114, 0xf117, 0xf118, 0xf119, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf702, 0xf200, 0xf200, @@ -29,7 +29,7 @@ 0xf200, 0xfb41, 0xfb42, 0xfb43, 0xfb44, 0xfb45, 0xfb46, 0xfb47, 0xfb48, 0xfb49, 0xfb4a, 0xfb4b, 0xfb4c, 0xfb4d, 0xfb4e, 0xfb4f, 0xfb50, 0xfb51, 0xfb52, 0xfb53, 0xfb54, 0xfb55, 0xfb56, 0xfb57, - 0xfb58, 0xfb59, 0xfb5a, 0xf700, 0xf201, 0xf101, 0xf703, 0xf008, + 0xfb58, 0xfb59, 0xfb5a, 0xf700, 0xf201, 0xf10a, 0xf701, 0xf008, 0xf208, 0xf200, 0xf01b, 0xf601, 0xf603, 0xf600, 0xf602, 0xf201, 0xf200, 0xf021, 0xf022, 0xf023, 0xf024, 0xf025, 0xf026, 0xf027, 0xf028, 0xf029, 0xf07e, 0xf03d, 0xf07e, 0xf07c, 0xf07b, 0xf060, @@ -37,7 +37,7 @@ 0xf200, 0xf009, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf301, 0xf302, 0xf303, 0xf304, 0xf305, 0xf306, 0xf307, 0xf308, 0xf309, 0xf300, 0xf07f, 0xf30d, 0xf30c, 0xf201, 0xf30b, 0xf30a, 0xf30e, - 0xf702, 0xf703, 0xf01b, 0xf200, 0xf020, 0xf310, 0xf200, 0xf02b, + 0xf108, 0xf109, 0xf10c, 0xf200, 0xf020, 0xf310, 0xf200, 0xf02b, 0xf02a, 0xf07d, 0xf03c, 0xf03e, 0xf03f, 0xf05f, 0xf200, 0xf03f, 0xf114, 0xf117, 0xf20b, 0xf20a, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf702, 0xf200, 0xf200, @@ -48,7 +48,7 @@ 0xf200, 0xf001, 0xf002, 0xf003, 0xf004, 0xf005, 0xf006, 0xf007, 0xf008, 0xf009, 0xf00a, 0xf00b, 0xf00c, 0xf00d, 0xf00e, 0xf00f, 0xf010, 0xf011, 0xf012, 0xf013, 0xf014, 0xf015, 0xf016, 0xf017, - 0xf018, 0xf019, 0xf01a, 0xf700, 0xf201, 0xf101, 0xf703, 0xf008, + 0xf018, 0xf019, 0xf01a, 0xf700, 0xf201, 0xf10a, 0xf701, 0xf008, 0xf208, 0xf200, 0xf01b, 0xf601, 0xf603, 0xf600, 0xf602, 0xf201, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, @@ -56,7 +56,7 @@ 0xf200, 0xf009, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf301, 0xf302, 0xf303, 0xf304, 0xf305, 0xf306, 0xf307, 0xf308, 0xf309, 0xf300, 0xf07f, 0xf30d, 0xf30c, 0xf201, 0xf30b, 0xf30a, 0xf30e, - 0xf702, 0xf703, 0xf01b, 0xf200, 0xf020, 0xf310, 0xf200, 0xf200, + 0xf108, 0xf109, 0xf10c, 0xf200, 0xf020, 0xf310, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf114, 0xf117, 0xf118, 0xf119, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf702, 0xf200, 0xf200, @@ -67,7 +67,7 @@ 0xf200, 0xf001, 0xf002, 0xf003, 0xf004, 0xf005, 0xf006, 0xf007, 0xf008, 0xf009, 0xf00a, 0xf00b, 0xf00c, 0xf00d, 0xf00e, 0xf00f, 0xf010, 0xf011, 0xf012, 0xf013, 0xf014, 0xf015, 0xf016, 0xf017, - 0xf018, 0xf019, 0xf01a, 0xf700, 0xf201, 0xf101, 0xf703, 0xf008, + 0xf018, 0xf019, 0xf01a, 0xf700, 0xf201, 0xf10a, 0xf701, 0xf008, 0xf208, 0xf200, 0xf01b, 0xf601, 0xf603, 0xf600, 0xf602, 0xf201, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, @@ -75,18 +75,18 @@ 0xf200, 0xf009, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf301, 0xf302, 0xf303, 0xf304, 0xf305, 0xf306, 0xf307, 0xf308, 0xf309, 0xf300, 0xf07f, 0xf30d, 0xf30c, 0xf201, 0xf30b, 0xf30a, 0xf30e, - 0xf702, 0xf703, 0xf01b, 0xf200, 0xf020, 0xf310, 0xf200, 0xf200, + 0xf108, 0xf109, 0xf10c, 0xf200, 0xf020, 0xf310, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf114, 0xf117, 0xf118, 0xf119, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf702, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, }; -u_short alt_map[NR_KEYS] = { - 0xf200, 0xf861, 0xf05f, 0xf863, 0xf864, 0xf03d, 0xf05c, 0xf03b, - 0xf03a, 0xf869, 0xf02a, 0xf05c, 0xf07c, 0xf86d, 0xf86e, 0xf86f, - 0xf870, 0xf871, 0xf02b, 0xf873, 0xf05b, 0xf875, 0xf876, 0xf05e, - 0xf878, 0xf05d, 0xf87a, 0xf700, 0xf201, 0xf101, 0xf703, 0xf07f, +u_short altgr_map[NR_KEYS] = { + 0xf200, 0xfb61, 0xf05f, 0xfb63, 0xfb64, 0xf03d, 0xf05c, 0xf03b, + 0xf03a, 0xfb69, 0xf02a, 0xf05c, 0xf07c, 0xfb6d, 0xfb6e, 0xfb6f, + 0xfb70, 0xfb71, 0xf02b, 0xfb73, 0xf05b, 0xfb75, 0xfb76, 0xf05e, + 0xfb78, 0xf05d, 0xfb7a, 0xf700, 0xf201, 0xf10a, 0xf701, 0xf07f, 0xf208, 0xf200, 0xf01b, 0xf601, 0xf603, 0xf600, 0xf602, 0xf201, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, @@ -94,7 +94,7 @@ 0xf200, 0xf207, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf301, 0xf302, 0xf303, 0xf304, 0xf305, 0xf306, 0xf307, 0xf308, 0xf309, 0xf300, 0xf07f, 0xf30d, 0xf30c, 0xf201, 0xf30b, 0xf30a, 0xf30e, - 0xf702, 0xf703, 0xf01b, 0xf200, 0xf020, 0xf310, 0xf200, 0xf200, + 0xf108, 0xf109, 0xf10c, 0xf200, 0xf020, 0xf310, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf03e, 0xf114, 0xf117, 0xf118, 0xf119, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf702, 0xf200, 0xf200, @@ -102,9 +102,8 @@ }; ushort *key_maps[MAX_NR_KEYMAPS] = { - plain_map, shift_map, 0, 0, - ctrl_map, shift_ctrl_map, 0, 0, - alt_map, 0 + plain_map, shift_map, altgr_map, 0, + ctrl_map, shift_ctrl_map, 0 }; unsigned int keymap_count = 5; --- linux_n1/drivers/char/spitz_keymap.map~saner-spitz-keymap 2005-05-04 09:24:57.100856624 +0100 +++ linux_n1/drivers/char/spitz_keymap.map 2005-05-04 09:42:32.880353744 +0100 @@ -10,7 +10,7 @@ # 5 for [CTRL] [SHIFT] , to symbol input for debug # 8 for [ALT] # -keymaps 0,1,4,5,8 +keymaps 0,1,2,4,5 # # loadkeys --mktable iris_keymap.map # @@ -21,48 +21,48 @@ # keycode 1 = a keycode 2 = b - alt keycode 2 = underscore + altgr keycode 2 = underscore keycode 3 = c keycode 4 = d keycode 5 = e - alt keycode 5 = equal + altgr keycode 5 = equal keycode 6 = f - alt keycode 6 = backslash + altgr keycode 6 = backslash keycode 7 = g - alt keycode 7 = semicolon + altgr keycode 7 = semicolon keycode 8 = h - alt keycode 8 = colon + altgr keycode 8 = colon keycode 9 = i keycode 10 = j - alt keycode 10 = asterisk + altgr keycode 10 = asterisk keycode 11 = k - alt keycode 11 = backslash + altgr keycode 11 = backslash keycode 12 = l - alt keycode 12 = bar + altgr keycode 12 = bar keycode 13 = m keycode 14 = n keycode 15 = o keycode 16 = p keycode 17 = q keycode 18 = r - alt keycode 18 = plus + altgr keycode 18 = plus keycode 19 = s keycode 20 = t - alt keycode 20 = bracketleft + altgr keycode 20 = bracketleft keycode 21 = u keycode 22 = v keycode 23 = w - alt keycode 23 = asciicircum + altgr keycode 23 = asciicircum keycode 24 = x keycode 25 = y - alt keycode 25 = bracketright + altgr keycode 25 = bracketright keycode 26 = z keycode 27 = Shift keycode 28 = Return -keycode 29 = F2 -keycode 30 = Alt +keycode 29 = F11 +keycode 30 = AltGr keycode 31 = BackSpace - alt keycode 31 = Delete + altgr keycode 31 = Delete keycode 32 = Num_Lock keycode 34 = Escape keycode 35 = Left @@ -93,9 +93,9 @@ keycode 59 = minus at keycode 60 = Shift_Lock keycode 63 = comma slash - alt keycode 63 = less + altgr keycode 63 = less keycode 65 = Tab - alt keycode 65 = Caps_Lock + altgr keycode 65 = Caps_Lock keycode 71 = KP_1 keycode 72 = KP_2 keycode 73 = KP_3 @@ -113,11 +113,12 @@ keycode 85 = KP_Subtract keycode 86 = KP_Add keycode 87 = KP_Enter -# (Activity:88) -> Ctrl -keycode 88 = Control -# (Contacts:89) -> Alt -keycode 89 = Alt -keycode 90 = Escape +# (Activity:88) -> F9 +keycode 88 = F9 +# (Contacts:89) -> F10 +keycode 89 = F10 +# (Mail:90) -> F13 +keycode 90 = F13 keycode 92 = space keycode 93 = KP_Period keycode 94 = @@ -130,7 +131,7 @@ keycode 101 = underscore underscore keycode 102 = keycode 103 = period question - alt keycode 103 = greater + altgr keycode 103 = greater keycode 104 = Find keycode 105 = Select keycode 106 = Prior