Fixing Canadian with hex values

3 files changed, 15 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index d95f2276..3f872909 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2006-06-13  Sergey Udaltsov
 
+	symbols/level5, compat/level5: replacing F21-F23 with explicit
+	hexadecimal values of XK_ISO_Level5_*. So for next months people could
+	have Canadian layout fixed and, at the same time, do not have to
+	upgrade xorg. Closing https://bugs.freedesktop.org/show_bug.cgi?id=4411
+
+2006-06-13  Sergey Udaltsov
+
 	symbols/ch, symbols/inet, symbols/base.xml.in: added mac stuff from
 	https://bugs.freedesktop.org/show_bug.cgi?id=6960
 
diff --git a/compat/level5 b/compat/level5
index e41cd631..db87d4dc 100644
--- a/compat/level5
+++ b/compat/level5
@@ -15,33 +15,33 @@ default partial xkb_compatibility "default"  {
     latchMods.latchToLock= True;
 
     //ISO_Level5_Shift
-    interpret F21+Any {
+    interpret 0xfe11+Any {
 	useModMapMods= level1;
 	virtualModifier= LevelFive;
 	action= SetMods(modifiers=LevelFive);
     };
 
-    interpret F21 {
+    interpret 0xfe11 {
 	action= SetMods(modifiers=LevelFive);
     };
 
     //ISO_Level5_Latch
-    interpret F22+Any {
+    interpret 0xfe12+Any {
 	virtualModifier= LevelFive;
 	action= LatchMods(modifiers=LevelFive);
     };
 
-    interpret F22 {
+    interpret 0xfe12 {
 	action= LatchMods(modifiers=LevelFive);
     };
 
     //ISO_Level5_Lock
-    interpret F23+Any {
+    interpret 0xfe13+Any {
 	virtualModifier= LevelFive;
 	action= LockMods(modifiers=LevelFive);
     };
 
-    interpret F23 {
+    interpret 0xfe13 {
 	action= LockMods(modifiers=LevelFive);
     };
 };
diff --git a/symbols/level5 b/symbols/level5
index 391529fc..188096b1 100644
--- a/symbols/level5
+++ b/symbols/level5
@@ -12,7 +12,7 @@ partial modifier_keys
 xkb_symbols "rctrl_switch" {
   key <RCTL> {
     type[Group1]="ONE_LEVEL",
-    symbols[Group1] = [ F21 ]
+    symbols[Group1] = [ 0xfe11 ]
     };
-  modifier_map Mod3   { F21 };
+  modifier_map Mod3   { 0xfe11 };
 };