xserver: Branch 'master'

[GitLab Mirror]

 hw/xquartz/xpr/xprCursor.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 4ae36f418ed683532b0b6991e4a1e7d56740b845
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date:   Mon Mar 8 21:02:40 2021 -0800

    xquartz: Ensure the mouse pointer is shown when switching to a native macOS alert or window
    
    Fixes: https://github.com/XQuartz/XQuartz/issues/100
    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>

diff --git a/hw/xquartz/xpr/xprCursor.c b/hw/xquartz/xpr/xprCursor.c
index 5e89348c0..ff6cf4dd0 100644
--- a/hw/xquartz/xpr/xprCursor.c
+++ b/hw/xquartz/xpr/xprCursor.c
@@ -380,7 +380,9 @@ QuartzInitCursor(ScreenPtr pScreen)
  */
 void
 QuartzSuspendXCursor(ScreenPtr pScreen)
-{}
+{
+    xp_show_cursor();
+}
 
 /*
  * QuartzResumeXCursor