#define ENABLE_UNUSED_CODE 0 /* currently unused functions */
+#define DEBUG_JOYSTICKS 0
+
/* ========================================================================= */
/* video functions */
SDLSetWindowIcon(program.icon_filename);
/* set window and icon title */
-#if defined(TARGET_SDL2)
- SDL_SetWindowTitle(sdl_window, program.window_title);
-#else
- SDL_WM_SetCaption(program.window_title, program.window_title);
-#endif
+ SDLSetWindowTitle();
}
inline static void SDLInitVideoBuffer_DrawBuffer()
void SDLSetWindowTitle()
{
#if defined(TARGET_SDL2)
+ if (sdl_window == NULL)
+ return;
+
SDL_SetWindowTitle(sdl_window, program.window_title);
#else
SDL_WM_SetCaption(program.window_title, program.window_title);
static int sdl_js_button[MAX_PLAYERS][2];
static boolean sdl_is_controller[MAX_PLAYERS];
-static boolean SDLOpenJoystick(int nr)
+void SDLClearJoystickState()
{
- if (nr < 0 || nr > MAX_PLAYERS)
+ int i, j;
+
+ for (i = 0; i < MAX_PLAYERS; i++)
+ {
+ for (j = 0; j < 2; j++)
+ {
+ sdl_js_axis_raw[i][j] = -1;
+ sdl_js_axis[i][j] = 0;
+ sdl_js_button[i][j] = 0;
+ }
+ }
+}
+
+boolean SDLOpenJoystick(int nr)
+{
+ if (nr < 0 || nr >= MAX_PLAYERS)
return FALSE;
#if defined(TARGET_SDL2)
sdl_is_controller[nr] = FALSE;
#endif
-#if 1
+#if DEBUG_JOYSTICKS
Error(ERR_DEBUG, "opening joystick %d (%s)",
nr, (sdl_is_controller[nr] ? "game controller" : "joystick"));
#endif
return (sdl_joystick[nr] != NULL);
}
-static void SDLCloseJoystick(int nr)
+void SDLCloseJoystick(int nr)
{
- if (nr < 0 || nr > MAX_PLAYERS)
+ if (nr < 0 || nr >= MAX_PLAYERS)
return;
-#if 1
+#if DEBUG_JOYSTICKS
Error(ERR_DEBUG, "closing joystick %d", nr);
#endif
#endif
sdl_joystick[nr] = NULL;
-
- sdl_js_axis_raw[nr][0] = -1;
- sdl_js_axis_raw[nr][1] = -1;
- sdl_js_axis[nr][0] = 0;
- sdl_js_axis[nr][1] = 0;
- sdl_js_button[nr][0] = 0;
- sdl_js_button[nr][1] = 0;
}
boolean SDLCheckJoystickOpened(int nr)
{
- if (nr < 0 || nr > MAX_PLAYERS)
+ if (nr < 0 || nr >= MAX_PLAYERS)
return FALSE;
#if defined(TARGET_SDL2)
int axis_id = axis_id_raw % 2;
#endif
+ if (nr < 0 || nr >= MAX_PLAYERS)
+ return;
+
if (axis_id == -1)
return;
int button_id = button_id_raw % 2;
#endif
+ if (nr < 0 || nr >= MAX_PLAYERS)
+ return;
+
if (button_id == -1)
return;
switch(event->type)
{
#if defined(TARGET_SDL2)
+ case SDL_CONTROLLERDEVICEADDED:
+#if DEBUG_JOYSTICKS
+ Error(ERR_DEBUG, "SDL_CONTROLLERDEVICEADDED: device %d added",
+ event->cdevice.which);
+#endif
+ InitJoysticks();
+ break;
+
+ case SDL_CONTROLLERDEVICEREMOVED:
+#if DEBUG_JOYSTICKS
+ Error(ERR_DEBUG, "SDL_CONTROLLERDEVICEREMOVED: device %d removed",
+ event->cdevice.which);
+#endif
+ InitJoysticks();
+ break;
+
case SDL_CONTROLLERAXISMOTION:
-#if 1
+#if DEBUG_JOYSTICKS
Error(ERR_DEBUG, "SDL_CONTROLLERAXISMOTION: device %d, axis %d: %d",
event->caxis.which, event->caxis.axis, event->caxis.value);
#endif
break;
case SDL_CONTROLLERBUTTONDOWN:
-#if 1
+#if DEBUG_JOYSTICKS
Error(ERR_DEBUG, "SDL_CONTROLLERBUTTONDOWN: device %d, button %d",
event->cbutton.which, event->cbutton.button);
#endif
break;
case SDL_CONTROLLERBUTTONUP:
-#if 1
+#if DEBUG_JOYSTICKS
Error(ERR_DEBUG, "SDL_CONTROLLERBUTTONUP: device %d, button %d",
event->cbutton.which, event->cbutton.button);
#endif
if (sdl_is_controller[event->jaxis.which])
break;
-#if 1
+#if DEBUG_JOYSTICKS
Error(ERR_DEBUG, "SDL_JOYAXISMOTION: device %d, axis %d: %d",
event->jaxis.which, event->jaxis.axis, event->jaxis.value);
#endif
if (sdl_is_controller[event->jaxis.which])
break;
-#if 1
+#if DEBUG_JOYSTICKS
Error(ERR_DEBUG, "SDL_JOYBUTTONDOWN: device %d, button %d",
event->jbutton.which, event->jbutton.button);
#endif
if (sdl_is_controller[event->jaxis.which])
break;
-#if 1
+#if DEBUG_JOYSTICKS
Error(ERR_DEBUG, "SDL_JOYBUTTONUP: device %d, button %d",
event->jbutton.which, event->jbutton.button);
#endif
static boolean sdl_joystick_subsystem_initialized = FALSE;
boolean print_warning = !sdl_joystick_subsystem_initialized;
#if defined(TARGET_SDL2)
- char *mappings_file = "gamecontrollerdb.txt";
+ char *mappings_file_base = getPath2(options.conf_directory,
+ GAMECONTROLLER_BASENAME);
+ char *mappings_file_user = getPath2(getUserGameDataDir(),
+ GAMECONTROLLER_BASENAME);
int num_mappings;
#endif
int i;
}
#if defined(TARGET_SDL2)
- num_mappings = SDL_GameControllerAddMappingsFromFile(mappings_file);
+ num_mappings = SDL_GameControllerAddMappingsFromFile(mappings_file_base);
- if (num_mappings != -1)
- Error(ERR_INFO, "%d game controller mapping(s) added", num_mappings);
+ /* the included game controller base mappings should always be found */
+ if (num_mappings == -1)
+ Error(ERR_WARN, "no game controller base mappings found");
+#if DEBUG_JOYSTICKS
else
- Error(ERR_WARN, "no game controller mappings found");
+ Error(ERR_INFO, "%d game controller base mapping(s) added", num_mappings);
+#endif
+
+ num_mappings = SDL_GameControllerAddMappingsFromFile(mappings_file_user);
+
+#if DEBUG_JOYSTICKS
+ /* the personal game controller user mappings may or may not be found */
+ if (num_mappings == -1)
+ Error(ERR_WARN, "no game controller user mappings found");
+ else
+ Error(ERR_INFO, "%d game controller user mapping(s) added", num_mappings);
Error(ERR_INFO, "%d joystick(s) found:", SDL_NumJoysticks());
+#endif
+
+ checked_free(mappings_file_base);
+ checked_free(mappings_file_user);
+#if DEBUG_JOYSTICKS
for (i = 0; i < SDL_NumJoysticks(); i++)
{
const char *name, *type;
Error(ERR_INFO, "- joystick %d (%s): '%s'",
i, type, (name ? name : "(Unknown)"));
}
+#endif
#endif
}
joystick_nr = -1;
}
- /* misuse joystick file descriptor variable to store joystick number */
- joystick.fd[i] = joystick_nr;
+ /* store configured joystick number for each player */
+ joystick.nr[i] = joystick_nr;
}
/* now open all connected joysticks (regardless if configured or not) */
else if (print_warning)
Error(ERR_WARN, "cannot open joystick %d", i);
}
+
+ SDLClearJoystickState();
}
boolean SDLReadJoystick(int nr, int *x, int *y, boolean *b1, boolean *b2)
return TRUE;
}
+
+/* ========================================================================= */
+/* touch input overlay functions */
+/* ========================================================================= */
+
#if defined(USE_TOUCH_INPUT_OVERLAY)
static void DrawTouchInputOverlay()
{
static int alpha_step = 5;
static int alpha_last = 0;
static int alpha = 0;
+ boolean active = (overlay.enabled && overlay.active);
- if (!overlay.active && deactivated)
+ if (!active && deactivated)
return;
- if (overlay.active)
+ if (active)
{
if (alpha < alpha_max)
alpha = MIN(alpha + alpha_step, alpha_max);