Commit fec035a5 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kraxel/tags/ui-20171117-pull-request' into staging 



sdl2 fixes for 2.11

# gpg: Signature made Fri 17 Nov 2017 10:06:27 GMT
# gpg:                using RSA key 0x4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/ui-20171117-pull-request:
  sdl2: Fix broken display updating after the window is hidden
  sdl2: Do not leave grab when fullscreen
  sdl2: Fix dead keyboard after fullsceen
  sdl2: Use the same pointer show/hide logic for absolute and relative mode
  sdl2: Do not quit the emulator when an auxilliary window is closed

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents b91f0f25 bcf43cdc

ui/sdl2.c

+27 −22
Original line number Diff line number Diff line
@@ -169,10 +169,10 @@ static void sdl_hide_cursor(void) 
        return;

    }



    if (qemu_input_is_absolute()) {

        SDL_ShowCursor(1);

    SDL_ShowCursor(SDL_DISABLE);

    SDL_SetCursor(sdl_cursor_hidden);

    } else {



    if (!qemu_input_is_absolute()) {

        SDL_SetRelativeMouseMode(SDL_TRUE);

    }

}
@@ -185,14 +185,16 @@ static void sdl_show_cursor(void) 


    if (!qemu_input_is_absolute()) {

        SDL_SetRelativeMouseMode(SDL_FALSE);

        SDL_ShowCursor(1);

    }



    if (guest_cursor &&

        (gui_grab || qemu_input_is_absolute() || absolute_enabled)) {

        SDL_SetCursor(guest_sprite);

    } else {

        SDL_SetCursor(sdl_cursor_normal);

    }

    }



    SDL_ShowCursor(SDL_ENABLE);

}



static void sdl_grab_start(struct sdl2_console *scon)
@@ -440,6 +442,7 @@ static void handle_keyup(SDL_Event *ev) 
            sdl2_reset_keys(scon);

            return;

        }

        sdl2_reset_keys(scon);

        gui_keysym = 0;

    }

    if (!gui_keysym) {
@@ -468,7 +471,8 @@ static void handle_mousemotion(SDL_Event *ev) 
        SDL_GetWindowSize(scon->real_window, &scr_w, &scr_h);

        max_x = scr_w - 1;

        max_y = scr_h - 1;

        if (gui_grab && (ev->motion.x == 0 || ev->motion.y == 0 ||

        if (gui_grab && !gui_fullscreen

            && (ev->motion.x == 0 || ev->motion.y == 0 ||

                ev->motion.x == max_x || ev->motion.y == max_y)) {

            sdl_grab_end(scon);

        }
@@ -566,20 +570,21 @@ static void handle_windowevent(SDL_Event *ev) 
        update_displaychangelistener(&scon->dcl, 500);

        break;

    case SDL_WINDOWEVENT_CLOSE:

        if (qemu_console_is_graphic(scon->dcl.con)) {

            if (!no_quit) {

                no_shutdown = 0;

                qemu_system_shutdown_request(SHUTDOWN_CAUSE_HOST_UI);

            }

        break;

    case SDL_WINDOWEVENT_SHOWN:

        if (scon->hidden) {

        } else {

            SDL_HideWindow(scon->real_window);

            scon->hidden = true;

        }

        break;

    case SDL_WINDOWEVENT_SHOWN:

        scon->hidden = false;

        break;

    case SDL_WINDOWEVENT_HIDDEN:

        if (!scon->hidden) {

            SDL_ShowWindow(scon->real_window);

        }

        scon->hidden = true;

        break;

    }

}