From 201b26cf01cb25e974abdb0a93f5a7bcb0f8c631 Mon Sep 17 00:00:00 2001 From: mazze Date: Sun, 24 May 2009 19:49:12 +0000 Subject: [PATCH] Added some characters to the German keymap to be entered by or +. I've recorded to keys from my UAE installation and made only changes when the alternative character was printed on the keyboard's key. git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@31290 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- workbench/devs/keymaps/pc105_d.c | 96 +++++++++++++++++++------------------- workbench/devs/keymaps/pc105_d.txt | 13 ++++-- 2 files changed, 57 insertions(+), 52 deletions(-) diff --git a/workbench/devs/keymaps/pc105_d.c b/workbench/devs/keymaps/pc105_d.c index dc0e33936..f89b87f2f 100644 --- a/workbench/devs/keymaps/pc105_d.c +++ b/workbench/devs/keymaps/pc105_d.c @@ -66,12 +66,12 @@ CONST struct KeyMapNode km = STATIC CONST UBYTE lokeymaptypes[] = { S, /* 00 */ - S, /* 01 */ + S|A, /* 01 */ S|A, /* 02 */ S|A, /* 03 */ - S, /* 04 */ - S, /* 05 */ - S, /* 06 */ + S|A, /* 04 */ + S|A, /* 05 */ + S|A, /* 06 */ S|A, /* 07 */ S|A, /* 08 */ S|A, /* 09 */ @@ -91,7 +91,7 @@ STATIC CONST UBYTE lokeymaptypes[] = V, /* 17 i */ V, /* 18 o */ V, /* 19 p */ - S, /* 1A */ + S|A, /* 1A */ S|A, /* 1B */ S|A, /* 1C */ S|A, /* 1D */ @@ -106,8 +106,8 @@ STATIC CONST UBYTE lokeymaptypes[] = V, /* 26 j */ V, /* 27 k */ V, /* 28 l */ - S, /* 29 */ - S, /* 2A */ + S|A, /* 29 */ + S|A, /* 2A */ S, /* 2B */ N, /* 2C */ N, /* 2D */ @@ -123,7 +123,7 @@ STATIC CONST UBYTE lokeymaptypes[] = V, /* 37 m */ S|A, /* 38 */ S|A, /* 39 */ - S, /* 3A */ + S|A, /* 3A */ N, /* 3B */ N, /* 3C */ N, /* 3D */ @@ -230,7 +230,7 @@ STATIC CONST UBYTE key0b_descr[] = 'ß', /* NO QUAL */ '?', /* SHIFT */ '\\', /* ALT */ - '\\', /* ALT + SHIFT */ + '_', /* ALT + SHIFT */ 28, /* CTRL */ 28, /* CTRL + SHIFT */ 28, /* CTRL + ALT */ @@ -240,68 +240,68 @@ STATIC CONST UBYTE key0b_descr[] = STATIC CONST IPTR lokeymap[] = { BYTES('°', '^', '°', '^'), /* 00 Left of 1 Key */ - BYTES('!', '1', '!', '1'), /* 01 1 */ - BYTES('²', '²', '"', '2'), /* 02 2 */ - BYTES('³', '³', '§', '3'), /* 03 3 */ - BYTES('$', '4', '$', '4'), /* 04 4 */ - BYTES('%', '5', '%', '5'), /* 05 5 */ - BYTES('&', '6', '&', '6'), /* 06 6 */ - BYTES('{', '{', '/', '7'), /* 07 7 */ - BYTES('[', '[', '(', '8'), /* 08 8 */ - BYTES(']', ']', ')', '9'), /* 09 9 */ - BYTES('}', '}', '=', '0'), /* 0A 0 */ + BYTES('!', '¹', '!', '1'), /* 01 1 */ + BYTES('"', '²', '"', '2'), /* 02 2 */ + BYTES('#', '³', '§', '3'), /* 03 3 */ + BYTES('¢', '°', '$', '4'), /* 04 4 */ + BYTES('%', '¼', '%', '5'), /* 05 5 */ + BYTES('^', '½', '&', '6'), /* 06 6 */ + BYTES('&', '{', '/', '7'), /* 07 7 */ + BYTES('*', '[', '(', '8'), /* 08 8 */ + BYTES('(', ']', ')', '9'), /* 09 9 */ + BYTES(')', '}', '=', '0'), /* 0A 0 */ STRING(key0b_descr), /* 0B Right of 0 */ BYTES('+', '=', '`', '´'), /* 0C 2nd right of 0 */ BYTES('|', '|', '|', '|'), /* 0D 3rd right of 0 */ BYTES(0, 0, 0, 0), /* 0E undefined */ BYTES('0', '0', '0', '0'), /* 0F NUM 0 */ BYTES('@', '@', 'Q', 'q'), /* 10 */ - BYTES('W', 'w', 'W', 'w'), /* 11 */ - BYTES(EUR, EUR, 'E', 'e'), /* 12 */ - BYTES('R', 'r', 'R', 'r'), /* 13 */ - BYTES('T', 't', 'T', 't'), /* 14 */ - BYTES('Z', 'z', 'Z', 'z'), /* 15 */ - BYTES('U', 'u', 'U', 'u'), /* 16 */ - BYTES('I', 'i', 'I', 'i'), /* 17 */ - BYTES('O', 'o', 'O', 'o'), /* 18 */ - BYTES('P', 'p', 'P', 'p'), /* 19 */ + BYTES('°', '°', 'W', 'w'), /* 11 */ + BYTES('©', EUR, 'E', 'e'), /* 12 */ + BYTES('®', '®', 'R', 'r'), /* 13 */ + BYTES('Þ', 'þ', 'T', 't'), /* 14 */ + BYTES('¥', '¤', 'Z', 'z'), /* 15 */ + BYTES('µ', '¸', 'U', 'u'), /* 16 */ + BYTES('¦', '¡', 'I', 'i'), /* 17 */ + BYTES('Ø', 'ø', 'O', 'o'), /* 18 */ + BYTES('¶', '¶', 'P', 'p'), /* 19 */ - BYTES('Ü', 'ü', 'Ü', 'ü'), /* 1A */ - BYTES('~', '~', '*', '+'), /* 1B */ + BYTES('{', '[', 'Ü', 'ü'), /* 1A */ + BYTES('}', '~', '*', '+'), /* 1B */ BYTES(0, 0, 0, 0), /* 1C undefined */ BYTES('1', '1', '1', '1'), /* 1D NUM 1*/ BYTES('2', '2', '2', '2'), /* 1E NUM 2*/ BYTES('3', '3', '3', '3'), /* 1F NUM 3*/ - BYTES('A', 'a', 'A', 'a'), /* 20 */ - BYTES('S', 's', 'S', 's'), /* 21 */ - BYTES('D', 'd', 'D', 'd'), /* 22 */ + BYTES('Æ', 'æ', 'A', 'a'), /* 20 */ + BYTES('§', 'ß', 'S', 's'), /* 21 */ + BYTES('Ð', 'ð', 'D', 'd'), /* 22 */ BYTES('F', 'f', 'F', 'f'), /* 23 */ BYTES('G', 'g', 'G', 'g'), /* 24 */ BYTES('H', 'h', 'H', 'h'), /* 25 */ BYTES('J', 'j', 'J', 'j'), /* 26 */ BYTES('K', 'k', 'K', 'k'), /* 27 */ - BYTES('L', 'l', 'L', 'l'), /* 28 */ + BYTES('£', '£', 'L', 'l'), /* 28 */ - BYTES('Ö', 'ö', 'Ö', 'ö'), /* 29 */ - BYTES('Ä', 'ä', 'Ä', 'ä'), /* 2A */ - BYTES('\'', '#', '\'', '#'), /* 2B */ + BYTES(';', ';', 'Ö', 'ö'), /* 29 */ + BYTES('\'', '\'', 'Ä', 'ä'), /* 2A */ + BYTES('#', '#', '\'', '#'), /* 2B */ BYTES(0, 0, 0, 0), /* 2C undefined */ BYTES('4', '4', '4', '4'), /* 2D NUM 4 */ BYTES('5', '5', '5', '5'), /* 2E NUM 5 */ BYTES('6', '6', '6', '6'), /* 2F NUM 6 */ - BYTES('|', '|', '>', '<'), /* 30 */ - BYTES('Y', 'y', 'Y', 'y'), /* 31 */ - BYTES('X', 'x', 'X', 'x'), /* 32 */ - BYTES('C', 'c', 'C', 'c'), /* 33 */ - BYTES('V', 'v', 'V', 'v'), /* 34 */ - BYTES('B', 'b', 'B', 'b'), /* 35 */ - BYTES('N', 'n', 'N', 'n'), /* 36 */ - BYTES('µ', 'µ', 'M', 'm'), /* 37 */ + BYTES(0 , '|', '>', '<'), /* 30 */ + BYTES('¬', '±', 'Y', 'y'), /* 31 */ + BYTES('÷', '×', 'X', 'x'), /* 32 */ + BYTES('Ç', 'ç', 'C', 'c'), /* 33 */ + BYTES('ª', 'ª', 'V', 'v'), /* 34 */ + BYTES('º', 'º', 'B', 'b'), /* 35 */ + BYTES('¯', 0 , 'N', 'n'), /* 36 */ + BYTES('¿', 'µ', 'M', 'm'), /* 37 */ - BYTES(';', ',', ';', ','), /* 38 */ - BYTES(':', '.', ':', '.'), /* 39 */ - BYTES('_', '-', '_', '-'), /* 3A */ + BYTES('<', ',', ';', ','), /* 38 */ + BYTES('>', '.', ':', '.'), /* 39 */ + BYTES('?', '/', '_', '-'), /* 3A */ BYTES(0, 0, 0, 0), /* 3B */ BYTES(',', ',', ',', ','), /* 3C NUM . */ BYTES('7', '7', '7', '7'), /* 3D NUM 7 */ diff --git a/workbench/devs/keymaps/pc105_d.txt b/workbench/devs/keymaps/pc105_d.txt index a8ee3df66..b6eba52e0 100644 --- a/workbench/devs/keymaps/pc105_d.txt +++ b/workbench/devs/keymaps/pc105_d.txt @@ -3,6 +3,7 @@ # Each key has 3 lines of text. First line: + key. # Middle line: key alone. # Third line: + key. +# Fourth line: + + key # # Numeric pad: "(" ")" is used to indicate that this key is on # the numeric pad, unless the name already implies, that it is on the numeric @@ -40,22 +41,26 @@ KEY_RIGHT_OF_LSHIFT = "yes" +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ | ° | | ! | | " | | § | | $ | | % | | & | | / | | ( | | ) | | = | | ? | | ` | | | | | | | | | | | | | | | | | | | | ^ | | 1 | | 2 | | 3 | | 4 | | 5 | | 6 | | 7 | | 8 | | 9 | | 0 | | ß | | ´ | | | | BS | | INS | |HOME | |PGUP | |NUML | | (/) | | (*) | | (-) | -| | | ² | | ² | | ³ | | | | | | | | { | | [ | | ] | | } | | \ | | | | | | | | | | | | | | | | | | | | | +| ^ | | ¹ | | ² | | ³ | | ° | | ¼ | | ½ | | { | | [ | | ] | | } | | \ | | | | | | | | | | | | | | | | | | | | | +| °| | !| | "| | #| | ¢| | %| | ^| | &| | *| | (| | )| | _| | | | | | | | | | | | | | | | | | | | | +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +---------+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +---------+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ | | | Q | | W | | E | | R | | T | | Z | | U | | I | | O | | P | | Ü | | * | | | | | | | | | | | | | | | | | | TAB | | q | | w | | e | | r | | t | | z | | u | | i | | o | | p | | ü | | + | | | | DEL | | END | |PGDW | | (7) | | (8) | | (9) | | (+) | -| | | @ | | | | | | | | | | | | | | | | | | | | | | ~ | | | | | | | | | |(HOM)| |(UP) | |(PUP)| | | +| | | @ | | ° | | ¤ | | ® | | þ | | ¤ | | ¸ | | ¡ | | ø | | ¶ | | [ | | ~ | | | | | | | | | |(HOM)| |(UP) | |(PUP)| | | +| | | @| | °| | ©| | ®| | Þ| | ¥| | µ| | ¦| | ¦| | ¶| | {| | }| | | | | | | | | |(HOM)| |(UP) | |(PUP)| | | +---------+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +---------+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +---------+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-------+ +-----+ +-----+ +-----+ +-----+ | | | A | | S | | D | | F | | G | | H | | J | | K | | L | | Ö | | Ä | | ' | | | | | | | | | | | |CAPSLOCK | | a | | s | | d | | f | | g | | h | | j | | k | | l | | ö | | ä | | # | |RETURN | | (4) | | (5) | | (6) | | | -| | | | | | | | | | | | | | | | | | | | | | | | | | | | |(LFT)| | | |(RGT)| | | +| | | æ | | ß | | ð | | f | | g | | h | | j | | k | | £ | | ; | | ' | | # | | | |(LFT)| | | |(RGT)| | | +| | | Æ| | §| | Ð| | F| | G| | H| | J| | K| | £| | ;| | '| | '| | | |(LFT)| | | |(RGT)| | | +---------+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-------+ +-----+ +-----+ +-----+ +-----+ +-------+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-------------------+ +-----+ +-----+ +-----+ +-----+ +-----+ | | | > | | Y | | X | | C | | V | | B | | N | | M | | ; | | : | | _ | | | | | | | | | | | | | |LSHIFT | | < | | y | | x | | c | | v | | b | | n | | m | | , | | . | | - | | RSHIFT | | UP | | (1) | | (2) | | (3) | |ENTER| -| | | | | | | | | | | | | | | | | | µ | | | | | | | | | | | |(END)| |(DWN)| |(PDN)| | | +| | | | | | ± | | × | | ç | | ª | | º | | | | µ | | , | | . | | / | | | | | |(END)| |(DWN)| |(PDN)| | | +| | | | | ¬| | ÷| | Ç| | ª| | º| | ¯| | ¿| | <| | >| | ?| | | | | |(END)| |(DWN)| |(PDN)| | | +-------+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-------------------+ +-----+ +-----+ +-----+ +-----+ | | +---------+ +---------+ +---------+ +---------------------------------+ +---------+ +---------+ +---------+ +---------+ +-----+ +-----+ +-----+ +-------------+ +-----+ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -- 2.11.4.GIT