Mercurial > sdl-ios-xcode
view src/timer/mint/SDL_vbltimer.S @ 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 | c9b51268668f |
| children | eb5e61b72da3 |
line wrap: on
line source
/* SDL - Simple DirectMedia Layer Copyright (C) 1997-2006 Sam Lantinga This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org */ /* * VBL queue routine * * Patrice Mandin */ #define _vbl_queue 0x456 .text .globl _SDL_AtariVblInstall .globl _SDL_AtariVblUninstall /*--- Vector installer ---*/ _SDL_AtariVblInstall: movel sp@(4),my_vector lea _my_vbl,a0 clrw vbl_mutex /* Stop interrupts */ movew #0x2700,sr /* Read vbl_queue pointer */ movel _vbl_queue.w,a1 /* Search a free place */ moveq #7,d0 bcl_search_place: movel (a1),d1 beqs place_found addql #4,a1 dbra d0,bcl_search_place /* Not found */ moveq #1,d0 bras exit_vbl_queue /* Then install ourselves */ place_found: movel a0,(a1) moveq #0,d0 exit_vbl_queue: /* Restart interrupts */ movew #0x2300,sr rts /*--- Vector uninstaller ---*/ _SDL_AtariVblUninstall: movel sp@(4),d0 cmpl my_vector,d0 bnes badvector movel #_my_vbl,d0 /* Stop interrupts */ movew #0x2700,sr /* Read vbl_queue pointer */ movel _vbl_queue.w,a1 /* Search where we are */ moveq #7,d1 bcl2_search_place: cmpl (a1),d0 bnes next_place clrl (a1) moveq #0,d1 next_place: addql #4,a1 dbra d1,bcl2_search_place /* Restart interrupts */ movew #0x2300,sr badvector: rts /*--- Our vbl ---*/ _my_vbl: /* Verify if this is not already running */ tstw vbl_mutex bnes vbl_end notw vbl_mutex moveml d0-d7/a0-a6,sp@- movel my_vector,a0 jsr a0@ moveml sp@+,d0-d7/a0-a6 clrw vbl_mutex vbl_end: rts .data .even .comm vbl_mutex,2*1 .even .comm my_vector,4*1