LOVE/megasource
1
0
Fork 0
mirror of https://github.com/love2d/megasource.git synced 2026-08-17 11:11:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added SDL 1c0f6952e65e.

Browse Source
This commit is contained in:
rude
2015-03-15 15:47:43 +01:00
parent 4d04ac181e
commit 6a2aff6450
1109 changed files with 160136 additions and 33995 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/SDL2/test/controllermap.c
+9 -7
View File
@@ -109,9 +109,9 @@ WatchJoystick(SDL_Joystick * joystick)
SDL_Rect dst;
int s, _s;
Uint8 alpha=200, alpha_step = -1;
Uint32 alpha_ticks;
Uint32 alpha_ticks = 0;
char mapping[4096], temp[4096];
MappingStep *step;
MappingStep *step, *prev_step;
MappingStep steps[] = {
{342, 132, 0.0, MARKER_BUTTON, "x", -1, -1, -1, -1, ""},
{387, 167, 0.0, MARKER_BUTTON, "a", -1, -1, -1, -1, ""},
@@ -191,7 +191,6 @@ WatchJoystick(SDL_Joystick * joystick)
step->button = -1;
step->hat = -1;
step->hat_value = -1;
SDL_SetClipboardText("TESTING TESTING 123");
switch(step->marker) {
case MARKER_AXIS:
@@ -251,6 +250,9 @@ WatchJoystick(SDL_Joystick * joystick)
break;
case SDL_JOYHATMOTION:
if (event.jhat.value == SDL_HAT_CENTERED) {
break; /* ignore centering, we're probably just coming back to the center from the previous item we set. */
}
for (_s = 0; _s < s; _s++) {
if (steps[_s].hat == event.jhat.hat && steps[_s].hat_value == event.jhat.value) {
break;
@@ -293,8 +295,8 @@ WatchJoystick(SDL_Joystick * joystick)
if (event.key.keysym.sym == SDLK_BACKSPACE || event.key.keysym.sym == SDLK_AC_BACK) {
/* Undo! */
if (s > 0) {
SDL_strlcpy(mapping, step->mapping, SDL_arraysize(step->mapping));
s--;
prev_step = &steps[--s];
SDL_strlcpy(mapping, prev_step->mapping, SDL_arraysize(prev_step->mapping));
next = SDL_TRUE;
}
break;
@@ -373,7 +375,7 @@ main(int argc, char *argv[])
}
}
#ifdef ANDROID
#ifdef __ANDROID__
if (SDL_NumJoysticks() > 0) {
#else
if (argv[1]) {
@@ -382,7 +384,7 @@ main(int argc, char *argv[])
SDL_bool keepGoing = SDL_TRUE;
SDL_Event event;
int device;
#ifdef ANDROID
#ifdef __ANDROID__
device = 0;
#else
device = atoi(argv[1]);