Mercurial > sdl-ios-xcode
annotate src/video/windib/SDL_dibevents.c @ 4170:092c0bc69155 SDL-1.2
Fixed bug #618
Description From Tim Angus 2008-08-30 12:23:56 (-) [reply]
As we all know SDL 1.2 doesn't handle dead keys well since one key press
potentially equals two (or more) characters. For example, on many layouts,
keying <backquote>,<space> results in <no character>,<backquote><space>. Since
the unicode member of the SDL_keysym struct only has room for one character,
only one can be returned.
On Linux, the first character is returned. On Windows however, unless the exact
number of characters generated by the keypress is 1, nothing is returned. The
following patch addresses this inconsistency.
Updated patch which includes a further fix to the handling of the numpad when
numlock is on. This further fix is courtesy Amanieu d'Antras.
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Mon, 13 Apr 2009 08:42:09 +0000 |
| parents | a6f635e5eaa6 |
| children | d7294b7c732d |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 2 SDL - Simple DirectMedia Layer | |
| 4159 | 3 Copyright (C) 1997-2009 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:
1303
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:
1303
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:
1303
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:
1303
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:
1303
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:
1303
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:
145
diff
changeset
|
20 slouken@libsdl.org |
| 0 | 21 */ |
|
1402
d910939febfa
Use consistent identifiers for the various platforms we support.
Sam Lantinga <slouken@libsdl.org>
parents:
1379
diff
changeset
|
22 #include "SDL_config.h" |
| 0 | 23 |
|
1433
bb6839704ed6
SDL_windows.h is no longer necessary
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
24 #define WIN32_LEAN_AND_MEAN |
|
bb6839704ed6
SDL_windows.h is no longer necessary
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
25 #include <windows.h> |
| 0 | 26 |
|
1358
c71e05b4dc2e
More header massaging... works great on Windows. ;-)
Sam Lantinga <slouken@libsdl.org>
parents:
1338
diff
changeset
|
27 #include "SDL_main.h" |
| 0 | 28 #include "SDL_events.h" |
| 29 #include "SDL_syswm.h" | |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
30 #include "../../events/SDL_sysevents.h" |
|
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
31 #include "../../events/SDL_events_c.h" |
|
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
32 #include "../wincommon/SDL_lowvideo.h" |
|
4162
3b7fc3416601
GAPI fixes from Stefan Klug
Sam Lantinga <slouken@libsdl.org>
parents:
4159
diff
changeset
|
33 #include "SDL_gapidibvideo.h" |
|
3b7fc3416601
GAPI fixes from Stefan Klug
Sam Lantinga <slouken@libsdl.org>
parents:
4159
diff
changeset
|
34 #include "SDL_vkeys.h" |
|
3b7fc3416601
GAPI fixes from Stefan Klug
Sam Lantinga <slouken@libsdl.org>
parents:
4159
diff
changeset
|
35 |
|
3b7fc3416601
GAPI fixes from Stefan Klug
Sam Lantinga <slouken@libsdl.org>
parents:
4159
diff
changeset
|
36 #ifdef SDL_VIDEO_DRIVER_GAPI |
|
3b7fc3416601
GAPI fixes from Stefan Klug
Sam Lantinga <slouken@libsdl.org>
parents:
4159
diff
changeset
|
37 #include "../gapi/SDL_gapivideo.h" |
|
3b7fc3416601
GAPI fixes from Stefan Klug
Sam Lantinga <slouken@libsdl.org>
parents:
4159
diff
changeset
|
38 #endif |
|
3b7fc3416601
GAPI fixes from Stefan Klug
Sam Lantinga <slouken@libsdl.org>
parents:
4159
diff
changeset
|
39 |
|
3b7fc3416601
GAPI fixes from Stefan Klug
Sam Lantinga <slouken@libsdl.org>
parents:
4159
diff
changeset
|
40 #ifdef SDL_VIDEO_DRIVER_WINDIB |
| 0 | 41 #include "SDL_dibvideo.h" |
|
4162
3b7fc3416601
GAPI fixes from Stefan Klug
Sam Lantinga <slouken@libsdl.org>
parents:
4159
diff
changeset
|
42 #endif |
| 0 | 43 |
| 44 #ifndef WM_APP | |
| 45 #define WM_APP 0x8000 | |
| 46 #endif | |
| 47 | |
| 48 #ifdef _WIN32_WCE | |
| 49 #define NO_GETKEYBOARDSTATE | |
| 50 #endif | |
| 51 | |
| 52 /* The translation table from a Microsoft VK keysym to a SDL keysym */ | |
| 53 static SDLKey VK_keymap[SDLK_LAST]; | |
|
1472
4aac8563c296
Fixed more Win64 portability issues
Sam Lantinga <slouken@libsdl.org>
parents:
1456
diff
changeset
|
54 static SDL_keysym *TranslateKey(WPARAM vkey, UINT scancode, SDL_keysym *keysym, int pressed); |
|
4162
3b7fc3416601
GAPI fixes from Stefan Klug
Sam Lantinga <slouken@libsdl.org>
parents:
4159
diff
changeset
|
55 static SDLKey Arrows_keymap[4]; |
| 0 | 56 |
| 57 /* Masks for processing the windows KEYDOWN and KEYUP messages */ | |
| 58 #define REPEATED_KEYMASK (1<<30) | |
| 59 #define EXTENDED_KEYMASK (1<<24) | |
| 60 | |
|
145
29a638dc26db
Applied David MacCormack's patch to fix SDL_WINDOWID on Windows,
Sam Lantinga <slouken@libsdl.org>
parents:
140
diff
changeset
|
61 /* DJM: If the user setup the window for us, we want to save his window proc, |
|
29a638dc26db
Applied David MacCormack's patch to fix SDL_WINDOWID on Windows,
Sam Lantinga <slouken@libsdl.org>
parents:
140
diff
changeset
|
62 and give him a chance to handle some messages. */ |
|
1303
52b5afd7ecee
Date: Tue, 05 Jul 2005 21:43:26 +1000
Sam Lantinga <slouken@libsdl.org>
parents:
1288
diff
changeset
|
63 #ifdef STRICT |
|
52b5afd7ecee
Date: Tue, 05 Jul 2005 21:43:26 +1000
Sam Lantinga <slouken@libsdl.org>
parents:
1288
diff
changeset
|
64 #define WNDPROCTYPE WNDPROC |
|
52b5afd7ecee
Date: Tue, 05 Jul 2005 21:43:26 +1000
Sam Lantinga <slouken@libsdl.org>
parents:
1288
diff
changeset
|
65 #else |
|
52b5afd7ecee
Date: Tue, 05 Jul 2005 21:43:26 +1000
Sam Lantinga <slouken@libsdl.org>
parents:
1288
diff
changeset
|
66 #define WNDPROCTYPE FARPROC |
|
52b5afd7ecee
Date: Tue, 05 Jul 2005 21:43:26 +1000
Sam Lantinga <slouken@libsdl.org>
parents:
1288
diff
changeset
|
67 #endif |
|
52b5afd7ecee
Date: Tue, 05 Jul 2005 21:43:26 +1000
Sam Lantinga <slouken@libsdl.org>
parents:
1288
diff
changeset
|
68 static WNDPROCTYPE userWindowProc = NULL; |
|
145
29a638dc26db
Applied David MacCormack's patch to fix SDL_WINDOWID on Windows,
Sam Lantinga <slouken@libsdl.org>
parents:
140
diff
changeset
|
69 |
|
1251
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
70 |
|
4162
3b7fc3416601
GAPI fixes from Stefan Klug
Sam Lantinga <slouken@libsdl.org>
parents:
4159
diff
changeset
|
71 #ifdef SDL_VIDEO_DRIVER_GAPI |
|
1251
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
72 |
|
4162
3b7fc3416601
GAPI fixes from Stefan Klug
Sam Lantinga <slouken@libsdl.org>
parents:
4159
diff
changeset
|
73 WPARAM rotateKey(WPARAM key,int direction) |
|
1251
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
74 { |
|
4162
3b7fc3416601
GAPI fixes from Stefan Klug
Sam Lantinga <slouken@libsdl.org>
parents:
4159
diff
changeset
|
75 if(direction ==0 ) return key; |
|
3b7fc3416601
GAPI fixes from Stefan Klug
Sam Lantinga <slouken@libsdl.org>
parents:
4159
diff
changeset
|
76 |
|
1251
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
77 switch (key) { |
|
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
78 case 0x26: /* up */ |
|
4162
3b7fc3416601
GAPI fixes from Stefan Klug
Sam Lantinga <slouken@libsdl.org>
parents:
4159
diff
changeset
|
79 return Arrows_keymap[(2 + direction) % 4]; |
|
1251
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
80 case 0x27: /* right */ |
|
4162
3b7fc3416601
GAPI fixes from Stefan Klug
Sam Lantinga <slouken@libsdl.org>
parents:
4159
diff
changeset
|
81 return Arrows_keymap[(1 + direction) % 4]; |
|
1251
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
82 case 0x28: /* down */ |
|
4162
3b7fc3416601
GAPI fixes from Stefan Klug
Sam Lantinga <slouken@libsdl.org>
parents:
4159
diff
changeset
|
83 return Arrows_keymap[direction % 4]; |
|
1251
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
84 case 0x25: /* left */ |
|
4162
3b7fc3416601
GAPI fixes from Stefan Klug
Sam Lantinga <slouken@libsdl.org>
parents:
4159
diff
changeset
|
85 return Arrows_keymap[(3 + direction) % 4]; |
|
1251
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
86 } |
|
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
87 |
|
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
88 return key; |
|
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
89 } |
|
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
90 |
|
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
91 #endif |
|
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
92 |
|
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
93 |
| 0 | 94 /* The main Win32 event handler */ |
|
1456
84de7511f79f
Fixed a bunch of 64-bit compatibility problems
Sam Lantinga <slouken@libsdl.org>
parents:
1433
diff
changeset
|
95 LRESULT DIB_HandleMessage(_THIS, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) |
| 0 | 96 { |
| 97 extern int posted; | |
| 98 | |
| 99 switch (msg) { | |
| 100 case WM_SYSKEYDOWN: | |
| 101 case WM_KEYDOWN: { | |
| 102 SDL_keysym keysym; | |
| 103 | |
|
4162
3b7fc3416601
GAPI fixes from Stefan Klug
Sam Lantinga <slouken@libsdl.org>
parents:
4159
diff
changeset
|
104 #ifdef SDL_VIDEO_DRIVER_GAPI |
|
3b7fc3416601
GAPI fixes from Stefan Klug
Sam Lantinga <slouken@libsdl.org>
parents:
4159
diff
changeset
|
105 if(this->hidden->gapiInfo) |
|
3b7fc3416601
GAPI fixes from Stefan Klug
Sam Lantinga <slouken@libsdl.org>
parents:
4159
diff
changeset
|
106 { |
|
3b7fc3416601
GAPI fixes from Stefan Klug
Sam Lantinga <slouken@libsdl.org>
parents:
4159
diff
changeset
|
107 // Drop GAPI artefacts |
|
3b7fc3416601
GAPI fixes from Stefan Klug
Sam Lantinga <slouken@libsdl.org>
parents:
4159
diff
changeset
|
108 if (wParam == 0x84 || wParam == 0x5B) |
|
3b7fc3416601
GAPI fixes from Stefan Klug
Sam Lantinga <slouken@libsdl.org>
parents:
4159
diff
changeset
|
109 return 0; |
|
1251
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
110 |
|
4162
3b7fc3416601
GAPI fixes from Stefan Klug
Sam Lantinga <slouken@libsdl.org>
parents:
4159
diff
changeset
|
111 wParam = rotateKey(wParam, this->hidden->gapiInfo->coordinateTransform); |
|
3b7fc3416601
GAPI fixes from Stefan Klug
Sam Lantinga <slouken@libsdl.org>
parents:
4159
diff
changeset
|
112 } |
|
1251
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
113 #endif |
| 0 | 114 /* Ignore repeated keys */ |
| 115 if ( lParam&REPEATED_KEYMASK ) { | |
| 116 return(0); | |
| 117 } | |
| 118 switch (wParam) { | |
| 119 case VK_CONTROL: | |
| 120 if ( lParam&EXTENDED_KEYMASK ) | |
| 121 wParam = VK_RCONTROL; | |
| 122 else | |
| 123 wParam = VK_LCONTROL; | |
| 124 break; | |
| 125 case VK_SHIFT: | |
| 126 /* EXTENDED trick doesn't work here */ | |
|
1282
217f5d5a49e5
Date: Sat, 15 Jan 2005 02:01:51 +0000 (UTC)
Sam Lantinga <slouken@libsdl.org>
parents:
1280
diff
changeset
|
127 { |
|
217f5d5a49e5
Date: Sat, 15 Jan 2005 02:01:51 +0000 (UTC)
Sam Lantinga <slouken@libsdl.org>
parents:
1280
diff
changeset
|
128 Uint8 *state = SDL_GetKeyState(NULL); |
|
217f5d5a49e5
Date: Sat, 15 Jan 2005 02:01:51 +0000 (UTC)
Sam Lantinga <slouken@libsdl.org>
parents:
1280
diff
changeset
|
129 if (state[SDLK_LSHIFT] == SDL_RELEASED && (GetKeyState(VK_LSHIFT) & 0x8000)) { |
|
558
2312d983e1fe
Fixed left/right shift detection on Windows (thanks Mike!)
Sam Lantinga <slouken@libsdl.org>
parents:
523
diff
changeset
|
130 wParam = VK_LSHIFT; |
|
1282
217f5d5a49e5
Date: Sat, 15 Jan 2005 02:01:51 +0000 (UTC)
Sam Lantinga <slouken@libsdl.org>
parents:
1280
diff
changeset
|
131 } else if (state[SDLK_RSHIFT] == SDL_RELEASED && (GetKeyState(VK_RSHIFT) & 0x8000)) { |
|
558
2312d983e1fe
Fixed left/right shift detection on Windows (thanks Mike!)
Sam Lantinga <slouken@libsdl.org>
parents:
523
diff
changeset
|
132 wParam = VK_RSHIFT; |
|
2312d983e1fe
Fixed left/right shift detection on Windows (thanks Mike!)
Sam Lantinga <slouken@libsdl.org>
parents:
523
diff
changeset
|
133 } else { |
|
1852
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
134 /* Win9x */ |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
135 int sc = HIWORD(lParam) & 0xFF; |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
136 |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
137 if (sc == 0x2A) |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
138 wParam = VK_LSHIFT; |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
139 else |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
140 if (sc == 0x36) |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
141 wParam = VK_RSHIFT; |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
142 else |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
143 wParam = VK_LSHIFT; |
|
1282
217f5d5a49e5
Date: Sat, 15 Jan 2005 02:01:51 +0000 (UTC)
Sam Lantinga <slouken@libsdl.org>
parents:
1280
diff
changeset
|
144 } |
|
558
2312d983e1fe
Fixed left/right shift detection on Windows (thanks Mike!)
Sam Lantinga <slouken@libsdl.org>
parents:
523
diff
changeset
|
145 } |
| 0 | 146 break; |
| 147 case VK_MENU: | |
| 148 if ( lParam&EXTENDED_KEYMASK ) | |
| 149 wParam = VK_RMENU; | |
| 150 else | |
| 151 wParam = VK_LMENU; | |
| 152 break; | |
| 153 } | |
|
112
9ef74357a5fb
Incorporated slightly modified version of Rainer's WinCE patch
Sam Lantinga <slouken@lokigames.com>
parents:
36
diff
changeset
|
154 #ifdef NO_GETKEYBOARDSTATE |
|
9ef74357a5fb
Incorporated slightly modified version of Rainer's WinCE patch
Sam Lantinga <slouken@lokigames.com>
parents:
36
diff
changeset
|
155 /* this is the workaround for the missing ToAscii() and ToUnicode() in CE (not necessary at KEYUP!) */ |
|
9ef74357a5fb
Incorporated slightly modified version of Rainer's WinCE patch
Sam Lantinga <slouken@lokigames.com>
parents:
36
diff
changeset
|
156 if ( SDL_TranslateUNICODE ) { |
|
140
3c35d8f160bd
Fixed compiling on Windows CE
Sam Lantinga <slouken@libsdl.org>
parents:
112
diff
changeset
|
157 MSG m; |
|
112
9ef74357a5fb
Incorporated slightly modified version of Rainer's WinCE patch
Sam Lantinga <slouken@lokigames.com>
parents:
36
diff
changeset
|
158 |
|
140
3c35d8f160bd
Fixed compiling on Windows CE
Sam Lantinga <slouken@libsdl.org>
parents:
112
diff
changeset
|
159 m.hwnd = hwnd; |
|
3c35d8f160bd
Fixed compiling on Windows CE
Sam Lantinga <slouken@libsdl.org>
parents:
112
diff
changeset
|
160 m.message = msg; |
|
3c35d8f160bd
Fixed compiling on Windows CE
Sam Lantinga <slouken@libsdl.org>
parents:
112
diff
changeset
|
161 m.wParam = wParam; |
|
3c35d8f160bd
Fixed compiling on Windows CE
Sam Lantinga <slouken@libsdl.org>
parents:
112
diff
changeset
|
162 m.lParam = lParam; |
|
3c35d8f160bd
Fixed compiling on Windows CE
Sam Lantinga <slouken@libsdl.org>
parents:
112
diff
changeset
|
163 m.time = 0; |
|
3c35d8f160bd
Fixed compiling on Windows CE
Sam Lantinga <slouken@libsdl.org>
parents:
112
diff
changeset
|
164 if ( TranslateMessage(&m) && PeekMessage(&m, hwnd, 0, WM_USER, PM_NOREMOVE) && (m.message == WM_CHAR) ) { |
|
112
9ef74357a5fb
Incorporated slightly modified version of Rainer's WinCE patch
Sam Lantinga <slouken@lokigames.com>
parents:
36
diff
changeset
|
165 GetMessage(&m, hwnd, 0, WM_USER); |
|
9ef74357a5fb
Incorporated slightly modified version of Rainer's WinCE patch
Sam Lantinga <slouken@lokigames.com>
parents:
36
diff
changeset
|
166 wParam = m.wParam; |
|
9ef74357a5fb
Incorporated slightly modified version of Rainer's WinCE patch
Sam Lantinga <slouken@lokigames.com>
parents:
36
diff
changeset
|
167 } |
|
9ef74357a5fb
Incorporated slightly modified version of Rainer's WinCE patch
Sam Lantinga <slouken@lokigames.com>
parents:
36
diff
changeset
|
168 } |
|
9ef74357a5fb
Incorporated slightly modified version of Rainer's WinCE patch
Sam Lantinga <slouken@lokigames.com>
parents:
36
diff
changeset
|
169 #endif /* NO_GETKEYBOARDSTATE */ |
| 0 | 170 posted = SDL_PrivateKeyboard(SDL_PRESSED, |
| 171 TranslateKey(wParam,HIWORD(lParam),&keysym,1)); | |
| 172 } | |
| 173 return(0); | |
| 174 | |
| 175 case WM_SYSKEYUP: | |
| 176 case WM_KEYUP: { | |
| 177 SDL_keysym keysym; | |
| 178 | |
|
4162
3b7fc3416601
GAPI fixes from Stefan Klug
Sam Lantinga <slouken@libsdl.org>
parents:
4159
diff
changeset
|
179 #ifdef SDL_VIDEO_DRIVER_GAPI |
|
3b7fc3416601
GAPI fixes from Stefan Klug
Sam Lantinga <slouken@libsdl.org>
parents:
4159
diff
changeset
|
180 if(this->hidden->gapiInfo) |
|
3b7fc3416601
GAPI fixes from Stefan Klug
Sam Lantinga <slouken@libsdl.org>
parents:
4159
diff
changeset
|
181 { |
|
3b7fc3416601
GAPI fixes from Stefan Klug
Sam Lantinga <slouken@libsdl.org>
parents:
4159
diff
changeset
|
182 // Drop GAPI artifacts |
|
3b7fc3416601
GAPI fixes from Stefan Klug
Sam Lantinga <slouken@libsdl.org>
parents:
4159
diff
changeset
|
183 if (wParam == 0x84 || wParam == 0x5B) |
|
3b7fc3416601
GAPI fixes from Stefan Klug
Sam Lantinga <slouken@libsdl.org>
parents:
4159
diff
changeset
|
184 return 0; |
|
3b7fc3416601
GAPI fixes from Stefan Klug
Sam Lantinga <slouken@libsdl.org>
parents:
4159
diff
changeset
|
185 |
|
3b7fc3416601
GAPI fixes from Stefan Klug
Sam Lantinga <slouken@libsdl.org>
parents:
4159
diff
changeset
|
186 wParam = rotateKey(wParam, this->hidden->gapiInfo->coordinateTransform); |
|
3b7fc3416601
GAPI fixes from Stefan Klug
Sam Lantinga <slouken@libsdl.org>
parents:
4159
diff
changeset
|
187 } |
|
1251
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
188 #endif |
|
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
189 |
| 0 | 190 switch (wParam) { |
| 191 case VK_CONTROL: | |
| 192 if ( lParam&EXTENDED_KEYMASK ) | |
| 193 wParam = VK_RCONTROL; | |
| 194 else | |
| 195 wParam = VK_LCONTROL; | |
| 196 break; | |
| 197 case VK_SHIFT: | |
| 198 /* EXTENDED trick doesn't work here */ | |
|
1282
217f5d5a49e5
Date: Sat, 15 Jan 2005 02:01:51 +0000 (UTC)
Sam Lantinga <slouken@libsdl.org>
parents:
1280
diff
changeset
|
199 { |
|
217f5d5a49e5
Date: Sat, 15 Jan 2005 02:01:51 +0000 (UTC)
Sam Lantinga <slouken@libsdl.org>
parents:
1280
diff
changeset
|
200 Uint8 *state = SDL_GetKeyState(NULL); |
|
217f5d5a49e5
Date: Sat, 15 Jan 2005 02:01:51 +0000 (UTC)
Sam Lantinga <slouken@libsdl.org>
parents:
1280
diff
changeset
|
201 if (state[SDLK_LSHIFT] == SDL_PRESSED && !(GetKeyState(VK_LSHIFT) & 0x8000)) { |
|
572
4c740ee76027
Mike Nordell _really_ fixed Win32 windib shift state handling this time. :)
Sam Lantinga <slouken@libsdl.org>
parents:
558
diff
changeset
|
202 wParam = VK_LSHIFT; |
|
1282
217f5d5a49e5
Date: Sat, 15 Jan 2005 02:01:51 +0000 (UTC)
Sam Lantinga <slouken@libsdl.org>
parents:
1280
diff
changeset
|
203 } else if (state[SDLK_RSHIFT] == SDL_PRESSED && !(GetKeyState(VK_RSHIFT) & 0x8000)) { |
|
572
4c740ee76027
Mike Nordell _really_ fixed Win32 windib shift state handling this time. :)
Sam Lantinga <slouken@libsdl.org>
parents:
558
diff
changeset
|
204 wParam = VK_RSHIFT; |
|
4c740ee76027
Mike Nordell _really_ fixed Win32 windib shift state handling this time. :)
Sam Lantinga <slouken@libsdl.org>
parents:
558
diff
changeset
|
205 } else { |
|
1852
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
206 /* Win9x */ |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
207 int sc = HIWORD(lParam) & 0xFF; |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
208 |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
209 if (sc == 0x2A) |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
210 wParam = VK_LSHIFT; |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
211 else |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
212 if (sc == 0x36) |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
213 wParam = VK_RSHIFT; |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
214 else |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
215 wParam = VK_LSHIFT; |
|
1282
217f5d5a49e5
Date: Sat, 15 Jan 2005 02:01:51 +0000 (UTC)
Sam Lantinga <slouken@libsdl.org>
parents:
1280
diff
changeset
|
216 } |
|
572
4c740ee76027
Mike Nordell _really_ fixed Win32 windib shift state handling this time. :)
Sam Lantinga <slouken@libsdl.org>
parents:
558
diff
changeset
|
217 } |
| 0 | 218 break; |
| 219 case VK_MENU: | |
| 220 if ( lParam&EXTENDED_KEYMASK ) | |
| 221 wParam = VK_RMENU; | |
| 222 else | |
| 223 wParam = VK_LMENU; | |
| 224 break; | |
| 225 } | |
| 1526 | 226 /* Windows only reports keyup for print screen */ |
| 227 if ( wParam == VK_SNAPSHOT && SDL_GetKeyState(NULL)[SDLK_PRINT] == SDL_RELEASED ) { | |
| 228 posted = SDL_PrivateKeyboard(SDL_PRESSED, | |
| 229 TranslateKey(wParam,HIWORD(lParam),&keysym,1)); | |
| 230 } | |
| 0 | 231 posted = SDL_PrivateKeyboard(SDL_RELEASED, |
| 232 TranslateKey(wParam,HIWORD(lParam),&keysym,0)); | |
| 233 } | |
| 234 return(0); | |
|
726
5429a06aa816
SDL12: Disable screensaver in windib driver.
Ryan C. Gordon <icculus@icculus.org>
parents:
721
diff
changeset
|
235 #if defined(SC_SCREENSAVE) && defined(SC_MONITORPOWER) |
|
5429a06aa816
SDL12: Disable screensaver in windib driver.
Ryan C. Gordon <icculus@icculus.org>
parents:
721
diff
changeset
|
236 case WM_SYSCOMMAND: { |
|
3981
b0d021cf41b6
windib target can now control screensaver with SDL_VIDEO_ALLOW_SCREENSAVER.
Ryan C. Gordon <icculus@icculus.org>
parents:
3868
diff
changeset
|
237 const DWORD val = (DWORD) (wParam & 0xFFF0); |
|
b0d021cf41b6
windib target can now control screensaver with SDL_VIDEO_ALLOW_SCREENSAVER.
Ryan C. Gordon <icculus@icculus.org>
parents:
3868
diff
changeset
|
238 if ((val == SC_SCREENSAVE) || (val == SC_MONITORPOWER)) { |
|
4162
3b7fc3416601
GAPI fixes from Stefan Klug
Sam Lantinga <slouken@libsdl.org>
parents:
4159
diff
changeset
|
239 if (this->hidden->dibInfo && !allow_screensaver) { |
|
3981
b0d021cf41b6
windib target can now control screensaver with SDL_VIDEO_ALLOW_SCREENSAVER.
Ryan C. Gordon <icculus@icculus.org>
parents:
3868
diff
changeset
|
240 /* Note that this doesn't stop anything on Vista |
|
b0d021cf41b6
windib target can now control screensaver with SDL_VIDEO_ALLOW_SCREENSAVER.
Ryan C. Gordon <icculus@icculus.org>
parents:
3868
diff
changeset
|
241 if the screensaver has a password. */ |
|
726
5429a06aa816
SDL12: Disable screensaver in windib driver.
Ryan C. Gordon <icculus@icculus.org>
parents:
721
diff
changeset
|
242 return(0); |
|
3981
b0d021cf41b6
windib target can now control screensaver with SDL_VIDEO_ALLOW_SCREENSAVER.
Ryan C. Gordon <icculus@icculus.org>
parents:
3868
diff
changeset
|
243 } |
|
b0d021cf41b6
windib target can now control screensaver with SDL_VIDEO_ALLOW_SCREENSAVER.
Ryan C. Gordon <icculus@icculus.org>
parents:
3868
diff
changeset
|
244 } |
|
726
5429a06aa816
SDL12: Disable screensaver in windib driver.
Ryan C. Gordon <icculus@icculus.org>
parents:
721
diff
changeset
|
245 } |
|
5429a06aa816
SDL12: Disable screensaver in windib driver.
Ryan C. Gordon <icculus@icculus.org>
parents:
721
diff
changeset
|
246 /* Fall through to default processing */ |
|
5429a06aa816
SDL12: Disable screensaver in windib driver.
Ryan C. Gordon <icculus@icculus.org>
parents:
721
diff
changeset
|
247 #endif /* SC_SCREENSAVE && SC_MONITORPOWER */ |
|
5429a06aa816
SDL12: Disable screensaver in windib driver.
Ryan C. Gordon <icculus@icculus.org>
parents:
721
diff
changeset
|
248 |
| 0 | 249 default: { |
| 250 /* Only post the event if we're watching for it */ | |
| 251 if ( SDL_ProcessEvents[SDL_SYSWMEVENT] == SDL_ENABLE ) { | |
| 252 SDL_SysWMmsg wmmsg; | |
| 253 | |
| 254 SDL_VERSION(&wmmsg.version); | |
| 255 wmmsg.hwnd = hwnd; | |
| 256 wmmsg.msg = msg; | |
| 257 wmmsg.wParam = wParam; | |
| 258 wmmsg.lParam = lParam; | |
| 259 posted = SDL_PrivateSysWMEvent(&wmmsg); | |
|
145
29a638dc26db
Applied David MacCormack's patch to fix SDL_WINDOWID on Windows,
Sam Lantinga <slouken@libsdl.org>
parents:
140
diff
changeset
|
260 |
|
29a638dc26db
Applied David MacCormack's patch to fix SDL_WINDOWID on Windows,
Sam Lantinga <slouken@libsdl.org>
parents:
140
diff
changeset
|
261 /* DJM: If the user isn't watching for private |
|
29a638dc26db
Applied David MacCormack's patch to fix SDL_WINDOWID on Windows,
Sam Lantinga <slouken@libsdl.org>
parents:
140
diff
changeset
|
262 messages in her SDL event loop, then pass it |
|
29a638dc26db
Applied David MacCormack's patch to fix SDL_WINDOWID on Windows,
Sam Lantinga <slouken@libsdl.org>
parents:
140
diff
changeset
|
263 along to any win32 specific window proc. |
|
29a638dc26db
Applied David MacCormack's patch to fix SDL_WINDOWID on Windows,
Sam Lantinga <slouken@libsdl.org>
parents:
140
diff
changeset
|
264 */ |
|
29a638dc26db
Applied David MacCormack's patch to fix SDL_WINDOWID on Windows,
Sam Lantinga <slouken@libsdl.org>
parents:
140
diff
changeset
|
265 } else if (userWindowProc) { |
|
721
ab0656314eef
Date: Thu, 18 Sep 2003 14:24:35 -0400
Sam Lantinga <slouken@libsdl.org>
parents:
572
diff
changeset
|
266 return CallWindowProc(userWindowProc, hwnd, msg, wParam, lParam); |
| 0 | 267 } |
| 268 } | |
| 269 break; | |
| 270 } | |
| 271 return(DefWindowProc(hwnd, msg, wParam, lParam)); | |
| 272 } | |
| 273 | |
| 4167 | 274 static void DIB_GenerateMouseMotionEvent(void) |
| 275 { | |
| 276 extern int mouse_relative; | |
| 277 extern int posted; | |
| 278 | |
| 279 POINT mouse; | |
| 280 GetCursorPos( &mouse ); | |
| 281 | |
| 282 if ( mouse_relative ) { | |
| 283 POINT center; | |
| 284 center.x = (SDL_VideoSurface->w/2); | |
| 285 center.y = (SDL_VideoSurface->h/2); | |
| 286 ClientToScreen(SDL_Window, ¢er); | |
| 287 | |
| 288 mouse.x -= (Sint16)center.x; | |
| 289 mouse.y -= (Sint16)center.y; | |
| 290 if ( mouse.x || mouse.y ) { | |
| 291 SetCursorPos(center.x, center.y); | |
| 292 posted = SDL_PrivateMouseMotion(0, 1, mouse.x, mouse.y); | |
| 293 } | |
| 294 } else if ( SDL_GetAppState() & SDL_APPMOUSEFOCUS ) { | |
| 295 ScreenToClient(SDL_Window, &mouse); | |
| 296 #ifdef _WIN32_WCE | |
| 297 if (SDL_VideoSurface) | |
| 298 GapiTransform(this->hidden->userOrientation, this->hidden->hiresFix, &mouse.x, &mouse.y); | |
| 299 #endif | |
| 300 posted = SDL_PrivateMouseMotion(0, 0, mouse.x, mouse.y); | |
| 301 } | |
| 302 } | |
| 303 | |
| 0 | 304 void DIB_PumpEvents(_THIS) |
| 305 { | |
| 306 MSG msg; | |
| 307 | |
|
523
c210010f50f4
Fixed windows event handling for ActiveX controls (thanks Huib-Jan!)
Sam Lantinga <slouken@libsdl.org>
parents:
515
diff
changeset
|
308 while ( PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE) ) { |
|
c210010f50f4
Fixed windows event handling for ActiveX controls (thanks Huib-Jan!)
Sam Lantinga <slouken@libsdl.org>
parents:
515
diff
changeset
|
309 if ( GetMessage(&msg, NULL, 0, 0) > 0 ) { |
| 0 | 310 DispatchMessage(&msg); |
| 311 } | |
| 312 } | |
| 4167 | 313 |
| 314 if ( SDL_GetAppState() & SDL_APPINPUTFOCUS ) { | |
| 315 DIB_GenerateMouseMotionEvent( ); | |
| 316 } | |
| 0 | 317 } |
| 318 | |
|
1852
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
319 static HKL hLayoutUS = NULL; |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
320 |
| 0 | 321 void DIB_InitOSKeymap(_THIS) |
| 322 { | |
|
1852
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
323 int i; |
| 3868 | 324 #ifndef _WIN32_WCE |
| 325 char current_layout[KL_NAMELENGTH]; | |
|
1852
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
326 |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
327 GetKeyboardLayoutName(current_layout); |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
328 //printf("Initial Keyboard Layout Name: '%s'\n", current_layout); |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
329 |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
330 hLayoutUS = LoadKeyboardLayout("00000409", KLF_NOTELLSHELL); |
| 3868 | 331 |
|
1852
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
332 if (!hLayoutUS) { |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
333 //printf("Failed to load US keyboard layout. Using current.\n"); |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
334 hLayoutUS = GetKeyboardLayout(0); |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
335 } |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
336 LoadKeyboardLayout(current_layout, KLF_ACTIVATE); |
| 3868 | 337 #else |
| 338 #if _WIN32_WCE >=420 | |
| 339 TCHAR current_layout[KL_NAMELENGTH]; | |
| 0 | 340 |
| 3868 | 341 GetKeyboardLayoutName(current_layout); |
| 342 //printf("Initial Keyboard Layout Name: '%s'\n", current_layout); | |
| 343 | |
| 344 hLayoutUS = LoadKeyboardLayout(L"00000409", 0); | |
| 345 | |
| 346 if (!hLayoutUS) { | |
| 347 //printf("Failed to load US keyboard layout. Using current.\n"); | |
| 348 hLayoutUS = GetKeyboardLayout(0); | |
| 349 } | |
| 350 LoadKeyboardLayout(current_layout, 0); | |
| 351 #endif // _WIN32_WCE >=420 | |
| 352 #endif | |
| 0 | 353 /* Map the VK keysyms */ |
|
1379
c0a74f199ecf
Use only safe string functions
Sam Lantinga <slouken@libsdl.org>
parents:
1361
diff
changeset
|
354 for ( i=0; i<SDL_arraysize(VK_keymap); ++i ) |
| 0 | 355 VK_keymap[i] = SDLK_UNKNOWN; |
| 356 | |
| 357 VK_keymap[VK_BACK] = SDLK_BACKSPACE; | |
| 358 VK_keymap[VK_TAB] = SDLK_TAB; | |
| 359 VK_keymap[VK_CLEAR] = SDLK_CLEAR; | |
| 360 VK_keymap[VK_RETURN] = SDLK_RETURN; | |
| 361 VK_keymap[VK_PAUSE] = SDLK_PAUSE; | |
| 362 VK_keymap[VK_ESCAPE] = SDLK_ESCAPE; | |
| 363 VK_keymap[VK_SPACE] = SDLK_SPACE; | |
| 364 VK_keymap[VK_APOSTROPHE] = SDLK_QUOTE; | |
| 365 VK_keymap[VK_COMMA] = SDLK_COMMA; | |
| 366 VK_keymap[VK_MINUS] = SDLK_MINUS; | |
| 367 VK_keymap[VK_PERIOD] = SDLK_PERIOD; | |
| 368 VK_keymap[VK_SLASH] = SDLK_SLASH; | |
| 369 VK_keymap[VK_0] = SDLK_0; | |
| 370 VK_keymap[VK_1] = SDLK_1; | |
| 371 VK_keymap[VK_2] = SDLK_2; | |
| 372 VK_keymap[VK_3] = SDLK_3; | |
| 373 VK_keymap[VK_4] = SDLK_4; | |
| 374 VK_keymap[VK_5] = SDLK_5; | |
| 375 VK_keymap[VK_6] = SDLK_6; | |
| 376 VK_keymap[VK_7] = SDLK_7; | |
| 377 VK_keymap[VK_8] = SDLK_8; | |
| 378 VK_keymap[VK_9] = SDLK_9; | |
| 379 VK_keymap[VK_SEMICOLON] = SDLK_SEMICOLON; | |
| 380 VK_keymap[VK_EQUALS] = SDLK_EQUALS; | |
| 381 VK_keymap[VK_LBRACKET] = SDLK_LEFTBRACKET; | |
| 382 VK_keymap[VK_BACKSLASH] = SDLK_BACKSLASH; | |
|
1253
7c7ddaf195bf
Implemented ToUnicode() support on Windows 95/98/ME/NT/2000/XP
Sam Lantinga <slouken@libsdl.org>
parents:
1251
diff
changeset
|
383 VK_keymap[VK_OEM_102] = SDLK_LESS; |
| 0 | 384 VK_keymap[VK_RBRACKET] = SDLK_RIGHTBRACKET; |
| 385 VK_keymap[VK_GRAVE] = SDLK_BACKQUOTE; | |
|
327
13fc64213765
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
386 VK_keymap[VK_BACKTICK] = SDLK_BACKQUOTE; |
| 0 | 387 VK_keymap[VK_A] = SDLK_a; |
| 388 VK_keymap[VK_B] = SDLK_b; | |
| 389 VK_keymap[VK_C] = SDLK_c; | |
| 390 VK_keymap[VK_D] = SDLK_d; | |
| 391 VK_keymap[VK_E] = SDLK_e; | |
| 392 VK_keymap[VK_F] = SDLK_f; | |
| 393 VK_keymap[VK_G] = SDLK_g; | |
| 394 VK_keymap[VK_H] = SDLK_h; | |
| 395 VK_keymap[VK_I] = SDLK_i; | |
| 396 VK_keymap[VK_J] = SDLK_j; | |
| 397 VK_keymap[VK_K] = SDLK_k; | |
| 398 VK_keymap[VK_L] = SDLK_l; | |
| 399 VK_keymap[VK_M] = SDLK_m; | |
| 400 VK_keymap[VK_N] = SDLK_n; | |
| 401 VK_keymap[VK_O] = SDLK_o; | |
| 402 VK_keymap[VK_P] = SDLK_p; | |
| 403 VK_keymap[VK_Q] = SDLK_q; | |
| 404 VK_keymap[VK_R] = SDLK_r; | |
| 405 VK_keymap[VK_S] = SDLK_s; | |
| 406 VK_keymap[VK_T] = SDLK_t; | |
| 407 VK_keymap[VK_U] = SDLK_u; | |
| 408 VK_keymap[VK_V] = SDLK_v; | |
| 409 VK_keymap[VK_W] = SDLK_w; | |
| 410 VK_keymap[VK_X] = SDLK_x; | |
| 411 VK_keymap[VK_Y] = SDLK_y; | |
| 412 VK_keymap[VK_Z] = SDLK_z; | |
| 413 VK_keymap[VK_DELETE] = SDLK_DELETE; | |
| 414 | |
| 415 VK_keymap[VK_NUMPAD0] = SDLK_KP0; | |
| 416 VK_keymap[VK_NUMPAD1] = SDLK_KP1; | |
| 417 VK_keymap[VK_NUMPAD2] = SDLK_KP2; | |
| 418 VK_keymap[VK_NUMPAD3] = SDLK_KP3; | |
| 419 VK_keymap[VK_NUMPAD4] = SDLK_KP4; | |
| 420 VK_keymap[VK_NUMPAD5] = SDLK_KP5; | |
| 421 VK_keymap[VK_NUMPAD6] = SDLK_KP6; | |
| 422 VK_keymap[VK_NUMPAD7] = SDLK_KP7; | |
| 423 VK_keymap[VK_NUMPAD8] = SDLK_KP8; | |
| 424 VK_keymap[VK_NUMPAD9] = SDLK_KP9; | |
| 425 VK_keymap[VK_DECIMAL] = SDLK_KP_PERIOD; | |
| 426 VK_keymap[VK_DIVIDE] = SDLK_KP_DIVIDE; | |
| 427 VK_keymap[VK_MULTIPLY] = SDLK_KP_MULTIPLY; | |
| 428 VK_keymap[VK_SUBTRACT] = SDLK_KP_MINUS; | |
| 429 VK_keymap[VK_ADD] = SDLK_KP_PLUS; | |
| 430 | |
| 431 VK_keymap[VK_UP] = SDLK_UP; | |
| 432 VK_keymap[VK_DOWN] = SDLK_DOWN; | |
| 433 VK_keymap[VK_RIGHT] = SDLK_RIGHT; | |
| 434 VK_keymap[VK_LEFT] = SDLK_LEFT; | |
| 435 VK_keymap[VK_INSERT] = SDLK_INSERT; | |
| 436 VK_keymap[VK_HOME] = SDLK_HOME; | |
| 437 VK_keymap[VK_END] = SDLK_END; | |
| 438 VK_keymap[VK_PRIOR] = SDLK_PAGEUP; | |
| 439 VK_keymap[VK_NEXT] = SDLK_PAGEDOWN; | |
| 440 | |
| 441 VK_keymap[VK_F1] = SDLK_F1; | |
| 442 VK_keymap[VK_F2] = SDLK_F2; | |
| 443 VK_keymap[VK_F3] = SDLK_F3; | |
| 444 VK_keymap[VK_F4] = SDLK_F4; | |
| 445 VK_keymap[VK_F5] = SDLK_F5; | |
| 446 VK_keymap[VK_F6] = SDLK_F6; | |
| 447 VK_keymap[VK_F7] = SDLK_F7; | |
| 448 VK_keymap[VK_F8] = SDLK_F8; | |
| 449 VK_keymap[VK_F9] = SDLK_F9; | |
| 450 VK_keymap[VK_F10] = SDLK_F10; | |
| 451 VK_keymap[VK_F11] = SDLK_F11; | |
| 452 VK_keymap[VK_F12] = SDLK_F12; | |
| 453 VK_keymap[VK_F13] = SDLK_F13; | |
| 454 VK_keymap[VK_F14] = SDLK_F14; | |
| 455 VK_keymap[VK_F15] = SDLK_F15; | |
| 456 | |
| 457 VK_keymap[VK_NUMLOCK] = SDLK_NUMLOCK; | |
| 458 VK_keymap[VK_CAPITAL] = SDLK_CAPSLOCK; | |
| 459 VK_keymap[VK_SCROLL] = SDLK_SCROLLOCK; | |
| 460 VK_keymap[VK_RSHIFT] = SDLK_RSHIFT; | |
| 461 VK_keymap[VK_LSHIFT] = SDLK_LSHIFT; | |
| 462 VK_keymap[VK_RCONTROL] = SDLK_RCTRL; | |
| 463 VK_keymap[VK_LCONTROL] = SDLK_LCTRL; | |
| 464 VK_keymap[VK_RMENU] = SDLK_RALT; | |
| 465 VK_keymap[VK_LMENU] = SDLK_LALT; | |
| 466 VK_keymap[VK_RWIN] = SDLK_RSUPER; | |
| 467 VK_keymap[VK_LWIN] = SDLK_LSUPER; | |
| 468 | |
| 469 VK_keymap[VK_HELP] = SDLK_HELP; | |
| 470 #ifdef VK_PRINT | |
| 471 VK_keymap[VK_PRINT] = SDLK_PRINT; | |
| 472 #endif | |
| 473 VK_keymap[VK_SNAPSHOT] = SDLK_PRINT; | |
| 474 VK_keymap[VK_CANCEL] = SDLK_BREAK; | |
| 475 VK_keymap[VK_APPS] = SDLK_MENU; | |
|
4162
3b7fc3416601
GAPI fixes from Stefan Klug
Sam Lantinga <slouken@libsdl.org>
parents:
4159
diff
changeset
|
476 |
|
3b7fc3416601
GAPI fixes from Stefan Klug
Sam Lantinga <slouken@libsdl.org>
parents:
4159
diff
changeset
|
477 Arrows_keymap[3] = 0x25; |
|
3b7fc3416601
GAPI fixes from Stefan Klug
Sam Lantinga <slouken@libsdl.org>
parents:
4159
diff
changeset
|
478 Arrows_keymap[2] = 0x26; |
|
3b7fc3416601
GAPI fixes from Stefan Klug
Sam Lantinga <slouken@libsdl.org>
parents:
4159
diff
changeset
|
479 Arrows_keymap[1] = 0x27; |
|
3b7fc3416601
GAPI fixes from Stefan Klug
Sam Lantinga <slouken@libsdl.org>
parents:
4159
diff
changeset
|
480 Arrows_keymap[0] = 0x28; |
| 0 | 481 } |
| 482 | |
|
1852
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
483 #define EXTKEYPAD(keypad) ((scancode & 0x100)?(mvke):(keypad)) |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
484 |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
485 static int SDL_MapVirtualKey(int scancode, int vkey) |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
486 { |
| 3868 | 487 #ifndef _WIN32_WCE |
|
1852
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
488 int mvke = MapVirtualKeyEx(scancode & 0xFF, 1, hLayoutUS); |
| 3868 | 489 #else |
| 490 int mvke = MapVirtualKey(scancode & 0xFF, 1); | |
| 491 #endif | |
|
1852
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
492 |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
493 switch(vkey) { |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
494 /* These are always correct */ |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
495 case VK_DIVIDE: |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
496 case VK_MULTIPLY: |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
497 case VK_SUBTRACT: |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
498 case VK_ADD: |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
499 case VK_LWIN: |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
500 case VK_RWIN: |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
501 case VK_APPS: |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
502 /* These are already handled */ |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
503 case VK_LCONTROL: |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
504 case VK_RCONTROL: |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
505 case VK_LSHIFT: |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
506 case VK_RSHIFT: |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
507 case VK_LMENU: |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
508 case VK_RMENU: |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
509 case VK_SNAPSHOT: |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
510 case VK_PAUSE: |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
511 return vkey; |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
512 } |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
513 switch(mvke) { |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
514 /* Distinguish between keypad and extended keys */ |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
515 case VK_INSERT: return EXTKEYPAD(VK_NUMPAD0); |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
516 case VK_DELETE: return EXTKEYPAD(VK_DECIMAL); |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
517 case VK_END: return EXTKEYPAD(VK_NUMPAD1); |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
518 case VK_DOWN: return EXTKEYPAD(VK_NUMPAD2); |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
519 case VK_NEXT: return EXTKEYPAD(VK_NUMPAD3); |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
520 case VK_LEFT: return EXTKEYPAD(VK_NUMPAD4); |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
521 case VK_CLEAR: return EXTKEYPAD(VK_NUMPAD5); |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
522 case VK_RIGHT: return EXTKEYPAD(VK_NUMPAD6); |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
523 case VK_HOME: return EXTKEYPAD(VK_NUMPAD7); |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
524 case VK_UP: return EXTKEYPAD(VK_NUMPAD8); |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
525 case VK_PRIOR: return EXTKEYPAD(VK_NUMPAD9); |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
526 } |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
527 return mvke?mvke:vkey; |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
528 } |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
529 |
|
1472
4aac8563c296
Fixed more Win64 portability issues
Sam Lantinga <slouken@libsdl.org>
parents:
1456
diff
changeset
|
530 static SDL_keysym *TranslateKey(WPARAM vkey, UINT scancode, SDL_keysym *keysym, int pressed) |
| 0 | 531 { |
| 532 /* Set the keysym information */ | |
| 533 keysym->scancode = (unsigned char) scancode; | |
| 534 keysym->mod = KMOD_NONE; | |
| 535 keysym->unicode = 0; | |
|
4162
3b7fc3416601
GAPI fixes from Stefan Klug
Sam Lantinga <slouken@libsdl.org>
parents:
4159
diff
changeset
|
536 |
|
3b7fc3416601
GAPI fixes from Stefan Klug
Sam Lantinga <slouken@libsdl.org>
parents:
4159
diff
changeset
|
537 if ((vkey == VK_RETURN) && (scancode & 0x100)) { |
|
3b7fc3416601
GAPI fixes from Stefan Klug
Sam Lantinga <slouken@libsdl.org>
parents:
4159
diff
changeset
|
538 /* No VK_ code for the keypad enter key */ |
|
3b7fc3416601
GAPI fixes from Stefan Klug
Sam Lantinga <slouken@libsdl.org>
parents:
4159
diff
changeset
|
539 keysym->sym = SDLK_KP_ENTER; |
|
3b7fc3416601
GAPI fixes from Stefan Klug
Sam Lantinga <slouken@libsdl.org>
parents:
4159
diff
changeset
|
540 } |
|
3b7fc3416601
GAPI fixes from Stefan Klug
Sam Lantinga <slouken@libsdl.org>
parents:
4159
diff
changeset
|
541 else { |
|
3b7fc3416601
GAPI fixes from Stefan Klug
Sam Lantinga <slouken@libsdl.org>
parents:
4159
diff
changeset
|
542 keysym->sym = VK_keymap[SDL_MapVirtualKey(scancode, vkey)]; |
|
3b7fc3416601
GAPI fixes from Stefan Klug
Sam Lantinga <slouken@libsdl.org>
parents:
4159
diff
changeset
|
543 } |
|
3b7fc3416601
GAPI fixes from Stefan Klug
Sam Lantinga <slouken@libsdl.org>
parents:
4159
diff
changeset
|
544 |
|
1253
7c7ddaf195bf
Implemented ToUnicode() support on Windows 95/98/ME/NT/2000/XP
Sam Lantinga <slouken@libsdl.org>
parents:
1251
diff
changeset
|
545 if ( pressed && SDL_TranslateUNICODE ) { |
| 0 | 546 #ifdef NO_GETKEYBOARDSTATE |
| 547 /* Uh oh, better hope the vkey is close enough.. */ | |
|
4162
3b7fc3416601
GAPI fixes from Stefan Klug
Sam Lantinga <slouken@libsdl.org>
parents:
4159
diff
changeset
|
548 if((keysym->sym == vkey) || (vkey > 0x7f)) |
| 0 | 549 keysym->unicode = vkey; |
| 550 #else | |
|
1253
7c7ddaf195bf
Implemented ToUnicode() support on Windows 95/98/ME/NT/2000/XP
Sam Lantinga <slouken@libsdl.org>
parents:
1251
diff
changeset
|
551 BYTE keystate[256]; |
|
7c7ddaf195bf
Implemented ToUnicode() support on Windows 95/98/ME/NT/2000/XP
Sam Lantinga <slouken@libsdl.org>
parents:
1251
diff
changeset
|
552 Uint16 wchars[2]; |
| 0 | 553 |
| 554 GetKeyboardState(keystate); | |
| 4170 | 555 /* Numlock isn't taken into account in ToUnicode, |
| 556 * so we handle it as a special case here */ | |
| 557 if ((keystate[VK_NUMLOCK] & 1) && vkey >= VK_NUMPAD0 && vkey <= VK_NUMPAD9) | |
| 558 { | |
| 559 keysym->unicode = vkey - VK_NUMPAD0 + '0'; | |
| 560 } | |
| 561 else if (SDL_ToUnicode((UINT)vkey, scancode, keystate, wchars, sizeof(wchars)/sizeof(wchars[0]), 0) > 0) | |
|
1253
7c7ddaf195bf
Implemented ToUnicode() support on Windows 95/98/ME/NT/2000/XP
Sam Lantinga <slouken@libsdl.org>
parents:
1251
diff
changeset
|
562 { |
|
7c7ddaf195bf
Implemented ToUnicode() support on Windows 95/98/ME/NT/2000/XP
Sam Lantinga <slouken@libsdl.org>
parents:
1251
diff
changeset
|
563 keysym->unicode = wchars[0]; |
| 0 | 564 } |
| 565 #endif /* NO_GETKEYBOARDSTATE */ | |
| 566 } | |
|
1852
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
567 |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
568 #if 0 |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
569 { |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
570 HKL hLayoutCurrent = GetKeyboardLayout(0); |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
571 int sc = scancode & 0xFF; |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
572 |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
573 printf("SYM:%d, VK:0x%02X, SC:0x%04X, US:(1:0x%02X, 3:0x%02X), " |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
574 "Current:(1:0x%02X, 3:0x%02X)\n", |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
575 keysym->sym, vkey, scancode, |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
576 MapVirtualKeyEx(sc, 1, hLayoutUS), |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
577 MapVirtualKeyEx(sc, 3, hLayoutUS), |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
578 MapVirtualKeyEx(sc, 1, hLayoutCurrent), |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
579 MapVirtualKeyEx(sc, 3, hLayoutCurrent) |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
580 ); |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
581 } |
|
eb2d5480ae95
Try to keep SDL keysyms sane regardless of keyboard layout in windib target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1526
diff
changeset
|
582 #endif |
| 0 | 583 return(keysym); |
| 584 } | |
| 585 | |
| 586 int DIB_CreateWindow(_THIS) | |
| 587 { | |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1330
diff
changeset
|
588 char *windowid = SDL_getenv("SDL_WINDOWID"); |
|
1152
51a8702d8ecd
Updates to PocketPC (WinCE) support, thanks to Dmitry Yakimov at
Ryan C. Gordon <icculus@icculus.org>
parents:
1048
diff
changeset
|
589 |
|
1288
ea3888b472bf
Cleaned up the app registration stuff a bit
Sam Lantinga <slouken@libsdl.org>
parents:
1282
diff
changeset
|
590 SDL_RegisterApp(NULL, 0, 0); |
|
1280
f61f045343d3
Re-query the SDL_WINDOWID each time we initialize the video
Sam Lantinga <slouken@libsdl.org>
parents:
1264
diff
changeset
|
591 |
|
f61f045343d3
Re-query the SDL_WINDOWID each time we initialize the video
Sam Lantinga <slouken@libsdl.org>
parents:
1264
diff
changeset
|
592 SDL_windowid = (windowid != NULL); |
| 0 | 593 if ( SDL_windowid ) { |
|
1152
51a8702d8ecd
Updates to PocketPC (WinCE) support, thanks to Dmitry Yakimov at
Ryan C. Gordon <icculus@icculus.org>
parents:
1048
diff
changeset
|
594 #if defined(_WIN32_WCE) && (_WIN32_WCE < 300) |
|
1280
f61f045343d3
Re-query the SDL_WINDOWID each time we initialize the video
Sam Lantinga <slouken@libsdl.org>
parents:
1264
diff
changeset
|
595 /* wince 2.1 does not have strtol */ |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1330
diff
changeset
|
596 wchar_t *windowid_t = SDL_malloc((SDL_strlen(windowid) + 1) * sizeof(wchar_t)); |
|
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1330
diff
changeset
|
597 MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, windowid, -1, windowid_t, SDL_strlen(windowid) + 1); |
|
1280
f61f045343d3
Re-query the SDL_WINDOWID each time we initialize the video
Sam Lantinga <slouken@libsdl.org>
parents:
1264
diff
changeset
|
598 SDL_Window = (HWND)wcstol(windowid_t, NULL, 0); |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1330
diff
changeset
|
599 SDL_free(windowid_t); |
|
1152
51a8702d8ecd
Updates to PocketPC (WinCE) support, thanks to Dmitry Yakimov at
Ryan C. Gordon <icculus@icculus.org>
parents:
1048
diff
changeset
|
600 #else |
|
1456
84de7511f79f
Fixed a bunch of 64-bit compatibility problems
Sam Lantinga <slouken@libsdl.org>
parents:
1433
diff
changeset
|
601 SDL_Window = (HWND)SDL_strtoull(windowid, NULL, 0); |
|
1152
51a8702d8ecd
Updates to PocketPC (WinCE) support, thanks to Dmitry Yakimov at
Ryan C. Gordon <icculus@icculus.org>
parents:
1048
diff
changeset
|
602 #endif |
|
974
b8427b5151ed
Restore the user specified window proc after shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
833
diff
changeset
|
603 if ( SDL_Window == NULL ) { |
|
b8427b5151ed
Restore the user specified window proc after shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
833
diff
changeset
|
604 SDL_SetError("Couldn't get user specified window"); |
|
b8427b5151ed
Restore the user specified window proc after shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
833
diff
changeset
|
605 return(-1); |
|
b8427b5151ed
Restore the user specified window proc after shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
833
diff
changeset
|
606 } |
|
b8427b5151ed
Restore the user specified window proc after shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
833
diff
changeset
|
607 |
|
b8427b5151ed
Restore the user specified window proc after shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
833
diff
changeset
|
608 /* DJM: we want all event's for the user specified |
|
b8427b5151ed
Restore the user specified window proc after shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
833
diff
changeset
|
609 window to be handled by SDL. |
|
b8427b5151ed
Restore the user specified window proc after shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
833
diff
changeset
|
610 */ |
|
1472
4aac8563c296
Fixed more Win64 portability issues
Sam Lantinga <slouken@libsdl.org>
parents:
1456
diff
changeset
|
611 userWindowProc = (WNDPROCTYPE)GetWindowLongPtr(SDL_Window, GWLP_WNDPROC); |
|
4aac8563c296
Fixed more Win64 portability issues
Sam Lantinga <slouken@libsdl.org>
parents:
1456
diff
changeset
|
612 SetWindowLongPtr(SDL_Window, GWLP_WNDPROC, (LONG_PTR)WinMessage); |
| 0 | 613 } else { |
| 614 SDL_Window = CreateWindow(SDL_Appname, SDL_Appname, | |
| 615 (WS_OVERLAPPED|WS_CAPTION|WS_SYSMENU|WS_MINIMIZEBOX), | |
|
833
31fa08b36380
Added support for SDL_VIDEO_WINDOW_POS and SDL_VIDEO_CENTERED on Windows
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
616 CW_USEDEFAULT, CW_USEDEFAULT, 0, 0, NULL, NULL, SDL_Instance, NULL); |
| 0 | 617 if ( SDL_Window == NULL ) { |
| 618 SDL_SetError("Couldn't create window"); | |
| 619 return(-1); | |
| 620 } | |
| 621 ShowWindow(SDL_Window, SW_HIDE); | |
| 622 } | |
| 1523 | 623 |
| 624 /* JC 14 Mar 2006 | |
| 625 Flush the message loop or this can cause big problems later | |
| 626 Especially if the user decides to use dialog boxes or assert()! | |
| 627 */ | |
| 628 WIN_FlushMessageQueue(); | |
| 629 | |
| 0 | 630 return(0); |
| 631 } | |
| 632 | |
| 633 void DIB_DestroyWindow(_THIS) | |
| 634 { | |
|
974
b8427b5151ed
Restore the user specified window proc after shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
833
diff
changeset
|
635 if ( SDL_windowid ) { |
|
1472
4aac8563c296
Fixed more Win64 portability issues
Sam Lantinga <slouken@libsdl.org>
parents:
1456
diff
changeset
|
636 SetWindowLongPtr(SDL_Window, GWLP_WNDPROC, (LONG_PTR)userWindowProc); |
|
974
b8427b5151ed
Restore the user specified window proc after shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
833
diff
changeset
|
637 } else { |
| 0 | 638 DestroyWindow(SDL_Window); |
| 639 } | |
|
1288
ea3888b472bf
Cleaned up the app registration stuff a bit
Sam Lantinga <slouken@libsdl.org>
parents:
1282
diff
changeset
|
640 SDL_UnregisterApp(); |
| 1523 | 641 |
| 642 /* JC 14 Mar 2006 | |
| 643 Flush the message loop or this can cause big problems later | |
| 644 Especially if the user decides to use dialog boxes or assert()! | |
| 645 */ | |
| 646 WIN_FlushMessageQueue(); | |
| 0 | 647 } |