Mercurial > sdl-ios-xcode
view src/main/epoc/SDL_main.cpp @ 1348:40d0975c1769
Date: Mon, 6 Feb 2006 11:41:04 -0500
From: "mystml@adinet.com.uy"
Subject: [SDL] ALT-F4 using DirectX
My game isn't getting SDL_QUIT when I press ALT-F4 using the DirectX
driver; it does get SDL_QUIT when I press the red X in the window.
I tracked this down to DX5_HandleMessage() in SDL_dx5events.c;
WM_SYSKEYDOWN is being trapped and ignored which causes Windows not to post
a WM_CLOSE, hence no SDL_QUIT is being generated.
The relevant code is this :
/* The keyboard is handled via DirectInput */
case WM_SYSKEYUP:
case WM_SYSKEYDOWN:
case WM_KEYUP:
case WM_KEYDOWN: {
/* Ignore windows keyboard messages */;
}
return(0);
If I comment the WM_SYSKEYDOWN case, it falls through DefWindowProc() and
ALT-F4 starts working again.
I'm not sure about the best way to fix this. One option is handling ALT-F4
as a particular case somehow, but doesn't sound good. Another option would
be to handle WM_SYSKEYDOWN separately and breaking instead of returning 0,
so processing falls through and goes to DefWindowProc which does The Right
Thing (TM). This seems to be the minimal change that makes ALT-F4 work and
normal keyboard input continues to work.
Does this sound reasonable? Am I overlooking anything? Do I submit a patch?
--Gabriel
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Wed, 08 Feb 2006 17:19:43 +0000 |
parents | f6ffac90895c |
children |
line wrap: on
line source
/* SDL - Simple DirectMedia Layer Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 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 */ /* SDL_main.cpp The Epoc executable startup functions Epoc version by Hannu Viitala (hannu.j.viitala@mbnet.fi) */ #include <e32std.h> #include <e32def.h> #include <e32svr.h> #include <e32base.h> #include <estlib.h> #include <stdlib.h> #include <stdio.h> #include <w32std.h> #include <apgtask.h> #include "SDL_error.h" #ifndef EXPORT_C # ifdef __VC32__ # define IMPORT_C __declspec(dllexport) # define EXPORT_C __declspec(dllexport) # endif # ifdef __GCC32__ # define IMPORT_C # define EXPORT_C __declspec(dllexport) # endif #endif #if defined(__WINS__) #include <estw32.h> IMPORT_C void RegisterWsExe(const TDesC &aName); #endif /* The prototype for the application's main() function */ #define main SDL_main extern "C" int main (int argc, char *argv[], char *envp[]); extern "C" void exit (int ret); /* Epoc main function */ GLDEF_C TInt E32Main() { /* Get the clean-up stack */ CTrapCleanup* cleanup = CTrapCleanup::New(); #if defined(__WINS__) /* arrange for access to Win32 stdin/stdout/stderr */ RWin32Stream::StartServer(); #endif /* Arrange for multi-threaded operation */ SpawnPosixServerThread(); /* Get args and environment */ int argc=0; char** argv=0; char** envp=0; __crt0(argc,argv,envp); #if defined(__WINS__) /* Cause the graphical Window Server to come into existence */ RSemaphore sem; sem.CreateGlobal(_L("WsExeSem"),0); RegisterWsExe(sem.FullName()); #endif /* Start the application! */ /* Create stdlib */ _REENT; /* Set process and thread priority */ RThread currentThread; currentThread.Rename(_L("SdlProgram")); currentThread.SetProcessPriority(EPriorityLow); currentThread.SetPriority(EPriorityMuchLess); /* Call stdlib main */ int ret = main(argc, argv, envp); /* !! process exits here if there is "exit()" in main! */ /* Call exit */ exit(ret); /* !! process exits here! */ /* Free resources and return */ CloseSTDLIB(); delete cleanup; return(KErrNone); } /* Epoc dll entry point */ #if defined(__WINS__) GLDEF_C TInt E32Dll(TDllReason) { return(KErrNone); } EXPORT_C TInt WinsMain(TAny *) { E32Main(); return KErrNone; } #endif