# HG changeset patch
# User Sam Lantinga <slouken@libsdl.org>
# Date 1139419183 0
# Node ID 40d0975c1769105e98b4cf1e27eef5e0b94e49b8
# Parent  905dc98a40fab4a6a85128006ddf0ace826c7a0c
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

diff -r 905dc98a40fa -r 40d0975c1769 src/video/windx5/SDL_dx5events.c
--- a/src/video/windx5/SDL_dx5events.c	Wed Feb 08 09:06:34 2006 +0000
+++ b/src/video/windx5/SDL_dx5events.c	Wed Feb 08 17:19:43 2006 +0000
@@ -518,7 +518,10 @@
 
 		/* The keyboard is handled via DirectInput */
 		case WM_SYSKEYUP:
-		case WM_SYSKEYDOWN:
+		case WM_SYSKEYDOWN: {
+			/* Pass syskey to DefWindwoProc (ALT-F4, etc.) */
+		}
+		break;
 		case WM_KEYUP:
 		case WM_KEYDOWN: {
 			/* Ignore windows keyboard messages */;