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

Date: Wed, 1 Mar 2006 23:52:09 +0100

Browse source 
From: Sam Hocevar
Subject: [SDL] [patch] aalib driver

   Hi there. The attached patch fixes a buffer overflow in the aalib
driver and also adds a workaround for a conflict between arrow keys and
the numeric keypad that have the same scancode on aalib. The patch gives
precedence to the arrow keys.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401462
This commit is contained in:
Sam Lantinga 2006-03-02 03:18:21 +00:00
parent 95425a11d5
commit a4b20c800a
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/video/aalib/SDL_aaevents.c
View file

@ -126,12 +126,6 @@ void AA_InitOSKeymap(_THIS)
for ( i=0; i<SDL_arraysize(keymap); ++i ) for ( i=0; i<SDL_arraysize(keymap); ++i )
keymap[i] = SDLK_UNKNOWN; keymap[i] = SDLK_UNKNOWN;
keymap[AA_ESC] = SDLK_ESCAPE;
keymap[AA_UP] = SDLK_UP;
keymap[AA_DOWN] = SDLK_DOWN;
keymap[AA_LEFT] = SDLK_LEFT;
keymap[AA_RIGHT] = SDLK_RIGHT;
/* Alphabet keys */ /* Alphabet keys */
for ( i = 0; i<26; ++i ){ for ( i = 0; i<26; ++i ){
keymap['a' + i] = SDLK_a+i; keymap['a' + i] = SDLK_a+i;
@ -179,10 +173,20 @@ void AA_InitOSKeymap(_THIS)
keymap[293] = SDLK_KP7; keymap[293] = SDLK_KP7;
keymap[295] = SDLK_KP8; keymap[295] = SDLK_KP8;
keymap[298] = SDLK_KP9; keymap[298] = SDLK_KP9;
keymap[AA_ESC] = SDLK_ESCAPE;
keymap[AA_UP] = SDLK_UP;
keymap[AA_DOWN] = SDLK_DOWN;
keymap[AA_LEFT] = SDLK_LEFT;
keymap[AA_RIGHT] = SDLK_RIGHT;
} }
static SDL_keysym *TranslateKey(int scancode, SDL_keysym *keysym) static SDL_keysym *TranslateKey(int scancode, SDL_keysym *keysym)
{ {
/* Sanity check */
if ( scancode >= SDL_arraysize(keymap) )
scancode = AA_UNKNOWN;
/* Set the keysym information */ /* Set the keysym information */
keysym->scancode = scancode; keysym->scancode = scancode;
keysym->sym = keymap[scancode]; keysym->sym = keymap[scancode];