[fuse-emulator-cvs] fuse/ui/sdl sdljoystick.c,NONE,1.1 sdljoystick.h,NONE,1.1 Makefile.am,1.1,1.2 sdlui.c,1.5,1.6

[<pa...@us...>]

Update of /cvsroot/fuse-emulator/fuse/ui/sdl
In directory sc8-pr-cvs1:/tmp/cvs-serv31876/ui/sdl

Modified Files:
	Makefile.am sdlui.c 
Added Files:
	sdljoystick.c sdljoystick.h 
Log Message:
Real joystick support (Darren/Fred)


--- NEW FILE: sdljoystick.c ---
/* sdljoystick.c: routines for dealing with the SDL joystick
   Copyright (c) 2003 Darren Salt, Fredrick Meunier

   $Id: sdljoystick.c,v 1.1 2003/10/07 13:49:01 pak21 Exp $

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.

   This program 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 General Public License for more details.

   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 49 Temple Place, Suite 330, Boston, MA 02111-1307 USA

   Author contact information:

   E-mail: pak...@sr...
   Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England

   Fred: fr...@sp...
*/

#include <config.h>

#ifdef UI_SDL			/* Use this iff we're using SDL */

#if !defined USE_JOYSTICK || defined HAVE_JSW_H
/* Fake joystick, or override UI-specific handling */
#include "../uijoystick.c"

#else			/* #if !defined USE_JOYSTICK || defined HAVE_JSW_H */

#include <SDL.h>

#include "sdljoystick.h"
#include "settings.h"
#include "ui/ui.h"
#include "ui/uijoystick.h"

static SDL_Joystick *joystick1 = NULL;
static SDL_Joystick *joystick2 = NULL;

kempston_type joystick1_return_value;
kempston_type joystick2_return_value;

int
ui_joystick_init( void )
{
  int retval = SDL_NumJoysticks();

  SDL_InitSubSystem( SDL_INIT_JOYSTICK );

  if( retval >= 2 ) {

    retval = 2;

    if( ( joystick2 = SDL_JoystickOpen( 1 ) ) == NULL ) {
      ui_error( UI_ERROR_ERROR, "failed to initialise joystick 2" );
      return 0;
    }

    if( SDL_JoystickNumAxes( joystick2 ) < 2    ||
        SDL_JoystickNumButtons( joystick2 ) < 1    ) {
      ui_error( UI_ERROR_ERROR, "sorry, joystick 2 is inadequate!" );
      return 0;
    }

  }

  if( retval > 0 ) {

    if( ( joystick1 = SDL_JoystickOpen( 0 ) ) == NULL ) {
      ui_error( UI_ERROR_ERROR, "failed to initialise joystick 1" );
      return 0;
    }
 
    if( SDL_JoystickNumAxes( joystick1 ) < 2    ||
        SDL_JoystickNumButtons( joystick1 ) < 1    ) {
      ui_error( UI_ERROR_ERROR, "sorry, joystick 1 is inadequate!" );
      return 0;
    }
  }

  SDL_JoystickEventState( SDL_ENABLE );

  return retval;
}

BYTE
ui_joystick_read( WORD port, BYTE which )
{
  if( which ) return joystick2_return_value.byte;

  return joystick1_return_value.byte;
}

void
sdljoystick_buttonpress( SDL_JoyButtonEvent *buttonevent )
{
  switch ( buttonevent->which ) {

  case 0: joystick1_return_value.bits.fire = 1; break;
  case 1: joystick2_return_value.bits.fire = 1; break;

  default:
    /* Unknown joystick */
    return;
  }
}

void
sdljoystick_buttonrelease( SDL_JoyButtonEvent *buttonevent )
{
  switch ( buttonevent->which ) {

  case 0: joystick1_return_value.bits.fire = 0; break;
  case 1: joystick2_return_value.bits.fire = 0; break;

  default:
    /* Unknown joystick */
    return;
  }
}

void
sdljoystick_axismove( SDL_JoyAxisEvent *axisevent )
{
  kempston_type *joystick_return_value = NULL;
  
  switch ( axisevent->which ) {

  case 0: joystick_return_value = &joystick1_return_value; break;
  case 1: joystick_return_value = &joystick2_return_value; break;

  default:
    /* Unknown joystick */
    return;
  }

  if( axisevent->axis == 0 ) {

    if( axisevent->value > 16384 ) { /* right */
      (*joystick_return_value).bits.right = 1;
      (*joystick_return_value).bits.left = 0;
    } else if( axisevent->value < -16384 ) { /* left */
      (*joystick_return_value).bits.left = 1;
      (*joystick_return_value).bits.right = 0;
    } else { /* centered */
      (*joystick_return_value).bits.left = 0;
      (*joystick_return_value).bits.right = 0;
    }

  } else if( axisevent->axis == 1 ) {

    if( axisevent->value > 16384 ) { /* down */
      (*joystick_return_value).bits.down = 1;
      (*joystick_return_value).bits.up = 0;
    } else if( axisevent->value < -16384 ) { /* up */
      (*joystick_return_value).bits.up = 1;
      (*joystick_return_value).bits.down = 0;
    } else { /* centered */
      (*joystick_return_value).bits.up = 0;
      (*joystick_return_value).bits.down = 0;
    }

  }
}

void
ui_joystick_end( void )
{
  if( joystick1 != NULL || joystick2 != NULL ) {

    SDL_JoystickEventState( SDL_IGNORE );
    if( joystick1 != NULL ) SDL_JoystickClose( joystick1 );
    if( joystick2 != NULL ) SDL_JoystickClose( joystick2 );
    joystick1 = NULL;
    joystick2 = NULL;

  }

  SDL_QuitSubSystem( SDL_INIT_JOYSTICK );
}

#endif			/* #if !defined USE_JOYSTICK || defined HAVE_JSW_H */

#endif			/* #ifdef UI_SDL */

--- NEW FILE: sdljoystick.h ---
/* sdljoystick.h: routines for dealing with the SDL joystick
   Copyright (c) 2003 Fredrick Meunier

   $Id: sdljoystick.h,v 1.1 2003/10/07 13:49:01 pak21 Exp $

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.

   This program 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 General Public License for more details.

   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 49 Temple Place, Suite 330, Boston, MA 02111-1307 USA

   Author contact information:

   E-mail: pak...@sr...
   Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England

   Fred: fr...@sp...

*/

#ifndef FUSE_SDLJOYSTICK_H
#define FUSE_SDLJOYSTICK_H

void sdljoystick_buttonpress( SDL_JoyButtonEvent *buttonevent );
void sdljoystick_buttonrelease( SDL_JoyButtonEvent *buttonevent );
void sdljoystick_axismove( SDL_JoyAxisEvent *axisevent );

#endif			/* #ifndef FUSE_SDLJOYSTICK_H */

Index: Makefile.am
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/ui/sdl/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile.am	11 Dec 2002 15:54:18 -0000	1.1
--- Makefile.am	7 Oct 2003 13:49:01 -0000	1.2
***************
*** 1,4 ****
  ## Process this file with automake to produce Makefile.in
! ## Copyright (c) 2001 Philip Kendall
  
  ## $Id$
--- 1,4 ----
  ## Process this file with automake to produce Makefile.in
! ## Copyright (c) 2001-2003 Philip Kendall
  
  ## $Id$
***************
*** 27,33 ****
  noinst_LIBRARIES = libuisdl.a
  
! INCLUDES = @GLIB_CFLAGS@ @LIBSPEC_CFLAGS@
  
! libuisdl_a_SOURCES = sdldisplay.c sdlkeyboard.c sdlui.c error.c keysyms.c
  
  BUILT_SOURCES = keysyms.c
--- 27,39 ----
  noinst_LIBRARIES = libuisdl.a
  
! INCLUDES = @GLIB_CFLAGS@ @LIBSPEC_CFLAGS@ @SDL_CFLAGS@
! LDADD = @SDL_LIBS@
  
! libuisdl_a_SOURCES = sdldisplay.c \
! 		     sdljoystick.c \
! 		     sdlkeyboard.c \
! 		     sdlui.c \
! 		     error.c \
! 		     keysyms.c
  
  BUILT_SOURCES = keysyms.c

Index: sdlui.c
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/ui/sdl/sdlui.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** sdlui.c	22 Aug 2003 11:45:42 -0000	1.5
--- sdlui.c	7 Oct 2003 13:49:01 -0000	1.6
***************
*** 37,40 ****
--- 37,41 ----
  #include "ui/uidisplay.h"
  #include "sdldisplay.h"
+ #include "sdljoystick.h"
  #include "sdlkeyboard.h"
  #include "ui/scaler/scaler.h"
***************
*** 76,79 ****
--- 77,95 ----
        sdlkeyboard_keyrelease( &(event.key) );
        break;
+ 
+ #if defined USE_JOYSTICK && !defined HAVE_JSW_H
+ 
+     case SDL_JOYBUTTONDOWN:
+       sdljoystick_buttonpress( &(event.jbutton) );
+       break;
+     case SDL_JOYBUTTONUP:
+       sdljoystick_buttonrelease( &(event.jbutton) );
+       break;
+     case SDL_JOYAXISMOTION:
+       sdljoystick_axismove( &(event.jaxis) );
+       break;
+ 
+ #endif			/* if defined USE_JOYSTICK && !defined HAVE_JSW_H */
+ 
      case SDL_QUIT:
        fuse_exiting = 1;