fuse-emulator-cvs — SCM commits for Fuse (the Free Unix Spectrum Emulator), the associated utilities and libspectrum, the ZX Spectrum file format handling library

[fuse-emulator-cvs] fuse/ui/fb fbjoystick.c,NONE,1.1 Makefile.am,1.6,1.7

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

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

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


--- NEW FILE: fbjoystick.c ---
/* fbjoystick.c: Joystick emulation
   Copyright (c) 2003 Darren Salt

   $Id: fbjoystick.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., 59 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

   Darren: li...@yo...

*/

#include <config.h>

#ifdef UI_FB

#include "../uijoystick.c"

#endif				/* #ifdef UI_FB */


Index: Makefile.am
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/ui/fb/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Makefile.am	13 Apr 2003 09:48:32 -0000	1.6
--- Makefile.am	7 Oct 2003 13:49:01 -0000	1.7
***************
*** 29,33 ****
  INCLUDES = @GLIB_CFLAGS@ @LIBSPEC_CFLAGS@
  
! libuifb_a_SOURCES = fbdisplay.c fbkeyboard.c fbui.c error.c keysyms.c
  
  BUILT_SOURCES = keysyms.c
--- 29,38 ----
  INCLUDES = @GLIB_CFLAGS@ @LIBSPEC_CFLAGS@
  
! libuifb_a_SOURCES = fbdisplay.c \
! 		    fbjoystick.c \
! 	 	    fbkeyboard.c \
! 		    fbui.c \
! 		    error.c \
! 		    keysyms.c
  
  BUILT_SOURCES = keysyms.c

[fuse-emulator-cvs] fuse/ui/xlib xjoystick.c,NONE,1.1 Makefile.am,1.5,1.6

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

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

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


--- NEW FILE: xjoystick.c ---
/* fbjoystick.c: Joystick emulation
   Copyright (c) 2003 Darren Salt

   $Id: xjoystick.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., 59 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

   Darren: li...@yo...

*/

#include <config.h>

#ifdef UI_X

#include "../uijoystick.c"

#endif				/* #ifdef UI_X */

Index: Makefile.am
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/ui/xlib/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile.am	4 Dec 2002 22:26:13 -0000	1.5
--- Makefile.am	7 Oct 2003 13:49:01 -0000	1.6
***************
*** 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,31 ****
  noinst_LIBRARIES = libuixlib.a
  
! libuixlib_a_SOURCES = xdisplay.c xerror.c xkeyboard.c xui.c keysyms.c
  
  BUILT_SOURCES = keysyms.c
--- 27,36 ----
  noinst_LIBRARIES = libuixlib.a
  
! libuixlib_a_SOURCES = xdisplay.c \
! 		      xerror.c \
! 		      xjoystick.c \
! 		      xkeyboard.c \
! 		      xui.c \
! 		      keysyms.c
  
  BUILT_SOURCES = keysyms.c

[fuse-emulator-cvs] fuse/ui/svga svgajoystick.c,NONE,1.1 Makefile.am,1.5,1.6

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

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

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


--- NEW FILE: svgajoystick.c ---
/* svgajoystick.c: Joystick emulation (using svgalib)
   Copyright (c) 2003 Darren Salt

   $Id: svgajoystick.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., 59 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

   Darren: li...@yo...

*/

#include <config.h>

#ifdef UI_SVGA			/* Use this iff we're using svgalib */

#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 */

/* Use the svgalib joystick support */

#include <string.h>
#include <errno.h>

#include <libspectrum.h>
#include <vgajoystick.h>

#include "fuse.h"
#include "joystick.h"
#include "keyboard.h"
#include "settings.h"
#include "spectrum.h"
#include "machine.h"
#include "ui/ui.h"

static int
init_stick( int which )
{
  if( !joystick_init( which, JOY_CALIB_STDOUT ) )
  {
    ui_error( UI_ERROR_ERROR, "failed to initialise joystick %i: %s",
	      which + 1, errno ? strerror (errno) : "not configured?" );
    return 1;
  }

  if( joystick_getnumaxes( which ) < 2 || joystick_getnumbuttons( which ) < 1 )
  {
    joystick_close( which );
    ui_error( UI_ERROR_ERROR, "sorry, joystick %i is inadequate!", which + 1 );
    return 1;
  }

  return 0;
}

int
ui_joystick_init( void )
{
  /* If we can't init the first, don't try the second */
  if( init_stick( 0 ) ) return 0;
  if( init_stick( 1 ) ) return 1;
  return 2;
}

int
ui_joystick_end( void )
{
  joystick_close( -1 );
  return 0;
}

BYTE
ui_joystick_read( WORD port, BYTE which )
{
  BYTE ret = 0;
  int x, y;

  joystick_update();

  x = joystick_x( which );
  y = joystick_y( which );

       if( x > 0 ) ret |= 1; /* right */
  else if( x < 0 ) ret |= 2; /* left */

       if( y > 0 ) ret |= 4; /* down */
  else if( y < 0 ) ret |= 8; /* up */

  if( joystick_button1( which ) ) ret |= 16; /* fire */

  return ret;
}

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

#endif			/* #ifdef UI_SVGA */

Index: Makefile.am
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/ui/svga/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile.am	2 Apr 2003 12:44:24 -0000	1.5
--- Makefile.am	7 Oct 2003 13:49:01 -0000	1.6
***************
*** 29,33 ****
  INCLUDES = @GLIB_CFLAGS@ @LIBSPEC_CFLAGS@
  
! libuisvga_a_SOURCES = error.c svgadisplay.c svgakeyboard.c svgaui.c keysyms.c
  
  BUILT_SOURCES = keysyms.c
--- 29,38 ----
  INCLUDES = @GLIB_CFLAGS@ @LIBSPEC_CFLAGS@
  
! libuisvga_a_SOURCES = error.c \
! 		      svgadisplay.c \
! 		      svgajoystick.c \
! 		      svgakeyboard.c \
! 		      svgaui.c \
! 		      keysyms.c
  
  BUILT_SOURCES = keysyms.c

[fuse-emulator-cvs] fuse/ui/gtk gtkjoystick.c,NONE,1.1 Makefile.am,1.17,1.18

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

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

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


--- NEW FILE: gtkjoystick.c ---
/* fbjoystick.c: Joystick emulation
   Copyright (c) 2003 Darren Salt

   $Id: gtkjoystick.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., 59 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

   Darren: li...@yo...

*/

#include <config.h>

#ifdef UI_GTK

#include "../uijoystick.c"

#endif				/* #ifdef UI_GTK */

Index: Makefile.am
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/ui/gtk/Makefile.am,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Makefile.am	4 Oct 2003 22:44:19 -0000	1.17
--- Makefile.am	7 Oct 2003 13:49:01 -0000	1.18
***************
*** 35,38 ****
--- 35,39 ----
                       error.c \
  		     gtkdisplay.c \
+ 		     gtkjoystick.c \
  		     gtkkeyboard.c \
                       gtkui.c \

[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;

[fuse-emulator-cvs] fuse/ui uijoystick.c,NONE,1.1 uijoystick.h,NONE,1.1

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

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

Added Files:
	uijoystick.c uijoystick.h 
Log Message:
Real joystick support (Darren/Fred)


--- NEW FILE: uijoystick.c ---
/* uijoystick.c: Joystick emulation (using libjsw)
   Copyright (c) 2003 Darren Salt

   $Id: uijoystick.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., 59 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

   Darren: li...@yo...

*/

/* Usage note: build this from within a specific UI unless that UI implements
 * its own joystick support using some other library.
 * Inclusion as follows:
 * #if !defined USE_JOYSTICK || defined HAVE_JSW_H
 * # include "../uijoystick.c"
 * #else
 *  // UI-specific code implementing the following (exported) functions
 * #endif
 */

#include <config.h>

#include "../joystick.h"
#include "joystick.h"

#if defined USE_JOYSTICK && defined HAVE_JSW_H

#include <stdio.h>
#include <string.h>
#include <errno.h>

#include <jsw.h>

#include <libspectrum.h>

#include "fuse.h"
#include "keyboard.h"
#include "settings.h"
#include "spectrum.h"
#include "machine.h"
#include "ui/ui.h"

static js_data_struct jsd[2];


static int
init_stick( int which, const char *const device,
	    const char *const calibration )
{
  switch( JSInit( &jsd[which], device, calibration, JSFlagNonBlocking ) ) {

  case JSSuccess:
    if( JSLoadCalibrationUNIX( &jsd[which] ) && errno != ENOENT ) {
      ui_error( UI_ERROR_ERROR,
		"failed to read calibration for joystick %i: %s", which + 1,
		strerror( errno ) );
      break;
    }

    if( jsd[which].total_axises < 2 || jsd[which].total_buttons < 1 )
    {
      ui_error( UI_ERROR_ERROR, "sorry, joystick %i (%s) is inadequate!",
		which + 1, device );
      break;
    }
    return 0;

  case JSBadValue:
    ui_error( UI_ERROR_ERROR, "failed to initialise joystick %i: %s",
	      which + 1, "invalid parameter/value");
    break;

  case JSNoAccess:

    /* FIXME: why is this commented out? */
/*
    ui_error (UI_ERROR_ERROR,
	      "failed to initialise joystick %i: %s",
	      which + 1, "cannot access device");
*/
    break;

  case JSNoBuffers:
    ui_error( UI_ERROR_ERROR, "failed to initialise joystick %i: %s",
	      which + 1, "not enough memory" );
    break;

  default:
    ui_error( UI_ERROR_ERROR, "failed to initialise joystick %i", which + 1 );
    break;

  }

  JSClose( &jsd[which] );

  return 1;
}


int
ui_joystick_init( void )
{
  const char *home = getenv( "HOME" );
  char *calibration;

  /* FIXME: generalise both how this and the config file code look for
     files */

  if( !home ) home = ".";

  /* Default calibration file is ~/.joystick */
  calibration = malloc( strlen( home ) + strlen( JSDefaultCalibration ) + 2 );

  if( !calibration ) {
    ui_error( UI_ERROR_ERROR, "failed to initialise joystick: %s",
	      "not enough memory" );
    return 1;
  }

  sprintf( calibration, "%s/%s", home, JSDefaultCalibration );

  /* If we can't init the first, don't try the second */
  if( init_stick( 0, "/dev/js0", calibration ) ) return 0;
  if( init_stick( 1, "/dev/js1", calibration ) ) return 1;
  return 2;
}


int
ui_joystick_end( void )
{
  int i;
  for( i = 0; i < joysticks_supported; i++ ) JSClose( &jsd[i] );
  return 0;
}


libspectrum_byte
ui_joystick_read( libspectrum_word port, libspectrum_byte which )
{
  libspectrum_byte ret = 0;

  JSUpdate( &jsd[which] );

         if( jsd[which].axis[0]->cur >
	     jsd[which].axis[0]->cen + jsd[which].axis[0]->nz ) {
    ret = 1; /* right */
  } else if( jsd[which].axis[0]->cur <
	     jsd[which].axis[0]->cen - jsd[which].axis[0]->nz ) {
    ret = 2; /* left */
  }

       if( jsd[which].axis[1]->cur >
	   jsd[which].axis[1]->cen + jsd[which].axis[1]->nz ) {
    ret |= 4; /* down */
  else if( jsd[which].axis[1]->cur <
	   jsd[which].axis[1]->cen - jsd[which].axis[1]->nz ) {
    ret |= 8; /* up */
  }

  if( jsd[which].button[0]->state == JSButtonStateOn ) ret |= 16; /* fire */

  return ret;
}

#else			/* #if defined USE_JOYSTICK && defined HAVE_JSW_H */

/* No joystick library */

int
ui_joystick_init( void )
{
  return 0;
}

int
ui_joystick_end( void )
{
  return 0;
}

libspectrum_byte
ui_joystick_read(libspectrum_word port, libspectrum_byte which)
{
  return joystick_default_read( port, which );
}

#endif			/* #if defined USE_JOYSTICK && defined HAVE_JSW_H */

--- NEW FILE: uijoystick.h ---
/* uijoystick.h: Joystick emulation support
   Copyright (c) 2001-2003 Russell Marks, Philip Kendall, Darren Salt,
			   Fredrick Meunier

   $Id: uijoystick.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., 59 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

*/

/* ui_joystick_* are called from joystick_*.
 * Do not use these directly; use the joystick_* wrappers.
 * UI-specific implementations are in ui/<ui>/<ui>joystick.c.
 * (If the UI cannot provide its own, it must use the default implementation;
 *  see uijoystick.c for details.)
 */

#ifndef FUSE_UI_UIJOYSTICK_H
#define FUSE_UI_UIJOYSTICK_H

#ifdef WORDS_BIGENDIAN

typedef struct
{
  unsigned unused : 3;
  unsigned fire   : 1;
  unsigned up     : 1;
  unsigned down   : 1;
  unsigned left   : 1;
  unsigned right  : 1;
} kempston_bits;

#else				/* #ifdef WORDS_BIGENDIAN */

typedef struct
{
  unsigned right  : 1;
  unsigned left   : 1;
  unsigned down   : 1;
  unsigned up     : 1;
  unsigned fire   : 1;
  unsigned unused : 3;
} kempston_bits;

#endif				/* #ifdef WORDS_BIGENDIAN */

typedef union
{
  libspectrum_byte byte;
  kempston_bits bits;
} kempston_type; 

int ui_joystick_init( void ); /* returns no. of joysticks initialised */
void ui_joystick_end( void );

/* Read function (returns data in Kempston format) */
libspectrum_byte ui_joystick_read( libspectrum_word port,
				   libspectrum_byte which );

#endif			/* #ifndef FUSE_UI_UIJOYSTICK_H */

[fuse-emulator-cvs] fuse acconfig.h,1.21,1.22 configure.in,1.118,1.119 fuse.c,1.85,1.86 joystick.c,1.8,1.9 joystick.h,1.3,1.4

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

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

Modified Files:
	acconfig.h configure.in fuse.c joystick.c joystick.h 
Log Message:
Real joystick support (Darren/Fred)


Index: acconfig.h
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/acconfig.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** acconfig.h	23 Jun 2003 16:17:18 -0000	1.21
--- acconfig.h	7 Oct 2003 13:49:00 -0000	1.22
***************
*** 66,69 ****
--- 66,72 ----
  #undef UI_X
  
+ /* Defined if we're using hardware joysticks */
+ #undef USE_JOYSTICK
+ 
  /* Defined if we're going to be using the installed libpng */
  #undef USE_LIBPNG

Index: configure.in
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/configure.in,v
retrieving revision 1.118
retrieving revision 1.119
diff -C2 -d -r1.118 -r1.119
*** configure.in	3 Oct 2003 18:03:08 -0000	1.118
--- configure.in	7 Oct 2003 13:49:00 -0000	1.119
***************
*** 288,295 ****
  AC_SUBST(PNG_LIBS)
  
  dnl See if libxml2 is available (for the config file handling)
  AM_PATH_XML2(2.0.0,AC_DEFINE(HAVE_LIB_XML2),
    AC_WARN(libxml2 not found - config file use disabled))
! 	       
  dnl Do we want the low memory compile?
  AC_MSG_CHECKING(whether low memory compile requested)
--- 288,333 ----
  AC_SUBST(PNG_LIBS)
  
+ AC_MSG_CHECKING(whether hardware joystick support requested)
+   AC_ARG_WITH(joystick,
+   [  --with-joystick         use a real joystick for Kempston emulation etc.],
+   if test "$withval" = no; then stick=no; else stick=yes; fi,
+   stick=yes)
+ AC_MSG_RESULT($stick)
+ if test "$stick" = yes; then
+   dnl We prefer to use UI-specific joystick code. (Default.)
+   dnl If there is none, or you override this here, we use libjsw.
+   dnl (svgalib appears to dislike switched joysticks on the parallel port...)
+   AC_DEFINE(USE_JOYSTICK)
+   case "$ui" in
+     svga)
+       dnl Libraries such as svgalib provide their own joystick code.
+       AC_MSG_CHECKING([whether to use $UI's joystick support])
+       AC_ARG_ENABLE(ui-joystick,
+       [  --enable-ui-joystick    use UI-specific joystick code (where supported)],
+       if test "$enableval" = no; then libjsw=yes; else libjsw=no; fi,
+       libjsw=no)
+       if test "$libjsw" = yes; then
+ 	AC_MSG_RESULT([no, use libjsw])
+       else
+ 	AC_MSG_RESULT(yes)
+       fi
+       ;;
+     *)
+       dnl Our only option is libjsw.
+       libjsw=yes
+       ;;
+   esac
+   if test "$libjsw" = yes; then
+     dnl Look for libjsw. If missing, use QAOP<space>.
+     AC_CHECK_HEADERS(jsw.h,
+                      LIBS="$LIBS -ljsw",
+                      AC_MSG_WARN(jsw.h not found - joystick support disabled))
+   fi
+ fi
+ 
  dnl See if libxml2 is available (for the config file handling)
  AM_PATH_XML2(2.0.0,AC_DEFINE(HAVE_LIB_XML2),
    AC_WARN(libxml2 not found - config file use disabled))
! 
  dnl Do we want the low memory compile?
  AC_MSG_CHECKING(whether low memory compile requested)

Index: fuse.c
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/fuse.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -C2 -d -r1.85 -r1.86
*** fuse.c	23 Sep 2003 12:10:10 -0000	1.85
--- fuse.c	7 Oct 2003 13:49:00 -0000	1.86
***************
*** 42,45 ****
--- 42,46 ----
  #include "event.h"
  #include "fuse.h"
+ #include "joystick.h"
  #include "keyboard.h"
  #include "machine.h"
***************
*** 148,151 ****
--- 149,153 ----
    /* FIXME FIXME 20030407: really do this soon. This is getting *far* too
       hairy */
+   fuse_joystick_init ();
    fuse_keyboard_init();
  
***************
*** 459,462 ****
--- 461,465 ----
    sound_end();
    event_end();
+   fuse_joystick_end ();
    ui_end();
  

Index: joystick.c
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/joystick.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** joystick.c	17 Aug 2003 20:40:03 -0000	1.8
--- joystick.c	7 Oct 2003 13:49:00 -0000	1.9
***************
*** 36,50 ****
  #include "spectrum.h"
  #include "machine.h"
  
  libspectrum_byte
! joystick_kempston_read( libspectrum_word port )
  {
    /* Offset/mask in keyboard_return_values[] for joystick keys,
       in order right, left, down, up, fire. These are p/o/a/q/Space */
!   static int offset[5] = {    5,    5,    1,    2,    7 };
!   static int mask[5]   = { 0x01, 0x02, 0x01, 0x01, 0x01 };
    libspectrum_byte return_value = 0, jmask = 1;
    int i;
  
    if( !settings_current.joy_kempston ) {
      /* Some machines have a built-in Kempston interface */
--- 36,75 ----
  #include "spectrum.h"
  #include "machine.h"
+ #include "ui/ui.h"
+ #include "ui/uijoystick.h"
+ 
+ /* Number of joysticks known about & initialised */
+ int joysticks_supported = 0;
+ 
+ /* Init/shutdown functions. Errors aren't important here */
+ 
+ void
+ fuse_joystick_init (void)
+ {
+   joysticks_supported = ui_joystick_init();
+ }
+ 
+ void
+ fuse_joystick_end (void)
+ {
+   ui_joystick_end();
+ }
+ 
+ /* Returns joystick direction/button state in Kempston format.
+    This is used if no (hardware) joysticks are found. */
  
  libspectrum_byte
! joystick_default_read( libspectrum_word port, libspectrum_byte which )
  {
    /* Offset/mask in keyboard_return_values[] for joystick keys,
       in order right, left, down, up, fire. These are p/o/a/q/Space */
!   static const int offset[5] = {    5,    5,    1,    2,    7 };
!   static const int mask[5]   = { 0x01, 0x02, 0x01, 0x01, 0x01 };
    libspectrum_byte return_value = 0, jmask = 1;
    int i;
  
+   /* We only support one "joystick" */
+   if( which ) return 0;
+ 
    if( !settings_current.joy_kempston ) {
      /* Some machines have a built-in Kempston interface */
***************
*** 65,70 ****
  }
  
  libspectrum_byte
! joystick_timex_read( libspectrum_word port, int which )
  {
    static const libspectrum_byte translate[] = {
--- 90,110 ----
  }
  
+ /* Read functions for specific interfaces */
+ 
  libspectrum_byte
! joystick_kempston_read( libspectrum_word port )
! {
!   /* If joysticks are disabled, return the floating bus value */
!   if( !settings_current.joy_kempston ) return spectrum_port_noread( port );
! 
!   /* If we have no real joysticks, return the QAOP<space>-emulated value */
!   if( joysticks_supported == 0 ) return joystick_default_read( port, 0 );
! 
!   /* Return the value from the actual joystick */
!   return ui_joystick_read( port, 0 );
! }
! 
! libspectrum_byte
! joystick_timex_read( libspectrum_word port, libspectrum_byte which )
  {
    static const libspectrum_byte translate[] = {
***************
*** 75,81 ****
    };
  
!   if( which == 0 )
!     return translate[ joystick_kempston_read( port ) ];
  
!   return 0;
  }
--- 115,124 ----
    };
  
!   /* If we don't have a real joystick for this, use the QAOP<space>-emulated
!      value */
!   if( joysticks_supported <= which )
!     return translate[ joystick_default_read( port, which ) ];
  
!   /* If we do have a real joystick, read it */
!   return translate[ ui_joystick_read( port, which ) ];
  }

Index: joystick.h
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/joystick.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** joystick.h	11 Jul 2003 11:03:25 -0000	1.3
--- joystick.h	7 Oct 2003 13:49:00 -0000	1.4
***************
*** 1,4 ****
--- 1,5 ----
  /* joystick.h: Joystick emulation support
     Copyright (c) 2001-2003 Russell Marks, Philip Kendall
+    Copyright (c) 2003 Darren Salt
  
     $Id$
***************
*** 30,36 ****
  #include <libspectrum.h>
  
! libspectrum_byte joystick_kempston_read( libspectrum_word port );
! void joystick_kempston_write( libspectrum_word port, libspectrum_byte b );
! libspectrum_byte joystick_timex_read( libspectrum_word port, int which );
  
  #endif			/* #ifndef FUSE_JOYSTICK_H */
--- 31,49 ----
  #include <libspectrum.h>
  
! /* Number of joysticks known about & initialised */
! extern int joysticks_supported;
! 
! /* Init/shutdown functions. Errors aren't important here */
! void fuse_joystick_init( void );
! void fuse_joystick_end( void );
! 
! /* Default read function (returns data in Kempston format) */
! libspectrum_byte joystick_default_read( libspectrum_word port,
! 					libspectrum_byte which );
! 
! /* Interface-specific read functions */
! libspectrum_byte joystick_kempston_read ( libspectrum_word port );
! libspectrum_byte joystick_timex_read ( libspectrum_word port,
! 				       libspectrum_byte which );
  
  #endif			/* #ifndef FUSE_JOYSTICK_H */

[fuse-emulator-cvs] fuse/ui/fb fbdisplay.c,1.26,1.27 fbkeyboard.c,1.25,1.26

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

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

Modified Files:
	fbdisplay.c fbkeyboard.c 
Log Message:
Fix up framebuffer UI (Darren).


Index: fbdisplay.c
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/ui/fb/fbdisplay.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** fbdisplay.c	6 May 2003 14:35:30 -0000	1.26
--- fbdisplay.c	7 Oct 2003 11:05:44 -0000	1.27
***************
*** 56,62 ****
  
  /* A scaled copy of the image displayed on the Spectrum's screen */
! static WORD scaled_image[2*DISPLAY_SCREEN_HEIGHT][2*DISPLAY_SCREEN_WIDTH];
  static const ptrdiff_t scaled_pitch =
!                                      2 * DISPLAY_SCREEN_WIDTH * sizeof( WORD );
  
  /* Are we in a Timex display mode? */
--- 56,63 ----
  
  /* A scaled copy of the image displayed on the Spectrum's screen */
! static libspectrum_word
!   scaled_image[2*DISPLAY_SCREEN_HEIGHT][2*DISPLAY_SCREEN_WIDTH];
  static const ptrdiff_t scaled_pitch =
!   2 * DISPLAY_SCREEN_WIDTH * sizeof( libspectrum_word );
  
  /* Are we in a Timex display mode? */
***************
*** 72,76 ****
  
  static int fb_fd = -1;		/* The framebuffer's file descriptor */
! static WORD *image = 0, *gm = 0;
  
  static struct fb_fix_screeninfo fixed;
--- 73,77 ----
  
  static int fb_fd = -1;		/* The framebuffer's file descriptor */
! static libspectrum_word *image = 0, *gm = 0;
  
  static struct fb_fix_screeninfo fixed;
***************
*** 263,267 ****
      {
        int i;
!       WORD *point;
  
        if( hires ) {
--- 264,268 ----
      {
        int i;
!       libspectrum_word *point;
  
        if( hires ) {
***************
*** 289,293 ****
      {
        int i;
!       WORD *point;
  
        if( hires ) {
--- 290,294 ----
      {
        int i;
!       libspectrum_word *point;
  
        if( hires ) {
***************
*** 313,317 ****
      {
        int i;
!       WORD *point;
  
        for( i = 0, point = gm + y * display.xres_virtual + x;
--- 314,318 ----
      {
        int i;
!       libspectrum_word *point;
  
        for( i = 0, point = gm + y * display.xres_virtual + x;

Index: fbkeyboard.c
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/ui/fb/fbkeyboard.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** fbkeyboard.c	7 Feb 2003 19:22:49 -0000	1.25
--- fbkeyboard.c	7 Oct 2003 11:05:44 -0000	1.26
***************
*** 1,4 ****
  /* fbkeyboard.c: routines for dealing with the linux fbdev display
!    Copyright (c) 2000-2002 Philip Kendall, Matan Ziv-Av, Darren Salt
  
     $Id$
--- 1,4 ----
  /* fbkeyboard.c: routines for dealing with the linux fbdev display
!    Copyright (c) 2000-2003 Philip Kendall, Matan Ziv-Av, Darren Salt
  
     $Id$
***************
*** 29,32 ****
--- 29,33 ----
  #ifdef UI_FB			/* Use this iff we're using fbdev */
  
+ #include <stdio.h>
  #include <errno.h>
  #include <linux/kd.h>

[fuse-emulator-cvs] fuse/hacking ChangeLog,1.36,1.37

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

Update of /cvsroot/fuse-emulator/fuse/hacking
In directory sc8-pr-cvs1:/tmp/cvs-serv4792/hacking

Modified Files:
	ChangeLog 
Log Message:
Fix up framebuffer UI (Darren).


Index: ChangeLog
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/hacking/ChangeLog,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** ChangeLog	6 Oct 2003 21:32:36 -0000	1.36
--- ChangeLog	7 Oct 2003 11:05:43 -0000	1.37
***************
*** 244,245 ****
--- 244,247 ----
  	 disable the 'confirm' dialogs.
  20031006 debugger/command.c, debugger/commandy.y: better error recovery
+ 20031007 ui/fb/fbdisplay.c, ui/fb/fbkeyboard.c: fix up framebuffer UI
+ 	 (Darren).

[fuse-emulator-cvs] fuse-utils tapeconv.c,1.11,1.12

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

Update of /cvsroot/fuse-emulator/fuse-utils
In directory sc8-pr-cvs1:/tmp/cvs-serv1785

Modified Files:
	tapeconv.c 
Log Message:
Remove double-free bug if tape reading fails.


Index: tapeconv.c
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse-utils/tapeconv.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** tapeconv.c	6 Jan 2003 01:13:17 -0000	1.11
--- tapeconv.c	7 Oct 2003 10:45:29 -0000	1.12
***************
*** 124,128 ****
  
    if( libspectrum_tape_read( *tape, buffer, length, type, filename ) ) {
!     munmap( buffer, length ); libspectrum_tape_free( *tape );
      return 1;
    }
--- 124,128 ----
  
    if( libspectrum_tape_read( *tape, buffer, length, type, filename ) ) {
!     munmap( buffer, length );
      return 1;
    }

[fuse-emulator-cvs] fuse-utils/hacking ChangeLog,1.9,1.10

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

Update of /cvsroot/fuse-emulator/fuse-utils/hacking
In directory sc8-pr-cvs1:/tmp/cvs-serv1785/hacking

Modified Files:
	ChangeLog 
Log Message:
Remove double-free bug if tape reading fails.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse-utils/hacking/ChangeLog,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ChangeLog	6 Oct 2003 21:45:37 -0000	1.9
--- ChangeLog	7 Oct 2003 10:45:29 -0000	1.10
***************
*** 47,48 ****
--- 47,49 ----
  20030921 rzxdump.c: use libgcrypt 1.1.42.
  20031006 rzxcheck.c: return 1 if no signature or unknown key.
+ 20031007 tapeconv.c: remove double-free bug if tape reading fails.

[fuse-emulator-cvs] libspectrum THANKS,1.2,1.3 z80.c,1.61,1.62

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

Update of /cvsroot/fuse-emulator/libspectrum
In directory sc8-pr-cvs1:/tmp/cvs-serv8030

Modified Files:
	THANKS z80.c 
Log Message:
Actually allocate memory for the .slt pages; thanks to Alberto Garcia for
reporting this.


Index: THANKS
===================================================================
RCS file: /cvsroot/fuse-emulator/libspectrum/THANKS,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** THANKS	4 Dec 2002 17:20:34 -0000	1.2
--- THANKS	6 Oct 2003 22:58:02 -0000	1.3
***************
*** 1,4 ****
--- 1,6 ----
  See also `AUTHORS'
  
+ * Alberto Garcia: for reporting a bug in the .slt routines.
+ 
  * Russell Marks: for many bug fixes and the like.
  

Index: z80.c
===================================================================
RCS file: /cvsroot/fuse-emulator/libspectrum/z80.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** z80.c	12 Sep 2003 12:47:04 -0000	1.61
--- z80.c	6 Oct 2003 22:58:02 -0000	1.62
***************
*** 500,503 ****
--- 500,504 ----
        }
  
+       length = 0;	/* Tell uncompress_block to allocate memory for us */
        error =
  	uncompress_block( &buffer, &length,

[fuse-emulator-cvs] libspectrum/hacking ChangeLog,1.17,1.18

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

Update of /cvsroot/fuse-emulator/libspectrum/hacking
In directory sc8-pr-cvs1:/tmp/cvs-serv8030/hacking

Modified Files:
	ChangeLog 
Log Message:
Actually allocate memory for the .slt pages; thanks to Alberto Garcia for
reporting this.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/fuse-emulator/libspectrum/hacking/ChangeLog,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** ChangeLog	6 Oct 2003 12:52:51 -0000	1.17
--- ChangeLog	6 Oct 2003 22:58:02 -0000	1.18
***************
*** 104,107 ****
  	 crypto.c:libspectrum_verify_signature, we have to ignore the
  	 error source before comparing with an error code.
! 
! 	
\ No newline at end of file
--- 104,107 ----
  	 crypto.c:libspectrum_verify_signature, we have to ignore the
  	 error source before comparing with an error code.
! 20031006 z80.c: actually allocate memory for the .slt pages; thanks to
! 	 Alberto Garcia for reporting this.

[fuse-emulator-cvs] fuse-utils rzxcheck.c,1.3,1.4

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

Update of /cvsroot/fuse-emulator/fuse-utils
In directory sc8-pr-cvs1:/tmp/cvs-serv23395

Modified Files:
	rzxcheck.c 
Log Message:
Return 1 if no signature or unknown key.


Index: rzxcheck.c
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse-utils/rzxcheck.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** rzxcheck.c	22 Aug 2003 14:35:35 -0000	1.3
--- rzxcheck.c	6 Oct 2003 21:45:36 -0000	1.4
***************
*** 81,85 ****
      libspectrum_rzx_free( rzx );
      munmap( buffer, length );
!     return 0;
    }
  
--- 81,85 ----
      libspectrum_rzx_free( rzx );
      munmap( buffer, length );
!     return 1;
    }
  
***************
*** 92,96 ****
      libspectrum_rzx_free( rzx );
      munmap( buffer, length );
!     return 0;
    }
  
--- 92,96 ----
      libspectrum_rzx_free( rzx );
      munmap( buffer, length );
!     return 1;
    }
  

[fuse-emulator-cvs] fuse-utils/hacking ChangeLog,1.8,1.9

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

Update of /cvsroot/fuse-emulator/fuse-utils/hacking
In directory sc8-pr-cvs1:/tmp/cvs-serv23395/hacking

Modified Files:
	ChangeLog 
Log Message:
Return 1 if no signature or unknown key.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse-utils/hacking/ChangeLog,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ChangeLog	21 Sep 2003 22:29:59 -0000	1.8
--- ChangeLog	6 Oct 2003 21:45:37 -0000	1.9
***************
*** 46,47 ****
--- 46,48 ----
  20030913 configure.in: bump version number to 0.6.1.
  20030921 rzxdump.c: use libgcrypt 1.1.42.
+ 20031006 rzxcheck.c: return 1 if no signature or unknown key.

[fuse-emulator-cvs] fuse/hacking ChangeLog,1.35,1.36

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

Update of /cvsroot/fuse-emulator/fuse/hacking
In directory sc8-pr-cvs1:/tmp/cvs-serv21214/hacking

Modified Files:
	ChangeLog 
Log Message:
Better error recovery: should stop the parser ending up half way through
a command after a parse error.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/hacking/ChangeLog,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** ChangeLog	6 Oct 2003 17:45:53 -0000	1.35
--- ChangeLog	6 Oct 2003 21:32:36 -0000	1.36
***************
*** 243,244 ****
--- 243,245 ----
  20031006 settings.dat, ui/options.dat, ui/gtk/confirm.c: add option to
  	 disable the 'confirm' dialogs.
+ 20031006 debugger/command.c, debugger/commandy.y: better error recovery

[fuse-emulator-cvs] fuse/debugger command.c,1.11,1.12 commandy.y,1.32,1.33

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

Update of /cvsroot/fuse-emulator/fuse/debugger
In directory sc8-pr-cvs1:/tmp/cvs-serv21214/debugger

Modified Files:
	command.c commandy.y 
Log Message:
Better error recovery: should stop the parser ending up half way through
a command after a parse error.


Index: command.c
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/debugger/command.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** command.c	13 Jul 2003 10:53:27 -0000	1.11
--- command.c	6 Oct 2003 21:32:36 -0000	1.12
***************
*** 61,66 ****
    command_ptr = command_buffer;
      
!   /* Parse the command. If there was a problem, skip the rest of this line */
!   if( yyparse() ) command_ptr = "\0";
  
    ui_debugger_update();
--- 61,66 ----
    command_ptr = command_buffer;
      
!   /* Parse the command */
!   yyparse();
  
    ui_debugger_update();

Index: commandy.y
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/debugger/commandy.y,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** commandy.y	20 Aug 2003 18:24:01 -0000	1.32
--- commandy.y	6 Oct 2003 21:32:36 -0000	1.33
***************
*** 129,132 ****
--- 129,133 ----
  input:	 /* empty */
         | command
+        | error
  ;
  

[fuse-emulator-cvs] fuse settings.dat,1.23,1.24

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

Update of /cvsroot/fuse-emulator/fuse
In directory sc8-pr-cvs1:/tmp/cvs-serv15828

Modified Files:
	settings.dat 
Log Message:
Add option to disable the 'confirm' dialogs.


Index: settings.dat
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/settings.dat,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** settings.dat	18 Sep 2003 19:26:32 -0000	1.23
--- settings.dat	6 Oct 2003 17:45:53 -0000	1.24
***************
*** 45,48 ****
--- 45,49 ----
  autosave_settings, boolean, 0
  colour_tv, boolean, 1
+ confirm_dangerous, boolean, 1
  
  sound_device, string, NULL, 'd'

[fuse-emulator-cvs] fuse/ui/gtk confirm.c,1.4,1.5

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

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

Modified Files:
	confirm.c 
Log Message:
Add option to disable the 'confirm' dialogs.


Index: confirm.c
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/ui/gtk/confirm.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** confirm.c	4 Oct 2003 22:44:19 -0000	1.4
--- confirm.c	6 Oct 2003 17:45:53 -0000	1.5
***************
*** 34,37 ****
--- 34,38 ----
  #include "fuse.h"
  #include "gtkinternals.h"
+ #include "settings.h"
  
  struct confirm_data {
***************
*** 51,54 ****
--- 52,59 ----
    GtkWidget *label, *button;
    GtkAccelGroup *accelerators;
+ 
+   /* Return value isn't an error code, but signifies whether to undertake
+      the action */
+   if( !settings_current.confirm_dangerous ) return 1;
  
    fuse_emulation_pause();

[fuse-emulator-cvs] fuse/hacking ChangeLog,1.34,1.35

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

Update of /cvsroot/fuse-emulator/fuse/hacking
In directory sc8-pr-cvs1:/tmp/cvs-serv15828/hacking

Modified Files:
	ChangeLog 
Log Message:
Add option to disable the 'confirm' dialogs.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/hacking/ChangeLog,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** ChangeLog	6 Oct 2003 15:30:26 -0000	1.34
--- ChangeLog	6 Oct 2003 17:45:53 -0000	1.35
***************
*** 241,242 ****
--- 241,244 ----
  20031006 machine.c: remove duplicated code from machine_select_machine()
  20031006 settings.pl: change config file name to 'fuse.cfg' on Win32
+ 20031006 settings.dat, ui/options.dat, ui/gtk/confirm.c: add option to
+ 	 disable the 'confirm' dialogs.

[fuse-emulator-cvs] fuse/ui options.dat,1.17,1.18

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

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

Modified Files:
	options.dat 
Log Message:
Add option to disable the 'confirm' dialogs.


Index: options.dat
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/ui/options.dat,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** options.dat	18 Sep 2003 19:26:32 -0000	1.17
--- options.dat	6 Oct 2003 17:45:53 -0000	1.18
***************
*** 11,14 ****
--- 11,15 ----
  Checkbox, A(u)to-save settings, autosave_settings, KEYBOARD_u
  Checkbox, (C)olour TV, colour_tv, KEYBOARD_c
+ Checkbox, Confirm (d)angerous actions, confirm_dangerous, KEYBOARD_d
  
  rzx

[fuse-emulator-cvs] fuse/hacking ChangeLog,1.33,1.34

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

Update of /cvsroot/fuse-emulator/fuse/hacking
In directory sc8-pr-cvs1:/tmp/cvs-serv23771/hacking

Modified Files:
	ChangeLog 
Log Message:
Change config file name to 'fuse.cfg' on Win32.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/hacking/ChangeLog,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** ChangeLog	6 Oct 2003 11:59:26 -0000	1.33
--- ChangeLog	6 Oct 2003 15:30:26 -0000	1.34
***************
*** 240,241 ****
--- 240,242 ----
  	 disk motor when the +2A/+3 memory port is written to.
  20031006 machine.c: remove duplicated code from machine_select_machine()
+ 20031006 settings.pl: change config file name to 'fuse.cfg' on Win32

[fuse-emulator-cvs] fuse settings.pl,1.52,1.53

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

Update of /cvsroot/fuse-emulator/fuse
In directory sc8-pr-cvs1:/tmp/cvs-serv23771

Modified Files:
	settings.pl 
Log Message:
Change config file name to 'fuse.cfg' on Win32.


Index: settings.pl
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/settings.pl,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** settings.pl	18 Aug 2003 21:59:46 -0000	1.52
--- settings.pl	6 Oct 2003 15:30:25 -0000	1.53
***************
*** 95,98 ****
--- 95,105 ----
  #include "ui/ui.h"
  
+ /* The name of our configuration file */
+ #ifdef WIN32
+ #define CONFIG_FILE_NAME "fuse.cfg"
+ #else				/* #ifdef WIN32 */
+ #define CONFIG_FILE_NAME ".fuserc"
+ #endif				/* #ifdef WIN32 */
+ 
  /* The current settings of options, etc */
  settings_info settings_current;
***************
*** 187,191 ****
    }
  
!   snprintf( path, 256, "%s/.fuserc", home );
  
    /* See if the file exists; if doesn't, it's not a problem */
--- 194,198 ----
    }
  
!   snprintf( path, 256, "%s/%s", home, CONFIG_FILE_NAME );
  
    /* See if the file exists; if doesn't, it's not a problem */
***************
*** 290,294 ****
    }
  
!   snprintf( path, 256, "%s/.fuserc", home );
  
    /* Create the XML document */
--- 297,301 ----
    }
  
!   snprintf( path, 256, "%s/%s", home, CONFIG_FILE_NAME );
  
    /* Create the XML document */

[fuse-emulator-cvs] libspectrum crypto.c,1.7,1.8

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

Update of /cvsroot/fuse-emulator/libspectrum
In directory sc8-pr-cvs1:/tmp/cvs-serv26921

Modified Files:
	crypto.c 
Log Message:
Need only one error variable in get_hash.


Index: crypto.c
===================================================================
RCS file: /cvsroot/fuse-emulator/libspectrum/crypto.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** crypto.c	6 Oct 2003 12:52:50 -0000	1.7
--- crypto.c	6 Oct 2003 12:55:12 -0000	1.8
***************
*** 117,122 ****
  get_hash( gcry_sexp_t *hash, const libspectrum_byte *data, size_t data_length )
  {
!   libspectrum_error error;
!   gcry_error_t gcrypt_error;
    char *digest; size_t digest_length;
    gcry_mpi_t hash_mpi;
--- 117,121 ----
  get_hash( gcry_sexp_t *hash, const libspectrum_byte *data, size_t data_length )
  {
!   gcry_error_t error;
    char *digest; size_t digest_length;
    gcry_mpi_t hash_mpi;
***************
*** 132,141 ****
    gcry_md_hash_buffer( HASH_ALGORITHM, digest, data, data_length );
  
!   gcrypt_error = gcry_mpi_scan( &hash_mpi, GCRYMPI_FMT_USG, digest,
! 				digest_length, NULL );
!   if( gcrypt_error ) {
      libspectrum_print_error( LIBSPECTRUM_ERROR_LOGIC,
  			     "get_hash: error creating hash MPI: %s",
! 			     gcry_strerror( gcrypt_error )
      );
      free( digest );
--- 131,140 ----
    gcry_md_hash_buffer( HASH_ALGORITHM, digest, data, data_length );
  
!   error = gcry_mpi_scan( &hash_mpi, GCRYMPI_FMT_USG, digest, digest_length,
! 			 NULL );
!   if( error ) {
      libspectrum_print_error( LIBSPECTRUM_ERROR_LOGIC,
  			     "get_hash: error creating hash MPI: %s",
! 			     gcry_strerror( error )
      );
      free( digest );
***************
*** 145,153 ****
    free( digest );
  
!   gcrypt_error = gcry_sexp_build( hash, NULL, hash_format, hash_mpi );
!   if( gcrypt_error ) {
      libspectrum_print_error( LIBSPECTRUM_ERROR_LOGIC,
  			     "get_hash: error creating hash sexp: %s",
! 			     gcry_strerror( gcrypt_error )
      );
      gcry_mpi_release( hash_mpi );
--- 144,152 ----
    free( digest );
  
!   error = gcry_sexp_build( hash, NULL, hash_format, hash_mpi );
!   if( error ) {
      libspectrum_print_error( LIBSPECTRUM_ERROR_LOGIC,
  			     "get_hash: error creating hash sexp: %s",
! 			     gcry_strerror( error )
      );
      gcry_mpi_release( hash_mpi );

[fuse-emulator-cvs] libspectrum/hacking ChangeLog,1.16,1.17

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

Update of /cvsroot/fuse-emulator/libspectrum/hacking
In directory sc8-pr-cvs1:/tmp/cvs-serv26588/hacking

Modified Files:
	ChangeLog 
Log Message:
Use gcrypt errors properly; most importantly in
crypto.c:libspectrum_verify_signature, we have to ignore the error source
before comparing with an error code.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/fuse-emulator/libspectrum/hacking/ChangeLog,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** ChangeLog	3 Oct 2003 17:18:53 -0000	1.16
--- ChangeLog	6 Oct 2003 12:52:51 -0000	1.17
***************
*** 101,102 ****
--- 101,107 ----
  	 0.2.0.1 release changes back to HEAD.
  20031003 make-perl.c: change GcryMPI to gcry_mpi_t.
+ 20031006 crypto.c, rzx.c: use gcrypt errors properly; most importantly in
+ 	 crypto.c:libspectrum_verify_signature, we have to ignore the
+ 	 error source before comparing with an error code.
+ 
+ 	
\ No newline at end of file