Commit dc8dceee authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Gerd Hoffmann
Browse files

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: default avatarGerd Hoffmann <kraxel@redhat.com>
parent d0df04a1

include/ui/spice-display.h

+2 −1
Original line number Diff line number Diff line
@@ -97,7 +97,8 @@ struct SimpleSpiceDisplay { 
    /* cursor (without qxl): displaychangelistener -> spice server */

    SimpleSpiceCursor *ptr_define;

    SimpleSpiceCursor *ptr_move;

    uint16_t ptr_x, ptr_y;

    int16_t ptr_x, ptr_y;

    int16_t hot_x, hot_y;



    /* cursor (with qxl): qxl local renderer -> displaychangelistener */

    QEMUCursor *cursor;

ui/spice-display.c

+6 −4
Original line number Diff line number Diff line
@@ -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;