Mercurial > sdl-ios-xcode
annotate src/video/dga/SDL_dgavideo.h @ 1629:ef4a796e7f24
Fixed bug #55
From Christian Walther:
When writing my patch for #12, I ended up doing all sorts of changes to the way
application/window activating/deactivating is handled in the Quartz backend,
resulting in the attached patch. It does make the code a bit cleaner IMHO, but
as it might be regarded as a case of "if it ain't broken, don't fix it" I'd
like to hear other people's opinion about it. Please shout if some change
strikes you as unnecessary or wrong, and I'll explain the reasons behind it. As
far as I tested it, it does not introduce any new bugs, but I may well have
missed some.
- The most fundamental change (that triggered most of the others) is irrelevant
for the usual single-window SDL applications, it only affects the people who
are crazy enough to display other Cocoa windows alongside the SDL window (I'm
actually doing this currently, although the additional window only displays
debugging info and won't be present in the final product): Before, some things
were done on the application becoming active, some on the window becoming key,
and some on the window becoming main. Conceptually, all these actions belong to
the window becoming key, so that's what I implemented. However, since in a
single-window application these three events always happen together, the
previous implementation "ain't broken".
- This slightly changed the meaning of the SDL_APPMOUSEFOCUS flag from
SDL_GetAppState(): Before, it meant "window is main and mouse is inside window
(or mode is fullscreen)". Now, it means "window is key and mouse is inside
window (or mode is fullscreen)". It makes more sense to me that way. (See
http://developer.apple.com/documentation/Cocoa/Conceptual/WinPanel/Concepts/ChangingMainKeyWindow.html
for a discussion of what key and main windows are.) The other two flags are
unchanged: SDL_APPACTIVE = application is not hidden and window is not
minimized, SDL_APPINPUTFOCUS = window is key (or mode is fullscreen).
- As a side effect, the reorganization fixes the following two issues (and
maybe others) (but they could also be fixed in less invasive ways):
* A regression that was introduced in revision 1.42 of SDL_QuartzVideo.m
(http://libsdl.org/cgi/cvsweb.cgi/SDL12/src/video/quartz/SDL_QuartzVideo.m.diff?r1=1.41&r2=1.42)
(from half-desirable to undesirable behavior):
Situation: While in windowed mode, hide the cursor using
SDL_ShowCursor(SDL_DISABLE), move the mouse outside of the window so that the
cursor becomes visible again, and SDL_SetVideoMode() to a fullscreen mode.
What happened before revision 1.42: The cursor is visible, but becomes
invisible as soon as the mouse is moved (half-desirable).
What happens in revision 1.42 and after (including current CVS): The cursor is
visible and stays visible (undesirable).
What happens after my patch: The cursor is invisible from the beginning
(desirable).
* When the cursor is hidden and grabbed, switch away from the application using
cmd-tab (which ungrabs and makes the cursor visible), move the cursor outside
of the SDL window, then cmd-tab back to the application. In 1.2.8 and in the
current CVS, the cursor is re-grabbed, but it stays visible (immovable in the
middle of the window). With my patch, the cursor is correctly re-grabbed and
hidden. (For some reason, it still doesn't work correctly if you switch back to
the application using the dock instead of cmd-tab. I haven't been able to
figure out why. I can step over [NSCursor hide] being called in the debugger,
but it seems to have no effect.)
- The patch includes my patch for #12 (it was easier to obtain using cvs diff
that way). If you apply both of them, you will end up with 6 duplicate lines in
SDL_QuartzEvents.m.
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Thu, 13 Apr 2006 14:17:48 +0000 |
parents | d910939febfa |
children | 14717b52abc0 45669d4efd02 |
rev | line source |
---|---|
0 | 1 /* |
2 SDL - Simple DirectMedia Layer | |
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
3 Copyright (C) 1997-2006 Sam Lantinga |
0 | 4 |
5 This library is free software; you can redistribute it and/or | |
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
6 modify it under the terms of the GNU Lesser General Public |
0 | 7 License as published by the Free Software Foundation; either |
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
8 version 2.1 of the License, or (at your option) any later version. |
0 | 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 | |
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
13 Lesser General Public License for more details. |
0 | 14 |
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
15 You should have received a copy of the GNU Lesser General Public |
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
16 License along with this library; if not, write to the Free Software |
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
0 | 18 |
19 Sam Lantinga | |
252
e8157fcb3114
Updated the source with the correct e-mail address
Sam Lantinga <slouken@libsdl.org>
parents:
105
diff
changeset
|
20 slouken@libsdl.org |
0 | 21 */ |
1402
d910939febfa
Use consistent identifiers for the various platforms we support.
Sam Lantinga <slouken@libsdl.org>
parents:
1361
diff
changeset
|
22 #include "SDL_config.h" |
0 | 23 |
24 #ifndef _SDL_dgavideo_h | |
25 #define _SDL_dgavideo_h | |
26 | |
27 #include <X11/Xlib.h> | |
28 | |
29 #include "SDL_mouse.h" | |
30 #include "SDL_mutex.h" | |
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1312
diff
changeset
|
31 #include "../SDL_sysvideo.h" |
0 | 32 |
33 /* Hidden "this" pointer for the video functions */ | |
34 #define _THIS SDL_VideoDevice *this | |
35 | |
101
825b2fa28e2e
DGA video driver is now thread-safe
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
36 /* Define this if you need the DGA driver to be thread-safe */ |
825b2fa28e2e
DGA video driver is now thread-safe
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
37 #define LOCK_DGA_DISPLAY |
825b2fa28e2e
DGA video driver is now thread-safe
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
38 #ifdef LOCK_DGA_DISPLAY |
825b2fa28e2e
DGA video driver is now thread-safe
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
39 #define LOCK_DISPLAY() SDL_mutexP(event_lock) |
825b2fa28e2e
DGA video driver is now thread-safe
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
40 #define UNLOCK_DISPLAY() SDL_mutexV(event_lock) |
825b2fa28e2e
DGA video driver is now thread-safe
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
41 #else |
825b2fa28e2e
DGA video driver is now thread-safe
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
42 #define LOCK_DISPLAY() |
825b2fa28e2e
DGA video driver is now thread-safe
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
43 #define UNLOCK_DISPLAY() |
825b2fa28e2e
DGA video driver is now thread-safe
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
44 #endif |
825b2fa28e2e
DGA video driver is now thread-safe
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
45 |
0 | 46 |
47 /* This is the structure we use to keep track of video memory */ | |
48 typedef struct vidmem_bucket { | |
49 struct vidmem_bucket *prev; | |
101
825b2fa28e2e
DGA video driver is now thread-safe
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
50 int used; |
825b2fa28e2e
DGA video driver is now thread-safe
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
51 int dirty; |
0 | 52 Uint8 *base; |
53 unsigned int size; | |
54 struct vidmem_bucket *next; | |
55 } vidmem_bucket; | |
56 | |
57 /* Private display data */ | |
58 struct SDL_PrivateVideoData { | |
59 Display *DGA_Display; | |
60 Colormap DGA_colormap; | |
61 int visualClass; | |
62 | |
63 #define NUM_MODELISTS 4 /* 8, 16, 24, and 32 bits-per-pixel */ | |
64 int SDL_nummodes[NUM_MODELISTS]; | |
65 SDL_Rect **SDL_modelist[NUM_MODELISTS]; | |
66 | |
67 /* Information for the video surface */ | |
68 Uint8 *memory_base; | |
69 int memory_pitch; | |
70 SDL_mutex *hw_lock; | |
71 int sync_needed; | |
72 int was_flipped; | |
73 | |
74 /* Information for hardware surfaces */ | |
75 vidmem_bucket surfaces; | |
76 int surfaces_memtotal; | |
77 int surfaces_memleft; | |
78 | |
79 /* Information for double-buffering */ | |
80 int flip_page; | |
81 int flip_yoffset[2]; | |
82 Uint8 *flip_address[2]; | |
83 | |
84 /* Used to handle DGA events */ | |
85 int event_base; | |
101
825b2fa28e2e
DGA video driver is now thread-safe
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
86 #ifdef LOCK_DGA_DISPLAY |
825b2fa28e2e
DGA video driver is now thread-safe
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
87 SDL_mutex *event_lock; |
825b2fa28e2e
DGA video driver is now thread-safe
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
88 #endif |
0 | 89 }; |
90 /* Old variable names */ | |
91 #define DGA_Display (this->hidden->DGA_Display) | |
92 #define DGA_Screen DefaultScreen(DGA_Display) | |
93 #define DGA_colormap (this->hidden->DGA_colormap) | |
94 #define DGA_visualClass (this->hidden->visualClass) | |
95 #define memory_base (this->hidden->memory_base) | |
96 #define memory_pitch (this->hidden->memory_pitch) | |
97 #define flip_page (this->hidden->flip_page) | |
98 #define flip_yoffset (this->hidden->flip_yoffset) | |
99 #define flip_address (this->hidden->flip_address) | |
100 #define sync_needed (this->hidden->sync_needed) | |
101 #define was_flipped (this->hidden->was_flipped) | |
102 #define SDL_nummodes (this->hidden->SDL_nummodes) | |
103 #define SDL_modelist (this->hidden->SDL_modelist) | |
104 #define surfaces (this->hidden->surfaces) | |
105 #define surfaces_memtotal (this->hidden->surfaces_memtotal) | |
106 #define surfaces_memleft (this->hidden->surfaces_memleft) | |
107 #define hw_lock (this->hidden->hw_lock) | |
108 #define DGA_event_base (this->hidden->event_base) | |
101
825b2fa28e2e
DGA video driver is now thread-safe
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
109 #define event_lock (this->hidden->event_lock) |
0 | 110 |
111 #endif /* _SDL_dgavideo_h */ |