Mercurial > sdl-ios-xcode
annotate include/SDL_types.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 | 1b5fbaf1d2c6 |
children | 7ba544e2888d |
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:
1190
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:
1190
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:
1190
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:
1190
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:
1190
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:
1190
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:
1190
diff
changeset
|
17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
0 | 18 |
19 Sam Lantinga | |
251
b8688cfdc232
Updated the headers with the correct e-mail address
Sam Lantinga <slouken@libsdl.org>
parents:
173
diff
changeset
|
20 slouken@libsdl.org |
0 | 21 */ |
22 | |
23 /* General data types used by the SDL library */ | |
24 | |
25 #ifndef _SDL_types_h | |
26 #define _SDL_types_h | |
27 | |
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
|
28 #include <sys/types.h> |
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
|
29 #ifdef _MSC_VER |
1346
1b5fbaf1d2c6
Default to build SDL without MSVCRT
Sam Lantinga <slouken@libsdl.org>
parents:
1345
diff
changeset
|
30 #ifndef _SIZE_T_DEFINED |
1b5fbaf1d2c6
Default to build SDL without MSVCRT
Sam Lantinga <slouken@libsdl.org>
parents:
1345
diff
changeset
|
31 #ifdef _WIN64 |
1b5fbaf1d2c6
Default to build SDL without MSVCRT
Sam Lantinga <slouken@libsdl.org>
parents:
1345
diff
changeset
|
32 typedef unsigned __int64 size_t; |
1b5fbaf1d2c6
Default to build SDL without MSVCRT
Sam Lantinga <slouken@libsdl.org>
parents:
1345
diff
changeset
|
33 #else |
1b5fbaf1d2c6
Default to build SDL without MSVCRT
Sam Lantinga <slouken@libsdl.org>
parents:
1345
diff
changeset
|
34 typedef _W64 unsigned int size_t; |
1b5fbaf1d2c6
Default to build SDL without MSVCRT
Sam Lantinga <slouken@libsdl.org>
parents:
1345
diff
changeset
|
35 #endif |
1b5fbaf1d2c6
Default to build SDL without MSVCRT
Sam Lantinga <slouken@libsdl.org>
parents:
1345
diff
changeset
|
36 #define _SIZE_T_DEFINED |
1b5fbaf1d2c6
Default to build SDL without MSVCRT
Sam Lantinga <slouken@libsdl.org>
parents:
1345
diff
changeset
|
37 #endif |
1345
7f32b9bede06
Fixes for Visual C++ 6.0
Sam Lantinga <slouken@libsdl.org>
parents:
1330
diff
changeset
|
38 typedef size_t uintptr_t; |
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
|
39 #endif |
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
|
40 |
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
|
41 /* The number of elements in an array */ |
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
|
42 #define SDL_arraysize(array) (sizeof(array)/sizeof(array[0])) |
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
|
43 #define SDL_TABLESIZE(table) SDL_arraysize(table) |
0 | 44 |
45 /* Basic data types */ | |
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
|
46 typedef enum SDL_bool { |
0 | 47 SDL_FALSE = 0, |
48 SDL_TRUE = 1 | |
49 } SDL_bool; | |
908
6104bfff77ba
Date: Mon, 28 Jun 2004 19:58:08 +0900
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
50 |
6104bfff77ba
Date: Mon, 28 Jun 2004 19:58:08 +0900
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
51 #ifdef H_MMBASIC /* mmbasic.h (Tru64 MME) */ |
6104bfff77ba
Date: Mon, 28 Jun 2004 19:58:08 +0900
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
52 /* Some of the basic types are already defined in mmbasic.h */ |
6104bfff77ba
Date: Mon, 28 Jun 2004 19:58:08 +0900
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
53 typedef signed char Sint8; |
6104bfff77ba
Date: Mon, 28 Jun 2004 19:58:08 +0900
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
54 typedef signed short Sint16; |
6104bfff77ba
Date: Mon, 28 Jun 2004 19:58:08 +0900
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
55 typedef signed int Sint32; |
6104bfff77ba
Date: Mon, 28 Jun 2004 19:58:08 +0900
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
56 #else |
0 | 57 typedef unsigned char Uint8; |
58 typedef signed char Sint8; | |
59 typedef unsigned short Uint16; | |
60 typedef signed short Sint16; | |
61 typedef unsigned int Uint32; | |
62 typedef signed int Sint32; | |
908
6104bfff77ba
Date: Mon, 28 Jun 2004 19:58:08 +0900
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
63 #endif |
0 | 64 |
65 /* Figure out how to support 64-bit datatypes */ | |
66 #if !defined(__STRICT_ANSI__) | |
912
bc0b95b02235
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
908
diff
changeset
|
67 #ifdef __osf__ /* Tru64 */ |
908
6104bfff77ba
Date: Mon, 28 Jun 2004 19:58:08 +0900
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
68 #define SDL_HAS_64BIT_TYPE long |
1190 | 69 #elif defined(__GNUC__) || defined(__MWERKS__) || defined(__SUNPRO_C) || defined(__DECC) || defined(__WATCOMC__) |
0 | 70 #define SDL_HAS_64BIT_TYPE long long |
71 #elif defined(_MSC_VER) /* VC++ */ | |
72 #define SDL_HAS_64BIT_TYPE __int64 | |
73 #endif | |
74 #endif /* !__STRICT_ANSI__ */ | |
75 | |
173
83018110dce8
Added initial support for EPOC/Symbian OS (thanks Hannu!)
Sam Lantinga <slouken@libsdl.org>
parents:
166
diff
changeset
|
76 /* The 64-bit type isn't available on EPOC/Symbian OS */ |
83018110dce8
Added initial support for EPOC/Symbian OS (thanks Hannu!)
Sam Lantinga <slouken@libsdl.org>
parents:
166
diff
changeset
|
77 #ifdef __SYMBIAN32__ |
83018110dce8
Added initial support for EPOC/Symbian OS (thanks Hannu!)
Sam Lantinga <slouken@libsdl.org>
parents:
166
diff
changeset
|
78 #undef SDL_HAS_64BIT_TYPE |
83018110dce8
Added initial support for EPOC/Symbian OS (thanks Hannu!)
Sam Lantinga <slouken@libsdl.org>
parents:
166
diff
changeset
|
79 #endif |
83018110dce8
Added initial support for EPOC/Symbian OS (thanks Hannu!)
Sam Lantinga <slouken@libsdl.org>
parents:
166
diff
changeset
|
80 |
0 | 81 /* The 64-bit datatype isn't supported on all platforms */ |
82 #ifdef SDL_HAS_64BIT_TYPE | |
654
e92bcf2573cb
Added audio and CD-ROM support for OSF/Tru64 (thanks Hayashi!)
Sam Lantinga <slouken@libsdl.org>
parents:
534
diff
changeset
|
83 #ifndef H_MMBASIC |
0 | 84 typedef unsigned SDL_HAS_64BIT_TYPE Uint64; |
654
e92bcf2573cb
Added audio and CD-ROM support for OSF/Tru64 (thanks Hayashi!)
Sam Lantinga <slouken@libsdl.org>
parents:
534
diff
changeset
|
85 #endif |
0 | 86 typedef SDL_HAS_64BIT_TYPE Sint64; |
87 #else | |
88 /* This is really just a hack to prevent the compiler from complaining */ | |
89 typedef struct { | |
90 Uint32 hi; | |
91 Uint32 lo; | |
92 } Uint64, Sint64; | |
93 #endif | |
94 | |
95 /* Make sure the types really have the right sizes */ | |
96 #define SDL_COMPILE_TIME_ASSERT(name, x) \ | |
97 typedef int SDL_dummy_ ## name[(x) * 2 - 1] | |
98 | |
99 SDL_COMPILE_TIME_ASSERT(uint8, sizeof(Uint8) == 1); | |
100 SDL_COMPILE_TIME_ASSERT(sint8, sizeof(Sint8) == 1); | |
101 SDL_COMPILE_TIME_ASSERT(uint16, sizeof(Uint16) == 2); | |
102 SDL_COMPILE_TIME_ASSERT(sint16, sizeof(Sint16) == 2); | |
103 SDL_COMPILE_TIME_ASSERT(uint32, sizeof(Uint32) == 4); | |
104 SDL_COMPILE_TIME_ASSERT(sint32, sizeof(Sint32) == 4); | |
105 SDL_COMPILE_TIME_ASSERT(uint64, sizeof(Uint64) == 8); | |
106 SDL_COMPILE_TIME_ASSERT(sint64, sizeof(Sint64) == 8); | |
107 | |
463
bf7389310d27
Added compile-time checking for the size of enums to SDL_types.h
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
108 /* Check to make sure enums are the size of ints, for structure packing. |
bf7389310d27
Added compile-time checking for the size of enums to SDL_types.h
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
109 For both Watcom C/C++ and Borland C/C++ the compiler option that makes |
bf7389310d27
Added compile-time checking for the size of enums to SDL_types.h
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
110 enums having the size of an int must be enabled. |
bf7389310d27
Added compile-time checking for the size of enums to SDL_types.h
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
111 This is "-b" for Borland C/C++ and "-ei" for Watcom C/C++ (v11). |
bf7389310d27
Added compile-time checking for the size of enums to SDL_types.h
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
112 */ |
534
1ea658a3dd52
Turn on enums always ints for CodeWarrior (thanks Darrell!)
Sam Lantinga <slouken@libsdl.org>
parents:
463
diff
changeset
|
113 /* Enable enums always int in CodeWarrior (for MPW use "-enum int") */ |
1ea658a3dd52
Turn on enums always ints for CodeWarrior (thanks Darrell!)
Sam Lantinga <slouken@libsdl.org>
parents:
463
diff
changeset
|
114 #ifdef __MWERKS__ |
1ea658a3dd52
Turn on enums always ints for CodeWarrior (thanks Darrell!)
Sam Lantinga <slouken@libsdl.org>
parents:
463
diff
changeset
|
115 #pragma enumsalwaysint on |
1ea658a3dd52
Turn on enums always ints for CodeWarrior (thanks Darrell!)
Sam Lantinga <slouken@libsdl.org>
parents:
463
diff
changeset
|
116 #endif |
1ea658a3dd52
Turn on enums always ints for CodeWarrior (thanks Darrell!)
Sam Lantinga <slouken@libsdl.org>
parents:
463
diff
changeset
|
117 |
463
bf7389310d27
Added compile-time checking for the size of enums to SDL_types.h
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
118 typedef enum { |
bf7389310d27
Added compile-time checking for the size of enums to SDL_types.h
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
119 DUMMY_ENUM_VALUE |
bf7389310d27
Added compile-time checking for the size of enums to SDL_types.h
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
120 } SDL_DUMMY_ENUM; |
bf7389310d27
Added compile-time checking for the size of enums to SDL_types.h
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
121 |
bf7389310d27
Added compile-time checking for the size of enums to SDL_types.h
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
122 SDL_COMPILE_TIME_ASSERT(enum, sizeof(SDL_DUMMY_ENUM) == sizeof(int)); |
bf7389310d27
Added compile-time checking for the size of enums to SDL_types.h
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
123 |
0 | 124 #endif |