Mercurial > sdl-ios-xcode

diff src/video/quartz/SDL_QuartzEvents.m @ 615:7ec821f3cbd0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Sam Lantinga <slouken@libsdl.org>
date Sun, 20 Apr 2003 05:41:16 +0000
parents 04dcaf3da918
children bf816ce70144
line wrap: on
line diff
--- 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);
 }