Mercurial > sdl-ios-xcode
view src/video/epoc/SDL_epocvideo.h @ 3877:81f66f258d77 SDL-1.2
Fixed bug #281
------- Comment #2 From Christian Walther 2006-07-23 07:37 [reply] -------
Wow, that was an interesting bug to chase. It was a timing issue: it seems that
for some reason, a certain time must pass between ShowMenuBar() being called in
QZ_UnsetVideoMode() and the application quitting. Before rev. 1885, this delay
was provided by the slow hand-coded fade. With the asynchronous Core Graphics
fading introduced in rev. 1885, that delay was no longer present (most of the
time) and the bug became apparent. Adding an SDL_Delay(100) somewhere between
ShowMenuBar() and the end of QZ_VideoQuit() lowered the frequency of the bug
appearing from "almost every time" to "very rarely" here.
However, there is another solution: doing the ShowMenuBar() before releasing
the captured display instead of afterwards. Apparently, no delay is necessary
in that case, and it looks nicer to me anyway because it is the reverse order
of the way things are set up in the beginning: capture display - set video mode
- hide menu bar - ... - show menu bar - reset video mode - release captured
display. So, this is what the attached patch does.
In addition, I've taken the liberty of
- removing some unused code that I forgot to remove in rev. 1885,
- fixing two warnings about undeclared functions in SDL_QuartzVideo.m by
including OpenGL.h (whose name is a bit misleading - it only declares CGL
stuff, so there's no interference with SDL_opengl.h).
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Sun, 24 Sep 2006 01:27:40 +0000 |
| parents | d910939febfa |
| children | 782fd950bd46 c121d94672cb |
line wrap: on
line source
/* SDL - Simple DirectMedia Layer Copyright (C) 1997-2004 Sam Lantinga This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Sam Lantinga slouken@libsdl.org */ #include "SDL_config.h" /* SDL_epocvideo.h Epoc based SDL video driver implementation Epoc version by Hannu Viitala (hannu.j.viitala@mbnet.fi) */ #ifndef _SDL_epocvideo_h #define _SDL_epocvideo_h extern "C" { #include "SDL_mouse.h" #include "../SDL_sysvideo.h" }; #include <e32std.h> #include <bitdev.h> #include <w32std.h> /* Hidden "this" pointer for the video functions */ #define _THIS SDL_VideoDevice *_this #define Private _this->hidden #define SDL_NUMMODES 4 /* Private display data */ struct SDL_PrivateVideoData { SDL_Rect *SDL_modelist[SDL_NUMMODES+1]; /* Epoc window server info */ RWsSession EPOC_WsSession; RWindowGroup EPOC_WsWindowGroup; TInt EPOC_WsWindowGroupID; RWindow EPOC_WsWindow; CWsScreenDevice* EPOC_WsScreen; CWindowGc* EPOC_WindowGc; TRequestStatus EPOC_WsEventStatus; TRequestStatus EPOC_RedrawEventStatus; TWsEvent EPOC_WsEvent; TWsRedrawEvent EPOC_RedrawEvent; #ifdef __WINS__ CWsBitmap* EPOC_Bitmap; #endif TBool EPOC_IsWindowFocused; //!!Not used for anything yet! /* Screen hardware frame buffer info */ TBool EPOC_HasFrameBuffer; TInt EPOC_BytesPerPixel; TInt EPOC_BytesPerScanLine; TDisplayMode EPOC_DisplayMode; TSize EPOC_ScreenSize; TUint8* EPOC_FrameBuffer; /* if NULL in HW we can't do direct screen access */ TInt EPOC_ScreenOffset; /* Simulate double screen height */ TBool EPOC_ShrinkedHeight; }; extern "C" { extern void RedrawWindowL(_THIS); }; #endif /* _SDL_epocvideo_h */