Mercurial > sdl-ios-xcode
view src/joystick/riscos/SDL_sysjoystick.c @ 1135:cf6133247d34
Mac Classic and CodeWarrior patches.
--ryan.
From: =?ISO-8859-1?Q?Anders_F_Bj=F6rklund?= <afb@algonet.se>
Subject: Re: [SDL] Updated Mac patch
Date: Tue, 6 Sep 2005 15:21:27 +0200
To: A list for developers using the SDL library <sdl@libsdl.org>
Earlier, I wrote:
> Updated the previous Mac patch to disable Carbon by default.
> Also "fixed" the SDL.spec again, so that it builds on Darwin.
>
> http://www.algonet.se/~afb/SDL-1.2.9-mac.patch
> Also applied fine to SDL12 CVS, when I tried it.
>
> Haven't completed any new packaging or projects for Xcode/PB,
> but it seems to build and install fine here (in development).
Tested the new patch to build with old CodeWarrior and MPW,
and it seems it needed some hacks with those old headers...
Just in case you want to support the archeological versions -
here is a small add-on to the above patch, to fix those...
http://www.algonet.se/~afb/SDL-1.2.9-classic.patch
I couldn't get the old CW5 projects to build without a few
modifications - such as deleting the stray old header in:
"CWprojects/Support/Carbon/Include/ConditionalMacros.h" ?
But I updated both projects to CW6 too and built for Carbon,
and it ran all of the Mac test projects without any problems.
The MPW file seems to have compiled, with a small order change.
As long as you're still shipping the CWProjects and MPWmake
with the download, they should probably be updated/fixed ?
(another "solution" would of course be to just delete them)
I'll post my new projects along with the new Xcode projects
later on, along with XML exports of the various .mcp files.
(CW5 builds for Classic / "PPC", and CW6 builds for Carbon)
It'll be packaged as a part of the next SpriteWorld X release...
http://spriteworldx.sourceforge.net/ [Classic/Carbon/Win/X11]
--anders
author | Ryan C. Gordon <icculus@icculus.org> |
---|---|
date | Thu, 08 Sep 2005 06:34:28 +0000 |
parents | 974ba6ae0fa3 |
children | c9b51268668f |
line wrap: on
line source
/* SDL - Simple DirectMedia Layer Copyright (C) 1997-2004 Sam Lantinga This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 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 Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Sam Lantinga slouken@devolution.com */ /* RISC OS - Joystick support by Alan Buckley (alan_baa@hotmail.com) - 10 April 2003 Note: Currently assumes joystick is present if joystick module is loaded and that there is one joystick with four buttons. */ #ifdef SAVE_RCSID static char rcsid = "@(#) $Id$"; #endif /* This is the system specific header for the SDL joystick API */ #include <stdio.h> /* For the definition of NULL */ #include <stdlib.h> #include "SDL_error.h" #include "SDL_joystick.h" #include "SDL_sysjoystick.h" #include "SDL_joystick_c.h" #include "kernel.h" #define JOYSTICK_READ 0x43F40 struct joystick_hwdata { int joystate; }; /* 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 number of joysticks, or -1 on an unrecoverable fatal error. */ int SDL_SYS_JoystickInit(void) { _kernel_swi_regs regs; /* Try to read joystick 0 */ regs.r[0] = 0; if (_kernel_swi(JOYSTICK_READ, ®s, ®s) == NULL) { /* Switch works so assume we've got a joystick */ return 1; } /* Switch fails so it looks like there's no joystick here */ return(0); } /* Function to get the device-dependent name of a joystick */ const char *SDL_SYS_JoystickName(int index) { if (index == 0) { return "RISC OS Joystick 0"; } SDL_SetError("No joystick available with that index"); return(NULL); } /* 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) { _kernel_swi_regs regs; if(!(joystick->hwdata=malloc(sizeof(struct joystick_hwdata)))) return -1; regs.r[0] = joystick->index; /* Don't know how to get exact count of buttons so assume max of 4 for now */ joystick->nbuttons=4; joystick->nhats=0; joystick->nballs=0; joystick->naxes=2; joystick->hwdata->joystate=0; 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) { _kernel_swi_regs regs; regs.r[0] = joystick->index; if (_kernel_swi(JOYSTICK_READ, ®s, ®s) == NULL) { int newstate = regs.r[0]; int oldstate = joystick->hwdata->joystate; if (newstate != oldstate) { if ((newstate & 0xFF) != (oldstate & 0xFF)) { int y = regs.r[0] & 0xFF; /* Convert to signed values */ if (y >= 128) y -= 256; SDL_PrivateJoystickAxis(joystick,1,-y * 256); /* Up and down opposite to result in SDL */ } if ((newstate & 0xFF00) != (oldstate & 0xFF00)) { int x = (regs.r[0] & 0xFF00) >> 8; if (x >= 128) x -= 256; SDL_PrivateJoystickAxis(joystick,0,x * 256); } if ((newstate & 0xFF0000) != (oldstate & 0xFF0000)) { int buttons = (regs.r[0] & 0xFF0000) >> 16; int oldbuttons = (oldstate & 0xFF0000) >> 16; int i; for (i = 0; i < joystick->nbuttons; i++) { if ((buttons & (1<<i)) != (oldbuttons & (1<<i))) { if (buttons & (1<<i)) SDL_PrivateJoystickButton(joystick,i,SDL_PRESSED); else SDL_PrivateJoystickButton(joystick,i,SDL_RELEASED); } } } joystick->hwdata->joystate = newstate; } } return; } /* Function to close a joystick after use */ void SDL_SYS_JoystickClose(SDL_Joystick *joystick) { if(joystick->hwdata) free(joystick->hwdata); return; } /* Function to perform any system-specific joystick related cleanup */ void SDL_SYS_JoystickQuit(void) { SDL_numjoysticks=0; return; }