# HG changeset patch
# User Sam Lantinga <slouken@libsdl.org>
# Date 1050817276 0
# Node ID 7ec821f3cbd04777d59288ad7333ebc200057bc9
# Parent  0b4c3f5ff63d2f1b6d39d5cc88c0d52fa56b877e
Date: Thu, 17 Apr 2003 23:27:34 -0400
From: Darrell Walisser
Subject: Yet another OS X cursor bug

The synopsis:

1. Call SDL_ShowCursor(0);
2. Call SDL_SetVideoMode();
3. Call SDL_GetEvent();
3. Call SDL_ShowCursor(1);

The result: Sometimes the cursor doesn't come back! Ack! Oddly enough,
it does come back when mousing over the dock or clicking in the menu
bar. But that's besides the point.

The reason why this is happening is a flaw in the handling of
activation/deactivation events. The short explanation is that the
HideCursor() and ShowCursor() calls must be balanced, but if the cursor
was initially hidden, HideCursor() was called again on the activate
event - so now the next ShowCursor() fails (as does the next, and the
next, for some reason).

So, here's the patch. All it does is keep track of the
HideCursor()/ShowCursor() calls so that they will always be balanced.

diff -r 0b4c3f5ff63d -r 7ec821f3cbd0 src/video/quartz/SDL_QuartzEvents.m
--- a/src/video/quartz/SDL_QuartzEvents.m	Sun Apr 20 05:36:52 2003 +0000
+++ b/src/video/quartz/SDL_QuartzEvents.m	Sun Apr 20 05:41:16 2003 +0000
@@ -301,9 +301,10 @@
 {
     in_foreground = YES;
     
-    /* Hide the mouse cursor if was hidden */
-    if (!cursor_visible) {
+    /* Hide the cursor if it was hidden by SDL_ShowCursor() */
+    if (!cursor_visible && !cursor_hidden) {
         HideCursor ();
+        cursor_hidden = YES;
     }
 
     /* Regrab input, only if it was previously grabbed */
@@ -330,8 +331,11 @@
     /* Reassociate mouse and cursor */
     CGAssociateMouseAndMouseCursorPosition (1);
 
-    /* Show the cursor */
-    ShowCursor ();
+    /* Show the cursor if it was hidden by SDL_ShowCursor() */
+    if (!cursor_visible && cursor_hidden) {
+        ShowCursor ();
+        cursor_hidden = NO;
+    }
 
     SDL_PrivateAppActive (0, SDL_APPINPUTFOCUS);
 }
diff -r 0b4c3f5ff63d -r 7ec821f3cbd0 src/video/quartz/SDL_QuartzVideo.h
--- a/src/video/quartz/SDL_QuartzVideo.h	Sun Apr 20 05:36:52 2003 +0000
+++ b/src/video/quartz/SDL_QuartzVideo.h	Sun Apr 20 05:41:16 2003 +0000
@@ -138,7 +138,8 @@
     Uint8              expect_mouse_up;    /* used to determine when to send mouse up events */
     Uint8              grab_state;         /* used to manage grab behavior */
     NSPoint            cursor_loc;         /* saved cursor coords, for activate/deactivate when grabbed */
-    BOOL          	   cursor_visible;     /* tells if cursor was hidden or not */
+    BOOL          	   cursor_visible;     /* tells if cursor was instructed to be hidden or not (SDL_ShowCursor) */
+    BOOL               cursor_hidden;      /* tells if cursor is *actually* hidden or not */
     Uint8*             sw_buffers[2];      /* pointers to the two software buffers for double-buffer emulation */
     SDL_Thread         *thread;            /* thread for async updates to the screen */
     SDL_sem            *sem1, *sem2;       /* synchronization for async screen updates */
@@ -183,6 +184,7 @@
 #define grab_state (this->hidden->grab_state)
 #define cursor_loc (this->hidden->cursor_loc)
 #define cursor_visible (this->hidden->cursor_visible)
+#define cursor_hidden (this->hidden->cursor_hidden)
 #define sw_buffers (this->hidden->sw_buffers)
 #define thread (this->hidden->thread)
 #define sem1 (this->hidden->sem1)
diff -r 0b4c3f5ff63d -r 7ec821f3cbd0 src/video/quartz/SDL_QuartzWM.m
--- a/src/video/quartz/SDL_QuartzWM.m	Sun Apr 20 05:36:52 2003 +0000
+++ b/src/video/quartz/SDL_QuartzWM.m	Sun Apr 20 05:41:16 2003 +0000
@@ -72,7 +72,10 @@
 
     if ( cursor == NULL) {
         if ( cursor_visible ) {
-            HideCursor ();
+            if (!cursor_hidden) {
+                HideCursor ();
+                cursor_hidden = YES;
+            }
             cursor_visible = NO;
             QZ_ChangeGrabState (this, QZ_HIDECURSOR);
         }
@@ -80,7 +83,10 @@
     else {
         SetCursor(&cursor->curs);
         if ( ! cursor_visible ) {
-            ShowCursor ();
+            if (cursor_hidden) {
+                ShowCursor ();
+                cursor_hidden = NO;
+            }
             cursor_visible = YES;
             QZ_ChangeGrabState (this, QZ_SHOWCURSOR);
         }