From 982aae66ff75dced49990d7cce8dc0be31aff7e1 Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Sat, 30 Jul 2011 11:39:10 +0200 Subject: [PATCH] sdl: Drop bogus gui_fullscreen_initial_grab There must be no difference between initial -full-screen and switching to this mode via the hot key. Signed-off-by: Jan Kiszka Signed-off-by: Anthony Liguori --- ui/sdl.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ui/sdl.c b/ui/sdl.c index e18c59a..80bf776 100644 --- a/ui/sdl.c +++ b/ui/sdl.c @@ -47,7 +47,6 @@ static int gui_fullscreen; static int gui_noframe; static int gui_key_modifier_pressed; static int gui_keysym; -static int gui_fullscreen_initial_grab; static int gui_grab_code = KMOD_LALT | KMOD_LCTRL; static uint8_t modifiers_state[256]; static int width, height; @@ -751,7 +750,7 @@ static void sdl_refresh(DisplayState *ds) break; case SDL_ACTIVEEVENT: if (gui_grab && ev->active.state == SDL_APPINPUTFOCUS && - !ev->active.gain && !gui_fullscreen_initial_grab) { + !ev->active.gain && !gui_fullscreen) { sdl_grab_end(); } if (ev->active.state & SDL_APPACTIVE) { @@ -923,7 +922,6 @@ void sdl_display_init(DisplayState *ds, int full_screen, int no_frame) atexit(sdl_cleanup); if (full_screen) { gui_fullscreen = 1; - gui_fullscreen_initial_grab = 1; sdl_grab_start(); } } -- 2.7.4