more properly handling new haa semantics

[drnoksnes] / platform / sdlv.cpp

diff --git a/platform/sdlv.cpp b/platform/sdlv.cpp
index 180b795..9896494 100644 (file)
--- a/platform/sdlv.cpp
+++ b/platform/sdlv.cpp
@@ -28,6 +28,9 @@ static bool gotWindowSize, gotScreenSize;
 /** The current scaler object */
 Scaler* scaler;
 
+/** Use the current window size to calculate screen size.
+       Useful on "single window" platforms, like Hildon.
+ */
 static void calculateScreenSize()
 {
        SDL_SysWMinfo wminfo;
@@ -57,8 +60,10 @@ static void calculateScreenSize()
        }
 }
 
+/** Sets the main window title */
 void S9xSetTitle(const char *title)
 {
+       // This is a Maemo specific hack, but works on most platforms.
        SDL_SysWMinfo info;
        SDL_VERSION(&info.version);
        if ( SDL_GetWMInfo(&info) ) {
@@ -92,9 +97,13 @@ static void setupVideoSurface()
        const unsigned gameHeight = IMAGE_HEIGHT;
 
 #ifdef MAEMO
+       // Under Maemo we know that the window manager will automatically
+       // resize our windows to fullscreen.
+       // Thus we can use that to detect the screen size.
+       // Of course, this causes flicker, so we try to avoid it when
+       // changing between modes.
        if ((Config.fullscreen && !gotScreenSize) ||
                (!Config.fullscreen && !gotWindowSize)) {
-               // Do a first try, in order to get window/screen size
                screen = SDL_SetVideoMode(gameWidth, gameHeight, 16,
                        SDL_SWSURFACE | SDL_RESIZABLE |
                        (Config.fullscreen ? SDL_FULLSCREEN : 0));
@@ -134,19 +143,20 @@ static void setupVideoSurface()
 
        scaler = sFactory->instantiate(screen, gameWidth, gameHeight);
 
-       // We get pitch surface values from SDL
-       GFX.RealPitch = GFX.Pitch = scaler->getDrawBufferPitch();
-       GFX.ZPitch = GFX.Pitch / 2; // gfx & tile.cpp depend on this, unfortunately.
-       GFX.PixSize = screen->format->BitsPerPixel / 8;
-       
+       // Each scaler may have its own pitch
+       GFX.Pitch = scaler->getDrawBufferPitch();
+       GFX.ZPitch = GFX.Pitch / 2;
+       // gfx & tile.cpp depend on the zbuffer pitch being always half of the color buffer pitch.
+       // Which is a pity, since the color buffer might be much larger.
+
        GFX.Screen = scaler->getDrawBuffer();
        GFX.SubScreen = (uint8 *) malloc(GFX.Pitch * IMAGE_HEIGHT);
        GFX.ZBuffer =  (uint8 *) malloc(GFX.ZPitch * IMAGE_HEIGHT);
        GFX.SubZBuffer = (uint8 *) malloc(GFX.ZPitch * IMAGE_HEIGHT);
 
        GFX.Delta = (GFX.SubScreen - GFX.Screen) >> 1;
-       GFX.PPL = GFX.Pitch >> 1;
-       GFX.PPLx2 = GFX.Pitch;
+       GFX.DepthDelta = GFX.SubZBuffer - GFX.ZBuffer;
+       GFX.PPL = GFX.Pitch / (screen->format->BitsPerPixel / 8);
 
        scaler->getRenderedGUIArea(GUI.RenderX, GUI.RenderY, GUI.RenderW, GUI.RenderH);
        scaler->getRatio(GUI.ScaleX, GUI.ScaleY);
@@ -174,7 +184,7 @@ static void drawOnscreenControls()
        }
 }
 
-void S9xInitDisplay(int argc, const char ** argv)
+void S9xInitDisplay(int argc, char ** argv)
 {      
        if (SDL_InitSubSystem(SDL_INIT_VIDEO) < 0) 
                DIE("SDL_InitSubSystem(VIDEO): %s", SDL_GetError());
@@ -197,13 +207,26 @@ void S9xVideoToggleFullscreen()
        drawOnscreenControls();
 }
 
-void processVideoEvent(const SDL_Event& event)
+bool videoEventFilter(const SDL_Event& event)
 {
+       // If we're in power save mode, and this is a defocus event, quit.
+       if (Config.saver) {
+               if (event.type == SDL_ACTIVEEVENT &&
+                  (event.active.state & SDL_APPINPUTFOCUS) &&
+                  !event.active.gain) {
+                       S9xDoAction(kActionQuit);
+                       return true;
+               }
+       }
+
+       // Forward video event to the active scaler, if any.
        if (scaler)
-               scaler->filter(event);
+               return scaler->filter(event);
+       else
+               return false;
 }
 
-// This is here for completeness, but palette mode is useless on N8x0
+// This is here for completeness, but palette mode is mostly useless (slow).
 void S9xSetPalette ()
 {
        if (Settings.SixteenBit) return;
@@ -220,6 +243,11 @@ void S9xSetPalette ()
        SDL_SetColors(screen, colors, 0, 256);
 }
 
+/** Called before rendering a frame.
+       This function must ensure GFX.Screen points to something, but we did that
+       while initializing video output.
+       @return TRUE if we should render the frame.
+ */
 bool8_32 S9xInitUpdate ()
 {
        scaler->prepare();
@@ -227,6 +255,18 @@ bool8_32 S9xInitUpdate ()
        return TRUE;
 }
 
+/** Called once a complete SNES screen has been rendered into the GFX.Screen
+       memory buffer.
+
+       Now is your chance to copy the SNES rendered screen to the
+       host computer's screen memory. The problem is that you have to cope with
+       different sized SNES rendered screens. Width is always 256, unless you're
+       supporting SNES hi-res. screen modes (Settings.SupportHiRes is TRUE), in
+       which case it can be 256 or 512. The height parameter can be either 224 or
+       239 if you're only supporting SNES lo-res. screen modes, or 224, 239, 448 or
+       478 if hi-res. SNES screen modes are being supported.
+ */
+// TODO Above.
 bool8_32 S9xDeinitUpdate (int width, int height, bool8_32 sixteenBit)
 {
        scaler->finish();