From 511120e1d38a885ae5d806589fab179ca491f887 Mon Sep 17 00:00:00 2001 From: niun Date: Wed, 25 Sep 2024 04:50:22 +0200 Subject: [PATCH] keymaps: Add US International, Fix unescaped backslash in eurkey.py --- src/main/python/keymap/eurkey.py | 2 +- src/main/python/keymap/us_international.py | 72 ++++++++++++++++++++++ src/main/python/keymaps.py | 5 +- 3 files changed, 76 insertions(+), 3 deletions(-) create mode 100644 src/main/python/keymap/us_international.py diff --git a/src/main/python/keymap/eurkey.py b/src/main/python/keymap/eurkey.py index d716783964..5e318d6016 100644 --- a/src/main/python/keymap/eurkey.py +++ b/src/main/python/keymap/eurkey.py @@ -26,7 +26,7 @@ "KC_EQUAL": "+ ÷\n= ×", "KC_LBRACKET": "{ ‹\n[ «", "KC_RBRACKET": "} ›\n] »", - "KC_BSLASH": "| ¦\n\ ¬", + "KC_BSLASH": "| ¦\n\\ ¬", "KC_A": "A\n ä", "KC_S": "S\n ß", "KC_D": "D\n đ", diff --git a/src/main/python/keymap/us_international.py b/src/main/python/keymap/us_international.py new file mode 100644 index 0000000000..be773a3845 --- /dev/null +++ b/src/main/python/keymap/us_international.py @@ -0,0 +1,72 @@ +# coding: utf-8 + +keymap = { + "KC_1": '! ¹\n1 ¡', # Keyboard 1 and Bang, Win: VK_1, AT-101 position: 2 + "KC_2": '@ \n2 ²', # Keyboard 2 and At, Win: VK_2, AT-101 position: 3 + "KC_3": '# \n3 ³', # Keyboard 3 And Hash, Win: VK_3, AT-101 position: 4 + "KC_4": '$ £\n4 ¤', # Keyboard 4 and Dollar, Win: VK_4, AT-101 position: 5 + "KC_5": '% \n5 €', # Keyboard 5 and Percent, Win: VK_5, AT-101 position: 6 + "KC_6": '^ \n6 ¼', # Keyboard 6 and Caret, Win: VK_6, AT-101 position: 7 + "KC_7": '& \n7 ½', # Keyboard 7 and Ampersand, Win: VK_7, AT-101 position: 8 + "KC_8": '* \n8 ¾', # Keyboard 8 and Star, Win: VK_8, AT-101 position: 9 + "KC_9": '( \n9 ‘', # Keyboard 9 and Left Bracket, Win: VK_9, AT-101 position: 10 + "KC_0": ') \n0 ’', # Keyboard 0 and Right Bracket, Win: VK_0, AT-101 position: 11 + "KC_MINUS": '_ \n- ¥', # Keyboard Dash and Underscore, Win: VK_OEM_MINUS, AT-101 position: 12 + "KC_EQUAL": '+ ÷\n= ×', # Keyboard Equals and Plus, Win: VK_OEM_PLUS, AT-101 position: 13 + "KC_BSPACE": ' \n␡ ', # Keyboard Delete, Win: VK_BACK, AT-101 position: 15 + "KC_Q": 'Q Ä\nq ä', # Keyboard Q, Win: VK_Q, AT-101 position: 17 + "KC_W": 'W Å\nw å', # Keyboard W, Win: VK_W, AT-101 position: 18 + "KC_E": 'E É\ne é', # Keyboard E, Win: VK_E, AT-101 position: 19 + "KC_R": 'R \nr ®', # Keyboard R, Win: VK_R, AT-101 position: 20 + "KC_T": 'T Þ\nt þ', # Keyboard T, Win: VK_T, AT-101 position: 21 + "KC_Y": 'Y Ü\ny ü', # Keyboard Y, Win: VK_Y, AT-101 position: 22 + "KC_U": 'U Ú\nu ú', # Keyboard U, Win: VK_U, AT-101 position: 23 + "KC_I": 'I Í\ni í', # Keyboard I, Win: VK_I, AT-101 position: 24 + "KC_O": 'O Ó\no ó', # Keyboard O, Win: VK_O, AT-101 position: 25 + "KC_P": 'P Ö\np ö', # Keyboard P, Win: VK_P, AT-101 position: 26 + "KC_LBRACKET": '{ \n[ «', # Keyboard Left Brace, Win: VK_OEM_4, AT-101 position: 27 + "KC_RBRACKET": '} \n] »', # Keyboard Right Brace, Win: VK_OEM_6, AT-101 position: 28 + "KC_A": 'A Á\na á', # Keyboard A, Win: VK_A, AT-101 position: 31 + "KC_S": 'S §\ns ß', # Keyboard S, Win: VK_S, AT-101 position: 32 + "KC_D": 'D Ð\nd ð', # Keyboard D, Win: VK_D, AT-101 position: 33 + "KC_F": 'F \nf ', # Keyboard F, Win: VK_F, AT-101 position: 34 + "KC_G": 'G \ng ', # Keyboard G, Win: VK_G, AT-101 position: 35 + "KC_H": 'H \nh ', # Keyboard H, Win: VK_H, AT-101 position: 36 + "KC_J": 'J \nj ', # Keyboard J, Win: VK_J, AT-101 position: 37 + "KC_K": 'K \nk ', # Keyboard K, Win: VK_K, AT-101 position: 38 + "KC_L": 'L Ø\nl ø', # Keyboard L, Win: VK_L, AT-101 position: 39 + "KC_SCOLON": ': °\n; ¶', # Keyboard SemiColon and Colon, Win: VK_OEM_1, AT-101 position: 40 + "KC_QUOTE": '" ¨\n\' ´', # Keyboard Apostrophe and Double Quotation Mark, Win: VK_OEM_7, AT-101 position: 41 + "KC_GRAVE": '~ \n` ', # Keyboard Grave Accent and Tilde, Win: VK_OEM_3, AT-101 position: 1 + "KC_NONUS_HASH": '| ¦\n\\ ¬', # Keyboard Non-US, Win: VK_OEM_5, AT-101 position: 42 + "KC_Z": 'Z Æ\nz æ', # Keyboard Z, Win: VK_Z, AT-101 position: 46 + "KC_X": 'X \nx ', # Keyboard X, Win: VK_X, AT-101 position: 47 + "KC_C": 'C ¢\nc ©', # Keyboard C, Win: VK_C, AT-101 position: 48 + "KC_V": 'V \nv ', # Keyboard V, Win: VK_V, AT-101 position: 49 + "KC_B": 'B \nb ', # Keyboard B, Win: VK_B, AT-101 position: 50 + "KC_N": 'N Ñ\nn ñ', # Keyboard N, Win: VK_N, AT-101 position: 51 + "KC_M": 'M \nm µ', # Keyboard M, Win: VK_M, AT-101 position: 52 + "KC_COMMA": '< Ç\n, ç', # Keyboard Comma, Win: VK_OEM_COMMA, AT-101 position: 53 + "KC_DOT": '> \n. ', # Keyboard Period, Win: VK_OEM_PERIOD, AT-101 position: 54 + "KC_SLASH": '? \n/ ¿', # Keyboard QuestionMark, Win: VK_OEM_2, AT-101 position: 55 + "KC_KP_ASTERISK": '* \n* ', # Keypad Star, Win: VK_MULTIPLY, AT-101 position: 100 + "KC_SPACE": '␣ \n␣ ', # Keyboard Spacebar, Win: VK_SPACE, AT-101 position: 61 + "KC_KP_7": ' \n7 ', # Keypad 7 and Home, Win: VK_HOME, AT-101 position: 91 + "KC_KP_8": ' \n8 ', # Keypad 8 and Up Arrow, Win: VK_UP, AT-101 position: 96 + "KC_KP_9": ' \n9 ', # Keypad 9 and PageUp, Win: VK_PRIOR, AT-101 position: 101 + "KC_KP_MINUS": '- \n- ', # Keypad Dash, Win: VK_SUBTRACT, AT-101 position: 105 + "KC_KP_4": ' \n4 ', # Keypad 4 and Left Arrow, Win: VK_LEFT, AT-101 position: 92 + "KC_KP_5": ' \n5 ', # Keypad 5, Win: VK_CLEAR, AT-101 position: 97 + "KC_KP_6": ' \n6 ', # Keypad 6 and Right Arrow, Win: VK_RIGHT, AT-101 position: 102 + "KC_KP_PLUS": '+ \n+ ', # Keypad Plus, Win: VK_ADD, AT-101 position: 106 + "KC_KP_1": ' \n1 ', # Keypad 1 and End, Win: VK_END, AT-101 position: 93 + "KC_KP_2": ' \n2 ', # Keypad 2 and Down Arrow, Win: VK_DOWN, AT-101 position: 98 + "KC_KP_3": ' \n3 ', # Keypad 3 and PageDn, Win: VK_NEXT, AT-101 position: 103 + "KC_KP_0": ' \n0 ', # Keypad 0 and Insert, Win: VK_INSERT, AT-101 position: 99 + "KC_KP_DOT": ' \n. ', # Keypad Period, Win: VK_DELETE, AT-101 position: 104 + "KC_NONUS_BSLASH": '| \n\\ ', # Keyboard Non-US Slash Bar, Win: VK_OEM_102, AT-101 position: 45 + "KC_KP_SLASH": '/ \n/ ', # Keypad Forward Slash, Win: VK_DIVIDE, AT-101 position: 95 + "KC_RALT": 'AltGr', + "RALT(kc)": 'AltGr\n(kc)', + "RALT_T(kc)": 'AltGr_T\n(kc)', +} \ No newline at end of file diff --git a/src/main/python/keymaps.py b/src/main/python/keymaps.py index 3be0f0ef34..b2dda93530 100644 --- a/src/main/python/keymaps.py +++ b/src/main/python/keymaps.py @@ -1,5 +1,5 @@ from keycodes.keycodes import Keycode -from keymap import brazilian, canadian_csa, colemak, danish, eurkey, french, german, hebrew, hungarian, italian, japanese, latam, norwegian, russian, slovak, spanish, swedish, swedish_swerty, swiss, turkish, croatian +from keymap import brazilian, canadian_csa, colemak, danish, eurkey, french, german, hebrew, hungarian, italian, japanese, latam, norwegian, russian, slovak, spanish, swedish, swedish_swerty, swiss, turkish, croatian, us_international KEYMAPS = [ ("QWERTY", dict()), @@ -24,7 +24,8 @@ ("Swedish (QWERTY)", swedish.keymap), ("Swedish (SWERTY)", swedish_swerty.keymap), ("Swiss (QWERTZ)", swiss.keymap), - ("Turkish (QWERTY)", turkish.keymap) + ("Turkish (QWERTY)", turkish.keymap), + ("United States - International (QWERTY)", us_international.keymap) ] # make sure that qmk IDs we used are all correct