index HIGHER_ASCII and COMBINED_KEYS with ints for space

Author: Neradoc

generator/layout_generator.py

@@ -498,14 +498,20 @@ def make_layout_file(layout_data):
         "    HIGHER_ASCII = {\n"
     )
     for k, c in layout_data.high.items():
-        output_file_data += f"        {repr(k)}: 0x{c:02x},\n"
+        output_file_data += (
+            f"        0x{ord(k):02x}:"
+            f" 0x{c:02x},"
+            f"  # {repr(k)}"
+            "\n"
+        )
     output_file_data += "    }\n" "    COMBINED_KEYS = {\n"
     for k, c in layout_data.combined.items():
         first, second, altgr = c
         second = ord(second) | altgr
         output_file_data += (
-            f"        {repr(k)}: "
-            f'0x{first:02x}{second:02x},'
+            f"        0x{ord(k):02x}:"
+            f' 0x{first:02x}{second:02x},'
+            f"  # {repr(k)}"
             "\n"
         )
     output_file_data += "    }\n"

libraries/common/keyboard_layout.py

@@ -64,9 +64,9 @@ def write(self, string):
             if keycode > 0:
                 self._write(keycode, char in self.NEED_ALTGR)
             # find combined keys
-            elif char in self.COMBINED_KEYS:
+            elif ord(char) in self.COMBINED_KEYS:
                 # first key (including shift bit)
-                cchar = self.COMBINED_KEYS[char]
+                cchar = self.COMBINED_KEYS[ord(char)]
                 self._write(cchar >> 8, cchar & self.ALTGR_FLAG)
                 # second key (removing the altgr bit)
                 char = chr(cchar & 0xFF & (~self.ALTGR_FLAG))

libraries/layouts/keyboard_layout_mac_fr.py

@@ -186,54 +186,54 @@ class KeyboardLayout(KeyboardLayoutBase):
 
     NEED_ALTGR = "[]\\{}|~€"
     HIGHER_ASCII = {
-        "à": 0x27,  # à
-        "ç": 0x26,  # ç
-        "è": 0x24,  # è
-        "é": 0x1F,  # é
-        "ù": 0x34,  # ù
-        "€": 0x30,  # € - altgr will be added thanks to NEED_ALTGR
-        "°": 0xAD,  # °
-        "§": 0x23,  # §
-        "£": 0xB1,  # £
+        0xe0: 0x27,  # à
+        0xe7: 0x26,  # ç
+        0xe8: 0x24,  # è
+        0xe9: 0x1f,  # é
+        0xf9: 0x34,  # ù
+        0x20ac: 0x30,  # €
+        0xb0: 0xad,  # °
+        0xa7: 0x23,  # §
+        0xa3: 0xb1,  # £
     }
     COMBINED_KEYS = {
-        'ã': 0x11e1,
-        'Ã': 0x11c1,
-        'ñ': 0x11ee,
-        'Ñ': 0x11ce,
-        'õ': 0x11ef,
-        'Õ': 0x11cf,
-        '~': 0x11a0,
-        'Ù': 0x3155,
-        '`': 0x3120,
-        'ì': 0x3169,
-        'Ì': 0x3149,
-        'ò': 0x316f,
-        'Ò': 0x314f,
-        'À': 0x3141,
-        'È': 0x3145,
-        'â': 0x2f61,
-        'ê': 0x2f65,
-        'î': 0x2f69,
-        'ô': 0x2f6f,
-        'û': 0x2f75,
-        'Â': 0x2f41,
-        'Ê': 0x2f45,
-        'Î': 0x2f49,
-        'Ô': 0x2f4f,
-        'Û': 0x2f55,
-        '^': 0x2f20,
-        'ä': 0xaf61,
-        'ë': 0xaf65,
-        'ï': 0xaf69,
-        'ö': 0xaf6f,
-        'ü': 0xaf75,
-        'ÿ': 0xaf79,
-        'Ä': 0xaf41,
-        'Ë': 0xaf45,
-        'Ï': 0xaf49,
-        'Ö': 0xaf4f,
-        'Ü': 0xaf55,
-        '¨': 0xaf20,
+        0xe3: 0x11e1,  # ã
+        0xc3: 0x11c1,  # Ã
+        0xf1: 0x11ee,  # ñ
+        0xd1: 0x11ce,  # Ñ
+        0xf5: 0x11ef,  # õ
+        0xd5: 0x11cf,  # Õ
+        0x7e: 0x11a0,  # ~
+        0xd9: 0x3155,  # Ù
+        0x60: 0x3120,  # `
+        0xec: 0x3169,  # ì
+        0xcc: 0x3149,  # Ì
+        0xf2: 0x316f,  # ò
+        0xd2: 0x314f,  # Ò
+        0xc0: 0x3141,  # À
+        0xc8: 0x3145,  # È
+        0xe2: 0x2f61,  # â
+        0xea: 0x2f65,  # ê
+        0xee: 0x2f69,  # î
+        0xf4: 0x2f6f,  # ô
+        0xfb: 0x2f75,  # û
+        0xc2: 0x2f41,  # Â
+        0xca: 0x2f45,  # Ê
+        0xce: 0x2f49,  # Î
+        0xd4: 0x2f4f,  # Ô
+        0xdb: 0x2f55,  # Û
+        0x5e: 0x2f20,  # ^
+        0xe4: 0xaf61,  # ä
+        0xeb: 0xaf65,  # ë
+        0xef: 0xaf69,  # ï
+        0xf6: 0xaf6f,  # ö
+        0xfc: 0xaf75,  # ü
+        0xff: 0xaf79,  # ÿ
+        0xc4: 0xaf41,  # Ä
+        0xcb: 0xaf45,  # Ë
+        0xcf: 0xaf49,  # Ï
+        0xd6: 0xaf4f,  # Ö
+        0xdc: 0xaf55,  # Ü
+        0xa8: 0xaf20,  # ¨
     }
 

libraries/layouts/keyboard_layout_win_br.py

@@ -144,73 +144,73 @@ class KeyboardLayout(KeyboardLayoutBase):
     )
     NEED_ALTGR = '/?¢£§ª¬°²³¹º₢'
     HIGHER_ASCII = {
-        '¹': 0x1e,
-        '²': 0x1f,
-        '³': 0x20,
-        '£': 0x21,
-        '¢': 0x22,
-        '¬': 0x23,
-        '§': 0x2e,
-        '°': 0x08,
-        'ª': 0x30,
-        'ç': 0x33,
-        'Ç': 0xb3,
-        'º': 0x31,
-        '₢': 0x06,
+        0xb9: 0x1e,  # '¹'
+        0xb2: 0x1f,  # '²'
+        0xb3: 0x20,  # '³'
+        0xa3: 0x21,  # '£'
+        0xa2: 0x22,  # '¢'
+        0xac: 0x23,  # '¬'
+        0xa7: 0x2e,  # '§'
+        0xb0: 0x08,  # '°'
+        0xaa: 0x30,  # 'ª'
+        0xe7: 0x33,  # 'ç'
+        0xc7: 0xb3,  # 'Ç'
+        0xba: 0x31,  # 'º'
+        0x20a2: 0x06,  # '₢'
     }
     COMBINED_KEYS = {
-        'ä': 0xa361,
-        'ë': 0xa365,
-        'ï': 0xa369,
-        'ö': 0xa36f,
-        'ü': 0xa375,
-        'ÿ': 0xa379,
-        'Ä': 0xa341,
-        'Ë': 0xa345,
-        'Ï': 0xa349,
-        'Ö': 0xa34f,
-        'Ü': 0xa355,
-        '¨': 0xa320,
-        'á': 0x2f61,
-        'é': 0x2f65,
-        'í': 0x2f69,
-        'ó': 0x2f6f,
-        'ú': 0x2f75,
-        'ý': 0x2f79,
-        'Á': 0x2f41,
-        'É': 0x2f45,
-        'Í': 0x2f49,
-        'Ó': 0x2f4f,
-        'Ú': 0x2f55,
-        'Ý': 0x2f59,
-        '´': 0x2f20,
-        'à': 0xaf61,
-        'è': 0xaf65,
-        'ì': 0xaf69,
-        'ò': 0xaf6f,
-        'ù': 0xaf75,
-        'À': 0xaf41,
-        'È': 0xaf45,
-        'Ì': 0xaf49,
-        'Ò': 0xaf4f,
-        'Ù': 0xaf55,
-        '`': 0xaf20,
-        'ã': 0x3461,
-        'õ': 0x346f,
-        'ñ': 0x346e,
-        'Ã': 0x3441,
-        'Õ': 0x344f,
-        'Ñ': 0x344e,
-        '~': 0x3420,
-        'â': 0xb461,
-        'ê': 0xb465,
-        'î': 0xb469,
-        'ô': 0xb46f,
-        'û': 0xb475,
-        'Â': 0xb441,
-        'Ê': 0xb445,
-        'Î': 0xb449,
-        'Ô': 0xb44f,
-        'Û': 0xb455,
-        '^': 0xb420,
+        0xe4: 0xa361,  # 'ä'
+        0xeb: 0xa365,  # 'ë'
+        0xef: 0xa369,  # 'ï'
+        0xf6: 0xa36f,  # 'ö'
+        0xfc: 0xa375,  # 'ü'
+        0xff: 0xa379,  # 'ÿ'
+        0xc4: 0xa341,  # 'Ä'
+        0xcb: 0xa345,  # 'Ë'
+        0xcf: 0xa349,  # 'Ï'
+        0xd6: 0xa34f,  # 'Ö'
+        0xdc: 0xa355,  # 'Ü'
+        0xa8: 0xa320,  # '¨'
+        0xe1: 0x2f61,  # 'á'
+        0xe9: 0x2f65,  # 'é'
+        0xed: 0x2f69,  # 'í'
+        0xf3: 0x2f6f,  # 'ó'
+        0xfa: 0x2f75,  # 'ú'
+        0xfd: 0x2f79,  # 'ý'
+        0xc1: 0x2f41,  # 'Á'
+        0xc9: 0x2f45,  # 'É'
+        0xcd: 0x2f49,  # 'Í'
+        0xd3: 0x2f4f,  # 'Ó'
+        0xda: 0x2f55,  # 'Ú'
+        0xdd: 0x2f59,  # 'Ý'
+        0xb4: 0x2f20,  # '´'
+        0xe0: 0xaf61,  # 'à'
+        0xe8: 0xaf65,  # 'è'
+        0xec: 0xaf69,  # 'ì'
+        0xf2: 0xaf6f,  # 'ò'
+        0xf9: 0xaf75,  # 'ù'
+        0xc0: 0xaf41,  # 'À'
+        0xc8: 0xaf45,  # 'È'
+        0xcc: 0xaf49,  # 'Ì'
+        0xd2: 0xaf4f,  # 'Ò'
+        0xd9: 0xaf55,  # 'Ù'
+        0x60: 0xaf20,  # '`'
+        0xe3: 0x3461,  # 'ã'
+        0xf5: 0x346f,  # 'õ'
+        0xf1: 0x346e,  # 'ñ'
+        0xc3: 0x3441,  # 'Ã'
+        0xd5: 0x344f,  # 'Õ'
+        0xd1: 0x344e,  # 'Ñ'
+        0x7e: 0x3420,  # '~'
+        0xe2: 0xb461,  # 'â'
+        0xea: 0xb465,  # 'ê'
+        0xee: 0xb469,  # 'î'
+        0xf4: 0xb46f,  # 'ô'
+        0xfb: 0xb475,  # 'û'
+        0xc2: 0xb441,  # 'Â'
+        0xca: 0xb445,  # 'Ê'
+        0xce: 0xb449,  # 'Î'
+        0xd4: 0xb44f,  # 'Ô'
+        0xdb: 0xb455,  # 'Û'
+        0x5e: 0xb420,  # '^'
     }