From b81026c0b555fb393504e687a649394348c32fba Mon Sep 17 00:00:00 2001 From: svu Date: Thu, 18 Oct 2007 20:46:07 +0000 Subject: [PATCH] added some br and pt layouts, b.fd.o#12816 --- ChangeLog | 6 + geometry/pc | 132 +++------------------ rules/base.xml.in | 48 ++++++++ rules/compat/base.lists.part | 2 +- symbols/br | 218 ++++++++++++++++++++++++++++++++++- symbols/pt | 120 +++++++++++++++++++ 6 files changed, 403 insertions(+), 123 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9fd6760..b28296e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-10-18 Sergey Udaltsov + + * geometry/pc, rules/base.xml.in, rules/compat/base.lists.part, + symbols/br, symbols/pt: added some br and pt layouts, + https://bugs.freedesktop.org/show_bug.cgi?id=12816 + 2007-10-13 Sergey Udaltsov * symbols/inet, rules/base.lists.part, rules/base.xml.in: added diNovo diff --git a/geometry/pc b/geometry/pc index 2941dab..4efe5c3 100644 --- a/geometry/pc +++ b/geometry/pc @@ -828,83 +828,27 @@ xkb_geometry "jp106" { // Added for brazilian ABNT2 by Ricardo Y. Igarashi(iga@that.com.br) xkb_geometry "abnt2" { + include "pc(pc105)" description= "Brazilian ABNT2"; - width= 470; - height= 180; - shape.cornerRadius= 1; - shape "NORM" { { [ 18,18] }, { [2,1], [ 16,17] } }; - shape "BKSP" { { [ 37,18] }, { [2,1], [ 35,17] } }; - shape "TABK" { { [ 28,18] }, { [2,1], [ 26,17] } }; - shape "BKSL" { { [ 27,18] }, { [2,1], [ 25,17] } }; shape "RTRN" { - { [0,0],[ 27,0],[27,37],[4,37],[4,18],[0,18] } , - { [2,1],[ 25,1],[25,36],[5,36],[5,17],[2,17] } }; - shape "CAPS" { { [ 32,18] }, { [2,1], [ 30,17] } }; - shape "LFSH" { { [ 24,18] }, { [2,1], [ 22,17] } }; - shape "RTSH" { { [ 31,18] }, { [2,1], [ 29,17] } }; - shape "MODK" { { [ 28,18] }, { [2,1], [ 26,17] } }; - shape "SPCE" { { [133,18] }, { [2,1], [131,17] } }; - shape "KP0" { { [ 37,18] }, { [2,1], [ 35,17] } }; - shape "KPAD" { { [ 18,37] }, { [2,1], [ 16,36] } }; - - shape "LEDS" { cornerRadius= 0, { [ 76 ,20 ] } }; - shape "LED" { cornerRadius= 0, { [ 5, 1 ] } }; - solid "LedPanel" { - shape= "LEDS"; - top= 25; - left= 375; - color= "grey10"; - }; - - indicator.onColor= "green"; - indicator.offColor= "green30"; - indicator.top= 40; - indicator.shape= "LED"; - indicator "Num Lock" { left= 379; }; - indicator "Caps Lock" { left= 404; }; - indicator "Scroll Lock" { left= 429; }; - text.top= 28; - text.color= "black"; - text "NumLockLabel" { left= 378; text="Num\nLock"; }; - text "CapsLockLabel" { left= 403; text="Caps\nLock"; }; - text "ScrollLockLabel" { left= 428; text="Scroll\nLock"; }; + { [0,0],[ 28,0],[28,37],[4,37],[4,18],[0,18] } , + { [2,1],[ 26,1],[26,36],[5,36],[5,18],[2,18] } }; + shape "RTSH" { { [ 31,18] }, { [2,1], [ 29,16] } }; section.left= 19; row.left= 1; key.shape= "NORM"; key.gap= 1; - section "Function" { - top= 25; - row { - top= 1; - keys { { , color="grey20" }, - { , 18 }, , , , - { , 11 ,color="grey20"}, {,color="grey20"}, - { , color="grey20"}, {,color="grey20"}, - { , 11 }, , , , - { , 8 }, , - }; - }; - }; // End of "Function" section - section "Alpha" { - top= 61; - row { - top= 1; - keys { {,color="grey20"}, , , - , , , , , - , , , , , - { , "BKSP", color="grey20" } - }; - }; + top= 91; row { top= 20; keys { { , "TABK", color="grey20" }, , , , , , , , , , , - , , { , 1 ,"RTRN",color="grey20" } + , , { , "RTRN", color="grey20" } }; }; row { @@ -917,75 +861,27 @@ xkb_geometry "abnt2" { }; row { top= 58; - keys { { , "LFSH", color="grey20" }, , - , , , , , - , , , , , - , { , "RTSH", color="grey20" } - }; - }; - row { - top= 77; - key.shape= "MODK"; - key.color= "grey20"; - keys { , { , 20 }, - { , "SPCE", color="white" }, - , { , 17 } + keys { { , "LFSH", color="grey20" }, + , , , , , , + , , , , , , + { , "RTSH", color="grey20" } }; }; }; // End of "Alpha" section - section "Editing" { - top= 61; - left= 310; - key.color= "grey20"; - row { - top= 1; - keys { , , }; - }; - row { - top= 20; - keys { , , }; - }; - row { - top= 58; - left= 20; - keys { }; - }; - row { - top= 77; - keys { , , }; - }; - }; // End of "Editing" section - section "Keypad" { - top= 61; - left= 375; - row { - top= 1; - key.color= "grey20"; - keys { , , , }; - }; + top= 91; + left= 376; row { top= 20; - keys { , , , { , "KPAD", color="grey20" } }; + keys { , , , { , color="grey20" } }; }; row { top= 39; - keys { , , }; - }; - row { - top= 58; - keys { , , , { , "KPAD", color="grey20" } }; - }; - row { - top= 77; - keys { { , "KP0" }, }; + keys { , , , { , color="grey20" } }; }; }; // End of "Keypad" section - alias = ; - alias = ; - }; // End of "abnt2" geometry diff --git a/rules/base.xml.in b/rules/base.xml.in index ecb44bf..50d28e3 100644 --- a/rules/base.xml.in +++ b/rules/base.xml.in @@ -1399,6 +1399,36 @@ <_description>Eliminate dead keys + + + thinkpad + Thinkpad + + + + + dvorak + Dvorak + + + + + nativo + Nativo + + + + + nativo-us + Nativo for USA keyboards + + + + + nativo-epo + Nativo for Esperanto + + @@ -2665,6 +2695,24 @@ <_description>Macintosh, Sun dead keys + + + nativo + Nativo + + + + + nativo-us + Nativo for USA keyboards + + + + + nativo-epo + Nativo for Esperanto + + diff --git a/rules/compat/base.lists.part b/rules/compat/base.lists.part index 7e5621b..f1cf7ee 100644 --- a/rules/compat/base.lists.part +++ b/rules/compat/base.lists.part @@ -1,2 +1,2 @@ -! $dvoraklayouts = ca de ee es fr gb no pl se us +! $dvoraklayouts = br ca de ee es fr gb no pl se us diff --git a/symbols/br b/symbols/br index dc07edc..2cd9807 100644 --- a/symbols/br +++ b/symbols/br @@ -1,13 +1,13 @@ - +// $XKeyboardConfig$ +// $XdotOrg: xc/programs/xkbcomp/symbols/br,v 1.1.4.3 2004/03/05 13:41:32 eich Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/br,v 1.3 2003/04/19 12:22:11 pascal Exp $ +// // based on // "a very simple Brasilian ABNT2 keyboard // by Ricardo Y. Igarashi (iga@that.com.br) // Adds suport for dead-keys in I18N applications // by Conectiva (http://www.conectiva.com.br)" // -// $XKeyboardConfig$ -// $XdotOrg: xc/programs/xkbcomp/symbols/br,v 1.1.4.3 2004/03/05 13:41:32 eich Exp $ -// $XFree86: xc/programs/xkbcomp/symbols/br,v 1.3 2003/04/19 12:22:11 pascal Exp $ default xkb_symbols "abnt2" { @@ -64,6 +64,7 @@ xkb_symbols "nodeadkeys" { key { [ semicolon, colon, dead_belowdot, abovedot ] }; }; + // ABNT2 Keyboard to IBM/Lenovo Thinkpads // by Piter PUNK // @@ -76,6 +77,7 @@ xkb_symbols "thinkpad" { key { [ slash, question, degree, questiondown ] }; }; + partial alphanumeric_keys xkb_symbols "olpc" { @@ -110,3 +112,211 @@ xkb_symbols "olpc" { include "level3(ralt_switch)" }; + +// +// Brazilian Dvorak keyboard 2005-04-18 +// "Teclado Simplificado Brasileiro" ou "Dvorak Brasileiro" +// +// Heitor Moraes heitor.moraes@gmail.com +// Luiz Portella lfpor@lujz.org +// Nando Florestan nando2003@mandic.com.br +// Ari Caldeira ari@tecladobrasileiro.com.br +// +partial alphanumeric_keys +xkb_symbols "dvorak" { + + name[Group1]="Brazil - Dvorak"; + +// Numeric row + key { [ apostrophe, quotedbl, dead_caron, dead_doubleacute ] }; + key { [ 1, exclam, onesuperior, exclamdown ] }; + key { [ 2, at, twosuperior, onehalf ] }; + key { [ 3, numbersign, threesuperior, threequarters ] }; + key { [ 4, dollar, sterling, onequarter ] }; + key { [ 5, percent, cent, 0x01002030 ] }; + key { [ 6, dead_diaeresis, notsign, diaeresis ] }; + key { [ 7, ampersand, dead_belowdot, dead_abovedot ] }; + key { [ 8, asterisk, dead_ogonek, dead_horn ] }; + key { [ 9, parenleft, dead_cedilla, dead_hook ] }; + key { [ 0, parenright, dead_macron, dead_breve ] }; + key { [ bracketleft, braceleft, ordfeminine, 0x01000326 ] }; + key { [ bracketright, braceright, masculine, dead_abovering ] }; + + +// Upper row + key { [ slash, question, degree, questiondown ] }; + key { [ comma, less, 0x01000329, 0x01000313 ] }; + key { [ period, greater, 0x01002022, periodcentered ] }; + key { [ p, P, thorn, THORN ] }; + key { [ y, Y, yen, yen ] }; + key { [ f, F, leftdoublequotemark, leftsinglequotemark ] }; + key { [ g, G, rightdoublequotemark, rightsinglequotemark ] }; + key { [ c, C, uparrow, copyright ] }; + key { [ r, R, registered, registered ] }; + key { [ l, L, lstroke, Lstroke ] }; + key { [ dead_acute, dead_grave, acute, grave ] }; + key { [ equal, plus, section, plusminus ] }; + +// Central row + key { [ a, A, ae, AE ] }; + key { [ o, O, oe, OE ] }; + key { [ e, E, EuroSign, EuroSign ] }; + key { [ u, U, oslash, Ooblique ] }; + key { [ i, I, idotless, Iabovedot ] }; + key { [ d, D, eth, ETH ] }; + key { [ h, H, leftarrow, paragraph ] }; + key { [ t, T, rightarrow, trademark ] }; + key { [ n, N, eng, ENG ] }; + key { [ s, S, ssharp, ssharp ] }; + key { [ dead_tilde, dead_circumflex, asciitilde, asciicircum ] }; + key { [ minus, underscore, 0x01002015, 0x01000336 ] }; + +// Lower row + key { [ ccedilla, Ccedilla, backslash, bar ] }; + key { [ semicolon, colon, 0x01000331, 0x0100032D ] }; + key { [ q, Q, 0x01000259, 0x0100018F ] }; + key { [ j, J, 0x01000292, 0x010001B7 ] }; + key { [ k, K, guillemotleft, 0x01002039 ] }; + key { [ x, X, multiply, division ] }; + key { [ b, B, guillemotright, 0x0100203A ] }; + key { [ m, M, downarrow, mu ] }; + key { [ w, W, ubreve, Ubreve ] }; + key { [ v, V, doublelowquotemark, singlelowquotemark ] }; + key { [ z, Z, 0x0100201F, 0x0100201B ] }; + key { [ backslash, bar, currency, brokenbar ] }; + + key { [ space, space, nobreakspace, nobreakspace ] }; + +// Configures the "." and the "," for the numeric keypad + key { [ KP_Decimal ] }; + include "kpdl(comma)" + +// Configures the use of the AltGr key + include "level3(ralt_switch)" + +}; + + +// +// Teclado Nativo Brasileiro 2005-07-19 +// Brazilian Nativo Keyboard +// This is a Dvorak-based layout, designed for the Portuguese language +// +// Ari Caldeira ari@tecladobrasileiro.com.br +// +partial alphanumeric_keys +xkb_symbols "nativo" { + + name[Group1]="Brazil - Nativo"; + +// Numeric row + key { [ equal, plus, section, plusminus ] }; + key { [ 1, exclam, onesuperior, exclamdown ] }; + key { [ 2, at, twosuperior, onehalf ] }; + key { [ 3, numbersign, threesuperior, threequarters ] }; + key { [ 4, dollar, sterling, onequarter ] }; + key { [ 5, percent, cent, 0x01002030 ] }; + key { [ 6, dead_diaeresis, notsign, diaeresis ] }; + key { [ 7, ampersand, dead_belowdot, dead_abovedot ] }; + key { [ 8, asterisk, dead_ogonek, dead_horn ] }; + key { [ 9, parenleft, dead_cedilla, dead_hook ] }; + key { [ 0, parenright, dead_macron, dead_breve ] }; + key { [ bracketleft, braceleft, ordfeminine, 0x01000326 ] }; + key { [ bracketright, braceright, masculine, dead_abovering ] }; + +// Upper row + key { [ slash, question, degree, questiondown ] }; + key { [ comma, less, 0x01000329, 0x01000313 ] }; + key { [ period, greater, 0x01002022, periodcentered ] }; + key { [ h, H, paragraph, paragraph ] }; + key { [ x, X, multiply, division ] }; + key { [ w, W, ubreve, Ubreve ] }; + key { [ l, L, lstroke, Lstroke ] }; + key { [ t, T, trademark, trademark ] }; + key { [ c, C, copyright, copyright ] }; + key { [ p, P, thorn, THORN ] }; + key { [ dead_tilde, dead_circumflex, asciitilde, asciicircum ] }; + key { [ minus, underscore, 0x01002015, 0x01000336 ] }; + +// Central row + key { [ i, I, idotless, Iabovedot ] }; + key { [ e, E, EuroSign, EuroSign ] }; + key { [ a, A, ae, AE ] }; + key { [ o, O, oe, OE ] }; + key { [ u, U, oslash, Ooblique ] }; + key { [ m, M, mu, mu ] }; + key { [ d, D, eth, ETH ] }; + key { [ s, S, ssharp, ssharp ] }; + key { [ r, R, registered, registered ] }; + key { [ n, N, eng, ENG ] }; + key { [ dead_acute, dead_grave, acute, grave ] }; + key { [ apostrophe, quotedbl, dead_caron, dead_doubleacute ] }; + +// Lower row + key { [ semicolon, colon, 0x01000331, 0x0100032D ] }; + key { [ y, Y, yen, yen ] }; + key { [ ccedilla, Ccedilla, backslash, bar ] }; + key { [ j, J, 0x01000292, 0x010001B7 ] }; + key { [ b, B, guillemotleft, 0x01002039 ] }; + key { [ k, K, guillemotright, 0x0100203A ] }; + key { [ q, Q, 0x01000259, 0x0100018F ] }; + key { [ v, V, doublelowquotemark, singlelowquotemark ] }; + key { [ g, G, leftdoublequotemark, leftsinglequotemark ] }; + key { [ f, F, rightdoublequotemark, rightsinglequotemark ] }; + key { [ z, Z, 0x0100201F, 0x0100201B ] }; + key { [ backslash, bar, currency, brokenbar ] }; + + key { [ space, space, nobreakspace, nobreakspace ] }; + +// Configures the "." and the "," for the numeric keypad + key { [ KP_Decimal ] }; + include "kpdl(comma)" + +// Configures the use of the AltGr key + include "level3(ralt_switch)" + +}; + + +// +// Teclado Nativo Brasileiro para o teclado estadunidense 2005-07-19 +// Brazilian Nativo Keyboard for USA keyboards +// +// Ari Caldeira ari@tecladobrasileiro.com.br +// +partial alphanumeric_keys +xkb_symbols "nativo-us" { + include "br(nativo)" + + name[Group1]="Brazil - Nativo for USA keyboards"; + +// Lower row + key { [ y, Y, ccedilla, Ccedilla ] }; + key { [ semicolon, colon, backslash, bar ] }; + +}; + + +// +// Teclado Nativo Brasileiro para digitacao em Esperanto 2005-07-19 +// Brazilian Nativo Keyboard for typing Esperanto +// +// Ari Caldeira ari@tecladobrasileiro.com.br +// +partial alphanumeric_keys +xkb_symbols "nativo-epo" { + include "br(nativo)" + + name[Group1]="Brazil - Nativo for Esperanto"; + +// Upper row Esperanto + key { [ h, H, hcircumflex, Hcircumflex ] }; + key { [ ccircumflex, Ccircumflex, x, X ] }; + key { [ ubreve, Ubreve, w, W ] }; + +// Lower row Esperanto + key { [ jcircumflex, Jcircumflex, y, Y ] }; + key { [ scircumflex, Scircumflex, ccedilla, Ccedilla ] }; + key { [ gcircumflex, Gcircumflex, q, Q ] }; + +}; diff --git a/symbols/pt b/symbols/pt index a86fc45..ba141b3 100644 --- a/symbols/pt +++ b/symbols/pt @@ -102,3 +102,123 @@ xkb_symbols "mac_nodeadkeys" { key { [ asciitilde, asciicircum ] }; key { [ acute, grave ] }; }; + + +// +// Teclado Nativo Portugues 2005-07-19 +// Portuguese Nativo Keyboard +// This is a Dvorak-based layout, designed for the Portuguese language +// +// Ari Caldeira ari@tecladobrasileiro.com.br +// +partial alphanumeric_keys +xkb_symbols "nativo" { + + name[Group1]="Portugal - Nativo"; + +// Numeric row + key { [ plus, asterisk, dead_diaeresis, plusminus ] }; + key { [ 1, exclam, onesuperior, exclamdown ] }; + key { [ 2, quotedbl, at, twosuperior ] }; + key { [ 3, numbersign, sterling, threesuperior ] }; + key { [ 4, dollar, section, onequarter ] }; + key { [ 5, percent, cent, 0x01002030 ] }; + key { [ 6, ampersand, notsign, diaeresis ] }; + key { [ 7, slash, braceleft, 0x0100032D ] }; + key { [ 8, parenleft, bracketleft, 0x01000331 ] }; + key { [ 9, parenright, bracketright, dead_horn ] }; + key { [ 0, equal, braceright, dead_hook ] }; + key { [ masculine, ordfeminine, dead_ogonek, 0x01000326 ] }; + key { [ less, greater, dead_cedilla, dead_abovering ] }; + +// Upper row + key { [ apostrophe, question, degree, questiondown ] }; + key { [ comma, semicolon, 0x01000329, 0x01000315 ] }; + key { [ period, colon, 0x01002022, periodcentered ] }; + key { [ h, H, paragraph, paragraph ] }; + key { [ x, X, multiply, division ] }; + key { [ w, W, ubreve, Ubreve ] }; + key { [ l, L, lstroke, Lstroke ] }; + key { [ t, T, trademark, trademark ] }; + key { [ c, C, copyright, copyright ] }; + key { [ p, P, thorn, THORN ] }; + key { [ dead_tilde, dead_circumflex, dead_caron, dead_doubleacute ] }; + key { [ minus, underscore, 0x01002015, 0x01000336 ] }; + +// Central row + key { [ i, I, idotless, Iabovedot ] }; + key { [ e, E, EuroSign, EuroSign ] }; + key { [ a, A, ae, AE ] }; + key { [ o, O, oe, OE ] }; + key { [ u, U, oslash, Ooblique ] }; + key { [ m, M, mu, mu ] }; + key { [ d, D, eth, ETH ] }; + key { [ s, S, ssharp, ssharp ] }; + key { [ r, R, registered, registered ] }; + key { [ n, N, eng, ENG ] }; + key { [ dead_acute, dead_grave, dead_macron, dead_breve ] }; + key { [ backslash, bar, dead_belowdot, dead_abovedot ] }; + +// Lower row + key { [ guillemotleft, guillemotright, 0x01002039, 0x0100203A ] }; + key { [ y, Y, yen, yen ] }; + key { [ ccedilla, Ccedilla ] }; + key { [ j, J, 0x01000292, 0x010001B7 ] }; + key { [ b, B, apostrophe, quotedbl ] }; + key { [ k, K, currency, brokenbar ] }; + key { [ q, Q, 0x01000259, 0x0100018F ] }; + key { [ v, V, doublelowquotemark, singlelowquotemark ] }; + key { [ g, G, leftdoublequotemark, leftsinglequotemark ] }; + key { [ f, F, rightdoublequotemark, rightsinglequotemark ] }; + key { [ z, Z, 0x0100201F, 0x0100201B ] }; + + key { [ space, space, nobreakspace, nobreakspace ] }; + +// Configures the use of the AltGr key + include "level3(ralt_switch)" + +}; + + +// +// Teclado Nativo Portugues para o teclado estadunidense 2005-07-19 +// Portuguese Nativo Keyboard for USA keyboards +// +// Ari Caldeira ari@tecladobrasileiro.com.br +// +partial alphanumeric_keys +xkb_symbols "nativo-us" { + include "pt(nativo)" + + name[Group1]="Portugal - Nativo for USA keyboards"; + +// Lower row + key { [ y, Y, ccedilla, Ccedilla ] }; + key { [ guillemotleft, guillemotright, 0x01002039, 0x0100203A ] }; + +}; + + +// +// Teclado Nativo Portugues para digitacao em Esperanto 2005-07-19 +// Portuguese Nativo Keyboard for typing Esperanto +// +// Ari Caldeira ari@tecladobrasileiro.com.br +// +partial alphanumeric_keys +xkb_symbols "nativo-epo" { + include "pt(nativo)" + + name[Group1]="Portugal - Nativo for Esperanto"; + +// Upper row Esperanto + key { [ h, H, hcircumflex, Hcircumflex ] }; + key { [ ccircumflex, Ccircumflex, x, X ] }; + key { [ ubreve, Ubreve, w, W ] }; + +// Lower row Esperanto + key { [ jcircumflex, Jcircumflex, y, Y ] }; + key { [ scircumflex, Scircumflex, ccedilla, Ccedilla ] }; + key { [ gcircumflex, Gcircumflex, q, Q ] }; + +}; \ No newline at end of file -- 2.32.0.93.g670b81a890