changeset 2090:f419000e7596

Merged r2975:2976 from branches/SDL-1.2: Mac OS X F13-15 key support.
author Ryan C. Gordon <icculus@icculus.org>
date Wed, 14 Feb 2007 10:25:41 +0000
parents 58ed46da318c
children b8bee470f737
files src/video/cocoa/SDL_cocoakeyboard.m src/video/cocoa/SDL_cocoakeys.h
diffstat 2 files changed, 10 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/video/cocoa/SDL_cocoakeyboard.m	Tue Feb 13 09:58:58 2007 +0000
+++ b/src/video/cocoa/SDL_cocoakeyboard.m	Wed Feb 14 10:25:41 2007 +0000
@@ -77,9 +77,14 @@
     keymap[KEY_F10] = SDLK_F10;
     keymap[KEY_F11] = SDLK_F11;
     keymap[KEY_F12] = SDLK_F12;
+    keymap[KEY_F13] = SDLK_F13;
+    keymap[KEY_F14] = SDLK_F14;
+    keymap[KEY_F15] = SDLK_F15;
+/*
     keymap[KEY_PRINT] = SDLK_PRINT;
     keymap[KEY_SCROLLOCK] = SDLK_SCROLLOCK;
     keymap[KEY_PAUSE] = SDLK_PAUSE;
+*/
     keymap[KEY_POWER] = SDLK_POWER;
     keymap[KEY_BACKQUOTE] = SDLK_BACKQUOTE;
     keymap[KEY_1] = SDLK_1;
--- a/src/video/cocoa/SDL_cocoakeys.h	Tue Feb 13 09:58:58 2007 +0000
+++ b/src/video/cocoa/SDL_cocoakeys.h	Wed Feb 14 10:25:41 2007 +0000
@@ -36,9 +36,14 @@
 #define KEY_F10			0x6D
 #define KEY_F11			0x67
 #define KEY_F12			0x6F
+#define KEY_F13			0x69
+#define KEY_F14			0x6B
+#define KEY_F15			0x71
+/*
 #define KEY_PRINT		0x69
 #define KEY_SCROLLOCK    0x6B
 #define KEY_PAUSE		0x71
+*/
 #define KEY_POWER		0x7F
 #define KEY_BACKQUOTE	0x32
 #define KEY_1			0x12