From d3f3a0f453ea590be529079ae214c200bb5ecc1a Mon Sep 17 00:00:00 2001 From: Max Reitz Date: Fri, 12 Dec 2014 10:52:52 +0100 Subject: sdl2: Work around SDL2 SDL_ShowWindow() bug Apparently it is possible for X to send an event to a hidden SDL2 window, leading to SDL2 believing it is now shown. SDL2 will pass the SDL_WINDOWEVENT_SHOWN message to the application without actually showing the window; the problem is that the next SDL_ShowWindow() will be a no-op because SDL2 assumes the window is already shown. The correct way to react to SDL_WINDOWEVENT_SHOWN would be to clear scon->hidden (analogous for SDL_WINDOWEVENT_HIDDEN). However, due to the window not actually being shown, this will somehow not be correct after all. Therefore, just hide the window on SDL_WINDOWEVENT_SHOWN if it is supposed to be hidden (and analogous for SDL_WINDOWEVENT_HIDDEN). Signed-off-by: Max Reitz Signed-off-by: Gerd Hoffmann --- ui/sdl2.c | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'ui/sdl2.c') diff --git a/ui/sdl2.c b/ui/sdl2.c index 04bbcc78ee..1ae2781624 100644 --- a/ui/sdl2.c +++ b/ui/sdl2.c @@ -548,6 +548,16 @@ static void handle_windowevent(SDL_Event *ev) qemu_system_shutdown_request(); } break; + case SDL_WINDOWEVENT_SHOWN: + if (scon->hidden) { + SDL_HideWindow(scon->real_window); + } + break; + case SDL_WINDOWEVENT_HIDDEN: + if (!scon->hidden) { + SDL_ShowWindow(scon->real_window); + } + break; } } -- cgit v1.2.1