Mercurial > sdl-ios-xcode
annotate src/events/SDL_active.c @ 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 | 3692456e7b0f |
| children | c71e05b4dc2e |
| 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 /* Application focus/iconification handling code for SDL */ | |
| 24 | |
| 25 #include "SDL_events.h" | |
|
1330
450721ad5436
It's now possible to build SDL without any C runtime at all on Windows,
Sam Lantinga <slouken@libsdl.org>
parents:
1312
diff
changeset
|
26 #include "SDL_string.h" |
| 0 | 27 #include "SDL_events_c.h" |
| 28 | |
| 29 | |
| 30 /* These are static for our active event handling code */ | |
| 31 static Uint8 SDL_appstate = 0; | |
| 32 | |
| 33 /* Public functions */ | |
| 34 int SDL_AppActiveInit(void) | |
| 35 { | |
| 36 /* Start completely active */ | |
| 37 SDL_appstate = (SDL_APPACTIVE|SDL_APPINPUTFOCUS|SDL_APPMOUSEFOCUS); | |
| 38 | |
| 39 /* That's it! */ | |
| 40 return(0); | |
| 41 } | |
|
1123
28ac87a38c17
Date: Fri, 08 Jul 2005 22:43:48 +0200 (CEST)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
42 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 { |
|
28ac87a38c17
Date: Fri, 08 Jul 2005 22:43:48 +0200 (CEST)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
44 } |
| 0 | 45 |
| 46 Uint8 SDL_GetAppState(void) | |
| 47 { | |
| 48 return(SDL_appstate); | |
| 49 } | |
| 50 | |
| 51 /* This is global for SDL_eventloop.c */ | |
| 52 int SDL_PrivateAppActive(Uint8 gain, Uint8 state) | |
| 53 { | |
| 54 int posted; | |
| 55 Uint8 new_state; | |
| 56 | |
| 57 /* Modify the current state with the given mask */ | |
| 58 if ( gain ) { | |
| 59 new_state = (SDL_appstate | state); | |
| 60 } else { | |
| 61 new_state = (SDL_appstate & ~state); | |
| 62 } | |
| 63 | |
| 64 /* Drop events that don't change state */ | |
| 65 if ( new_state == SDL_appstate ) { | |
| 66 return(0); | |
| 67 } | |
| 68 | |
| 69 /* Update internal active state */ | |
| 70 SDL_appstate = new_state; | |
| 71 | |
| 72 /* Post the event, if desired */ | |
| 73 posted = 0; | |
| 74 if ( SDL_ProcessEvents[SDL_ACTIVEEVENT] == SDL_ENABLE ) { | |
| 75 SDL_Event event; | |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1330
diff
changeset
|
76 SDL_memset(&event, 0, sizeof(event)); |
| 0 | 77 event.type = SDL_ACTIVEEVENT; |
| 78 event.active.gain = gain; | |
| 79 event.active.state = state; | |
| 80 if ( (SDL_EventOK == NULL) || (*SDL_EventOK)(&event) ) { | |
| 81 posted = 1; | |
| 82 SDL_PushEvent(&event); | |
| 83 } | |
| 84 } | |
| 85 | |
| 86 /* If we lost keyboard focus, post key-up events */ | |
| 87 if ( (state & SDL_APPINPUTFOCUS) && !gain ) { | |
| 88 SDL_ResetKeyboard(); | |
| 89 } | |
| 90 return(posted); | |
| 91 } |