Mercurial > sdl-ios-xcode
annotate src/video/windib/SDL_dibevents.c @ 1554:0ca607a5d173
Fixed bug #84
Date: Sun, 23 Oct 2005 16:39:03 +0200
From: "A. Schmid" <sahib@phreaker.net>
Subject: [SDL] no software surfaces with svgalib driver?
Hi,
I noticed that the SDL (1.2.9) svgalib driver only makes use of linear
addressable (framebuffer) video modes. On older systems (like one of
mine), linear addressable modes are often not available.
Especially for cards with VESA VBE < 2.0 the svgalib vesa driver is
unusable, since VESA only supports framebuffering for VBE 2.0 and later.
The changes necessary to add support for software surfaces seem to be
relatively small. I only had to hack src/video/svga/SDL_svgavideo.c (see
attached patch). The code worked fine for me, but it is no more than a
proof of concept and should be reviewed (probably has a memory leak when
switching modes). It also uses the vgagl library (included in the
svgalib package) and needs to be linked against it.
-Alex
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Sun, 19 Mar 2006 12:04:40 +0000 |
| parents | 89f90f32f6c0 |
| children | 782fd950bd46 eb2d5480ae95 |
| 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:
1303
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:
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" |
| 0 | 33 #include "SDL_dibvideo.h" |
| 34 #include "SDL_vkeys.h" | |
| 35 | |
| 36 #ifndef WM_APP | |
| 37 #define WM_APP 0x8000 | |
| 38 #endif | |
| 39 | |
| 40 #ifdef _WIN32_WCE | |
| 41 #define NO_GETKEYBOARDSTATE | |
| 42 #endif | |
| 43 | |
| 44 /* The translation table from a Microsoft VK keysym to a SDL keysym */ | |
| 45 static SDLKey VK_keymap[SDLK_LAST]; | |
|
1472
4aac8563c296
Fixed more Win64 portability issues
Sam Lantinga <slouken@libsdl.org>
parents:
1456
diff
changeset
|
46 static SDL_keysym *TranslateKey(WPARAM vkey, UINT scancode, SDL_keysym *keysym, int pressed); |
| 0 | 47 |
| 48 /* Masks for processing the windows KEYDOWN and KEYUP messages */ | |
| 49 #define REPEATED_KEYMASK (1<<30) | |
| 50 #define EXTENDED_KEYMASK (1<<24) | |
| 51 | |
|
145
29a638dc26db
Applied David MacCormack's patch to fix SDL_WINDOWID on Windows,
Sam Lantinga <slouken@libsdl.org>
parents:
140
diff
changeset
|
52 /* 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
|
53 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
|
54 #ifdef STRICT |
|
52b5afd7ecee
Date: Tue, 05 Jul 2005 21:43:26 +1000
Sam Lantinga <slouken@libsdl.org>
parents:
1288
diff
changeset
|
55 #define WNDPROCTYPE WNDPROC |
|
52b5afd7ecee
Date: Tue, 05 Jul 2005 21:43:26 +1000
Sam Lantinga <slouken@libsdl.org>
parents:
1288
diff
changeset
|
56 #else |
|
52b5afd7ecee
Date: Tue, 05 Jul 2005 21:43:26 +1000
Sam Lantinga <slouken@libsdl.org>
parents:
1288
diff
changeset
|
57 #define WNDPROCTYPE FARPROC |
|
52b5afd7ecee
Date: Tue, 05 Jul 2005 21:43:26 +1000
Sam Lantinga <slouken@libsdl.org>
parents:
1288
diff
changeset
|
58 #endif |
|
52b5afd7ecee
Date: Tue, 05 Jul 2005 21:43:26 +1000
Sam Lantinga <slouken@libsdl.org>
parents:
1288
diff
changeset
|
59 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
|
60 |
|
1251
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
61 |
|
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
62 #ifdef _WIN32_WCE |
|
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
63 |
|
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
64 WPARAM rotateKey(WPARAM key,SDL_ScreenOrientation direction) |
|
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
65 { |
|
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
66 if (direction != SDL_ORIENTATION_LEFT) |
|
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
67 return key; |
|
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
68 |
|
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
69 switch (key) { |
|
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
70 case 0x26: /* up */ |
|
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
71 return 0x27; |
|
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
72 case 0x27: /* right */ |
|
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
73 return 0x28; |
|
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
74 case 0x28: /* down */ |
|
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
75 return 0x25; |
|
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
76 case 0x25: /* left */ |
|
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
77 return 0x26; |
|
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
78 } |
|
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
79 |
|
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
80 return key; |
|
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
81 } |
|
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
82 |
|
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
83 #endif |
|
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
84 |
|
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
85 |
| 0 | 86 /* The main Win32 event handler */ |
|
1456
84de7511f79f
Fixed a bunch of 64-bit compatibility problems
Sam Lantinga <slouken@libsdl.org>
parents:
1433
diff
changeset
|
87 LRESULT DIB_HandleMessage(_THIS, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) |
| 0 | 88 { |
| 89 extern int posted; | |
| 90 | |
| 91 switch (msg) { | |
| 92 case WM_SYSKEYDOWN: | |
| 93 case WM_KEYDOWN: { | |
| 94 SDL_keysym keysym; | |
| 95 | |
|
1251
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
96 #ifdef _WIN32_WCE |
|
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
97 // Drop GAPI artefacts |
|
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
98 if (wParam == 0x84 || wParam == 0x5B) |
|
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
99 return 0; |
|
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
100 |
|
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
101 // Rotate key if necessary |
|
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
102 if (this->hidden->orientation != SDL_ORIENTATION_UP) |
|
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
103 wParam = rotateKey(wParam, this->hidden->orientation); |
|
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
104 #endif |
| 0 | 105 /* Ignore repeated keys */ |
| 106 if ( lParam&REPEATED_KEYMASK ) { | |
| 107 return(0); | |
| 108 } | |
| 109 switch (wParam) { | |
| 110 case VK_CONTROL: | |
| 111 if ( lParam&EXTENDED_KEYMASK ) | |
| 112 wParam = VK_RCONTROL; | |
| 113 else | |
| 114 wParam = VK_LCONTROL; | |
| 115 break; | |
| 116 case VK_SHIFT: | |
| 117 /* 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
|
118 { |
|
217f5d5a49e5
Date: Sat, 15 Jan 2005 02:01:51 +0000 (UTC)
Sam Lantinga <slouken@libsdl.org>
parents:
1280
diff
changeset
|
119 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
|
120 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
|
121 wParam = VK_LSHIFT; |
|
1282
217f5d5a49e5
Date: Sat, 15 Jan 2005 02:01:51 +0000 (UTC)
Sam Lantinga <slouken@libsdl.org>
parents:
1280
diff
changeset
|
122 } 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
|
123 wParam = VK_RSHIFT; |
|
2312d983e1fe
Fixed left/right shift detection on Windows (thanks Mike!)
Sam Lantinga <slouken@libsdl.org>
parents:
523
diff
changeset
|
124 } else { |
|
1282
217f5d5a49e5
Date: Sat, 15 Jan 2005 02:01:51 +0000 (UTC)
Sam Lantinga <slouken@libsdl.org>
parents:
1280
diff
changeset
|
125 /* Probably a key repeat */ |
|
217f5d5a49e5
Date: Sat, 15 Jan 2005 02:01:51 +0000 (UTC)
Sam Lantinga <slouken@libsdl.org>
parents:
1280
diff
changeset
|
126 return(0); |
|
217f5d5a49e5
Date: Sat, 15 Jan 2005 02:01:51 +0000 (UTC)
Sam Lantinga <slouken@libsdl.org>
parents:
1280
diff
changeset
|
127 } |
|
558
2312d983e1fe
Fixed left/right shift detection on Windows (thanks Mike!)
Sam Lantinga <slouken@libsdl.org>
parents:
523
diff
changeset
|
128 } |
| 0 | 129 break; |
| 130 case VK_MENU: | |
| 131 if ( lParam&EXTENDED_KEYMASK ) | |
| 132 wParam = VK_RMENU; | |
| 133 else | |
| 134 wParam = VK_LMENU; | |
| 135 break; | |
| 136 } | |
|
112
9ef74357a5fb
Incorporated slightly modified version of Rainer's WinCE patch
Sam Lantinga <slouken@lokigames.com>
parents:
36
diff
changeset
|
137 #ifdef NO_GETKEYBOARDSTATE |
|
9ef74357a5fb
Incorporated slightly modified version of Rainer's WinCE patch
Sam Lantinga <slouken@lokigames.com>
parents:
36
diff
changeset
|
138 /* 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
|
139 if ( SDL_TranslateUNICODE ) { |
|
140
3c35d8f160bd
Fixed compiling on Windows CE
Sam Lantinga <slouken@libsdl.org>
parents:
112
diff
changeset
|
140 MSG m; |
|
112
9ef74357a5fb
Incorporated slightly modified version of Rainer's WinCE patch
Sam Lantinga <slouken@lokigames.com>
parents:
36
diff
changeset
|
141 |
|
140
3c35d8f160bd
Fixed compiling on Windows CE
Sam Lantinga <slouken@libsdl.org>
parents:
112
diff
changeset
|
142 m.hwnd = hwnd; |
|
3c35d8f160bd
Fixed compiling on Windows CE
Sam Lantinga <slouken@libsdl.org>
parents:
112
diff
changeset
|
143 m.message = msg; |
|
3c35d8f160bd
Fixed compiling on Windows CE
Sam Lantinga <slouken@libsdl.org>
parents:
112
diff
changeset
|
144 m.wParam = wParam; |
|
3c35d8f160bd
Fixed compiling on Windows CE
Sam Lantinga <slouken@libsdl.org>
parents:
112
diff
changeset
|
145 m.lParam = lParam; |
|
3c35d8f160bd
Fixed compiling on Windows CE
Sam Lantinga <slouken@libsdl.org>
parents:
112
diff
changeset
|
146 m.time = 0; |
|
3c35d8f160bd
Fixed compiling on Windows CE
Sam Lantinga <slouken@libsdl.org>
parents:
112
diff
changeset
|
147 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
|
148 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
|
149 wParam = m.wParam; |
|
9ef74357a5fb
Incorporated slightly modified version of Rainer's WinCE patch
Sam Lantinga <slouken@lokigames.com>
parents:
36
diff
changeset
|
150 } |
|
9ef74357a5fb
Incorporated slightly modified version of Rainer's WinCE patch
Sam Lantinga <slouken@lokigames.com>
parents:
36
diff
changeset
|
151 } |
|
9ef74357a5fb
Incorporated slightly modified version of Rainer's WinCE patch
Sam Lantinga <slouken@lokigames.com>
parents:
36
diff
changeset
|
152 #endif /* NO_GETKEYBOARDSTATE */ |
| 0 | 153 posted = SDL_PrivateKeyboard(SDL_PRESSED, |
| 154 TranslateKey(wParam,HIWORD(lParam),&keysym,1)); | |
| 155 } | |
| 156 return(0); | |
| 157 | |
| 158 case WM_SYSKEYUP: | |
| 159 case WM_KEYUP: { | |
| 160 SDL_keysym keysym; | |
| 161 | |
|
1251
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
162 #ifdef _WIN32_WCE |
| 1526 | 163 // Drop GAPI artifacts |
|
1251
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
164 if (wParam == 0x84 || wParam == 0x5B) |
|
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
165 return 0; |
|
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
166 |
|
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
167 // Rotate key if necessary |
|
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
168 if (this->hidden->orientation != SDL_ORIENTATION_UP) |
|
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
169 wParam = rotateKey(wParam, this->hidden->orientation); |
|
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
170 #endif |
|
86d0d01290ea
Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode,
Ryan C. Gordon <icculus@icculus.org>
parents:
1152
diff
changeset
|
171 |
| 0 | 172 switch (wParam) { |
| 173 case VK_CONTROL: | |
| 174 if ( lParam&EXTENDED_KEYMASK ) | |
| 175 wParam = VK_RCONTROL; | |
| 176 else | |
| 177 wParam = VK_LCONTROL; | |
| 178 break; | |
| 179 case VK_SHIFT: | |
| 180 /* 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
|
181 { |
|
217f5d5a49e5
Date: Sat, 15 Jan 2005 02:01:51 +0000 (UTC)
Sam Lantinga <slouken@libsdl.org>
parents:
1280
diff
changeset
|
182 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
|
183 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
|
184 wParam = VK_LSHIFT; |
|
1282
217f5d5a49e5
Date: Sat, 15 Jan 2005 02:01:51 +0000 (UTC)
Sam Lantinga <slouken@libsdl.org>
parents:
1280
diff
changeset
|
185 } 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
|
186 wParam = VK_RSHIFT; |
|
4c740ee76027
Mike Nordell _really_ fixed Win32 windib shift state handling this time. :)
Sam Lantinga <slouken@libsdl.org>
parents:
558
diff
changeset
|
187 } else { |
|
1282
217f5d5a49e5
Date: Sat, 15 Jan 2005 02:01:51 +0000 (UTC)
Sam Lantinga <slouken@libsdl.org>
parents:
1280
diff
changeset
|
188 /* Probably a key repeat */ |
|
217f5d5a49e5
Date: Sat, 15 Jan 2005 02:01:51 +0000 (UTC)
Sam Lantinga <slouken@libsdl.org>
parents:
1280
diff
changeset
|
189 return(0); |
|
217f5d5a49e5
Date: Sat, 15 Jan 2005 02:01:51 +0000 (UTC)
Sam Lantinga <slouken@libsdl.org>
parents:
1280
diff
changeset
|
190 } |
|
572
4c740ee76027
Mike Nordell _really_ fixed Win32 windib shift state handling this time. :)
Sam Lantinga <slouken@libsdl.org>
parents:
558
diff
changeset
|
191 } |
| 0 | 192 break; |
| 193 case VK_MENU: | |
| 194 if ( lParam&EXTENDED_KEYMASK ) | |
| 195 wParam = VK_RMENU; | |
| 196 else | |
| 197 wParam = VK_LMENU; | |
| 198 break; | |
| 199 } | |
| 1526 | 200 /* Windows only reports keyup for print screen */ |
| 201 if ( wParam == VK_SNAPSHOT && SDL_GetKeyState(NULL)[SDLK_PRINT] == SDL_RELEASED ) { | |
| 202 posted = SDL_PrivateKeyboard(SDL_PRESSED, | |
| 203 TranslateKey(wParam,HIWORD(lParam),&keysym,1)); | |
| 204 } | |
| 0 | 205 posted = SDL_PrivateKeyboard(SDL_RELEASED, |
| 206 TranslateKey(wParam,HIWORD(lParam),&keysym,0)); | |
| 207 } | |
| 208 return(0); | |
| 209 | |
|
726
5429a06aa816
SDL12: Disable screensaver in windib driver.
Ryan C. Gordon <icculus@icculus.org>
parents:
721
diff
changeset
|
210 #if defined(SC_SCREENSAVE) && defined(SC_MONITORPOWER) |
|
5429a06aa816
SDL12: Disable screensaver in windib driver.
Ryan C. Gordon <icculus@icculus.org>
parents:
721
diff
changeset
|
211 case WM_SYSCOMMAND: { |
|
5429a06aa816
SDL12: Disable screensaver in windib driver.
Ryan C. Gordon <icculus@icculus.org>
parents:
721
diff
changeset
|
212 if ((wParam&0xFFF0)==SC_SCREENSAVE || |
|
5429a06aa816
SDL12: Disable screensaver in windib driver.
Ryan C. Gordon <icculus@icculus.org>
parents:
721
diff
changeset
|
213 (wParam&0xFFF0)==SC_MONITORPOWER) |
|
5429a06aa816
SDL12: Disable screensaver in windib driver.
Ryan C. Gordon <icculus@icculus.org>
parents:
721
diff
changeset
|
214 return(0); |
|
5429a06aa816
SDL12: Disable screensaver in windib driver.
Ryan C. Gordon <icculus@icculus.org>
parents:
721
diff
changeset
|
215 } |
|
5429a06aa816
SDL12: Disable screensaver in windib driver.
Ryan C. Gordon <icculus@icculus.org>
parents:
721
diff
changeset
|
216 /* Fall through to default processing */ |
|
5429a06aa816
SDL12: Disable screensaver in windib driver.
Ryan C. Gordon <icculus@icculus.org>
parents:
721
diff
changeset
|
217 #endif /* SC_SCREENSAVE && SC_MONITORPOWER */ |
|
5429a06aa816
SDL12: Disable screensaver in windib driver.
Ryan C. Gordon <icculus@icculus.org>
parents:
721
diff
changeset
|
218 |
| 0 | 219 default: { |
| 220 /* Only post the event if we're watching for it */ | |
| 221 if ( SDL_ProcessEvents[SDL_SYSWMEVENT] == SDL_ENABLE ) { | |
| 222 SDL_SysWMmsg wmmsg; | |
| 223 | |
| 224 SDL_VERSION(&wmmsg.version); | |
| 225 wmmsg.hwnd = hwnd; | |
| 226 wmmsg.msg = msg; | |
| 227 wmmsg.wParam = wParam; | |
| 228 wmmsg.lParam = lParam; | |
| 229 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
|
230 |
|
29a638dc26db
Applied David MacCormack's patch to fix SDL_WINDOWID on Windows,
Sam Lantinga <slouken@libsdl.org>
parents:
140
diff
changeset
|
231 /* 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
|
232 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
|
233 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
|
234 */ |
|
29a638dc26db
Applied David MacCormack's patch to fix SDL_WINDOWID on Windows,
Sam Lantinga <slouken@libsdl.org>
parents:
140
diff
changeset
|
235 } else if (userWindowProc) { |
|
721
ab0656314eef
Date: Thu, 18 Sep 2003 14:24:35 -0400
Sam Lantinga <slouken@libsdl.org>
parents:
572
diff
changeset
|
236 return CallWindowProc(userWindowProc, hwnd, msg, wParam, lParam); |
| 0 | 237 } |
| 238 } | |
| 239 break; | |
| 240 } | |
| 241 return(DefWindowProc(hwnd, msg, wParam, lParam)); | |
| 242 } | |
| 243 | |
| 244 void DIB_PumpEvents(_THIS) | |
| 245 { | |
| 246 MSG msg; | |
| 247 | |
|
523
c210010f50f4
Fixed windows event handling for ActiveX controls (thanks Huib-Jan!)
Sam Lantinga <slouken@libsdl.org>
parents:
515
diff
changeset
|
248 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
|
249 if ( GetMessage(&msg, NULL, 0, 0) > 0 ) { |
| 0 | 250 DispatchMessage(&msg); |
| 251 } | |
| 252 } | |
| 253 } | |
| 254 | |
| 255 void DIB_InitOSKeymap(_THIS) | |
| 256 { | |
| 257 int i; | |
| 258 | |
| 259 /* Map the VK keysyms */ | |
|
1379
c0a74f199ecf
Use only safe string functions
Sam Lantinga <slouken@libsdl.org>
parents:
1361
diff
changeset
|
260 for ( i=0; i<SDL_arraysize(VK_keymap); ++i ) |
| 0 | 261 VK_keymap[i] = SDLK_UNKNOWN; |
| 262 | |
| 263 VK_keymap[VK_BACK] = SDLK_BACKSPACE; | |
| 264 VK_keymap[VK_TAB] = SDLK_TAB; | |
| 265 VK_keymap[VK_CLEAR] = SDLK_CLEAR; | |
| 266 VK_keymap[VK_RETURN] = SDLK_RETURN; | |
| 267 VK_keymap[VK_PAUSE] = SDLK_PAUSE; | |
| 268 VK_keymap[VK_ESCAPE] = SDLK_ESCAPE; | |
| 269 VK_keymap[VK_SPACE] = SDLK_SPACE; | |
| 270 VK_keymap[VK_APOSTROPHE] = SDLK_QUOTE; | |
| 271 VK_keymap[VK_COMMA] = SDLK_COMMA; | |
| 272 VK_keymap[VK_MINUS] = SDLK_MINUS; | |
| 273 VK_keymap[VK_PERIOD] = SDLK_PERIOD; | |
| 274 VK_keymap[VK_SLASH] = SDLK_SLASH; | |
| 275 VK_keymap[VK_0] = SDLK_0; | |
| 276 VK_keymap[VK_1] = SDLK_1; | |
| 277 VK_keymap[VK_2] = SDLK_2; | |
| 278 VK_keymap[VK_3] = SDLK_3; | |
| 279 VK_keymap[VK_4] = SDLK_4; | |
| 280 VK_keymap[VK_5] = SDLK_5; | |
| 281 VK_keymap[VK_6] = SDLK_6; | |
| 282 VK_keymap[VK_7] = SDLK_7; | |
| 283 VK_keymap[VK_8] = SDLK_8; | |
| 284 VK_keymap[VK_9] = SDLK_9; | |
| 285 VK_keymap[VK_SEMICOLON] = SDLK_SEMICOLON; | |
| 286 VK_keymap[VK_EQUALS] = SDLK_EQUALS; | |
| 287 VK_keymap[VK_LBRACKET] = SDLK_LEFTBRACKET; | |
| 288 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
|
289 VK_keymap[VK_OEM_102] = SDLK_LESS; |
| 0 | 290 VK_keymap[VK_RBRACKET] = SDLK_RIGHTBRACKET; |
| 291 VK_keymap[VK_GRAVE] = SDLK_BACKQUOTE; | |
|
327
13fc64213765
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
292 VK_keymap[VK_BACKTICK] = SDLK_BACKQUOTE; |
| 0 | 293 VK_keymap[VK_A] = SDLK_a; |
| 294 VK_keymap[VK_B] = SDLK_b; | |
| 295 VK_keymap[VK_C] = SDLK_c; | |
| 296 VK_keymap[VK_D] = SDLK_d; | |
| 297 VK_keymap[VK_E] = SDLK_e; | |
| 298 VK_keymap[VK_F] = SDLK_f; | |
| 299 VK_keymap[VK_G] = SDLK_g; | |
| 300 VK_keymap[VK_H] = SDLK_h; | |
| 301 VK_keymap[VK_I] = SDLK_i; | |
| 302 VK_keymap[VK_J] = SDLK_j; | |
| 303 VK_keymap[VK_K] = SDLK_k; | |
| 304 VK_keymap[VK_L] = SDLK_l; | |
| 305 VK_keymap[VK_M] = SDLK_m; | |
| 306 VK_keymap[VK_N] = SDLK_n; | |
| 307 VK_keymap[VK_O] = SDLK_o; | |
| 308 VK_keymap[VK_P] = SDLK_p; | |
| 309 VK_keymap[VK_Q] = SDLK_q; | |
| 310 VK_keymap[VK_R] = SDLK_r; | |
| 311 VK_keymap[VK_S] = SDLK_s; | |
| 312 VK_keymap[VK_T] = SDLK_t; | |
| 313 VK_keymap[VK_U] = SDLK_u; | |
| 314 VK_keymap[VK_V] = SDLK_v; | |
| 315 VK_keymap[VK_W] = SDLK_w; | |
| 316 VK_keymap[VK_X] = SDLK_x; | |
| 317 VK_keymap[VK_Y] = SDLK_y; | |
| 318 VK_keymap[VK_Z] = SDLK_z; | |
| 319 VK_keymap[VK_DELETE] = SDLK_DELETE; | |
| 320 | |
| 321 VK_keymap[VK_NUMPAD0] = SDLK_KP0; | |
| 322 VK_keymap[VK_NUMPAD1] = SDLK_KP1; | |
| 323 VK_keymap[VK_NUMPAD2] = SDLK_KP2; | |
| 324 VK_keymap[VK_NUMPAD3] = SDLK_KP3; | |
| 325 VK_keymap[VK_NUMPAD4] = SDLK_KP4; | |
| 326 VK_keymap[VK_NUMPAD5] = SDLK_KP5; | |
| 327 VK_keymap[VK_NUMPAD6] = SDLK_KP6; | |
| 328 VK_keymap[VK_NUMPAD7] = SDLK_KP7; | |
| 329 VK_keymap[VK_NUMPAD8] = SDLK_KP8; | |
| 330 VK_keymap[VK_NUMPAD9] = SDLK_KP9; | |
| 331 VK_keymap[VK_DECIMAL] = SDLK_KP_PERIOD; | |
| 332 VK_keymap[VK_DIVIDE] = SDLK_KP_DIVIDE; | |
| 333 VK_keymap[VK_MULTIPLY] = SDLK_KP_MULTIPLY; | |
| 334 VK_keymap[VK_SUBTRACT] = SDLK_KP_MINUS; | |
| 335 VK_keymap[VK_ADD] = SDLK_KP_PLUS; | |
| 336 | |
| 337 VK_keymap[VK_UP] = SDLK_UP; | |
| 338 VK_keymap[VK_DOWN] = SDLK_DOWN; | |
| 339 VK_keymap[VK_RIGHT] = SDLK_RIGHT; | |
| 340 VK_keymap[VK_LEFT] = SDLK_LEFT; | |
| 341 VK_keymap[VK_INSERT] = SDLK_INSERT; | |
| 342 VK_keymap[VK_HOME] = SDLK_HOME; | |
| 343 VK_keymap[VK_END] = SDLK_END; | |
| 344 VK_keymap[VK_PRIOR] = SDLK_PAGEUP; | |
| 345 VK_keymap[VK_NEXT] = SDLK_PAGEDOWN; | |
| 346 | |
| 347 VK_keymap[VK_F1] = SDLK_F1; | |
| 348 VK_keymap[VK_F2] = SDLK_F2; | |
| 349 VK_keymap[VK_F3] = SDLK_F3; | |
| 350 VK_keymap[VK_F4] = SDLK_F4; | |
| 351 VK_keymap[VK_F5] = SDLK_F5; | |
| 352 VK_keymap[VK_F6] = SDLK_F6; | |
| 353 VK_keymap[VK_F7] = SDLK_F7; | |
| 354 VK_keymap[VK_F8] = SDLK_F8; | |
| 355 VK_keymap[VK_F9] = SDLK_F9; | |
| 356 VK_keymap[VK_F10] = SDLK_F10; | |
| 357 VK_keymap[VK_F11] = SDLK_F11; | |
| 358 VK_keymap[VK_F12] = SDLK_F12; | |
| 359 VK_keymap[VK_F13] = SDLK_F13; | |
| 360 VK_keymap[VK_F14] = SDLK_F14; | |
| 361 VK_keymap[VK_F15] = SDLK_F15; | |
| 362 | |
| 363 VK_keymap[VK_NUMLOCK] = SDLK_NUMLOCK; | |
| 364 VK_keymap[VK_CAPITAL] = SDLK_CAPSLOCK; | |
| 365 VK_keymap[VK_SCROLL] = SDLK_SCROLLOCK; | |
| 366 VK_keymap[VK_RSHIFT] = SDLK_RSHIFT; | |
| 367 VK_keymap[VK_LSHIFT] = SDLK_LSHIFT; | |
| 368 VK_keymap[VK_RCONTROL] = SDLK_RCTRL; | |
| 369 VK_keymap[VK_LCONTROL] = SDLK_LCTRL; | |
| 370 VK_keymap[VK_RMENU] = SDLK_RALT; | |
| 371 VK_keymap[VK_LMENU] = SDLK_LALT; | |
| 372 VK_keymap[VK_RWIN] = SDLK_RSUPER; | |
| 373 VK_keymap[VK_LWIN] = SDLK_LSUPER; | |
| 374 | |
| 375 VK_keymap[VK_HELP] = SDLK_HELP; | |
| 376 #ifdef VK_PRINT | |
| 377 VK_keymap[VK_PRINT] = SDLK_PRINT; | |
| 378 #endif | |
| 379 VK_keymap[VK_SNAPSHOT] = SDLK_PRINT; | |
| 380 VK_keymap[VK_CANCEL] = SDLK_BREAK; | |
| 381 VK_keymap[VK_APPS] = SDLK_MENU; | |
| 382 } | |
| 383 | |
|
1472
4aac8563c296
Fixed more Win64 portability issues
Sam Lantinga <slouken@libsdl.org>
parents:
1456
diff
changeset
|
384 static SDL_keysym *TranslateKey(WPARAM vkey, UINT scancode, SDL_keysym *keysym, int pressed) |
| 0 | 385 { |
| 386 /* Set the keysym information */ | |
| 387 keysym->scancode = (unsigned char) scancode; | |
| 388 keysym->sym = VK_keymap[vkey]; | |
| 389 keysym->mod = KMOD_NONE; | |
| 390 keysym->unicode = 0; | |
|
1253
7c7ddaf195bf
Implemented ToUnicode() support on Windows 95/98/ME/NT/2000/XP
Sam Lantinga <slouken@libsdl.org>
parents:
1251
diff
changeset
|
391 if ( pressed && SDL_TranslateUNICODE ) { |
| 0 | 392 #ifdef NO_GETKEYBOARDSTATE |
| 393 /* Uh oh, better hope the vkey is close enough.. */ | |
| 394 keysym->unicode = vkey; | |
| 395 #else | |
|
1253
7c7ddaf195bf
Implemented ToUnicode() support on Windows 95/98/ME/NT/2000/XP
Sam Lantinga <slouken@libsdl.org>
parents:
1251
diff
changeset
|
396 BYTE keystate[256]; |
|
7c7ddaf195bf
Implemented ToUnicode() support on Windows 95/98/ME/NT/2000/XP
Sam Lantinga <slouken@libsdl.org>
parents:
1251
diff
changeset
|
397 Uint16 wchars[2]; |
| 0 | 398 |
| 399 GetKeyboardState(keystate); | |
| 1480 | 400 if (SDL_ToUnicode((UINT)vkey, scancode, keystate, wchars, sizeof(wchars)/sizeof(wchars[0]), 0) == 1) |
|
1253
7c7ddaf195bf
Implemented ToUnicode() support on Windows 95/98/ME/NT/2000/XP
Sam Lantinga <slouken@libsdl.org>
parents:
1251
diff
changeset
|
401 { |
|
7c7ddaf195bf
Implemented ToUnicode() support on Windows 95/98/ME/NT/2000/XP
Sam Lantinga <slouken@libsdl.org>
parents:
1251
diff
changeset
|
402 keysym->unicode = wchars[0]; |
| 0 | 403 } |
| 404 #endif /* NO_GETKEYBOARDSTATE */ | |
| 405 } | |
| 406 return(keysym); | |
| 407 } | |
| 408 | |
| 409 int DIB_CreateWindow(_THIS) | |
| 410 { | |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1330
diff
changeset
|
411 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
|
412 |
|
1288
ea3888b472bf
Cleaned up the app registration stuff a bit
Sam Lantinga <slouken@libsdl.org>
parents:
1282
diff
changeset
|
413 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
|
414 |
|
f61f045343d3
Re-query the SDL_WINDOWID each time we initialize the video
Sam Lantinga <slouken@libsdl.org>
parents:
1264
diff
changeset
|
415 SDL_windowid = (windowid != NULL); |
| 0 | 416 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
|
417 #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
|
418 /* 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
|
419 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
|
420 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
|
421 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
|
422 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
|
423 #else |
|
1456
84de7511f79f
Fixed a bunch of 64-bit compatibility problems
Sam Lantinga <slouken@libsdl.org>
parents:
1433
diff
changeset
|
424 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
|
425 #endif |
|
974
b8427b5151ed
Restore the user specified window proc after shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
833
diff
changeset
|
426 if ( SDL_Window == NULL ) { |
|
b8427b5151ed
Restore the user specified window proc after shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
833
diff
changeset
|
427 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
|
428 return(-1); |
|
b8427b5151ed
Restore the user specified window proc after shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
833
diff
changeset
|
429 } |
|
b8427b5151ed
Restore the user specified window proc after shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
833
diff
changeset
|
430 |
|
b8427b5151ed
Restore the user specified window proc after shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
833
diff
changeset
|
431 /* 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
|
432 window to be handled by SDL. |
|
b8427b5151ed
Restore the user specified window proc after shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
833
diff
changeset
|
433 */ |
|
1472
4aac8563c296
Fixed more Win64 portability issues
Sam Lantinga <slouken@libsdl.org>
parents:
1456
diff
changeset
|
434 userWindowProc = (WNDPROCTYPE)GetWindowLongPtr(SDL_Window, GWLP_WNDPROC); |
|
4aac8563c296
Fixed more Win64 portability issues
Sam Lantinga <slouken@libsdl.org>
parents:
1456
diff
changeset
|
435 SetWindowLongPtr(SDL_Window, GWLP_WNDPROC, (LONG_PTR)WinMessage); |
| 0 | 436 } else { |
| 437 SDL_Window = CreateWindow(SDL_Appname, SDL_Appname, | |
| 438 (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
|
439 CW_USEDEFAULT, CW_USEDEFAULT, 0, 0, NULL, NULL, SDL_Instance, NULL); |
| 0 | 440 if ( SDL_Window == NULL ) { |
| 441 SDL_SetError("Couldn't create window"); | |
| 442 return(-1); | |
| 443 } | |
| 444 ShowWindow(SDL_Window, SW_HIDE); | |
| 445 } | |
| 1523 | 446 |
| 447 /* JC 14 Mar 2006 | |
| 448 Flush the message loop or this can cause big problems later | |
| 449 Especially if the user decides to use dialog boxes or assert()! | |
| 450 */ | |
| 451 WIN_FlushMessageQueue(); | |
| 452 | |
| 0 | 453 return(0); |
| 454 } | |
| 455 | |
| 456 void DIB_DestroyWindow(_THIS) | |
| 457 { | |
|
974
b8427b5151ed
Restore the user specified window proc after shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
833
diff
changeset
|
458 if ( SDL_windowid ) { |
|
1472
4aac8563c296
Fixed more Win64 portability issues
Sam Lantinga <slouken@libsdl.org>
parents:
1456
diff
changeset
|
459 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
|
460 } else { |
| 0 | 461 DestroyWindow(SDL_Window); |
| 462 } | |
|
1288
ea3888b472bf
Cleaned up the app registration stuff a bit
Sam Lantinga <slouken@libsdl.org>
parents:
1282
diff
changeset
|
463 SDL_UnregisterApp(); |
| 1523 | 464 |
| 465 /* JC 14 Mar 2006 | |
| 466 Flush the message loop or this can cause big problems later | |
| 467 Especially if the user decides to use dialog boxes or assert()! | |
| 468 */ | |
| 469 WIN_FlushMessageQueue(); | |
| 0 | 470 } |