Mercurial > sdl-ios-xcode
annotate include/SDL_main.h @ 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 | c9b51268668f |
children | 67114343400d |
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:
1145
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:
1145
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:
1145
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:
1145
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:
1145
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:
1145
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:
1145
diff
changeset
|
17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
0 | 18 |
19 Sam Lantinga | |
251
b8688cfdc232
Updated the headers with the correct e-mail address
Sam Lantinga <slouken@libsdl.org>
parents:
173
diff
changeset
|
20 slouken@libsdl.org |
0 | 21 */ |
22 | |
23 #ifndef _SDL_main_h | |
24 #define _SDL_main_h | |
25 | |
26 /* Redefine main() on Win32 and MacOS so that it is called by winmain.c */ | |
27 | |
453
a6fa62b1be09
Updated for embedded Visual C++ 4.0
Sam Lantinga <slouken@libsdl.org>
parents:
371
diff
changeset
|
28 #if defined(WIN32) || defined(_WIN32) || \ |
a6fa62b1be09
Updated for embedded Visual C++ 4.0
Sam Lantinga <slouken@libsdl.org>
parents:
371
diff
changeset
|
29 (defined(__MWERKS__) && !defined(__BEOS__)) || \ |
a6fa62b1be09
Updated for embedded Visual C++ 4.0
Sam Lantinga <slouken@libsdl.org>
parents:
371
diff
changeset
|
30 defined(macintosh) || defined(__APPLE__) || \ |
a6fa62b1be09
Updated for embedded Visual C++ 4.0
Sam Lantinga <slouken@libsdl.org>
parents:
371
diff
changeset
|
31 defined(__SYMBIAN32__) || defined(QWS) |
0 | 32 |
33 #ifdef __cplusplus | |
34 #define C_LINKAGE "C" | |
35 #else | |
36 #define C_LINKAGE | |
37 #endif /* __cplusplus */ | |
38 | |
39 /* The application's main() function must be called with C linkage, | |
40 and should be declared like this: | |
41 #ifdef __cplusplus | |
42 extern "C" | |
43 #endif | |
44 int main(int argc, char *argv[]) | |
45 { | |
46 } | |
47 */ | |
48 #define main SDL_main | |
49 | |
50 /* The prototype for the application's main() function */ | |
51 extern C_LINKAGE int SDL_main(int argc, char *argv[]); | |
52 | |
53 | |
54 /* From the SDL library code -- needed for registering the app on Win32 */ | |
55 #if defined(WIN32) | |
56 #include "SDL_types.h" | |
57 #include "begin_code.h" | |
58 | |
59 #ifdef __cplusplus | |
60 extern "C" { | |
61 #endif | |
62 | |
63 /* This should be called from your WinMain() function, if any */ | |
337
9154ec9ca3d2
Explicitly specify the SDL API calling convention (C by default)
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
64 extern DECLSPEC void SDLCALL SDL_SetModuleHandle(void *hInst); |
145
29a638dc26db
Applied David MacCormack's patch to fix SDL_WINDOWID on Windows,
Sam Lantinga <slouken@libsdl.org>
parents:
47
diff
changeset
|
65 /* This can also be called, but is no longer necessary */ |
337
9154ec9ca3d2
Explicitly specify the SDL API calling convention (C by default)
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
66 extern DECLSPEC int SDLCALL SDL_RegisterApp(char *name, Uint32 style, void *hInst); |
1145
d31afac94eff
Patch from Martin Lange (mala-sdl at hotmail.com) to unregister SDL's win32
Ryan C. Gordon <icculus@icculus.org>
parents:
769
diff
changeset
|
67 /* This can also be called, but is no longer necessary (SDL_Quit calls it) */ |
d31afac94eff
Patch from Martin Lange (mala-sdl at hotmail.com) to unregister SDL's win32
Ryan C. Gordon <icculus@icculus.org>
parents:
769
diff
changeset
|
68 extern DECLSPEC void SDLCALL SDL_UnregisterApp(); |
0 | 69 #ifdef __cplusplus |
70 } | |
71 #endif | |
72 #include "close_code.h" | |
73 #endif | |
74 | |
75 /* From the SDL library code -- needed for registering QuickDraw on MacOS */ | |
76 #if defined(macintosh) | |
77 #include "begin_code.h" | |
78 | |
79 #ifdef __cplusplus | |
80 extern "C" { | |
81 #endif | |
82 | |
83 /* Forward declaration so we don't need to include QuickDraw.h */ | |
84 struct QDGlobals; | |
85 | |
86 /* This should be called from your main() function, if any */ | |
337
9154ec9ca3d2
Explicitly specify the SDL API calling convention (C by default)
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
87 extern DECLSPEC void SDLCALL SDL_InitQuickDraw(struct QDGlobals *the_qd); |
0 | 88 |
89 #ifdef __cplusplus | |
90 } | |
91 #endif | |
92 #include "close_code.h" | |
93 #endif | |
94 | |
95 #endif /* Need to redefine main()? */ | |
96 | |
97 #endif /* _SDL_main_h */ |