mirror of https://github.com/xemu-project/xemu.git
sdl2 uses surface relative coordinates
This patch fixes mouse positioning with -device usb-tablet and fullscreen
or resized window.
Fixes: 46522a8223
Signed-off-by: Jindrich Makovicka <makovick@gmail.com>
Message-Id: <20171117112258.5888-3-makovick@gmail.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
parent
2821671629
commit
d9f0626280
30
ui/sdl2.c
30
ui/sdl2.c
|
@ -276,32 +276,10 @@ static void sdl_send_mouse_event(struct sdl2_console *scon, int dx, int dy,
|
||||||
}
|
}
|
||||||
|
|
||||||
if (qemu_input_is_absolute()) {
|
if (qemu_input_is_absolute()) {
|
||||||
int scr_w, scr_h;
|
qemu_input_queue_abs(scon->dcl.con, INPUT_AXIS_X,
|
||||||
int max_w = 0, max_h = 0;
|
x, 0, surface_width(scon->surface));
|
||||||
int off_x = 0, off_y = 0;
|
qemu_input_queue_abs(scon->dcl.con, INPUT_AXIS_Y,
|
||||||
int cur_off_x = 0, cur_off_y = 0;
|
y, 0, surface_height(scon->surface));
|
||||||
int i;
|
|
||||||
|
|
||||||
for (i = 0; i < sdl2_num_outputs; i++) {
|
|
||||||
struct sdl2_console *thiscon = &sdl2_console[i];
|
|
||||||
if (thiscon->real_window && thiscon->surface) {
|
|
||||||
SDL_GetWindowSize(thiscon->real_window, &scr_w, &scr_h);
|
|
||||||
cur_off_x = thiscon->x;
|
|
||||||
cur_off_y = thiscon->y;
|
|
||||||
if (scr_w + cur_off_x > max_w) {
|
|
||||||
max_w = scr_w + cur_off_x;
|
|
||||||
}
|
|
||||||
if (scr_h + cur_off_y > max_h) {
|
|
||||||
max_h = scr_h + cur_off_y;
|
|
||||||
}
|
|
||||||
if (i == scon->idx) {
|
|
||||||
off_x = cur_off_x;
|
|
||||||
off_y = cur_off_y;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
qemu_input_queue_abs(scon->dcl.con, INPUT_AXIS_X, off_x + x, 0, max_w);
|
|
||||||
qemu_input_queue_abs(scon->dcl.con, INPUT_AXIS_Y, off_y + y, 0, max_h);
|
|
||||||
} else {
|
} else {
|
||||||
if (guest_cursor) {
|
if (guest_cursor) {
|
||||||
x -= guest_x;
|
x -= guest_x;
|
||||||
|
|
Loading…
Reference in New Issue