Attachment 40075 Details for Bug 30903 – 0001-Add-htcdream-keyboard-model-with-US-IT-DE-keyboard-v.patch

[patch] 0001-Add-htcdream-keyboard-model-with-US-IT-DE-keyboard-v.patch

0001-Add-htcdream-keyboard-model-with-US-IT-DE-keyboard-v.patch (text/plain), 9.12 KB, created by GNUtoo on 2010-11-05 13:00:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: GNUtoo

Created: 2010-11-05 13:00:37 UTC

Size: 9.12 KB

patch

obsolete

>From c0470c6cb67bedd0f4e87ae62d8b37ab4d40720e Mon Sep 17 00:00:00 2001
>From: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
>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 <GNUtoo@no-log.org>
>---
> 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 deletions(-)
>
>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 1a9cb5f..93e7481 100644
>--- a/rules/base.xml.in
>+++ b/rules/base.xml.in
>@@ -1210,6 +1210,13 @@
>         <vendor>Creative</vendor>
>       </configItem>
>     </model>
>+    <model>
>+      <configItem>
>+       <name>htcdream</name>
>+       <_description>Htc Dream phone</_description>
>+       <vendor>htc</vendor>
>+     </configItem>
>+    </model>
>   </modelList>
>   <layoutList>
>     <layout>
>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 <AD01> { [ q, Q, Tab, Tab ] };
>+        key <AD02> { [ w, W, grave, grave ] };
>+        key <AD03> { [ e, E, EuroSign, EuroSign ] };
>+        key <AD04> { [ r, R, underscore, underscore ] };
>+        key <AD05> { [ t, T, sterling, sterling] };
>+        key <AD06> { [ z, Z, division, division ] };
>+        key <AD07> { [ u, U, udiaeresis, udiaeresis ] };
>+        key <AD08> { [ i, I, minus, minus ] };
>+        key <AD09> { [ o, O, odiaeresis, odiaeresis ] };
>+        key <AD10> { [ p, P, equal, equal ] };
>+
>+        //third row
>+        key <AC01> { [ a, A, adiaeresis, adiaeresis ] };
>+        key <AC02> { [ s, S, ssharp, ssharp] };
>+        key <AC03> { [ d ,D, backslash, backslash ] };
>+        key <AC04> { [ f, F, braceleft, braceleft ] };
>+        key <AC05> { [ g, G, braceright, braceright ] };
>+        key <AC06> { [ h, H, multiply, multiply ] };
>+        key <AC07> { [ j, J, colon, colon ] };
>+        key <AC08> { [ k, K, plus, plus ] };
>+        key <AC09> { [ l, L, apostrophe, apostrophe ] };
>+
>+        //forth row
>+        key <AB01> { [ y, Y, bar, bar ] };
>+        key <AB02> { [ x, X, bracketleft, bracketleft ] };
>+        key <AB03> { [ c, C, bracketright, bracketright ] };
>+        key <AB04> { [ v, V, less, less ] };
>+        key <AB05> { [ b, B, greater, greater ] };
>+        key <AB06> { [ n, N, semicolon, semicolon ] };
>+        key <AB07> { [ m, M, quotedbl, quotedbl ] };
>+        key <AB08> { [ comma, comma, question, question ] };
>+
>+        //fifth row
>+        key <FK15> { [ at, at, asciitilde, asciitilde ] };
>+
>+        include "level3(alt_switch)"
>+};
>diff --git a/symbols/inet b/symbols/inet
>index 5de28b8..0009231 100644
>--- a/symbols/inet
>+++ b/symbols/inet
>@@ -1825,3 +1825,31 @@ partial alphanumeric_keys
> xkb_symbols "pc105" {
>     include "inet(media_nav_acpi_common)"
> };
>+
>+// HTC Dream
>+partial alphanumeric_keys
>+xkb_symbols "htcdream" {
>+	key <BKSP> { [ BackSpace ] };
>+	key <RTRN> { [ Return ] };
>+
>+        //first row
>+        key <AE01> { [ 1, 1, exclam, exclam ] };
>+        key <AE02> { [ 2, 2, at, at ] };
>+        key <AE03> { [ 3, 3, numbersign, numbersign ] };
>+        key <AE04> { [ 4, 4, dollar, dollar ] };
>+        key <AE05> { [ 5, 5, percent, percent ] };
>+        key <AE06> { [ 6, 6, dead_circumflex, dead_circumflex ] };
>+        key <AE07> { [ 7, 7, ampersand, ampersand ] };
>+        key <AE08> { [ 8, 8, asterisk, asterisk ] };
>+        key <AE09> { [ 9, 9, parenleft, parenleft ] };
>+        key <AE10> { [ 0, 0, parenright, parenright ] };
>+
>+	//fifth row
>+	key <LFSH> { [ Shift_L ] };
>+	key <SPCE> { [ space ] };
>+	key <AB09> { [ period, period, slash, slash ] };
>+	key <RTSH> { [ Shift_R ] };
>+
>+	//modifiers
>+	modifier_map Shift { <LFSH>, <RTSH> };
>+};
>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 <AD01> { [ q, Q, Tab, Tab ] };
>+        key <AD02> { [ w, W, grave, grave ] };
>+        key <AD03> { [ e, E, egrave, egrave] };
>+        key <AD04> { [ r, R, eacute, eacute ] };
>+        key <AD05> { [ t, T, quotedbl, quotedbl ] };
>+        key <AD06> { [ y, Y, apostrophe, apostrophe ] };
>+        key <AD07> { [ u, U, ugrave, ugrave ] };
>+        key <AD08> { [ i, I, igrave, igrave ] };
>+        key <AD09> { [ o, O, ograve, ograve ] };
>+        key <AD10> { [ p, P, NoSymbol, NoSymbol ] };
>+
>+        //third row
>+        key <AC01> { [ a, A, agrave, agrave ] };
>+        key <AC02> { [ s, S, bar, bar ] };
>+        key <AC03> { [ d ,D, EuroSign, EuroSign ] };
>+        key <AC04> { [ f, F, sterling, sterling ] };
>+        key <AC05> { [ g, G, division, division ] };
>+        key <AC06> { [ h, H, multiply, multiply ] };
>+        key <AC07> { [ j, J, minus, minus ] };
>+        key <AC08> { [ k, K, plus, plus ] };
>+        key <AC09> { [ l, L, equal, equal ] };
>+
>+        //forth row
>+        key <AB01> { [ z, Z, underscore, underscore ] };
>+        key <AB02> { [ x, X, asciitilde, asciitilde ] };
>+        key <AB03> { [ c, C, less, less ] };
>+        key <AB04> { [ v, V, greater, greater ] };
>+        key <AB05> { [ b, B,  backslash, backslash ] };
>+        key <AB06> { [ n, N, colon, colon ] };
>+        key <AB07> { [ m, M, semicolon, semicolon ] };
>+        key <AB08> { [ comma, comma, question, question ] };
>+
>+        //fifth row
>+        key <FK15> { [ 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 <AD01> { [ q, Q, Tab, Tab ] };
>+        key <AD02> { [ w, W, grave, grave ] };
>+        key <AD03> { [ e, E, underscore, underscore ] };
>+        key <AD04> { [ r, R, sterling, sterling ] };
>+        key <AD05> { [ t, T, EuroSign, EuroSign ] };
>+        key <AD06> { [ y, Y, division, division ] };
>+        key <AD07> { [ u, U, multiply, multiply ] };
>+        key <AD08> { [ i, I, minus, minus ] };
>+        key <AD09> { [ o, O, plus, plus ] };
>+        key <AD10> { [ p, P, equal, equal ] };
>+
>+        //third row
>+        key <AC01> { [ a, A, NoSymbol, NoSymbol ] };
>+        key <AC02> { [ s, S, bar, bar ] };
>+        key <AC03> { [ d ,D, backslash, backslash ] };
>+        key <AC04> { [ f, F, braceleft, braceleft ] };
>+        key <AC05> { [ g, G, braceright, braceright ] };
>+        key <AC06> { [ h, H, colon, colon ] };
>+        key <AC07> { [ j, J, semicolon, semicolon ] };
>+        key <AC08> { [ k, K, quotedbl, quotedbl ] };
>+        key <AC09> { [ l, L, apostrophe, apostrophe ] };
>+
>+        //forth row
>+        key <AB01> { [ z, Z, NoSymbol, NoSymbol ] };
>+        key <AB02> { [ x, X, NoSymbol, NoSymbol ] };
>+        key <AB03> { [ c, C, NoSymbol, NoSymbol ] };
>+        key <AB04> { [ v, V, bracketleft, bracketleft ] };
>+        key <AB05> { [ b, B, bracketright, bracketright ] };
>+        key <AB06> { [ n, N, less, less ] };
>+        key <AB07> { [ m, M, greater, greater ] };
>+        key <AB08> { [ comma, comma, question, question ] };
>+
>+        //fifth row
>+        key <FK15> { [ at, at, asciitilde, asciitilde ] };
>+
>+        include "level3(alt_switch)"
>+};
>\ No newline at end of file
>-- 
>1.7.0.4
>

Actions: View | Splinter Review

Attachments on bug 30903: 39469 | 39471 | 40075

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.