Mercurial > sdl-ios-xcode
view src/video/os2fslib/SDL_os2fslib.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 | 173c063d4f55 |
children | d910939febfa |
line wrap: on
line source
/* SDL - Simple DirectMedia Layer Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Sam Lantinga slouken@libsdl.org */ #ifndef _SDL_os2fslib_h #define _SDL_os2fslib_h // OS2 specific includes #define INCL_TYPES #define INCL_DOS #define INCL_DOSERRORS #define INCL_DOSPROCESS #define INCL_WIN #define INCL_GPI #include <os2.h> #include <FSLib.h> /* Hidden "this" pointer for the video functions */ #define _THIS SDL_VideoDevice *_this /* Private display data */ struct SDL_PrivateVideoData { FSLib_VideoMode_p pAvailableFSLibVideoModes; SDL_Rect **pListModesResult; // Allocated memory to return list of modes for os2fslib_ListModes() API FSLib_VideoMode SrcBufferDesc; // Description of current source image buffer char *pchSrcBuffer; // The source image buffer itself SDL_Surface *pSDLSurface; // The SDL surface describing the buffer HMTX hmtxUseSrcBuffer; // Mutex semaphore to manipulate src buffer HWND hwndFrame, hwndClient; // Window handle of frame and client int iPMThreadStatus; // 0: Not running // 1: Running // Other: Not running, had an error int tidPMThread; // Thread ID of PM Thread int fInFocus; // True if we're in focus! int iSkipWMMOUSEMOVE; // Number of WM_MOUSEMOVE messages to skip! int iMouseVisible; // }; extern DECLSPEC void SDLCALL SDL_OS2FSLIB_SetFCFToUse(ULONG ulFCF); #endif /* _SDL_os2fslib_h */