diff options
Diffstat (limited to 'xorg-server/xkeyboard-config')
| -rw-r--r-- | xorg-server/xkeyboard-config/rules/base.o_s.part | 2 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/rules/base.xml.in | 4 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/rules/compat/layoutsMapping.lst | 1 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/symbols/altwin | 13 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/symbols/cd | 14 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/symbols/gr | 6 |
6 files changed, 27 insertions, 13 deletions
diff --git a/xorg-server/xkeyboard-config/rules/base.o_s.part b/xorg-server/xkeyboard-config/rules/base.o_s.part index b4772b4c6..7d880f438 100644 --- a/xorg-server/xkeyboard-config/rules/base.o_s.part +++ b/xorg-server/xkeyboard-config/rules/base.o_s.part @@ -6,7 +6,7 @@ altwin:left_meta_win = +altwin(left_meta_win) altwin:hyper_win = +altwin(hyper_win) altwin:alt_super_win = +altwin(alt_super_win) - altwin:swap_lalt_lwin = +altwin(swap_lalt_lwin) + altwin:swap_alt_win = +altwin(swap_alt_win) grp:switch = +group(switch) grp:lswitch = +group(lswitch) grp:win_switch = +group(win_switch) diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in index 8d8075004..4b18513e9 100644 --- a/xorg-server/xkeyboard-config/rules/base.xml.in +++ b/xorg-server/xkeyboard-config/rules/base.xml.in @@ -6196,8 +6196,8 @@ </option> <option> <configItem> - <name>altwin:swap_lalt_lwin</name> - <_description>Left Alt is swapped with Left Win</_description> + <name>altwin:swap_alt_win</name> + <_description>Alt is swapped with Win</_description> </configItem> </option> </group> diff --git a/xorg-server/xkeyboard-config/rules/compat/layoutsMapping.lst b/xorg-server/xkeyboard-config/rules/compat/layoutsMapping.lst index cecda6d8a..a1a021855 100644 --- a/xorg-server/xkeyboard-config/rules/compat/layoutsMapping.lst +++ b/xorg-server/xkeyboard-config/rules/compat/layoutsMapping.lst @@ -14,7 +14,6 @@ iu ca(ike) lo la kan in(kan) mi mao -ml in(mal) ogham ie(ogam) ori ie(ori) sapmi no(smi) diff --git a/xorg-server/xkeyboard-config/symbols/altwin b/xorg-server/xkeyboard-config/symbols/altwin index 92599128f..f7578b493 100644 --- a/xorg-server/xkeyboard-config/symbols/altwin +++ b/xorg-server/xkeyboard-config/symbols/altwin @@ -72,8 +72,21 @@ xkb_symbols "alt_super_win" { }; partial modifier_keys +xkb_symbols "swap_alt_win" { + include "altwin(swap_lalt_lwin)" + include "altwin(swap_ralt_rwin)" +}; + +partial hidden modifier_keys xkb_symbols "swap_lalt_lwin" { key <LALT> { type[Group1] = "ONE_LEVEL", symbols[Group1] = [ Super_L ] }; key <LWIN> { [ Alt_L, Meta_L ] }; }; + +partial hidden modifier_keys +xkb_symbols "swap_ralt_rwin" { + key <RALT> { type[Group1] = "ONE_LEVEL", + symbols[Group1] = [ Super_R ] }; + key <RWIN> { [ Alt_R, Meta_R ] }; +}; diff --git a/xorg-server/xkeyboard-config/symbols/cd b/xorg-server/xkeyboard-config/symbols/cd index 78803dbcc..5e51535cc 100644 --- a/xorg-server/xkeyboard-config/symbols/cd +++ b/xorg-server/xkeyboard-config/symbols/cd @@ -24,10 +24,10 @@ xkb_symbols "basic" { key <AE11> { [ minus, underscore, percent, degree ] }; key <AE12> { [ equal, plus, multiply, division ] }; - key <AD01> { [ a, A, ae, AE ] }; + key <AD01> { [ a, A, ae, AE ] }; key <AD02> { [ z, Z ] }; key <AD03> { [ e, E, oe, OE ] }; - key <AD04> { [ r, R ] }; + key <AD04> { [ r, R ] }; key <AD05> { [ t, T ] }; key <AD06> { [ y, Y ] }; key <AD07> { [ u, U, 0x01000289, 0x01000244 ] }; @@ -46,16 +46,16 @@ xkb_symbols "basic" { key <AC07> { [ j, J ] }; key <AC08> { [ k, K ] }; key <AC09> { [ l, L ] }; - key <AC10> { [ m, M ] }; - key <AC11> { [0x01000254, 0x01000186 ] }; - key <LSGT> { [ backslash, bar ] }; + key <AC10> { [ m, M ] }; + key <AC11> { [0x01000254, 0x01000186 ] }; + key <LSGT> { [ backslash, bar ] }; key <AB01> { [ w, W ] }; - key <AB02> { [ x, X ] }; + key <AB02> { [ x, X ] }; key <AB03> { [ c, C, ccedilla, Ccedilla ] }; key <AB04> { [ v, V ] }; key <AB05> { [ b, B ] }; - key <AB06> { [ n, N ] }; + key <AB06> { [ n, N, 0x01000014B, 0x0100014A ] }; key <AB07> { [ comma, question, 0x01000327 ] }; key <AB08> { [ semicolon, period ] }; key <AB09> { [ colon, slash ] }; diff --git a/xorg-server/xkeyboard-config/symbols/gr b/xorg-server/xkeyboard-config/symbols/gr index f4364cf89..d7d126009 100644 --- a/xorg-server/xkeyboard-config/symbols/gr +++ b/xorg-server/xkeyboard-config/symbols/gr @@ -73,7 +73,7 @@ xkb_symbols "simple" { key <AE12> { [ equal, plus ] }; // = + key <AD11> { [ bracketleft, braceleft ] }; // [ { - key <AD12> { [ bracketright, braceright ] }; // [ { + key <AD12> { [ bracketright, braceright ] }; // ] } key <AC11> { [ apostrophe, quotedbl ] }; // ' " @@ -180,7 +180,9 @@ xkb_symbols "polytonic" { key <AD12> { [ dead_iota, VoidSymbol, dead_breve ] }; // ͺ ˘ key <AC10> { [ dead_acute, dead_psili ] }; // ´ ̓ - key <AC11> { [ dead_grave, dead_dasia ] }; // ` ̔ + key <AC11> { type[Group1]="FOUR_LEVEL", + [ dead_grave, dead_dasia, apostrophe, quotedbl ] }; + // ` ̔ ' " }; partial alphanumeric_keys alternate_group |