Mercurial > sdl-ios-xcode
annotate test/testerror.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 | be9c9c8f6d53 |
| children | 14717b52abc0 |
| rev | line source |
|---|---|
| 0 | 1 |
| 2 /* Simple test of the SDL threading code and error handling */ | |
| 3 | |
| 4 #include <stdio.h> | |
| 5 #include <stdlib.h> | |
| 6 #include <signal.h> | |
| 7 | |
| 8 #include "SDL.h" | |
| 9 #include "SDL_thread.h" | |
| 10 | |
| 11 static int alive = 0; | |
| 12 | |
|
1151
be9c9c8f6d53
Removed atexit() from most of the test programs; atexit(SDL_Quit) isn't safe
Ryan C. Gordon <icculus@icculus.org>
parents:
0
diff
changeset
|
13 /* Call this instead of exit(), so we can clean up SDL: atexit() is evil. */ |
|
be9c9c8f6d53
Removed atexit() from most of the test programs; atexit(SDL_Quit) isn't safe
Ryan C. Gordon <icculus@icculus.org>
parents:
0
diff
changeset
|
14 static void quit(int rc) |
|
be9c9c8f6d53
Removed atexit() from most of the test programs; atexit(SDL_Quit) isn't safe
Ryan C. Gordon <icculus@icculus.org>
parents:
0
diff
changeset
|
15 { |
|
be9c9c8f6d53
Removed atexit() from most of the test programs; atexit(SDL_Quit) isn't safe
Ryan C. Gordon <icculus@icculus.org>
parents:
0
diff
changeset
|
16 SDL_Quit(); |
|
be9c9c8f6d53
Removed atexit() from most of the test programs; atexit(SDL_Quit) isn't safe
Ryan C. Gordon <icculus@icculus.org>
parents:
0
diff
changeset
|
17 exit(rc); |
|
be9c9c8f6d53
Removed atexit() from most of the test programs; atexit(SDL_Quit) isn't safe
Ryan C. Gordon <icculus@icculus.org>
parents:
0
diff
changeset
|
18 } |
|
be9c9c8f6d53
Removed atexit() from most of the test programs; atexit(SDL_Quit) isn't safe
Ryan C. Gordon <icculus@icculus.org>
parents:
0
diff
changeset
|
19 |
| 0 | 20 int ThreadFunc(void *data) |
| 21 { | |
| 22 /* Set the child thread error string */ | |
| 23 SDL_SetError("Thread %s (%d) had a problem: %s", | |
| 24 (char *)data, SDL_ThreadID(), "nevermind"); | |
| 25 while ( alive ) { | |
| 26 printf("Thread '%s' is alive!\n", (char *)data); | |
| 27 SDL_Delay(1*1000); | |
| 28 } | |
| 29 printf("Child thread error string: %s\n", SDL_GetError()); | |
| 30 return(0); | |
| 31 } | |
| 32 | |
| 33 int main(int argc, char *argv[]) | |
| 34 { | |
| 35 SDL_Thread *thread; | |
| 36 | |
| 37 /* Load the SDL library */ | |
| 38 if ( SDL_Init(0) < 0 ) { | |
| 39 fprintf(stderr, "Couldn't initialize SDL: %s\n",SDL_GetError()); | |
|
1151
be9c9c8f6d53
Removed atexit() from most of the test programs; atexit(SDL_Quit) isn't safe
Ryan C. Gordon <icculus@icculus.org>
parents:
0
diff
changeset
|
40 return(1); |
| 0 | 41 } |
| 42 | |
| 43 /* Set the error value for the main thread */ | |
| 44 SDL_SetError("No worries"); | |
| 45 | |
| 46 alive = 1; | |
| 47 thread = SDL_CreateThread(ThreadFunc, "#1"); | |
| 48 if ( thread == NULL ) { | |
| 49 fprintf(stderr, "Couldn't create thread: %s\n", SDL_GetError()); | |
|
1151
be9c9c8f6d53
Removed atexit() from most of the test programs; atexit(SDL_Quit) isn't safe
Ryan C. Gordon <icculus@icculus.org>
parents:
0
diff
changeset
|
50 quit(1); |
| 0 | 51 } |
| 52 SDL_Delay(5*1000); | |
| 53 printf("Waiting for thread #1\n"); | |
| 54 alive = 0; | |
| 55 SDL_WaitThread(thread, NULL); | |
| 56 | |
| 57 printf("Main thread error string: %s\n", SDL_GetError()); | |
| 58 | |
|
1151
be9c9c8f6d53
Removed atexit() from most of the test programs; atexit(SDL_Quit) isn't safe
Ryan C. Gordon <icculus@icculus.org>
parents:
0
diff
changeset
|
59 SDL_Quit(); |
| 0 | 60 return(0); |
| 61 } |