From c265005a7cc2e16603ae95808acd415401160682 Mon Sep 17 00:00:00 2001 From: stephan Date: Sun, 10 May 2009 18:36:09 +0000 Subject: =?UTF-8?q?Versuch,=20#135=20zu=20l=C3=B6sen.=20F=C3=BCr=20das=20W?= =?UTF-8?q?echseln=20zwischen=20den=20Layouts=20gibt=20es=20noch=20keine?= =?UTF-8?q?=20L=C3=B6sung.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.neo-layout.org@1830 b9310e46-f624-0410-8ea1-cfbb3a30dc96 --- linux/X/de | 177 ++++++++++++++++++++++++++++++--------------------------- linux/X/level5 | 128 +++++++++++++++++++++++------------------ 2 files changed, 165 insertions(+), 140 deletions(-) diff --git a/linux/X/de b/linux/X/de index 7975cba..99310c2 100644 --- a/linux/X/de +++ b/linux/X/de @@ -268,33 +268,42 @@ xkb_symbols "neo" { // -------------------------------------------------------------- key.type[Group1] = "ONE_LEVEL"; key { - vmods = LevelFive, - symbols[Group1] = [ ISO_Level3_Shift ], - actions[Group1] = [ SetMods(modifiers=LevelFive) ] + vmods[Group1] = LevelThree, + symbols[Group1] = [ ISO_Level3_Shift ], + actions[Group1] = [ SetMods(modifiers=LevelThree) ] }; key { - vmods = LevelFive, - symbols[Group1] = [ ISO_Level3_Shift ], - actions[Group1] = [ SetMods(modifiers=LevelFive) ] + vmods[Group1] = LevelThree, + symbols[Group1] = [ ISO_Level3_Shift ], + actions[Group1] = [ SetMods(modifiers=LevelThree) ] }; - modifier_map Mod3 { , }; + modifier_map Mod5 { , }; // Neo-Mod4 // -------------------------------------------------------------- - key.type[Group1] = "THREE_LEVEL"; // Mod4 + Mod4 = Mod4_Lock + key.type[Group1] = "EIGHT_LEVEL"; key { - vmods = NumLock, - symbols[Group1] = [ Num_Lock, Num_Lock, Num_Lock ], - actions[Group1] = [ SetMods(modifiers=LevelThree), SetMods(modifiers=LevelThree), LockMods(modifiers=NumLock) ] + vmods[Group1] = NumLock, + symbols[Group1] = [ Num_Lock, Num_Lock, Num_Lock, Num_Lock, Num_Lock, Num_Lock, Num_Lock, Num_Lock ], + actions[Group1] = [ SetMods(modifiers=LevelFive), SetMods(modifiers=LevelFive), SetMods(modifiers=LevelFive), SetMods(modifiers=LevelFive), LockMods(modifiers=NumLock), LockMods(modifiers=NumLock), LockMods(modifiers=NumLock), LockMods(modifiers=NumLock) ] }; key { - vmods = NumLock, - symbols[Group1] = [ Num_Lock, Num_Lock, Num_Lock ], - actions[Group1] = [ SetMods(modifiers=LevelThree), SetMods(modifiers=LevelThree), LockMods(modifiers=NumLock) ] + vmods[Group1] = NumLock, + symbols[Group1] = [ Num_Lock, Num_Lock, Num_Lock, Num_Lock, Num_Lock, Num_Lock, Num_Lock, Num_Lock ], + actions[Group1] = [ SetMods(modifiers=LevelFive), SetMods(modifiers=LevelFive), SetMods(modifiers=LevelFive), SetMods(modifiers=LevelFive), LockMods(modifiers=NumLock), LockMods(modifiers=NumLock), LockMods(modifiers=NumLock), LockMods(modifiers=NumLock) ] }; modifier_map Mod2 { , }; + // Mapping virtual modifier 'LevelFive' to real modifier 'Mod3': + key { + type[Group1] = "ONE_LEVEL", + vmods[Group1] = LevelFive, + symbols[Group1] = [ NoSymbol ], + actions[Group1] = [ SetMods(modifiers=LevelFive) ] + }; + modifier_map Mod3 { }; + // Legend // =============== @@ -302,8 +311,8 @@ xkb_symbols "neo" { // These are the levels used, and Xorg's translations: // -------------------------------------------------------------- // Xorg: Level1 Level2 Level3 Level4 Level5 Level6 Level7 Level8 - // Neo: Ebene1 Ebene2 Ebene4 ??? Ebene3 Ebene5 Ebene6 ??? - // Keys (Neo): None Shift Mod4 Mod4 + Shift Mod3 Mod3 + Shift Mod3 + Mod4 Mod3 + Mod4 + Shift + // Neo: Ebene1 Ebene2 Ebene3 Ebene5 Ebene4 ??? Ebene6 ??? + // Keys (Neo): None Shift Mod3 Mod3 + Shift Mod4 Mod4 + Shift Mod3 + Mod4 Mod3 + Mod4 + Shift // Alphanumeric-keys @@ -312,124 +321,124 @@ xkb_symbols "neo" { // Tab as Multi_key (Compose) // -------------------------------------------------------------- - key { [ Tab, ISO_Left_Tab, NoSymbol, NoSymbol, Multi_key, NoSymbol, NoSymbol, NoSymbol ] }; + key { [ Tab, ISO_Left_Tab, Multi_key, NoSymbol, NoSymbol, NoSymbol, NoSymbol, NoSymbol ] }; // Number row // -------------------------------------------------------------- - key { [ dead_circumflex, dead_tilde, dead_caron, Pointer_EnableKeys, dead_abovering, dead_breve, dead_macron, NoSymbol ] }; - - key { [ 1, degree, ordfeminine, NoSymbol, onesuperior, onesubscript, notsign, NoSymbol ] }; - key { [ 2, section, masculine, NoSymbol, twosuperior, twosubscript, logicalor, NoSymbol ] }; - key { [ 3, U2113, numerosign, NoSymbol, threesuperior, threesubscript, logicaland, NoSymbol ] }; - key { [ 4, guillemotright, Prior, Prior, U203A, femalesymbol, U22A5, NoSymbol ] }; - key { [ 5, guillemotleft, periodcentered, NoSymbol, U2039, malesymbol, U2221, NoSymbol ] }; - key { [ 6, dollar, sterling, NoSymbol, cent, U26A5, U2225, NoSymbol ] }; - - key { [ 7, EuroSign, currency, NoSymbol, yen, Greek_kappa, rightarrow, NoSymbol ] }; - key { [ 8, doublelowquotemark, NoSymbol, NoSymbol, singlelowquotemark, U27E8, U221E, NoSymbol ] }; - key { [ 9, leftdoublequotemark, KP_Divide, NoSymbol, leftsinglequotemark, U27E9, U220B, NoSymbol ] }; - key { [ 0, rightdoublequotemark, KP_Multiply, NoSymbol, rightsinglequotemark, zerosubscript, emptyset, NoSymbol ] }; - - key { [ minus, emdash, KP_Subtract, NoSymbol, NoSymbol, U2011, hyphen, NoSymbol ] }; - key { [ dead_grave, NoSymbol, dead_doublegrave, NoSymbol, dead_diaeresis, dead_dasia, NoSymbol, NoSymbol ] }; + 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 // -------------------------------------------------------------- key.type[Group1] = "EIGHT_LEVEL_NEO_LOCKS_QUARTERALPHABETIC"; - key { [ x, X, U22EE, NoSymbol, ellipsis, Greek_xi, Greek_XI, NoSymbol ] }; - key { [ v, V, BackSpace, BackSpace, underscore, NoSymbol, U222E, NoSymbol ] }; - key { [ l, L, Up, Up, bracketleft, Greek_lambda, Greek_LAMBDA, NoSymbol ] }; - key { [ c, C, Delete, Delete, bracketright, Greek_chi, U2102, NoSymbol ] }; - key { [ w, W, Insert, Insert, asciicircum, Greek_omega, Greek_OMEGA, NoSymbol ] }; + 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, exclamdown, NoSymbol, exclam, U03F0, radical, NoSymbol ] }; - key { [ h, H, KP_7, NoSymbol, less, Greek_psi, Greek_PSI, NoSymbol ] }; - key { [ g, G, KP_8, NoSymbol, greater, Greek_gamma, Greek_GAMMA, NoSymbol ] }; - key { [ f, F, KP_9, NoSymbol, equal, Greek_phi, Greek_PHI, NoSymbol ] }; - key { [ q, Q, KP_Add, NoSymbol, ampersand, U03D5, U211A, 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, U2212, NoSymbol, U017F, Greek_finalsmallsigma, jot, NoSymbol ] }; + key { [ ssharp, U1E9E, U017F, Greek_finalsmallsigma, U2212, NoSymbol, jot, NoSymbol ] }; key.type[Group1] = "EIGHT_LEVEL_NEO_LOCKS"; - key { [ dead_acute, dead_cedilla, dead_doubleacute, NoSymbol, dead_stroke, dead_psili, dead_abovedot, NoSymbol ] }; + key { [ dead_acute, dead_cedilla, dead_stroke, dead_psili, dead_doubleacute, NoSymbol, dead_abovedot, NoSymbol ] }; // Middle row // -------------------------------------------------------------- key.type[Group1] = "EIGHT_LEVEL_NEO_LOCKS_QUARTERALPHABETIC"; - key { [ u, U, Home, Home, backslash, NoSymbol, mu, NoSymbol ] }; - key { [ i, I, Left, Left, slash, Greek_iota, integral, NoSymbol ] }; - key { [ a, A, Down, Down, braceleft, Greek_alpha, U2200, NoSymbol ] }; - key { [ e, E, Right, Right, braceright, Greek_epsilon, U2203, NoSymbol ] }; - key { [ o, O, End, End, asterisk, Greek_omicron, elementof, NoSymbol ] }; + 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, questiondown, NoSymbol, question, Greek_sigma, Greek_SIGMA, NoSymbol ] }; - key { [ n, N, KP_4, NoSymbol, parenleft, Greek_nu, U2115, NoSymbol ] }; - key { [ r, R, KP_5, NoSymbol, parenright, U03F1, U211D, NoSymbol ] }; - key { [ t, T, KP_6, NoSymbol, minus, Greek_tau, partialderivative, NoSymbol ] }; - key { [ d, D, KP_Separator, NoSymbol, colon, Greek_delta, Greek_DELTA, 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, KP_Decimal, NoSymbol, at, Greek_upsilon, nabla, NoSymbol ] }; + key { [ y, Y, at, Greek_upsilon, KP_Decimal, NoSymbol, nabla, NoSymbol ] }; // Bottom row // -------------------------------------------------------------- - key { [ udiaeresis, Udiaeresis, Escape, Escape, numbersign, NoSymbol, U211C, NoSymbol ] }; - key { [ odiaeresis, Odiaeresis, Tab, Tab, dollar, U03F5, U2111, NoSymbol ] }; - key { [ adiaeresis, Adiaeresis, Next, Next, bar, Greek_eta, U2135, NoSymbol ] }; - key { [ p, P, Return, Return, asciitilde, Greek_pi, Greek_PI, NoSymbol ] }; - key { [ z, Z, Undo, NoSymbol, grave, Greek_zeta, U2124, NoSymbol ] }; - - key { [ b, B, colon, NoSymbol, plus, Greek_beta, U21D0, NoSymbol ] }; - key { [ m, M, KP_1, NoSymbol, percent, Greek_mu, ifonlyif, NoSymbol ] }; + 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, Undo, Undo, U2124, NoSymbol ] }; + + key { [ b, B, plus, Greek_beta, colon, NoSymbol, U21D0, NoSymbol ] }; + key { [ m, M, percent, Greek_mu, KP_1, NoSymbol, ifonlyif, NoSymbol ] }; key.type[Group1] = "EIGHT_LEVEL_NEO_LOCKS"; - key { [ comma, endash, KP_2, NoSymbol, quotedbl, Greek_rho, U21D2, NoSymbol ] }; - key { [ period, enfilledcircbullet, KP_3, NoSymbol, apostrophe, U03D1, Greek_THETA, NoSymbol ] }; + key { [ comma, endash, quotedbl, Greek_rho, KP_2, NoSymbol, U21D2, NoSymbol ] }; + key { [ period, enfilledcircbullet, apostrophe, U03D1, KP_3, NoSymbol, Greek_THETA, NoSymbol ] }; key.type[Group1] = "EIGHT_LEVEL_NEO_LOCKS_QUARTERALPHABETIC"; - key { [ j, J, semicolon, NoSymbol, semicolon, Greek_theta, variation, NoSymbol ] }; + key { [ j, J, semicolon, Greek_theta, semicolon, NoSymbol, variation, NoSymbol ] }; key.type[Group1] = "EIGHT_LEVEL_NEO_LOCKS"; // Space key // -------------------------------------------------------------- - key { [ space, space, KP_0, NoSymbol, space, nobreakspace, U202F, NoSymbol ] }; + key { [ space, space, space, nobreakspace, KP_0, NoSymbol, U202F, NoSymbol ] }; // Keypad-keys // =============== // The former Numlock key: - key { [ Tab, ISO_Left_Tab, notequal, NoSymbol, equal, approxeq, identical, NoSymbol ] }; + key { [ Tab, ISO_Left_Tab, equal, approxeq, notequal, NoSymbol, identical, NoSymbol ] }; // Topmost row // -------------------------------------------------------------- - key { [ KP_Divide, KP_Divide, U2215, NoSymbol, division, U2300, U2223, NoSymbol ] }; - key { [ KP_Multiply, KP_Multiply, multiply, NoSymbol, U2219, U2299, U2297, NoSymbol ] }; - key { [ KP_Subtract, KP_Subtract, U2216, NoSymbol, U2212, U2296, U2238, NoSymbol ] }; + 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 // -------------------------------------------------------------- - key { [ KP_7, U2714, KP_Home, KP_Home, U2195, U226A, upstile, NoSymbol ] }; - key { [ KP_8, U2718, KP_Up, KP_Up, uparrow, intersection, U22C2, NoSymbol ] }; - key { [ KP_9, dagger, KP_Prior, KP_Prior, U20D7, U226B, U2309, NoSymbol ] }; - key { [ KP_Add, KP_Add, U2213, NoSymbol, plusminus, U2295, U2214, NoSymbol ] }; + 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, KP_Left, KP_Left, leftarrow, includedin, U2286, NoSymbol ] }; - key { [ KP_5, EuroSign, KP_Begin, KP_Begin, brokenbar, U22B6, U22B7, NoSymbol ] }; - key { [ KP_6, U2023, KP_Right, KP_Right, rightarrow, includes, U2287, NoSymbol ] }; + 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 // -------------------------------------------------------------- - key { [ KP_1, diamond, KP_End, KP_End, U2194, lessthanequal, downstile, NoSymbol ] }; - key { [ KP_2, heart, KP_Down, KP_Down, downarrow, union, U22C3, NoSymbol ] }; - key { [ KP_3, U2660, KP_Next, KP_Next, U21CC, greaterthanequal, U230B, NoSymbol ] }; + 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 // -------------------------------------------------------------- - key { [ KP_0, U2423, KP_Insert, KP_Insert, percent, U2030, U25A1, NoSymbol ] }; - key { [ KP_Separator, KP_Decimal, KP_Delete, KP_Delete, period, apostrophe, quotedbl, NoSymbol ] }; + 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 diff --git a/linux/X/level5 b/linux/X/level5 index f549866..30313d2 100644 --- a/linux/X/level5 +++ b/linux/X/level5 @@ -60,29 +60,35 @@ partial default xkb_types "default" { // 'NumLock' is used for the (Neo-)Mod4-Lock. modifiers = Shift + LevelThree + NumLock + LevelFive; - map[None] = Level1; - map[Shift] = Level2; - map[LevelThree] = Level3; - map[LevelThree+Shift] = Level4; - map[NumLock] = Level3; - map[NumLock+Shift] = Level4; - map[NumLock+LevelThree] = Level1; - map[NumLock+LevelThree+Shift] = Level2; - map[LevelFive] = Level5; - map[LevelFive+Shift] = Level6; - map[LevelFive+LevelThree] = Level7; - map[LevelFive+LevelThree+Shift] = Level8; - map[LevelFive+NumLock] = Level7; - map[LevelFive+NumLock+Shift] = Level8; - map[LevelFive+NumLock+LevelThree] = Level5; - map[LevelFive+NumLock+LevelThree+Shift] = Level6; + preserve[LevelFive+Shift] = Shift; + preserve[NumLock+Shift] = Shift; + + map[None] = Level1; + map[Shift] = Level2; + map[LevelThree] = Level3; + map[LevelThree+Shift] = Level4; + + map[LevelFive] = Level5; + map[LevelFive+Shift] = Level6; + map[LevelFive+LevelThree] = Level7; + map[LevelFive+LevelThree+Shift] = Level8; + + map[NumLock] = Level5; + map[NumLock+Shift] = Level6; + map[NumLock+LevelThree] = Level7; + map[NumLock+LevelThree+Shift] = Level8; + + map[NumLock+LevelFive] = Level1; + map[NumLock+LevelFive+Shift] = Level2; + map[NumLock+LevelFive+LevelThree] = Level3; + map[NumLock+LevelFive+LevelThree+Shift] = Level4; level_name[Level1] = "Neo Level1"; level_name[Level2] = "Neo Level2"; - level_name[Level3] = "Neo Level4"; - level_name[Level4] = "Neo Level4 Shift"; - level_name[Level5] = "Neo Level3"; - level_name[Level6] = "Neo Level5"; + level_name[Level3] = "Neo Level3"; + level_name[Level4] = "Neo Level5"; + level_name[Level5] = "Neo Level4"; + level_name[Level6] = "Neo Level4 Shift"; level_name[Level7] = "Neo Level6"; level_name[Level8] = "Neo Level6 Shift"; }; @@ -91,46 +97,56 @@ partial default xkb_types "default" { // 'NumLock' is used for the (Neo-)Mod4-Lock. modifiers = Shift + Lock + LevelThree + NumLock + LevelFive; - map[None] = Level1; - map[Shift] = Level2; - map[LevelThree] = Level3; - map[LevelThree+Shift] = Level4; - map[NumLock] = Level3; - map[NumLock+Shift] = Level4; - map[NumLock+LevelThree] = Level1; - map[NumLock+LevelThree+Shift] = Level2; - map[LevelFive] = Level5; - map[LevelFive+Shift] = Level6; - map[LevelFive+LevelThree] = Level7; - map[LevelFive+LevelThree+Shift] = Level8; - map[LevelFive+NumLock] = Level7; - map[LevelFive+NumLock+Shift] = Level8; - map[LevelFive+NumLock+LevelThree] = Level5; - map[LevelFive+NumLock+LevelThree+Shift] = Level6; + preserve[LevelFive+Shift] = Shift; + preserve[NumLock+Shift] = Shift; + + map[None] = Level1; + map[Shift] = Level2; + map[LevelThree] = Level3; + map[LevelThree+Shift] = Level4; + + map[LevelFive] = Level5; + map[LevelFive+Shift] = Level6; + map[LevelFive+LevelThree] = Level7; + map[LevelFive+LevelThree+Shift] = Level8; + + map[NumLock] = Level5; + map[NumLock+Shift] = Level6; + map[NumLock+LevelThree] = Level7; + map[NumLock+LevelThree+Shift] = Level8; + + map[NumLock+LevelFive] = Level1; + map[NumLock+LevelFive+Shift] = Level2; + map[NumLock+LevelFive+LevelThree] = Level3; + map[NumLock+LevelFive+LevelThree+Shift] = Level4; + // Lock interchanges Level1 and Level2 - map[Lock] = Level2; - map[Lock+Shift] = Level1; - map[Lock+LevelThree] = Level3; - map[Lock+LevelThree+Shift] = Level4; - map[Lock+NumLock] = Level3; - map[Lock+NumLock+Shift] = Level4; - map[Lock+NumLock+LevelThree] = Level2; - map[Lock+NumLock+LevelThree+Shift] = Level1; - map[Lock+LevelFive] = Level5; - map[Lock+LevelFive+Shift] = Level6; - map[Lock+LevelFive+LevelThree] = Level7; - map[Lock+LevelFive+LevelThree+Shift] = Level8; - map[Lock+LevelFive+NumLock] = Level7; - map[Lock+LevelFive+NumLock+Shift] = Level8; - map[Lock+LevelFive+NumLock+LevelThree] = Level5; - map[Lock+LevelFive+NumLock+LevelThree+Shift] = Level6; + map[Lock] = Level2; + map[Lock+Shift] = Level1; + map[Lock+LevelThree] = Level3; + map[Lock+LevelThree+Shift] = Level4; + + map[Lock+LevelFive] = Level5; + map[Lock+LevelFive+Shift] = Level6; + map[Lock+LevelFive+LevelThree] = Level7; + map[Lock+LevelFive+LevelThree+Shift] = Level8; + + map[Lock+NumLock] = Level5; + map[Lock+NumLock+Shift] = Level6; + map[Lock+NumLock+LevelThree] = Level7; + map[Lock+NumLock+LevelThree+Shift] = Level8; + + map[Lock+NumLock+LevelFive] = Level2; + map[Lock+NumLock+LevelFive+Shift] = Level1; + map[Lock+NumLock+LevelFive+LevelThree] = Level3; + map[Lock+NumLock+LevelFive+LevelThree+Shift] = Level4; level_name[Level1] = "Neo Level1"; level_name[Level2] = "Neo Level2"; - level_name[Level3] = "Neo Level4"; - level_name[Level4] = "Neo Level4 Shift"; - level_name[Level5] = "Neo Level3"; - level_name[Level6] = "Neo Level5"; + level_name[Level3] = "Neo Level3"; + level_name[Level4] = "Neo Level5"; + level_name[Level5] = "Neo Level4"; + level_name[Level6] = "Neo Level4 Shift"; level_name[Level7] = "Neo Level6"; level_name[Level8] = "Neo Level6 Shift"; }; -- cgit v1.2.3