Merge branch 'make-combined-keys-into-numbers'

* make-combined-keys-into-numbers:
  change the COMBINED_KEYS table from bytes to ints (less ram)
  rename espanol from sp to es

Author: Neradoc

generator/layout_generator.py

@@ -505,7 +505,7 @@ def make_layout_file(layout_data):
         second = ord(second) | altgr
         output_file_data += (
             f"        {repr(k)}: "
-            f'b"\\x{first:02x}\\x{second:02x}",'
+            f'0x{first:02x}{second:02x},'
             "\n"
         )
     output_file_data += "    }\n"

libraries/common/keyboard_layout.py

@@ -67,8 +67,8 @@ def write(self, string):
             # find combined keys
             elif char in self.COMBINED_KEYS:
                 cchar = self.COMBINED_KEYS[char]
-                self._write(char, cchar[0], cchar[1] & self.ALTGR_FLAG)
-                char = chr(cchar[1] & (~self.ALTGR_FLAG))
+                self._write(char, (cchar >> 8), (cchar & 0xFF & self.ALTGR_FLAG))
+                char = chr(cchar & 0xFF & (~self.ALTGR_FLAG))
                 keycode = self._char_to_keycode(char)
                 # assume no altgr needed for second key
                 self._write(char, keycode, False)

libraries/keycodes/keycode_win_sp.py libraries/keycodes/keycode_win_es.pylibraries/keycodes/keycode_win_sp.py renamed to libraries/keycodes/keycode_win_es.py

@@ -197,43 +197,43 @@ class KeyboardLayout(KeyboardLayoutBase):
         "£": 0xB1,  # £
     }
     COMBINED_KEYS = {
-        'ã': b"\x11\xe1",
-        'Ã': b"\x11\xc1",
-        'ñ': b"\x11\xee",
-        'Ñ': b"\x11\xce",
-        'õ': b"\x11\xef",
-        'Õ': b"\x11\xcf",
-        '~': b"\x11\xa0",
-        'Ù': b"\x31\x55",
-        '`': b"\x31\x20",
-        'ì': b"\x31\x69",
-        'Ì': b"\x31\x49",
-        'ò': b"\x31\x6f",
-        'Ò': b"\x31\x4f",
-        'À': b"\x31\x41",
-        'È': b"\x31\x45",
-        'â': b"\x2f\x61",
-        'ê': b"\x2f\x65",
-        'î': b"\x2f\x69",
-        'ô': b"\x2f\x6f",
-        'û': b"\x2f\x75",
-        'Â': b"\x2f\x41",
-        'Ê': b"\x2f\x45",
-        'Î': b"\x2f\x49",
-        'Ô': b"\x2f\x4f",
-        'Û': b"\x2f\x55",
-        '^': b"\x2f\x20",
-        'ä': b"\xaf\x61",
-        'ë': b"\xaf\x65",
-        'ï': b"\xaf\x69",
-        'ö': b"\xaf\x6f",
-        'ü': b"\xaf\x75",
-        'ÿ': b"\xaf\x79",
-        'Ä': b"\xaf\x41",
-        'Ë': b"\xaf\x45",
-        'Ï': b"\xaf\x49",
-        'Ö': b"\xaf\x4f",
-        'Ü': b"\xaf\x55",
-        '¨': b"\xaf\x20",
+        'ã': 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,
     }
 

libraries/layouts/keyboard_layout_mac_fr.py

@@ -159,58 +159,58 @@ class KeyboardLayout(KeyboardLayoutBase):
         '₢': 0x06,
     }
     COMBINED_KEYS = {
-        'ä': b"\xa3\x61",
-        'ë': b"\xa3\x65",
-        'ï': b"\xa3\x69",
-        'ö': b"\xa3\x6f",
-        'ü': b"\xa3\x75",
-        'ÿ': b"\xa3\x79",
-        'Ä': b"\xa3\x41",
-        'Ë': b"\xa3\x45",
-        'Ï': b"\xa3\x49",
-        'Ö': b"\xa3\x4f",
-        'Ü': b"\xa3\x55",
-        '¨': b"\xa3\x20",
-        'á': b"\x2f\x61",
-        'é': b"\x2f\x65",
-        'í': b"\x2f\x69",
-        'ó': b"\x2f\x6f",
-        'ú': b"\x2f\x75",
-        'ý': b"\x2f\x79",
-        'Á': b"\x2f\x41",
-        'É': b"\x2f\x45",
-        'Í': b"\x2f\x49",
-        'Ó': b"\x2f\x4f",
-        'Ú': b"\x2f\x55",
-        'Ý': b"\x2f\x59",
-        '´': b"\x2f\x20",
-        'à': b"\xaf\x61",
-        'è': b"\xaf\x65",
-        'ì': b"\xaf\x69",
-        'ò': b"\xaf\x6f",
-        'ù': b"\xaf\x75",
-        'À': b"\xaf\x41",
-        'È': b"\xaf\x45",
-        'Ì': b"\xaf\x49",
-        'Ò': b"\xaf\x4f",
-        'Ù': b"\xaf\x55",
-        '`': b"\xaf\x20",
-        'ã': b"\x34\x61",
-        'õ': b"\x34\x6f",
-        'ñ': b"\x34\x6e",
-        'Ã': b"\x34\x41",
-        'Õ': b"\x34\x4f",
-        'Ñ': b"\x34\x4e",
-        '~': b"\x34\x20",
-        'â': b"\xb4\x61",
-        'ê': b"\xb4\x65",
-        'î': b"\xb4\x69",
-        'ô': b"\xb4\x6f",
-        'û': b"\xb4\x75",
-        'Â': b"\xb4\x41",
-        'Ê': b"\xb4\x45",
-        'Î': b"\xb4\x49",
-        'Ô': b"\xb4\x4f",
-        'Û': b"\xb4\x55",
-        '^': b"\xb4\x20",
+        'ä': 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,
     }