summaryrefslogtreecommitdiff
path: root/textscreen
diff options
context:
space:
mode:
authorSimon Howard2009-06-12 00:23:33 +0000
committerSimon Howard2009-06-12 00:23:33 +0000
commit0f5de61b743fdf05335436c1c71b4b488870483f (patch)
tree43eca2de9916341a75148e681e73fff20299d9e8 /textscreen
parentec03448333ca4c1d996dcb2b9c9ac01522a271bd (diff)
parent43748a366a4bc5494c15995273bfe158530e03de (diff)
downloadchocolate-doom-0f5de61b743fdf05335436c1c71b4b488870483f.tar.gz
chocolate-doom-0f5de61b743fdf05335436c1c71b4b488870483f.tar.bz2
chocolate-doom-0f5de61b743fdf05335436c1c71b4b488870483f.zip
Merge from trunk.
Subversion-branch: /branches/raven-branch Subversion-revision: 1596
Diffstat (limited to 'textscreen')
-rw-r--r--textscreen/txt_sdl.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/textscreen/txt_sdl.c b/textscreen/txt_sdl.c
index ef00cfb4..cfeaf0b0 100644
--- a/textscreen/txt_sdl.c
+++ b/textscreen/txt_sdl.c
@@ -372,6 +372,15 @@ static int TranslateKey(SDL_keysym *sym)
case SDLK_PAGEUP: return KEY_PGUP;
case SDLK_PAGEDOWN: return KEY_PGDN;
+#ifdef SDL_HAVE_APP_KEYS
+ case SDLK_APP1: return KEY_F1;
+ case SDLK_APP2: return KEY_F2;
+ case SDLK_APP3: return KEY_F3;
+ case SDLK_APP4: return KEY_F4;
+ case SDLK_APP5: return KEY_F5;
+ case SDLK_APP6: return KEY_F6;
+#endif
+
default: break;
}
@@ -512,6 +521,7 @@ static char *SpecialKeyName(int key)
case KEYP_MINUS: return "PAD-";
case KEYP_DIVIDE: return "PAD/";
*/
+
default: return NULL;
}
}