From 3744281b9ae8aa0ab86ceaee1afe8a603e3aeb2c Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 19 Nov 2012 10:16:38 +0100 Subject: dos -> unix --- .../symbols/digital_vndr/Makefile.am | 10 +- .../xkeyboard-config/symbols/extractGroupNames.sh | 6 +- .../symbols/fujitsu_vndr/Makefile.am | 8 +- .../xkeyboard-config/symbols/hp_vndr/Makefile.am | 8 +- .../symbols/macintosh_vndr/Makefile.am | 16 +- .../xkeyboard-config/symbols/macintosh_vndr/fr | 220 ++++---- .../xkeyboard-config/symbols/macintosh_vndr/jp | 70 +-- .../xkeyboard-config/symbols/nec_vndr/Makefile.am | 8 +- .../symbols/nokia_vndr/Makefile.am | 12 +- .../xkeyboard-config/symbols/nokia_vndr/rx-44 | 606 ++++++++++----------- .../xkeyboard-config/symbols/sgi_vndr/Makefile.am | 8 +- .../xkeyboard-config/symbols/sony_vndr/Makefile.am | 8 +- .../xkeyboard-config/symbols/sun_vndr/Makefile.am | 20 +- .../xkeyboard-config/symbols/sun_vndr/solaris | 426 +++++++-------- .../symbols/xfree68_vndr/Makefile.am | 8 +- 15 files changed, 717 insertions(+), 717 deletions(-) (limited to 'xorg-server/xkeyboard-config/symbols') diff --git a/xorg-server/xkeyboard-config/symbols/digital_vndr/Makefile.am b/xorg-server/xkeyboard-config/symbols/digital_vndr/Makefile.am index 69184024b..063fc8d57 100644 --- a/xorg-server/xkeyboard-config/symbols/digital_vndr/Makefile.am +++ b/xorg-server/xkeyboard-config/symbols/digital_vndr/Makefile.am @@ -1,5 +1,5 @@ -symbolsdir = $(xkb_base)/symbols/digital_vndr - -dist_symbols_DATA = \ -lk pc us \ -vt +symbolsdir = $(xkb_base)/symbols/digital_vndr + +dist_symbols_DATA = \ +lk pc us \ +vt diff --git a/xorg-server/xkeyboard-config/symbols/extractGroupNames.sh b/xorg-server/xkeyboard-config/symbols/extractGroupNames.sh index bbcd6d58d..fb128fd19 100644 --- a/xorg-server/xkeyboard-config/symbols/extractGroupNames.sh +++ b/xorg-server/xkeyboard-config/symbols/extractGroupNames.sh @@ -1,3 +1,3 @@ -#!/bin/sh - -grep 'name\[Group1\]' * | sed 's/[[:space:]]*name\[Group1\].*=[[:space:]]*//;s/;[[:space:]]*$//' | sort +#!/bin/sh + +grep 'name\[Group1\]' * | sed 's/[[:space:]]*name\[Group1\].*=[[:space:]]*//;s/;[[:space:]]*$//' | sort diff --git a/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/Makefile.am b/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/Makefile.am index 5c9b0b833..4e3a96ee1 100644 --- a/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/Makefile.am +++ b/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/Makefile.am @@ -1,4 +1,4 @@ -symbolsdir = $(xkb_base)/symbols/fujitsu_vndr - -dist_symbols_DATA = \ -jp us +symbolsdir = $(xkb_base)/symbols/fujitsu_vndr + +dist_symbols_DATA = \ +jp us diff --git a/xorg-server/xkeyboard-config/symbols/hp_vndr/Makefile.am b/xorg-server/xkeyboard-config/symbols/hp_vndr/Makefile.am index 25e8fa44f..6bcd4da3e 100644 --- a/xorg-server/xkeyboard-config/symbols/hp_vndr/Makefile.am +++ b/xorg-server/xkeyboard-config/symbols/hp_vndr/Makefile.am @@ -1,4 +1,4 @@ -symbolsdir = $(xkb_base)/symbols/hp_vndr - -dist_symbols_DATA = \ -us +symbolsdir = $(xkb_base)/symbols/hp_vndr + +dist_symbols_DATA = \ +us diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/Makefile.am b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/Makefile.am index 1d43f40c2..f39662e4c 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/Makefile.am +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/Makefile.am @@ -1,8 +1,8 @@ -symbolsdir = $(xkb_base)/symbols/macintosh_vndr - -dist_symbols_DATA = \ -apple ch de dk \ -fi fr \ -gb is it jp \ -latam nl no pt \ -se us +symbolsdir = $(xkb_base)/symbols/macintosh_vndr + +dist_symbols_DATA = \ +apple ch de dk \ +fi fr \ +gb is it jp \ +latam nl no pt \ +se us diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fr b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fr index c76551d30..9a8f8de23 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fr +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fr @@ -1,110 +1,110 @@ -// Marc.Shapiro@inria.fr 19-sep-1998 -// modifications : Etienne Herlent june 2000 -// adapted to the new input layer : -// Martin Costabel 3-jan-2001 -////////////////////////////////////////////////////////////////// -// Petites Modification le juillet 2005 par Bin Zhang : -// 1) La ligne 83 : remplacer les deux "VoidSymbol" par oe et OE -// 2) La ligne 89 : remplacer "VoidSymbol" par "EuroSign" -// ( 1) et 2) fonctionnent sous UTF-8, mais pas sous iso-8859-1. ) -// 3) Remplacer la ligne 148 par la ligne 149 pour que la touche Alt_L -// (la touche Apple-Pomme) fonctionne correctement sous Xorg, une idée -// motivée par http://www.linux-france.org/macintosh/clavier_gentoo.html -////////////////////////////////////////////////////////////////// -// This map is an almost-complete mapping of the standard French -// MacIntosh keyboard under Xwindows. I tried to remain as faithful -// as possible to the Mac meaning of each key. I did this entirely by -// hand and by intuition, relying on the Clavier (Keyboard?) Desktop -// Accessory for the Mac meaning of keys, and on reading keysymdef.h -// to intuit the corresponding X names. Lacking proper documentation, -// I may have made some mistakes. - -// Entries marked CHECK are particularly uncertain - -// Entries marked MISSING mark Mac characters for which I was unable -// to find a corresponding keysym. (Some for sure don't: e.g. the -// Apple mark and the oe/OE character; others I may have simply not -// found.) - -default -xkb_symbols "extended" { - - name[Group1]= "France - Mac"; - - key { [ Escape ] }; - - // Alphanumeric section - key { [ at, numbersign, periodcentered, Ydiaeresis ] }; - key { [ KP_Enter ] }; - key { [ ampersand, 1, VoidSymbol, dead_acute ] }; // MISSING: Apple - key { [ eacute, 2, ediaeresis, Eacute ] }; - key { [ quotedbl, 3, leftdoublequotemark, rightdoublequotemark ] }; - key { [ apostrophe, 4, leftsinglequotemark, rightsinglequotemark ] }; - key { [ parenleft, 5, braceleft, bracketleft ] }; - key { [ section, 6, paragraph, aring ] }; - key { [ egrave, 7, guillemotleft, guillemotright] }; - key { [ exclam, 8, exclamdown, Ucircumflex ] }; - key { [ ccedilla, 9, Ccedilla, Aacute ] }; - key { [ agrave, 0, oslash, Oslash ] }; - key { [ parenright, degree, braceright, bracketright ] }; - key { [ minus, underscore, emdash, endash ] }; - key { [ BackSpace, VoidSymbol, Delete, VoidSymbol ] }; - - key { [ Tab, ISO_Left_Tab ] }; - key { [ a, A, ae, AE ] }; - key { [ z, Z, Acircumflex, Aring ] }; - key { [ e, E, ecircumflex, Ecircumflex ] }; - key { [ r, R, registered, currency ] }; - key { [ t, T, dagger, trademark ] }; - key { [ y, Y, Uacute, Ydiaeresis ] }; - key { [ u, U, masculine, ordfeminine ] }; - key { [ i, I, icircumflex, idiaeresis ] }; - key { [ o, O, oe, OE ] }; - key { [ p, P, Greek_pi, Greek_PI ] }; - key { [dead_circumflex,dead_diaeresis,ocircumflex, Ocircumflex ] }; - key { [ dollar, asterisk, EuroSign, yen ] }; - key { [ Caps_Lock ] }; - key { [ q, Q, doubledagger, Greek_OMEGA ] }; - key { [ s, S, Ograve, Greek_SIGMA ] }; - key { [ d, D, Greek_delta, Greek_DELTA ] }; - key { [ f, F, VoidSymbol, periodcentered ] }; - key { [ g, G, VoidSymbol, VoidSymbol ] }; // MISSING: ligature fi,fl - key { [ h, H, Igrave, Icircumflex ] }; - key { [ j, J, Idiaeresis, Iacute ] }; - key { [ k, K, Egrave, Ediaeresis ] }; - key { [ l, L, notsign, bar ] }; - key { [ m, M, mu, Oacute ] }; - key { [ ugrave, percent, Ugrave, 0x1002030 ] }; - key { [ dead_grave, sterling, at, numbersign ] }; - key { [ Return ] }; - - key { [ less, greater, lessthanequal, greaterthanequal ] }; - key { [ w, W, guilsinglleft, guilsinglright ] }; // MISSING: half-guillemot (single angle bracket) - key { [ x, X, VoidSymbol, VoidSymbol ] }; // CHECK: similarequal; MISSING: extra-slanted slash - key { [ c, C, copyright, cent ] }; - key { [ v, V, diamond, radical ] }; // CHECK diamond - key { [ b, B, ssharp, integral ] }; - key { [ n, N, dead_tilde, asciitilde ] }; - key { [ comma, question, infinity, questiondown ] }; - key { [ semicolon, period, ellipsis, periodcentered ] }; - key { [ colon, slash, division, backslash ] }; - key { [ equal, plus, notequal, plusminus ] }; - - key { [ space, space, nobreakspace, nobreakspace ] }; - // End alphanumeric section - - include "level3(ralt_switch)" -}; - - - -xkb_symbols "nodeadkeys" { -include "macintosh_vndr/fr(extended)" - name[Group1]= "France - Mac, eliminate dead keys"; - - key { [ ampersand, 1, VoidSymbol, acute ] }; // MISSING: Apple - key { [asciicircum,diaeresis,ocircumflex, Ocircumflex ] }; - key { [ grave, sterling, at, numbersign ] }; - - key { [ n, N, asciitilde, dead_tilde ] }; -}; +// Marc.Shapiro@inria.fr 19-sep-1998 +// modifications : Etienne Herlent june 2000 +// adapted to the new input layer : +// Martin Costabel 3-jan-2001 +////////////////////////////////////////////////////////////////// +// Petites Modification le juillet 2005 par Bin Zhang : +// 1) La ligne 83 : remplacer les deux "VoidSymbol" par oe et OE +// 2) La ligne 89 : remplacer "VoidSymbol" par "EuroSign" +// ( 1) et 2) fonctionnent sous UTF-8, mais pas sous iso-8859-1. ) +// 3) Remplacer la ligne 148 par la ligne 149 pour que la touche Alt_L +// (la touche Apple-Pomme) fonctionne correctement sous Xorg, une idée +// motivée par http://www.linux-france.org/macintosh/clavier_gentoo.html +////////////////////////////////////////////////////////////////// +// This map is an almost-complete mapping of the standard French +// MacIntosh keyboard under Xwindows. I tried to remain as faithful +// as possible to the Mac meaning of each key. I did this entirely by +// hand and by intuition, relying on the Clavier (Keyboard?) Desktop +// Accessory for the Mac meaning of keys, and on reading keysymdef.h +// to intuit the corresponding X names. Lacking proper documentation, +// I may have made some mistakes. + +// Entries marked CHECK are particularly uncertain + +// Entries marked MISSING mark Mac characters for which I was unable +// to find a corresponding keysym. (Some for sure don't: e.g. the +// Apple mark and the oe/OE character; others I may have simply not +// found.) + +default +xkb_symbols "extended" { + + name[Group1]= "France - Mac"; + + key { [ Escape ] }; + + // Alphanumeric section + key { [ at, numbersign, periodcentered, Ydiaeresis ] }; + key { [ KP_Enter ] }; + key { [ ampersand, 1, VoidSymbol, dead_acute ] }; // MISSING: Apple + key { [ eacute, 2, ediaeresis, Eacute ] }; + key { [ quotedbl, 3, leftdoublequotemark, rightdoublequotemark ] }; + key { [ apostrophe, 4, leftsinglequotemark, rightsinglequotemark ] }; + key { [ parenleft, 5, braceleft, bracketleft ] }; + key { [ section, 6, paragraph, aring ] }; + key { [ egrave, 7, guillemotleft, guillemotright] }; + key { [ exclam, 8, exclamdown, Ucircumflex ] }; + key { [ ccedilla, 9, Ccedilla, Aacute ] }; + key { [ agrave, 0, oslash, Oslash ] }; + key { [ parenright, degree, braceright, bracketright ] }; + key { [ minus, underscore, emdash, endash ] }; + key { [ BackSpace, VoidSymbol, Delete, VoidSymbol ] }; + + key { [ Tab, ISO_Left_Tab ] }; + key { [ a, A, ae, AE ] }; + key { [ z, Z, Acircumflex, Aring ] }; + key { [ e, E, ecircumflex, Ecircumflex ] }; + key { [ r, R, registered, currency ] }; + key { [ t, T, dagger, trademark ] }; + key { [ y, Y, Uacute, Ydiaeresis ] }; + key { [ u, U, masculine, ordfeminine ] }; + key { [ i, I, icircumflex, idiaeresis ] }; + key { [ o, O, oe, OE ] }; + key { [ p, P, Greek_pi, Greek_PI ] }; + key { [dead_circumflex,dead_diaeresis,ocircumflex, Ocircumflex ] }; + key { [ dollar, asterisk, EuroSign, yen ] }; + key { [ Caps_Lock ] }; + key { [ q, Q, doubledagger, Greek_OMEGA ] }; + key { [ s, S, Ograve, Greek_SIGMA ] }; + key { [ d, D, Greek_delta, Greek_DELTA ] }; + key { [ f, F, VoidSymbol, periodcentered ] }; + key { [ g, G, VoidSymbol, VoidSymbol ] }; // MISSING: ligature fi,fl + key { [ h, H, Igrave, Icircumflex ] }; + key { [ j, J, Idiaeresis, Iacute ] }; + key { [ k, K, Egrave, Ediaeresis ] }; + key { [ l, L, notsign, bar ] }; + key { [ m, M, mu, Oacute ] }; + key { [ ugrave, percent, Ugrave, 0x1002030 ] }; + key { [ dead_grave, sterling, at, numbersign ] }; + key { [ Return ] }; + + key { [ less, greater, lessthanequal, greaterthanequal ] }; + key { [ w, W, guilsinglleft, guilsinglright ] }; // MISSING: half-guillemot (single angle bracket) + key { [ x, X, VoidSymbol, VoidSymbol ] }; // CHECK: similarequal; MISSING: extra-slanted slash + key { [ c, C, copyright, cent ] }; + key { [ v, V, diamond, radical ] }; // CHECK diamond + key { [ b, B, ssharp, integral ] }; + key { [ n, N, dead_tilde, asciitilde ] }; + key { [ comma, question, infinity, questiondown ] }; + key { [ semicolon, period, ellipsis, periodcentered ] }; + key { [ colon, slash, division, backslash ] }; + key { [ equal, plus, notequal, plusminus ] }; + + key { [ space, space, nobreakspace, nobreakspace ] }; + // End alphanumeric section + + include "level3(ralt_switch)" +}; + + + +xkb_symbols "nodeadkeys" { +include "macintosh_vndr/fr(extended)" + name[Group1]= "France - Mac, eliminate dead keys"; + + key { [ ampersand, 1, VoidSymbol, acute ] }; // MISSING: Apple + key { [asciicircum,diaeresis,ocircumflex, Ocircumflex ] }; + key { [ grave, sterling, at, numbersign ] }; + + key { [ n, N, asciitilde, dead_tilde ] }; +}; diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/jp b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/jp index a4af79f35..331257a82 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/jp +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/jp @@ -1,35 +1,35 @@ -// JIS symbol mapping for Apple Aluminium Keyboard -// (Damien Ciabrini ) -// -// The JIS version of the Aluminium Keyboard is made of -// QWERTY-like map for the latin part -// PC98-like map for the kana part -// EISU and KANA keys found on other Apple keyboards - -partial default alphanumeric_keys -xkb_symbols "usmac" { - name[Group1] = "Japan - Macintosh, US map"; - include "jp(common)" - - key { [ KP_Separator ] }; - key { [ yen, bar ] }; - replace key { [ 0 ] }; - replace key { [ underscore ] }; - replace key { [ Caps_Lock ] }; -}; - -partial alphanumeric_keys -xkb_symbols "mac" { - name[Group1] = "Japan - Macintosh"; - include "jp(kana)" - - replace key { [ Caps_Lock ] }; -}; - -partial alphanumeric_keys -xkb_symbols "alujiskeys" { - // On JIS USB keyboard, EISU and KANA replace Hangul and Hanja - // see keycodes macintosh(jisevdev) - replace key { [ Hiragana_Katakana ] }; - replace key { [ Eisu_toggle ] }; -}; +// JIS symbol mapping for Apple Aluminium Keyboard +// (Damien Ciabrini ) +// +// The JIS version of the Aluminium Keyboard is made of +// QWERTY-like map for the latin part +// PC98-like map for the kana part +// EISU and KANA keys found on other Apple keyboards + +partial default alphanumeric_keys +xkb_symbols "usmac" { + name[Group1] = "Japan - Macintosh, US map"; + include "jp(common)" + + key { [ KP_Separator ] }; + key { [ yen, bar ] }; + replace key { [ 0 ] }; + replace key { [ underscore ] }; + replace key { [ Caps_Lock ] }; +}; + +partial alphanumeric_keys +xkb_symbols "mac" { + name[Group1] = "Japan - Macintosh"; + include "jp(kana)" + + replace key { [ Caps_Lock ] }; +}; + +partial alphanumeric_keys +xkb_symbols "alujiskeys" { + // On JIS USB keyboard, EISU and KANA replace Hangul and Hanja + // see keycodes macintosh(jisevdev) + replace key { [ Hiragana_Katakana ] }; + replace key { [ Eisu_toggle ] }; +}; diff --git a/xorg-server/xkeyboard-config/symbols/nec_vndr/Makefile.am b/xorg-server/xkeyboard-config/symbols/nec_vndr/Makefile.am index ac1de6ec9..ff070065a 100644 --- a/xorg-server/xkeyboard-config/symbols/nec_vndr/Makefile.am +++ b/xorg-server/xkeyboard-config/symbols/nec_vndr/Makefile.am @@ -1,4 +1,4 @@ -symbolsdir = $(xkb_base)/symbols/nec_vndr - -dist_symbols_DATA = \ -jp +symbolsdir = $(xkb_base)/symbols/nec_vndr + +dist_symbols_DATA = \ +jp diff --git a/xorg-server/xkeyboard-config/symbols/nokia_vndr/Makefile.am b/xorg-server/xkeyboard-config/symbols/nokia_vndr/Makefile.am index 63dc5db6e..71200ec4d 100644 --- a/xorg-server/xkeyboard-config/symbols/nokia_vndr/Makefile.am +++ b/xorg-server/xkeyboard-config/symbols/nokia_vndr/Makefile.am @@ -1,6 +1,6 @@ -symbolsdir = $(xkb_base)/symbols/nokia_vndr - -dist_symbols_DATA = \ -rx-44 \ -rx-51 \ -su-8w +symbolsdir = $(xkb_base)/symbols/nokia_vndr + +dist_symbols_DATA = \ +rx-44 \ +rx-51 \ +su-8w diff --git a/xorg-server/xkeyboard-config/symbols/nokia_vndr/rx-44 b/xorg-server/xkeyboard-config/symbols/nokia_vndr/rx-44 index 7d91d6db3..515b69eef 100644 --- a/xorg-server/xkeyboard-config/symbols/nokia_vndr/rx-44 +++ b/xorg-server/xkeyboard-config/symbols/nokia_vndr/rx-44 @@ -1,303 +1,303 @@ -partial alphanumeric_keys -xkb_symbols "us" { - name[Group1] = "U.S. English"; - - include "nokia_vndr/rx-44(base)" - - key { [ a, A, exclam, exclam ] }; - key { [ s, S, quotedbl, quotedbl ] }; - key { [ d, D, at, at ] }; - key { [ f, F, numbersign, numbersign ] }; - key { [ g, G, backslash, backslash ] }; - key { [ h, H, slash, slash ] }; - key { [ j, J, parenleft, parenleft ] }; - key { [ k, K, parenright, parenright ] }; - key { [ l, L, asterisk, asterisk ] }; - key { [ apostrophe, question, question, question ] }; - - key { [ z, Z, yen, yen ] }; - key { [ x, X, asciicircum, asciicircum ] }; - key { [ c, C, asciitilde, asciitilde ] }; - key { [ v, V, percent, percent ] }; - key { [ b, B, ampersand, ampersand ] }; - key { [ n, N, dollar, dollar ] }; - key { [ m, M, EuroSign, EuroSign ] }; - key { [ semicolon, colon, sterling, sterling ] }; - key { [ minus, underscore, underscore, underscore ] }; - key { [ plus, equal, equal, equal ] }; - - key { [ comma, less, comma, less ] }; - key { [ period, greater, period, greater ] }; -}; - - - -partial alphanumeric_keys -xkb_symbols "fisenoda" { - name[Group1] = "Finnish/Swedish/Norwegian/Danish"; - - include "nokia_vndr/rx-44(base)" - - key { [ a, A, exclam, exclam ] }; - key { [ s, S, quotedbl, quotedbl ] }; - key { [ d, D, at, at ] }; - key { [ f, F, numbersign, numbersign ] }; - key { [ g, G, asterisk, asterisk ] }; - key { [ h, H, backslash, backslash ] }; - key { [ j, J, slash, slash ] }; - key { [ k, K, parenleft, parenleft ] }; - key { [ l, L, parenright, parenright ] }; - key { [ aring, Aring, question, question ] }; - - key { [ z, Z, EuroSign, EuroSign ] }; - key { [ x, X, asciitilde, asciitilde ] }; - key { [ c, C, percent, percent ] }; - key { [ v, V, ampersand, ampersand ] }; - key { [ b, B, plus, plus ] }; - key { [ n, N, less, less ] }; - key { [ m, M, greater, greater ] }; - key { type="EIGHT_LEVEL", [ oslash, Oslash, equal, equal, odiaeresis, Odiaeresis, equal, equal ] }; - key { type="EIGHT_LEVEL", [ ae, AE, apostrophe, apostrophe, adiaeresis, Adiaeresis, apostrophe, apostrophe ] }; - key { [ minus, underscore, underscore, underscore ] }; - - key { [ comma, semicolon, comma, semicolon ] }; - key { [ period, colon, period, colon ] }; -}; - - - -partial alphanumeric_keys -xkb_symbols "ptes" { - name[Group1] = "Portuguese/Spanish"; - - include "nokia_vndr/rx-44(base)" - - key { [ a, A, exclam, exclam ] }; - key { [ s, S, quotedbl, quotedbl ] }; - key { [ d, D, at, at ] }; - key { [ f, F, numbersign, numbersign ] }; - key { [ g, G, asterisk, asterisk ] }; - key { [ h, H, backslash, backslash ] }; - key { [ j, J, slash, slash ] }; - key { [ k, K, parenleft, parenleft ] }; - key { [ l, L, parenright, parenright ] }; - key { [ dead_acute, dead_grave, dead_diaeresis, dead_diaeresis ] }; - - key { [ z, Z, EuroSign, EuroSign ] }; - key { [ x, X, percent, percent ] }; - key { [ c, C, ampersand, ampersand ] }; - key { [ v, V, exclamdown, exclamdown ] }; - key { [ b, B, apostrophe, apostrophe ] }; - key { [ n, N, plus, plus ] }; - key { [ m, M, equal, equal ] }; - key { [ ccedilla, Ccedilla, questiondown, questiondown ] }; - key { [ ntilde, Ntilde, question, question ] }; - key { [ dead_tilde, dead_circumflex, dead_circumflex, dead_circumflex ] }; - - key { [ comma, semicolon, minus, minus ] }; - key { [ period, colon, underscore, underscore ] }; -}; - - - -partial alphanumeric_keys -xkb_symbols "fr" { - name[Group1] = "French"; - - include "nokia_vndr/rx-44(base)" - - key { [ a, A, 1, 1 ] }; - key { [ z, Z, 2, 2 ] }; - - key { [ q, Q, at, at ] }; - key { [ s, S, percent, percent ] }; - key { [ d, D, ecircumflex, Ecircumflex ] }; - key { [ f, F, eacute, Eacute ] }; - key { [ g, G, egrave, Egrave ] }; - key { [ h, H, oe, OE ] }; - key { [ j, J, parenleft, parenleft ] }; - key { [ k, K, parenright, parenright ] }; - key { [ l, L, agrave, Agrave ] }; - key { [ m, M, ugrave, Ugrave ] }; - - key { [ w, w, EuroSign, EuroSign ] }; - key { [ x, X, numbersign, numbersign ] }; - key { [ c, C, ccedilla, Ccedilla ] }; - key { [ v, V, plus, plus ] }; - key { [ b, B, equal, equal ] }; - key { [ n, N, quotedbl, quotedbl ] }; - key { [ comma, question, backslash, backslash ] }; - key { [ semicolon, period, minus, minus ] }; - key { [ colon, slash, underscore, underscore ] }; - key { [ apostrophe, apostrophe, mu, mu ] }; - - key { [ less, greater, less, greater ] }; - key { [ exclam, section, asterisk, asterisk ] }; -}; - - - -partial alphanumeric_keys -xkb_symbols "de" { - name[Group1] = "German"; - - include "nokia_vndr/rx-44(base)" - - key { [ z, Z, 6, 6 ] }; - - key { [ a, A, exclam, exclam ] }; - key { [ s, S, quotedbl, quotedbl ] }; - key { [ d, D, at, at ] }; - key { [ f, F, numbersign, numbersign ] }; - key { [ g, G, percent, percent ] }; - key { [ h, H, backslash, backslash ] }; - key { [ j, J, slash, slash ] }; - key { [ k, K, parenleft, parenleft ] }; - key { [ l, L, parenright, parenright ] }; - key { [ udiaeresis, Udiaeresis, question, question ] }; - - key { [ y, Y, EuroSign, EuroSign ] }; - key { [ x, X, asciitilde, asciitilde ] }; - key { [ c, C, asterisk, asterisk ] }; - key { [ v, V, ampersand, ampersand ] }; - key { [ b, B, plus, plus ] }; - key { [ n, N, less, less ] }; - key { [ m, M, greater, greater ] }; - key { [ odiaeresis, Odiaeresis, equal, equal ] }; - key { [ adiaeresis, Adiaeresis, apostrophe, apostrophe ] }; - key { [ minus, underscore, ssharp, ssharp ] }; - - key { [ comma, semicolon, comma, semicolon ] }; - key { [ period, colon, period, colon ] }; -}; - - -// Levels 5-8 are Russian, levels 1-4 US English, for shortcut reasons. -partial alphanumeric_keys -xkb_symbols "ru" { - name[Group1] = "Russian"; - - include "nokia_vndr/rx-44(base)" - - key { type="EIGHT_LEVEL", [ q, Q, 1, 1, Cyrillic_shorti, Cyrillic_SHORTI, 1, 1 ] }; - key { type="EIGHT_LEVEL", [ w, W, 2, 2, Cyrillic_tse, Cyrillic_TSE, 2, 2 ] }; - key { type="EIGHT_LEVEL", [ e, E, 3, 3, Cyrillic_u, Cyrillic_U, 3, 3 ] }; - key { type="EIGHT_LEVEL", [ r, R, 4, 4, Cyrillic_ka, Cyrillic_KA, 4, 4 ] }; - key { type="EIGHT_LEVEL", [ t, T, 5, 5, Cyrillic_ie, Cyrillic_IE, 5, 5 ] }; - key { type="EIGHT_LEVEL", [ y, Y, 6, 6, Cyrillic_en, Cyrillic_EN, 6, 6 ] }; - key { type="EIGHT_LEVEL", [ u, U, 7, 7, Cyrillic_ghe, Cyrillic_GHE, 7, 7 ] }; - key { type="EIGHT_LEVEL", [ i, I, 8, 8, Cyrillic_sha, Cyrillic_SHA, 8, 8 ] }; - key { type="EIGHT_LEVEL", [ o, O, 9, 9, Cyrillic_shcha, Cyrillic_SHCHA, 9, 9 ] }; - key { type="EIGHT_LEVEL", [ p, P, 0, 0, Cyrillic_ze, Cyrillic_ZE, 0, 0 ] }; - - key { type="EIGHT_LEVEL", [ a, A, exclam, exclam, Cyrillic_ef, Cyrillic_EF, exclam, exclam ] }; - key { type="EIGHT_LEVEL", [ s, S, quotedbl, quotedbl, Cyrillic_yeru, Cyrillic_YERU, quotedbl, quotedbl ] }; - key { type="EIGHT_LEVEL", [ d, D, at, at, Cyrillic_ve, Cyrillic_VE, at, at ] }; - key { type="EIGHT_LEVEL", [ f, F, numbersign, numbersign, Cyrillic_a, Cyrillic_A, numbersign, numbersign ] }; - key { type="EIGHT_LEVEL", [ g, G, backslash, backslash, Cyrillic_pe, Cyrillic_PE, backslash, backslash ] }; - key { type="EIGHT_LEVEL", [ h, H, slash, slash, Cyrillic_er, Cyrillic_ER, slash, slash ] }; - key { type="EIGHT_LEVEL", [ j, J, parenleft, parenleft, Cyrillic_o, Cyrillic_O, parenleft, parenleft ] }; - key { type="EIGHT_LEVEL", [ k, K, parenright, parenright, Cyrillic_el, Cyrillic_EL, parenright, parenright ] }; - key { type="EIGHT_LEVEL", [ l, L, colon, colon, Cyrillic_de, Cyrillic_DE, colon, colon ] }; - key { type="EIGHT_LEVEL", [ NoSymbol, NoSymbol, semicolon, semicolon, Cyrillic_zhe, Cyrillic_ZHE, semicolon, semicolon ] }; - - key { type="EIGHT_LEVEL", [ z, Z, underscore, underscore, Cyrillic_ya, Cyrillic_YA, minus, minus ] }; - key { type="EIGHT_LEVEL", [ x, X, percent, percent, Cyrillic_che, Cyrillic_CHE, percent, percent ] }; - key { type="EIGHT_LEVEL", [ c, C, 0x1002116, 0x1002116, Cyrillic_es, Cyrillic_ES, 0x1002116, 0x1002116 ] }; - key { type="EIGHT_LEVEL", [ v, V, equal, equal, Cyrillic_em, Cyrillic_EM, equal, equal ] }; - key { type="EIGHT_LEVEL", [ b, B, ampersand, ampersand, Cyrillic_i, Cyrillic_I, ampersand, ampersand ] }; - key { type="EIGHT_LEVEL", [ n, N, asterisk, asterisk, Cyrillic_te, Cyrillic_TE, asterisk, asterisk ] }; - key { type="EIGHT_LEVEL", [ m, M, apostrophe, apostrophe, Cyrillic_softsign, Cyrillic_SOFTSIGN, apostrophe, apostrophe ] }; - key { type="EIGHT_LEVEL", [ NoSymbol, NoSymbol, minus, minus, Cyrillic_be, Cyrillic_BE, minus, minus ] }; - key { type="EIGHT_LEVEL", [ NoSymbol, NoSymbol, question, question, Cyrillic_yu, Cyrillic_YU, question, question ] }; - key { type="EIGHT_LEVEL", [ NoSymbol, NoSymbol, Cyrillic_hardsign, Cyrillic_HARDSIGN, Cyrillic_ha, Cyrillic_HA, Cyrillic_hardsign, Cyrillic_HARDSIGN ] }; - - key { type="EIGHT_LEVEL", [ period, comma, period, comma, period, comma, period, comma ] }; - key { type="EIGHT_LEVEL", [ NoSymbol, NoSymbol, Cyrillic_io, Cyrillic_IO, Cyrillic_e, Cyrillic_E, Cyrillic_io, Cyrillic_IO ] }; -}; - - - -partial alphanumeric_keys -xkb_symbols "it" { - name[Group1] = "Italian"; - - include "nokia_vndr/rx-44(base)" - - key { [ a, A, exclam, exclam ] }; - key { [ s, S, quotedbl, quotedbl ] }; - key { [ d, D, at, at ] }; - key { [ f, F, numbersign, numbersign ] }; - key { [ g, G, asterisk, asterisk ] }; - key { [ h, H, backslash, backslash ] }; - key { [ j, J, slash, slash ] }; - key { [ k, K, parenleft, parenleft ] }; - key { [ l, L, parenright, parenright ] }; - key { [ apostrophe, question, igrave, Igrave ] }; - - key { [ z, Z, EuroSign, EuroSign ] }; - key { [ x, X, asciitilde, asciitilde ] }; - key { [ c, C, ampersand, ampersand ] }; - key { [ v, V, equal, equal ] }; - key { [ b, B, less, less ] }; - key { [ n, N, greater, greater ] }; - key { [ m, M, plus, plus ] }; - key { [ eacute, Eacute, ograve, Ograve ] }; - key { [ egrave, Egrave, agrave, Agrave ] }; - key { [ minus, underscore, ugrave, Ugrave ] }; - - key { [ comma, semicolon, comma, semicolon ] }; - key { [ period, colon, period, colon ] }; -}; - -partial default alphanumeric_keys -xkb_symbols "base" { - key { [ q, Q, 1, 1 ] }; - key { [ w, W, 2, 2 ] }; - key { [ e, E, 3, 3 ] }; - key { [ r, R, 4, 4 ] }; - key { [ t, T, 5, 5 ] }; - key { [ y, Y, 6, 6 ] }; - key { [ u, U, 7, 7 ] }; - key { [ i, I, 8, 8 ] }; - key { [ o, O, 9, 9 ] }; - key { [ p, P, 0, 0 ] }; - key { [ BackSpace, BackSpace, BackSpace, BackSpace ] }; - - // broken UI spec. - key { [ KP_Enter, KP_Enter, KP_Enter, KP_Enter ] }; - - key { [ Multi_key, Multi_key, Multi_key, Multi_key ] }; - key { [ Shift_L, Shift_L, Shift_L, Shift_L ] }; - key { [ ISO_Level3_Shift, ISO_Level3_Shift, ISO_Level3_Shift, ISO_Level3_Shift ] }; - key { [ space, space, space, space ] }; - key { [ Control_R, Control_R, Control_R, Control_R ] }; - key { [ Tab, Tab, Tab, Tab ] }; - - modifier_map Shift { Shift_L }; - modifier_map Mod5 { ISO_Level3_Shift }; - modifier_map Control { Control_R }; - - key { [ Return ] }; - key { [ Up ] }; - key { [ Down ] }; - key { [ Left ] }; - key { [ Right ] }; - - key { [ Escape ] }; - key { [ F1 ] }; - key { [ F2 ] }; - key { [ F3 ] }; - key { [ F4 ] }; - key { [ F5 ] }; - key { [ F6 ] }; - key { [ F7 ] }; - key { [ F8 ] }; - key { [ F9 ] }; - key { [ F10 ] }; - key { [ F11 ] }; - key { [ F12 ] }; - - // generated from the headset, must always be in the map. - key { [ XF86Phone ] }; -}; +partial alphanumeric_keys +xkb_symbols "us" { + name[Group1] = "U.S. English"; + + include "nokia_vndr/rx-44(base)" + + key { [ a, A, exclam, exclam ] }; + key { [ s, S, quotedbl, quotedbl ] }; + key { [ d, D, at, at ] }; + key { [ f, F, numbersign, numbersign ] }; + key { [ g, G, backslash, backslash ] }; + key { [ h, H, slash, slash ] }; + key { [ j, J, parenleft, parenleft ] }; + key { [ k, K, parenright, parenright ] }; + key { [ l, L, asterisk, asterisk ] }; + key { [ apostrophe, question, question, question ] }; + + key { [ z, Z, yen, yen ] }; + key { [ x, X, asciicircum, asciicircum ] }; + key { [ c, C, asciitilde, asciitilde ] }; + key { [ v, V, percent, percent ] }; + key { [ b, B, ampersand, ampersand ] }; + key { [ n, N, dollar, dollar ] }; + key { [ m, M, EuroSign, EuroSign ] }; + key { [ semicolon, colon, sterling, sterling ] }; + key { [ minus, underscore, underscore, underscore ] }; + key { [ plus, equal, equal, equal ] }; + + key { [ comma, less, comma, less ] }; + key { [ period, greater, period, greater ] }; +}; + + + +partial alphanumeric_keys +xkb_symbols "fisenoda" { + name[Group1] = "Finnish/Swedish/Norwegian/Danish"; + + include "nokia_vndr/rx-44(base)" + + key { [ a, A, exclam, exclam ] }; + key { [ s, S, quotedbl, quotedbl ] }; + key { [ d, D, at, at ] }; + key { [ f, F, numbersign, numbersign ] }; + key { [ g, G, asterisk, asterisk ] }; + key { [ h, H, backslash, backslash ] }; + key { [ j, J, slash, slash ] }; + key { [ k, K, parenleft, parenleft ] }; + key { [ l, L, parenright, parenright ] }; + key { [ aring, Aring, question, question ] }; + + key { [ z, Z, EuroSign, EuroSign ] }; + key { [ x, X, asciitilde, asciitilde ] }; + key { [ c, C, percent, percent ] }; + key { [ v, V, ampersand, ampersand ] }; + key { [ b, B, plus, plus ] }; + key { [ n, N, less, less ] }; + key { [ m, M, greater, greater ] }; + key { type="EIGHT_LEVEL", [ oslash, Oslash, equal, equal, odiaeresis, Odiaeresis, equal, equal ] }; + key { type="EIGHT_LEVEL", [ ae, AE, apostrophe, apostrophe, adiaeresis, Adiaeresis, apostrophe, apostrophe ] }; + key { [ minus, underscore, underscore, underscore ] }; + + key { [ comma, semicolon, comma, semicolon ] }; + key { [ period, colon, period, colon ] }; +}; + + + +partial alphanumeric_keys +xkb_symbols "ptes" { + name[Group1] = "Portuguese/Spanish"; + + include "nokia_vndr/rx-44(base)" + + key { [ a, A, exclam, exclam ] }; + key { [ s, S, quotedbl, quotedbl ] }; + key { [ d, D, at, at ] }; + key { [ f, F, numbersign, numbersign ] }; + key { [ g, G, asterisk, asterisk ] }; + key { [ h, H, backslash, backslash ] }; + key { [ j, J, slash, slash ] }; + key { [ k, K, parenleft, parenleft ] }; + key { [ l, L, parenright, parenright ] }; + key { [ dead_acute, dead_grave, dead_diaeresis, dead_diaeresis ] }; + + key { [ z, Z, EuroSign, EuroSign ] }; + key { [ x, X, percent, percent ] }; + key { [ c, C, ampersand, ampersand ] }; + key { [ v, V, exclamdown, exclamdown ] }; + key { [ b, B, apostrophe, apostrophe ] }; + key { [ n, N, plus, plus ] }; + key { [ m, M, equal, equal ] }; + key { [ ccedilla, Ccedilla, questiondown, questiondown ] }; + key { [ ntilde, Ntilde, question, question ] }; + key { [ dead_tilde, dead_circumflex, dead_circumflex, dead_circumflex ] }; + + key { [ comma, semicolon, minus, minus ] }; + key { [ period, colon, underscore, underscore ] }; +}; + + + +partial alphanumeric_keys +xkb_symbols "fr" { + name[Group1] = "French"; + + include "nokia_vndr/rx-44(base)" + + key { [ a, A, 1, 1 ] }; + key { [ z, Z, 2, 2 ] }; + + key { [ q, Q, at, at ] }; + key { [ s, S, percent, percent ] }; + key { [ d, D, ecircumflex, Ecircumflex ] }; + key { [ f, F, eacute, Eacute ] }; + key { [ g, G, egrave, Egrave ] }; + key { [ h, H, oe, OE ] }; + key { [ j, J, parenleft, parenleft ] }; + key { [ k, K, parenright, parenright ] }; + key { [ l, L, agrave, Agrave ] }; + key { [ m, M, ugrave, Ugrave ] }; + + key { [ w, w, EuroSign, EuroSign ] }; + key { [ x, X, numbersign, numbersign ] }; + key { [ c, C, ccedilla, Ccedilla ] }; + key { [ v, V, plus, plus ] }; + key { [ b, B, equal, equal ] }; + key { [ n, N, quotedbl, quotedbl ] }; + key { [ comma, question, backslash, backslash ] }; + key { [ semicolon, period, minus, minus ] }; + key { [ colon, slash, underscore, underscore ] }; + key { [ apostrophe, apostrophe, mu, mu ] }; + + key { [ less, greater, less, greater ] }; + key { [ exclam, section, asterisk, asterisk ] }; +}; + + + +partial alphanumeric_keys +xkb_symbols "de" { + name[Group1] = "German"; + + include "nokia_vndr/rx-44(base)" + + key { [ z, Z, 6, 6 ] }; + + key { [ a, A, exclam, exclam ] }; + key { [ s, S, quotedbl, quotedbl ] }; + key { [ d, D, at, at ] }; + key { [ f, F, numbersign, numbersign ] }; + key { [ g, G, percent, percent ] }; + key { [ h, H, backslash, backslash ] }; + key { [ j, J, slash, slash ] }; + key { [ k, K, parenleft, parenleft ] }; + key { [ l, L, parenright, parenright ] }; + key { [ udiaeresis, Udiaeresis, question, question ] }; + + key { [ y, Y, EuroSign, EuroSign ] }; + key { [ x, X, asciitilde, asciitilde ] }; + key { [ c, C, asterisk, asterisk ] }; + key { [ v, V, ampersand, ampersand ] }; + key { [ b, B, plus, plus ] }; + key { [ n, N, less, less ] }; + key { [ m, M, greater, greater ] }; + key { [ odiaeresis, Odiaeresis, equal, equal ] }; + key { [ adiaeresis, Adiaeresis, apostrophe, apostrophe ] }; + key { [ minus, underscore, ssharp, ssharp ] }; + + key { [ comma, semicolon, comma, semicolon ] }; + key { [ period, colon, period, colon ] }; +}; + + +// Levels 5-8 are Russian, levels 1-4 US English, for shortcut reasons. +partial alphanumeric_keys +xkb_symbols "ru" { + name[Group1] = "Russian"; + + include "nokia_vndr/rx-44(base)" + + key { type="EIGHT_LEVEL", [ q, Q, 1, 1, Cyrillic_shorti, Cyrillic_SHORTI, 1, 1 ] }; + key { type="EIGHT_LEVEL", [ w, W, 2, 2, Cyrillic_tse, Cyrillic_TSE, 2, 2 ] }; + key { type="EIGHT_LEVEL", [ e, E, 3, 3, Cyrillic_u, Cyrillic_U, 3, 3 ] }; + key { type="EIGHT_LEVEL", [ r, R, 4, 4, Cyrillic_ka, Cyrillic_KA, 4, 4 ] }; + key { type="EIGHT_LEVEL", [ t, T, 5, 5, Cyrillic_ie, Cyrillic_IE, 5, 5 ] }; + key { type="EIGHT_LEVEL", [ y, Y, 6, 6, Cyrillic_en, Cyrillic_EN, 6, 6 ] }; + key { type="EIGHT_LEVEL", [ u, U, 7, 7, Cyrillic_ghe, Cyrillic_GHE, 7, 7 ] }; + key { type="EIGHT_LEVEL", [ i, I, 8, 8, Cyrillic_sha, Cyrillic_SHA, 8, 8 ] }; + key { type="EIGHT_LEVEL", [ o, O, 9, 9, Cyrillic_shcha, Cyrillic_SHCHA, 9, 9 ] }; + key { type="EIGHT_LEVEL", [ p, P, 0, 0, Cyrillic_ze, Cyrillic_ZE, 0, 0 ] }; + + key { type="EIGHT_LEVEL", [ a, A, exclam, exclam, Cyrillic_ef, Cyrillic_EF, exclam, exclam ] }; + key { type="EIGHT_LEVEL", [ s, S, quotedbl, quotedbl, Cyrillic_yeru, Cyrillic_YERU, quotedbl, quotedbl ] }; + key { type="EIGHT_LEVEL", [ d, D, at, at, Cyrillic_ve, Cyrillic_VE, at, at ] }; + key { type="EIGHT_LEVEL", [ f, F, numbersign, numbersign, Cyrillic_a, Cyrillic_A, numbersign, numbersign ] }; + key { type="EIGHT_LEVEL", [ g, G, backslash, backslash, Cyrillic_pe, Cyrillic_PE, backslash, backslash ] }; + key { type="EIGHT_LEVEL", [ h, H, slash, slash, Cyrillic_er, Cyrillic_ER, slash, slash ] }; + key { type="EIGHT_LEVEL", [ j, J, parenleft, parenleft, Cyrillic_o, Cyrillic_O, parenleft, parenleft ] }; + key { type="EIGHT_LEVEL", [ k, K, parenright, parenright, Cyrillic_el, Cyrillic_EL, parenright, parenright ] }; + key { type="EIGHT_LEVEL", [ l, L, colon, colon, Cyrillic_de, Cyrillic_DE, colon, colon ] }; + key { type="EIGHT_LEVEL", [ NoSymbol, NoSymbol, semicolon, semicolon, Cyrillic_zhe, Cyrillic_ZHE, semicolon, semicolon ] }; + + key { type="EIGHT_LEVEL", [ z, Z, underscore, underscore, Cyrillic_ya, Cyrillic_YA, minus, minus ] }; + key { type="EIGHT_LEVEL", [ x, X, percent, percent, Cyrillic_che, Cyrillic_CHE, percent, percent ] }; + key { type="EIGHT_LEVEL", [ c, C, 0x1002116, 0x1002116, Cyrillic_es, Cyrillic_ES, 0x1002116, 0x1002116 ] }; + key { type="EIGHT_LEVEL", [ v, V, equal, equal, Cyrillic_em, Cyrillic_EM, equal, equal ] }; + key { type="EIGHT_LEVEL", [ b, B, ampersand, ampersand, Cyrillic_i, Cyrillic_I, ampersand, ampersand ] }; + key { type="EIGHT_LEVEL", [ n, N, asterisk, asterisk, Cyrillic_te, Cyrillic_TE, asterisk, asterisk ] }; + key { type="EIGHT_LEVEL", [ m, M, apostrophe, apostrophe, Cyrillic_softsign, Cyrillic_SOFTSIGN, apostrophe, apostrophe ] }; + key { type="EIGHT_LEVEL", [ NoSymbol, NoSymbol, minus, minus, Cyrillic_be, Cyrillic_BE, minus, minus ] }; + key { type="EIGHT_LEVEL", [ NoSymbol, NoSymbol, question, question, Cyrillic_yu, Cyrillic_YU, question, question ] }; + key { type="EIGHT_LEVEL", [ NoSymbol, NoSymbol, Cyrillic_hardsign, Cyrillic_HARDSIGN, Cyrillic_ha, Cyrillic_HA, Cyrillic_hardsign, Cyrillic_HARDSIGN ] }; + + key { type="EIGHT_LEVEL", [ period, comma, period, comma, period, comma, period, comma ] }; + key { type="EIGHT_LEVEL", [ NoSymbol, NoSymbol, Cyrillic_io, Cyrillic_IO, Cyrillic_e, Cyrillic_E, Cyrillic_io, Cyrillic_IO ] }; +}; + + + +partial alphanumeric_keys +xkb_symbols "it" { + name[Group1] = "Italian"; + + include "nokia_vndr/rx-44(base)" + + key { [ a, A, exclam, exclam ] }; + key { [ s, S, quotedbl, quotedbl ] }; + key { [ d, D, at, at ] }; + key { [ f, F, numbersign, numbersign ] }; + key { [ g, G, asterisk, asterisk ] }; + key { [ h, H, backslash, backslash ] }; + key { [ j, J, slash, slash ] }; + key { [ k, K, parenleft, parenleft ] }; + key { [ l, L, parenright, parenright ] }; + key { [ apostrophe, question, igrave, Igrave ] }; + + key { [ z, Z, EuroSign, EuroSign ] }; + key { [ x, X, asciitilde, asciitilde ] }; + key { [ c, C, ampersand, ampersand ] }; + key { [ v, V, equal, equal ] }; + key { [ b, B, less, less ] }; + key { [ n, N, greater, greater ] }; + key { [ m, M, plus, plus ] }; + key { [ eacute, Eacute, ograve, Ograve ] }; + key { [ egrave, Egrave, agrave, Agrave ] }; + key { [ minus, underscore, ugrave, Ugrave ] }; + + key { [ comma, semicolon, comma, semicolon ] }; + key { [ period, colon, period, colon ] }; +}; + +partial default alphanumeric_keys +xkb_symbols "base" { + key { [ q, Q, 1, 1 ] }; + key { [ w, W, 2, 2 ] }; + key { [ e, E, 3, 3 ] }; + key { [ r, R, 4, 4 ] }; + key { [ t, T, 5, 5 ] }; + key { [ y, Y, 6, 6 ] }; + key { [ u, U, 7, 7 ] }; + key { [ i, I, 8, 8 ] }; + key { [ o, O, 9, 9 ] }; + key { [ p, P, 0, 0 ] }; + key { [ BackSpace, BackSpace, BackSpace, BackSpace ] }; + + // broken UI spec. + key { [ KP_Enter, KP_Enter, KP_Enter, KP_Enter ] }; + + key { [ Multi_key, Multi_key, Multi_key, Multi_key ] }; + key { [ Shift_L, Shift_L, Shift_L, Shift_L ] }; + key { [ ISO_Level3_Shift, ISO_Level3_Shift, ISO_Level3_Shift, ISO_Level3_Shift ] }; + key { [ space, space, space, space ] }; + key { [ Control_R, Control_R, Control_R, Control_R ] }; + key { [ Tab, Tab, Tab, Tab ] }; + + modifier_map Shift { Shift_L }; + modifier_map Mod5 { ISO_Level3_Shift }; + modifier_map Control { Control_R }; + + key { [ Return ] }; + key { [ Up ] }; + key { [ Down ] }; + key { [ Left ] }; + key { [ Right ] }; + + key { [ Escape ] }; + key { [ F1 ] }; + key { [ F2 ] }; + key { [ F3 ] }; + key { [ F4 ] }; + key { [ F5 ] }; + key { [ F6 ] }; + key { [ F7 ] }; + key { [ F8 ] }; + key { [ F9 ] }; + key { [ F10 ] }; + key { [ F11 ] }; + key { [ F12 ] }; + + // generated from the headset, must always be in the map. + key { [ XF86Phone ] }; +}; diff --git a/xorg-server/xkeyboard-config/symbols/sgi_vndr/Makefile.am b/xorg-server/xkeyboard-config/symbols/sgi_vndr/Makefile.am index 0133ca001..b1123e70e 100644 --- a/xorg-server/xkeyboard-config/symbols/sgi_vndr/Makefile.am +++ b/xorg-server/xkeyboard-config/symbols/sgi_vndr/Makefile.am @@ -1,4 +1,4 @@ -symbolsdir = $(xkb_base)/symbols/sgi_vndr - -dist_symbols_DATA = \ -jp +symbolsdir = $(xkb_base)/symbols/sgi_vndr + +dist_symbols_DATA = \ +jp diff --git a/xorg-server/xkeyboard-config/symbols/sony_vndr/Makefile.am b/xorg-server/xkeyboard-config/symbols/sony_vndr/Makefile.am index 5577f7c7c..e1a77d957 100644 --- a/xorg-server/xkeyboard-config/symbols/sony_vndr/Makefile.am +++ b/xorg-server/xkeyboard-config/symbols/sony_vndr/Makefile.am @@ -1,4 +1,4 @@ -symbolsdir = $(xkb_base)/symbols/sony_vndr - -dist_symbols_DATA = \ -us +symbolsdir = $(xkb_base)/symbols/sony_vndr + +dist_symbols_DATA = \ +us diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/Makefile.am b/xorg-server/xkeyboard-config/symbols/sun_vndr/Makefile.am index 00692e334..cc4c5b620 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/Makefile.am +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/Makefile.am @@ -1,10 +1,10 @@ -symbolsdir = $(xkb_base)/symbols/sun_vndr - -dist_symbols_DATA = \ - ara be br ca ch \ - cz de dk ee es \ - fi fr gb gr it \ - jp kr lt lv nl \ - no pl pt ro ru \ - se sk solaris tr tuv \ - tw ua us +symbolsdir = $(xkb_base)/symbols/sun_vndr + +dist_symbols_DATA = \ + ara be br ca ch \ + cz de dk ee es \ + fi fr gb gr it \ + jp kr lt lv nl \ + no pl pt ro ru \ + se sk solaris tr tuv \ + tw ua us diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/solaris b/xorg-server/xkeyboard-config/symbols/sun_vndr/solaris index d07b150d1..c435744ee 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/solaris +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/solaris @@ -1,213 +1,213 @@ -//------------------------------------------------------------------------- -// -// Copyright 2010 Sun Microsystems, Inc. All rights reserved. -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, provided that the above -// copyright notice(s) and this permission notice appear in all copies of -// the Software and that both the above copyright notice(s) and this -// permission notice appear in supporting documentation. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder -// shall not be used in advertising or otherwise to promote the sale, use -// or other dealings in this Software without prior written authorization -// of the copyright holder. -// -//------------------------------------------------------------------------- -// - -// -// CDDL HEADER START -// -// The contents of this file are subject to the terms of the -// Common Development and Distribution License (the "License"). -// You may not use this file except in compliance with the License. -// -// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE -// or http://www.opensolaris.org/os/licensing. -// See the License for the specific language governing permissions -// and limitations under the License. -// -// When distributing Covered Code, include this CDDL HEADER in each -// file and include the License file at src/OPENSOLARIS.LICENSE. -// If applicable, add the following below this CDDL HEADER, with the -// fields enclosed by brackets "[]" replaced with your own identifying -// information: Portions Copyright [yyyy] [name of copyright owner] -// -// CDDL HEADER END -// - -// Default map provides backwards compatibility with Sun keyboards from -// long ago and the key mappings still used in Solaris Xsun today - -partial default -xkb_symbols "defaults_common" { - - // Left side keys were labeled L1-L10 on Sun Type 2 & Type 3 keyboards - // and the names have stuck (you can spot a longtime Sun admin when you - // hear them say to hit "L1-A" to enter the OpenBoot PROM) - // These names get mapped to the keysyms F11-F20 - key { [ L1, L1 ], [ SunStop ] }; - key { [ L2, L2 ], [ SunAgain ] }; - key { [ L3, L3 ], [ SunProps ] }; - key { [ L4, L4 ], [ SunUndo ] }; - key { [ L5, L5 ], [ SunFront ] }; - key { [ L6, L6 ], [ SunCopy ] }; - key { [ L7, L7 ], [ SunOpen ] }; - key { [ L8, L8 ], [ SunPaste ] }; - key { [ L9, L9 ], [ SunFind ] }; - key { [ L10, L10 ], [ SunCut ] }; - - // And on the right side, the function keys were labeled R1-R15, - // which get mapped to the keysyms F21-F35 - // This includes the keys that became the numeric keypad - key { [ R1, R1 ], [ Pause ] }; - key { [ R2, R2 ], [ Print ] }; - key { [ R3, R3 ], [ Scroll_Lock, Break ] }; - - key { [ KP_Equal ], [ R4, KP_Equal ] }; - key { [ KP_Divide ], [ R5, KP_Divide ] }; - key { [ KP_Multiply ], [ R6, KP_Multiply ] }; - - key { [ KP_Home, KP_7, R7 ], [ R7, KP_7, Home ] }; - key { [ KP_Up, KP_8, R8 ], [ R8, KP_8, Up ] }; - key { [ KP_Prior, KP_9, R9 ], [ R9, KP_9, Prior ] }; - - key { [ KP_Left, KP_4, R10 ], [ R10, KP_4, Left ] }; - key { [ KP_Begin, KP_5, R11 ], [ R11, KP_5 ] }; - key { [ KP_Right, KP_6, R12 ], [ R12, KP_6, Right ] }; - - key { [ KP_End, KP_1, R13 ], [ R13, KP_1, End ] }; - key { [ KP_Down, KP_2, R14 ], [ R14, KP_2, Down ] }; - key { [ KP_Next, KP_3, R15 ], [ R15, KP_3, Next ] }; - - // F11 & F12 are mapped to SunF36 and SunF37 since they were added - // after F11-F35 were already assigned on Sun keyboards - key { [ SunF36 ], [ F11 ] }; - key { [ SunF37 ], [ F12 ] }; - - // These were added to the keyboard much later and simply got mapped - // to their logical names - key { [ Help ] }; - key { [ SunAudioMute, SunVideoDegauss ] }; - key { [ SunAudioLowerVolume,SunVideoLowerBrightness ] }; - key { [ SunAudioRaiseVolume,SunVideoRaiseBrightness ] }; - key { [ XF86Sleep, XF86Hibernate ] }; - -// key { [ Alt_L ] }; -// key { [ Meta_L ] }; -// key { [ Meta_R ] }; -// key { [ Multi_key ] }; -}; - -partial default -xkb_symbols "defaults" { - include "sun_vndr/solaris(defaults_common)" -// key { [ Mode_switch ] }; -// key { [ Mode_switch ] }; - - // begin modifier mappings -// modifier_map Shift { Shift_R, Shift_L }; -// modifier_map Mod1 { Alt_L }; -// modifier_map Mod2 { Num_Lock }; -// modifier_map Mod3 { Alt_R, Mode_switch }; -// modifier_map Mod4 { Meta_L, Meta_R }; -}; - -partial default -xkb_symbols "defaults_type7jp" { - include "sun_vndr/solaris(defaults_common)" - // begin modifier mappings - modifier_map Shift { Shift_R, Shift_L }; - modifier_map Mod1 { Alt_L , Alt_R}; - modifier_map Mod2 { Num_Lock }; - modifier_map Mod3 { Mode_switch }; - modifier_map Mod4 { Meta_L, Meta_R }; -}; - -// Map the keys to the actual key names instead of the ancient Sun function -// keys -partial -xkb_symbols "keynames" { - key { [ F11 ], [ SunF36 ] }; - key { [ F12 ], [ SunF37 ] }; - - key { [ Cancel ], [ F11 ] }; - key { [ Redo ], [ F12 ] }; - key { [ SunProps ], [ F13 ] }; - key { [ Undo ], [ F14 ] }; - key { [ SunFront ], [ F15 ] }; - key { [ SunCopy ], [ F16 ] }; - key { [ SunOpen ], [ F17 ] }; - key { [ SunPaste ], [ F18 ] }; - key { [ Find ], [ F19 ] }; - key { [ SunCut ], [ F20 ] }; - - key { [ Help ] }; - - key { [ Pause ] }; - key { [ Print ] }; - key { [ Scroll_Lock, Break ] }; - - key { [ KP_Home, KP_7 ] }; - key { [ KP_Up, KP_8 ] }; - key { [ KP_Prior, KP_9 ] }; - - key { [ KP_Left, KP_4 ] }; - key { [ KP_Begin, KP_5 ] }; - key { [ KP_Right, KP_6 ] }; - - key { [ KP_End, KP_1 ] }; - key { [ KP_Down, KP_2 ] }; - key { [ KP_Next, KP_3 ] }; - - key { [ KP_Enter ] }; - key { [ KP_Equal ] }; - - key { [ SunAudioMute, SunVideoDegauss ] }; - key { [ SunAudioLowerVolume, SunVideoLowerBrightness ] }; - key { [ SunAudioRaiseVolume, SunVideoRaiseBrightness ] }; - key { [ SunPowerSwitch, SunPowerSwitchShift ] }; - - key { [ Alt_L ] }; - key { [ Mode_switch ] }; - key { [ Mode_switch ] }; - key { [ Meta_L ] }; - key { [ Meta_R ] }; - key { [ Multi_key ] }; - -}; - -// Map the keys to the XFree86 key names instead of the Sun key names -partial -xkb_symbols "xf86keynames" { - key { [ XF86Stop ], [ F11 ] }; - key { [ Redo ], [ F12 ] }; - key { [ SunProps ], [ F13 ] }; - key { [ Undo ], [ F14 ] }; - key { [ SunFront ], [ F15 ] }; - key { [ XF86Copy ], [ F16 ] }; - key { [ XF86Open ], [ F17 ] }; - key { [ XF86Paste ], [ F18 ] }; - key { [ Find ], [ F19 ] }; - key { [ XF86Cut ], [ F20 ] }; - - key { [ XF86AudioMute, SunVideoDegauss ] }; - key { [ XF86AudioLowerVolume,SunVideoLowerBrightness ] }; - key { [ XF86AudioRaiseVolume,SunVideoRaiseBrightness ] }; - key { [ XF86Sleep, XF86PowerDown ] }; -}; +//------------------------------------------------------------------------- +// +// Copyright 2010 Sun Microsystems, Inc. All rights reserved. +// +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, and/or sell copies of the Software, and to permit persons +// to whom the Software is furnished to do so, provided that the above +// copyright notice(s) and this permission notice appear in all copies of +// the Software and that both the above copyright notice(s) and this +// permission notice appear in supporting documentation. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL +// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING +// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +// +// Except as contained in this notice, the name of a copyright holder +// shall not be used in advertising or otherwise to promote the sale, use +// or other dealings in this Software without prior written authorization +// of the copyright holder. +// +//------------------------------------------------------------------------- +// + +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + +// Default map provides backwards compatibility with Sun keyboards from +// long ago and the key mappings still used in Solaris Xsun today + +partial default +xkb_symbols "defaults_common" { + + // Left side keys were labeled L1-L10 on Sun Type 2 & Type 3 keyboards + // and the names have stuck (you can spot a longtime Sun admin when you + // hear them say to hit "L1-A" to enter the OpenBoot PROM) + // These names get mapped to the keysyms F11-F20 + key { [ L1, L1 ], [ SunStop ] }; + key { [ L2, L2 ], [ SunAgain ] }; + key { [ L3, L3 ], [ SunProps ] }; + key { [ L4, L4 ], [ SunUndo ] }; + key { [ L5, L5 ], [ SunFront ] }; + key { [ L6, L6 ], [ SunCopy ] }; + key { [ L7, L7 ], [ SunOpen ] }; + key { [ L8, L8 ], [ SunPaste ] }; + key { [ L9, L9 ], [ SunFind ] }; + key { [ L10, L10 ], [ SunCut ] }; + + // And on the right side, the function keys were labeled R1-R15, + // which get mapped to the keysyms F21-F35 + // This includes the keys that became the numeric keypad + key { [ R1, R1 ], [ Pause ] }; + key { [ R2, R2 ], [ Print ] }; + key { [ R3, R3 ], [ Scroll_Lock, Break ] }; + + key { [ KP_Equal ], [ R4, KP_Equal ] }; + key { [ KP_Divide ], [ R5, KP_Divide ] }; + key { [ KP_Multiply ], [ R6, KP_Multiply ] }; + + key { [ KP_Home, KP_7, R7 ], [ R7, KP_7, Home ] }; + key { [ KP_Up, KP_8, R8 ], [ R8, KP_8, Up ] }; + key { [ KP_Prior, KP_9, R9 ], [ R9, KP_9, Prior ] }; + + key { [ KP_Left, KP_4, R10 ], [ R10, KP_4, Left ] }; + key { [ KP_Begin, KP_5, R11 ], [ R11, KP_5 ] }; + key { [ KP_Right, KP_6, R12 ], [ R12, KP_6, Right ] }; + + key { [ KP_End, KP_1, R13 ], [ R13, KP_1, End ] }; + key { [ KP_Down, KP_2, R14 ], [ R14, KP_2, Down ] }; + key { [ KP_Next, KP_3, R15 ], [ R15, KP_3, Next ] }; + + // F11 & F12 are mapped to SunF36 and SunF37 since they were added + // after F11-F35 were already assigned on Sun keyboards + key { [ SunF36 ], [ F11 ] }; + key { [ SunF37 ], [ F12 ] }; + + // These were added to the keyboard much later and simply got mapped + // to their logical names + key { [ Help ] }; + key { [ SunAudioMute, SunVideoDegauss ] }; + key { [ SunAudioLowerVolume,SunVideoLowerBrightness ] }; + key { [ SunAudioRaiseVolume,SunVideoRaiseBrightness ] }; + key { [ XF86Sleep, XF86Hibernate ] }; + +// key { [ Alt_L ] }; +// key { [ Meta_L ] }; +// key { [ Meta_R ] }; +// key { [ Multi_key ] }; +}; + +partial default +xkb_symbols "defaults" { + include "sun_vndr/solaris(defaults_common)" +// key { [ Mode_switch ] }; +// key { [ Mode_switch ] }; + + // begin modifier mappings +// modifier_map Shift { Shift_R, Shift_L }; +// modifier_map Mod1 { Alt_L }; +// modifier_map Mod2 { Num_Lock }; +// modifier_map Mod3 { Alt_R, Mode_switch }; +// modifier_map Mod4 { Meta_L, Meta_R }; +}; + +partial default +xkb_symbols "defaults_type7jp" { + include "sun_vndr/solaris(defaults_common)" + // begin modifier mappings + modifier_map Shift { Shift_R, Shift_L }; + modifier_map Mod1 { Alt_L , Alt_R}; + modifier_map Mod2 { Num_Lock }; + modifier_map Mod3 { Mode_switch }; + modifier_map Mod4 { Meta_L, Meta_R }; +}; + +// Map the keys to the actual key names instead of the ancient Sun function +// keys +partial +xkb_symbols "keynames" { + key { [ F11 ], [ SunF36 ] }; + key { [ F12 ], [ SunF37 ] }; + + key { [ Cancel ], [ F11 ] }; + key { [ Redo ], [ F12 ] }; + key { [ SunProps ], [ F13 ] }; + key { [ Undo ], [ F14 ] }; + key { [ SunFront ], [ F15 ] }; + key { [ SunCopy ], [ F16 ] }; + key { [ SunOpen ], [ F17 ] }; + key { [ SunPaste ], [ F18 ] }; + key { [ Find ], [ F19 ] }; + key { [ SunCut ], [ F20 ] }; + + key { [ Help ] }; + + key { [ Pause ] }; + key { [ Print ] }; + key { [ Scroll_Lock, Break ] }; + + key { [ KP_Home, KP_7 ] }; + key { [ KP_Up, KP_8 ] }; + key { [ KP_Prior, KP_9 ] }; + + key { [ KP_Left, KP_4 ] }; + key { [ KP_Begin, KP_5 ] }; + key { [ KP_Right, KP_6 ] }; + + key { [ KP_End, KP_1 ] }; + key { [ KP_Down, KP_2 ] }; + key { [ KP_Next, KP_3 ] }; + + key { [ KP_Enter ] }; + key { [ KP_Equal ] }; + + key { [ SunAudioMute, SunVideoDegauss ] }; + key { [ SunAudioLowerVolume, SunVideoLowerBrightness ] }; + key { [ SunAudioRaiseVolume, SunVideoRaiseBrightness ] }; + key { [ SunPowerSwitch, SunPowerSwitchShift ] }; + + key { [ Alt_L ] }; + key { [ Mode_switch ] }; + key { [ Mode_switch ] }; + key { [ Meta_L ] }; + key { [ Meta_R ] }; + key { [ Multi_key ] }; + +}; + +// Map the keys to the XFree86 key names instead of the Sun key names +partial +xkb_symbols "xf86keynames" { + key { [ XF86Stop ], [ F11 ] }; + key { [ Redo ], [ F12 ] }; + key { [ SunProps ], [ F13 ] }; + key { [ Undo ], [ F14 ] }; + key { [ SunFront ], [ F15 ] }; + key { [ XF86Copy ], [ F16 ] }; + key { [ XF86Open ], [ F17 ] }; + key { [ XF86Paste ], [ F18 ] }; + key { [ Find ], [ F19 ] }; + key { [ XF86Cut ], [ F20 ] }; + + key { [ XF86AudioMute, SunVideoDegauss ] }; + key { [ XF86AudioLowerVolume,SunVideoLowerBrightness ] }; + key { [ XF86AudioRaiseVolume,SunVideoRaiseBrightness ] }; + key { [ XF86Sleep, XF86PowerDown ] }; +}; diff --git a/xorg-server/xkeyboard-config/symbols/xfree68_vndr/Makefile.am b/xorg-server/xkeyboard-config/symbols/xfree68_vndr/Makefile.am index e7b931bf0..50be49bb4 100644 --- a/xorg-server/xkeyboard-config/symbols/xfree68_vndr/Makefile.am +++ b/xorg-server/xkeyboard-config/symbols/xfree68_vndr/Makefile.am @@ -1,4 +1,4 @@ -symbolsdir = $(xkb_base)/symbols/xfree68_vndr - -dist_symbols_DATA = \ -amiga ataritt +symbolsdir = $(xkb_base)/symbols/xfree68_vndr + +dist_symbols_DATA = \ +amiga ataritt -- cgit v1.2.3