From c38dead3ea7e177728d90cd815cf4eead0c9f534 Mon Sep 17 00:00:00 2001 From: marha Date: Sat, 15 May 2010 16:28:11 +0000 Subject: xserver git update 15/5/2010 --- xorg-server/xkbdata.src/symbols/fi | 438 +++++++++---------- xorg-server/xkbdata.src/symbols/hu | 859 +++++++++++++++++++------------------ 2 files changed, 639 insertions(+), 658 deletions(-) (limited to 'xorg-server/xkbdata.src') diff --git a/xorg-server/xkbdata.src/symbols/fi b/xorg-server/xkbdata.src/symbols/fi index 6c5a3e6af..78dd91934 100644 --- a/xorg-server/xkbdata.src/symbols/fi +++ b/xorg-server/xkbdata.src/symbols/fi @@ -1,231 +1,207 @@ -// based on a keyboard map from an 'xkb/symbols/fi' file -// -// $XKeyboardConfig$ -// $XFree86: xc/programs/xkbcomp/symbols/fi,v 1.9 2003/01/29 17:17:31 dawes Exp $ - -// Troy Korjuslommi, -// Jan 6, 2006 -// May 5, 2006 -// May 6, 2006 -// May 12, 2006 -// Oct 10, 2007 -// Nov 11, 2008 -// Nov 29, 2008 -// Dec 31, 2008 -// Jan 22, 2009 -// -// -// Jan 22, 2009 -// Submit requests to change all remaining Uxxxx values to named versions -// in keysymdef.h. -// ezh : U0292: LATIN SMALL LETTER EZH -// Ezh : U01B7: LATIN CAPITAL LETTER EZH -// permille : U2030: PER MILLE SIGN -// -// Dec 31, 2008 -// U0326 replaced with dead_belowcomma. -// -// Nov 29, 2008 -// dead_belowcomma has been added to keysymdef.h, so the U0326 can be replaced with -// it, as long as the version of X11 is built with the new keysymdef.h file. -// -// Nov 11, 2008. -// (a) Changed level 4 from Ooblique to Oslash. The two names are synonyms. Since level 3 is already -// specified as oslash, the change adds consistency. -// (b) The new Finnish keyboard standard (SFS 5966) reserves level 4 for U0326, the combining comma below. -// Removed the previous dead_abovedot entry there and replaced it with U0326, which can be replaced -// with dead_commabelow if that is added to keysymdef.h. -// -// Oct 10, 2007. -// -Changed space column 3 to nobreakspace (from space). -// -Changed UFE63 entries to dead_stroke. -// -// Nov 29, 2006. -// UFE63 can be changed to dead_stroke starting with version 7.0.7. of the X server. -// -// Dec 05, 2006. -// Changed instances of NoSymbol in columns 3 and 4 to characters in columns 1 and 2. -// This fixes a bug where the mappings couldn't be changed (with xmodmap for example). -// NoSymbol left in other positions, so nothing is output from those key presses. -// -// Dec 11, 2006. -// Changed all Uxxxx values to named versions. -// If you have problems, check these defines (when compiling X): -// XK_LATIN9: oe, OE. -// XK_CURRENCY: EuroSign. -// XK_LATIN2: caron. -// XK_LATIN3: idotless. -// XK_LATIN4: kra, eng, ENG. -// XK_CAUCASUS: schwa, SCHWA. -// XK_PUBLISHING: rightdoublequotemark, leftdoublequotemark, singlelowquotemark, doublelowquotemark, emdash, -// rightsinglequotemark, leftsinglequotemark, endash. -// -// Unnamed positions: -// UFE63: dead_stroke. Will be fixed, once the entry is in keysymdef.h. -// U0292: LATIN SMALL LETTER EZH. -// U01B7: LATIN CAPITAL LETTER EZH. -// U2030: PER MILLE SIGN. -// Comment: XK_MillSign is U+20A5 MILL SIGN. -// Per mille is a generic term for 1/1000. Mill is 1/1000 of a dollar. -// - -partial default alphanumeric_keys -xkb_symbols "kotoistus" { - - name[Group1]="Finland"; - - key { [ section, onehalf, dead_stroke, NoSymbol ] }; - key { [ 1, exclam, NoSymbol, exclamdown ] }; - key { [ 2, quotedbl, at, rightdoublequotemark ] }; - key { [ 3, numbersign, sterling, guillemotright ] }; - key { [ 4, currency, dollar, guillemotleft ] }; - key { [ 5, percent, U2030, leftdoublequotemark ] }; - key { [ 6, ampersand, singlelowquotemark, doublelowquotemark ] }; - key { [ 7, slash, braceleft, NoSymbol ] }; - key { [ 8, parenleft, bracketleft, less ] }; - key { [ 9, parenright, bracketright, greater ] }; - key { [ 0, equal, braceright, degree ] }; - key { [ plus, question, backslash, questiondown ] }; - key { [ dead_acute, dead_grave, dead_cedilla, dead_ogonek ] }; - key { [ q, Q, q, Q ] }; - key { [ w, W, w, W ] }; - key { [ e, E, EuroSign, NoSymbol ] }; - key { [ r, R, r, R ] }; - key { [ t, T, thorn, THORN ] }; - key { [ y, Y, y, Y ] }; - key { [ u, U, u, U ] }; - key { [ i, I, idotless, bar ] }; - key { [ o, O, oe, OE ] }; - key { [ p, P, dead_horn, dead_hook ] }; - key { [ aring, Aring, dead_doubleacute, dead_abovering ] }; - key { [ dead_diaeresis, dead_circumflex, dead_tilde, dead_macron ] }; - key { [ a, A, schwa, SCHWA ] }; - key { [ s, S, ssharp, NoSymbol ] }; - key { [ d, D, eth, ETH ] }; - key { [ f, F, f, F ] }; - key { [ g, G, g, G ] }; - key { [ h, H, h, H ] }; - key { [ j, J, j, J ] }; - key { [ k, K, kra, NoSymbol ] }; - key { [ l, L, dead_stroke, NoSymbol ] }; - key { [ odiaeresis, Odiaeresis, oslash, Oslash ] }; - key { [ adiaeresis, Adiaeresis, ae, AE ] }; - key { [ apostrophe, asterisk, dead_caron, dead_breve ] }; - key { [ less, greater, bar, NoSymbol ] }; - key { [ z, Z, U0292, U01B7 ] }; - key { [ x, X, multiply, periodcentered ] }; - key { [ c, C, c, C ] }; - key { [ v, V, v, V ] }; - key { [ b, B, b, B ] }; - key { [ n, N, eng, ENG ] }; - key { [ m, M, mu, emdash ] }; - key { [ comma, semicolon, rightsinglequotemark, leftsinglequotemark ] }; - key { [ period, colon, dead_belowdot, dead_abovedot ] }; - key { [ minus, underscore, endash, dead_belowcomma ] }; - - include "nbsp(level3)" - - include "kpdl(comma)" - - include "level3(ralt_switch)" - - include "compose(rwin)" -}; - - -partial alphanumeric_keys -xkb_symbols "classic" { - include "latin(type2)" - include "fi(fi)" - - name[Group1]="Finland - Classic"; -}; - -hidden partial alphanumeric_keys -xkb_symbols "fi" { - - // a Finnish keyboard with dead key support and all of - // ISO-8859-1 and ISO-8859-15 characters available. - - key { [ section, onehalf, onequarter, threequarters ] }; - key { [ less, greater, bar, brokenbar ] }; - // AltGr+ is pressed accidentally too often after AltGr+, - // hence AltGr+ produces now space, not nobreakspace. - key { [ space, space, space, nobreakspace ] }; - key { [ 1, exclam, exclamdown, onesuperior ] }; - key { [ 2, quotedbl, at, twosuperior ] }; - key { [ 3, numbersign, sterling, threesuperior ] }; - key { [ 4, currency, dollar, cent ] }; - key { [ 5, percent, EuroSign, masculine ] }; - key { [ 6, ampersand, yen, ordfeminine ] }; - key { [ 7, slash, braceleft, plusminus ] }; - key { [ 8, parenleft, bracketleft, guillemotleft ] }; - key { [ 9, parenright, bracketright, guillemotright ] }; - key { [ 0, equal, braceright, degree ] }; - key { [ period, colon, periodcentered, notsign ] }; - key { [ z, Z, zcaron, Zcaron ] }; - key { [ x, X, multiply, division ] }; - key { [ c, C, copyright, cent ] }; - key { [ b, B, ssharp, NoSymbol ] }; - key { [ n, N, ntilde, Ntilde ] }; - key { [ m, M, mu, NoSymbol ] }; - key { [ minus, underscore, hyphen, dead_macron ] }; - key { [ s, S, scaron, Scaron ] }; - key { [ d, D, eth, ETH ] }; - key { [ e, E, EuroSign, cent ] }; - key { [ r, R, registered, NoSymbol ] }; - key { [ t, T, thorn, THORN ] }; - key { [ p, P, paragraph, NoSymbol ] }; - key { [ odiaeresis, Odiaeresis, oslash, Ooblique ] }; - key { [ plus, question, backslash, questiondown ] }; - key { [ adiaeresis, Adiaeresis, ae, AE ] }; - key { [ apostrophe, asterisk ] }; - key { [ aring, Aring, oe, OE ] }; - key { [ dead_acute, dead_grave ] }; - key { [ dead_diaeresis, dead_circumflex, dead_tilde, dead_caron ] }; - - // End alphanumeric section, begin "Keypad" - include "kpdl(comma)" - // End "Keypad" section - - include "level3(ralt_switch)" -}; - -partial alphanumeric_keys -xkb_symbols "nodeadkeys" { - include "latin(type2)" - include "latin(type2_nodeadkeys)" - include "fi(fi)" - - name[Group1]="Finland - Classic, eliminate dead keys"; - - key { [ acute, grave ] }; - key { [ diaeresis, asciicircum, asciitilde, caron ] }; - key { [ minus, underscore, hyphen, macron ] }; -}; - -xkb_symbols "smi" { - - // Describes the differences between a Norwegian Northern Sami - // (keyboard with dead key support) and a Swedish/Finnish Sami - // keyboard according to the specs at: - // http://www.hum.uit.no/a/trond/se-lat9-sefi-keys.html - - include "no(smi)" - - name[Group1]= "Finland - Northern Saami"; - - key { [odiaeresis, Odiaeresis, oslash, Ooblique ] }; - key { [adiaeresis, Adiaeresis, ae, AE ] }; -}; - -// Copied from macintosh_vndr/fi -partial alphanumeric_keys -xkb_symbols "mac" { - - // Describes the differences between a very simple mac_US - // keyboard and a very simple Swedish(Finland) keybaord - - include "se(mac)" - name[Group1]= "Finland - Macintosh"; -}; +// +// $XKeyboardConfig$ +// +// X keyboard maps for Finland +// +// SFS 5966 / Kotoistus keymap created by Troy Korjuslommi +// Classic keymap based on traditional by Marko Myllynen +// Eliminate deadkeys alternative sent by Linus Torvalds +// + +// +// Missing from X11/keysymdef.h as of 2010-05-13 +// +// U2030 # PER MILLE SIGN +// U0292 # LATIN SMALL LETTER EZH +// U01B7 # LATIN CAPITAL LETTER EZH +// + +partial alphanumeric_keys default +xkb_symbols "kotoistus" { + + // Official keymap for Finland based on SFS 5966 standard + // + // This keymap implements all the functionality of Annex 1 + // of the standard and additionally defines the following to + // allow entering these characters with keyboars without LSGT. + // + // AE08+4, U+003C : LESS-THAN SIGN (less) + // AE09+4, U+003E : GREATER-THAN SIGN (greater) + // AD08+4, U+007C : VERTICAL LINE (bar) + // + // Annex 3 of the standard is implemented in fi_FI.UTF-8/Compose + + name[Group1]="Finland"; + + key { [ section, onehalf, dead_stroke, NoSymbol ] }; + key { [ 1, exclam, NoSymbol, exclamdown ] }; + key { [ 2, quotedbl, at, rightdoublequotemark ] }; + key { [ 3, numbersign, sterling, guillemotright ] }; + key { [ 4, currency, dollar, guillemotleft ] }; + key { [ 5, percent, U2030, leftdoublequotemark ] }; + key { [ 6, ampersand, singlelowquotemark, doublelowquotemark ] }; + key { [ 7, slash, braceleft, NoSymbol ] }; + key { [ 8, parenleft, bracketleft, less ] }; + key { [ 9, parenright, bracketright, greater ] }; + key { [ 0, equal, braceright, degree ] }; + key { [ plus, question, backslash, questiondown ] }; + key { [ dead_acute, dead_grave, dead_cedilla, dead_ogonek ] }; + + key { [ q, Q, q, Q ] }; + key { [ w, W, w, W ] }; + key { [ e, E, EuroSign, NoSymbol ] }; + key { [ r, R, r, R ] }; + key { [ t, T, thorn, THORN ] }; + key { [ y, Y, y, Y ] }; + key { [ u, U, u, U ] }; + key { [ i, I, idotless, bar ] }; + key { [ o, O, oe, OE ] }; + key { [ p, P, dead_horn, dead_hook ] }; + key { [ aring, Aring, dead_doubleacute, dead_abovering ] }; + key { [ dead_diaeresis, dead_circumflex, dead_tilde, dead_macron ] }; + + key { [ a, A, schwa, SCHWA ] }; + key { [ s, S, ssharp, NoSymbol ] }; + key { [ d, D, eth, ETH ] }; + key { [ f, F, f, F ] }; + key { [ g, G, g, G ] }; + key { [ h, H, h, H ] }; + key { [ j, J, j, J ] }; + key { [ k, K, kra, NoSymbol ] }; + key { [ l, L, dead_stroke, NoSymbol ] }; + key { [ odiaeresis, Odiaeresis, oslash, Oslash ] }; + key { [ adiaeresis, Adiaeresis, ae, AE ] }; + key { [ apostrophe, asterisk, dead_caron, dead_breve ] }; + + key { [ less, greater, bar, NoSymbol ] }; + key { [ z, Z, U0292, U01B7 ] }; + key { [ x, X, multiply, periodcentered ] }; + key { [ c, C, c, C ] }; + key { [ v, V, v, V ] }; + key { [ b, B, b, B ] }; + key { [ n, N, eng, ENG ] }; + key { [ m, M, mu, emdash ] }; + key { [ comma, semicolon, rightsinglequotemark, leftsinglequotemark ] }; + key { [ period, colon, dead_belowdot, dead_abovedot ] }; + key { [ minus, underscore, endash, dead_belowcomma ] }; + + include "nbsp(level3)" + include "kpdl(comma)" + include "level3(ralt_switch)" + include "compose(rwin)" +}; + +partial alphanumeric_keys +xkb_symbols "classic" { + + include "fi(fi)" + + name[Group1]="Finland - Classic"; +}; + +partial alphanumeric_keys hidden +xkb_symbols "fi" { + + // Classic Finnish keyboard layout with dead keys support + // and all ISO-8859-1 and ISO-8859-15 characters available + + key { [ section, onehalf, onequarter, threequarters ] }; + key { [ 1, exclam, exclamdown, onesuperior ] }; + key { [ 2, quotedbl, at, twosuperior ] }; + key { [ 3, numbersign, sterling, threesuperior ] }; + key { [ 4, currency, dollar, cent ] }; + key { [ 5, percent, EuroSign, masculine ] }; + key { [ 6, ampersand, yen, ordfeminine ] }; + key { [ 7, slash, braceleft, plusminus ] }; + key { [ 8, parenleft, bracketleft, guillemotleft ] }; + key { [ 9, parenright, bracketright, guillemotright ] }; + key { [ 0, equal, braceright, degree ] }; + key { [ plus, question, backslash, questiondown ] }; + key { [ dead_acute, dead_grave, dead_cedilla, dead_ogonek ] }; + + key { [ q, Q, q, Q ] }; + key { [ w, W, w, W ] }; + key { [ e, E, EuroSign, cent ] }; + key { [ r, R, registered, NoSymbol ] }; + key { [ t, T, thorn, THORN ] }; + key { [ y, Y, y, Y ] }; + key { [ u, U, u, U ] }; + key { [ i, I, idotless, bar ] }; + key { [ o, O, o, O ] }; + key { [ p, P, paragraph, NoSymbol ] }; + key { [ aring, Aring, oe, OE ] }; + key { [ dead_diaeresis, dead_circumflex, dead_tilde, dead_caron ] }; + + key { [ a, A, schwa, SCHWA ] }; + key { [ s, S, scaron, Scaron ] }; + key { [ d, D, eth, ETH ] }; + key { [ f, F, f, F ] }; + key { [ g, G, eng, ENG ] }; + key { [ h, H, h, H ] }; + key { [ j, J, j, J ] }; + key { [ k, K, kra, NoSymbol ] }; + key { [ l, L, dead_stroke, NoSymbol ] }; + key { [ odiaeresis, Odiaeresis, oslash, Oslash ] }; + key { [ adiaeresis, Adiaeresis, ae, AE ] }; + key { [ apostrophe, asterisk, dead_caron, dead_breve ] }; + + key { [ less, greater, bar, brokenbar ] }; + key { [ z, Z, zcaron, Zcaron ] }; + key { [ x, X, multiply, division ] }; + key { [ c, C, copyright, cent ] }; + key { [ v, V, v, V ] }; + key { [ b, B, ssharp, NoSymbol ] }; + key { [ n, N, ntilde, Ntilde ] }; + key { [ m, M, mu, NoSymbol ] }; + key { [ comma, semicolon, dead_cedilla, dead_ogonek ] }; + key { [ period, colon, periodcentered, notsign ] }; + key { [ minus, underscore, hyphen, dead_macron ] }; + + include "nbsp(level4)" + include "kpdl(comma)" + include "level3(ralt_switch)" + include "compose(rwin)" +}; + +partial alphanumeric_keys +xkb_symbols "nodeadkeys" { + + // Classic Finnish keyboard layout without dead keys + + include "fi(fi)" + + name[Group1]="Finland - Classic, eliminate dead keys"; + + key { [ acute, grave, cedilla, ogonek ] }; + key { [ diaeresis, asciicircum, asciitilde, caron ] }; + key { [ l, L, l, L ] }; + key { [ apostrophe, asterisk, caron, breve ] }; + key { [ comma, semicolon, cedilla, ogonek ] }; + key { [ minus, underscore, hyphen, macron ] }; +}; + +partial alphanumeric_keys +xkb_symbols "smi" { + + // Describes the differences between a Norwegian Northern Sami + // (keyboard with dead key support) and a Swedish/Finnish Sami + // keyboard according to the specs at: + // http://www.hum.uit.no/a/trond/se-lat9-sefi-keys.html + + include "no(smi)" + + name[Group1]="Finland - Northern Saami"; + + key { [ odiaeresis, Odiaeresis, oslash, Oslash ] }; + key { [ adiaeresis, Adiaeresis, ae, AE ] }; +}; + +partial alphanumeric_keys +xkb_symbols "mac" { + + // Macintosh keyboard for Finland based on Swedish(Macintosh) keyboard + + include "se(mac)" + + name[Group1]="Finland - Macintosh"; +}; diff --git a/xorg-server/xkbdata.src/symbols/hu b/xorg-server/xkbdata.src/symbols/hu index e5abdf2ad..9e97740fa 100644 --- a/xorg-server/xkbdata.src/symbols/hu +++ b/xorg-server/xkbdata.src/symbols/hu @@ -1,427 +1,432 @@ -// New style XKB layout for some widely used Hungarian keyboard layouts -// -// Based on old style 'xkb/symbols/hu" -// -// $XKeyboardConfig$ -// (C) 2002-2004 Soós Péter -// -// Permission is granted to anyone to use, distribute and modify -// this file in any way, provided that the above copyright notice -// is left intact and the author of the modification summarizes -// the changes in this header. -// -// This file is distributed without any expressed or implied warranty. -// -// Changes: -// 2004-04-17 - Moved to new style (only Unicode based layouts) -// - Added consistent dead key support -// - Fixed abovedot -// - Added adiaeresis -// - Added EuroSign and cent symbol - - -// Default layout -default partial -xkb_symbols "basic" { - include "hu(102_qwertz_comma_dead)" - name[Group1] = "Hungary"; -}; - -// Standard layout -partial -xkb_symbols "standard" { - include "hu(102_qwertz_comma_dead)" - name[Group1] = "Hungary - Standard"; -}; - -// Standard layout without dead key support -partial -xkb_symbols "nodeadkeys" { - include "hu(102_qwertz_comma_nodead)" - name[Group1] = "Hungary - Eliminate dead keys"; -}; - -// Qwerty layout -partial -xkb_symbols "qwerty" { - include "hu(101_qwerty_comma_dead)" - name[Group1] = "Hungary - qwerty"; -}; - -// Main layouts - -// 101_qwertz_comma_dead -// 101 key qwertz layout -// with decimal comma on keypad -// and with dead key support -partial -xkb_symbols "101_qwertz_comma_dead" { - name[Group1] = "Hungary - 101/qwertz/comma/Dead keys"; - include "latin" - include "hu(def_101)" - include "hu(def_qwertz)" - include "kpdl(comma)" - include "hu(def_dead)" - include "hu(def_common)" - include "level3(ralt_switch)" -}; - -// 101_qwertz_comma_nodead -// 101 key qwertz layout -// with decimal comma on keypad -// and without dead key support -partial -xkb_symbols "101_qwertz_comma_nodead" { - name[Group1] = "Hungary - 101/qwertz/comma/Eliminate dead keys"; - include "latin" - include "hu(def_101)" - include "hu(def_qwertz)" - include "kpdl(comma)" - include "hu(def_nodead)" - include "hu(def_common)" - include "level3(ralt_switch)" -}; - -// 101_qwertz_dot_dead -// 101 key qwertz layout -// with decimal dot on keypad -// and with dead key support -partial -xkb_symbols "101_qwertz_dot_dead" { - name[Group1] = "Hungary - 101/qwertz/dot/Dead keys"; - include "latin" - include "hu(def_101)" - include "hu(def_qwertz)" - include "hu(def_dot)" - include "hu(def_dead)" - include "hu(def_common)" - include "level3(ralt_switch)" -}; - -// 101_qwertz_dot_nodead -// 101 key qwertz layout -// with decimal dot on keypad -// and without dead key support -partial -xkb_symbols "101_qwertz_dot_nodead" { - name[Group1] = "Hungary - 101/qwertz/dot/Eliminate dead keys"; - include "latin" - include "hu(def_101)" - include "hu(def_qwertz)" - include "hu(def_dot)" - include "hu(def_nodead)" - include "hu(def_common)" - include "level3(ralt_switch)" -}; - -// 101_qwerty_comma_dead -// 101 key qwerty layout -// with decimal comma on keypad -// and with dead key support -partial -xkb_symbols "101_qwerty_comma_dead" { - name[Group1] = "Hungary - 101/qwerty/comma/Dead keys"; - include "latin" - include "hu(def_101)" - include "hu(def_qwerty)" - include "kpdl(comma)" - include "hu(def_dead)" - include "hu(def_common)" - include "level3(ralt_switch)" -}; - -// 101_qwerty_comma_nodead -// 101 key qwerty layout -// with decimal comma on keypad -// and without dead key support -partial -xkb_symbols "101_qwerty_comma_nodead" { - name[Group1] = "Hungary - 101/qwerty/comma/Eliminate dead keys"; - include "latin" - include "hu(def_101)" - include "hu(def_qwerty)" - include "kpdl(comma)" - include "hu(def_nodead)" - include "hu(def_common)" - include "level3(ralt_switch)" -}; - -// 101_qwerty_dot_dead -// 101 key qwerty layout -// with decimal dot on keypad -// and with dead key support -partial -xkb_symbols "101_qwerty_dot_dead" { - name[Group1] = "Hungary - 101/qwerty/dot/Dead keys"; - include "latin" - include "hu(def_101)" - include "hu(def_qwerty)" - include "hu(def_dot)" - include "hu(def_dead)" - include "hu(def_common)" - include "level3(ralt_switch)" -}; - -// 101_qwerty_dot_nodead -// 101 key qwerty layout -// with decimal dot on keypad -// and without dead key support -partial -xkb_symbols "101_qwerty_dot_nodead" { - name[Group1] = "Hungary - 101/qwerty/dot/Eliminate dead keys"; - include "latin" - include "hu(def_101)" - include "hu(def_qwerty)" - include "hu(def_dot)" - include "hu(def_nodead)" - include "hu(def_common)" - include "level3(ralt_switch)" -}; - -// 102_qwertz_comma_dead -// 102 key qwertz layout -// with decimal comma on keypad -// and with dead key support -partial -xkb_symbols "102_qwertz_comma_dead" { - name[Group1] = "Hungary - 102/qwertz/comma/Dead keys"; - include "latin" - include "hu(def_102)" - include "hu(def_qwertz)" - include "kpdl(comma)" - include "hu(def_dead)" - include "hu(def_common)" - include "level3(ralt_switch)" -}; - -// 102_qwertz_comma_nodead -// 102 key qwertz layout -// with decimal comma on keypad -// and without dead key support -partial -xkb_symbols "102_qwertz_comma_nodead" { - name[Group1] = "Hungary - 102/qwertz/comma/Eliminate dead keys"; - include "latin" - include "hu(def_102)" - include "hu(def_qwertz)" - include "kpdl(comma)" - include "hu(def_nodead)" - include "hu(def_common)" - include "level3(ralt_switch)" -}; - -// 102_qwertz_dot_dead -// 102 key qwertz layout -// with decimal dot on keypad -// and with dead key support -partial -xkb_symbols "102_qwertz_dot_dead" { - name[Group1] = "Hungary - 102/qwertz/dot/Dead keys"; - include "latin" - include "hu(def_102)" - include "hu(def_qwertz)" - include "hu(def_dot)" - include "hu(def_dead)" - include "hu(def_common)" - include "level3(ralt_switch)" -}; - -// 102_qwertz_dot_nodead -// 102 key qwertz layout -// with decimal dot on keypad -// and without dead key support -partial -xkb_symbols "102_qwertz_dot_nodead" { - name[Group1] = "Hungary - 102/qwertz/dot/Eliminate dead keys"; - include "latin" - include "hu(def_102)" - include "hu(def_qwertz)" - include "hu(def_dot)" - include "hu(def_nodead)" - include "hu(def_common)" - include "level3(ralt_switch)" -}; - -// 102_qwerty_comma_dead -// 102 key qwerty layout -// with decimal comma on keypad -// and with dead key support -partial -xkb_symbols "102_qwerty_comma_dead" { - name[Group1] = "Hungary - 102/qwerty/comma/Dead keys"; - include "latin" - include "hu(def_102)" - include "hu(def_qwerty)" - include "kpdl(comma)" - include "hu(def_dead)" - include "hu(def_common)" - include "level3(ralt_switch)" -}; - -// 102_qwerty_comma_nodead -// 102 key qwerty layout -// with decimal comma on keypad -// and without dead key support -partial -xkb_symbols "102_qwerty_comma_nodead" { - name[Group1] = "Hungary - 102/qwerty/comma/Eliminate dead keys"; - include "latin" - include "hu(def_102)" - include "hu(def_qwerty)" - include "kpdl(comma)" - include "hu(def_nodead)" - include "hu(def_common)" - include "level3(ralt_switch)" -}; - -// 102_qwerty_dot_dead -// 102 key qwerty layout -// with decimal dot on keypad -// and with dead key support -partial -xkb_symbols "102_qwerty_dot_dead" { - name[Group1] = "Hungary - 102/qwerty/dot/Dead keys"; - include "latin" - include "hu(def_102)" - include "hu(def_qwerty)" - include "hu(def_dot)" - include "hu(def_dead)" - include "hu(def_common)" - include "level3(ralt_switch)" -}; - -// 102_qwerty_dot_nodead -// 102 key qwerty layout -// with decimal dot on keypad -// and without dead key support -partial -xkb_symbols "102_qwerty_dot_nodead" { - name[Group1] = "Hungary - 102/qwerty/dot/Eliminate dead keys"; - include "latin" - include "hu(def_102)" - include "hu(def_qwerty)" - include "hu(def_dot)" - include "hu(def_nodead)" - include "hu(def_common)" - include "level3(ralt_switch)" -}; - -// Partial layouts - -// def_102: -// The standard Hungarian 102 key layout -hidden partial alphanumeric_keys -xkb_symbols "def_102" { - key { [ 0, section, notsign ] }; - key { [ iacute, Iacute, less, greater ] }; - -}; - -// def_101: -// An alternative layout for 101 key keyboards -hidden partial alphanumeric_keys -xkb_symbols "def_101" { - key { [ iacute, Iacute, 0, section ] }; - key { [ less, greater ] }; -}; - -// def_qwertz: -// The standard Hungaryan qwertz layout -hidden partial alphanumeric_keys -xkb_symbols "def_qwertz" { - key { [ z, Z, endash ] }; - key { [ y, Y, greater ] }; -}; - - -// def_qwerty: -// The qwerty layout for people who familiar with the standard US layout -hidden partial alphanumeric_keys -xkb_symbols "def_qwerty" { - key { [ y, Y, endash ] }; - key { [ z, Z, greater ] }; -}; - -// def_dot: -// The Hungarian standard is the comma on the keypad not decimal dot, -// but programmers hate it -hidden partial keypad_keys -xkb_symbols "def_dot" { - key { [ KP_Delete, KP_Decimal ] }; -}; - - -// def_dead: -// Dead keys support part -hidden partial alphanumeric_keys -xkb_symbols "def_dead" { - key { [ 1, apostrophe, asciitilde, dead_tilde ] }; - key { [ 2, quotedbl, dead_caron, caron ] }; - key { [ 3, plus, asciicircum, dead_circumflex ] }; - key { [ 4, exclam, dead_breve, breve ] }; - key { [ 5, percent, dead_abovering, degree ] }; - key { [ 6, slash, dead_ogonek, ogonek ] }; - key { [ 7, equal, grave, dead_grave ] }; - key { [ 8, parenleft, dead_abovedot, abovedot ] }; - key { [ 9, parenright, dead_acute, acute ] }; - key { [ odiaeresis, Odiaeresis, dead_doubleacute, doubleacute ] }; - key { [ udiaeresis, Udiaeresis, dead_diaeresis, diaeresis ] }; - key { [ oacute, Oacute, dead_cedilla, cedilla ] }; -}; - -// def_nodead: -// Without dead keys support -hidden partial alphanumeric_keys -xkb_symbols "def_nodead" { - key { [ 1, apostrophe, asciitilde ] }; - key { [ 2, quotedbl, caron ] }; - key { [ 3, plus, asciicircum ] }; - key { [ 4, exclam, breve ] }; - key { [ 5, percent, degree ] }; - key { [ 6, slash, ogonek ] }; - key { [ 7, equal, grave ] }; - key { [ 8, parenleft, abovedot ] }; - key { [ 9, parenright, acute ] }; - key { [ odiaeresis, Odiaeresis, doubleacute ] }; - key { [ udiaeresis, Udiaeresis, diaeresis ] }; - key { [ oacute, Oacute, cedilla ] }; -}; - - -// def_common: -// The common part of all Hungarian layout above -hidden partial alphanumeric_keys -xkb_symbols "def_common" { - key { [ q, Q, backslash ] }; - key { [ w, W, bar ] }; - key { [ u, U, EuroSign ] }; - key { [ i, I, Iacute, iacute ] }; - key { [ o, O, doublelowquotemark ] }; - key { [ p, P, rightdoublequotemark ] }; - key { [ odoubleacute, Odoubleacute, division ] }; - key { [ uacute, Uacute, multiply ] }; - - key { [ a, A, adiaeresis, Adiaeresis ] }; - key { [ s, S, dstroke ] }; - key { [ d, D, Dstroke ] }; - key { [ f, F, bracketleft ] }; - key { [ g, G, bracketright ] }; - key { [ j, J, iacute, Iacute ] }; - key { [ k, K, lstroke ] }; - key { [ l, L, Lstroke ] }; - key { [ eacute, Eacute, dollar, cent ] }; - key { [ aacute, Aacute, ssharp ] }; - - key { [ udoubleacute, Udoubleacute, currency ] }; - - key { [ x, X, numbersign ] }; - key { [ c, C, ampersand ] }; - key { [ v, V, at ] }; - key { [ b, B, braceleft ] }; - key { [ n, N, braceright ] }; - key { [ m, M, less ] }; - key { [ comma, question, semicolon ] }; - key { [ period, colon, greater ] }; - key { [ minus, underscore, asterisk ] }; - -}; +// New style XKB layout for some widely used Hungarian keyboard layouts +// +// Based on old style 'xkb/symbols/hu" +// +// $XKeyboardConfig$ +// (C) 2002-2004 Soós Péter +// (C) 2010 Andras Timar +// +// Permission is granted to anyone to use, distribute and modify +// this file in any way, provided that the above copyright notice +// is left intact and the author of the modification summarizes +// the changes in this header. +// +// This file is distributed without any expressed or implied warranty. +// +// Changes: +// 2004-04-17 - Moved to new style (only Unicode based layouts) +// - Added consistent dead key support +// - Fixed abovedot +// - Added adiaeresis +// - Added EuroSign and cent symbol +// 2010-04-23 - Added doublelowquotemark +// - Added rightdoublequotemark +// - Added endash +// 2010-05-13 - Added ellipsis + + +// Default layout +default partial +xkb_symbols "basic" { + include "hu(102_qwertz_comma_dead)" + name[Group1] = "Hungary"; +}; + +// Standard layout +partial +xkb_symbols "standard" { + include "hu(102_qwertz_comma_dead)" + name[Group1] = "Hungary - Standard"; +}; + +// Standard layout without dead key support +partial +xkb_symbols "nodeadkeys" { + include "hu(102_qwertz_comma_nodead)" + name[Group1] = "Hungary - Eliminate dead keys"; +}; + +// Qwerty layout +partial +xkb_symbols "qwerty" { + include "hu(101_qwerty_comma_dead)" + name[Group1] = "Hungary - qwerty"; +}; + +// Main layouts + +// 101_qwertz_comma_dead +// 101 key qwertz layout +// with decimal comma on keypad +// and with dead key support +partial +xkb_symbols "101_qwertz_comma_dead" { + name[Group1] = "Hungary - 101/qwertz/comma/Dead keys"; + include "latin" + include "hu(def_101)" + include "hu(def_qwertz)" + include "kpdl(comma)" + include "hu(def_dead)" + include "hu(def_common)" + include "level3(ralt_switch)" +}; + +// 101_qwertz_comma_nodead +// 101 key qwertz layout +// with decimal comma on keypad +// and without dead key support +partial +xkb_symbols "101_qwertz_comma_nodead" { + name[Group1] = "Hungary - 101/qwertz/comma/Eliminate dead keys"; + include "latin" + include "hu(def_101)" + include "hu(def_qwertz)" + include "kpdl(comma)" + include "hu(def_nodead)" + include "hu(def_common)" + include "level3(ralt_switch)" +}; + +// 101_qwertz_dot_dead +// 101 key qwertz layout +// with decimal dot on keypad +// and with dead key support +partial +xkb_symbols "101_qwertz_dot_dead" { + name[Group1] = "Hungary - 101/qwertz/dot/Dead keys"; + include "latin" + include "hu(def_101)" + include "hu(def_qwertz)" + include "hu(def_dot)" + include "hu(def_dead)" + include "hu(def_common)" + include "level3(ralt_switch)" +}; + +// 101_qwertz_dot_nodead +// 101 key qwertz layout +// with decimal dot on keypad +// and without dead key support +partial +xkb_symbols "101_qwertz_dot_nodead" { + name[Group1] = "Hungary - 101/qwertz/dot/Eliminate dead keys"; + include "latin" + include "hu(def_101)" + include "hu(def_qwertz)" + include "hu(def_dot)" + include "hu(def_nodead)" + include "hu(def_common)" + include "level3(ralt_switch)" +}; + +// 101_qwerty_comma_dead +// 101 key qwerty layout +// with decimal comma on keypad +// and with dead key support +partial +xkb_symbols "101_qwerty_comma_dead" { + name[Group1] = "Hungary - 101/qwerty/comma/Dead keys"; + include "latin" + include "hu(def_101)" + include "hu(def_qwerty)" + include "kpdl(comma)" + include "hu(def_dead)" + include "hu(def_common)" + include "level3(ralt_switch)" +}; + +// 101_qwerty_comma_nodead +// 101 key qwerty layout +// with decimal comma on keypad +// and without dead key support +partial +xkb_symbols "101_qwerty_comma_nodead" { + name[Group1] = "Hungary - 101/qwerty/comma/Eliminate dead keys"; + include "latin" + include "hu(def_101)" + include "hu(def_qwerty)" + include "kpdl(comma)" + include "hu(def_nodead)" + include "hu(def_common)" + include "level3(ralt_switch)" +}; + +// 101_qwerty_dot_dead +// 101 key qwerty layout +// with decimal dot on keypad +// and with dead key support +partial +xkb_symbols "101_qwerty_dot_dead" { + name[Group1] = "Hungary - 101/qwerty/dot/Dead keys"; + include "latin" + include "hu(def_101)" + include "hu(def_qwerty)" + include "hu(def_dot)" + include "hu(def_dead)" + include "hu(def_common)" + include "level3(ralt_switch)" +}; + +// 101_qwerty_dot_nodead +// 101 key qwerty layout +// with decimal dot on keypad +// and without dead key support +partial +xkb_symbols "101_qwerty_dot_nodead" { + name[Group1] = "Hungary - 101/qwerty/dot/Eliminate dead keys"; + include "latin" + include "hu(def_101)" + include "hu(def_qwerty)" + include "hu(def_dot)" + include "hu(def_nodead)" + include "hu(def_common)" + include "level3(ralt_switch)" +}; + +// 102_qwertz_comma_dead +// 102 key qwertz layout +// with decimal comma on keypad +// and with dead key support +partial +xkb_symbols "102_qwertz_comma_dead" { + name[Group1] = "Hungary - 102/qwertz/comma/Dead keys"; + include "latin" + include "hu(def_102)" + include "hu(def_qwertz)" + include "kpdl(comma)" + include "hu(def_dead)" + include "hu(def_common)" + include "level3(ralt_switch)" +}; + +// 102_qwertz_comma_nodead +// 102 key qwertz layout +// with decimal comma on keypad +// and without dead key support +partial +xkb_symbols "102_qwertz_comma_nodead" { + name[Group1] = "Hungary - 102/qwertz/comma/Eliminate dead keys"; + include "latin" + include "hu(def_102)" + include "hu(def_qwertz)" + include "kpdl(comma)" + include "hu(def_nodead)" + include "hu(def_common)" + include "level3(ralt_switch)" +}; + +// 102_qwertz_dot_dead +// 102 key qwertz layout +// with decimal dot on keypad +// and with dead key support +partial +xkb_symbols "102_qwertz_dot_dead" { + name[Group1] = "Hungary - 102/qwertz/dot/Dead keys"; + include "latin" + include "hu(def_102)" + include "hu(def_qwertz)" + include "hu(def_dot)" + include "hu(def_dead)" + include "hu(def_common)" + include "level3(ralt_switch)" +}; + +// 102_qwertz_dot_nodead +// 102 key qwertz layout +// with decimal dot on keypad +// and without dead key support +partial +xkb_symbols "102_qwertz_dot_nodead" { + name[Group1] = "Hungary - 102/qwertz/dot/Eliminate dead keys"; + include "latin" + include "hu(def_102)" + include "hu(def_qwertz)" + include "hu(def_dot)" + include "hu(def_nodead)" + include "hu(def_common)" + include "level3(ralt_switch)" +}; + +// 102_qwerty_comma_dead +// 102 key qwerty layout +// with decimal comma on keypad +// and with dead key support +partial +xkb_symbols "102_qwerty_comma_dead" { + name[Group1] = "Hungary - 102/qwerty/comma/Dead keys"; + include "latin" + include "hu(def_102)" + include "hu(def_qwerty)" + include "kpdl(comma)" + include "hu(def_dead)" + include "hu(def_common)" + include "level3(ralt_switch)" +}; + +// 102_qwerty_comma_nodead +// 102 key qwerty layout +// with decimal comma on keypad +// and without dead key support +partial +xkb_symbols "102_qwerty_comma_nodead" { + name[Group1] = "Hungary - 102/qwerty/comma/Eliminate dead keys"; + include "latin" + include "hu(def_102)" + include "hu(def_qwerty)" + include "kpdl(comma)" + include "hu(def_nodead)" + include "hu(def_common)" + include "level3(ralt_switch)" +}; + +// 102_qwerty_dot_dead +// 102 key qwerty layout +// with decimal dot on keypad +// and with dead key support +partial +xkb_symbols "102_qwerty_dot_dead" { + name[Group1] = "Hungary - 102/qwerty/dot/Dead keys"; + include "latin" + include "hu(def_102)" + include "hu(def_qwerty)" + include "hu(def_dot)" + include "hu(def_dead)" + include "hu(def_common)" + include "level3(ralt_switch)" +}; + +// 102_qwerty_dot_nodead +// 102 key qwerty layout +// with decimal dot on keypad +// and without dead key support +partial +xkb_symbols "102_qwerty_dot_nodead" { + name[Group1] = "Hungary - 102/qwerty/dot/Eliminate dead keys"; + include "latin" + include "hu(def_102)" + include "hu(def_qwerty)" + include "hu(def_dot)" + include "hu(def_nodead)" + include "hu(def_common)" + include "level3(ralt_switch)" +}; + +// Partial layouts + +// def_102: +// The standard Hungarian 102 key layout +hidden partial alphanumeric_keys +xkb_symbols "def_102" { + key { [ 0, section, notsign ] }; + key { [ iacute, Iacute, less, greater ] }; + +}; + +// def_101: +// An alternative layout for 101 key keyboards +hidden partial alphanumeric_keys +xkb_symbols "def_101" { + key { [ iacute, Iacute, 0, section ] }; + key { [ less, greater ] }; +}; + +// def_qwertz: +// The standard Hungaryan qwertz layout +hidden partial alphanumeric_keys +xkb_symbols "def_qwertz" { + key { [ z, Z, endash ] }; + key { [ y, Y, greater ] }; +}; + + +// def_qwerty: +// The qwerty layout for people who familiar with the standard US layout +hidden partial alphanumeric_keys +xkb_symbols "def_qwerty" { + key { [ y, Y, endash ] }; + key { [ z, Z, greater ] }; +}; + +// def_dot: +// The Hungarian standard is the comma on the keypad not decimal dot, +// but programmers hate it +hidden partial keypad_keys +xkb_symbols "def_dot" { + key { [ KP_Delete, KP_Decimal ] }; +}; + + +// def_dead: +// Dead keys support part +hidden partial alphanumeric_keys +xkb_symbols "def_dead" { + key { [ 1, apostrophe, asciitilde, dead_tilde ] }; + key { [ 2, quotedbl, dead_caron, caron ] }; + key { [ 3, plus, asciicircum, dead_circumflex ] }; + key { [ 4, exclam, dead_breve, breve ] }; + key { [ 5, percent, dead_abovering, degree ] }; + key { [ 6, slash, dead_ogonek, ogonek ] }; + key { [ 7, equal, grave, dead_grave ] }; + key { [ 8, parenleft, dead_abovedot, abovedot ] }; + key { [ 9, parenright, dead_acute, acute ] }; + key { [ odiaeresis, Odiaeresis, dead_doubleacute, doubleacute ] }; + key { [ udiaeresis, Udiaeresis, dead_diaeresis, diaeresis ] }; + key { [ oacute, Oacute, dead_cedilla, cedilla ] }; +}; + +// def_nodead: +// Without dead keys support +hidden partial alphanumeric_keys +xkb_symbols "def_nodead" { + key { [ 1, apostrophe, asciitilde ] }; + key { [ 2, quotedbl, caron ] }; + key { [ 3, plus, asciicircum ] }; + key { [ 4, exclam, breve ] }; + key { [ 5, percent, degree ] }; + key { [ 6, slash, ogonek ] }; + key { [ 7, equal, grave ] }; + key { [ 8, parenleft, abovedot ] }; + key { [ 9, parenright, acute ] }; + key { [ odiaeresis, Odiaeresis, doubleacute ] }; + key { [ udiaeresis, Udiaeresis, diaeresis ] }; + key { [ oacute, Oacute, cedilla ] }; +}; + + +// def_common: +// The common part of all Hungarian layout above +hidden partial alphanumeric_keys +xkb_symbols "def_common" { + key { [ q, Q, backslash ] }; + key { [ w, W, bar ] }; + key { [ u, U, EuroSign ] }; + key { [ i, I, Iacute, iacute ] }; + key { [ o, O, doublelowquotemark ] }; + key { [ p, P, rightdoublequotemark ] }; + key { [ odoubleacute, Odoubleacute, division ] }; + key { [ uacute, Uacute, multiply ] }; + + key { [ a, A, adiaeresis, Adiaeresis ] }; + key { [ s, S, dstroke ] }; + key { [ d, D, Dstroke ] }; + key { [ f, F, bracketleft ] }; + key { [ g, G, bracketright ] }; + key { [ j, J, iacute, Iacute ] }; + key { [ k, K, lstroke ] }; + key { [ l, L, Lstroke ] }; + key { [ eacute, Eacute, dollar, cent ] }; + key { [ aacute, Aacute, ssharp ] }; + + key { [ udoubleacute, Udoubleacute, currency ] }; + + key { [ x, X, numbersign ] }; + key { [ c, C, ampersand ] }; + key { [ v, V, at ] }; + key { [ b, B, braceleft ] }; + key { [ n, N, braceright ] }; + key { [ m, M, less ] }; + key { [ comma, question, semicolon ] }; + key { [ period, colon, ellipsis ] }; + key { [ minus, underscore, asterisk ] }; + +}; -- cgit v1.2.3