From aa1558e403c7d626fe38d8ec452557c5f2037dc4 Mon Sep 17 00:00:00 2001 From: stephan Date: Thu, 28 May 2009 18:22:07 +0000 Subject: Alles auf xkeyboard-config Version 1.6 angeglichen. Modifier mit Hilfe von compat-Regeln definiert. Damit sollten alle Multi-Layout-Bugs behoben sein. Allerdings tritt wahrscheinlich #135 wieder auf. git-svn-id: https://svn.neo-layout.org@1879 b9310e46-f624-0410-8ea1-cfbb3a30dc96 --- linux/X/symbols/de | 32 ++++++----- linux/X/symbols/level5 | 142 ++++++++++++++++++------------------------------- linux/X/symbols/shift | 18 +++---- 3 files changed, 76 insertions(+), 116 deletions(-) (limited to 'linux/X/symbols') diff --git a/linux/X/symbols/de b/linux/X/symbols/de index 32d57bc..cd998b9 100644 --- a/linux/X/symbols/de +++ b/linux/X/symbols/de @@ -62,7 +62,7 @@ xkb_symbols "nodeadkeys" { name[Group1]="Germany - Eliminate dead keys"; key { [asciicircum, degree, notsign, notsign ] }; - key { [apostrophe, grave, cedilla, cedilla ] }; + key { [ acute, grave, cedilla, cedilla ] }; key { [udiaeresis, Udiaeresis, diaeresis, diaeresis ] }; key { [ plus, asterisk, asciitilde, macron ] }; key { [odiaeresis, Odiaeresis, doubleacute, doubleacute ] }; @@ -211,6 +211,7 @@ xkb_symbols "sundeadkeys" { name[Group1]="Germany - Sun dead keys"; }; + // German NEO-Layout Version 2 // adopted 2004 by Hanno Behrens // inspired by Dvorak/de-ergo http://www.goebel-consult.de/de-ergo/ @@ -227,13 +228,7 @@ xkb_symbols "sundeadkeys" { // $Revision$, $Date$ partial alphanumeric_keys modifier_keys keypad_keys -xkb_symbols "neo" { - - include "shift(both_capslock)" - include "level3(caps_switch)" - include "level3(bksl_switch)" - include "level5(lsgt_switch_numlock)" - include "level5(ralt_switch_numlock)" +xkb_symbols "neo_base" { name[Group1]= "Germany - Neo 2"; @@ -248,7 +243,7 @@ xkb_symbols "neo" { // Compose (not a level): Mod3 + Tab // Feststelltaste (Capslock): Shift + Shift // Mod4-Lock: Mod4 + Mod4 - // + // Mod4-Lock: Shift + Mod3 + Tab // Legend // =============== @@ -266,11 +261,8 @@ xkb_symbols "neo" { // Tab as Multi_key (Compose) // -------------------------------------------------------------- - key { - symbols[Group1]= [ Tab, ISO_Left_Tab, Multi_key, Num_Lock, NoSymbol, NoSymbol, NoSymbol, Num_Lock ], - actions[Group1]= [ NoAction(), NoAction(), NoAction(), LockMods(modifiers=NumLock), NoAction(), NoAction(), NoAction(), LockMods(modifiers=NumLock) ] - }; - modifier_map Mod2 { }; + key { [ Tab, ISO_Left_Tab, Multi_key, ISO_Level5_Lock, NoSymbol, NoSymbol, NoSymbol, ISO_Level5_Lock ] }; + // Number row // -------------------------------------------------------------- @@ -389,6 +381,18 @@ xkb_symbols "neo" { key { [ KP_Separator, KP_Decimal, period, apostrophe, KP_Delete, KP_Delete, quotedbl, 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_numlock)" + include "level5(ralt_switch_numlock)" +}; + // Copied from macintosh_vndr/de // olh@suse.de very close to MacOS map diff --git a/linux/X/symbols/level5 b/linux/X/symbols/level5 index 35b8186..c722d87 100644 --- a/linux/X/symbols/level5 +++ b/linux/X/symbols/level5 @@ -22,7 +22,7 @@ xkb_symbols "rctrl_switch" { // as some applications get confused by it. partial modifier_keys -xkb_symbols "lsgt_switch_numlock" { +xkb_symbols "neomod_map" { key { type[Group1] = "ONE_LEVEL", vmods[Group1] = LevelFive, @@ -30,137 +30,99 @@ xkb_symbols "lsgt_switch_numlock" { actions[Group1] = [ SetMods(modifiers=LevelFive) ] }; modifier_map Mod3 { }; + key { + type[Group1] = "ONE_LEVEL", + vmods[Group1] = NumLock, + symbols[Group1] = [ NoSymbol ], + actions[Group1] = [ SetMods(modifiers=NumLock) ] + }; + modifier_map Mod2 { }; +}; + +partial modifier_keys +xkb_symbols "lsgt_switch_numlock" { + + include "level5(neomod_map)" + key { - vmods= NumLock, - key.type[Group1] = "EIGHT_LEVEL", - 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) ] + type[Group1] = "EIGHT_LEVEL", + symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ] }; - modifier_map Mod2 { }; }; partial modifier_keys xkb_symbols "lwin_switch_numlock" { - key { - type[Group1] = "ONE_LEVEL", - vmods[Group1] = LevelFive, - symbols[Group1] = [ NoSymbol ], - actions[Group1] = [ SetMods(modifiers=LevelFive) ] - }; - modifier_map Mod3 { }; + + include "level5(neomod_map)" + key { - vmods= NumLock, - key.type[Group1] = "EIGHT_LEVEL", - 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) ] + type[Group1] = "EIGHT_LEVEL", + symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ] }; - modifier_map Mod2 { }; }; partial modifier_keys xkb_symbols "ralt_switch_numlock" { - key { - type[Group1] = "ONE_LEVEL", - vmods[Group1] = LevelFive, - symbols[Group1] = [ NoSymbol ], - actions[Group1] = [ SetMods(modifiers=LevelFive) ] - }; - modifier_map Mod3 { }; + + include "level5(neomod_map)" + key { - vmods= NumLock, - key.type[Group1] = "EIGHT_LEVEL", - 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) ] + type[Group1] = "EIGHT_LEVEL", + symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ] }; - modifier_map Mod2 { }; }; partial modifier_keys xkb_symbols "rwin_switch_numlock" { - key { - type[Group1] = "ONE_LEVEL", - vmods[Group1] = LevelFive, - symbols[Group1] = [ NoSymbol ], - actions[Group1] = [ SetMods(modifiers=LevelFive) ] - }; - modifier_map Mod3 { }; + + include "level5(neomod_map)" + key { - vmods= NumLock, - key.type[Group1] = "EIGHT_LEVEL", - 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) ] + type[Group1] = "EIGHT_LEVEL", + symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ] }; - modifier_map Mod2 { }; }; partial modifier_keys xkb_symbols "lsgt_switch_numlock_cancel" { - key { - type[Group1] = "ONE_LEVEL", - vmods[Group1] = LevelFive, - symbols[Group1] = [ NoSymbol ], - actions[Group1] = [ SetMods(modifiers=LevelFive) ] - }; - modifier_map Mod3 { }; + + include "level5(neomod_map)" + key { - vmods= NumLock, - key.type[Group1] = "EIGHT_LEVEL_NEO_LOCKS", - 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) ] + type[Group1] = "EIGHT_LEVEL_NEO_LOCKS", + symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ] }; - modifier_map Mod2 { }; }; partial modifier_keys xkb_symbols "lwin_switch_numlock_cancel" { - key { - type[Group1] = "ONE_LEVEL", - vmods[Group1] = LevelFive, - symbols[Group1] = [ NoSymbol ], - actions[Group1] = [ SetMods(modifiers=LevelFive) ] - }; - modifier_map Mod3 { }; + + include "level5(neomod_map)" + key { - vmods= NumLock, - key.type[Group1] = "EIGHT_LEVEL_NEO_LOCKS", - 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) ] + type[Group1] = "EIGHT_LEVEL_NEO_LOCKS", + symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ] }; - modifier_map Mod2 { }; }; partial modifier_keys xkb_symbols "ralt_switch_numlock_cancel" { - key { - type[Group1] = "ONE_LEVEL", - vmods[Group1] = LevelFive, - symbols[Group1] = [ NoSymbol ], - actions[Group1] = [ SetMods(modifiers=LevelFive) ] - }; - modifier_map Mod3 { }; + + include "level5(neomod_map)" + key { - vmods= NumLock, - key.type[Group1] = "EIGHT_LEVEL_NEO_LOCKS", - 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) ] + type[Group1] = "EIGHT_LEVEL_NEO_LOCKS", + symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ] }; - modifier_map Mod2 { }; }; partial modifier_keys xkb_symbols "rwin_switch_numlock_cancel" { - key { - type[Group1] = "ONE_LEVEL", - vmods[Group1] = LevelFive, - symbols[Group1] = [ NoSymbol ], - actions[Group1] = [ SetMods(modifiers=LevelFive) ] - }; - modifier_map Mod3 { }; + + include "level5(neomod_map)" + key { - vmods= NumLock, - key.type[Group1] = "EIGHT_LEVEL_NEO_LOCKS", - 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) ] + type[Group1] = "EIGHT_LEVEL_NEO_LOCKS", + symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ] }; - modifier_map Mod2 { }; }; diff --git a/linux/X/symbols/shift b/linux/X/symbols/shift index ac39f34..ccb4ae1 100644 --- a/linux/X/symbols/shift +++ b/linux/X/symbols/shift @@ -23,8 +23,7 @@ partial modifier_keys xkb_symbols "lshift_both_capslock" { key { type[Group1]="TWO_LEVEL", - symbols[Group1] = [ Shift_L, Caps_Lock ], - actions[Group1] = [ SetMods(modifiers=Shift), LockMods(modifiers=Lock) ] + symbols[Group1] = [ Shift_L, Caps_Lock ] }; }; // When pressed together with another Shift key, set or unset Lock. @@ -32,8 +31,7 @@ partial modifier_keys xkb_symbols "rshift_both_capslock" { key { type[Group1]="TWO_LEVEL", - symbols[Group1] = [ Shift_R, Caps_Lock ], - actions[Group1] = [ SetMods(modifiers=Shift), LockMods(modifiers=Lock) ] + symbols[Group1] = [ Shift_R, Caps_Lock ] }; }; partial modifier_keys @@ -47,8 +45,7 @@ partial modifier_keys xkb_symbols "lshift_both_capslock_cancel" { key { type[Group1]="ALPHABETIC", - symbols[Group1] = [ Shift_L, Caps_Lock ], - actions[Group1] = [ SetMods(modifiers=Shift), LockMods(modifiers=Lock) ] + symbols[Group1] = [ Shift_L, Caps_Lock ] }; }; // When pressed alone, release Lock, whan pressed with another Shift key, set Lock. @@ -56,8 +53,7 @@ partial modifier_keys xkb_symbols "rshift_both_capslock_cancel" { key { type[Group1]="ALPHABETIC", - symbols[Group1] = [ Shift_R, Caps_Lock ], - actions[Group1] = [ SetMods(modifiers=Shift), LockMods(modifiers=Lock) ] + symbols[Group1] = [ Shift_R, Caps_Lock ] }; }; partial modifier_keys @@ -72,8 +68,7 @@ partial modifier_keys xkb_symbols "lshift_both_shiftlock" { key { type[Group1]="TWO_LEVEL", - symbols[Group1] = [ Shift_L, Shift_Lock ], - actions[Group1] = [ SetMods(modifiers=Shift), LockMods(modifiers=Shift) ] + symbols[Group1] = [ Shift_L, Shift_Lock ] }; }; // When pressed together with another Shift key, lock/unlock Shift. @@ -81,8 +76,7 @@ partial modifier_keys xkb_symbols "rshift_both_shiftlock" { key { type[Group1]="TWO_LEVEL", - symbols[Group1] = [ Shift_R, Shift_Lock ], - actions[Group1] = [ SetMods(modifiers=Shift), LockMods(modifiers=Shift) ] + symbols[Group1] = [ Shift_R, Shift_Lock ] }; }; partial modifier_keys -- cgit v1.2.3