Merge pull request #3423 from cmitu/joy2key-fix3

joy2key: fix a couple of bugs in the SDL version

Author: joolswills

scriptmodules/admin/joy2key/joy2key_sdl.py

@@ -38,7 +38,7 @@
 from sdl2 import joystick, events, version, \
     SDL_WasInit, SDL_Init, SDL_QuitSubSystem, SDL_GetError, \
     SDL_INIT_JOYSTICK, SDL_INIT_VIDEO, version_info, \
-    SDL_Event, SDL_PollEvent, SDL_Delay, SDL_Quit, \
+    SDL_Event, SDL_PollEvent, SDL_FlushEvent, SDL_Delay, SDL_Quit, \
     SDL_JOYDEVICEADDED, SDL_JOYDEVICEREMOVED, SDL_QUIT, \
     SDL_JOYBUTTONDOWN, SDL_JOYBUTTONUP, SDL_JOYHATMOTION, SDL_JOYAXISMOTION, \
     SDL_GetTicks
@@ -255,7 +255,7 @@ def filter_active_events(event_queue: dict) -> list:
     for e in event_queue:
         if event_queue[e][0] is None:
             continue
-        
+
         last_fire_time = event_queue[e][2]
         repeat_count = event_queue[e][1]
 
@@ -268,7 +268,13 @@ def filter_active_events(event_queue: dict) -> list:
 
     # remove any duplicate events from the list
     return list(set(filtered_events))
-    
+
+"""
+Remove all queued events for a device
+"""
+def remove_events_for_device(event_queue: dict, dev_index: int):
+    return { key:value for (key,value) in event_queue.items() if not key.startswith(f"{dev_index}_")}
+
 def event_loop(configs, joy_map, tty_fd):
     event = SDL_Event()
 
@@ -346,6 +352,8 @@ def handle_new_input(e: SDL_Event, axis_norm_value: int = 0) -> bool:
                 if joystick.SDL_JoystickNumAxes(stick) > 0:
                     axis_prev_values[joystick.SDL_JoystickInstanceID(stick)] = [0 for x in range(joystick.SDL_JoystickNumAxes(stick))]
 
+                # Remove any spurious axis movements reported by SDL during initialization
+                SDL_FlushEvent(SDL_JOYAXISMOTION);
                 continue
 
             if event.jdevice.which not in active_devices:
@@ -355,6 +363,8 @@ def handle_new_input(e: SDL_Event, axis_norm_value: int = 0) -> bool:
 
             if event.type == SDL_JOYDEVICEREMOVED:
                 joystick.SDL_JoystickClose(active_devices[event.jdevice.which][1])
+                if event.jdevice.which in active_devices:
+                    event_queue = remove_events_for_device(event_queue, active_devices[event.jdevice.which][0])
                 active_devices.pop(event.jdevice.which, None)
                 axis_prev_values.pop(event.jdevice.which, None)
                 LOG.debug(f'Removed joystick #{event.jdevice.which}')