pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed spacing, adding vim spacing hints

Browse source
This commit is contained in:
Sam Lantinga 2011-02-01 09:02:53 -08:00
parent 220fd4679a
commit 3752cf5872
7 changed files with 54 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/video/uikit/SDL_uikitappdelegate.h
View file

@ -31,3 +31,5 @@
@end @end
/* *INDENT-ON* */ /* *INDENT-ON* */
/* vi: set ts=4 sw=4 expandtab: */

2
src/video/uikit/SDL_uikitkeyboard.h
View file

@ -29,3 +29,5 @@ extern DECLSPEC SDL_bool SDLCALL SDL_iPhoneKeyboardIsShown(SDL_Window * window);
extern DECLSPEC int SDLCALL SDL_iPhoneKeyboardToggle(SDL_Window * window); extern DECLSPEC int SDLCALL SDL_iPhoneKeyboardToggle(SDL_Window * window);
#endif #endif
/* vi: set ts=4 sw=4 expandtab: */

2
src/video/uikit/SDL_uikitopengles.h
View file

@ -36,3 +36,5 @@ extern void *UIKit_GL_GetProcAddress(_THIS, const char *proc);
extern int UIKit_GL_LoadLibrary(_THIS, const char *path); extern int UIKit_GL_LoadLibrary(_THIS, const char *path);
#endif #endif
/* vi: set ts=4 sw=4 expandtab: */

2
src/video/uikit/SDL_uikitopenglview.h
View file

@ -63,3 +63,5 @@
@end @end
/* *INDENT-ON* */ /* *INDENT-ON* */
/* vi: set ts=4 sw=4 expandtab: */

14
src/video/uikit/SDL_uikitview.h
View file

@ -38,17 +38,17 @@
#endif #endif
#ifdef FIXED_MULTITOUCH #ifdef FIXED_MULTITOUCH
long touchId; long touchId;
#ifndef IPHONE_TOUCH_EFFICIENT_DANGEROUS #ifndef IPHONE_TOUCH_EFFICIENT_DANGEROUS
UITouch *finger[MAX_SIMULTANEOUS_TOUCHES]; UITouch *finger[MAX_SIMULTANEOUS_TOUCHES];
#endif #endif
#endif #endif
#if SDL_IPHONE_KEYBOARD #if SDL_IPHONE_KEYBOARD
UITextField *textField; UITextField *textField;
BOOL keyboardVisible; BOOL keyboardVisible;
#endif #endif
} }
- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event; - (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event;
- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event; - (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event;
@ -63,3 +63,5 @@
@end @end
/* *INDENT-ON* */ /* *INDENT-ON* */
/* vi: set ts=4 sw=4 expandtab: */

2
src/video/uikit/jumphack.h
View file

@ -14,3 +14,5 @@
extern jmp_buf *jump_env(void); extern jmp_buf *jump_env(void);
#endif #endif
/* vi: set ts=4 sw=4 expandtab: */

70
src/video/uikit/keyinfotable.h
View file

@ -26,10 +26,10 @@
#include "SDL_scancode.h" #include "SDL_scancode.h"
/* /*
This file is used by the keyboard code in SDL_uikitview.m to convert between characters This file is used by the keyboard code in SDL_uikitview.m to convert between characters
passed in from the iPhone's virtual keyboard, and tuples of SDL_ScanCodes and SDL_keymods. passed in from the iPhone's virtual keyboard, and tuples of SDL_ScanCodes and SDL_keymods.
For example unicharToUIKeyInfoTable['a'] would give you the scan code and keymod for lower For example unicharToUIKeyInfoTable['a'] would give you the scan code and keymod for lower
case a. case a.
*/ */
typedef struct typedef struct
@ -74,22 +74,22 @@ static UIKitKeyInfo unicharToUIKeyInfoTable[] = {
/* 30 */ { SDL_SCANCODE_UNKNOWN, 0 }, /* 30 */ { SDL_SCANCODE_UNKNOWN, 0 },
/* 31 */ { SDL_SCANCODE_UNKNOWN, 0 }, /* 31 */ { SDL_SCANCODE_UNKNOWN, 0 },
/* 32 */ { SDL_SCANCODE_SPACE, 0 }, /* 32 */ { SDL_SCANCODE_SPACE, 0 },
/* 33 */ { SDL_SCANCODE_1, KMOD_SHIFT }, /* plus shift modifier '!' */ /* 33 */ { SDL_SCANCODE_1, KMOD_SHIFT }, /* plus shift modifier '!' */
/* 34 */ { SDL_SCANCODE_APOSTROPHE, KMOD_SHIFT }, /* plus shift modifier '"' */ /* 34 */ { SDL_SCANCODE_APOSTROPHE, KMOD_SHIFT }, /* plus shift modifier '"' */
/* 35 */ { SDL_SCANCODE_3, KMOD_SHIFT }, /* plus shift modifier '#' */ /* 35 */ { SDL_SCANCODE_3, KMOD_SHIFT }, /* plus shift modifier '#' */
/* 36 */ { SDL_SCANCODE_4, KMOD_SHIFT }, /* plus shift modifier '$' */ /* 36 */ { SDL_SCANCODE_4, KMOD_SHIFT }, /* plus shift modifier '$' */
/* 37 */ { SDL_SCANCODE_5, KMOD_SHIFT }, /* plus shift modifier '%' */ /* 37 */ { SDL_SCANCODE_5, KMOD_SHIFT }, /* plus shift modifier '%' */
/* 38 */ { SDL_SCANCODE_7, KMOD_SHIFT }, /* plus shift modifier '&' */ /* 38 */ { SDL_SCANCODE_7, KMOD_SHIFT }, /* plus shift modifier '&' */
/* 39 */ { SDL_SCANCODE_APOSTROPHE, 0 }, /* ''' */ /* 39 */ { SDL_SCANCODE_APOSTROPHE, 0 }, /* ''' */
/* 40 */ { SDL_SCANCODE_9, KMOD_SHIFT }, /* plus shift modifier '(' */ /* 40 */ { SDL_SCANCODE_9, KMOD_SHIFT }, /* plus shift modifier '(' */
/* 41 */ { SDL_SCANCODE_0, KMOD_SHIFT }, /* plus shift modifier ')' */ /* 41 */ { SDL_SCANCODE_0, KMOD_SHIFT }, /* plus shift modifier ')' */
/* 42 */ { SDL_SCANCODE_8, KMOD_SHIFT }, /* '*' */ /* 42 */ { SDL_SCANCODE_8, KMOD_SHIFT }, /* '*' */
/* 43 */ { SDL_SCANCODE_EQUALS, KMOD_SHIFT }, /* plus shift modifier '+' */ /* 43 */ { SDL_SCANCODE_EQUALS, KMOD_SHIFT }, /* plus shift modifier '+' */
/* 44 */ { SDL_SCANCODE_COMMA, 0 }, /* ',' */ /* 44 */ { SDL_SCANCODE_COMMA, 0 }, /* ',' */
/* 45 */ { SDL_SCANCODE_MINUS, 0 }, /* '-' */ /* 45 */ { SDL_SCANCODE_MINUS, 0 }, /* '-' */
/* 46 */ { SDL_SCANCODE_PERIOD, 0 }, /* '.' */ /* 46 */ { SDL_SCANCODE_PERIOD, 0 }, /* '.' */
/* 47 */ { SDL_SCANCODE_SLASH, 0 }, /* '/' */ /* 47 */ { SDL_SCANCODE_SLASH, 0 }, /* '/' */
/* 48 */ { SDL_SCANCODE_0, 0 }, /* 48 */ { SDL_SCANCODE_0, 0 },
/* 49 */ { SDL_SCANCODE_1, 0 }, /* 49 */ { SDL_SCANCODE_1, 0 },
/* 50 */ { SDL_SCANCODE_2, 0 }, /* 50 */ { SDL_SCANCODE_2, 0 },
/* 51 */ { SDL_SCANCODE_3, 0 }, /* 51 */ { SDL_SCANCODE_3, 0 },
@ -99,14 +99,14 @@ static UIKitKeyInfo unicharToUIKeyInfoTable[] = {
/* 55 */ { SDL_SCANCODE_7, 0 }, /* 55 */ { SDL_SCANCODE_7, 0 },
/* 56 */ { SDL_SCANCODE_8, 0 }, /* 56 */ { SDL_SCANCODE_8, 0 },
/* 57 */ { SDL_SCANCODE_9, 0 }, /* 57 */ { SDL_SCANCODE_9, 0 },
/* 58 */ { SDL_SCANCODE_SEMICOLON, KMOD_SHIFT }, /* plus shift modifier ';' */ /* 58 */ { SDL_SCANCODE_SEMICOLON, KMOD_SHIFT }, /* plus shift modifier ';' */
/* 59 */ { SDL_SCANCODE_SEMICOLON, 0 }, /* 59 */ { SDL_SCANCODE_SEMICOLON, 0 },
/* 60 */ { SDL_SCANCODE_COMMA, KMOD_SHIFT }, /* plus shift modifier '<' */ /* 60 */ { SDL_SCANCODE_COMMA, KMOD_SHIFT }, /* plus shift modifier '<' */
/* 61 */ { SDL_SCANCODE_EQUALS, 0 }, /* 61 */ { SDL_SCANCODE_EQUALS, 0 },
/* 62 */ { SDL_SCANCODE_PERIOD, KMOD_SHIFT }, /* plus shift modifier '>' */ /* 62 */ { SDL_SCANCODE_PERIOD, KMOD_SHIFT }, /* plus shift modifier '>' */
/* 63 */ { SDL_SCANCODE_SLASH, KMOD_SHIFT }, /* plus shift modifier '?' */ /* 63 */ { SDL_SCANCODE_SLASH, KMOD_SHIFT }, /* plus shift modifier '?' */
/* 64 */ { SDL_SCANCODE_2, KMOD_SHIFT }, /* plus shift modifier '@' */ /* 64 */ { SDL_SCANCODE_2, KMOD_SHIFT }, /* plus shift modifier '@' */
/* 65 */ { SDL_SCANCODE_A, KMOD_SHIFT }, /* all the following need shift modifiers */ /* 65 */ { SDL_SCANCODE_A, KMOD_SHIFT }, /* all the following need shift modifiers */
/* 66 */ { SDL_SCANCODE_B, KMOD_SHIFT }, /* 66 */ { SDL_SCANCODE_B, KMOD_SHIFT },
/* 67 */ { SDL_SCANCODE_C, KMOD_SHIFT }, /* 67 */ { SDL_SCANCODE_C, KMOD_SHIFT },
/* 68 */ { SDL_SCANCODE_D, KMOD_SHIFT }, /* 68 */ { SDL_SCANCODE_D, KMOD_SHIFT },
@ -135,10 +135,10 @@ static UIKitKeyInfo unicharToUIKeyInfoTable[] = {
/* 91 */ { SDL_SCANCODE_LEFTBRACKET, 0 }, /* 91 */ { SDL_SCANCODE_LEFTBRACKET, 0 },
/* 92 */ { SDL_SCANCODE_BACKSLASH, 0 }, /* 92 */ { SDL_SCANCODE_BACKSLASH, 0 },
/* 93 */ { SDL_SCANCODE_RIGHTBRACKET, 0 }, /* 93 */ { SDL_SCANCODE_RIGHTBRACKET, 0 },
/* 94 */ { SDL_SCANCODE_6, KMOD_SHIFT }, /* plus shift modifier '^' */ /* 94 */ { SDL_SCANCODE_6, KMOD_SHIFT }, /* plus shift modifier '^' */
/* 95 */ { SDL_SCANCODE_MINUS, KMOD_SHIFT }, /* plus shift modifier '_' */ /* 95 */ { SDL_SCANCODE_MINUS, KMOD_SHIFT }, /* plus shift modifier '_' */
/* 96 */ { SDL_SCANCODE_GRAVE, KMOD_SHIFT }, /* '`' /* 96 */ { SDL_SCANCODE_GRAVE, KMOD_SHIFT }, /* '`'
/* 97 */ { SDL_SCANCODE_A, 0 }, /* 97 */ { SDL_SCANCODE_A, 0 },
/* 98 */ { SDL_SCANCODE_B, 0 }, /* 98 */ { SDL_SCANCODE_B, 0 },
/* 99 */ { SDL_SCANCODE_C, 0 }, /* 99 */ { SDL_SCANCODE_C, 0 },
/* 100 */{ SDL_SCANCODE_D, 0 }, /* 100 */{ SDL_SCANCODE_D, 0 },
@ -164,12 +164,14 @@ static UIKitKeyInfo unicharToUIKeyInfoTable[] = {
/* 120 */{ SDL_SCANCODE_X, 0 }, /* 120 */{ SDL_SCANCODE_X, 0 },
/* 121 */{ SDL_SCANCODE_Y, 0 }, /* 121 */{ SDL_SCANCODE_Y, 0 },
/* 122 */{ SDL_SCANCODE_Z, 0 }, /* 122 */{ SDL_SCANCODE_Z, 0 },
/* 123 */{ SDL_SCANCODE_LEFTBRACKET, KMOD_SHIFT }, /* plus shift modifier '{' */ /* 123 */{ SDL_SCANCODE_LEFTBRACKET, KMOD_SHIFT }, /* plus shift modifier '{' */
/* 124 */{ SDL_SCANCODE_BACKSLASH, KMOD_SHIFT }, /* plus shift modifier '|' */ /* 124 */{ SDL_SCANCODE_BACKSLASH, KMOD_SHIFT }, /* plus shift modifier '|' */
/* 125 */{ SDL_SCANCODE_RIGHTBRACKET, KMOD_SHIFT }, /* plus shift modifier '}' */ /* 125 */{ SDL_SCANCODE_RIGHTBRACKET, KMOD_SHIFT }, /* plus shift modifier '}' */
/* 126 */{ SDL_SCANCODE_GRAVE, KMOD_SHIFT }, /* plus shift modifier '~' */ /* 126 */{ SDL_SCANCODE_GRAVE, KMOD_SHIFT }, /* plus shift modifier '~' */
/* 127 */{ SDL_SCANCODE_DELETE, KMOD_SHIFT } /* 127 */{ SDL_SCANCODE_DELETE, KMOD_SHIFT }
/* *INDENT-ON* */ /* *INDENT-ON* */
}; };
#endif /* UIKitKeyInfo */ #endif /* UIKitKeyInfo */
/* vi: set ts=4 sw=4 expandtab: */