From f540a2d76f68bb1567b04432fb4de38118a3ba5d Mon Sep 17 00:00:00 2001 From: erik Date: Sun, 10 May 2009 09:45:37 +0000 Subject: =?UTF-8?q?test-Version=20ist=20angesichts=20der=20wenigen=20Zeit?= =?UTF-8?q?=20bis=20zum=20xkeyboard-config-freeze=20(http://wiki.neo-layou?= =?UTF-8?q?t.org/roadmap)=20nicht=20mehr=20sinnvoll.=20alle=20fehler=20dor?= =?UTF-8?q?t=20sollten=20so=20schnell=20wie=20m=C3=B6glich=20von=20vielen?= =?UTF-8?q?=20getestet=20und=20behoben=20werden.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.neo-layout.org@1827 b9310e46-f624-0410-8ea1-cfbb3a30dc96 --- linux/X/de | 101 ++++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 57 insertions(+), 44 deletions(-) (limited to 'linux/X/de') diff --git a/linux/X/de b/linux/X/de index ca205d3..08a823f 100644 --- a/linux/X/de +++ b/linux/X/de @@ -216,6 +216,7 @@ xkb_symbols "sundeadkeys" { // inspired by Dvorak/de-ergo http://www.goebel-consult.de/de-ergo/ // // Authors: +// Stephan Hilb // // Benjamin Kellermann // Erik Streb @@ -240,66 +241,74 @@ xkb_symbols "neo" { // Ebene 6: Mod3 + Mod4 // Compose (not a level): Mod3 + Tab // Feststelltaste (Capslock): Shift + Shift - // Mod3-Lock: Mod3 + Mod3 // Mod4-Lock: Mod4 + Mod4 // - // Levels in Xkbmap jargon to be found here in the definitions. - // These are the levels used, and Xorg's translations with type="EIGHT_LEVEL": - // -------------------------------------------------------------- - // Legend - // =============== - // I don't think we need EIGHT_LEVEL_ALPHABETIC because the Lock gets deactivated - // 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"; - - // 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 + // NOTE: To get the desired Mod4-Lock the real modifier Mod2 was misused in order to get control over the lock-state! + // I wasn't able to get it working with a virtual modifier and I think its not that fatal, because Num-Lock (the original use for Mod2) isn't used in Neo anyways. // Modifier-keys // =============== - // FIXME Force norepeat is not working correctly: - // key { repeat = false }; - // key { repeat = false }; - // key { repeat = false }; - // Shift // -------------------------------------------------------------- - // 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 ] }; + // Shift + Shift = Caps_Lock + key.type[Group1] = "TWO_LEVEL"; + key { + symbols[Group1] = [ Shift_L, Caps_Lock ], + actions[Group1] = [ SetMods(modifiers=Shift), LockMods(modifiers=Lock) ] + }; + key { + symbols[Group1] = [ Shift_R, Caps_Lock ], + actions[Group1] = [ SetMods(modifiers=Shift), LockMods(modifiers=Lock) ] + }; // 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"! + key.type[Group1] = "ONE_LEVEL"; + key { + vmods = LevelFive, + symbols[Group1] = [ ISO_Level3_Shift ], + actions[Group1] = [ SetMods(modifiers=LevelFive) ] + }; + key { + vmods = LevelFive, + symbols[Group1] = [ ISO_Level3_Shift ], + actions[Group1] = [ SetMods(modifiers=LevelFive) ] + }; + modifier_map Mod3 { , }; // Neo-Mod4 // -------------------------------------------------------------- + key.type[Group1] = "THREE_LEVEL"; // 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 { + vmods = NumLock, + symbols[Group1] = [ Num_Lock, Num_Lock, Num_Lock ], + actions[Group1] = [ SetMods(modifiers=LevelThree), SetMods(modifiers=LevelThree), 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) ] + }; + modifier_map Mod2 { , }; + + + // Legend + // =============== + // Levels in Xkbmap jargon to be found here in the definitions. + // 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 // Alphanumeric-keys // =============== + key.type[Group1] = "EIGHT_LEVEL_NEO_LOCKS"; // Tab as Multi_key (Compose) // -------------------------------------------------------------- @@ -320,13 +329,14 @@ xkb_symbols "neo" { 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 { [ BackSpace, BackSpace, BackSpace, BackSpace, BackSpace, BackSpace, BackSpace, NoSymbol ] }; // Top Row // -------------------------------------------------------------- + key.type[Group1] = "EIGHT_LEVEL_NEO_LOCKS_QUATERALPHABETIC"; 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 ] }; @@ -340,10 +350,13 @@ xkb_symbols "neo" { key { [ q, Q, KP_Add, NoSymbol, ampersand, U03D5, U211A, NoSymbol ] }; key { [ ssharp, U1E9E, U2212, NoSymbol, U017F, Greek_finalsmallsigma, jot, NoSymbol ] }; + + key.type[Group1] = "EIGHT_LEVEL_NEO_LOCKS"; key { [ dead_acute, dead_cedilla, dead_doubleacute, NoSymbol, dead_stroke, dead_psili, dead_abovedot, NoSymbol ] }; // Middle Row // -------------------------------------------------------------- + key.type[Group1] = "EIGHT_LEVEL_NEO_LOCKS_QUATERALPHABETIC"; 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 ] }; @@ -364,13 +377,16 @@ xkb_symbols "neo" { 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, NoSymbol, NoSymbol, grave, Greek_zeta, U2124, 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.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.type[Group1] = "EIGHT_LEVEL_NEO_LOCKS_QUATERALPHABETIC"; key { [ j, J, semicolon, NoSymbol, semicolon, Greek_theta, variation, NoSymbol ] }; + key.type[Group1] = "EIGHT_LEVEL_NEO_LOCKS"; // Space key // -------------------------------------------------------------- @@ -380,9 +396,6 @@ xkb_symbols "neo" { // 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, notequal, NoSymbol, equal, approxeq, identical, NoSymbol ] }; -- cgit v1.2.3