Commit 6bb816031f8bc0aafc3476e6dfa4293ee3a5f106
1 parent
4141d4c2
Handle SDL grabs failing (Mark McLoughlin)
If a X window is not viewable, XGrabPointer() fails and returns GrabNotViewable. SDL's X backend currently handles this by retrying the grab until the window becomes viewable again. This means e.g. if you Ctrl-Alt-RightArrow to switch workspaces, QEMU tries to grab, SDL blocks because the window isn't viewable and your guest stops executing until you switch back to that workspace again. See this Fedora bug for the gory details: https://bugzilla.redhat.com/480065 Some SDL backends will return SDL_GRAB_OFF from SDL_WM_GrabInput(), so the fix is to make the X backend do this if the grab fails. The only side-effect in QEMU is that if SDL_WM_GrabInput() fails we still change the window title to indicate that it's grabbed, when in fact it's not. This patch fixes that minor issue. Signed-off-by: Mark McLoughlin <markmc@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6325 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
1 changed file
with
6 additions
and
3 deletions
sdl.c
| ... | ... | @@ -286,9 +286,12 @@ static void sdl_grab_start(void) |
| 286 | 286 | SDL_WarpMouse(guest_x, guest_y); |
| 287 | 287 | } else |
| 288 | 288 | sdl_hide_cursor(); |
| 289 | - SDL_WM_GrabInput(SDL_GRAB_ON); | |
| 290 | - gui_grab = 1; | |
| 291 | - sdl_update_caption(); | |
| 289 | + | |
| 290 | + if (SDL_WM_GrabInput(SDL_GRAB_ON) == SDL_GRAB_ON) { | |
| 291 | + gui_grab = 1; | |
| 292 | + sdl_update_caption(); | |
| 293 | + } else | |
| 294 | + sdl_show_cursor(); | |
| 292 | 295 | } |
| 293 | 296 | |
| 294 | 297 | static void sdl_grab_end(void) | ... | ... |