Mercurial > sdl-ios-xcode
annotate src/video/maccommon/SDL_macmouse.c @ 615:7ec821f3cbd0
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 | f6ffac90895c |
| children | b8d311d90021 |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 2 SDL - Simple DirectMedia Layer | |
|
297
f6ffac90895c
Updated copyright information for 2002
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
3 Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga |
| 0 | 4 |
| 5 This library is free software; you can redistribute it and/or | |
| 6 modify it under the terms of the GNU Library General Public | |
| 7 License as published by the Free Software Foundation; either | |
| 8 version 2 of the License, or (at your option) any later version. | |
| 9 | |
| 10 This library is distributed in the hope that it will be useful, | |
| 11 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 13 Library General Public License for more details. | |
| 14 | |
| 15 You should have received a copy of the GNU Library General Public | |
| 16 License along with this library; if not, write to the Free | |
| 17 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
| 18 | |
| 19 Sam Lantinga | |
|
252
e8157fcb3114
Updated the source with the correct e-mail address
Sam Lantinga <slouken@libsdl.org>
parents:
168
diff
changeset
|
20 slouken@libsdl.org |
| 0 | 21 */ |
| 22 | |
| 23 #ifdef SAVE_RCSID | |
| 24 static char rcsid = | |
| 25 "@(#) $Id$"; | |
| 26 #endif | |
| 27 | |
| 28 #include <stdlib.h> | |
| 29 #include <stdio.h> | |
| 30 #if TARGET_API_MAC_CARBON | |
| 31 #include <Carbon.h> | |
| 32 #else | |
| 33 #include <Quickdraw.h> | |
| 34 #endif | |
| 35 | |
| 36 /* Routines that are not supported by the Carbon API... */ | |
| 37 #if !TARGET_API_MAC_CARBON | |
| 38 #include <CursorDevices.h> | |
| 39 #endif | |
| 40 | |
| 41 #include "SDL_error.h" | |
| 42 #include "SDL_mouse.h" | |
| 43 #include "SDL_macmouse_c.h" | |
| 44 | |
| 45 | |
| 46 /* The implementation dependent data for the window manager cursor */ | |
| 47 struct WMcursor { | |
| 48 Cursor curs; | |
| 49 }; | |
| 50 | |
| 51 | |
| 52 void Mac_FreeWMCursor(_THIS, WMcursor *cursor) | |
| 53 { | |
| 54 free(cursor); | |
| 55 } | |
| 56 | |
| 57 WMcursor *Mac_CreateWMCursor(_THIS, | |
| 58 Uint8 *data, Uint8 *mask, int w, int h, int hot_x, int hot_y) | |
| 59 { | |
| 60 WMcursor *cursor; | |
| 61 int row, bytes; | |
| 62 | |
| 63 /* Allocate the cursor memory */ | |
| 64 cursor = (WMcursor *)malloc(sizeof(WMcursor)); | |
| 65 if ( cursor == NULL ) { | |
| 66 SDL_OutOfMemory(); | |
| 67 return(NULL); | |
| 68 } | |
| 69 memset(cursor, 0, sizeof(*cursor)); | |
|
168
e92aa316c517
Added Max's patches for building MacOS X apps on command line
Sam Lantinga <slouken@libsdl.org>
parents:
0
diff
changeset
|
70 |
|
e92aa316c517
Added Max's patches for building MacOS X apps on command line
Sam Lantinga <slouken@libsdl.org>
parents:
0
diff
changeset
|
71 if (w > 16) |
|
e92aa316c517
Added Max's patches for building MacOS X apps on command line
Sam Lantinga <slouken@libsdl.org>
parents:
0
diff
changeset
|
72 w = 16; |
|
e92aa316c517
Added Max's patches for building MacOS X apps on command line
Sam Lantinga <slouken@libsdl.org>
parents:
0
diff
changeset
|
73 |
|
e92aa316c517
Added Max's patches for building MacOS X apps on command line
Sam Lantinga <slouken@libsdl.org>
parents:
0
diff
changeset
|
74 if (h > 16) |
|
e92aa316c517
Added Max's patches for building MacOS X apps on command line
Sam Lantinga <slouken@libsdl.org>
parents:
0
diff
changeset
|
75 h = 16; |
|
e92aa316c517
Added Max's patches for building MacOS X apps on command line
Sam Lantinga <slouken@libsdl.org>
parents:
0
diff
changeset
|
76 |
|
e92aa316c517
Added Max's patches for building MacOS X apps on command line
Sam Lantinga <slouken@libsdl.org>
parents:
0
diff
changeset
|
77 bytes = (w+7)/8; |
|
e92aa316c517
Added Max's patches for building MacOS X apps on command line
Sam Lantinga <slouken@libsdl.org>
parents:
0
diff
changeset
|
78 |
|
e92aa316c517
Added Max's patches for building MacOS X apps on command line
Sam Lantinga <slouken@libsdl.org>
parents:
0
diff
changeset
|
79 for ( row=0; row<h; ++row ) { |
|
e92aa316c517
Added Max's patches for building MacOS X apps on command line
Sam Lantinga <slouken@libsdl.org>
parents:
0
diff
changeset
|
80 memcpy(&cursor->curs.data[row], data, bytes); |
|
e92aa316c517
Added Max's patches for building MacOS X apps on command line
Sam Lantinga <slouken@libsdl.org>
parents:
0
diff
changeset
|
81 data += bytes; |
| 0 | 82 } |
|
168
e92aa316c517
Added Max's patches for building MacOS X apps on command line
Sam Lantinga <slouken@libsdl.org>
parents:
0
diff
changeset
|
83 for ( row=0; row<h; ++row ) { |
| 0 | 84 memcpy(&cursor->curs.mask[row], mask, bytes); |
|
168
e92aa316c517
Added Max's patches for building MacOS X apps on command line
Sam Lantinga <slouken@libsdl.org>
parents:
0
diff
changeset
|
85 mask += bytes; |
| 0 | 86 } |
| 87 cursor->curs.hotSpot.h = hot_x; | |
| 88 cursor->curs.hotSpot.v = hot_y; | |
| 89 | |
| 90 /* That was easy. :) */ | |
| 91 return(cursor); | |
| 92 } | |
| 93 | |
| 94 int Mac_cursor_showing = 1; | |
| 95 | |
| 96 int Mac_ShowWMCursor(_THIS, WMcursor *cursor) | |
| 97 { | |
| 98 if ( cursor == NULL ) { | |
| 99 if ( Mac_cursor_showing ) { | |
| 100 HideCursor(); | |
| 101 Mac_cursor_showing = 0; | |
| 102 } | |
| 103 } else { | |
| 104 SetCursor(&cursor->curs); | |
| 105 if ( ! Mac_cursor_showing ) { | |
| 106 ShowCursor(); | |
| 107 Mac_cursor_showing = 1; | |
| 108 } | |
| 109 } | |
| 110 return(1); | |
| 111 } | |
| 112 | |
| 113 void Mac_WarpWMCursor(_THIS, Uint16 x, Uint16 y) | |
| 114 { | |
| 115 #if !TARGET_API_MAC_CARBON | |
| 116 CursorDevice *cursordevice; | |
| 117 | |
| 118 cursordevice = nil; | |
| 119 CursorDeviceNextDevice(&cursordevice); | |
| 120 if ( cursordevice != nil ) { | |
| 121 WindowPtr saveport; | |
| 122 Point where; | |
| 123 | |
| 124 GetPort(&saveport); | |
| 125 SetPort(SDL_Window); | |
| 126 where.h = x; | |
| 127 where.v = y; | |
| 128 LocalToGlobal(&where); | |
| 129 SetPort(saveport); | |
| 130 CursorDeviceMoveTo(cursordevice, where.h, where.v); | |
| 131 } | |
| 132 #endif /* !TARGET_API_MAC_CARBON */ | |
| 133 } | |
| 134 |