From 4fbca19eeab8fecdb6b130badf8c7745a1d6d2dc Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 4 May 2010 12:33:39 +0000 Subject: xkeyboard-config git update 4/5/2010 --- xorg-server/xkbdata.src/symbols/de | 246 +++++++++++++++++++------------------ 1 file changed, 127 insertions(+), 119 deletions(-) (limited to 'xorg-server/xkbdata.src/symbols/de') diff --git a/xorg-server/xkbdata.src/symbols/de b/xorg-server/xkbdata.src/symbols/de index b23aaf6c0..60b53b545 100644 --- a/xorg-server/xkbdata.src/symbols/de +++ b/xorg-server/xkbdata.src/symbols/de @@ -212,21 +212,23 @@ xkb_symbols "sundeadkeys" { }; -// German NEO-Layout Version 2.0rc1 (rev: 1331) +// German Neo-Layout Version 2 // adopted 2004 by Hanno Behrens // inspired by Dvorak/de-ergo http://www.goebel-consult.de/de-ergo/ // // Authors: +// Stephan Hilb // // Benjamin Kellermann // Erik Streb -// and many other contributers +// and many other contributors // // http://www.neo-layout.org - +// +// $Revision$, $Date$ partial alphanumeric_keys modifier_keys keypad_keys -xkb_symbols "neo" { +xkb_symbols "neo_base" { name[Group1]= "Germany - Neo 2"; @@ -235,154 +237,160 @@ xkb_symbols "neo" { // Ebene 1: normal // Ebene 2: Shift // Ebene 3: Mod3 - // Ebene 4: Mod4 (for marking something use Shift+Mod4) - // Ebene 5: Shift+Mod3 - // Ebene 6: Mod3+Mod4 (in this order) - // Compose (not a level): Mod3+Tab - // Feststelltaste (Capslock): Mod3+Mod3 - // + // Ebene 4: Mod4 (for marking something use Shift + Mod4) + // Ebene 5: Shift + Mod3 + // Ebene 6: Mod3 + Mod4 + // Compose (not a level): Mod3 + Tab + // Feststelltaste (Capslock): Shift + Shift + // Mod4-Lock: Mod4 + Mod4 + // Mod4-Lock: Shift + Mod3 + Tab + + // Legend + // =============== // Levels in Xkbmap jargon to be found here in the definitions. - // These are the levels used, and Xorg's translations with type="EIGHT_LEVEL": - // -------------------------------------------------------------- - // Modifier: None Shift Mod3 Shift+Mod3 Mod4 Shift+Mod4 Mod3+Mod4 - // Xorg calls it: Level1 Level2 Level3 Level4 Level5 Level6 Level7 - // Neo calls it: Ebene1 Ebene2 Ebene3 Ebene5 Ebene4 Ebene4+Shift Ebene6 - - // Modifier definitions + // These are the levels used, and Xorg's translations: // -------------------------------------------------------------- - // Definition of the so called Neo-Mod3 - key.type[Group1]="THREE_LEVEL"; - key { [ ISO_Level3_Shift, ISO_Level3_Shift, Caps_Lock ] }; - key { [ ISO_Level3_Shift, ISO_Level3_Shift, Caps_Lock ] }; + // Xorg: Level1 Level2 Level3 Level4 Level5 Level6 Level7 Level8 + // Neo: Ebene1 Ebene2 Ebene3 Ebene5 Ebene4 Pseudo-Ebene Ebene6 ??? + // Keys (Neo): None Shift Mod3 Mod3 + Shift Mod4 Mod4 + Shift Mod3 + Mod4 Mod3 + Mod4 + Shift - // Definition of the so called Neo-Mod4 - key.type[Group1]="ONE_LEVEL"; - key { [ ISO_Level5_Shift ]}; - key { [ ISO_Level5_Shift ]}; - modifier_map Mod3 { , }; - // Attention: ^^^ This is a X server variable, not the Neo-Mod3. - key.type[Group1]="EIGHT_LEVEL_ALPHABETIC" ; + // Alphanumeric-keys + // =============== + key.type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK"; // Tab as Multi_key (Compose) // -------------------------------------------------------------- - key { [ Tab, ISO_Left_Tab, Multi_key ] }; + key { [ Tab, ISO_Left_Tab, Multi_key, ISO_Level5_Lock, NoSymbol, NoSymbol, NoSymbol, ISO_Level5_Lock ] }; - // number row - // -------------------------------------------------------------- - key { [ dead_circumflex, dead_tilde, dead_abovering, dead_breve, dead_caron, NoSymbol, dead_macron ] }; - key { [ 1, degree, onesuperior, onesubscript, ordfeminine, NoSymbol, notsign ] }; - key { [ 2, section, twosuperior, twosubscript, masculine, NoSymbol, logicalor ] }; - key { [ 3, U2113, threesuperior, threesubscript, numerosign, NoSymbol, logicaland ] }; - key { [ 4, guillemotright, U203A, dagger, Prior, Prior, U22A5 ] }; - key { [ 5, guillemotleft, U2039, femalesymbol, periodcentered, NoSymbol, U2221 ] }; - key { [ 6, EuroSign, cent, malesymbol, sterling, NoSymbol, U2225 ] }; + // Number row + // -------------------------------------------------------------- + key { [ dead_circumflex, dead_caron, U21BB, U02DE, dead_abovedot, Pointer_EnableKeys, dead_belowdot, NoSymbol ] }; - key { [ 7, dollar, yen, Greek_kappa, currency, NoSymbol, rightarrow ] }; - key { [ 8, doublelowquotemark, singlelowquotemark, leftanglebracket, NoSymbol, NoSymbol, U221E ] }; - key { [ 9, leftdoublequotemark, leftsinglequotemark, rightanglebracket, slash, NoSymbol, U220B ] }; - key { [ 0, rightdoublequotemark, rightsinglequotemark, zerosubscript, asterisk, NoSymbol, emptyset ] }; + key { [ 1, degree, onesuperior, onesubscript, ordfeminine, NoSymbol, notsign, NoSymbol ] }; + key { [ 2, section, twosuperior, twosubscript, masculine, NoSymbol, logicalor, NoSymbol ] }; + key { [ 3, U2113, threesuperior, threesubscript, numerosign, NoSymbol, logicaland, NoSymbol ] }; + key { [ 4, guillemotright, U203A, femalesymbol, NoSymbol, NoSymbol, U22A5, NoSymbol ] }; + key { [ 5, guillemotleft, U2039, malesymbol, periodcentered, NoSymbol, U2221, NoSymbol ] }; + key { [ 6, dollar, cent, U26A5, sterling, NoSymbol, U2225, NoSymbol ] }; - key { [ minus, emdash, NoSymbol, U2011, minus, NoSymbol, hyphen ] }; - key { [ dead_grave, NoSymbol, dead_diaeresis, dead_dasia, U030F, NoSymbol, NoSymbol ] }; + key { [ 7, EuroSign, yen, U03F0, currency, NoSymbol, rightarrow, NoSymbol ] }; + key { [ 8, doublelowquotemark, singlelowquotemark, U27E8, Tab, ISO_Left_Tab, U221E, NoSymbol ] }; + key { [ 9, leftdoublequotemark, leftsinglequotemark, U27E9, KP_Divide, KP_Divide, variation, NoSymbol ] }; + key { [ 0, rightdoublequotemark, rightsinglequotemark, zerosubscript, KP_Multiply, KP_Multiply, emptyset, NoSymbol ] }; - key { [ BackSpace, BackSpace, BackSpace, BackSpace, BackSpace, BackSpace, BackSpace ] }; + key { [ minus, emdash, NoSymbol, U2011, KP_Subtract, KP_Subtract, hyphen, NoSymbol ] }; + key { [ dead_grave, dead_cedilla, dead_abovering, dead_dasia, dead_diaeresis, NoSymbol, dead_macron, NoSymbol ] }; - // top row + // Top row // -------------------------------------------------------------- - // xvlcwkhgfqß - key { [ x, X, ellipsis, Greek_xi, U22EE, NoSymbol, Greek_XI ] }; - key { [ v, V, underscore, NoSymbol, BackSpace, BackSpace, U2259 ] }; - key { [ l, L, bracketleft, Greek_lambda, Up, Up, Greek_LAMBDA ] }; - key { [ c, C, bracketright, Greek_chi, Delete, Delete, U2102 ] }; - key { [ w, W, asciicircum, Greek_omega, Insert, Insert, Greek_OMEGA ] }; - - key { [ k, K, exclam, U03F0, exclamdown, NoSymbol, radical ] }; - key { [ h, H, less, Greek_psi, 7, NoSymbol, Greek_PSI ] }; - key { [ g, G, greater, Greek_gamma, 8, NoSymbol, Greek_GAMMA ] }; - key { [ f, F, equal, Greek_phi, 9, NoSymbol, Greek_PHI ] }; - key { [ q, Q, ampersand, U03D5, plus, NoSymbol, U211A ] }; - key { [ ssharp, U1E9E, U017F, Greek_finalsmallsigma, NoSymbol, NoSymbol, jot ] }; - - key { [ dead_acute, dead_cedilla, dead_stroke, dead_psili, dead_doubleacute,NoSymbol, dead_abovedot ] }; - - // middle row + key.type[Group1] = "EIGHT_LEVEL_ALPHABETIC_LEVEL_FIVE_LOCK"; + key { [ x, X, ellipsis, Greek_xi, Prior, Prior, Greek_XI, NoSymbol ] }; + key { [ v, V, underscore, NoSymbol, BackSpace, BackSpace, radical, NoSymbol ] }; + key { [ l, L, bracketleft, Greek_lambda, Up, Up, Greek_LAMBDA, NoSymbol ] }; + key { [ c, C, bracketright, Greek_chi, Delete, Delete, U2102, NoSymbol ] }; + key { [ w, W, asciicircum, Greek_omega, Next, Next, Greek_OMEGA, NoSymbol ] }; + + key { [ k, K, exclam, Greek_kappa, exclamdown, NoSymbol, multiply, NoSymbol ] }; + key { [ h, H, less, Greek_psi, KP_7, KP_7, Greek_PSI, NoSymbol ] }; + key { [ g, G, greater, Greek_gamma, KP_8, KP_8, Greek_GAMMA, NoSymbol ] }; + key { [ f, F, equal, Greek_phi, KP_9, KP_9, Greek_PHI, NoSymbol ] }; + key { [ q, Q, ampersand, U03D5, KP_Add, KP_Add, U211A, NoSymbol ] }; + + key { [ ssharp, U1E9E, U017F, Greek_finalsmallsigma, U2212, NoSymbol, jot, NoSymbol ] }; + + key.type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK"; + key { [ dead_acute, dead_tilde, dead_stroke, dead_psili, dead_doubleacute, NoSymbol, dead_breve, NoSymbol ] }; + + // Middle row // -------------------------------------------------------------- - // uiaeosnrtdy - key { [ u, U, backslash, NoSymbol, Home, Home, U222E ] }; - key { [ i, I, slash, Greek_iota, Left, Left, integral ] }; - key { [ a, A, braceleft, Greek_alpha, Down, Down, U2200 ] }; - key { [ e, E, braceright, Greek_epsilon, Right, Right, U2203 ] }; - key { [ o, O, asterisk, Greek_omicron, End, End, elementof ] }; - - key { [ s, S, question, Greek_sigma, questiondown, NoSymbol, Greek_SIGMA ] }; - key { [ n, N, parenleft, Greek_nu, 4, NoSymbol, U2115 ] }; - key { [ r, R, parenright, U03F1, 5, NoSymbol, U211D ] }; - key { [ t, T, minus, Greek_tau, 6, NoSymbol, partialderivative ] }; - key { [ d, D, colon, Greek_delta, comma, NoSymbol, Greek_DELTA ] }; - key { [ y, Y, at, Greek_upsilon, period, NoSymbol, nabla ] }; - - // bottom row + key.type[Group1] = "EIGHT_LEVEL_ALPHABETIC_LEVEL_FIVE_LOCK"; + key { [ u, U, backslash, NoSymbol, Home, Home, includedin, NoSymbol ] }; + key { [ i, I, slash, Greek_iota, Left, Left, integral, NoSymbol ] }; + key { [ a, A, braceleft, Greek_alpha, Down, Down, U2200, NoSymbol ] }; + key { [ e, E, braceright, Greek_epsilon, Right, Right, U2203, NoSymbol ] }; + key { [ o, O, asterisk, Greek_omicron, End, End, elementof, NoSymbol ] }; + + key { [ s, S, question, Greek_sigma, questiondown, NoSymbol, Greek_SIGMA, NoSymbol ] }; + key { [ n, N, parenleft, Greek_nu, KP_4, KP_4, U2115, NoSymbol ] }; + key { [ r, R, parenright, Greek_rho, KP_5, KP_5, U211D, NoSymbol ] }; + key { [ t, T, minus, Greek_tau, KP_6, KP_6, partialderivative, NoSymbol ] }; + key { [ d, D, colon, Greek_delta, KP_Separator, comma, Greek_DELTA, NoSymbol ] }; + + key { [ y, Y, at, Greek_upsilon, period, KP_Decimal, nabla, NoSymbol ] }; + + // Bottom row // -------------------------------------------------------------- - // üöäpzbm,.j - key { [ udiaeresis, Udiaeresis, numbersign, NoSymbol, Escape, Escape, U211C ] }; - key { [ odiaeresis, Odiaeresis, dollar, NoSymbol, Tab, Tab, U2111 ] }; - key { [ adiaeresis, Adiaeresis, bar, Greek_eta, Next, Next, U2135 ] }; - key { [ p, P, asciitilde, Greek_pi, Return, Return, Greek_PI ] }; - key { [ z, Z, grave, Greek_zeta, NoSymbol, NoSymbol, U2124 ] }; - - key { [ b, B, plus, Greek_beta, colon, NoSymbol, U21D0 ] }; - key { [ m, M, percent, Greek_mu, 1, NoSymbol, ifonlyif ] }; - key { [ comma, endash, quotedbl, Greek_rho, 2, NoSymbol, U21D2 ] }; - key { [ period, enfilledcircbullet, apostrophe, U03D1, 3, NoSymbol, Greek_THETA ] }; - key { [ j, J, semicolon, Greek_theta, semicolon, NoSymbol, variation ] }; + key { [ udiaeresis, Udiaeresis, numbersign, NoSymbol, Escape, Escape, union, NoSymbol ] }; + key { [ odiaeresis, Odiaeresis, dollar, U03F5, Tab, Tab, intersection, NoSymbol ] }; + key { [ adiaeresis, Adiaeresis, bar, Greek_eta, Insert, Insert, U2135, NoSymbol ] }; + key { [ p, P, asciitilde, Greek_pi, Return, Return, Greek_PI, NoSymbol ] }; + key { [ z, Z, grave, Greek_zeta, Undo, Undo, U2124, NoSymbol ] }; + + key { [ b, B, plus, Greek_beta, colon, NoSymbol, U21D0, NoSymbol ] }; + key { [ m, M, percent, Greek_mu, KP_1, KP_1, ifonlyif, NoSymbol ] }; + key.type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK"; + key { [ comma, endash, quotedbl, U03F1, KP_2, KP_2, U21D2, NoSymbol ] }; + key { [ period, enfilledcircbullet, apostrophe, U03D1, KP_3, KP_3, U21A6, NoSymbol ] }; + key.type[Group1] = "EIGHT_LEVEL_ALPHABETIC_LEVEL_FIVE_LOCK"; + key { [ j, J, semicolon, Greek_theta, semicolon, NoSymbol, Greek_THETA, NoSymbol ] }; + key.type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK"; // Space key // -------------------------------------------------------------- - key { [ space, space, space, nobreakspace, 0, NoSymbol, U202F ] }; + key { [ space, space, space, nobreakspace, KP_0, KP_0, U202F, NoSymbol ] }; - // Keypad - // =========== - // Num-Lock is no longer used with Neo: - //key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD"; + // Keypad-keys + // =============== - // the former Numlock key: - key { [ Tab, ISO_Left_Tab, equal, approxeq, notequal, NoSymbol, identical ] }; + // The former Numlock key: + key { [ Tab, ISO_Left_Tab, equal, approxeq, notequal, Pointer_EnableKeys, identical, NoSymbol ] }; - // topmost row + // Topmost row // -------------------------------------------------------------- - key { [ KP_Divide, KP_Divide, division, U2223, U2300, NoSymbol, U2044 ] }; - key { [ KP_Multiply, KP_Multiply, U22C5, multiply, U2299, NoSymbol, U2297 ] }; - key { [ KP_Subtract, KP_Subtract, U2212, U2216, U2296, NoSymbol, U2238 ] }; + key { [ KP_Divide, KP_Divide, division, U2300, U2215, NoSymbol, U2223, NoSymbol ] }; + key { [ KP_Multiply, KP_Multiply, U2219, U2299, multiply, NoSymbol, U2297, NoSymbol ] }; + key { [ KP_Subtract, KP_Subtract, U2212, U2296, U2216, NoSymbol, U2238, NoSymbol ] }; - // top row + // Top row // -------------------------------------------------------------- - key { [ KP_7, U2714, U2195, U226A, KP_Home, KP_Home, upstile ] }; - key { [ KP_8, U2718, uparrow, intersection, KP_Up, KP_Up, U22C2 ] }; - key { [ KP_9, NoSymbol, U20D7, U226B, KP_Prior, KP_Prior, U2309 ] }; - key { [ KP_Add, KP_Add, plusminus, U2213, U2295, NoSymbol, U2214 ] }; + key { [ KP_7, U2714, U2195, U226A, KP_Home, KP_Home, upstile, NoSymbol ] }; + key { [ KP_8, U2718, uparrow, intersection, KP_Up, KP_Up, U22C2, NoSymbol ] }; + key { [ KP_9, dagger, U20D7, U226B, KP_Prior, KP_Prior, U2309, NoSymbol ] }; + key { [ KP_Add, KP_Add, plusminus, U2295, U2213, NoSymbol, U2214, NoSymbol ] }; - // middle row + // Middle row // -------------------------------------------------------------- - key { [ KP_4, club, leftarrow, includedin, KP_Left, KP_Left, U2286 ] }; - key { [ KP_5, EuroSign, brokenbar, U22B6, KP_Begin, KP_Begin, U22B7 ] }; - key { [ KP_6, NoSymbol, rightarrow, includes, KP_Right, KP_Right, U2287 ] }; + key { [ KP_4, club, leftarrow, includedin, KP_Left, KP_Left, U2286, NoSymbol ] }; + key { [ KP_5, EuroSign, colon, U22B6, KP_Begin, KP_Begin, U22B7, NoSymbol ] }; + key { [ KP_6, U2023, rightarrow, includes, KP_Right, KP_Right, U2287, NoSymbol ] }; - // bottom row + // Bottom row // -------------------------------------------------------------- - key { [ KP_1, diamond, U2194, lessthanequal,KP_End, KP_End, downstile ] }; - key { [ KP_2, heart, downarrow, union, KP_Down, KP_Down, U22C3 ] }; - key { [ KP_3, U2660, U21CC, greaterthanequal,KP_Next, KP_Next, U230B ] }; - key { [ KP_Enter, KP_Enter, KP_Enter, KP_Enter, KP_Enter, KP_Enter, KP_Enter ] }; - key { [ KP_Equal ] }; + key { [ KP_1, diamond, U2194, lessthanequal, KP_End, KP_End, downstile, NoSymbol ] }; + key { [ KP_2, heart, downarrow, union, KP_Down, KP_Down, U22C3, NoSymbol ] }; + key { [ KP_3, U2660, U21CC, greaterthanequal, KP_Next, KP_Next, U230B, NoSymbol ] }; + key { [ KP_Enter, KP_Enter, KP_Enter, KP_Enter, KP_Enter, KP_Enter, KP_Enter, NoSymbol ] }; + key { [ KP_Equal, NoSymbol, NoSymbol, NoSymbol, NoSymbol, NoSymbol, NoSymbol, NoSymbol ] }; - // bottommost row + // Bottommost row // -------------------------------------------------------------- - key { [ KP_0, U2423, percent, U2030, KP_Insert, KP_Insert, U25A1 ] }; - key { [ KP_Decimal, comma, period, apostrophe, KP_Delete, KP_Delete, quotedbl ] }; + key { [ KP_0, U2423, percent, U2030, KP_Insert, KP_Insert, U25A1, NoSymbol ] }; + key { [ KP_Separator, period, comma, minutes, KP_Delete, KP_Delete, seconds, NoSymbol ] }; +}; + +partial alphanumeric_keys modifier_keys keypad_keys +xkb_symbols "neo" { + + include "de(neo_base)" + include "shift(both_capslock)" + include "level3(caps_switch)" + include "level3(bksl_switch)" + include "level5(lsgt_switch_lock)" + include "level5(ralt_switch_lock)" }; // Copied from macintosh_vndr/de -- cgit v1.2.3