aboutsummaryrefslogtreecommitdiff
path: root/ui/sdl.c
diff options
context:
space:
mode:
authorJan Kiszka <jan.kiszka@siemens.com>2012-01-31 13:45:29 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2012-02-01 14:45:02 -0600
commiteaa2e027b73c9afca623d877c91150a94c83049d (patch)
tree03d77c0864bd1f2492276875d6d735ab015dc180 /ui/sdl.c
parent85f94f868fcd868f0f605e9d3c1ad6351c557190 (diff)
downloadqemu-eaa2e027b73c9afca623d877c91150a94c83049d.zip
qemu-eaa2e027b73c9afca623d877c91150a94c83049d.tar.gz
qemu-eaa2e027b73c9afca623d877c91150a94c83049d.tar.bz2
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 <jan.kiszka@siemens.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'ui/sdl.c')
-rw-r--r--ui/sdl.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/ui/sdl.c b/ui/sdl.c
index d845efb..0d3a889 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)