massive patch from OLPC

1 files changed, 12 insertions, 9 deletions

diff --git a/symbols/group b/symbols/group
index 03d2250..4efa318 100644
--- a/symbols/group
+++ b/symbols/group
@@ -230,29 +230,32 @@ xkb_symbols "rwin_toggle" {
 // Both Ctrls pressed together toggle group
 partial modifier_keys
 xkb_symbols "ctrls_toggle" {
-  virtual_modifiers Control;
+  virtual_modifiers LControl, RControl;
     key <LCTL> {
-	type[Group1]="PC_CONTROL_LEVEL2",
-	symbols[Group1]= [ NoSymbol,	ISO_Prev_Group ]
+	type[Group1]="PC_RCONTROL_LEVEL2",
+	symbols[Group1]= [ NoSymbol,	ISO_Prev_Group ],
+	virtualMods= LControl
     };
     key <RCTL> {
-	type[Group1]="PC_CONTROL_LEVEL2",
-	symbols[Group1]= [ NoSymbol,	ISO_Next_Group ]
+	type[Group1]="PC_LCONTROL_LEVEL2",
+	symbols[Group1]= [ NoSymbol,	ISO_Next_Group ],
+	virtualMods= RControl
     };
 };
 
 // Both Alts pressed together toggle group
 partial modifier_keys
 xkb_symbols "alts_toggle" {
+  virtual_modifiers LAlt, RAlt;
     key <LALT> {
-	type[Group1]="PC_ALT_LEVEL2",
+	type[Group1]="PC_RALT_LEVEL2",
 	symbols[Group1]= [ NoSymbol,	ISO_Prev_Group ],
-	virtualMods= Alt
+	virtualMods= LAlt
     };
     key <RALT> {
-	type[Group1]="PC_ALT_LEVEL2",
+	type[Group1]="PC_LALT_LEVEL2",
 	symbols[Group1]= [ NoSymbol,	ISO_Next_Group ],
-	virtualMods= Alt
+	virtualMods= RAlt
     };
 };