Mercurial > sdl-ios-xcode
annotate src/thread/win32/SDL_sysmutex.c @ 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 | 604d73db6802 |
| children | c71e05b4dc2e |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 2 SDL - Simple DirectMedia Layer | |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
3 Copyright (C) 1997-2006 Sam Lantinga |
| 0 | 4 |
| 5 This library is free software; you can redistribute it and/or | |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
6 modify it under the terms of the GNU Lesser General Public |
| 0 | 7 License as published by the Free Software Foundation; either |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
8 version 2.1 of the License, or (at your option) any later version. |
| 0 | 9 |
| 10 This library is distributed in the hope that it will be useful, | |
| 11 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
13 Lesser General Public License for more details. |
| 0 | 14 |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
15 You should have received a copy of the GNU Lesser General Public |
|
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
16 License along with this library; if not, write to the Free Software |
|
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
| 0 | 18 |
| 19 Sam Lantinga | |
|
252
e8157fcb3114
Updated the source with the correct e-mail address
Sam Lantinga <slouken@libsdl.org>
parents:
0
diff
changeset
|
20 slouken@libsdl.org |
| 0 | 21 */ |
| 22 | |
| 23 /* Mutex functions using the Win32 API */ | |
| 24 | |
|
1330
450721ad5436
It's now possible to build SDL without any C runtime at all on Windows,
Sam Lantinga <slouken@libsdl.org>
parents:
1312
diff
changeset
|
25 #include "SDL_windows.h" |
| 0 | 26 |
|
1338
604d73db6802
Removed uses of stdlib.h and string.h
Sam Lantinga <slouken@libsdl.org>
parents:
1336
diff
changeset
|
27 #include "SDL_stdlib.h" |
| 0 | 28 #include "SDL_error.h" |
| 29 #include "SDL_mutex.h" | |
| 30 | |
| 31 | |
| 32 struct SDL_mutex { | |
| 33 HANDLE id; | |
| 34 }; | |
| 35 | |
| 36 /* Create a mutex */ | |
| 37 SDL_mutex *SDL_CreateMutex(void) | |
| 38 { | |
| 39 SDL_mutex *mutex; | |
| 40 | |
| 41 /* Allocate mutex memory */ | |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1330
diff
changeset
|
42 mutex = (SDL_mutex *)SDL_malloc(sizeof(*mutex)); |
| 0 | 43 if ( mutex ) { |
| 44 /* Create the mutex, with initial value signaled */ | |
| 45 mutex->id = CreateMutex(NULL, FALSE, NULL); | |
| 46 if ( ! mutex->id ) { | |
| 47 SDL_SetError("Couldn't create mutex"); | |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1330
diff
changeset
|
48 SDL_free(mutex); |
| 0 | 49 mutex = NULL; |
| 50 } | |
| 51 } else { | |
| 52 SDL_OutOfMemory(); | |
| 53 } | |
| 54 return(mutex); | |
| 55 } | |
| 56 | |
| 57 /* Free the mutex */ | |
| 58 void SDL_DestroyMutex(SDL_mutex *mutex) | |
| 59 { | |
| 60 if ( mutex ) { | |
| 61 if ( mutex->id ) { | |
| 62 CloseHandle(mutex->id); | |
| 63 mutex->id = 0; | |
| 64 } | |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1330
diff
changeset
|
65 SDL_free(mutex); |
| 0 | 66 } |
| 67 } | |
| 68 | |
| 69 /* Lock the mutex */ | |
| 70 int SDL_mutexP(SDL_mutex *mutex) | |
| 71 { | |
| 72 if ( mutex == NULL ) { | |
| 73 SDL_SetError("Passed a NULL mutex"); | |
| 74 return -1; | |
| 75 } | |
| 76 if ( WaitForSingleObject(mutex->id, INFINITE) == WAIT_FAILED ) { | |
| 77 SDL_SetError("Couldn't wait on mutex"); | |
| 78 return -1; | |
| 79 } | |
| 80 return(0); | |
| 81 } | |
| 82 | |
| 83 /* Unlock the mutex */ | |
| 84 int SDL_mutexV(SDL_mutex *mutex) | |
| 85 { | |
| 86 if ( mutex == NULL ) { | |
| 87 SDL_SetError("Passed a NULL mutex"); | |
| 88 return -1; | |
| 89 } | |
| 90 if ( ReleaseMutex(mutex->id) == FALSE ) { | |
| 91 SDL_SetError("Couldn't release mutex"); | |
| 92 return -1; | |
| 93 } | |
| 94 return(0); | |
| 95 } |