]> Git Repo - qemu.git/commitdiff
Revert "Handle SDL grabs failing (Mark McLoughlin)"
authorJan Kiszka <[email protected]>
Tue, 31 Jan 2012 12:45:29 +0000 (13:45 +0100)
committerAnthony Liguori <[email protected]>
Wed, 1 Feb 2012 20:45:02 +0000 (14:45 -0600)
This reverts commit 6bb816031f8bc0aafc3476e6dfa4293ee3a5f106.

SDL_WM_GrabInput does not reliably bail out if grabbing is impossible.
So if we get here, we already lost and will block. But this can no
longer happen due to the check in sdl_grab_start. So this patch became
obsolete.

Conflicts:

sdl.c

Signed-off-by: Jan Kiszka <[email protected]>
Signed-off-by: Anthony Liguori <[email protected]>
ui/sdl.c

index d845efb5e1673e078a5dc69320d5938d4029d8aa..0d3a889741cb742a129a7c473786741e4775773e 100644 (file)
--- a/ui/sdl.c
+++ b/ui/sdl.c
@@ -475,12 +475,9 @@ static void sdl_grab_start(void)
             SDL_WarpMouse(guest_x, guest_y);
     } else
         sdl_hide_cursor();
-
-    if (SDL_WM_GrabInput(SDL_GRAB_ON) == SDL_GRAB_ON) {
-        gui_grab = 1;
-        sdl_update_caption();
-    } else
-        sdl_show_cursor();
+    SDL_WM_GrabInput(SDL_GRAB_ON);
+    gui_grab = 1;
+    sdl_update_caption();
 }
 
 static void sdl_grab_end(void)
This page took 0.025192 seconds and 4 git commands to generate.