mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ui/sdl: switch to new show-cursor option

Browse Source 
Use DisplayOpts settings instead of cursor_hide global variable.
Also make "-display sdl,show-cursor=on" work.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Gerd Hoffmann 2020-01-31 12:35:21 +01:00
parent 09aa82ee7a
commit 86a088e624
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ui/sdl2.c
View File

@ -161,9 +161,9 @@ static void sdl_update_caption(struct sdl2_console *scon)
}
}
static void sdl_hide_cursor(void)
static void sdl_hide_cursor(struct sdl2_console *scon)
{
if (!cursor_hide) {
if (scon->opts->has_show_cursor && scon->opts->show_cursor) {
return;
}
@ -175,9 +175,9 @@ static void sdl_hide_cursor(void)
}
}
static void sdl_show_cursor(void)
static void sdl_show_cursor(struct sdl2_console *scon)
{
if (!cursor_hide) {
if (scon->opts->has_show_cursor && scon->opts->show_cursor) {
return;
}
@ -216,7 +216,7 @@ static void sdl_grab_start(struct sdl2_console *scon)
SDL_WarpMouseInWindow(scon->real_window, guest_x, guest_y);
}
} else {
sdl_hide_cursor();
sdl_hide_cursor(scon);
}
SDL_SetWindowGrab(scon->real_window, SDL_TRUE);
gui_grab = 1;
@ -227,7 +227,7 @@ static void sdl_grab_end(struct sdl2_console *scon)
{
SDL_SetWindowGrab(scon->real_window, SDL_FALSE);
gui_grab = 0;
sdl_show_cursor();
sdl_show_cursor(scon);
sdl_update_caption(scon);
}
@ -658,7 +658,7 @@ static void sdl_mouse_warp(DisplayChangeListener *dcl,
if (on) {
if (!guest_cursor) {
sdl_show_cursor();
sdl_show_cursor(scon);
}
if (gui_grab || qemu_input_is_absolute() || absolute_enabled) {
SDL_SetCursor(guest_sprite);
@ -667,7 +667,7 @@ static void sdl_mouse_warp(DisplayChangeListener *dcl,
}
}
} else if (gui_grab) {
sdl_hide_cursor();
sdl_hide_cursor(scon);
}
guest_cursor = on;
guest_x = x, guest_y = y;

10
vl.c
View File

@ -1931,6 +1931,16 @@ static void parse_display(const char *p)
} else {
goto invalid_sdl_args;
}
} else if (strstart(opts, ",show-cursor=", &nextopt)) {
opts = nextopt;
dpy.has_show_cursor = true;
if (strstart(opts, "on", &nextopt)) {
dpy.show_cursor = true;
} else if (strstart(opts, "off", &nextopt)) {
dpy.show_cursor = false;
} else {
goto invalid_sdl_args;
}
} else if (strstart(opts, ",gl=", &nextopt)) {
opts = nextopt;
dpy.has_gl = true;