|
35 | 35 | class PressedCharacter:
|
36 | 36 | def __init__(self):
|
37 | 37 | self.char = None
|
| 38 | + self.globalChar = keyboard.KeyboardEvent(None, None) |
38 | 39 | pressedCharacter = PressedCharacter()
|
39 | 40 | class PlaylistData:
|
40 | 41 | def __init__(self):
|
@@ -189,22 +190,25 @@ def saveFiles():
|
189 | 190 | nowPlaying.logged = True
|
190 | 191 |
|
191 | 192 | thread._start_new_thread(getChar, ())
|
| 193 | +def setGlobalChar(event): |
| 194 | + pressedCharacter.globalChar = event |
| 195 | +keyboard.on_press(setGlobalChar) |
192 | 196 | while shouldRun:
|
193 | 197 |
|
194 |
| - p_event = (pressedCharacter.char == "p") or ((keyboard.is_pressed(76)) and (keyboard.is_pressed("5"))) #Trigger on "p" inside console or "5" on numpad (globally) |
195 |
| - s_event = (pressedCharacter.char == "s") or ((keyboard.is_pressed(77)) and (keyboard.is_pressed("6"))) #Trigger on "s" inside console or "6" on numpad (globally) |
| 198 | + p_event = (pressedCharacter.char == "p") or ((keyboard.is_pressed(76)) and (pressedCharacter.globalChar.is_keypad)) #Trigger on "p" inside console or "5" on numpad (globally) |
| 199 | + s_event = (pressedCharacter.char == "s") or ((keyboard.is_pressed(77)) and (pressedCharacter.globalChar.is_keypad)) #Trigger on "s" inside console or "6" on numpad (globally) |
196 | 200 | l_event = pressedCharacter.char == "l"
|
197 | 201 | i_event = pressedCharacter.char == "i"
|
198 | 202 | u_event = pressedCharacter.char == "u"
|
199 |
| - r_event = (pressedCharacter.char == "r") or ((keyboard.is_pressed(75)) and (keyboard.is_pressed("4"))) #Trigger on "r" inside console or "4" on numpad (globally) |
| 203 | + r_event = (pressedCharacter.char == "r") or ((keyboard.is_pressed(75)) and (pressedCharacter.globalChar.is_keypad)) #Trigger on "r" inside console or "4" on numpad (globally) |
200 | 204 | t_event = pressedCharacter.char == "t"
|
201 | 205 | g_event = pressedCharacter.char == "g"
|
202 | 206 | j_event = pressedCharacter.char == "j"
|
203 | 207 | n_event = pressedCharacter.char == "n"
|
204 | 208 | h_event = pressedCharacter.char == "h"
|
205 | 209 | c_event = pressedCharacter.char == "c"
|
206 | 210 | o_event = pressedCharacter.char == "o"
|
207 |
| - e_event = (pressedCharacter.char == "e") or ((keyboard.is_pressed(79)) and (keyboard.is_pressed("1"))) #Trigger on "e" inside console or "1" on numpad (globally) |
| 211 | + e_event = (pressedCharacter.char == "e") or ((keyboard.is_pressed(79)) and (pressedCharacter.globalChar.is_keypad)) #Trigger on "e" inside console or "1" on numpad (globally) |
208 | 212 | q_event = pressedCharacter.char == "q"
|
209 | 213 |
|
210 | 214 | if p_event and pygame.mixer_music.get_busy():
|
|
0 commit comments