further SDL2 refactoring
sdl2
sdl2
fix