From 7137989f48c1446ffce084b9ec5f32137c74ced7 Mon Sep 17 00:00:00 2001 From: erik Date: Mon, 20 Apr 2009 19:28:57 +0000 Subject: Stephans Version, siehe Ticket #33 git-svn-id: https://svn.neo-layout.org@1798 b9310e46-f624-0410-8ea1-cfbb3a30dc96 --- linux/X/de | 257 +++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 140 insertions(+), 117 deletions(-) (limited to 'linux/X/de') diff --git a/linux/X/de b/linux/X/de index 29362bf..a14e791 100644 --- a/linux/X/de +++ b/linux/X/de @@ -216,7 +216,6 @@ xkb_symbols "sundeadkeys" { // // $Revision$, $Date$ - partial alphanumeric_keys modifier_keys keypad_keys xkb_symbols "neo" { @@ -230,156 +229,180 @@ xkb_symbols "neo" { // 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 + // Compose (not a level): Mod3 + Tab + // Feststelltaste (Capslock): Shift + Shift // // 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 - // -------------------------------------------------------------- - // Definition of the so called Neo-Mod3 - // (FIXME Nur CAPS+BKSL ist Caps_Lock – Nicht andersherum, siehe Ticket #30) - key.type[Group1]="THREE_LEVEL"; - key { [ ISO_Level3_Shift, ISO_Level3_Shift, Caps_Lock ] }; - key { [ ISO_Level3_Shift, ISO_Level3_Shift, Caps_Lock ] }; - - // Definition of the so called Neo-Mod4 - // FIXME ISO_Level5_Shift was causing problems, though it's defined in - // /usr/include/X11/keysymdef.h on Ubuntu 8.10 (ticket #33), - // using hexcode 0xfe11 again for now - key.type[Group1]="ONE_LEVEL"; - key { type[Group1]="ONE_LEVEL", [ 0xfe11 ]}; - key { [ 0xfe11 ]}; - modifier_map Mod3 { , }; - // Attention: ^^^ This is a X server variable, not the Neo-Mod3. - - key.type[Group1]="EIGHT_LEVEL_ALPHABETIC" ; + // Legend + // =============== + // I don't think we need EIGHT_LEVEL_ALPHABETIC because the Lock gets deaktivated as soon as a Shift-key is pressed + // Therefore there is no need for Lock + Shift. + // key.type[Group1] = "EIGHT_LEVEL_ALPHABETIC"; + key.type[Group1] = "EIGHT_LEVEL"; - // Tab as Multi_key (Compose) + // Xorg: Level1 Level2 Level3 Level4 Level5 Level6 Level7 Level8 + // Neo: Ebene1 Ebene2 Ebene3 Ebene5 Ebene4 ??? Ebene6 ??? + // Keys (Neo): None Shift Mod3 Mod3 + Shift Mod4 Mod4 + Shift Mod3 + Mod4 Mod3 + Mod4 + Shift + + + // Modifier-keys + // =============== + + // FIXME Force norepeat is not working correctly: + // key { repeat = false }; + // key { repeat = false }; + // key { repeat = false }; + + // Shift // -------------------------------------------------------------- - key { [ Tab, ISO_Left_Tab, Multi_key ] }; + // Redefinition of both Shift-keys in order to get the desired "Shift + Shift = Shift_Lock" + key { [ Shift_L, Shift_Lock, Shift_L, Shift_Lock, Shift_L, Shift_Lock, Shift_L, Shift_Lock ] }; + key { [ Shift_R, Shift_Lock, Shift_R, Shift_Lock, Shift_R, Shift_Lock, Shift_R, Shift_Lock ] }; - // number row + // Neo-Mod3 + // -------------------------------------------------------------- + // Mod3 + Mod3 = Mod3_Lock + key { [ ISO_Level3_Shift, ISO_Level3_Shift, ISO_Level3_Lock, ISO_Level3_Lock, ISO_Level3_Shift, ISO_Level3_Shift, ISO_Level3_Lock, ISO_Level3_Lock ] }; + key { [ ISO_Level3_Shift, ISO_Level3_Shift, ISO_Level3_Lock, ISO_Level3_Lock, ISO_Level3_Shift, ISO_Level3_Shift, ISO_Level3_Lock, ISO_Level3_Lock ] }; + // The following is also done somewhere else, but I couldn't find where and since the modifier_map is needed by ISO_Level5 too (see below) I'm adding it here. + // Also see how Level-switching is done in "symbols/level3(ralt_switch)" + modifier_map Mod5 { ISO_Level3_Shift }; // optional + // This ^^^^ has nothing to do with the "Neo-Mod-Keys"! + + // Neo-Mod4 // -------------------------------------------------------------- - key { [ dead_circumflex, dead_tilde, dead_abovering, dead_breve, dead_caron, Pointer_EnableKeys, dead_macron ] }; + // Mod4 + Mod4 = Mod4_Lock + // The console-setup package doesn't like ISO_Level5_Shift and ISO_Level5_Lock, see + // https://bugs.launchpad.net/ubuntu/+source/console-setup/+bug/363388 + key { [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ] }; + key { [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ] }; + // ISO_Level5_Shift alone won't have the desired effect in all applicitions, therefore adding the following as it is done in "symbols/level5(rctrl_switch)" + modifier_map Mod3 { ISO_Level5_Shift }; // mandatory + // This ^^^^ has nothing to do with the "Neo-Mod-Keys"! - 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, femalesymbol, Prior, Prior, U22A5 ] }; - key { [ 5, guillemotleft, U2039, malesymbol, periodcentered, NoSymbol, U2221 ] }; - key { [ 6, dollar, cent, U26A5, sterling, NoSymbol, U2225 ] }; - key { [ 7, EuroSign, yen, Greek_kappa, currency, NoSymbol, rightarrow ] }; - key { [ 8, doublelowquotemark, singlelowquotemark, U27E8, NoSymbol, NoSymbol, U221E ] }; - key { [ 9, leftdoublequotemark, leftsinglequotemark, U27E9, KP_Divide, NoSymbol, U220B ] }; - key { [ 0, rightdoublequotemark, rightsinglequotemark, zerosubscript, KP_Multiply, NoSymbol, emptyset ] }; + // Alphanumeric-keys + // =============== - key { [ minus, emdash, NoSymbol, U2011, KP_Subtract, NoSymbol, hyphen ] }; - key { [ dead_grave, NoSymbol, dead_diaeresis, dead_dasia, dead_doublegrave, NoSymbol, -NoSymbol ] }; + // Tab as Multi_key (Compose) + // -------------------------------------------------------------- + key { [ Tab, ISO_Left_Tab, Multi_key, NoSymbol, NoSymbol, NoSymbol, NoSymbol, NoSymbol ] }; - key { [ BackSpace, BackSpace, BackSpace, BackSpace, BackSpace, BackSpace, BackSpace ] }; + // Number Row + // -------------------------------------------------------------- + key { [ dead_circumflex, dead_tilde, dead_abovering, dead_breve, dead_caron, Pointer_EnableKeys, dead_macron, NoSymbol ] }; + + 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, Prior, Prior, U22A5, NoSymbol ] }; + key { [ 5, guillemotleft, U2039, malesymbol, periodcentered, NoSymbol, U2221, NoSymbol ] }; + + key { [ 6, dollar, cent, U26A5, sterling, NoSymbol, U2225, NoSymbol ] }; + key { [ 7, EuroSign, yen, Greek_kappa, currency, NoSymbol, rightarrow, NoSymbol ] }; + key { [ 8, doublelowquotemark, singlelowquotemark, U27E8, NoSymbol, NoSymbol, U221E, NoSymbol ] }; + key { [ 9, leftdoublequotemark, leftsinglequotemark, U27E9, KP_Divide, NoSymbol, U220B, NoSymbol ] }; + key { [ 0, rightdoublequotemark, rightsinglequotemark, zerosubscript, KP_Multiply, NoSymbol, emptyset, NoSymbol ] }; + + key { [ minus, emdash, NoSymbol, U2011, KP_Subtract, NoSymbol, hyphen, NoSymbol ] }; + key { [ dead_grave, NoSymbol, dead_diaeresis, dead_dasia, dead_doublegrave, NoSymbol, NoSymbol, NoSymbol ] }; + key { [ BackSpace, BackSpace, BackSpace, BackSpace, BackSpace, BackSpace, BackSpace, NoSymbol ] }; - // top row + // Top Row // -------------------------------------------------------------- - // xvlcwkhgfqß - key { [ x, X, ellipsis, Greek_xi, U22EE, NoSymbol, Greek_XI ] }; - key { [ v, V, underscore, NoSymbol, BackSpace, BackSpace, U222E ] }; - 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, KP_7, NoSymbol, Greek_PSI ] }; - key { [ g, G, greater, Greek_gamma, KP_8, NoSymbol, Greek_GAMMA ] }; - key { [ f, F, equal, Greek_phi, KP_9, NoSymbol, Greek_PHI ] }; - key { [ q, Q, ampersand, U03D5, KP_Add, NoSymbol, U211A ] }; - key { [ ssharp, U1E9E, U017F, Greek_finalsmallsigma, U2212, NoSymbol, jot ] }; - - key { [ dead_acute, dead_cedilla, dead_stroke, dead_psili, dead_doubleacute, NoSymbol, dead_abovedot ] }; - - // middle row + key { [ x, X, ellipsis, Greek_xi, U22EE, NoSymbol, Greek_XI, NoSymbol ] }; + key { [ v, V, underscore, NoSymbol, BackSpace, BackSpace, U222E, 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, Insert, Insert, Greek_OMEGA, NoSymbol ] }; + + key { [ k, K, exclam, U03F0, exclamdown, NoSymbol, radical, NoSymbol ] }; + key { [ h, H, less, Greek_psi, KP_7, NoSymbol, Greek_PSI, NoSymbol ] }; + key { [ g, G, greater, Greek_gamma, KP_8, NoSymbol, Greek_GAMMA, NoSymbol ] }; + key { [ f, F, equal, Greek_phi, KP_9, NoSymbol, Greek_PHI, NoSymbol ] }; + key { [ q, Q, ampersand, U03D5, KP_Add, NoSymbol, U211A, NoSymbol ] }; + + key { [ ssharp, U1E9E, U017F, Greek_finalsmallsigma, U2212, NoSymbol, jot, NoSymbol ] }; + key { [ dead_acute, dead_cedilla, dead_stroke, dead_psili, dead_doubleacute, NoSymbol, dead_abovedot, NoSymbol ] }; + + // Middle Row // -------------------------------------------------------------- - // uiaeosnrtdy - key { [ u, U, backslash, NoSymbol, Home, Home, mu ] }; - 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, KP_4, NoSymbol, U2115 ] }; - key { [ r, R, parenright, U03F1, KP_5, NoSymbol, U211D ] }; - key { [ t, T, minus, Greek_tau, KP_6, NoSymbol, partialderivative ] }; - key { [ d, D, colon, Greek_delta, KP_Separator, NoSymbol, Greek_DELTA ] }; - key { [ y, Y, at, Greek_upsilon, KP_Decimal, NoSymbol, nabla ] }; - - // bottom row + key { [ u, U, backslash, NoSymbol, Home, Home, mu, 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, NoSymbol, U2115, NoSymbol ] }; + key { [ r, R, parenright, U03F1, KP_5, NoSymbol, U211D, NoSymbol ] }; + key { [ t, T, minus, Greek_tau, KP_6, NoSymbol, partialderivative, NoSymbol ] }; + key { [ d, D, colon, Greek_delta, KP_Separator, NoSymbol, Greek_DELTA, NoSymbol ] }; + + key { [ y, Y, at, Greek_upsilon, KP_Decimal, NoSymbol, nabla, NoSymbol ] }; + + // Bottom Row // -------------------------------------------------------------- - // üöäpzbm,.j - key { [ udiaeresis, Udiaeresis, numbersign, NoSymbol, Escape, Escape, U211C ] }; - key { [ odiaeresis, Odiaeresis, dollar, U03F5, 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, KP_1, NoSymbol, ifonlyif ] }; - key { [ comma, endash, quotedbl, Greek_rho, KP_2, NoSymbol, U21D2 ] }; - key { [ period, enfilledcircbullet, apostrophe, U03D1, KP_3, NoSymbol, Greek_THETA ] }; - key { [ j, J, semicolon, Greek_theta, semicolon, NoSymbol, variation ] }; + key { [ udiaeresis, Udiaeresis, numbersign, NoSymbol, Escape, Escape, U211C, NoSymbol ] }; + key { [ odiaeresis, Odiaeresis, dollar, U03F5, Tab, Tab, U2111, NoSymbol ] }; + key { [ adiaeresis, Adiaeresis, bar, Greek_eta, Next, Next, U2135, NoSymbol ] }; + key { [ p, P, asciitilde, Greek_pi, Return, Return, Greek_PI, NoSymbol ] }; + key { [ z, Z, grave, Greek_zeta, NoSymbol, NoSymbol, U2124, NoSymbol ] }; + + key { [ b, B, plus, Greek_beta, colon, NoSymbol, U21D0, NoSymbol ] }; + key { [ m, M, percent, Greek_mu, KP_1, NoSymbol, ifonlyif, NoSymbol ] }; + key { [ comma, endash, quotedbl, Greek_rho, KP_2, NoSymbol, U21D2, NoSymbol ] }; + key { [ period, enfilledcircbullet, apostrophe, U03D1, KP_3, NoSymbol, Greek_THETA, NoSymbol ] }; + key { [ j, J, semicolon, Greek_theta, semicolon, NoSymbol, variation, NoSymbol ] }; // Space key // -------------------------------------------------------------- - key { [ space, space, space, nobreakspace, KP_0, NoSymbol, U202F ] }; + key { [ space, space, space, nobreakspace, KP_0, NoSymbol, U202F, NoSymbol ] }; - // Keypad - // =========== + + // Keypad-keys + // =============== // Num-Lock is no longer used with Neo: //key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD"; - // 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, NoSymbol, identical, NoSymbol ] }; - // topmost row + // Topmost Row // -------------------------------------------------------------- - key { [ KP_Divide, KP_Divide, division, U2300, U2215, NoSymbol, U2223 ] }; - key { [ KP_Multiply, KP_Multiply, U2219, U2299, multiply, NoSymbol, U2297 ] }; - key { [ KP_Subtract, KP_Subtract, U2212, U2296, U2216, 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, dagger, U20D7, U226B, KP_Prior, KP_Prior, U2309 ] }; - key { [ KP_Add, KP_Add, plusminus, U2295, U2213, NoSymbol, U2214 ] }; - - // middle row + 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 // -------------------------------------------------------------- - 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, U2023, rightarrow, includes, KP_Right, KP_Right, U2287 ] }; + key { [ KP_4, club, leftarrow, includedin, KP_Left, KP_Left, U2286, NoSymbol ] }; + key { [ KP_5, EuroSign, brokenbar, 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_Separator, KP_Decimal, period, apostrophe, KP_Delete, KP_Delete, quotedbl ] }; - + key { [ KP_0, U2423, percent, U2030, KP_Insert, KP_Insert, U25A1, NoSymbol ] }; + key { [ KP_Separator, KP_Decimal, period, apostrophe, KP_Delete, KP_Delete, quotedbl, NoSymbol ] }; }; // Copied from macintosh_vndr/de -- cgit v1.2.3