ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ui: Update cursor 

Tracking 86a088e624
This commit is contained in:
Matt Borgerson 2020-05-04 07:35:52 -07:00
parent 2d0e996887
commit 6c009b206d
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ui/xemu.c
View File

@ -205,9 +205,9 @@ static void sdl_update_caption(struct sdl2_console *scon)
#endif #endif
} }
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; return;
} }
@ -219,9 +219,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; return;
} }
@ -261,7 +261,7 @@ static void sdl_grab_start(struct sdl2_console *scon)
SDL_WarpMouseInWindow(scon->real_window, guest_x, guest_y); SDL_WarpMouseInWindow(scon->real_window, guest_x, guest_y);
} }
} else { } else {
sdl_hide_cursor(); sdl_hide_cursor(scon);
} }
SDL_SetWindowGrab(scon->real_window, SDL_TRUE); SDL_SetWindowGrab(scon->real_window, SDL_TRUE);
gui_grab = 1; gui_grab = 1;
@ -273,7 +273,7 @@ static void sdl_grab_end(struct sdl2_console *scon)
{ {
SDL_SetWindowGrab(scon->real_window, SDL_FALSE); SDL_SetWindowGrab(scon->real_window, SDL_FALSE);
gui_grab = 0; gui_grab = 0;
sdl_show_cursor(); sdl_show_cursor(scon);
sdl_update_caption(scon); sdl_update_caption(scon);
} }
@ -679,7 +679,7 @@ static void sdl_mouse_warp(DisplayChangeListener *dcl,
if (on) { if (on) {
if (!guest_cursor) { if (!guest_cursor) {
sdl_show_cursor(); sdl_show_cursor(scon);
} }
if (gui_grab || qemu_input_is_absolute() || absolute_enabled) { if (gui_grab || qemu_input_is_absolute() || absolute_enabled) {
SDL_SetCursor(guest_sprite); SDL_SetCursor(guest_sprite);
@ -688,7 +688,7 @@ static void sdl_mouse_warp(DisplayChangeListener *dcl,
} }
} }
} else if (gui_grab) { } else if (gui_grab) {
sdl_hide_cursor(); sdl_hide_cursor(scon);
} }
guest_cursor = on; guest_cursor = on;
guest_x = x, guest_y = y; guest_x = x, guest_y = y;