From 017e1e1d89171c845d025f04e886b48ef6fd18b0 Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Fri, 15 Oct 2010 22:22:46 +0200 Subject: [PATCH] Add htcdream keyboard model, with US,IT,DE keyboard variants The IT and DE keyboard were mapped looking at real hardware that I have, but the US one was done looking at: http://upload.wikimedia.org/wikipedia/commons/1/18/T-Mobile_G1_launch_event_2.jpg Signed-off-by: Denis 'GNUtoo' Carikli --- rules/base.lists.part | 2 +- rules/base.ml_s.part | 1 + rules/base.xml.in | 7 +++++++ symbols/de | 45 +++++++++++++++++++++++++++++++++++++++++++ symbols/inet | 28 +++++++++++++++++++++++++++ symbols/it | 44 ++++++++++++++++++++++++++++++++++++++++++ symbols/us | 45 +++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 171 insertions(+), 1 deletion(-) diff --git a/rules/base.lists.part b/rules/base.lists.part index 7eafb81..894fdb4 100644 --- a/rules/base.lists.part +++ b/rules/base.lists.part @@ -50,7 +50,7 @@ genius geniuscomfy2 \ gyration honeywell_euroboard \ hp250x hp5xx hp500fa hpdv5 \ - hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx \ + hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx htcdream \ ibm_spacesaver ipaq inspiron intel \ logiaccess logicda logicink \ logiex110 logiclx300 \ diff --git a/rules/base.ml_s.part b/rules/base.ml_s.part index 4cbc664..9f0e636 100644 --- a/rules/base.ml_s.part +++ b/rules/base.ml_s.part @@ -38,3 +38,4 @@ $thinkpads br = pc+br(thinkpad) * $nonlatin = pc+us+%l%(v):2 * * = pc+%l%(v) + htcdream us de it = %l(htcdream) diff --git a/rules/base.xml.in b/rules/base.xml.in index 52a365e..d86d358 100644 --- a/rules/base.xml.in +++ b/rules/base.xml.in @@ -1217,6 +1217,13 @@ Creative + + + htcdream + <_description>Htc Dream phone + htc + + diff --git a/symbols/de b/symbols/de index c7af1b0..fca83ef 100644 --- a/symbols/de +++ b/symbols/de @@ -553,3 +553,48 @@ key.type[group1]="FOUR_LEVEL_ALPHABETIC"; include "level3(ralt_switch)" }; + +partial alphanumeric_keys +xkb_symbols "htcdream" { + include "inet(htcdream)" + + name[Group1]= "Germany - htcdream"; + + //second row + key { [ q, Q, Tab, Tab ] }; + key { [ w, W, grave, grave ] }; + key { [ e, E, EuroSign, EuroSign ] }; + key { [ r, R, underscore, underscore ] }; + key { [ t, T, sterling, sterling] }; + key { [ z, Z, division, division ] }; + key { [ u, U, udiaeresis, udiaeresis ] }; + key { [ i, I, minus, minus ] }; + key { [ o, O, odiaeresis, odiaeresis ] }; + key { [ p, P, equal, equal ] }; + + //third row + key { [ a, A, adiaeresis, adiaeresis ] }; + key { [ s, S, ssharp, ssharp] }; + key { [ d ,D, backslash, backslash ] }; + key { [ f, F, braceleft, braceleft ] }; + key { [ g, G, braceright, braceright ] }; + key { [ h, H, multiply, multiply ] }; + key { [ j, J, colon, colon ] }; + key { [ k, K, plus, plus ] }; + key { [ l, L, apostrophe, apostrophe ] }; + + //forth row + key { [ y, Y, bar, bar ] }; + key { [ x, X, bracketleft, bracketleft ] }; + key { [ c, C, bracketright, bracketright ] }; + key { [ v, V, less, less ] }; + key { [ b, B, greater, greater ] }; + key { [ n, N, semicolon, semicolon ] }; + key { [ m, M, quotedbl, quotedbl ] }; + key { [ comma, comma, question, question ] }; + + //fifth row + key { [ at, at, asciitilde, asciitilde ] }; + + include "level3(alt_switch)" +}; diff --git a/symbols/inet b/symbols/inet index 3f91252..b295b25 100644 --- a/symbols/inet +++ b/symbols/inet @@ -1827,3 +1827,31 @@ partial alphanumeric_keys xkb_symbols "pc105" { include "inet(media_nav_acpi_common)" }; + +// HTC Dream +partial alphanumeric_keys +xkb_symbols "htcdream" { + key { [ BackSpace ] }; + key { [ Return ] }; + + //first row + key { [ 1, 1, exclam, exclam ] }; + key { [ 2, 2, at, at ] }; + key { [ 3, 3, numbersign, numbersign ] }; + key { [ 4, 4, dollar, dollar ] }; + key { [ 5, 5, percent, percent ] }; + key { [ 6, 6, dead_circumflex, dead_circumflex ] }; + key { [ 7, 7, ampersand, ampersand ] }; + key { [ 8, 8, asterisk, asterisk ] }; + key { [ 9, 9, parenleft, parenleft ] }; + key { [ 0, 0, parenright, parenright ] }; + + //fifth row + key { [ Shift_L ] }; + key { [ space ] }; + key { [ period, period, slash, slash ] }; + key { [ Shift_R ] }; + + //modifiers + modifier_map Shift { , }; +}; diff --git a/symbols/it b/symbols/it index 7f703d1..9840ebd 100644 --- a/symbols/it +++ b/symbols/it @@ -216,3 +216,47 @@ xkb_symbols "us" { include "level3(ralt_switch)" }; +partial alphanumeric_keys +xkb_symbols "htcdream" { + include "inet(htcdream)" + name[Group1]= "Italy - htcdream"; + + //second row + key { [ q, Q, Tab, Tab ] }; + key { [ w, W, grave, grave ] }; + key { [ e, E, egrave, egrave] }; + key { [ r, R, eacute, eacute ] }; + key { [ t, T, quotedbl, quotedbl ] }; + key { [ y, Y, apostrophe, apostrophe ] }; + key { [ u, U, ugrave, ugrave ] }; + key { [ i, I, igrave, igrave ] }; + key { [ o, O, ograve, ograve ] }; + key { [ p, P, NoSymbol, NoSymbol ] }; + + //third row + key { [ a, A, agrave, agrave ] }; + key { [ s, S, bar, bar ] }; + key { [ d ,D, EuroSign, EuroSign ] }; + key { [ f, F, sterling, sterling ] }; + key { [ g, G, division, division ] }; + key { [ h, H, multiply, multiply ] }; + key { [ j, J, minus, minus ] }; + key { [ k, K, plus, plus ] }; + key { [ l, L, equal, equal ] }; + + //forth row + key { [ z, Z, underscore, underscore ] }; + key { [ x, X, asciitilde, asciitilde ] }; + key { [ c, C, less, less ] }; + key { [ v, V, greater, greater ] }; + key { [ b, B, backslash, backslash ] }; + key { [ n, N, colon, colon ] }; + key { [ m, M, semicolon, semicolon ] }; + key { [ comma, comma, question, question ] }; + + //fifth row + key { [ at, at, NoSymbol, NoSymbol ] }; + + include "level3(alt_switch)" +}; + diff --git a/symbols/us b/symbols/us index a8a1c53..ffb947a 100644 --- a/symbols/us +++ b/symbols/us @@ -1147,3 +1147,48 @@ xkb_symbols "srp" { include "level3(ralt_switch)" }; + +//based on http://upload.wikimedia.org/wikipedia/commons/1/18/T-Mobile_G1_launch_event_2.jpg +partial alphanumeric_keys +xkb_symbols "htcdream" { + include "inet(htcdream)" + name[Group1]= "USA - htcdream"; + + //second row + key { [ q, Q, Tab, Tab ] }; + key { [ w, W, grave, grave ] }; + key { [ e, E, underscore, underscore ] }; + key { [ r, R, sterling, sterling ] }; + key { [ t, T, EuroSign, EuroSign ] }; + key { [ y, Y, division, division ] }; + key { [ u, U, multiply, multiply ] }; + key { [ i, I, minus, minus ] }; + key { [ o, O, plus, plus ] }; + key { [ p, P, equal, equal ] }; + + //third row + key { [ a, A, NoSymbol, NoSymbol ] }; + key { [ s, S, bar, bar ] }; + key { [ d ,D, backslash, backslash ] }; + key { [ f, F, braceleft, braceleft ] }; + key { [ g, G, braceright, braceright ] }; + key { [ h, H, colon, colon ] }; + key { [ j, J, semicolon, semicolon ] }; + key { [ k, K, quotedbl, quotedbl ] }; + key { [ l, L, apostrophe, apostrophe ] }; + + //forth row + key { [ z, Z, NoSymbol, NoSymbol ] }; + key { [ x, X, NoSymbol, NoSymbol ] }; + key { [ c, C, NoSymbol, NoSymbol ] }; + key { [ v, V, bracketleft, bracketleft ] }; + key { [ b, B, bracketright, bracketright ] }; + key { [ n, N, less, less ] }; + key { [ m, M, greater, greater ] }; + key { [ comma, comma, question, question ] }; + + //fifth row + key { [ at, at, asciitilde, asciitilde ] }; + + include "level3(alt_switch)" +}; \ No newline at end of file -- 2.32.0.93.g670b81a890