compat: eliminate the virtual modifier AltGr; map upper groups directly

Associate groups 2, 3, and 4 directly with Mod5 (for old applications
that are still not XKB-aware) so that the indirect association through
<MDSW> is no longer needed and this key is freed for something else.

This addresses the second part of issue #321.

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

4 files changed, 13 insertions, 25 deletions

diff --git a/compat/basic b/compat/basic
index 745cbba..31ad8a6 100644
--- a/compat/basic
+++ b/compat/basic
@@ -5,7 +5,7 @@
 
 default xkb_compatibility "basic" {
 
-    virtual_modifiers  NumLock,AltGr;
+    virtual_modifiers  NumLock;
 
     interpret.repeat= False;
     setMods.clearLocks= True;
@@ -26,8 +26,6 @@ default xkb_compatibility "basic" {
     };
 
     interpret Mode_switch {
-	useModMapMods= level1;
-	virtualModifier= AltGr;
 	action= SetGroup(group=+1);
     };
 
@@ -35,9 +33,9 @@ default xkb_compatibility "basic" {
 	action= SetMods(modifiers=modMapMods);
     };
 
-    group 2 = AltGr;
-    group 3 = AltGr;
-    group 4 = AltGr;
+    group 2 = Mod5;
+    group 3 = Mod5;
+    group 4 = Mod5;
 
     include "ledcaps"
     include "lednum"
diff --git a/compat/iso9995 b/compat/iso9995
index c5c7899..fe848fd 100644
--- a/compat/iso9995
+++ b/compat/iso9995
@@ -3,7 +3,7 @@
 
 default partial xkb_compatibility "default" {
 
-    virtual_modifiers  LevelThree,AltGr;
+    virtual_modifiers  LevelThree;
 
     interpret.repeat= False;
     setMods.clearLocks= True;
@@ -46,20 +46,14 @@ default partial xkb_compatibility "default" {
     };
 
     interpret ISO_Group_Latch {
-	useModMapMods= level1;
-	virtualModifier= AltGr;
 	action= LatchGroup(group=2);
     };
 
     interpret ISO_Next_Group {
-	useModMapMods= level1;
-	virtualModifier= AltGr;
 	action= LockGroup(group=+1);
     };
 
     interpret ISO_Prev_Group {
-	useModMapMods= level1;
-	virtualModifier= AltGr;
 	action= LockGroup(group=-1);
     };
 
diff --git a/compat/pc98 b/compat/pc98
index c743f4a..6f70839 100644
--- a/compat/pc98
+++ b/compat/pc98
@@ -5,7 +5,7 @@
 
 default xkb_compatibility "basic" {
 
-    virtual_modifiers  NumLock,AltGr;
+    virtual_modifiers  NumLock;
 
     interpret.repeat= False;
     setMods.clearLocks= True;
@@ -22,8 +22,6 @@ default xkb_compatibility "basic" {
     };
 
     interpret Mode_switch {
-	useModMapMods= level1;
-	virtualModifier= AltGr;
 	action= SetGroup(group=2,clearLocks);
     };
 
@@ -31,9 +29,9 @@ default xkb_compatibility "basic" {
 	action= SetMods(modifiers=modMapMods);
     };
 
-    group 2 = AltGr;
-    group 3 = AltGr;
-    group 4 = AltGr;
+    group 2 = Mod5;
+    group 3 = Mod5;
+    group 4 = Mod5;
 
     indicator.allowExplicit= False;
     indicator "Caps Lock" {
diff --git a/compat/xtest b/compat/xtest
index f2ca643..6fb5e77 100644
--- a/compat/xtest
+++ b/compat/xtest
@@ -11,7 +11,7 @@ default xkb_compatibility "xtest" {
     // just set the corresponding modifier so that xtest
     // will see the behavior it expects.
 
-    virtual_modifiers  NumLock,AltGr;
+    virtual_modifiers  NumLock;
 
     interpret.repeat= False;
     setMods.clearLocks= True;
@@ -28,8 +28,6 @@ default xkb_compatibility "xtest" {
     };
 
     interpret Mode_switch {
-	useModMapMods= level1;
-	virtualModifier= AltGr;
 	action= SetGroup(group=2);
     };
 
@@ -37,9 +35,9 @@ default xkb_compatibility "xtest" {
 	action= SetMods(modifiers=modMapMods);
     };
 
-    group 2 = AltGr;
-    group 3 = AltGr;
-    group 4 = AltGr;
+    group 2 = Mod5;
+    group 3 = Mod5;
+    group 4 = Mod5;
 
     indicator.allowExplicit= False;
     indicator "Caps Lock" {