|
1 diff -r f50c7996d925 Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj |
|
2 --- a/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj Wed Sep 29 21:24:50 2010 -0700 |
|
3 +++ b/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj Sun Oct 03 00:21:37 2010 +0200 |
|
4 @@ -106,6 +106,7 @@ |
|
5 04F2AF561104ABD200D6DDF7 /* SDL_assert.c in Sources */ = {isa = PBXBuildFile; fileRef = 04F2AF551104ABD200D6DDF7 /* SDL_assert.c */; }; |
|
6 56ED04E1118A8EE200A56AA6 /* SDL_power.c in Sources */ = {isa = PBXBuildFile; fileRef = 56ED04E0118A8EE200A56AA6 /* SDL_power.c */; }; |
|
7 56ED04E3118A8EFD00A56AA6 /* SDL_syspower.m in Sources */ = {isa = PBXBuildFile; fileRef = 56ED04E2118A8EFD00A56AA6 /* SDL_syspower.m */; }; |
|
8 + 61F7E7F4125543DA00DE6C14 /* SDL_uikitappdelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = FD689FCC0E26E9D400F90B21 /* SDL_uikitappdelegate.m */; }; |
|
9 FD24846D0E5655AE0021E198 /* SDL_uikitkeyboard.h in Headers */ = {isa = PBXBuildFile; fileRef = FD24846B0E5655AE0021E198 /* SDL_uikitkeyboard.h */; }; |
|
10 FD3F495C0DEA5B2100C5B771 /* begin_code.h in Headers */ = {isa = PBXBuildFile; fileRef = FD99B8CC0DD52EB400FB1D6B /* begin_code.h */; settings = {ATTRIBUTES = (Public, ); }; }; |
|
11 FD3F495D0DEA5B2100C5B771 /* close_code.h in Headers */ = {isa = PBXBuildFile; fileRef = FD99B8CD0DD52EB400FB1D6B /* close_code.h */; settings = {ATTRIBUTES = (Public, ); }; }; |
|
12 @@ -192,8 +193,6 @@ |
|
13 FD689F250E26E5D900F90B21 /* SDL_uikitwindow.m in Sources */ = {isa = PBXBuildFile; fileRef = FD689F150E26E5D900F90B21 /* SDL_uikitwindow.m */; }; |
|
14 FD689F260E26E5D900F90B21 /* SDL_uikitopenglview.h in Headers */ = {isa = PBXBuildFile; fileRef = FD689F160E26E5D900F90B21 /* SDL_uikitopenglview.h */; }; |
|
15 FD689F270E26E5D900F90B21 /* SDL_uikitopenglview.m in Sources */ = {isa = PBXBuildFile; fileRef = FD689F170E26E5D900F90B21 /* SDL_uikitopenglview.m */; }; |
|
16 - FD689FCE0E26E9D400F90B21 /* SDL_uikitappdelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = FD689FCC0E26E9D400F90B21 /* SDL_uikitappdelegate.m */; }; |
|
17 - FD689FCF0E26E9D400F90B21 /* SDL_uikitappdelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = FD689FCD0E26E9D400F90B21 /* SDL_uikitappdelegate.h */; }; |
|
18 FD6C83B60DEA66E500ABEE55 /* SDL_systimer.h in Headers */ = {isa = PBXBuildFile; fileRef = FD99BA2D0DD52EDC00FB1D6B /* SDL_systimer.h */; }; |
|
19 FD8BD7AC0E27DCA400B52CD5 /* SDL_opengles.h in Headers */ = {isa = PBXBuildFile; fileRef = FD8BD7AB0E27DCA400B52CD5 /* SDL_opengles.h */; settings = {ATTRIBUTES = (Public, ); }; }; |
|
20 FD8BD8250E27E25900B52CD5 /* SDL_sysloadso.c in Sources */ = {isa = PBXBuildFile; fileRef = FD8BD8190E27E25900B52CD5 /* SDL_sysloadso.c */; }; |
|
21 @@ -1186,7 +1185,6 @@ |
|
22 FD689F200E26E5D900F90B21 /* SDL_uikitvideo.h in Headers */, |
|
23 FD689F240E26E5D900F90B21 /* SDL_uikitwindow.h in Headers */, |
|
24 FD689F260E26E5D900F90B21 /* SDL_uikitopenglview.h in Headers */, |
|
25 - FD689FCF0E26E9D400F90B21 /* SDL_uikitappdelegate.h in Headers */, |
|
26 FD8BD7AC0E27DCA400B52CD5 /* SDL_opengles.h in Headers */, |
|
27 FDC656490E560DF800311C8E /* jumphack.h in Headers */, |
|
28 FD24846D0E5655AE0021E198 /* SDL_uikitkeyboard.h in Headers */, |
|
29 @@ -1347,6 +1345,7 @@ |
|
30 isa = PBXSourcesBuildPhase; |
|
31 buildActionMask = 2147483647; |
|
32 files = ( |
|
33 + 61F7E7F4125543DA00DE6C14 /* SDL_uikitappdelegate.m in Sources */, |
|
34 006E9852119550FB001DE610 /* audio.c in Sources */, |
|
35 006E9853119550FB001DE610 /* common.c in Sources */, |
|
36 006E9859119550FB001DE610 /* platform.c in Sources */, |
|
37 @@ -1429,7 +1428,6 @@ |
|
38 FD689F230E26E5D900F90B21 /* SDL_uikitview.m in Sources */, |
|
39 FD689F250E26E5D900F90B21 /* SDL_uikitwindow.m in Sources */, |
|
40 FD689F270E26E5D900F90B21 /* SDL_uikitopenglview.m in Sources */, |
|
41 - FD689FCE0E26E9D400F90B21 /* SDL_uikitappdelegate.m in Sources */, |
|
42 FD8BD8250E27E25900B52CD5 /* SDL_sysloadso.c in Sources */, |
|
43 FDC656480E560DF800311C8E /* jumphack.c in Sources */, |
|
44 0495E68C0E97408800152DFE /* SDL_renderer_gl.c in Sources */, |
|
45 @@ -1549,15 +1547,19 @@ |
|
46 isa = XCBuildConfiguration; |
|
47 buildSettings = { |
|
48 ALWAYS_SEARCH_USER_PATHS = NO; |
|
49 + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; |
|
50 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; |
|
51 GCC_C_LANGUAGE_STANDARD = c99; |
|
52 GCC_DEBUGGING_SYMBOLS = full; |
|
53 + GCC_THUMB_SUPPORT = NO; |
|
54 + GCC_VERSION = com.apple.compilers.llvmgcc42; |
|
55 GCC_WARN_ABOUT_RETURN_TYPE = YES; |
|
56 GCC_WARN_UNUSED_VARIABLE = NO; |
|
57 - IPHONEOS_DEPLOYMENT_TARGET = 3.1; |
|
58 + HEADER_SEARCH_PATHS = "\"$(SRCROOT)/../../include\""; |
|
59 + IPHONEOS_DEPLOYMENT_TARGET = 3.0; |
|
60 ONLY_ACTIVE_ARCH = NO; |
|
61 PREBINDING = NO; |
|
62 - SDKROOT = iphoneos3.2; |
|
63 + SDKROOT = iphoneos4.0; |
|
64 TARGETED_DEVICE_FAMILY = "1,2"; |
|
65 }; |
|
66 name = Debug; |
|
67 @@ -1566,14 +1568,18 @@ |
|
68 isa = XCBuildConfiguration; |
|
69 buildSettings = { |
|
70 ALWAYS_SEARCH_USER_PATHS = NO; |
|
71 - ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)"; |
|
72 + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; |
|
73 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; |
|
74 GCC_C_LANGUAGE_STANDARD = c99; |
|
75 + GCC_OPTIMIZATION_LEVEL = 2; |
|
76 + GCC_THUMB_SUPPORT = NO; |
|
77 + GCC_VERSION = com.apple.compilers.llvmgcc42; |
|
78 GCC_WARN_ABOUT_RETURN_TYPE = YES; |
|
79 GCC_WARN_UNUSED_VARIABLE = NO; |
|
80 - IPHONEOS_DEPLOYMENT_TARGET = 3.1; |
|
81 + HEADER_SEARCH_PATHS = "\"$(SRCROOT)/../../include\""; |
|
82 + IPHONEOS_DEPLOYMENT_TARGET = 3.0; |
|
83 PREBINDING = NO; |
|
84 - SDKROOT = iphoneos3.2; |
|
85 + SDKROOT = iphoneos4.0; |
|
86 TARGETED_DEVICE_FAMILY = "1,2"; |
|
87 }; |
|
88 name = Release; |
|
89 diff -r f50c7996d925 Xcode-iPhoneOS/SDL/testsdl-Info.plist |
|
90 --- a/Xcode-iPhoneOS/SDL/testsdl-Info.plist Wed Sep 29 21:24:50 2010 -0700 |
|
91 +++ b/Xcode-iPhoneOS/SDL/testsdl-Info.plist Sun Oct 03 00:21:37 2010 +0200 |
|
92 @@ -16,7 +16,5 @@ |
|
93 <string>????</string> |
|
94 <key>CFBundleVersion</key> |
|
95 <string>1.0</string> |
|
96 - <key>NSMainNibFile</key> |
|
97 - <string>MainWindow</string> |
|
98 </dict> |
|
99 </plist> |
|
100 diff -r f50c7996d925 include/SDL_config_iphoneos.h |
|
101 --- a/include/SDL_config_iphoneos.h Wed Sep 29 21:24:50 2010 -0700 |
|
102 +++ b/include/SDL_config_iphoneos.h Sun Oct 03 00:21:37 2010 +0200 |
|
103 @@ -98,6 +98,8 @@ |
|
104 #define HAVE_COS 1 |
|
105 #define HAVE_COSF 1 |
|
106 #define HAVE_FABS 1 |
|
107 +#define HAVE_ATAN 1 |
|
108 +#define HAVE_ATAN2 1 |
|
109 #define HAVE_FLOOR 1 |
|
110 #define HAVE_LOG 1 |
|
111 #define HAVE_POW 1 |
|
112 @@ -114,7 +116,7 @@ |
|
113 /* enable iPhone version of Core Audio driver */ |
|
114 #define SDL_AUDIO_DRIVER_COREAUDIOIPHONE 1 |
|
115 /* Enable the dummy audio driver (src/audio/dummy/\*.c) */ |
|
116 -#define SDL_AUDIO_DRIVER_DUMMY 1 |
|
117 +#define SDL_AUDIO_DRIVER_DUMMY 0 |
|
118 |
|
119 /* Enable the stub haptic driver (src/haptic/dummy/\*.c) */ |
|
120 #define SDL_HAPTIC_DISABLED 1 |
|
121 @@ -135,7 +137,7 @@ |
|
122 |
|
123 /* Supported video drivers */ |
|
124 #define SDL_VIDEO_DRIVER_UIKIT 1 |
|
125 -#define SDL_VIDEO_DRIVER_DUMMY 1 |
|
126 +#define SDL_VIDEO_DRIVER_DUMMY 0 |
|
127 |
|
128 /* enable OpenGL ES */ |
|
129 #define SDL_VIDEO_OPENGL_ES 1 |
|
130 @@ -152,4 +154,7 @@ |
|
131 */ |
|
132 #define SDL_IPHONE_MAX_GFORCE 5.0 |
|
133 |
|
134 +/* Tag to grab the uikit view from external code for further modification */ |
|
135 +#define SDL_VIEW_TAG 456987 |
|
136 + |
|
137 #endif /* _SDL_config_iphoneos_h */ |
|
138 diff -r f50c7996d925 src/video/SDL_renderer_gles.c |
|
139 --- a/src/video/SDL_renderer_gles.c Wed Sep 29 21:24:50 2010 -0700 |
|
140 +++ b/src/video/SDL_renderer_gles.c Sun Oct 03 00:21:37 2010 +0200 |
|
141 @@ -324,6 +324,9 @@ |
|
142 data->glDisable(GL_CULL_FACE); |
|
143 data->updateSize = SDL_TRUE; |
|
144 |
|
145 + data->glEnableClientState(GL_VERTEX_ARRAY); |
|
146 + data->glEnableClientState(GL_TEXTURE_COORD_ARRAY); |
|
147 + |
|
148 return renderer; |
|
149 } |
|
150 |
|
151 @@ -665,9 +668,7 @@ |
|
152 vertices[2*i+1] = (GLshort)points[i].y; |
|
153 } |
|
154 data->glVertexPointer(2, GL_SHORT, 0, vertices); |
|
155 - data->glEnableClientState(GL_VERTEX_ARRAY); |
|
156 data->glDrawArrays(GL_POINTS, 0, count); |
|
157 - data->glDisableClientState(GL_VERTEX_ARRAY); |
|
158 SDL_stack_free(vertices); |
|
159 |
|
160 return 0; |
|
161 @@ -694,7 +695,6 @@ |
|
162 vertices[2*i+1] = (GLshort)points[i].y; |
|
163 } |
|
164 data->glVertexPointer(2, GL_SHORT, 0, vertices); |
|
165 - data->glEnableClientState(GL_VERTEX_ARRAY); |
|
166 if (count > 2 && |
|
167 points[0].x == points[count-1].x && points[0].y == points[count-1].y) { |
|
168 /* GL_LINE_LOOP takes care of the final segment */ |
|
169 @@ -703,7 +703,6 @@ |
|
170 } else { |
|
171 data->glDrawArrays(GL_LINE_STRIP, 0, count); |
|
172 } |
|
173 - data->glDisableClientState(GL_VERTEX_ARRAY); |
|
174 SDL_stack_free(vertices); |
|
175 |
|
176 return 0; |
|
177 @@ -723,7 +722,6 @@ |
|
178 (GLfloat) renderer->b * inv255f, |
|
179 (GLfloat) renderer->a * inv255f); |
|
180 |
|
181 - data->glEnableClientState(GL_VERTEX_ARRAY); |
|
182 for (i = 0; i < count; ++i) { |
|
183 const SDL_Rect *rect = rects[i]; |
|
184 GLshort minx = rect->x; |
|
185 @@ -743,7 +741,6 @@ |
|
186 data->glVertexPointer(2, GL_SHORT, 0, vertices); |
|
187 data->glDrawArrays(GL_LINE_LOOP, 0, 4); |
|
188 } |
|
189 - data->glDisableClientState(GL_VERTEX_ARRAY); |
|
190 |
|
191 return 0; |
|
192 } |
|
193 @@ -762,7 +759,6 @@ |
|
194 (GLfloat) renderer->b * inv255f, |
|
195 (GLfloat) renderer->a * inv255f); |
|
196 |
|
197 - data->glEnableClientState(GL_VERTEX_ARRAY); |
|
198 for (i = 0; i < count; ++i) { |
|
199 const SDL_Rect *rect = rects[i]; |
|
200 GLshort minx = rect->x; |
|
201 @@ -782,7 +778,6 @@ |
|
202 data->glVertexPointer(2, GL_SHORT, 0, vertices); |
|
203 data->glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); |
|
204 } |
|
205 - data->glDisableClientState(GL_VERTEX_ARRAY); |
|
206 |
|
207 return 0; |
|
208 } |
|
209 @@ -925,12 +920,8 @@ |
|
210 texCoords[7] = maxv; |
|
211 |
|
212 data->glVertexPointer(2, GL_SHORT, 0, vertices); |
|
213 - data->glEnableClientState(GL_VERTEX_ARRAY); |
|
214 data->glTexCoordPointer(2, GL_FLOAT, 0, texCoords); |
|
215 - data->glEnableClientState(GL_TEXTURE_COORD_ARRAY); |
|
216 data->glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); |
|
217 - data->glDisableClientState(GL_TEXTURE_COORD_ARRAY); |
|
218 - data->glDisableClientState(GL_VERTEX_ARRAY); |
|
219 } |
|
220 |
|
221 data->glDisable(GL_TEXTURE_2D); |
|
222 diff -r f50c7996d925 src/video/SDL_video.c |
|
223 --- a/src/video/SDL_video.c Wed Sep 29 21:24:50 2010 -0700 |
|
224 +++ b/src/video/SDL_video.c Sun Oct 03 00:21:37 2010 +0200 |
|
225 @@ -1416,9 +1416,9 @@ |
|
226 SDL_MinimizeWindow(window); |
|
227 } |
|
228 |
|
229 - if (display->gamma && _this->SetDisplayGammaRamp) { |
|
230 + /*if (display->gamma && _this->SetDisplayGammaRamp) { |
|
231 _this->SetDisplayGammaRamp(_this, display, display->saved_gamma); |
|
232 - } |
|
233 + }*/ |
|
234 if ((window->flags & (SDL_WINDOW_INPUT_GRABBED | SDL_WINDOW_FULLSCREEN)) |
|
235 && _this->SetWindowGrab) { |
|
236 _this->SetWindowGrab(_this, window); |
|
237 diff -r f50c7996d925 src/video/uikit/SDL_uikitopengles.m |
|
238 --- a/src/video/uikit/SDL_uikitopengles.m Wed Sep 29 21:24:50 2010 -0700 |
|
239 +++ b/src/video/uikit/SDL_uikitopengles.m Sun Oct 03 00:21:37 2010 +0200 |
|
240 @@ -114,7 +114,7 @@ |
|
241 bBits: _this->gl_config.blue_size \ |
|
242 aBits: _this->gl_config.alpha_size \ |
|
243 depthBits: _this->gl_config.depth_size]; |
|
244 - |
|
245 + view.tag = SDL_VIEW_TAG; |
|
246 data->view = view; |
|
247 |
|
248 /* add the view to our window */ |
|
249 diff -r f50c7996d925 src/video/uikit/SDL_uikitview.m |
|
250 --- a/src/video/uikit/SDL_uikitview.m Wed Sep 29 21:24:50 2010 -0700 |
|
251 +++ b/src/video/uikit/SDL_uikitview.m Sun Oct 03 00:21:37 2010 +0200 |
|
252 @@ -35,9 +35,6 @@ |
|
253 @implementation SDL_uikitview |
|
254 |
|
255 - (void)dealloc { |
|
256 -#if SDL_IPHONE_KEYBOARD |
|
257 - [textField release]; |
|
258 -#endif |
|
259 [super dealloc]; |
|
260 } |
|
261 |
|
262 @@ -220,7 +217,7 @@ |
|
263 /* Set ourselves up as a UITextFieldDelegate */ |
|
264 - (void)initializeKeyboard { |
|
265 |
|
266 - textField = [[[UITextField alloc] initWithFrame: CGRectZero] autorelease]; |
|
267 + textField = [[UITextField alloc] initWithFrame: CGRectZero]; |
|
268 textField.delegate = self; |
|
269 /* placeholder so there is something to delete! */ |
|
270 textField.text = @" "; |
|
271 @@ -238,6 +235,7 @@ |
|
272 keyboardVisible = NO; |
|
273 /* add the UITextField (hidden) to our view */ |
|
274 [self addSubview: textField]; |
|
275 + [textField release]; |
|
276 } |
|
277 |
|
278 /* reveal onscreen virtual keyboard */ |
|
279 @@ -300,6 +298,7 @@ |
|
280 |
|
281 /* Terminates the editing session */ |
|
282 - (BOOL)textFieldShouldReturn:(UITextField*)_textField { |
|
283 + SDL_SendKeyboardKey(SDL_PRESSED, SDL_SCANCODE_RETURN); |
|
284 [self hideKeyboard]; |
|
285 return YES; |
|
286 } |
|
287 @@ -314,7 +313,7 @@ |
|
288 int SDL_iPhoneKeyboardShow(SDL_Window * window) { |
|
289 |
|
290 SDL_WindowData *data; |
|
291 - SDL_uikitview *view; |
|
292 + SDL_uikitview *view = NULL; |
|
293 |
|
294 if (NULL == window) { |
|
295 SDL_SetError("Window does not exist"); |
|
296 @@ -322,7 +321,8 @@ |
|
297 } |
|
298 |
|
299 data = (SDL_WindowData *)window->driverdata; |
|
300 - view = data->view; |
|
301 + if (data != NULL) |
|
302 + view = data->view; |
|
303 |
|
304 if (nil == view) { |
|
305 SDL_SetError("Window has no view"); |
|
306 @@ -337,7 +337,7 @@ |
|
307 int SDL_iPhoneKeyboardHide(SDL_Window * window) { |
|
308 |
|
309 SDL_WindowData *data; |
|
310 - SDL_uikitview *view; |
|
311 + SDL_uikitview *view = NULL; |
|
312 |
|
313 if (NULL == window) { |
|
314 SDL_SetError("Window does not exist"); |
|
315 @@ -345,7 +345,8 @@ |
|
316 } |
|
317 |
|
318 data = (SDL_WindowData *)window->driverdata; |
|
319 - view = data->view; |
|
320 + if (data != NULL) |
|
321 + view = data->view; |
|
322 |
|
323 if (NULL == view) { |
|
324 SDL_SetError("Window has no view"); |
|
325 @@ -360,7 +361,7 @@ |
|
326 SDL_bool SDL_iPhoneKeyboardIsShown(SDL_Window * window) { |
|
327 |
|
328 SDL_WindowData *data; |
|
329 - SDL_uikitview *view; |
|
330 + SDL_uikitview *view = NULL; |
|
331 |
|
332 if (NULL == window) { |
|
333 SDL_SetError("Window does not exist"); |
|
334 @@ -368,7 +369,8 @@ |
|
335 } |
|
336 |
|
337 data = (SDL_WindowData *)window->driverdata; |
|
338 - view = data->view; |
|
339 + if (data != NULL) |
|
340 + view = data->view; |
|
341 |
|
342 if (NULL == view) { |
|
343 SDL_SetError("Window has no view"); |
|
344 @@ -382,7 +384,7 @@ |
|
345 int SDL_iPhoneKeyboardToggle(SDL_Window * window) { |
|
346 |
|
347 SDL_WindowData *data; |
|
348 - SDL_uikitview *view; |
|
349 + SDL_uikitview *view = NULL; |
|
350 |
|
351 if (NULL == window) { |
|
352 SDL_SetError("Window does not exist"); |
|
353 @@ -390,7 +392,8 @@ |
|
354 } |
|
355 |
|
356 data = (SDL_WindowData *)window->driverdata; |
|
357 - view = data->view; |
|
358 + if (data != NULL) |
|
359 + view = data->view; |
|
360 |
|
361 if (NULL == view) { |
|
362 SDL_SetError("Window has no view"); |
|
363 diff -r f50c7996d925 src/video/uikit/SDL_uikitwindow.m |
|
364 --- a/src/video/uikit/SDL_uikitwindow.m Wed Sep 29 21:24:50 2010 -0700 |
|
365 +++ b/src/video/uikit/SDL_uikitwindow.m Sun Oct 03 00:21:37 2010 +0200 |
|
366 @@ -144,7 +144,10 @@ |
|
367 if (SDL_UIKit_supports_multiple_displays) { |
|
368 [uiwindow setScreen:uiscreen]; |
|
369 } |
|
370 - |
|
371 + |
|
372 + if ([[UIScreen screens] count] > 1) |
|
373 + uiwindow.screen = [[UIScreen screens] objectAtIndex:1]; |
|
374 + |
|
375 if (SetupWindowData(_this, window, uiwindow, SDL_TRUE) < 0) { |
|
376 [uiwindow release]; |
|
377 return -1; |
|
378 diff -r f50c7996d925 src/video/uikit/keyinfotable.h |
|
379 --- a/src/video/uikit/keyinfotable.h Wed Sep 29 21:24:50 2010 -0700 |
|
380 +++ b/src/video/uikit/keyinfotable.h Sun Oct 03 00:21:37 2010 +0200 |
|
381 @@ -54,7 +54,7 @@ |
|
382 /* 10 */ { SDL_SCANCODE_UNKNOWN, 0 }, |
|
383 /* 11 */ { SDL_SCANCODE_UNKNOWN, 0 }, |
|
384 /* 12 */ { SDL_SCANCODE_UNKNOWN, 0 }, |
|
385 -/* 13 */ { SDL_SCANCODE_UNKNOWN, 0 }, |
|
386 +/* 13 */ { SDL_SCANCODE_RETURN, 0 }, |
|
387 /* 14 */ { SDL_SCANCODE_UNKNOWN, 0 }, |
|
388 /* 15 */ { SDL_SCANCODE_UNKNOWN, 0 }, |
|
389 /* 16 */ { SDL_SCANCODE_UNKNOWN, 0 }, |
|
390 @@ -137,7 +137,7 @@ |
|
391 /* 93 */ { SDL_SCANCODE_RIGHTBRACKET, 0 }, |
|
392 /* 94 */ { SDL_SCANCODE_6, KMOD_SHIFT }, /* plus shift modifier '^' */ |
|
393 /* 95 */ { SDL_SCANCODE_MINUS, KMOD_SHIFT }, /* plus shift modifier '_' */ |
|
394 -/* 96 */ { SDL_SCANCODE_GRAVE, KMOD_SHIFT }, /* '`' |
|
395 +/* 96 */ { SDL_SCANCODE_GRAVE, KMOD_SHIFT }, /* '`' */ |
|
396 /* 97 */ { SDL_SCANCODE_A, 0 }, |
|
397 /* 98 */ { SDL_SCANCODE_B, 0 }, |
|
398 /* 99 */ { SDL_SCANCODE_C, 0 }, |