Date: Mon, 6 Feb 2006 11:41:04 -0500
authorSam Lantinga <slouken@libsdl.org>
Wed, 08 Feb 2006 17:19:43 +0000
changeset 134840d0975c1769
parent 1347 905dc98a40fa
child 1349 3f395c825b14
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
src/video/windx5/SDL_dx5events.c
     1.1 --- a/src/video/windx5/SDL_dx5events.c	Wed Feb 08 09:06:34 2006 +0000
     1.2 +++ b/src/video/windx5/SDL_dx5events.c	Wed Feb 08 17:19:43 2006 +0000
     1.3 @@ -518,7 +518,10 @@
     1.4  
     1.5  		/* The keyboard is handled via DirectInput */
     1.6  		case WM_SYSKEYUP:
     1.7 -		case WM_SYSKEYDOWN:
     1.8 +		case WM_SYSKEYDOWN: {
     1.9 +			/* Pass syskey to DefWindwoProc (ALT-F4, etc.) */
    1.10 +		}
    1.11 +		break;
    1.12  		case WM_KEYUP:
    1.13  		case WM_KEYDOWN: {
    1.14  			/* Ignore windows keyboard messages */;