marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mac: Change type of K_* constants from int to C4KeyCode (int <-> long discrepancy)

stable-5.3
Martin Plicht 2013-02-11 11:39:40 +01:00 committed by Armin Burgmeier
parent b1e323b49b
commit da27e5aa5b
2 changed files with 82 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
src/platform/C4Window.h
View File

@ -205,47 +205,47 @@
#import "ObjectiveCAssociated.h"
// declare as extern variables and initialize them in StdMacWindow.mm so as to not include objc headers
const int CocoaKeycodeOffset = 300;
extern int K_F1;
extern int K_F2;
extern int K_F3;
extern int K_F4;
extern int K_F5;
extern int K_F6;
extern int K_F7;
extern int K_F8;
extern int K_F9;
extern int K_F10;
extern int K_F11;
extern int K_F12;
extern int K_ADD;
extern int K_SUBTRACT;
extern int K_MULTIPLY;
extern int K_ESCAPE;
extern int K_PAUSE;
extern int K_TAB;
extern int K_RETURN;
extern int K_DELETE;
extern int K_INSERT;
extern int K_BACK;
extern int K_SPACE;
extern int K_UP;
extern int K_DOWN;
extern int K_LEFT;
extern int K_RIGHT;
extern int K_HOME;
extern int K_END;
extern int K_SCROLL;
extern int K_MENU;
extern int K_PAGEUP;
extern int K_PAGEDOWN;
extern int KEY_M;
extern int KEY_T;
extern int KEY_W;
extern int KEY_I;
extern int KEY_C;
extern int KEY_V;
extern int KEY_X;
extern int KEY_A;
extern C4KeyCode K_F1;
extern C4KeyCode K_F2;
extern C4KeyCode K_F3;
extern C4KeyCode K_F4;
extern C4KeyCode K_F5;
extern C4KeyCode K_F6;
extern C4KeyCode K_F7;
extern C4KeyCode K_F8;
extern C4KeyCode K_F9;
extern C4KeyCode K_F10;
extern C4KeyCode K_F11;
extern C4KeyCode K_F12;
extern C4KeyCode K_ADD;
extern C4KeyCode K_SUBTRACT;
extern C4KeyCode K_MULTIPLY;
extern C4KeyCode K_ESCAPE;
extern C4KeyCode K_PAUSE;
extern C4KeyCode K_TAB;
extern C4KeyCode K_RETURN;
extern C4KeyCode K_DELETE;
extern C4KeyCode K_INSERT;
extern C4KeyCode K_BACK;
extern C4KeyCode K_SPACE;
extern C4KeyCode K_UP;
extern C4KeyCode K_DOWN;
extern C4KeyCode K_LEFT;
extern C4KeyCode K_RIGHT;
extern C4KeyCode K_HOME;
extern C4KeyCode K_END;
extern C4KeyCode K_SCROLL;
extern C4KeyCode K_MENU;
extern C4KeyCode K_PAGEUP;
extern C4KeyCode K_PAGEDOWN;
extern C4KeyCode KEY_M;
extern C4KeyCode KEY_T;
extern C4KeyCode KEY_W;
extern C4KeyCode KEY_I;
extern C4KeyCode KEY_C;
extern C4KeyCode KEY_V;
extern C4KeyCode KEY_X;
extern C4KeyCode KEY_A;
#endif
#ifdef USE_X11

82
src/platform/C4WindowMac.mm
View File

@ -134,47 +134,47 @@ bool C4Window::ReInit(C4AbstractApp* pApp)
return true;
}
int K_F1 = 122 + CocoaKeycodeOffset;
int K_F2 = 120 + CocoaKeycodeOffset;
int K_F3 = 99 + CocoaKeycodeOffset;
int K_F4 = 118 + CocoaKeycodeOffset;
int K_F5 = 96 + CocoaKeycodeOffset;
int K_F6 = 97 + CocoaKeycodeOffset;
int K_F7 = 98 + CocoaKeycodeOffset;
int K_F8 = 100 + CocoaKeycodeOffset;
int K_F9 = 101 + CocoaKeycodeOffset;
int K_F10 = 109 + CocoaKeycodeOffset;
int K_F11 = 103 + CocoaKeycodeOffset;
int K_F12 = 111 + CocoaKeycodeOffset;
int K_ADD = 69 + CocoaKeycodeOffset;
int K_SUBTRACT = 78 + CocoaKeycodeOffset;
int K_MULTIPLY = 67 + CocoaKeycodeOffset;
int K_ESCAPE = 53 + CocoaKeycodeOffset;
int K_PAUSE = NSPauseFunctionKey + CocoaKeycodeOffset;
int K_TAB = 48 + CocoaKeycodeOffset;
int K_RETURN = 36 + CocoaKeycodeOffset;
int K_DELETE = 117 + CocoaKeycodeOffset;
int K_INSERT = 125125125 + CocoaKeycodeOffset;
int K_BACK = 51 + CocoaKeycodeOffset;
int K_SPACE = 49 + CocoaKeycodeOffset;
int K_UP = 126 + CocoaKeycodeOffset;
int K_DOWN = 125 + CocoaKeycodeOffset;
int K_LEFT = 123 + CocoaKeycodeOffset;
int K_RIGHT = 124 + CocoaKeycodeOffset;
int K_HOME = 115 + CocoaKeycodeOffset;
int K_END = 119 + CocoaKeycodeOffset;
int K_SCROLL = 1000 + CocoaKeycodeOffset;
int K_MENU = 1000 + CocoaKeycodeOffset;
int K_PAGEUP = 116 + CocoaKeycodeOffset;
int K_PAGEDOWN = 121 + CocoaKeycodeOffset;
int KEY_M = 46 + CocoaKeycodeOffset;
int KEY_T = 17 + CocoaKeycodeOffset;
int KEY_W = 13 + CocoaKeycodeOffset;
int KEY_I = 34 + CocoaKeycodeOffset;
int KEY_C = 8 + CocoaKeycodeOffset;
int KEY_V = 9 + CocoaKeycodeOffset;
int KEY_X = 7 + CocoaKeycodeOffset;
int KEY_A = 0 + CocoaKeycodeOffset;
C4KeyCode K_F1 = 122 + CocoaKeycodeOffset;
C4KeyCode K_F2 = 120 + CocoaKeycodeOffset;
C4KeyCode K_F3 = 99 + CocoaKeycodeOffset;
C4KeyCode K_F4 = 118 + CocoaKeycodeOffset;
C4KeyCode K_F5 = 96 + CocoaKeycodeOffset;
C4KeyCode K_F6 = 97 + CocoaKeycodeOffset;
C4KeyCode K_F7 = 98 + CocoaKeycodeOffset;
C4KeyCode K_F8 = 100 + CocoaKeycodeOffset;
C4KeyCode K_F9 = 101 + CocoaKeycodeOffset;
C4KeyCode K_F10 = 109 + CocoaKeycodeOffset;
C4KeyCode K_F11 = 103 + CocoaKeycodeOffset;
C4KeyCode K_F12 = 111 + CocoaKeycodeOffset;
C4KeyCode K_ADD = 69 + CocoaKeycodeOffset;
C4KeyCode K_SUBTRACT = 78 + CocoaKeycodeOffset;
C4KeyCode K_MULTIPLY = 67 + CocoaKeycodeOffset;
C4KeyCode K_ESCAPE = 53 + CocoaKeycodeOffset;
C4KeyCode K_PAUSE = NSPauseFunctionKey + CocoaKeycodeOffset;
C4KeyCode K_TAB = 48 + CocoaKeycodeOffset;
C4KeyCode K_RETURN = 36 + CocoaKeycodeOffset;
C4KeyCode K_DELETE = 117 + CocoaKeycodeOffset;
C4KeyCode K_INSERT = 125125125 + CocoaKeycodeOffset;
C4KeyCode K_BACK = 51 + CocoaKeycodeOffset;
C4KeyCode K_SPACE = 49 + CocoaKeycodeOffset;
C4KeyCode K_UP = 126 + CocoaKeycodeOffset;
C4KeyCode K_DOWN = 125 + CocoaKeycodeOffset;
C4KeyCode K_LEFT = 123 + CocoaKeycodeOffset;
C4KeyCode K_RIGHT = 124 + CocoaKeycodeOffset;
C4KeyCode K_HOME = 115 + CocoaKeycodeOffset;
C4KeyCode K_END = 119 + CocoaKeycodeOffset;
C4KeyCode K_SCROLL = 1000 + CocoaKeycodeOffset;
C4KeyCode K_MENU = 1000 + CocoaKeycodeOffset;
C4KeyCode K_PAGEUP = 116 + CocoaKeycodeOffset;
C4KeyCode K_PAGEDOWN = 121 + CocoaKeycodeOffset;
C4KeyCode KEY_M = 46 + CocoaKeycodeOffset;
C4KeyCode KEY_T = 17 + CocoaKeycodeOffset;
C4KeyCode KEY_W = 13 + CocoaKeycodeOffset;
C4KeyCode KEY_I = 34 + CocoaKeycodeOffset;
C4KeyCode KEY_C = 8 + CocoaKeycodeOffset;
C4KeyCode KEY_V = 9 + CocoaKeycodeOffset;
C4KeyCode KEY_X = 7 + CocoaKeycodeOffset;
C4KeyCode KEY_A = 0 + CocoaKeycodeOffset;
int MK_SHIFT = NSShiftKeyMask;
int MK_CONTROL = NSControlKeyMask;
int MK_ALT = NSAlternateKeyMask;