xserver: Branch 'master'

[GitLab Mirror]

 hw/xwayland/xwayland-cursor.c |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit dea4a74621294391ce5901bb3339e1b8e7151efc
Author: Carlos Garnacho <carlosg at gnome.org>
Date:   Wed May 22 17:51:04 2019 +0200

    xwayland: Reset scheduled frames after hiding tablet cursor
    
    Hiding the tablet tool cursor results in it being hidden forever after.
    This is due to the stale frame callback that will neither be disposed
    or replaced. This can be reproduced in krita (X11) as the pointer
    cursor is hidden while over the canvas.
    
    Clearing the frame callback ensures the correct behavior in future
    xwl_tablet_tool_set_cursor() calls (i.e. a new cursor surface being
    displayed, and a new frame callback created), and is 1:1
    with xwl_seat_set_cursor() for pointers.
    
    Signed-off-by: Carlos Garnacho <carlosg at gnome.org>

diff --git a/hw/xwayland/xwayland-cursor.c b/hw/xwayland/xwayland-cursor.c
index cf8395f1d..66720bcc0 100644
--- a/hw/xwayland/xwayland-cursor.c
+++ b/hw/xwayland/xwayland-cursor.c
@@ -188,6 +188,8 @@ xwl_tablet_tool_set_cursor(struct xwl_tablet_tool *xwl_tablet_tool)
         zwp_tablet_tool_v2_set_cursor(xwl_tablet_tool->tool,
                                       xwl_tablet_tool->proximity_in_serial,
                                       NULL, 0, 0);
+        clear_cursor_frame_callback(xwl_cursor);
+        xwl_cursor->needs_update = FALSE;
         return;
     }