adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compiling with no joystick warning fixes (bug #50); SDLKey signedness warning fixes and hardening

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3666 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2011-08-08 15:56:23 +00:00
parent 62a291f2c2
commit 30b6be94f9
1 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/libs/input/sdl/input.c
+30 -16
View File
@@ -33,7 +33,7 @@
static int kbdhead=0, kbdtail=0; static int kbdhead=0, kbdtail=0;
static UniChar kbdbuf[KBDBUFSIZE]; static UniChar kbdbuf[KBDBUFSIZE];
static UniChar lastchar; static UniChar lastchar;
static unsigned int num_keys = 0; static int num_keys = 0;
static int *kbdstate = NULL; static int *kbdstate = NULL;
// Holds all SDL keys +1 for holding invalid values // Holds all SDL keys +1 for holding invalid values
@@ -213,20 +213,13 @@ TFB_SetInputVectors (volatile int menu[], int num_menu_, volatile int flight[],
num_flight = num_flight_; num_flight = num_flight_;
} }
int
TFB_InitInput (int driver, int flags)
{
int i;
int nJoysticks;
(void)driver;
(void)flags;
SDL_EnableUNICODE(1);
(void)SDL_GetKeyState (&num_keys);
kbdstate = (int *)HMalloc (sizeof (int) * (num_keys + 1));
#ifdef HAVE_JOYSTICK #ifdef HAVE_JOYSTICK
static void
initJoystick (void)
{
int nJoysticks;
if ((SDL_InitSubSystem(SDL_INIT_JOYSTICK)) == -1) if ((SDL_InitSubSystem(SDL_INIT_JOYSTICK)) == -1)
{ {
log_add (log_Fatal, "Couldn't initialize joystick subsystem: %s", log_add (log_Fatal, "Couldn't initialize joystick subsystem: %s",
@@ -239,6 +232,8 @@ TFB_InitInput (int driver, int flags)
nJoysticks = SDL_NumJoysticks (); nJoysticks = SDL_NumJoysticks ();
if (nJoysticks > 0) if (nJoysticks > 0)
{ {
int i;
log_add (log_Info, "The names of the joysticks are:"); log_add (log_Info, "The names of the joysticks are:");
for (i = 0; i < nJoysticks; i++) for (i = 0; i < nJoysticks; i++)
{ {
@@ -246,6 +241,23 @@ TFB_InitInput (int driver, int flags)
} }
SDL_JoystickEventState (SDL_ENABLE); SDL_JoystickEventState (SDL_ENABLE);
} }
}
#endif /* HAVE_JOYSTICK */
int
TFB_InitInput (int driver, int flags)
{
(void)driver;
(void)flags;
SDL_EnableUNICODE(1);
(void)SDL_GetKeyState (&num_keys);
kbdstate = (int *)HMalloc (sizeof (int) * (num_keys + 1));
#ifdef HAVE_JOYSTICK
initJoystick ();
#endif /* HAVE_JOYSTICK */ #endif /* HAVE_JOYSTICK */
in_character_mode = FALSE; in_character_mode = FALSE;
@@ -350,10 +362,12 @@ ProcessInputEvent (const SDL_Event *Event)
if (Event->type == SDL_KEYDOWN || Event->type == SDL_KEYUP) if (Event->type == SDL_KEYDOWN || Event->type == SDL_KEYUP)
{ // process character input event, if any { // process character input event, if any
SDLKey k = Event->key.keysym.sym; // keysym.sym is an SDLKey type which is an enum and can be signed
// or unsigned on different platforms; we'll use a guaranteed type
int k = Event->key.keysym.sym;
UniChar map_key = Event->key.keysym.unicode; UniChar map_key = Event->key.keysym.unicode;
if (k > num_keys) if (k < 0 || k > num_keys)
k = num_keys; // for unknown keys k = num_keys; // for unknown keys
if (Event->type == SDL_KEYDOWN) if (Event->type == SDL_KEYDOWN)