Mercurial > sdl-ios-xcode
view src/video/dga/SDL_dgavideo.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 | c9b51268668f |
| children | 19418e4422cb |
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 */ #ifndef _SDL_dgavideo_h #define _SDL_dgavideo_h #include <X11/Xlib.h> #include "SDL_mouse.h" #include "SDL_mutex.h" #include "SDL_sysvideo.h" /* Hidden "this" pointer for the video functions */ #define _THIS SDL_VideoDevice *this /* Define this if you need the DGA driver to be thread-safe */ #define LOCK_DGA_DISPLAY #ifdef LOCK_DGA_DISPLAY #define LOCK_DISPLAY() SDL_mutexP(event_lock) #define UNLOCK_DISPLAY() SDL_mutexV(event_lock) #else #define LOCK_DISPLAY() #define UNLOCK_DISPLAY() #endif /* This is the structure we use to keep track of video memory */ typedef struct vidmem_bucket { struct vidmem_bucket *prev; int used; int dirty; Uint8 *base; unsigned int size; struct vidmem_bucket *next; } vidmem_bucket; /* Private display data */ struct SDL_PrivateVideoData { Display *DGA_Display; Colormap DGA_colormap; int visualClass; #define NUM_MODELISTS 4 /* 8, 16, 24, and 32 bits-per-pixel */ int SDL_nummodes[NUM_MODELISTS]; SDL_Rect **SDL_modelist[NUM_MODELISTS]; /* Information for the video surface */ Uint8 *memory_base; int memory_pitch; SDL_mutex *hw_lock; int sync_needed; int was_flipped; /* Information for hardware surfaces */ vidmem_bucket surfaces; int surfaces_memtotal; int surfaces_memleft; /* Information for double-buffering */ int flip_page; int flip_yoffset[2]; Uint8 *flip_address[2]; /* Used to handle DGA events */ int event_base; #ifdef LOCK_DGA_DISPLAY SDL_mutex *event_lock; #endif }; /* Old variable names */ #define DGA_Display (this->hidden->DGA_Display) #define DGA_Screen DefaultScreen(DGA_Display) #define DGA_colormap (this->hidden->DGA_colormap) #define DGA_visualClass (this->hidden->visualClass) #define memory_base (this->hidden->memory_base) #define memory_pitch (this->hidden->memory_pitch) #define flip_page (this->hidden->flip_page) #define flip_yoffset (this->hidden->flip_yoffset) #define flip_address (this->hidden->flip_address) #define sync_needed (this->hidden->sync_needed) #define was_flipped (this->hidden->was_flipped) #define SDL_nummodes (this->hidden->SDL_nummodes) #define SDL_modelist (this->hidden->SDL_modelist) #define surfaces (this->hidden->surfaces) #define surfaces_memtotal (this->hidden->surfaces_memtotal) #define surfaces_memleft (this->hidden->surfaces_memleft) #define hw_lock (this->hidden->hw_lock) #define DGA_event_base (this->hidden->event_base) #define event_lock (this->hidden->event_lock) #endif /* _SDL_dgavideo_h */