diff options
| author | Mathieu Boespflug <mboes@cs.mcgill.ca> | 2012-12-02 12:49:30 -0500 |
|---|---|---|
| committer | Sergey V. Udaltsov <svu@gnome.org> | 2012-12-23 21:36:31 +0000 |
| commit | 1a751933e080eceedb68004958620b5d923355b1 (patch) | |
| tree | 8342327314727a74a974a7d140117c0e6bc7dc0c | |
| parent | 1d3707416b4efd305b248af20ed3d79420a52690 (diff) | |
| download | xkeyboard-config-1a751933e080eceedb68004958620b5d923355b1.tar.gz | |
Add altwin:swap_alt_win option.
This replaces the existing option altwin:swap_lalt_lwin.
https://bugs.freedesktop.org/show_bug.cgi?id=57813
| -rw-r--r-- | rules/base.o_s.part | 2 | ||||
| -rw-r--r-- | rules/base.xml.in | 4 | ||||
| -rw-r--r-- | symbols/altwin | 13 |
3 files changed, 16 insertions, 3 deletions
diff --git a/rules/base.o_s.part b/rules/base.o_s.part index b4772b4..7d880f4 100644 --- a/rules/base.o_s.part +++ b/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/rules/base.xml.in b/rules/base.xml.in index 8d80750..4b18513 100644 --- a/rules/base.xml.in +++ b/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/symbols/altwin b/symbols/altwin index 9259912..f7578b4 100644 --- a/symbols/altwin +++ b/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 ] }; +}; |