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/hacking ChangeLog,1.46,1.47

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

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

Modified Files:
	ChangeLog 
Log Message:
Iif using SDL, use its joystick code by default. Change BYTE etc in
sdljoystick.c to libspectrum_byte. Add missing ; to configure.in (Darren).


Index: ChangeLog
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/hacking/ChangeLog,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** ChangeLog	9 Oct 2003 21:40:26 -0000	1.46
--- ChangeLog	9 Oct 2003 22:45:36 -0000	1.47
***************
*** 261,262 ****
--- 261,265 ----
  	 creating RZX files from a given snapshot.
  20031009 fuse.c: add information from uname() into creator custom data.
+ 20031009 configure.in, ui/sdl/sdljoystick.c: if using SDL, use its
+ 	 joystick code by default. Change BYTE etc in sdljoystick.c to
+ 	 libspectrum_byte. Add missing ; to configure.in (Darren).

[fuse-emulator-cvs] fuse/hacking ChangeLog,1.45,1.46

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

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

Modified Files:
	ChangeLog 
Log Message:
Add information from uname() into creator custom data.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/hacking/ChangeLog,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** ChangeLog	9 Oct 2003 11:16:44 -0000	1.45
--- ChangeLog	9 Oct 2003 21:40:26 -0000	1.46
***************
*** 260,261 ****
--- 260,262 ----
  	 widget/menu.c: add option as to whether to embed snapshot when
  	 creating RZX files from a given snapshot.
+ 20031009 fuse.c: add information from uname() into creator custom data.

[fuse-emulator-cvs] fuse fuse.c,1.89,1.90

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

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

Modified Files:
	fuse.c 
Log Message:
Add information from uname() into creator custom data.


Index: fuse.c
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/fuse.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -C2 -d -r1.89 -r1.90
*** fuse.c	9 Oct 2003 11:16:43 -0000	1.89
--- fuse.c	9 Oct 2003 21:40:26 -0000	1.90
***************
*** 31,34 ****
--- 31,35 ----
  #include <string.h>
  #include <sys/types.h>
+ #include <sys/utsname.h>
  #include <unistd.h>
  
***************
*** 237,241 ****
    size_t i;
    unsigned int version[4] = { 0, 0, 0, 0 };
!   libspectrum_error error;
  
    sscanf( VERSION, "%u.%u.%u.%u",
--- 238,244 ----
    size_t i;
    unsigned int version[4] = { 0, 0, 0, 0 };
!   char *custom;
!   struct utsname buf;
!   libspectrum_error error; int sys_error;
  
    sscanf( VERSION, "%u.%u.%u.%u",
***************
*** 244,247 ****
--- 247,257 ----
    for( i=0; i<4; i++ ) if( version[i] > 0xff ) version[i] = 0xff;
  
+   sys_error = uname( &buf );
+   if( sys_error ) {
+     ui_error( UI_ERROR_ERROR, "error getting system information: %s",
+ 	      strerror( errno ) );
+     return 1;
+   }
+ 
    error = libspectrum_creator_alloc( &fuse_creator ); if( error ) return error;
  
***************
*** 256,259 ****
--- 266,286 ----
  					 version[2] * 0x100 + version[3] );
    if( error ) { libspectrum_creator_free( fuse_creator ); return error; }
+ 
+   custom = malloc( 256 );
+   if( !custom ) {
+     ui_error( UI_ERROR_ERROR, "out of memory at %s:%d", __FILE__, __LINE__ );
+     libspectrum_creator_free( fuse_creator );
+     return 1;
+   }
+ 
+   snprintf( custom, 256, "uname: %s %s %s\n", buf.sysname, buf.machine,
+ 	    buf.release );
+ 
+   error = libspectrum_creator_set_custom( fuse_creator,
+ 					  custom, strlen( custom ) );
+   if( error ) {
+     free( custom ); libspectrum_creator_free( fuse_creator );
+     return error;
+   }
  
    return 0;

[fuse-emulator-cvs] fuse-utils utils.c,1.2,1.3

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

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

Modified Files:
	utils.c 
Log Message:
Add information from uname() into creator custom data.


Index: utils.c
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse-utils/utils.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** utils.c	13 Jun 2003 14:19:58 -0000	1.2
--- utils.c	9 Oct 2003 21:38:49 -0000	1.3
***************
*** 35,38 ****
--- 35,39 ----
  #include <unistd.h>
  #include <sys/mman.h>
+ #include <sys/utsname.h>
  
  #include <libspectrum.h>
***************
*** 43,47 ****
  get_creator( libspectrum_creator **creator, const char *program )
  {
!   libspectrum_error error;
  
    error = libspectrum_creator_alloc( creator );
--- 44,57 ----
  get_creator( libspectrum_creator **creator, const char *program )
  {
!   char *custom;
!   struct utsname buf;
!   libspectrum_error error; int sys_error;
! 
!   sys_error = uname( &buf );
!   if( sys_error ) {
!     fprintf( stderr, "%s: error getting system information: %s\n", progname,
! 	     strerror( errno ) );
!     return 1;
!   }
  
    error = libspectrum_creator_alloc( creator );
***************
*** 56,59 ****
--- 66,87 ----
    error = libspectrum_creator_set_minor( *creator, 0x0100 );
    if( error ) { libspectrum_creator_free( *creator ); return error; }
+ 
+   custom = malloc( 256 );
+   if( !custom ) {
+     fprintf( stderr, "%s: out of memory at %s:%d\n", progname,
+ 	     __FILE__, __LINE__ );
+     libspectrum_creator_free( *creator );
+     return 1;
+   }
+ 
+   snprintf( custom, 256, "uname: %s %s %s\n", buf.sysname, buf.machine,
+ 	    buf.release );
+ 
+   error = libspectrum_creator_set_custom( *creator,
+ 					  custom, strlen( custom ) );
+   if( error ) {
+     free( custom ); libspectrum_creator_free( *creator );
+     return error;
+   }
  
    return 0;

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

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

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

Modified Files:
	ChangeLog 
Log Message:
Add information from uname() into creator custom data.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse-utils/hacking/ChangeLog,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ChangeLog	7 Oct 2003 10:45:29 -0000	1.10
--- ChangeLog	9 Oct 2003 21:38:49 -0000	1.11
***************
*** 48,49 ****
--- 48,50 ----
  20031006 rzxcheck.c: return 1 if no signature or unknown key.
  20031007 tapeconv.c: remove double-free bug if tape reading fails.
+ 20031009 utils.c: add information from uname() into creator custom data.

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

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

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

Modified Files:
	ChangeLog 
Log Message:
Add support for writing custom data in the creator blocks.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/fuse-emulator/libspectrum/hacking/ChangeLog,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** ChangeLog	6 Oct 2003 22:58:02 -0000	1.18
--- ChangeLog	9 Oct 2003 21:37:32 -0000	1.19
***************
*** 106,107 ****
--- 106,109 ----
  20031006 z80.c: actually allocate memory for the .slt pages; thanks to
  	 Alberto Garcia for reporting this.
+ 20031009 creator.c, libspectrum.h.in, rzx.c, szx.c: add support for
+ 	 writing custom data in the creator blocks.

[fuse-emulator-cvs] libspectrum creator.c,1.3,1.4 libspectrum.h.in,1.94,1.95 rzx.c,1.52,1.53 szx.c,1.8,1.9

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

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

Modified Files:
	creator.c libspectrum.h.in rzx.c szx.c 
Log Message:
Add support for writing custom data in the creator blocks.


Index: creator.c
===================================================================
RCS file: /cvsroot/fuse-emulator/libspectrum/creator.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** creator.c	12 Aug 2003 14:23:59 -0000	1.3
--- creator.c	9 Oct 2003 21:37:31 -0000	1.4
***************
*** 39,42 ****
--- 39,45 ----
    libspectrum_dword competition_code;
  
+   libspectrum_byte *custom;
+   size_t custom_length;
+ 
  };
  
***************
*** 51,54 ****
--- 54,60 ----
    }
  
+   (*creator)->custom = NULL;
+   (*creator)->custom_length = 0;
+ 
    return LIBSPECTRUM_ERROR_NONE;
  }
***************
*** 57,60 ****
--- 63,67 ----
  libspectrum_creator_free( libspectrum_creator *creator )
  {
+   if( creator->custom ) free( creator->custom );
    free( creator );
  
***************
*** 117,118 ****
--- 124,145 ----
  }
  
+ libspectrum_error
+ libspectrum_creator_set_custom( libspectrum_creator *creator,
+ 				libspectrum_byte *data, size_t length )
+ {
+   creator->custom = data;
+   creator->custom_length = length;
+   return LIBSPECTRUM_ERROR_NONE;
+ }
+ 
+ libspectrum_byte*
+ libspectrum_creator_custom( libspectrum_creator *creator )
+ {
+   return creator->custom;
+ }
+ 
+ size_t
+ libspectrum_creator_custom_length( libspectrum_creator *creator )
+ {
+   return creator->custom_length;
+ }

Index: libspectrum.h.in
===================================================================
RCS file: /cvsroot/fuse-emulator/libspectrum/libspectrum.h.in,v
retrieving revision 1.94
retrieving revision 1.95
diff -C2 -d -r1.94 -r1.95
*** libspectrum.h.in	12 Sep 2003 12:47:04 -0000	1.94
--- libspectrum.h.in	9 Oct 2003 21:37:31 -0000	1.95
***************
*** 246,249 ****
--- 246,259 ----
  libspectrum_creator_competition_code( libspectrum_creator *creator );
  
+ libspectrum_error
+ libspectrum_creator_set_custom( libspectrum_creator *creator,
+ 				libspectrum_byte *data, size_t length );
+ 
+ libspectrum_byte*
+ libspectrum_creator_custom( libspectrum_creator *creator );
+ 
+ size_t
+ libspectrum_creator_custom_length( libspectrum_creator *creator );
+ 
  /*
   * Snap handling routines

Index: rzx.c
===================================================================
RCS file: /cvsroot/fuse-emulator/libspectrum/rzx.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** rzx.c	6 Oct 2003 12:52:50 -0000	1.52
--- rzx.c	9 Oct 2003 21:37:31 -0000	1.53
***************
*** 906,911 ****
  {
    libspectrum_error error;
  
!   error = libspectrum_make_room( buffer, 29, ptr, length );
    if( error != LIBSPECTRUM_ERROR_NONE ) {
      libspectrum_print_error( error, "rzx_write_creator: out of memory" );
--- 906,915 ----
  {
    libspectrum_error error;
+   size_t custom_length, block_length;
  
!   custom_length = libspectrum_creator_custom_length( creator );
!   block_length = 29 + custom_length;
! 
!   error = libspectrum_make_room( buffer, block_length, ptr, length );
    if( error != LIBSPECTRUM_ERROR_NONE ) {
      libspectrum_print_error( error, "rzx_write_creator: out of memory" );
***************
*** 914,918 ****
  
    *(*ptr)++ = LIBSPECTRUM_RZX_CREATOR_BLOCK;
!   libspectrum_write_dword( ptr, 29 );	/* Block length */
  
    memcpy( *ptr, libspectrum_creator_program( creator ), 20 ); (*ptr) += 20;
--- 918,922 ----
  
    *(*ptr)++ = LIBSPECTRUM_RZX_CREATOR_BLOCK;
!   libspectrum_write_dword( ptr, block_length );	/* Block length */
  
    memcpy( *ptr, libspectrum_creator_program( creator ), 20 ); (*ptr) += 20;
***************
*** 920,923 ****
--- 924,932 ----
    libspectrum_write_word( ptr, libspectrum_creator_major( creator ) );
    libspectrum_write_word( ptr, libspectrum_creator_minor( creator ) );
+ 
+   if( custom_length ) {
+     memcpy( *ptr, libspectrum_creator_custom( creator ), custom_length );
+     (*ptr) += custom_length;
+   }
  
    return LIBSPECTRUM_ERROR_NONE;

Index: szx.c
===================================================================
RCS file: /cvsroot/fuse-emulator/libspectrum/szx.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** szx.c	17 Aug 2003 18:56:21 -0000	1.8
--- szx.c	9 Oct 2003 21:37:32 -0000	1.9
***************
*** 575,580 ****
  {
    libspectrum_error error;
  
!   error = write_chunk_header( buffer, ptr, length, "CRTR", 36 );
    if( error ) return error;
  
--- 575,584 ----
  {
    libspectrum_error error;
+   size_t custom_length;
  
!   custom_length = libspectrum_creator_custom_length( creator );
! 
!   error = write_chunk_header( buffer, ptr, length, "CRTR",
! 			      36 + custom_length );
    if( error ) return error;
  
***************
*** 582,585 ****
--- 586,594 ----
    libspectrum_write_word( ptr, libspectrum_creator_major( creator ) );
    libspectrum_write_word( ptr, libspectrum_creator_minor( creator ) );
+ 
+   if( custom_length ) {
+     memcpy( *ptr, libspectrum_creator_custom( creator ), custom_length );
+     *ptr += custom_length;
+   }
  
    return LIBSPECTRUM_ERROR_NONE;

[fuse-emulator-cvs] fuse/ui/gtk gtkui.c,1.105,1.106

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

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

Modified Files:
	gtkui.c 
Log Message:
Add option as to whether to embed snapshot when creating RZX files from a
given snapshot.


Index: gtkui.c
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/ui/gtk/gtkui.c,v
retrieving revision 1.105
retrieving revision 1.106
diff -C2 -d -r1.105 -r1.106
*** gtkui.c	5 Oct 2003 18:03:58 -0000	1.105
--- gtkui.c	9 Oct 2003 11:16:44 -0000	1.106
***************
*** 481,485 ****
    }
  
!   rzx_start_recording( recording, 0 );
  
    free( recording );
--- 481,485 ----
    }
  
!   rzx_start_recording( recording, settings_current.embed_snapshot );
  
    free( recording );

[fuse-emulator-cvs] fuse/widget menu.c,1.70,1.71

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

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

Modified Files:
	menu.c 
Log Message:
Add option as to whether to embed snapshot when creating RZX files from a
given snapshot.


Index: menu.c
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/widget/menu.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** menu.c	5 Oct 2003 18:22:24 -0000	1.70
--- menu.c	9 Oct 2003 11:16:44 -0000	1.71
***************
*** 41,44 ****
--- 41,45 ----
  #include "rzx.h"
  #include "screenshot.h"
+ #include "settings.h"
  #include "snapshot.h"
  #include "specplus3.h"
***************
*** 186,190 ****
    }
  
!   return rzx_start_recording( "record.rzx", 0 );
  }
  
--- 187,191 ----
    }
  
!   return rzx_start_recording( "record.rzx", settings_current.embed_snapshot );
  }
  

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

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

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

Modified Files:
	options.dat 
Log Message:
Add option as to whether to embed snapshot when creating RZX files from a
given snapshot.


Index: options.dat
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/ui/options.dat,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** options.dat	6 Oct 2003 17:45:53 -0000	1.18
--- options.dat	9 Oct 2003 11:16:44 -0000	1.19
***************
*** 18,21 ****
--- 18,22 ----
  Checkbox, C(o)mpetition mode, competition_mode, KEYBOARD_o
  Entry, Co(m)petition code, competition_code, KEYBOARD_m, 8,
+ Checkbox, Always (e)mbed snapshot, embed_snapshot, KEYBOARD_e
  
  sound

[fuse-emulator-cvs] fuse/hacking ChangeLog,1.44,1.45

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

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

Modified Files:
	ChangeLog 
Log Message:
Add option as to whether to embed snapshot when creating RZX files from a
given snapshot.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/hacking/ChangeLog,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** ChangeLog	9 Oct 2003 10:40:01 -0000	1.44
--- ChangeLog	9 Oct 2003 11:16:44 -0000	1.45
***************
*** 257,258 ****
--- 257,261 ----
  	 snapshots.
  20031009 fuse.c: make the --record option record rather than playback.
+ 20031009 fuse.c, settings.dat, ui/options.dat, ui/gtk/gtkui.c,
+ 	 widget/menu.c: add option as to whether to embed snapshot when
+ 	 creating RZX files from a given snapshot.

[fuse-emulator-cvs] fuse fuse.c,1.88,1.89 settings.dat,1.24,1.25

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

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

Modified Files:
	fuse.c settings.dat 
Log Message:
Add option as to whether to embed snapshot when creating RZX files from a
given snapshot.


Index: fuse.c
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/fuse.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -C2 -d -r1.88 -r1.89
*** fuse.c	9 Oct 2003 10:40:01 -0000	1.88
--- fuse.c	9 Oct 2003 11:16:43 -0000	1.89
***************
*** 535,539 ****
  
    if( start_files->recording ) {
!     error = rzx_start_recording( start_files->recording, 1 );
      if( error ) return error;
    }
--- 535,540 ----
  
    if( start_files->recording ) {
!     error = rzx_start_recording( start_files->recording,
! 				 settings_current.embed_snapshot );
      if( error ) return error;
    }

Index: settings.dat
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/settings.dat,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** settings.dat	6 Oct 2003 17:45:53 -0000	1.24
--- settings.dat	9 Oct 2003 11:16:44 -0000	1.25
***************
*** 56,59 ****
--- 56,60 ----
  competition_mode, boolean, 0
  competition_code, numeric, 0
+ embed_snapshot, boolean, 1
  
  snapshot, string, NULL, 's'

[fuse-emulator-cvs] fuse/hacking ChangeLog,1.43,1.44

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

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

Modified Files:
	ChangeLog 
Log Message:
Make the --record option record rather than playback.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/hacking/ChangeLog,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** ChangeLog	8 Oct 2003 17:26:02 -0000	1.43
--- ChangeLog	9 Oct 2003 10:40:01 -0000	1.44
***************
*** 256,257 ****
--- 256,258 ----
  20031008 ui/svga/svgakeyboard.c: F3 should open all files, not just
  	 snapshots.
+ 20031009 fuse.c: make the --record option record rather than playback.

[fuse-emulator-cvs] fuse fuse.c,1.87,1.88

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

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

Modified Files:
	fuse.c 
Log Message:
Make the --record option record rather than playback.


Index: fuse.c
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/fuse.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -C2 -d -r1.87 -r1.88
*** fuse.c	8 Oct 2003 15:44:01 -0000	1.87
--- fuse.c	9 Oct 2003 10:40:01 -0000	1.88
***************
*** 535,539 ****
  
    if( start_files->recording ) {
!     error = utils_open_file( start_files->recording, autoload, NULL );
      if( error ) return error;
    }
--- 535,539 ----
  
    if( start_files->recording ) {
!     error = rzx_start_recording( start_files->recording, 1 );
      if( error ) return error;
    }

[fuse-emulator-cvs] fuse/ui/svga svgakeyboard.c,1.44,1.45

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

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

Modified Files:
	svgakeyboard.c 
Log Message:
F3 should open all files, not just snapshots.


Index: svgakeyboard.c
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/ui/svga/svgakeyboard.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** svgakeyboard.c	9 Feb 2003 12:06:53 -0000	1.44
--- svgakeyboard.c	8 Oct 2003 17:26:03 -0000	1.45
***************
*** 98,102 ****
    case SCANCODE_F3:
      fuse_emulation_pause();
!     widget_apply_to_file( snapshot_read );
      fuse_emulation_unpause();
      break;
--- 98,107 ----
    case SCANCODE_F3:
      fuse_emulation_pause();
!     widget_do( WIDGET_TYPE_FILESELECTOR, NULL );
!     if( widget_filesel_name ) {
!       utils_open_file( widget_filesel_name, settings_current.auto_load, NULL );
!       free( widget_filesel_name );
!       display_refresh_all();
!     }
      fuse_emulation_unpause();
      break;

[fuse-emulator-cvs] fuse/hacking ChangeLog,1.42,1.43

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

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

Modified Files:
	ChangeLog 
Log Message:
F3 should open all files, not just snapshots.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/hacking/ChangeLog,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** ChangeLog	8 Oct 2003 17:15:32 -0000	1.42
--- ChangeLog	8 Oct 2003 17:26:02 -0000	1.43
***************
*** 254,255 ****
--- 254,257 ----
  20031008 configure.in: correct joystick code detection if libjsw not
  	 present.
+ 20031008 ui/svga/svgakeyboard.c: F3 should open all files, not just
+ 	 snapshots.

[fuse-emulator-cvs] fuse configure.in,1.119,1.120

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

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

Modified Files:
	configure.in 
Log Message:
Correct joystick code detection if libjsw not present.


Index: configure.in
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/configure.in,v
retrieving revision 1.119
retrieving revision 1.120
diff -C2 -d -r1.119 -r1.120
*** configure.in	7 Oct 2003 13:49:00 -0000	1.119
--- configure.in	8 Oct 2003 17:15:31 -0000	1.120
***************
*** 298,303 ****
    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.
--- 298,302 ----
    dnl If there is none, or you override this here, we use libjsw.
    dnl (svgalib appears to dislike switched joysticks on the parallel port...)
!   case "$UI" in
      svga)
        dnl Libraries such as svgalib provide their own joystick code.
***************
*** 311,314 ****
--- 310,314 ----
        else
  	AC_MSG_RESULT(yes)
+ 	AC_DEFINE(USE_JOYSTICK)
        fi
        ;;
***************
*** 321,325 ****
      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
--- 321,325 ----
      dnl Look for libjsw. If missing, use QAOP<space>.
      AC_CHECK_HEADERS(jsw.h,
!                      LIBS="$LIBS -ljsw" AC_DEFINE(USE_JOYSTICK),
                       AC_MSG_WARN(jsw.h not found - joystick support disabled))
    fi

[fuse-emulator-cvs] fuse/hacking ChangeLog,1.41,1.42

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

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

Modified Files:
	ChangeLog 
Log Message:
Correct joystick code detection if libjsw not present.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/hacking/ChangeLog,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** ChangeLog	8 Oct 2003 15:44:01 -0000	1.41
--- ChangeLog	8 Oct 2003 17:15:32 -0000	1.42
***************
*** 252,253 ****
--- 252,255 ----
  20031008 fuse.c, utils.c: partial cleanup of the startup code: there is
  	 now only one place at which each type of file is opened.
+ 20031008 configure.in: correct joystick code detection if libjsw not
+ 	 present.

[fuse-emulator-cvs] fuse fuse.c,1.86,1.87 utils.c,1.25,1.26

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

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

Modified Files:
	fuse.c utils.c 
Log Message:
Partial cleanup of the startup code: there is now only one place at which
each type of file is opened.


Index: fuse.c
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/fuse.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -C2 -d -r1.86 -r1.87
*** fuse.c	7 Oct 2003 13:49:00 -0000	1.86
--- fuse.c	8 Oct 2003 15:44:01 -0000	1.87
***************
*** 84,87 ****
--- 84,100 ----
  libspectrum_creator *fuse_creator;
  
+ /* The various types of file we may want to run on startup */
+ typedef struct start_files_t {
+ 
+   const char *disk_plus3;
+   const char *disk_trdos;
+   const char *dock;
+   const char *playback;
+   const char *recording;
+   const char *snapshot;
+   const char *tape;
+ 
+ } start_files_t;
+ 
  static int fuse_init(int argc, char **argv);
  
***************
*** 91,96 ****
  static void fuse_show_help( void );
  
  static int parse_nonoption_args( int argc, char **argv, int first_arg,
! 				 int autoload );
  
  static int fuse_end(void);
--- 104,111 ----
  static void fuse_show_help( void );
  
+ static int setup_start_files( start_files_t *start_files );
  static int parse_nonoption_args( int argc, char **argv, int first_arg,
! 				 start_files_t *start_files );
! static int do_start_files( start_files_t *start_files );
  
  static int fuse_end(void);
***************
*** 122,125 ****
--- 137,141 ----
    int autoload;			/* Should we autoload tapes? */
    char *start_scaler;
+   start_files_t start_files;
  
    fuse_progname=argv[0];
***************
*** 206,260 ****
    if( error ) return error;
  
!   if( settings_current.snapshot ) {
!     snapshot_read( settings_current.snapshot ); autoload = 0;
!   }
! 
!   /* Insert any tape file; if no snapshot file already specified,
!      autoload the tape */
!   if( settings_current.tape_file )
!     tape_open( settings_current.tape_file, autoload );
! 
!   if( settings_current.playback_file )
!     rzx_start_playback( settings_current.playback_file, NULL );
! 
! #ifdef HAVE_765_H
!   if( settings_current.plus3disk_file ) {
!     error = machine_select( LIBSPECTRUM_MACHINE_PLUS3 );
!     if( error ) return error;
! 
!     specplus3_disk_insert( SPECPLUS3_DRIVE_A, settings_current.plus3disk_file );
!   }
! #endif				/* #ifdef HAVE_765_H */
! 
!   if( settings_current.trdosdisk_file ) {
!     error = machine_select( LIBSPECTRUM_MACHINE_PENT );
!     if( error ) return error;
! 
!     trdos_disk_insert( TRDOS_DRIVE_A, settings_current.trdosdisk_file );
!   }
! 
!   if( parse_nonoption_args( argc, argv, first_arg, autoload ) ) return 1;
! 
!   /* Do this after we've parsed the non-option arguments or otherwise
!      something like `./fuse snapshot.z80 -r recording.rzx' ends up with
!      the startup snapshot stored in the RZX file, not snapshot.z80 */
!   if( settings_current.record_file )
!     rzx_start_recording( settings_current.record_file, 1 );
! 
! #ifdef HAVE_765_H
!   if( settings_current.plus3disk_file ) {
!     error = machine_select( LIBSPECTRUM_MACHINE_PLUS3 );
!     if( error ) return error;
! 
!     specplus3_disk_insert( SPECPLUS3_DRIVE_A, settings_current.plus3disk_file );
!   }
! #endif				/* #ifdef HAVE_765_H */
! 
!   if( settings_current.trdosdisk_file ) {
!     error = machine_select( LIBSPECTRUM_MACHINE_PENT );
!     if( error ) return error;
! 
!     trdos_disk_insert( TRDOS_DRIVE_A, settings_current.trdosdisk_file );
!   }
  
    fuse_emulation_paused = 0;
--- 222,228 ----
    if( error ) return error;
  
!   if( setup_start_files( &start_files ) ) return 1;
!   if( parse_nonoption_args( argc, argv, first_arg, &start_files ) ) return 1;
!   if( do_start_files( &start_files ) ) return 1;
  
    fuse_emulation_paused = 0;
***************
*** 414,438 ****
  }
  
  /* Make 'best guesses' as to what to do with non-option arguments */
  static int
! parse_nonoption_args( int argc, char **argv, int first_arg, int autoload )
  {
    libspectrum_id_t type;
    libspectrum_class_t class;
    int error;
  
!   while( first_arg < argc ) {
  
!     error = utils_open_file( argv[ first_arg ], autoload, &type );
      if( error ) return error;
  
      error = libspectrum_identify_class( &class, type );
      if( error ) return error;
  
!     /* If we had a snapshot on the command line, don't autoload any tapes
!        specified as well */
!     if( class == LIBSPECTRUM_CLASS_SNAPSHOT ) autoload = 0;
  
!     first_arg++;
    }
  
--- 382,540 ----
  }
  
+ static int
+ setup_start_files( start_files_t *start_files )
+ {
+   start_files->disk_plus3 = settings_current.plus3disk_file;
+   start_files->disk_trdos = settings_current.trdosdisk_file;
+   start_files->dock = settings_current.dck_file;
+   start_files->playback = settings_current.playback_file;
+   start_files->recording = settings_current.record_file;
+   start_files->snapshot = settings_current.snapshot;
+   start_files->tape = settings_current.tape_file;
+ 
+   return 0;
+ }
+ 
  /* Make 'best guesses' as to what to do with non-option arguments */
  static int
! parse_nonoption_args( int argc, char **argv, int first_arg,
! 		      start_files_t *start_files )
  {
+   size_t i;
+   const char *filename;
+   utils_file file;
    libspectrum_id_t type;
    libspectrum_class_t class;
    int error;
  
!   for( i = first_arg; i < argc; i++ ) {
  
!     filename = argv[i];
! 
!     error = utils_read_file( filename, &file );
      if( error ) return error;
  
+     error = libspectrum_identify_file( &type, filename,
+ 				       file.buffer, file.length );
+     if( error ) return error;
+ 
+     error = utils_close_file( &file ); if( error ) return error;
+ 
      error = libspectrum_identify_class( &class, type );
      if( error ) return error;
  
!     switch( class ) {
  
!     case LIBSPECTRUM_CLASS_CARTRIDGE_TIMEX:
!       start_files->dock = filename; break;
! 
!     case LIBSPECTRUM_CLASS_DISK_PLUS3:
!       start_files->disk_plus3 = filename; break;
! 
!     case LIBSPECTRUM_CLASS_DISK_TRDOS:
!       start_files->disk_trdos = filename; break;
! 
!     case LIBSPECTRUM_CLASS_RECORDING:
!       start_files->playback = filename; break;
! 
!     case LIBSPECTRUM_CLASS_SNAPSHOT:
!       start_files->snapshot = filename; break;
! 
!     case LIBSPECTRUM_CLASS_TAPE:
!       start_files->tape = filename; break;
! 
!     case LIBSPECTRUM_CLASS_UNKNOWN:
!       ui_error( UI_ERROR_INFO, "couldn't identify '%s'; ignoring it",
! 		filename );
!       break;
! 
!     default:
!       ui_error( UI_ERROR_ERROR, "parse_nonoption_args: unknown file class %d",
! 		class );
!       break;
! 
!     }
!   }
! 
!   return 0;
! }
! 
! static int
! do_start_files( start_files_t *start_files )
! {
!   int autoload, error;
! 
!   /* Can't do both input recording and playback */
!   if( start_files->playback && start_files->recording ) {
!     ui_error(
!       UI_ERROR_INFO,
!       "can't do both input playback and recording; recording disabled"
!     );
!     start_files->recording = NULL;
!   }
! 
!   /* Can't use both +3 and TR-DOS disks simultaneously */
!   if( start_files->disk_plus3 && start_files->disk_trdos ) {
!     ui_error(
!       UI_ERROR_INFO,
!       "can't use +3 and TR-DOS disks simultaneously; +3 disk ignored"
!     );
!     start_files->disk_plus3 = NULL;
!   }
! 
!   /* Can't use disks and the dock simultaneously */
!   if( ( start_files->disk_plus3 || start_files->disk_trdos ) &&
!       start_files->dock                                         ) {
!     ui_error(
!       UI_ERROR_INFO,
!       "can't use disks and the dock simultaneously; dock cartridge ignored"
!     );
!     start_files->dock = NULL;
!   }
! 
!   /* If a snapshot has been specified, don't autoload tape, disks etc */
!   autoload = start_files->snapshot ? 0 : settings_current.auto_load;
! 
!   /* Load in each of the files. Input recording must be done after
!      snapshot loading such that the right snapshot is embedded into
!      the file; input playback being done after snapshot loading means
!      any embedded snapshot in the input recording will override any
!      specified snapshot */
! 
!   if( start_files->disk_plus3 ) {
!     error = utils_open_file( start_files->disk_plus3, autoload, NULL );
!     if( error ) return error;
!   }
! 
!   if( start_files->disk_trdos ) {
!     error = utils_open_file( start_files->disk_trdos, autoload, NULL );
!     if( error ) return error;
!   }
! 
!   if( start_files->dock ) {
!     error = utils_open_file( start_files->dock, autoload, NULL );
!     if( error ) return error;
!   }
! 
!   if( start_files->snapshot ) {
!     error = utils_open_file( start_files->snapshot, autoload, NULL );
!     if( error ) return error;
!   }
! 
!   if( start_files->tape ) {
!     error = utils_open_file( start_files->tape, autoload, NULL );
!     if( error ) return error;
!   }
! 
!   /* Input recordings */
! 
!   if( start_files->playback ) {
!     error = utils_open_file( start_files->playback, autoload, NULL );
!     if( error ) return error;
!   }
! 
!   if( start_files->recording ) {
!     error = utils_open_file( start_files->recording, autoload, NULL );
!     if( error ) return error;
    }
  

Index: utils.c
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/utils.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** utils.c	25 Jun 2003 12:30:43 -0000	1.25
--- utils.c	8 Oct 2003 15:44:01 -0000	1.26
***************
*** 77,81 ****
  
    error = libspectrum_identify_class( &class, type );
!   if( error ) return error;
  
    error = 0;
--- 77,81 ----
  
    error = libspectrum_identify_class( &class, type );
!   if( error ) { utils_close_file( &file ); return error; }
  
    error = 0;

[fuse-emulator-cvs] fuse/hacking ChangeLog,1.40,1.41

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

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

Modified Files:
	ChangeLog 
Log Message:
Partial cleanup of the startup code: there is now only one place at which
each type of file is opened.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/hacking/ChangeLog,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** ChangeLog	8 Oct 2003 14:53:07 -0000	1.40
--- ChangeLog	8 Oct 2003 15:44:01 -0000	1.41
***************
*** 250,251 ****
--- 250,253 ----
  20031008 settings.pl: don't segfault if there are empty string entries
  	 in the config file.
+ 20031008 fuse.c, utils.c: partial cleanup of the startup code: there is
+ 	 now only one place at which each type of file is opened.

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

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

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

Modified Files:
	settings.pl 
Log Message:
Don't segfault if there are empty string entries in the config file.


Index: settings.pl
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/settings.pl,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** settings.pl	6 Oct 2003 15:30:25 -0000	1.53
--- settings.pl	8 Oct 2003 14:53:06 -0000	1.54
***************
*** 224,227 ****
--- 224,228 ----
  {
    xmlNodePtr node;
+   const char *string;
  
    node = xmlDocGetRootElement( doc );
***************
*** 252,256 ****
  	    print << "CODE";
      if( !strcmp( node->name, (const xmlChar*)"$options{$name}->{configfile}" ) ) {
!       settings->$name = strdup( xmlNodeListGetString( doc, node->xmlChildrenNode, 1 ) );
      } else
  CODE
--- 253,258 ----
  	    print << "CODE";
      if( !strcmp( node->name, (const xmlChar*)"$options{$name}->{configfile}" ) ) {
!       string = xmlNodeListGetString( doc, node->xmlChildrenNode, 1 );
!       settings->$name = string ? strdup( string ) : NULL;
      } else
  CODE

[fuse-emulator-cvs] fuse/hacking ChangeLog,1.39,1.40

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

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

Modified Files:
	ChangeLog 
Log Message:
Don't segfault if there are empty string entries in the config file.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/hacking/ChangeLog,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** ChangeLog	8 Oct 2003 14:06:38 -0000	1.39
--- ChangeLog	8 Oct 2003 14:53:07 -0000	1.40
***************
*** 248,249 ****
--- 248,251 ----
  20031007 Real joystick support (Darren/Fred)
  20031008 ui/ggi/ggikeyboard.c: #include "fuse.h" (thanks, cmdzod)
+ 20031008 settings.pl: don't segfault if there are empty string entries
+ 	 in the config file.

[fuse-emulator-cvs] fuse/hacking ChangeLog,1.38,1.39

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

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

Modified Files:
	ChangeLog 
Log Message:
#include "fuse.h" (thanks, cmdzod).


Index: ChangeLog
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/hacking/ChangeLog,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** ChangeLog	7 Oct 2003 13:49:00 -0000	1.38
--- ChangeLog	8 Oct 2003 14:06:38 -0000	1.39
***************
*** 247,248 ****
--- 247,249 ----
  	 (Darren).
  20031007 Real joystick support (Darren/Fred)
+ 20031008 ui/ggi/ggikeyboard.c: #include "fuse.h" (thanks, cmdzod)

[fuse-emulator-cvs] fuse/ui/ggi ggikeyboard.c,1.1,1.2

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

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

Modified Files:
	ggikeyboard.c 
Log Message:
#include "fuse.h" (thanks, cmdzod).


Index: ggikeyboard.c
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/ui/ggi/ggikeyboard.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ggikeyboard.c	19 May 2003 15:17:14 -0000	1.1
--- ggikeyboard.c	8 Oct 2003 14:06:38 -0000	1.2
***************
*** 34,37 ****
--- 34,38 ----
  
  #include "ggi_internals.h"
+ #include "fuse.h"
  #include "keysyms.h"
  #include "machine.h"

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

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

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

Modified Files:
	ChangeLog 
Log Message:
Real joystick support (Darren/Fred)


Index: ChangeLog
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/hacking/ChangeLog,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** ChangeLog	7 Oct 2003 11:05:43 -0000	1.37
--- ChangeLog	7 Oct 2003 13:49:00 -0000	1.38
***************
*** 246,247 ****
--- 246,248 ----
  20031007 ui/fb/fbdisplay.c, ui/fb/fbkeyboard.c: fix up framebuffer UI
  	 (Darren).
+ 20031007 Real joystick support (Darren/Fred)