Mercurial > sdl-ios-xcode
view src/joystick/beos/SDL_bejoystick.cc @ 4426:1bceff8f008f
Fixed bug #943
Ozkan Sezer 2010-02-06 12:31:06 PST
Hi:
Here are some small fixes for compiling SDL against mingw-w64.
(see http://mingw-w64.sourceforge.net/ . Despite the name, it
supports both win32 and win64.)
src/audio/windx5/directx.h and src/video/windx5/directx.h (both
SDL-1.2 and SDL-1.3.) I get compilation errors about some union
not having a member named u1 and alike, because of other system
headers being included before this one and them already defining
DUMMYUNIONNAME and stuff. This header probably assumes that those
stuff are defined in windef.h, but mingw-w64 headers define them
in _mingw.h. Easily fixed by moving NONAMELESSUNION definition to
the top of the file.
src/thread/win32/SDL_systhread.c (both SDL-1.2 and SDL-1.3.) :
The __GNUC__ case for pfnSDL_CurrentBeginThread is 32-bit centric
because _beginthreadex returns uintptr_t, not unsigned long which
is 32 bits in win64. Changing the return type to uintptr_t fixes
it.
video/SDL_blit.h (and configure.in) (SDL-1.3-only) : MinGW-w64
uses msvcrt version of _aligned_malloc and _aligned_free and
they are defined in intrin.h (similar to VC). Adding proper
ifdefs fixes it. (Notes about macros to check: __MINGW32__ is
defined for both mingw.org and for mingw-w64 for both win32 and
win64, __MINGW64__ is only defined for _WIN64, so __MINGW64__
can't be used to detect mingw-w64: including _mingw.h and then
checking for __MINGW64_VERSION_MAJOR does the trick.)
SDL_win32video.h (SDL-1.3-only) : Tweaked the VINWER definition
and location in order to avoid multiple redefinition warnings.
Hope these are useful. Thanks.
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Wed, 10 Mar 2010 15:02:58 +0000 |
parents | 99210400e8b9 |
children | b530ef003506 |
line wrap: on
line source
/* SDL - Simple DirectMedia Layer Copyright (C) 1997-2009 Sam Lantinga This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org */ #include "SDL_config.h" #ifdef SDL_JOYSTICK_BEOS /* This is the system specific header for the SDL joystick API */ #include <be/support/String.h> #include <be/device/Joystick.h> extern "C" { #include "SDL_joystick.h" #include "../SDL_sysjoystick.h" #include "../SDL_joystick_c.h" /* The maximum number of joysticks we'll detect */ #define MAX_JOYSTICKS 16 /* A list of available joysticks */ static char *SDL_joyport[MAX_JOYSTICKS]; static char *SDL_joyname[MAX_JOYSTICKS]; /* The private structure used to keep track of a joystick */ struct joystick_hwdata { BJoystick *stick; uint8 *new_hats; int16 *new_axes; }; /* Function to scan the system for joysticks. * This function should set SDL_numjoysticks to the number of available * joysticks. Joystick 0 should be the system default joystick. * It should return 0, or -1 on an unrecoverable fatal error. */ int SDL_SYS_JoystickInit(void) { BJoystick joystick; int numjoysticks; int i; int32 nports; char name[B_OS_NAME_LENGTH]; /* Search for attached joysticks */ nports = joystick.CountDevices(); numjoysticks = 0; SDL_memset(SDL_joyport, 0, (sizeof SDL_joyport)); SDL_memset(SDL_joyname, 0, (sizeof SDL_joyname)); for (i = 0; (SDL_numjoysticks < MAX_JOYSTICKS) && (i < nports); ++i) { if (joystick.GetDeviceName(i, name) == B_OK) { if (joystick.Open(name) != B_ERROR) { BString stick_name; joystick.GetControllerName(&stick_name); SDL_joyport[numjoysticks] = strdup(name); SDL_joyname[numjoysticks] = strdup(stick_name.String()); numjoysticks++; joystick.Close(); } } } return (numjoysticks); } /* Function to get the device-dependent name of a joystick */ const char *SDL_SYS_JoystickName(int index) { return SDL_joyname[index]; } /* Function to open a joystick for use. The joystick to open is specified by the index field of the joystick. This should fill the nbuttons and naxes fields of the joystick structure. It returns 0, or -1 if there is an error. */ int SDL_SYS_JoystickOpen(SDL_Joystick * joystick) { BJoystick *stick; /* Create the joystick data structure */ joystick->hwdata = (struct joystick_hwdata *) SDL_malloc(sizeof(*joystick->hwdata)); if (joystick->hwdata == NULL) { SDL_OutOfMemory(); return (-1); } SDL_memset(joystick->hwdata, 0, sizeof(*joystick->hwdata)); stick = new BJoystick; joystick->hwdata->stick = stick; /* Open the requested joystick for use */ if (stick->Open(SDL_joyport[joystick->index]) == B_ERROR) { SDL_SetError("Unable to open joystick"); SDL_SYS_JoystickClose(joystick); return (-1); } /* Set the joystick to calibrated mode */ stick->EnableCalibration(); /* Get the number of buttons, hats, and axes on the joystick */ joystick->nbuttons = stick->CountButtons(); joystick->naxes = stick->CountAxes(); joystick->nhats = stick->CountHats(); joystick->hwdata->new_axes = (int16 *) SDL_malloc(joystick->naxes * sizeof(int16)); joystick->hwdata->new_hats = (uint8 *) SDL_malloc(joystick->nhats * sizeof(uint8)); if (!joystick->hwdata->new_hats || !joystick->hwdata->new_axes) { SDL_OutOfMemory(); SDL_SYS_JoystickClose(joystick); return (-1); } /* We're done! */ return (0); } /* Function to update the state of a joystick - called as a device poll. * This function shouldn't update the joystick structure directly, * but instead should call SDL_PrivateJoystick*() to deliver events * and update joystick device state. */ void SDL_SYS_JoystickUpdate(SDL_Joystick * joystick) { static const Uint8 hat_map[9] = { SDL_HAT_CENTERED, SDL_HAT_UP, SDL_HAT_RIGHTUP, SDL_HAT_RIGHT, SDL_HAT_RIGHTDOWN, SDL_HAT_DOWN, SDL_HAT_LEFTDOWN, SDL_HAT_LEFT, SDL_HAT_LEFTUP }; const int JITTER = (32768 / 10); /* 10% jitter threshold (ok?) */ BJoystick *stick; int i, change; int16 *axes; uint8 *hats; uint32 buttons; /* Set up data pointers */ stick = joystick->hwdata->stick; axes = joystick->hwdata->new_axes; hats = joystick->hwdata->new_hats; /* Get the new joystick state */ stick->Update(); stick->GetAxisValues(axes); stick->GetHatValues(hats); buttons = stick->ButtonValues(); /* Generate axis motion events */ for (i = 0; i < joystick->naxes; ++i) { change = ((int32) axes[i] - joystick->axes[i]); if ((change > JITTER) || (change < -JITTER)) { SDL_PrivateJoystickAxis(joystick, i, axes[i]); } } /* Generate hat change events */ for (i = 0; i < joystick->nhats; ++i) { if (hats[i] != joystick->hats[i]) { SDL_PrivateJoystickHat(joystick, i, hat_map[hats[i]]); } } /* Generate button events */ for (i = 0; i < joystick->nbuttons; ++i) { if ((buttons & 0x01) != joystick->buttons[i]) { SDL_PrivateJoystickButton(joystick, i, (buttons & 0x01)); } buttons >>= 1; } } /* Function to close a joystick after use */ void SDL_SYS_JoystickClose(SDL_Joystick * joystick) { if (joystick->hwdata) { joystick->hwdata->stick->Close(); delete joystick->hwdata->stick; if (joystick->hwdata->new_hats) { SDL_free(joystick->hwdata->new_hats); } if (joystick->hwdata->new_axes) { SDL_free(joystick->hwdata->new_axes); } SDL_free(joystick->hwdata); joystick->hwdata = NULL; } } /* Function to perform any system-specific joystick related cleanup */ void SDL_SYS_JoystickQuit(void) { int i; for (i = 0; SDL_joyport[i]; ++i) { SDL_free(SDL_joyport[i]); } SDL_joyport[0] = NULL; for (i = 0; SDL_joyname[i]; ++i) { SDL_free(SDL_joyname[i]); } SDL_joyname[0] = NULL; } }; // extern "C" #endif /* SDL_JOYSTICK_BEOS */ /* vi: set ts=4 sw=4 expandtab: */