From eaa2e027b73c9afca623d877c91150a94c83049d Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Tue, 31 Jan 2012 13:45:29 +0100 Subject: Revert "Handle SDL grabs failing (Mark McLoughlin)" 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 Signed-off-by: Anthony Liguori --- ui/sdl.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'ui') diff --git a/ui/sdl.c b/ui/sdl.c index d845efb5e..0d3a88974 100644 --- 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) -- cgit v1.2.3