From 4ad1acd24eeb836ff3b4fb06cb83011ed635d1e0 Mon Sep 17 00:00:00 2001
From: MarkusKgit <13160892+MarkusKgit@users.noreply.github.com>
Date: Mon, 20 May 2019 12:05:49 +0200
Subject: [PATCH] Fix X11 NullCursor

---
 src/Avalonia.X11/X11CursorFactory.cs | 8 ++++----
 src/Avalonia.X11/XLib.cs             | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/Avalonia.X11/X11CursorFactory.cs b/src/Avalonia.X11/X11CursorFactory.cs
index c5566318a2..c020c44662 100644
--- a/src/Avalonia.X11/X11CursorFactory.cs
+++ b/src/Avalonia.X11/X11CursorFactory.cs
@@ -51,7 +51,7 @@ namespace Avalonia.X11
         
         public IPlatformHandle GetCursor(StandardCursorType cursorType)
         {
-            IntPtr handle;
+            IntPtr handle;            
             if (cursorType == StandardCursorType.None)
             {
                 handle = _nullCursor;
@@ -66,12 +66,12 @@ namespace Avalonia.X11
         }
 
         private static IntPtr GetNullCursor(IntPtr display)
-        {            
+        {
             XColor color = new XColor();
             byte[] data = new byte[] { 0 };
             IntPtr window = XLib.XRootWindow(display, 0);
-            IntPtr pixmap = XLib.XCreatePixmapFromBitmapData(display, window, data, 1, 1, IntPtr.Zero, IntPtr.Zero, 0);
-            return XLib.XCreatePixmapCursor(display, pixmap, pixmap, ref color, ref color, 0, 0);            
+            IntPtr pixmap = XLib.XCreateBitmapFromData(display, window, data, 1, 1);
+            return XLib.XCreatePixmapCursor(display, pixmap, pixmap, ref color, ref color, 0, 0);                      
         }
     }
 }
diff --git a/src/Avalonia.X11/XLib.cs b/src/Avalonia.X11/XLib.cs
index 8a146f922d..3c41f7bdde 100644
--- a/src/Avalonia.X11/XLib.cs
+++ b/src/Avalonia.X11/XLib.cs
@@ -321,6 +321,9 @@ namespace Avalonia.X11
         public static extern IntPtr XCreatePixmapCursor(IntPtr display, IntPtr source, IntPtr mask,
             ref XColor foreground_color, ref XColor background_color, int x_hot, int y_hot);
 
+        [DllImport(libX11)]
+        public static extern IntPtr XCreateBitmapFromData(IntPtr display, IntPtr drawable, byte[] data, int width, int height);
+
         [DllImport(libX11)]
         public static extern IntPtr XCreatePixmapFromBitmapData(IntPtr display, IntPtr drawable, byte[] data, int width,
             int height, IntPtr fg, IntPtr bg, int depth);