aboutsummaryrefslogtreecommitdiff
path: root/ui
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@gmail.com>2015-03-24 17:50:12 +0100
committerGerd Hoffmann <kraxel@redhat.com>2015-04-27 12:47:04 +0200
commitdc8dceee64f45820c20f3ffa3c3fecd7b6539990 (patch)
tree1070df76dd0b19e12e20c5b86400f72f64c33f0b /ui
parentd0df04a1569c75f6442123fdda0b2e9aadc3fcc7 (diff)
downloadqemu-dc8dceee64f45820c20f3ffa3c3fecd7b6539990.zip
qemu-dc8dceee64f45820c20f3ffa3c3fecd7b6539990.tar.gz
qemu-dc8dceee64f45820c20f3ffa3c3fecd7b6539990.tar.bz2
spice: set pointer position on hotspot
The Spice protocol uses cursor position on hotspot: the client is applying hotspot offset when drawing the cursor. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'ui')
-rw-r--r--ui/spice-display.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/ui/spice-display.c b/ui/spice-display.c
index bf66cc9..a09f6f8 100644
--- a/ui/spice-display.c
+++ b/ui/spice-display.c
@@ -275,8 +275,8 @@ qemu_spice_create_cursor_update(SimpleSpiceDisplay *ssd,
if (c) {
ccmd->type = QXL_CURSOR_SET;
- ccmd->u.set.position.x = ssd->ptr_x;
- ccmd->u.set.position.y = ssd->ptr_y;
+ ccmd->u.set.position.x = ssd->ptr_x + ssd->hot_x;
+ ccmd->u.set.position.y = ssd->ptr_y + ssd->hot_y;
ccmd->u.set.visible = true;
ccmd->u.set.shape = (uintptr_t)cursor;
cursor->header.unique = ssd->unique++;
@@ -290,8 +290,8 @@ qemu_spice_create_cursor_update(SimpleSpiceDisplay *ssd,
memcpy(cursor->chunk.data, c->data, size);
} else {
ccmd->type = QXL_CURSOR_MOVE;
- ccmd->u.position.x = ssd->ptr_x;
- ccmd->u.position.y = ssd->ptr_y;
+ ccmd->u.position.x = ssd->ptr_x + ssd->hot_x;
+ ccmd->u.position.y = ssd->ptr_y + ssd->hot_y;
}
ccmd->release_info.id = (uintptr_t)(&update->ext);
@@ -748,6 +748,8 @@ static void display_mouse_define(DisplayChangeListener *dcl,
SimpleSpiceDisplay *ssd = container_of(dcl, SimpleSpiceDisplay, dcl);
qemu_mutex_lock(&ssd->lock);
+ ssd->hot_x = c->hot_x;
+ ssd->hot_y = c->hot_y;
if (ssd->ptr_move) {
g_free(ssd->ptr_move);
ssd->ptr_move = NULL;