Mercurial > sdl-ios-xcode
annotate src/events/SDL_events_c.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 | d910939febfa |
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:
1123
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:
1123
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:
1123
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:
1123
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:
1123
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:
1123
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:
1123
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:
0
diff
changeset
|
20 slouken@libsdl.org |
0 | 21 */ |
22 | |
23 /* Useful functions and variables from SDL_events.c */ | |
24 #include "SDL_events.h" | |
25 | |
26 /* Start and stop the event processing loop */ | |
27 extern int SDL_StartEventLoop(Uint32 flags); | |
28 extern void SDL_StopEventLoop(void); | |
29 extern void SDL_QuitInterrupt(void); | |
30 | |
31 extern void SDL_Lock_EventThread(); | |
32 extern void SDL_Unlock_EventThread(); | |
33 extern Uint32 SDL_EventThreadID(void); | |
34 | |
35 /* Event handler init routines */ | |
36 extern int SDL_AppActiveInit(void); | |
37 extern int SDL_KeyboardInit(void); | |
38 extern int SDL_MouseInit(void); | |
39 extern int SDL_QuitInit(void); | |
40 | |
1123
28ac87a38c17
Date: Fri, 08 Jul 2005 22:43:48 +0200 (CEST)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
41 /* Event handler quit routines */ |
28ac87a38c17
Date: Fri, 08 Jul 2005 22:43:48 +0200 (CEST)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
42 extern void SDL_AppActiveQuit(void); |
28ac87a38c17
Date: Fri, 08 Jul 2005 22:43:48 +0200 (CEST)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
43 extern void SDL_KeyboardQuit(void); |
28ac87a38c17
Date: Fri, 08 Jul 2005 22:43:48 +0200 (CEST)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
44 extern void SDL_MouseQuit(void); |
28ac87a38c17
Date: Fri, 08 Jul 2005 22:43:48 +0200 (CEST)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
45 extern void SDL_QuitQuit(void); |
28ac87a38c17
Date: Fri, 08 Jul 2005 22:43:48 +0200 (CEST)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
46 |
0 | 47 /* The event filter function */ |
48 extern SDL_EventFilter SDL_EventOK; | |
49 | |
50 /* The array of event processing states */ | |
51 extern Uint8 SDL_ProcessEvents[SDL_NUMEVENTS]; | |
52 | |
53 /* Internal event queueing functions | |
54 (from SDL_active.c, SDL_mouse.c, SDL_keyboard.c, SDL_quit.c, SDL_events.c) | |
55 */ | |
56 extern int SDL_PrivateAppActive(Uint8 gain, Uint8 state); | |
57 extern int SDL_PrivateMouseMotion(Uint8 buttonstate, int relative, | |
58 Sint16 x, Sint16 y); | |
59 extern int SDL_PrivateMouseButton(Uint8 state, Uint8 button,Sint16 x,Sint16 y); | |
60 extern int SDL_PrivateKeyboard(Uint8 state, SDL_keysym *key); | |
61 extern int SDL_PrivateResize(int w, int h); | |
62 extern int SDL_PrivateExpose(void); | |
63 extern int SDL_PrivateQuit(void); | |
64 extern int SDL_PrivateSysWMEvent(SDL_SysWMmsg *message); | |
65 | |
66 /* Used by the activity event handler to remove mouse focus */ | |
460
a888b3ae31ff
Reset mouse state when changing video modes
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
67 extern void SDL_ResetMouse(void); |
0 | 68 |
69 /* Used by the activity event handler to remove keyboard focus */ | |
70 extern void SDL_ResetKeyboard(void); | |
71 | |
72 /* Used by the event loop to queue pending keyboard repeat events */ | |
73 extern void SDL_CheckKeyRepeat(void); | |
74 | |
75 /* Used by the OS keyboard code to detect whether or not to do UNICODE */ | |
76 #ifndef DEFAULT_UNICODE_TRANSLATION | |
77 #define DEFAULT_UNICODE_TRANSLATION 0 /* Default off because of overhead */ | |
78 #endif | |
79 extern int SDL_TranslateUNICODE; |