xserver: Branch 'xwayland'

[Kristian Høgsberg]

 hw/xfree86/xwayland/xwayland-cursor.c |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 58019c294dcb4634cd9c1d7400fcdb8ae62a1b26
Author: Trevor McCort <tjmccort at gmail.com>
Date:   Tue Oct 15 19:41:12 2013 -0500

    xwayland: Fix hidden cursor
    
    If a cursor is set when bits->emptyMask is true, the xserver
    sets a NULL cursor instead.
    
    Signed-off-by: Trevor McCort <tjmccort at gmail.com>

diff --git a/hw/xfree86/xwayland/xwayland-cursor.c b/hw/xfree86/xwayland/xwayland-cursor.c
index 2cdd248..2b3cb5e 100644
--- a/hw/xfree86/xwayland/xwayland-cursor.c
+++ b/hw/xfree86/xwayland/xwayland-cursor.c
@@ -153,9 +153,16 @@ xwl_seat_set_cursor(struct xwl_seat *xwl_seat)
 {
     struct wl_buffer *buffer;
 
-    if (!xwl_seat->x_cursor || !xwl_seat->wl_pointer)
+    if (!xwl_seat->wl_pointer)
         return;
 
+    if (!xwl_seat->x_cursor) {
+        wl_pointer_set_cursor(xwl_seat->wl_pointer,
+                              xwl_seat->pointer_enter_serial,
+                              NULL, 0, 0);
+        return;
+    }
+
     buffer = dixGetPrivate(&xwl_seat->x_cursor->devPrivates,
                            &xwl_seat->xwl_screen->cursor_private_key);