revert commit 1cb7181936 plus the offending part of a1d41a4ef6

Mapping modifiers to keys instead of to symbols causes problems when
those keys carry symbols that are associated with *other* modifiers,
as this leads to two or more modifiers getting linked together and
thus activated in unison -- which one normally doesn't want.

This fixes issue #382.

(Issue #81 will have to be addressed in some other way.)

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>

2 files changed, 7 insertions, 7 deletions

diff --git a/symbols/altwin b/symbols/altwin
index c65c128..0b64641 100644
--- a/symbols/altwin
+++ b/symbols/altwin
@@ -51,7 +51,7 @@ xkb_symbols "meta_win" {
     key <LWIN> {[  Meta_L  ]};
     key <RWIN> {[  Meta_R  ]};
     modifier_map Mod1 { <LALT>, <RALT> };
-    modifier_map Mod4 { <META> };
+    modifier_map Mod4 { <META>, Meta_L, Meta_R };
 };
 
 // Meta is mapped to the left Super key.
@@ -60,7 +60,7 @@ xkb_symbols "left_meta_win" {
     key <LALT> {[  Alt_L,  Alt_L  ]};
     key <LWIN> {[  Meta_L  ]};
     modifier_map Mod1 { <LALT> };
-    modifier_map Mod4 { <META> };
+    modifier_map Mod4 { <META>, Meta_L };
 };
 
 // Hyper is mapped to the Super keys.
@@ -125,5 +125,5 @@ xkb_symbols "swap_alt_win" {
 partial modifier_keys
 xkb_symbols "prtsc_rwin" {
     replace key <PRSC> {[  Super_R,  Super_R  ]};
-    modifier_map Mod4 { <PRSC> };
+    modifier_map Mod4 { <PRSC>, <RWIN> };
 };
diff --git a/symbols/pc b/symbols/pc
index 751a598..8560a96 100644
--- a/symbols/pc
+++ b/symbols/pc
@@ -26,12 +26,12 @@ xkb_symbols "pc105" {
 
     key <MENU> {[  Menu  ]};
 
-    modifier_map Shift   { <LFSH>, <RTSH> };
+    modifier_map Shift   { Shift_L, Shift_R };
     modifier_map Lock    { Caps_Lock };
-    modifier_map Control { <LCTL>, <RCTL> };
-    modifier_map Mod1    { <LALT>, <RALT> };
+    modifier_map Control { Control_L, Control_R };
+    modifier_map Mod1    { Alt_L, Alt_R, Meta_L, Meta_R };
     modifier_map Mod2    { Num_Lock };
-    modifier_map Mod4    { <LWIN>, <RWIN> };
+    modifier_map Mod4    { Super_L, Super_R };
 
     // Six fake keys for virtual<->real modifiers mapping:
     key <LVL3> {[  ISO_Level3_Shift  ]};