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

ui/xemu: Pass scon->dcl.con to new required args

This commit is contained in:
Matt Borgerson 2025-01-06 04:08:59 -07:00
parent 031283eca4
commit 46e8cf16ee
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ui/xemu.c
View File

@ -252,7 +252,7 @@ static void sdl_hide_cursor(struct sdl2_console *scon)
SDL_ShowCursor(SDL_DISABLE); SDL_ShowCursor(SDL_DISABLE);
SDL_SetCursor(sdl_cursor_hidden); SDL_SetCursor(sdl_cursor_hidden);
if (!qemu_input_is_absolute()) { if (!qemu_input_is_absolute(scon->dcl.con)) {
SDL_SetRelativeMouseMode(SDL_TRUE); SDL_SetRelativeMouseMode(SDL_TRUE);
} }
} }
@ -263,12 +263,12 @@ static void sdl_show_cursor(struct sdl2_console *scon)
return; return;
} }
if (!qemu_input_is_absolute()) { if (!qemu_input_is_absolute(scon->dcl.con)) {
SDL_SetRelativeMouseMode(SDL_FALSE); SDL_SetRelativeMouseMode(SDL_FALSE);
} }
if (guest_cursor && if (guest_cursor &&
(gui_grab || qemu_input_is_absolute() || absolute_enabled)) { (gui_grab || qemu_input_is_absolute(scon->dcl.con) || absolute_enabled)) {
SDL_SetCursor(guest_sprite); SDL_SetCursor(guest_sprite);
} else { } else {
SDL_SetCursor(sdl_cursor_normal); SDL_SetCursor(sdl_cursor_normal);
@ -295,7 +295,7 @@ static void sdl_grab_start(struct sdl2_console *scon)
} }
if (guest_cursor) { if (guest_cursor) {
SDL_SetCursor(guest_sprite); SDL_SetCursor(guest_sprite);
if (!qemu_input_is_absolute() && !absolute_enabled) { if (!qemu_input_is_absolute(scon->dcl.con) && !absolute_enabled) {
SDL_WarpMouseInWindow(scon->real_window, guest_x, guest_y); SDL_WarpMouseInWindow(scon->real_window, guest_x, guest_y);
} }
} else { } else {
@ -329,7 +329,7 @@ static void absolute_mouse_grab(struct sdl2_console *scon)
static void sdl_mouse_mode_change(Notifier *notify, void *data) static void sdl_mouse_mode_change(Notifier *notify, void *data)
{ {
if (qemu_input_is_absolute()) { if (qemu_input_is_absolute(sdl2_console[0].dcl.con)) {
if (!absolute_enabled) { if (!absolute_enabled) {
absolute_enabled = 1; absolute_enabled = 1;
SDL_SetRelativeMouseMode(SDL_FALSE); SDL_SetRelativeMouseMode(SDL_FALSE);
@ -358,7 +358,7 @@ static void sdl_send_mouse_event(struct sdl2_console *scon, int dx, int dy,
prev_state = state; prev_state = state;
} }
if (qemu_input_is_absolute()) { if (qemu_input_is_absolute(scon->dcl.con)) {
qemu_input_queue_abs(scon->dcl.con, INPUT_AXIS_X, qemu_input_queue_abs(scon->dcl.con, INPUT_AXIS_X,
x, 0, surface_width(scon->surface)); x, 0, surface_width(scon->surface));
qemu_input_queue_abs(scon->dcl.con, INPUT_AXIS_Y, qemu_input_queue_abs(scon->dcl.con, INPUT_AXIS_Y,
@ -511,7 +511,7 @@ static void handle_mousemotion(SDL_Event *ev)
return; return;
} }
if (qemu_input_is_absolute() || absolute_enabled) { if (qemu_input_is_absolute(scon->dcl.con) || absolute_enabled) {
int scr_w, scr_h; int scr_w, scr_h;
SDL_GetWindowSize(scon->real_window, &scr_w, &scr_h); SDL_GetWindowSize(scon->real_window, &scr_w, &scr_h);
max_x = scr_w - 1; max_x = scr_w - 1;
@ -527,7 +527,7 @@ static void handle_mousemotion(SDL_Event *ev)
sdl_grab_start(scon); sdl_grab_start(scon);
} }
} }
if (gui_grab || qemu_input_is_absolute() || absolute_enabled) { if (gui_grab || qemu_input_is_absolute(scon->dcl.con) || absolute_enabled) {
sdl_send_mouse_event(scon, ev->motion.xrel, ev->motion.yrel, sdl_send_mouse_event(scon, ev->motion.xrel, ev->motion.yrel,
ev->motion.x, ev->motion.y, ev->motion.state); ev->motion.x, ev->motion.y, ev->motion.state);
} }
@ -544,7 +544,7 @@ static void handle_mousebutton(SDL_Event *ev)
} }
bev = &ev->button; bev = &ev->button;
if (!gui_grab && !qemu_input_is_absolute()) { if (!gui_grab && !qemu_input_is_absolute(scon->dcl.con)) {
if (ev->type == SDL_MOUSEBUTTONUP && bev->button == SDL_BUTTON_LEFT) { if (ev->type == SDL_MOUSEBUTTONUP && bev->button == SDL_BUTTON_LEFT) {
/* start grabbing all events */ /* start grabbing all events */
sdl_grab_start(scon); sdl_grab_start(scon);
@ -613,7 +613,7 @@ static void handle_windowevent(SDL_Event *ev)
break; break;
case SDL_WINDOWEVENT_FOCUS_GAINED: case SDL_WINDOWEVENT_FOCUS_GAINED:
case SDL_WINDOWEVENT_ENTER: case SDL_WINDOWEVENT_ENTER:
if (!gui_grab && (qemu_input_is_absolute() || absolute_enabled)) { if (!gui_grab && (qemu_input_is_absolute(scon->dcl.con) || absolute_enabled)) {
absolute_mouse_grab(scon); absolute_mouse_grab(scon);
} }
/* If a new console window opened using a hotkey receives the /* If a new console window opened using a hotkey receives the
@ -736,9 +736,9 @@ static void sdl_mouse_warp(DisplayChangeListener *dcl,
if (!guest_cursor) { if (!guest_cursor) {
sdl_show_cursor(scon); sdl_show_cursor(scon);
} }
if (gui_grab || qemu_input_is_absolute() || absolute_enabled) { if (gui_grab || qemu_input_is_absolute(scon->dcl.con) || absolute_enabled) {
SDL_SetCursor(guest_sprite); SDL_SetCursor(guest_sprite);
if (!qemu_input_is_absolute() && !absolute_enabled) { if (!qemu_input_is_absolute(scon->dcl.con) && !absolute_enabled) {
SDL_WarpMouseInWindow(scon->real_window, x, y); SDL_WarpMouseInWindow(scon->real_window, x, y);
} }
} }
@ -776,7 +776,7 @@ static void sdl_mouse_define(DisplayChangeListener *dcl,
return; return;
} }
if (guest_cursor && if (guest_cursor &&
(gui_grab || qemu_input_is_absolute() || absolute_enabled)) { (gui_grab || qemu_input_is_absolute(dcl->con) || absolute_enabled)) {
SDL_SetCursor(guest_sprite); SDL_SetCursor(guest_sprite);
} }
} }