fuse-for-macosx-commits Mailing List for Fuse for macOS (Page 20)
Brought to you by:
fredm
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(9) |
Dec
(31) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(24) |
Feb
(11) |
Mar
(6) |
Apr
(48) |
May
(9) |
Jun
(38) |
Jul
(33) |
Aug
(15) |
Sep
|
Oct
(3) |
Nov
(6) |
Dec
(3) |
| 2008 |
Jan
|
Feb
(24) |
Mar
(11) |
Apr
(22) |
May
(7) |
Jun
|
Jul
|
Aug
|
Sep
(2) |
Oct
(3) |
Nov
(18) |
Dec
(23) |
| 2009 |
Jan
(16) |
Feb
(1) |
Mar
(1) |
Apr
|
May
|
Jun
(7) |
Jul
(4) |
Aug
(11) |
Sep
(9) |
Oct
|
Nov
(3) |
Dec
(2) |
| 2010 |
Jan
(1) |
Feb
|
Mar
(1) |
Apr
(2) |
May
(8) |
Jun
|
Jul
|
Aug
(2) |
Sep
(2) |
Oct
(9) |
Nov
|
Dec
(8) |
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
(7) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(5) |
Nov
(2) |
Dec
|
| 2012 |
Jan
(4) |
Feb
(5) |
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
(10) |
Nov
(13) |
Dec
(11) |
| 2013 |
Jan
(4) |
Feb
(1) |
Mar
(8) |
Apr
(8) |
May
(16) |
Jun
(5) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(4) |
| 2014 |
Jan
|
Feb
(6) |
Mar
(2) |
Apr
(1) |
May
|
Jun
|
Jul
(1) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
(6) |
| 2015 |
Jan
|
Feb
|
Mar
(2) |
Apr
|
May
|
Jun
(5) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
(10) |
Jun
(9) |
Jul
(6) |
Aug
(5) |
Sep
(3) |
Oct
(6) |
Nov
(5) |
Dec
|
|
From: <fr...@us...> - 2007-05-12 00:06:34
|
Revision: 362
http://svn.sourceforge.net/fuse-for-macosx/?rev=362&view=rev
Author: fredm
Date: 2007-05-11 17:06:35 -0700 (Fri, 11 May 2007)
Log Message:
-----------
Load . into vendor/libspectrum/current.
Modified Paths:
--------------
vendor/libspectrum/current/ChangeLog
vendor/libspectrum/current/Makefile.am
vendor/libspectrum/current/README
vendor/libspectrum/current/acinclude.m4
vendor/libspectrum/current/configure.in
vendor/libspectrum/current/doc/cvs-tags
vendor/libspectrum/current/doc/libspectrum.3
vendor/libspectrum/current/doc/libspectrum.txt
vendor/libspectrum/current/hacking/ChangeLog
vendor/libspectrum/current/libspectrum.h.in
vendor/libspectrum/current/tap.c
vendor/libspectrum/current/tzx_read.c
Added Paths:
-----------
vendor/libspectrum/current/hacking/.cvsignore
vendor/libspectrum/current/hacking/Makefile.am
Modified: vendor/libspectrum/current/ChangeLog
===================================================================
--- vendor/libspectrum/current/ChangeLog 2007-05-07 13:03:04 UTC (rev 361)
+++ vendor/libspectrum/current/ChangeLog 2007-05-12 00:06:35 UTC (rev 362)
@@ -1,3 +1,18 @@
+2007-05-11 Philip Kendall <phi...@sh...>
+
+ * libspectrum 0.3.0.1 released (bug fix release).
+
+ * Avoid crash when reading an invalid TZX file (thanks, crabfists).
+ (Philip Kendall).
+
+ * Export the TZX Generalized Data Block functions when building a
+ Win32 DLL (Stuart Brady).
+
+ * Distribute the hacking/ directory (thanks, Stuart Brady) (Philip
+ Kendall).
+
+ * Remove warning when building from CVS (Stuart Brady).
+
2007-04-11 Philip Kendall <phi...@sh...>
* libspectrum 0.3.0 released.
@@ -188,4 +203,4 @@
* libspectrum separated from Fuse just before the 0.5.0 release of
Fuse; see Fuse's ChangeLog for changes up to this point
-$Id: ChangeLog,v 1.12.2.2 2007/04/11 08:43:07 pak21 Exp $
+$Id: ChangeLog,v 1.12.2.3 2007/05/11 07:04:59 pak21 Exp $
Modified: vendor/libspectrum/current/Makefile.am
===================================================================
--- vendor/libspectrum/current/Makefile.am 2007-05-07 13:03:04 UTC (rev 361)
+++ vendor/libspectrum/current/Makefile.am 2007-05-12 00:06:35 UTC (rev 362)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2001-2004 Philip Kendall
-## $Id: Makefile.am,v 1.65.2.1 2007/04/11 08:43:07 pak21 Exp $
+## $Id: Makefile.am,v 1.65.2.3 2007/05/11 07:04:59 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
@@ -55,7 +55,7 @@
zlib.c \
zxs.c
-libspectrum_la_LDFLAGS = -version-info 5:0:0 -no-undefined
+libspectrum_la_LDFLAGS = -version-info 5:1:0 -no-undefined
libspectrum_la_LIBADD = myglib/libmyglib.la -lm
@@ -99,4 +99,5 @@
SUBDIRS = doc \
+ hacking \
myglib
Modified: vendor/libspectrum/current/README
===================================================================
--- vendor/libspectrum/current/README 2007-05-07 13:03:04 UTC (rev 361)
+++ vendor/libspectrum/current/README 2007-05-12 00:06:35 UTC (rev 362)
@@ -1,5 +1,5 @@
-libspectrum 0.3.0
-=================
+libspectrum 0.3.0.1
+===================
libspectrum is a library which is designed to make the input and
output of ZX Spectrum emulator files slightly easier than it would be
@@ -50,4 +50,4 @@
'configure' for the first time.
Philip Kendall <phi...@sh...>
-11 April 2007
+11 May 2007
Modified: vendor/libspectrum/current/acinclude.m4
===================================================================
--- vendor/libspectrum/current/acinclude.m4 2007-05-07 13:03:04 UTC (rev 361)
+++ vendor/libspectrum/current/acinclude.m4 2007-05-12 00:06:35 UTC (rev 362)
@@ -7,7 +7,7 @@
dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or
dnl gthread is specified in MODULES, pass to glib-config
dnl
-AC_DEFUN(AM_PATH_GLIB,
+AC_DEFUN([AM_PATH_GLIB],
[dnl
dnl Get the cflags and libraries from the glib-config script
dnl
Modified: vendor/libspectrum/current/configure.in
===================================================================
--- vendor/libspectrum/current/configure.in 2007-05-07 13:03:04 UTC (rev 361)
+++ vendor/libspectrum/current/configure.in 2007-05-12 00:06:35 UTC (rev 362)
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
dnl Copyright (c) 1999-2004 Philip Kendall
-dnl $Id: configure.in,v 1.35.2.1 2007/04/11 08:43:07 pak21 Exp $
+dnl $Id: configure.in,v 1.35.2.3 2007/05/11 07:04:59 pak21 Exp $
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@
AM_CONFIG_HEADER(config.h)
dnl Use automake to produce `Makefile.in'
-AM_INIT_AUTOMAKE(libspectrum, 0.3.0)
+AM_INIT_AUTOMAKE(libspectrum, 0.3.0.1)
dnl Checks for programs.
AC_PROG_CC
@@ -127,6 +127,7 @@
AC_OUTPUT(
Makefile
doc/Makefile
+ hacking/Makefile
libspectrum.qpg
myglib/Makefile
)
Modified: vendor/libspectrum/current/doc/cvs-tags
===================================================================
--- vendor/libspectrum/current/doc/cvs-tags 2007-05-07 13:03:04 UTC (rev 361)
+++ vendor/libspectrum/current/doc/cvs-tags 2007-05-12 00:06:35 UTC (rev 362)
@@ -55,6 +55,7 @@
| | libspectrum_0_3_0pre1
| | libspectrum_0_3_0pre2
| | libspectrum_0_3_0
+| | libspectrum_0_3_0_1
| |
| | libspectrum_0_3_0-branch
|
Modified: vendor/libspectrum/current/doc/libspectrum.3
===================================================================
--- vendor/libspectrum/current/doc/libspectrum.3 2007-05-07 13:03:04 UTC (rev 361)
+++ vendor/libspectrum/current/doc/libspectrum.3 2007-05-12 00:06:35 UTC (rev 362)
@@ -22,7 +22,7 @@
.\" E-mail: phi...@sh...
.\"
.\"
-.TH libspectrum 3 "11th April, 2004" "Version 0.3.0" "Emulators"
+.TH libspectrum 3 "11th May, 2007" "Version 0.3.0.1" "Emulators"
.\"
.\"------------------------------------------------------------------
.\"
Modified: vendor/libspectrum/current/doc/libspectrum.txt
===================================================================
--- vendor/libspectrum/current/doc/libspectrum.txt 2007-05-07 13:03:04 UTC (rev 361)
+++ vendor/libspectrum/current/doc/libspectrum.txt 2007-05-12 00:06:35 UTC (rev 362)
@@ -1,5 +1,5 @@
-libspectrum 0.3.0
-=================
+libspectrum 0.3.0.1
+===================
libspectrum is a fairly simple library designed to make the handling
of various ZX Spectrum emulator-related file formats easy. So far it
@@ -1631,4 +1631,4 @@
Write `data' to register `reg' of the IDE channgel `chn'.
-$Id: libspectrum.txt,v 1.30.2.1 2007/02/04 18:32:36 pak21 Exp $
+$Id: libspectrum.txt,v 1.30.2.2 2007/05/11 07:04:59 pak21 Exp $
Added: vendor/libspectrum/current/hacking/.cvsignore
===================================================================
--- vendor/libspectrum/current/hacking/.cvsignore (rev 0)
+++ vendor/libspectrum/current/hacking/.cvsignore 2007-05-12 00:06:35 UTC (rev 362)
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
Modified: vendor/libspectrum/current/hacking/ChangeLog
===================================================================
--- vendor/libspectrum/current/hacking/ChangeLog 2007-05-07 13:03:04 UTC (rev 361)
+++ vendor/libspectrum/current/hacking/ChangeLog 2007-05-12 00:06:35 UTC (rev 362)
@@ -409,4 +409,17 @@
20070409 z80.c: remove warning (libspectrum_0_3_0-branch).
20070411 ChangeLog,Makefile.am,README,configure.in,doc/libspectrum.3: update
for 0.3.0 release (libspectrum_0_3_0-branch).
-20070411 TAG: libspectrum_0_3_0
\ No newline at end of file
+20070411 TAG: libspectrum_0_3_0 (libspectrum_0_3_0-branch)
+20070425 tap.c,tzx_read.c: call libspectrum_tape_clear() on error rather than
+ libspectrum_tape_free() to avoid double free bug (fixes bugs #1479451
+ and #1706994; thanks, crabfists) (libspectrum_0_3_0-branch).
+20070509 libspectrum.in: add WIN32_DLL to Generalised Data Block functions
+ (part of patch 1711412) (libspectrum_0_3_0-branch) (Stuart Brady).
+20070509 Makefile.am,configure.in,hacking/{.cvsignore,Makefile.am}: distribute
+ the hacking/ subdir (thanks, Stuart Brady) (libspectrum_0_3_0-branch).
+20070509 acinclude.m4: fix underquoted macro (thanks, Stuart Brady)
+ (libspectrum_0_3_0-branch).
+20070510 ChangeLog,Makefile.am,README,configure.in,doc/{libspectrum.3,
+ libspectrum.txt}: updates for 0.3.0.1 release
+ (libspectrum_0_3_0-branch).
+20070511 TAG: libspectrum_0_3_0_1 (libspectrum_0_3_0-branch)
Added: vendor/libspectrum/current/hacking/Makefile.am
===================================================================
--- vendor/libspectrum/current/hacking/Makefile.am (rev 0)
+++ vendor/libspectrum/current/hacking/Makefile.am 2007-05-12 00:06:35 UTC (rev 362)
@@ -0,0 +1,26 @@
+## Process this file with automake to produce Makefile.in
+## Copyright (c) 2007 Philip Kendall
+
+## $Id: Makefile.am,v 1.1.2.1 2007/05/09 20:24:39 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: phi...@sh...
+
+AUTOMAKE_OPTIONS = foreign
+
+EXTRA_DIST = ChangeLog
Modified: vendor/libspectrum/current/libspectrum.h.in
===================================================================
--- vendor/libspectrum/current/libspectrum.h.in 2007-05-07 13:03:04 UTC (rev 361)
+++ vendor/libspectrum/current/libspectrum.h.in 2007-05-12 00:06:35 UTC (rev 362)
@@ -1,7 +1,7 @@
/* libspectrum.h: the library for dealing with ZX Spectrum emulator files
Copyright (c) 2001-2007 Philip Kendall, Darren Salt, Fredrick Meunier
- $Id: libspectrum.h.in,v 1.141.2.1 2007/02/04 18:32:36 pak21 Exp $
+ $Id: libspectrum.h.in,v 1.141.2.2 2007/05/09 20:08:07 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
@@ -630,13 +630,13 @@
typedef struct libspectrum_tape_generalised_data_symbol libspectrum_tape_generalised_data_symbol;
-libspectrum_dword libspectrum_tape_generalised_data_symbol_table_symbols_in_block( const libspectrum_tape_generalised_data_symbol_table *table );
-libspectrum_byte libspectrum_tape_generalised_data_symbol_table_max_pulses( const libspectrum_tape_generalised_data_symbol_table *table );
-libspectrum_word libspectrum_tape_generalised_data_symbol_table_symbols_in_table( const libspectrum_tape_generalised_data_symbol_table *table );
-libspectrum_tape_generalised_data_symbol* libspectrum_tape_generalised_data_symbol_table_symbol( const libspectrum_tape_generalised_data_symbol_table *table, size_t which );
+libspectrum_dword WIN32_DLL libspectrum_tape_generalised_data_symbol_table_symbols_in_block( const libspectrum_tape_generalised_data_symbol_table *table );
+libspectrum_byte WIN32_DLL libspectrum_tape_generalised_data_symbol_table_max_pulses( const libspectrum_tape_generalised_data_symbol_table *table );
+libspectrum_word WIN32_DLL libspectrum_tape_generalised_data_symbol_table_symbols_in_table( const libspectrum_tape_generalised_data_symbol_table *table );
+libspectrum_tape_generalised_data_symbol* WIN32_DLL libspectrum_tape_generalised_data_symbol_table_symbol( const libspectrum_tape_generalised_data_symbol_table *table, size_t which );
-libspectrum_tape_generalised_data_symbol_edge_type libspectrum_tape_generalised_data_symbol_type( const libspectrum_tape_generalised_data_symbol *symbol );
-libspectrum_word libspectrum_tape_generalised_data_symbol_pulse( const libspectrum_tape_generalised_data_symbol *symbol, size_t which );
+libspectrum_tape_generalised_data_symbol_edge_type WIN32_DLL libspectrum_tape_generalised_data_symbol_type( const libspectrum_tape_generalised_data_symbol *symbol );
+libspectrum_word WIN32_DLL libspectrum_tape_generalised_data_symbol_pulse( const libspectrum_tape_generalised_data_symbol *symbol, size_t which );
/*
Modified: vendor/libspectrum/current/tap.c
===================================================================
--- vendor/libspectrum/current/tap.c 2007-05-07 13:03:04 UTC (rev 361)
+++ vendor/libspectrum/current/tap.c 2007-05-12 00:06:35 UTC (rev 362)
@@ -1,7 +1,7 @@
/* tape.c: Routines for handling .tap files
Copyright (c) 2001-2003 Philip Kendall
- $Id: tap.c,v 1.19 2007/02/02 16:35:43 pak21 Exp $
+ $Id: tap.c,v 1.19.2.1 2007/04/25 15:01:41 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
@@ -65,7 +65,7 @@
/* If we've got less than two bytes for the length, something's
gone wrong, so gone home */
if( ( end - ptr ) < 2 ) {
- libspectrum_tape_free( tape );
+ libspectrum_tape_clear( tape );
libspectrum_print_error(
LIBSPECTRUM_ERROR_CORRUPT,
"libspectrum_tap_read: not enough data in buffer"
@@ -84,7 +84,7 @@
/* Have we got enough bytes left in buffer? */
if( end - ptr < (ptrdiff_t)data_length ) {
- libspectrum_tape_free( tape );
+ libspectrum_tape_clear( tape );
free( block );
libspectrum_print_error(
LIBSPECTRUM_ERROR_CORRUPT,
@@ -96,7 +96,7 @@
/* Allocate memory for the data */
data = malloc( data_length * sizeof( libspectrum_byte ) );
if( !data ) {
- libspectrum_tape_free( tape );
+ libspectrum_tape_clear( tape );
free( block );
libspectrum_print_error( LIBSPECTRUM_ERROR_MEMORY,
"libspectrum_tap_create: out of memory" );
Modified: vendor/libspectrum/current/tzx_read.c
===================================================================
--- vendor/libspectrum/current/tzx_read.c 2007-05-07 13:03:04 UTC (rev 361)
+++ vendor/libspectrum/current/tzx_read.c 2007-05-12 00:06:35 UTC (rev 362)
@@ -1,7 +1,7 @@
/* tzx_read.c: Routines for reading .tzx files
Copyright (c) 2001-2007 Philip Kendall, Darren Salt
- $Id: tzx_read.c,v 1.65.2.1 2007/02/17 19:11:05 pak21 Exp $
+ $Id: tzx_read.c,v 1.65.2.2 2007/04/25 15:01:41 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
@@ -150,98 +150,98 @@
switch( id ) {
case LIBSPECTRUM_TAPE_BLOCK_ROM:
error = tzx_read_rom_block( tape, &ptr, end );
- if( error ) { libspectrum_tape_free( tape ); return error; }
+ if( error ) { libspectrum_tape_clear( tape ); return error; }
break;
case LIBSPECTRUM_TAPE_BLOCK_TURBO:
error = tzx_read_turbo_block( tape, &ptr, end );
- if( error ) { libspectrum_tape_free( tape ); return error; }
+ if( error ) { libspectrum_tape_clear( tape ); return error; }
break;
case LIBSPECTRUM_TAPE_BLOCK_PURE_TONE:
error = tzx_read_pure_tone( tape, &ptr, end );
- if( error ) { libspectrum_tape_free( tape ); return error; }
+ if( error ) { libspectrum_tape_clear( tape ); return error; }
break;
case LIBSPECTRUM_TAPE_BLOCK_PULSES:
error = tzx_read_pulses_block( tape, &ptr, end );
- if( error ) { libspectrum_tape_free( tape ); return error; }
+ if( error ) { libspectrum_tape_clear( tape ); return error; }
break;
case LIBSPECTRUM_TAPE_BLOCK_PURE_DATA:
error = tzx_read_pure_data( tape, &ptr, end );
- if( error ) { libspectrum_tape_free( tape ); return error; }
+ if( error ) { libspectrum_tape_clear( tape ); return error; }
break;
case LIBSPECTRUM_TAPE_BLOCK_RAW_DATA:
error = tzx_read_raw_data( tape, &ptr, end );
- if( error ) { libspectrum_tape_free( tape ); return error; }
+ if( error ) { libspectrum_tape_clear( tape ); return error; }
break;
case LIBSPECTRUM_TAPE_BLOCK_GENERALISED_DATA:
error = tzx_read_generalised_data( tape, &ptr, end );
- if( error ) { libspectrum_tape_free( tape ); return error; }
+ if( error ) { libspectrum_tape_clear( tape ); return error; }
break;
case LIBSPECTRUM_TAPE_BLOCK_PAUSE:
error = tzx_read_pause( tape, &ptr, end );
- if( error ) { libspectrum_tape_free( tape ); return error; }
+ if( error ) { libspectrum_tape_clear( tape ); return error; }
break;
case LIBSPECTRUM_TAPE_BLOCK_GROUP_START:
error = tzx_read_group_start( tape, &ptr, end );
- if( error ) { libspectrum_tape_free( tape ); return error; }
+ if( error ) { libspectrum_tape_clear( tape ); return error; }
break;
case LIBSPECTRUM_TAPE_BLOCK_GROUP_END:
error = tzx_read_empty_block( tape, id );
- if( error ) { libspectrum_tape_free( tape ); return error; }
+ if( error ) { libspectrum_tape_clear( tape ); return error; }
break;
case LIBSPECTRUM_TAPE_BLOCK_JUMP:
error = tzx_read_jump( tape, &ptr, end );
- if( error ) { libspectrum_tape_free( tape ); return error; }
+ if( error ) { libspectrum_tape_clear( tape ); return error; }
break;
case LIBSPECTRUM_TAPE_BLOCK_LOOP_START:
error = tzx_read_loop_start( tape, &ptr, end );
- if( error ) { libspectrum_tape_free( tape ); return error; }
+ if( error ) { libspectrum_tape_clear( tape ); return error; }
break;
case LIBSPECTRUM_TAPE_BLOCK_LOOP_END:
error = tzx_read_empty_block( tape, id );
- if( error ) { libspectrum_tape_free( tape ); return error; }
+ if( error ) { libspectrum_tape_clear( tape ); return error; }
break;
case LIBSPECTRUM_TAPE_BLOCK_SELECT:
error = tzx_read_select( tape, &ptr, end );
- if( error ) { libspectrum_tape_free( tape ); return error; }
+ if( error ) { libspectrum_tape_clear( tape ); return error; }
break;
case LIBSPECTRUM_TAPE_BLOCK_STOP48:
error = tzx_read_stop( tape, &ptr, end );
- if( error ) { libspectrum_tape_free( tape ); return error; }
+ if( error ) { libspectrum_tape_clear( tape ); return error; }
break;
case LIBSPECTRUM_TAPE_BLOCK_COMMENT:
error = tzx_read_comment( tape, &ptr, end );
- if( error ) { libspectrum_tape_free( tape ); return error; }
+ if( error ) { libspectrum_tape_clear( tape ); return error; }
break;
case LIBSPECTRUM_TAPE_BLOCK_MESSAGE:
error = tzx_read_message( tape, &ptr, end );
- if( error ) { libspectrum_tape_free( tape ); return error; }
+ if( error ) { libspectrum_tape_clear( tape ); return error; }
break;
case LIBSPECTRUM_TAPE_BLOCK_ARCHIVE_INFO:
error = tzx_read_archive_info( tape, &ptr, end );
- if( error ) { libspectrum_tape_free( tape ); return error; }
+ if( error ) { libspectrum_tape_clear( tape ); return error; }
break;
case LIBSPECTRUM_TAPE_BLOCK_HARDWARE:
error = tzx_read_hardware( tape, &ptr, end );
- if( error ) { libspectrum_tape_free( tape ); return error; }
+ if( error ) { libspectrum_tape_clear( tape ); return error; }
break;
case LIBSPECTRUM_TAPE_BLOCK_CUSTOM:
error = tzx_read_custom( tape, &ptr, end );
- if( error ) { libspectrum_tape_free( tape ); return error; }
+ if( error ) { libspectrum_tape_clear( tape ); return error; }
break;
case LIBSPECTRUM_TAPE_BLOCK_CONCAT:
error = tzx_read_concat( &ptr, end );
- if( error ) { libspectrum_tape_free( tape ); return error; }
+ if( error ) { libspectrum_tape_clear( tape ); return error; }
break;
default: /* For now, don't handle anything else */
- libspectrum_tape_free( tape );
+ libspectrum_tape_clear( tape );
libspectrum_print_error(
LIBSPECTRUM_ERROR_UNKNOWN,
"libspectrum_tzx_create: unknown block type 0x%02x", id
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2007-05-07 13:04:44
|
Revision: 361
http://svn.sourceforge.net/fuse-for-macosx/?rev=361&view=rev
Author: fredm
Date: 2007-05-07 06:03:04 -0700 (Mon, 07 May 2007)
Log Message:
-----------
Correct PAL TV scanline preference.
Modified Paths:
--------------
branches/Release-0_8_0/fuse/fusepb/nibs/Preferences.nib/info.nib
branches/Release-0_8_0/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib
Modified: branches/Release-0_8_0/fuse/fusepb/nibs/Preferences.nib/info.nib
===================================================================
--- branches/Release-0_8_0/fuse/fusepb/nibs/Preferences.nib/info.nib 2007-04-15 13:02:43 UTC (rev 360)
+++ branches/Release-0_8_0/fuse/fusepb/nibs/Preferences.nib/info.nib 2007-05-07 13:03:04 UTC (rev 361)
@@ -32,7 +32,7 @@
<integer>5</integer>
</array>
<key>IBSystem Version</key>
- <string>8L2127</string>
+ <string>8P2137</string>
<key>IBUsesTextArchiving</key>
<true/>
</dict>
Modified: branches/Release-0_8_0/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib
===================================================================
--- branches/Release-0_8_0/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib 2007-04-15 13:02:43 UTC (rev 360)
+++ branches/Release-0_8_0/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib 2007-05-07 13:03:04 UTC (rev 361)
@@ -11,32 +11,32 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>1560</integer>
+ <integer>1559</integer>
</dict>
<key>NSAccessibilityConnectors</key>
<dict>
<key>CF$UID</key>
- <integer>1557</integer>
+ <integer>1556</integer>
</dict>
<key>NSAccessibilityOidsKeys</key>
<dict>
<key>CF$UID</key>
- <integer>1558</integer>
+ <integer>1557</integer>
</dict>
<key>NSAccessibilityOidsValues</key>
<dict>
<key>CF$UID</key>
- <integer>1559</integer>
+ <integer>1558</integer>
</dict>
<key>NSClassesKeys</key>
<dict>
<key>CF$UID</key>
- <integer>1253</integer>
+ <integer>1252</integer>
</dict>
<key>NSClassesValues</key>
<dict>
<key>CF$UID</key>
- <integer>1254</integer>
+ <integer>1253</integer>
</dict>
<key>NSConnections</key>
<dict>
@@ -56,34 +56,34 @@
<key>NSNamesKeys</key>
<dict>
<key>CF$UID</key>
- <integer>1189</integer>
+ <integer>1188</integer>
</dict>
<key>NSNamesValues</key>
<dict>
<key>CF$UID</key>
- <integer>1190</integer>
+ <integer>1189</integer>
</dict>
<key>NSNextOid</key>
- <integer>1049</integer>
+ <integer>1050</integer>
<key>NSObjectsKeys</key>
<dict>
<key>CF$UID</key>
- <integer>1182</integer>
+ <integer>1181</integer>
</dict>
<key>NSObjectsValues</key>
<dict>
<key>CF$UID</key>
- <integer>1188</integer>
+ <integer>1187</integer>
</dict>
<key>NSOidsKeys</key>
<dict>
<key>CF$UID</key>
- <integer>1255</integer>
+ <integer>1254</integer>
</dict>
<key>NSOidsValues</key>
<dict>
<key>CF$UID</key>
- <integer>1256</integer>
+ <integer>1255</integer>
</dict>
<key>NSRoot</key>
<dict>
@@ -142,7 +142,7 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>98</integer>
+ <integer>97</integer>
</dict>
<key>NS.objects</key>
<array>
@@ -160,107 +160,111 @@
</dict>
<dict>
<key>CF$UID</key>
- <integer>838</integer>
+ <integer>837</integer>
</dict>
<dict>
<key>CF$UID</key>
+ <integer>846</integer>
+ </dict>
+ <dict>
+ <key>CF$UID</key>
<integer>847</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>848</integer>
+ <integer>851</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>852</integer>
+ <integer>854</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>855</integer>
+ <integer>857</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>858</integer>
+ <integer>860</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>861</integer>
+ <integer>863</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>864</integer>
+ <integer>866</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>867</integer>
+ <integer>869</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>870</integer>
+ <integer>872</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>873</integer>
+ <integer>875</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>876</integer>
+ <integer>878</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>879</integer>
+ <integer>881</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>882</integer>
+ <integer>884</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>885</integer>
+ <integer>887</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>888</integer>
+ <integer>890</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>891</integer>
+ <integer>893</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>894</integer>
+ <integer>896</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>897</integer>
+ <integer>899</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>900</integer>
+ <integer>902</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>903</integer>
+ <integer>905</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>906</integer>
+ <integer>908</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>909</integer>
+ <integer>911</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>912</integer>
+ <integer>919</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>920</integer>
+ <integer>926</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>927</integer>
+ <integer>929</integer>
</dict>
<dict>
<key>CF$UID</key>
@@ -268,83 +272,83 @@
</dict>
<dict>
<key>CF$UID</key>
- <integer>931</integer>
+ <integer>932</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>933</integer>
+ <integer>941</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>942</integer>
+ <integer>944</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>945</integer>
+ <integer>948</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>949</integer>
+ <integer>964</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>965</integer>
+ <integer>968</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>969</integer>
+ <integer>972</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>973</integer>
+ <integer>977</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>978</integer>
+ <integer>980</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>981</integer>
+ <integer>983</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>984</integer>
+ <integer>986</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>987</integer>
+ <integer>992</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>993</integer>
+ <integer>995</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>996</integer>
+ <integer>998</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>999</integer>
+ <integer>1002</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>1003</integer>
+ <integer>1004</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>1005</integer>
+ <integer>1006</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>1007</integer>
+ <integer>1008</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>1009</integer>
+ <integer>1010</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>1011</integer>
+ <integer>1012</integer>
</dict>
<dict>
<key>CF$UID</key>
@@ -360,27 +364,27 @@
</dict>
<dict>
<key>CF$UID</key>
- <integer>1016</integer>
+ <integer>1017</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>1018</integer>
+ <integer>1020</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>1021</integer>
+ <integer>1023</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>1024</integer>
+ <integer>1026</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>1027</integer>
+ <integer>1029</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>1030</integer>
+ <integer>1036</integer>
</dict>
<dict>
<key>CF$UID</key>
@@ -396,7 +400,7 @@
</dict>
<dict>
<key>CF$UID</key>
- <integer>1040</integer>
+ <integer>1042</integer>
</dict>
<dict>
<key>CF$UID</key>
@@ -404,11 +408,11 @@
</dict>
<dict>
<key>CF$UID</key>
- <integer>1044</integer>
+ <integer>1046</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>1047</integer>
+ <integer>1049</integer>
</dict>
<dict>
<key>CF$UID</key>
@@ -416,11 +420,11 @@
</dict>
<dict>
<key>CF$UID</key>
- <integer>1051</integer>
+ <integer>1053</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>1054</integer>
+ <integer>1058</integer>
</dict>
<dict>
<key>CF$UID</key>
@@ -440,31 +444,31 @@
</dict>
<dict>
<key>CF$UID</key>
- <integer>1063</integer>
+ <integer>1067</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>1068</integer>
+ <integer>1071</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>1072</integer>
+ <integer>1077</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>1078</integer>
+ <integer>1082</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>1083</integer>
+ <integer>1086</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>1087</integer>
+ <integer>1090</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>1091</integer>
+ <integer>1092</integer>
</dict>
<dict>
<key>CF$UID</key>
@@ -472,63 +476,63 @@
</dict>
<dict>
<key>CF$UID</key>
- <integer>1094</integer>
+ <integer>1096</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>1097</integer>
+ <integer>1099</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>1100</integer>
+ <integer>1103</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>1104</integer>
+ <integer>1105</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>1106</integer>
+ <integer>1107</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>1108</integer>
+ <integer>1110</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>1111</integer>
+ <integer>1113</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>1114</integer>
+ <integer>1115</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>1116</integer>
+ <integer>1117</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>1118</integer>
+ <integer>1120</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>1121</integer>
+ <integer>1123</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>1124</integer>
+ <integer>1126</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>1127</integer>
+ <integer>1129</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>1130</integer>
+ <integer>1131</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>1132</integer>
+ <integer>1133</integer>
</dict>
<dict>
<key>CF$UID</key>
@@ -544,80 +548,76 @@
</dict>
<dict>
<key>CF$UID</key>
- <integer>1137</integer>
+ <integer>1138</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>1139</integer>
+ <integer>1140</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>1141</integer>
+ <integer>1142</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>1143</integer>
+ <integer>1144</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>1145</integer>
+ <integer>1147</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>1148</integer>
+ <integer>1150</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>1151</integer>
+ <integer>1154</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>1155</integer>
+ <integer>1157</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>1158</integer>
+ <integer>1159</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>1160</integer>
+ <integer>1161</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>1162</integer>
+ <integer>1163</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>1164</integer>
+ <integer>1165</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>1166</integer>
+ <integer>1167</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>1168</integer>
+ <integer>1169</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>1170</integer>
+ <integer>1171</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>1172</integer>
+ <integer>1173</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>1174</integer>
+ <integer>1175</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>1176</integer>
+ <integer>1177</integer>
</dict>
- <dict>
- <key>CF$UID</key>
- <integer>1178</integer>
- </dict>
</array>
</dict>
<dict>
@@ -677,12 +677,12 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>130</integer>
+ <integer>129</integer>
</dict>
<key>NSFrame</key>
<dict>
<key>CF$UID</key>
- <integer>232</integer>
+ <integer>231</integer>
</dict>
<key>NSNextResponder</key>
<dict>
@@ -692,7 +692,7 @@
<key>NSSubviews</key>
<dict>
<key>CF$UID</key>
- <integer>135</integer>
+ <integer>134</integer>
</dict>
</dict>
<string>{{18, 103}, {105, 18}}</string>
@@ -1112,7 +1112,7 @@
<key>NSLabel</key>
<dict>
<key>CF$UID</key>
- <integer>837</integer>
+ <integer>836</integer>
</dict>
<key>NSSource</key>
<dict>
@@ -1124,22 +1124,22 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>836</integer>
+ <integer>835</integer>
</dict>
<key>NSMaxSize</key>
<dict>
<key>CF$UID</key>
- <integer>835</integer>
+ <integer>834</integer>
</dict>
<key>NSMinSize</key>
<dict>
<key>CF$UID</key>
- <integer>834</integer>
+ <integer>833</integer>
</dict>
<key>NSScreenRect</key>
<dict>
<key>CF$UID</key>
- <integer>833</integer>
+ <integer>832</integer>
</dict>
<key>NSViewClass</key>
<dict>
@@ -1199,12 +1199,12 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>130</integer>
+ <integer>129</integer>
</dict>
<key>NSFrame</key>
<dict>
<key>CF$UID</key>
- <integer>832</integer>
+ <integer>831</integer>
</dict>
<key>NSNextResponder</key>
<dict>
@@ -1221,7 +1221,7 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>98</integer>
+ <integer>97</integer>
</dict>
<key>NS.objects</key>
<array>
@@ -1231,11 +1231,11 @@
</dict>
<dict>
<key>CF$UID</key>
- <integer>794</integer>
+ <integer>793</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>827</integer>
+ <integer>826</integer>
</dict>
</array>
</dict>
@@ -1243,7 +1243,7 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>793</integer>
+ <integer>792</integer>
</dict>
<key>NSAllowTruncatedLabels</key>
<true/>
@@ -1257,7 +1257,7 @@
<key>NSFrame</key>
<dict>
<key>CF$UID</key>
- <integer>131</integer>
+ <integer>130</integer>
</dict>
<key>NSNextResponder</key>
<dict>
@@ -1267,7 +1267,7 @@
<key>NSSelectedTabViewItem</key>
<dict>
<key>CF$UID</key>
- <integer>791</integer>
+ <integer>790</integer>
</dict>
<key>NSSubviews</key>
<dict>
@@ -1282,7 +1282,7 @@
<key>NSTabViewItems</key>
<dict>
<key>CF$UID</key>
- <integer>132</integer>
+ <integer>131</integer>
</dict>
<key>NSTvFlags</key>
<integer>4</integer>
@@ -1291,7 +1291,7 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>98</integer>
+ <integer>97</integer>
</dict>
<key>NS.objects</key>
<array>
@@ -1305,12 +1305,12 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>130</integer>
+ <integer>129</integer>
</dict>
<key>NSFrame</key>
<dict>
<key>CF$UID</key>
- <integer>129</integer>
+ <integer>128</integer>
</dict>
<key>NSNextResponder</key>
<dict>
@@ -1332,7 +1332,7 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>98</integer>
+ <integer>97</integer>
</dict>
<key>NS.objects</key>
<array>
@@ -1342,11 +1342,11 @@
</dict>
<dict>
<key>CF$UID</key>
- <integer>121</integer>
+ <integer>120</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>125</integer>
+ <integer>124</integer>
</dict>
</array>
</dict>
@@ -1354,27 +1354,27 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>120</integer>
+ <integer>119</integer>
</dict>
<key>NSBackgroundColor</key>
<dict>
<key>CF$UID</key>
- <integer>115</integer>
+ <integer>114</integer>
</dict>
<key>NSCellBackgroundColor</key>
<dict>
<key>CF$UID</key>
- <integer>119</integer>
+ <integer>118</integer>
</dict>
<key>NSCellClass</key>
<dict>
<key>CF$UID</key>
- <integer>101</integer>
+ <integer>100</integer>
</dict>
<key>NSCellSize</key>
<dict>
<key>CF$UID</key>
- <integer>99</integer>
+ <integer>98</integer>
</dict>
<key>NSCells</key>
<dict>
@@ -1396,7 +1396,7 @@
<key>NSIntercellSpacing</key>
<dict>
<key>CF$UID</key>
- <integer>100</integer>
+ <integer>99</integer>
</dict>
<key>NSMatrixFlags</key>
<integer>1143472128</integer>
@@ -1412,7 +1412,7 @@
<key>NSProtoCell</key>
<dict>
<key>CF$UID</key>
- <integer>102</integer>
+ <integer>101</integer>
</dict>
<key>NSSelectedCell</key>
<dict>
@@ -1434,7 +1434,7 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>98</integer>
+ <integer>97</integer>
</dict>
<key>NS.objects</key>
<array>
@@ -1480,43 +1480,43 @@
</dict>
<dict>
<key>CF$UID</key>
- <integer>78</integer>
+ <integer>77</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>80</integer>
+ <integer>79</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>82</integer>
+ <integer>81</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>84</integer>
+ <integer>83</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>86</integer>
+ <integer>85</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>88</integer>
+ <integer>87</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>90</integer>
+ <integer>89</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>92</integer>
+ <integer>91</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>94</integer>
+ <integer>93</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>96</integer>
+ <integer>95</integer>
</dict>
</array>
</dict>
@@ -2008,7 +2008,7 @@
<key>NSAlternateContents</key>
<dict>
<key>CF$UID</key>
- <integer>77</integer>
+ <integer>21</integer>
</dict>
<key>NSAlternateImage</key>
<dict>
@@ -2051,7 +2051,6 @@
<integer>15</integer>
</dict>
<string>PAL TV</string>
- <string></string>
<dict>
<key>$class</key>
<dict>
@@ -2079,7 +2078,7 @@
<key>NSContents</key>
<dict>
<key>CF$UID</key>
- <integer>79</integer>
+ <integer>78</integer>
</dict>
<key>NSControlView</key>
<dict>
@@ -2113,7 +2112,7 @@
<key>NSAlternateContents</key>
<dict>
<key>CF$UID</key>
- <integer>77</integer>
+ <integer>21</integer>
</dict>
<key>NSAlternateImage</key>
<dict>
@@ -2131,7 +2130,7 @@
<key>NSContents</key>
<dict>
<key>CF$UID</key>
- <integer>81</integer>
+ <integer>80</integer>
</dict>
<key>NSControlView</key>
<dict>
@@ -2183,7 +2182,7 @@
<key>NSContents</key>
<dict>
<key>CF$UID</key>
- <integer>83</integer>
+ <integer>82</integer>
</dict>
<key>NSControlView</key>
<dict>
@@ -2217,7 +2216,7 @@
<key>NSAlternateContents</key>
<dict>
<key>CF$UID</key>
- <integer>77</integer>
+ <integer>21</integer>
</dict>
<key>NSAlternateImage</key>
<dict>
@@ -2235,7 +2234,7 @@
<key>NSContents</key>
<dict>
<key>CF$UID</key>
- <integer>85</integer>
+ <integer>84</integer>
</dict>
<key>NSControlView</key>
<dict>
@@ -2287,7 +2286,7 @@
<key>NSContents</key>
<dict>
<key>CF$UID</key>
- <integer>87</integer>
+ <integer>86</integer>
</dict>
<key>NSControlView</key>
<dict>
@@ -2339,7 +2338,7 @@
<key>NSContents</key>
<dict>
<key>CF$UID</key>
- <integer>89</integer>
+ <integer>88</integer>
</dict>
<key>NSControlView</key>
<dict>
@@ -2391,7 +2390,7 @@
<key>NSContents</key>
<dict>
<key>CF$UID</key>
- <integer>91</integer>
+ <integer>90</integer>
</dict>
<key>NSControlView</key>
<dict>
@@ -2443,7 +2442,7 @@
<key>NSContents</key>
<dict>
<key>CF$UID</key>
- <integer>93</integer>
+ <integer>92</integer>
</dict>
<key>NSControlView</key>
<dict>
@@ -2495,7 +2494,7 @@
<key>NSContents</key>
<dict>
<key>CF$UID</key>
- <integer>95</integer>
+ <integer>94</integer>
</dict>
<key>NSControlView</key>
<dict>
@@ -2529,7 +2528,7 @@
<key>NSAlternateContents</key>
<dict>
<key>CF$UID</key>
- <integer>77</integer>
+ <integer>21</integer>
</dict>
<key>NSAlternateImage</key>
<dict>
@@ -2547,7 +2546,7 @@
<key>NSContents</key>
<dict>
<key>CF$UID</key>
- <integer>97</integer>
+ <integer>96</integer>
</dict>
<key>NSControlView</key>
<dict>
@@ -2605,12 +2604,12 @@
<key>NSContents</key>
<dict>
<key>CF$UID</key>
- <integer>97</integer>
+ <integer>96</integer>
</dict>
<key>NSNormalImage</key>
<dict>
<key>CF$UID</key>
- <integer>103</integer>
+ <integer>102</integer>
</dict>
<key>NSPeriodicDelay</key>
<integer>400</integer>
@@ -2626,24 +2625,24 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>114</integer>
+ <integer>113</integer>
</dict>
<key>NSColor</key>
<dict>
<key>CF$UID</key>
- <integer>112</integer>
+ <integer>111</integer>
</dict>
<key>NSImageFlags</key>
<integer>549453824</integer>
<key>NSReps</key>
<dict>
<key>CF$UID</key>
- <integer>105</integer>
+ <integer>104</integer>
</dict>
<key>NSSize</key>
<dict>
<key>CF$UID</key>
- <integer>104</integer>
+ <integer>103</integer>
</dict>
</dict>
<string>{18, 18}</string>
@@ -2651,13 +2650,13 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>98</integer>
+ <integer>97</integer>
</dict>
<key>NS.objects</key>
<array>
<dict>
<key>CF$UID</key>
- <integer>106</integer>
+ <integer>105</integer>
</dict>
</array>
</dict>
@@ -2665,17 +2664,17 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>111</integer>
+ <integer>110</integer>
</dict>
<key>NS.objects</key>
<array>
<dict>
<key>CF$UID</key>
- <integer>107</integer>
+ <integer>106</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>108</integer>
+ <integer>107</integer>
</dict>
</array>
</dict>
@@ -2684,12 +2683,12 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>110</integer>
+ <integer>109</integer>
</dict>
<key>NSTIFFRepresentation</key>
<dict>
<key>CF$UID</key>
- <integer>109</integer>
+ <integer>108</integer>
</dict>
</dict>
<data>
@@ -2837,7 +2836,7 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>113</integer>
+ <integer>112</integer>
</dict>
<key>NSColorSpace</key>
<integer>3</integer>
@@ -2869,22 +2868,22 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>113</integer>
+ <integer>112</integer>
</dict>
<key>NSCatalogName</key>
<dict>
<key>CF$UID</key>
- <integer>116</integer>
+ <integer>115</integer>
</dict>
<key>NSColor</key>
<dict>
<key>CF$UID</key>
- <integer>118</integer>
+ <integer>117</integer>
</dict>
<key>NSColorName</key>
<dict>
<key>CF$UID</key>
- <integer>117</integer>
+ <integer>116</integer>
</dict>
<key>NSColorSpace</key>
<integer>6</integer>
@@ -2895,7 +2894,7 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>113</integer>
+ <integer>112</integer>
</dict>
<key>NSColorSpace</key>
<integer>3</integer>
@@ -2908,7 +2907,7 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>113</integer>
+ <integer>112</integer>
</dict>
<key>NSColorSpace</key>
<integer>3</integer>
@@ -2939,14 +2938,14 @@
<key>NSCell</key>
<dict>
<key>CF$UID</key>
- <integer>123</integer>
+ <integer>122</integer>
</dict>
<key>NSEnabled</key>
<true/>
<key>NSFrame</key>
<dict>
<key>CF$UID</key>
- <integer>122</integer>
+ <integer>121</integer>
</dict>
<key>NSNextResponder</key>
<dict>
@@ -2989,12 +2988,12 @@
<key>NSContents</key>
<dict>
<key>CF$UID</key>
- <integer>124</integer>
+ <integer>123</integer>
</dict>
<key>NSControlView</key>
<dict>
<key>CF$UID</key>
- <integer>121</integer>
+ <integer>120</integer>
</dict>
<key>NSKeyEquivalent</key>
<dict>
@@ -3021,14 +3020,14 @@
<key>NSCell</key>
<dict>
<key>CF$UID</key>
- <integer>127</integer>
+ <integer>126</integer>
</dict>
<key>NSEnabled</key>
<true/>
<key>NSFrame</key>
<dict>
<key>CF$UID</key>
- <integer>126</integer>
+ <integer>125</integer>
</dict>
<key>NSNextResponder</key>
<dict>
@@ -3071,12 +3070,12 @@
<key>NSContents</key>
<dict>
<key>CF$UID</key>
- <integer>128</integer>
+ <integer>127</integer>
</dict>
<key>NSControlView</key>
<dict>
<key>CF$UID</key>
- <integer>125</integer>
+ <integer>124</integer>
</dict>
<key>NSKeyEquivalent</key>
<dict>
@@ -3110,41 +3109,41 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>98</integer>
+ <integer>97</integer>
</dict>
<key>NS.objects</key>
<array>
<dict>
<key>CF$UID</key>
- <integer>133</integer>
+ <integer>132</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>235</integer>
+ <integer>234</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>274</integer>
+ <integer>273</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>425</integer>
+ <integer>424</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>463</integer>
+ <integer>462</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>602</integer>
+ <integer>601</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>703</integer>
+ <integer>702</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>791</integer>
+ <integer>790</integer>
</dict>
</array>
</dict>
@@ -3152,22 +3151,22 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>234</integer>
+ <integer>233</integer>
</dict>
<key>NSColor</key>
<dict>
<key>CF$UID</key>
- <integer>115</integer>
+ <integer>114</integer>
</dict>
<key>NSIdentifier</key>
<dict>
<key>CF$UID</key>
- <integer>134</integer>
+ <integer>133</integer>
</dict>
<key>NSLabel</key>
<dict>
<key>CF$UID</key>
- <integer>233</integer>
+ <integer>232</integer>
</dict>
<key>NSTabView</key>
<dict>
@@ -3193,21 +3192,21 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>98</integer>
+ <integer>97</integer>
</dict>
<key>NS.objects</key>
<array>
<dict>
<key>CF$UID</key>
- <integer>136</integer>
+ <integer>135</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>140</integer>
+ <integer>139</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>144</integer>
+ <integer>143</integer>
</dict>
<dict>
<key>CF$UID</key>
@@ -3223,7 +3222,7 @@
</dict>
<dict>
<key>CF$UID</key>
- <integer>148</integer>
+ <integer>147</integer>
</dict>
<dict>
<key>CF$UID</key>
@@ -3231,19 +3230,19 @@
</dict>
<dict>
<key>CF$UID</key>
- <integer>152</integer>
+ <integer>151</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>220</integer>
+ <integer>219</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>224</integer>
+ <integer>223</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>228</integer>
+ <integer>227</integer>
</dict>
</array>
</dict>
@@ -3256,14 +3255,14 @@
<key>NSCell</key>
<dict>
<key>CF$UID</key>
- <integer>138</integer>
+ <integer>137</integer>
</dict>
<key>NSEnabled</key>
<true/>
<key>NSFrame</key>
<dict>
<key>CF$UID</key>
- <integer>137</integer>
+ <integer>136</integer>
</dict>
<key>NSNextResponder</key>
<dict>
@@ -3306,12 +3305,12 @@
<key>NSContents</key>
<dict>
<key>CF$UID</key>
- <integer>139</integer>
+ <integer>138</integer>
</dict>
<key>NSControlView</key>
<dict>
<key>CF$UID</key>
- <integer>136</integer>
+ <integer>135</integer>
</dict>
<key>NSKeyEquivalent</key>
<dict>
@@ -3338,14 +3337,14 @@
<key>NSCell</key>
<dict>
<key>CF$UID</key>
- <integer>142</integer>
+ <integer>141</integer>
</dict>
<key>NSEnabled</key>
<true/>
<key>NSFrame</key>
<dict>
<key>CF$UID</key>
- <integer>141</integer>
+ <integer>140</integer>
</dict>
<key>NSNextResponder</key>
<dict>
@@ -3388,12 +3387,12 @@
<key>NSContents</key>
<dict>
<key>CF$UID</key>
- <integer>143</integer>
+ <integer>142</integer>
</dict>
<key>NSControlView</key>
<dict>
<key>CF$UID</key>
- <integer>140</integer>
+ <integer>139</integer>
</dict>
<key>NSKeyEquivalent</key>
<dict>
@@ -3420,14 +3419,14 @@
<key>NSCell</key>
<dict>
<key>CF$UID</key>
- <integer>146</integer>
+ <integer>145</integer>
</dict>
<key>NSEnabled</key>
<true/>
<key>NSFrame</key>
<dict>
<key>CF$UID</key>
- <integer>145</integer>
+ <integer>144</integer>
</dict>
<key>NSNextResponder</key>
<dict>
@@ -3470,12 +3469,12 @@
<key>NSContents</key>
<dict>
<key>CF$UID</key>
- <integer>147</integer>
+ <integer>146</integer>
</dict>
<key>NSControlView</key>
<dict>
<key>CF$UID</key>
- <integer>144</integer>
+ <integer>143</integer>
</dict>
<key>NSKeyEquivalent</key>
<dict>
@@ -3502,14 +3501,14 @@
<key>NSCell</key>
<dict>
<key>CF$UID</key>
- <integer>150</integer>
+ <integer>149</integer>
</dict>
<key>NSEnabled</key>
<true/>
<key>NSFrame</key>
<dict>
<key>CF$UID</key>
- <integer>149</integer>
+ <integer>148</integer>
</dict>
<key>NSNextResponder</key>
<dict>
@@ -3552,12 +3551,12 @@
<key>NSContents</key>
<dict>
<key>CF$UID</key>
- <integer>151</integer>
+ <integer>150</integer>
</dict>
<key>NSControlView</key>
<dict>
<key>CF$UID</key>
- <integer>148</integer>
+ <integer>147</integer>
</dict>
<key>NSKeyEquivalent</key>
<dict>
@@ -3579,32 +3578,32 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>219</integer>
+ <integer>218</integer>
</dict>
<key>NSBackgroundColor</key>
<dict>
<key>CF$UID</key>
- <integer>115</integer>
+ <integer>114</integer>
</dict>
<key>NSCellBackgroundColor</key>
<dict>
<key>CF$UID</key>
- <integer>119</integer>
+ <integer>118</integer>
</dict>
<key>NSCellClass</key>
<dict>
<key>CF$UID</key>
- <integer>215</integer>
+ <integer>214</integer>
</dict>
<key>NSCellSize</key>
<dict>
<key>CF$UID</key>
- <integer>213</integer>
+ <integer>212</integer>
</dict>
<key>NSCells</key>
<dict>
<key>CF$UID</key>
- <integer>154</integer>
+ <integer>153</integer>
</dict>
<key>NSEnabled</key>
<true/>
@@ -3616,12 +3615,12 @@
<key>NSFrame</key>
<dict>
<key>CF$UID</key>
- <integer>153</integer>
+ <integer>152</integer>
</dict>
<key>NSIntercellSpacing</key>
<dict>
<key>CF$UID</key>
- <integer>214</integer>
+ <integer>213</integer>
</dict>
<key>NSMatrixFlags</key>
<integer>67633152</integer>
@@ -3637,7 +3636,7 @@
<key>NSProtoCell</key>
<dict>
<key>CF$UID</key>
- <integer>216</integer>
+ <integer>215</integer>
</dict>
<key>NSSelectedCol</key>
<integer>-1</integer>
@@ -3656,17 +3655,17 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>98</integer>
+ <integer>97</integer>
</dict>
<key>NS.objects</key>
<array>
<dict>
<key>CF$UID</key>
- <integer>155</integer>
+ <integer>154</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>196</integer>
+ <integer>195</integer>
</dict>
</array>
</dict>
@@ -3674,7 +3673,7 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>195</integer>
+ <integer>194</integer>
</dict>
<key>NSCellFlags</key>
<integer>343014977</integer>
@@ -3688,12 +3687,12 @@
<key>NSControlView</key>
<dict>
<key>CF$UID</key>
- <integer>152</integer>
+ <integer>151</integer>
</dict>
<key>NSFormatter</key>
<dict>
<key>CF$UID</key>
- <integer>156</integer>
+ <integer>155</integer>
</dict>
<key>NSSupport</key>
<dict>
@@ -3703,7 +3702,7 @@
<key>NSTitleCell</key>
<dict>
<key>CF$UID</key>
- <integer>192</integer>
+ <integer>191</integer>
</dict>
<key>NSTitleWidth</key>
<real>161</real>
@@ -3712,19 +3711,19 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>191</integer>
+ <integer>190</integer>
</dict>
<key>NS.allowsfloats</key>
<true/>
<key>NS.attributes</key>
<dict>
<key>CF$UID</key>
- <integer>157</integer>
+ <integer>156</integer>
</dict>
<key>NS.decimal</key>
<dict>
<key>CF$UID</key>
- <integer>182</integer>
+ <integer>181</integer>
</dict>
<key>NS.hasthousands</key>
<false/>
@@ -3733,17 +3732,17 @@
<key>NS.max</key>
<dict>
<key>CF$UID</key>
- <integer>190</integer>
+ <integer>189</integer>
</dict>
<key>NS.min</key>
<dict>
<key>CF$UID</key>
- <integer>173</integer>
+ <integer>172</integer>
</dict>
<key>NS.nan</key>
<dict>
<key>CF$UID</key>
- <integer>187</integer>
+ <integer>186</integer>
</dict>
<key>NS.negativeattrs</key>
<dict>
@@ -3753,12 +3752,12 @@
<key>NS.negativeformat</key>
<dict>
<key>CF$UID</key>
- <integer>184</integer>
+ <integer>183</integer>
</dict>
<key>NS.nil</key>
<dict>
<key>CF$UID</key>
- <integer>185</integer>
+ <integer>184</integer>
</dict>
<key>NS.positiveattrs</key>
<dict>
@@ -3768,7 +3767,7 @@
<key>NS.positiveformat</key>
<dict>
<key>CF$UID</key>
- <integer>175</integer>
+ <integer>174</integer>
</dict>
<key>NS.rounding</key>
<dict>
@@ -3778,24 +3777,28 @@
<key>NS.thousand</key>
<dict>
<key>CF$UID</key>
- <integer>170</integer>
+ <integer>169</integer>
</dict>
<key>NS.zero</key>
<dict>
<key>CF$UID</key>
- <integer>177</integer>
+ <integer>176</integer>
</dict>
</dict>
<dict>
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>189</integer>
+ <integer>188</integer>
</dict>
<key>NS.keys</key>
<array>
<dict>
<key>CF$UID</key>
+ <integer>157</integer>
+ </dict>
+ <dict>
+ <key>CF$UID</key>
<integer>158</integer>
</dict>
<dict>
@@ -3838,24 +3841,24 @@
<key>CF$UID</key>
<integer>168</integer>
</dict>
+ </array>
+ <key>NS.objects</key>
+ <array>
<dict>
<key>CF$UID</key>
<integer>169</integer>
</dict>
- </array>
- <key>NS.objects</key>
- <array>
<dict>
<key>CF$UID</key>
<integer>170</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>171</integer>
+ <integer>172</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>173</integer>
+ <integer>174</integer>
</dict>
<dict>
<key>CF$UID</key>
@@ -3867,7 +3870,7 @@
</dict>
<dict>
<key>CF$UID</key>
- <integer>177</integer>
+ <integer>181</integer>
</dict>
<dict>
<key>CF$UID</key>
@@ -3889,10 +3892,6 @@
<key>CF$UID</key>
<integer>186</integer>
</dict>
- <dict>
- <key>CF$UID</key>
- <integer>187</integer>
- </dict>
</array>
</dict>
<string>groupingSeparator</string>
@@ -3912,7 +3911,7 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>172</integer>
+ <integer>171</integer>
</dict>
<key>NS.identifier</key>
<dict>
@@ -3933,7 +3932,7 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>174</integer>
+ <integer>173</integer>
</dict>
<key>NS.compact</key>
<true/>
@@ -3943,7 +3942,7 @@
<integer>1</integer>
<key>NS.mantissa</key>
<data>
- AQCAAbgAAAAAAIABAFuBkA==
+ AQCUFzArChY42P+/lpKlkA==
</data>
<key>NS.mantissa.bo</key>
<integer>1</integer>
@@ -3965,17 +3964,17 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>181</integer>
+ <integer>180</integer>
</dict>
<key>NSAttributes</key>
<dict>
<key>CF$UID</key>
- <integer>179</integer>
+ <integer>178</integer>
</dict>
<key>NSString</key>
<dict>
<key>CF$UID</key>
- <integer>178</integer>
+ <integer>177</integer>
</dict>
</dict>
<string>0%</string>
@@ -3983,7 +3982,7 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>180</integer>
+ <integer>179</integer>
</dict>
<key>NS.keys</key>
<array/>
@@ -4015,7 +4014,7 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>181</integer>
+ <integer>180</integer>
</dict>
<key>NSString</key>
<dict>
@@ -4028,17 +4027,17 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>181</integer>
+ <integer>180</integer>
</dict>
<key>NSAttributes</key>
<dict>
<key>CF$UID</key>
- <integer>179</integer>
+ <integer>178</integer>
</dict>
<key>NSString</key>
<dict>
<key>CF$UID</key>
- <integer>188</integer>
+ <integer>187</integer>
</dict>
</dict>
<string>NaN</string>
@@ -4056,7 +4055,7 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>174</integer>
+ <integer>173</integer>
</dict>
<key>NS.compact</key>
<false/>
@@ -4066,7 +4065,7 @@
<integer>0</integer>
<key>NS.mantissa</key>
<data>
- AACAAbgAAAAAAIABAFuBkA==
+ oGiUFzArChaI2f+/lpKlkA==
</data>
<key>NS.mantissa.bo</key>
<integer>1</integer>
@@ -4087,7 +4086,7 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>194</integer>
+ <integer>193</integer>
</dict>
<key>NSCellFlags</key>
<integer>67239424</integer>
@@ -4096,7 +4095,7 @@
<key>NSContents</key>
<dict>
<key>CF$UID</key>
- <integer>193</integer>
+ <integer>192</integer>
</dict>
<key>NSSupport</key>
<dict>
@@ -4129,7 +4128,7 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>195</integer>
+ <integer>194</integer>
</dict>
<key>NSCellFlags</key>
<integer>343014977</integer>
@@ -4138,17 +4137,17 @@
<key>NSContents</key>
<dict>
<key>CF$UID</key>
- <integer>197</integer>
+ <integer>196</integer>
</dict>
<key>NSControlView</key>
<dict>
<key>CF$UID</key>
- <integer>152</integer>
+ <integer>151</integer>
</dict>
<key>NSFormatter</key>
<dict>
<key>CF$UID</key>
- <integer>198</integer>
+ <integer>197</integer>
</dict>
<key>NSSupport</key>
<dict>
@@ -4160,7 +4159,7 @@
<key>NSTitleCell</key>
<dict>
<key>CF$UID</key>
- <integer>211</integer>
+ <integer>210</integer>
</dict>
<key>NSTitleWidth</key>
<real>161</real>
@@ -4178,19 +4177,19 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>191</integer>
+ <integer>190</integer>
</dict>
<key>NS.allowsfloats</key>
<true/>
<key>NS.attributes</key>
<dict>
<key>CF$UID</key>
- <integer>199</integer>
+ <integer>198</integer>
</dict>
<key>NS.decimal</key>
<dict>
<key>CF$UID</key>
- <integer>182</integer>
+ <integer>181</integer>
</dict>
<key>NS.hasthousands</key>
<false/>
@@ -4199,17 +4198,17 @@
<key>NS.max</key>
<dict>
<key>CF$UID</key>
- <integer>208</integer>
+ <integer>207</integer>
</dict>
<key>NS.min</key>
<dict>
<key>CF$UID</key>
- <integer>201</integer>
+ <integer>200</integer>
</dict>
<key>NS.nan</key>
<dict>
<key>CF$UID</key>
- <integer>209</integer>
+ <integer>208</integer>
</dict>
<key>NS.negativeattrs</key>
<dict>
@@ -4219,12 +4218,12 @@
<key>NS.negativeformat</key>
<dict>
<key>CF$UID</key>
- <integer>206</integer>
+ <integer>205</integer>
</dict>
<key>NS.nil</key>
<dict>
<key>CF$UID</key>
- <integer>207</integer>
+ <integer>206</integer>
</dict>
<key>NS.positiveattrs</key>
<dict>
@@ -4234,7 +4233,7 @@
<key>NS.positiveformat</key>
<dict>
<key>CF$UID</key>
- <integer>202</integer>
+ <integer>201</integer>
</dict>
<key>NS.rounding</key>
<dict>
@@ -4244,24 +4243,28 @@
<key>NS.thousand</key>
<dict>
<key>CF$UID</key>
- <integer>170</integer>
+ <integer>169</integer>
</dict>
<key>NS.zero</key>
<dict>
<key>CF$UID</key>
- <integer>204</integer>
+ <integer>203</integer>
</dict>
</dict>
<dict>
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>189</integer>
+ <integer>188</integer>
</dict>
<key>NS.keys</key>
<array>
<dict>
<key>CF$UID</key>
+ <integer>157</integer>
+ </dict>
+ <dict>
+ <key>CF$UID</key>
<integer>158</integer>
</dict>
<dict>
@@ -4298,30 +4301,30 @@
</dict>
<dict>
<key>CF$UID</key>
- <integer>167</integer>
+ <integer>199</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>200</integer>
+ <integer>167</integer>
</dict>
<dict>
<key>CF$UID</key>
<integer>168</integer>
</dict>
+ </array>
+ <key>NS.objects</key>
+ <array>
<dict>
<key>CF$UID</key>
<integer>169</integer>
</dict>
- </array>
- <key>NS.objects</key>
- <array>
<dict>
<key>CF$UID</key>
<integer>170</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>171</integer>
+ <integer>200</integer>
</dict>
<dict>
<key>CF$UID</key>
@@ -4337,7 +4340,7 @@
</dict>
<dict>
<key>CF$UID</key>
- <integer>204</integer>
+ <integer>181</integer>
</dict>
<dict>
<key>CF$UID</key>
@@ -4345,7 +4348,7 @@
</dict>
<dict>
<key>CF$UID</key>
- <integer>183</integer>
+ <integer>205</integer>
</dict>
<dict>
<key>CF$UID</key>
@@ -4357,16 +4360,12 @@
</dict>
<dict>
<key>CF$UID</key>
- <integer>208</integer>
+ <integer>185</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>186</integer>
+ <integer>208</integer>
</dict>
- <dict>
- <key>CF$UID</key>
- <integer>209</integer>
- </dict>
</array>
</dict>
<string>maximum</string>
@@ -4374,7 +4373,7 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>174</integer>
+ <integer>173</integer>
</dict>
<key>NS.compact</key>
<true/>
@@ -4384,7 +4383,7 @@
<integer>1</integer>
<key>NS.mantissa</key>
<data>
- AQCAAbgAAAAAAIABAFuBkA==
+ AQCAAbgAAAAAAIABTIeBkA==
</data>
<key>NS.mantissa.bo</key>
<integer>1</integer>
@@ -4397,17 +4396,17 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>181</integer>
+ <integer>180</integer>
</dict>
<key>NSAttributes</key>
<dict>
<key>CF$UID</key>
- <integer>179</integer>
+ <integer>178</integer>
</dict>
<key>NSString</key>
<dict>
<key>CF$UID</key>
- <integer>205</integer>
+ <integer>204</integer>
</dict>
</dict>
<string>0</string>
@@ -4416,7 +4415,7 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>181</integer>
+ <integer>180</integer>
</dict>
<key>NSString</key>
<dict>
@@ -4428,7 +4427,7 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>174</integer>
+ <integer>173</integer>
</dict>
<key>NS.compact</key>
<true/>
@@ -4438,7 +4437,7 @@
<integer>1</integer>
<key>NS.mantissa</key>
<data>
- BQCAAbgAAAAAAIABAFuBkA==
+ BQCAAbgAAAAAAIABTIeBkA==
</data>
<key>NS.mantissa.bo</key>
<integer>1</integer>
@@ -4449,17 +4448,17 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>181</integer>
+ <integer>180</integer>
</dict>
<key>NSAttributes</key>
<dict>
<key>CF$UID</key>
- <integer>179</integer>
+ <integer>178</integer>
</dict>
<key>NSString</key>
<dict>
<key>CF$UID</key>
- <integer>210</integer>
+ <integer>209</integer>
</dict>
</dict>
<string>NaN</string>
@@ -4467,7 +4466,7 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>194</integer>
+ <integer>193</integer>
</dict>
<key>NSCellFlags</key>
<integer>67239424</integer>
@@ -4476,7 +4475,7 @@
<key>NSContents</key>
<dict>
<key>CF$UID</key>
- <integer>212</integer>
+ <integer>211</integer>
</dict>
<key>NSSupport</key>
<dict>
@@ -4492,7 +4491,7 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>195</integer>
+ <integer>194</integer>
</dict>
<key>NSCellFlags</key>
<integer>343014976</integer>
@@ -4511,7 +4510,7 @@
<key>NSTitleCell</key>
<dict>
<key>CF$UID</key>
- <integer>217</integer>
+ <integer>216</integer>
</dict>
<key>NSTitleWidth</key>
<real>161</real>
@@ -4520,7 +4519,7 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>194</integer>
+ <integer>193</integer>
</dict>
<key>NSCellFlags</key>
<integer>67239424</integer>
@@ -4529,7 +4528,7 @@
<key>NSContents</key>
<dict>
<key>CF$UID</key>
- <integer>218</integer>
+ <integer>217</integer>
</dict>
<key>NSSupport</key>
<dict>
@@ -4561,14 +4560,14 @@
<key>NSCell</key>
<dict>
<key>CF$UID</key>
- <integer>222</integer>
+ <integer>221</integer>
</dict>
<key>NSEnabled</key>
<true/>
<key>NSFrame</key>
<dict>
<key>CF$UID</key>
- <integer>221</integer>
+ <integer>220</integer>
</dict>
<key>NSNextResponder</key>
<dict>
@@ -4611,12 +4610,12 @@
<key>NSContents</key>
<dict>
<key>CF$UID</key>
- <integer>223</integer>
+ <integer>222</integer>
</dict>
<key>NSControlView</key>
<dict>
<key>CF$UID</key>
- <integer>220</integer>
+ <integer>219</integer>
</dict>
<key>NSKeyEquivalent</key>
<dict>
@@ -4643,14 +4642,14 @@
<key>NSCell</key>
<dict>
<key>CF$UID</key>
- <integer>226</integer>
+ <integer>225</integer>
</dict>
<key>NSEnabled</key>
<true/>
<key>NSFrame</key>
<dict>
<key>CF$UID</key>
- <integer>225</integer>
+ <integer>224</integer>
</dict>
<key>NSNextResponder</key>
<dict>
@@ -4693,12 +4692,12 @@
<key>NSContents</key>
<dict>
<key>CF$UID</key>
- <integer>227</integer>
+ <integer>226</integer>
</dict>
<key>NSControlView</key>
<dict>
<key>CF$UID</key>
- <integer>224</integer>
+ <integer>223</integer>
</dict>
<key>NSKeyEquivalent</key>
<dict>
@@ -4725,14 +4724,14 @@
<key>NSCell</key>
<dict>
<key>CF$UID</key>
- <integer>230</integer>
+ <integer>229</integer>
</dict>
<key>NSEnabled</key>
<true/>
<key>NSFrame</key>
<dict>
<key>CF$UID</key>
- <integer>229</integer>
+ <integer>228</integer>
</dict>
<key>NSNextResponder</key>
<dict>
@@ -4775,12 +4774,12 @@
<key>NSContents</key>
<dict>
<key>CF$UID</key>
- <integer>231</integer>
+ <integer>230</integer>
</dict>
<key>NSControlView</key>
<dict>
<key>CF$UID</key>
- <integer>228</integer>
+ <integer>227</integer>
</dict>
<key>NSKeyEquivalent</key>
<dict>
@@ -4813,22 +4812,22 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>234</integer>
+ <integer>233</integer>
</dict>
<key>NSColor</key>
<dict>
<key>CF$UID</key>
- <integer>115</integer>
+ <integer>114</integer>
</dict>
<key>NSIdentifier</key>
<dict>
<key>CF$UID</key>
- <integer>236</integer>
+ <integer>235</integer>
</dict>
<key>NSLabel</key>
<dict>
<key>CF$UID</key>
- <integer>273</integer>
+ <integer>272</integer>
</dict>
<key>NSTabView</key>
<dict>
@@ -4838,7 +4837,7 @@
<key>NSView</key>
<dict>
<key>CF$UID</key>
- <integer>237</integer>
+ <integer>236</integer>
</dict>
</dict>
<dict>
@@ -4854,12 +4853,12 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>130</integer>
+ <integer>129</integer>
</dict>
<key>NSFrame</key>
<dict>
<key>CF$UID</key>
- <integer>272</integer>
+ <integer>271</integer>
</dict>
<key>NSNextResponder</key>
<dict>
@@ -4869,40 +4868,40 @@
<key>NSSubviews</key>
<dict>
<key>CF$UID</key>
- <integer>238</integer>
+ <integer>237</integer>
</dict>
</dict>
<dict>
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>98</integer>
+ <integer>97</integer>
</dict>
<key>NS.objects</key>
<array>
<dict>
<key>CF$UID</key>
- <integer>239</integer>
+ <integer>238</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>243</integer>
+ <integer>242</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>247</integer>
+ <integer>246</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>251</integer>
+ <integer>250</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>259</integer>
+ <integer>258</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>263</integer>
+ <integer>262</integer>
</dict>
</array>
</dict>
@@ -4915,24 +4914,24 @@
<key>NSCell</key>
<dict>
<key>CF$UID</key>
- <integer>241</integer>
+ <integer>240</integer>
</dict>
<key>NSEnabled</key>
<true/>
<key>NSFrame</key>
<dict>
<key>CF$UID</key>
- <integer>240</integer>
+ <integer>239</integer>
</dict>
<key>NSNextResponder</key>
<dict>
<key>CF$UID</key>
- <integer>237</integer>
+ <integer>236</integer>
</dict>
<key>NSSuperview</key>
<dict>
<key>CF$UID</key>
- <integer>237</integer>
+ <integer>236</integer>
</dict>
<key>NSvFlags</key>
<integer>256</integer>
@@ -4965,12 +4964,12 @@
<key>NSContents</key>
<dict>
<key>CF$UID</key>
- <integer>242</integer>
+ <integer>241</integer>
</dict>
<key>NSControlView</key>
<dict>
<key>CF$UID</key>
- <integer>239</integer>
+ <integer>238</integer>
</dict>
<key>NSKeyEquivalent</key>
<dict>
@@ -4997,24 +4996,24 @@
<key>NSCell</key>
<dict>
<key>CF$UID</key>
- <integer>245</integer>
+ <integer>244</integer>
</dict>
<key>NSEnabled</key>
<true/>
<key>NSFrame</key>
<dict>
<key>CF$UID</key>
- <integer>244</integer>
+ <integer>243</integer>
</dict>
<key>NSNextResponder</key>
<dict>
<key>CF$UID</key>
- <integer>237</integer>
+ <integer>236</integer>
</dict>
<key>NSSuperview</key>
<dict>
<key>CF$UID</key>
- <integer>237</integer>
+ <integer>236</integer>
</dict>
<key>NSvFlags</key>
<integer>256</integer>
@@ -5047,12 +5046,12 @@
<key>NSContents</key>
<dict>
<key>CF$UID</key>
- <integer>246</integer>
+ <integer>245</integer>
</dict>
<key>NSControlView</key>
<dict>
<key>CF$UID</key>
- <integer>243</integer>
+ <integer>242</integer>
</dict>
<key>NSKeyEquivalent</key>
<dict>
@@ -5079,24 +5078,24 @@
<key>NSCell</key>
<dict>
<key>CF$UID</key>
- <integer>249</integer>
+ <integer>248</integer>
</dict>
<key>NSEnabled</key>
<true/>
<key>NSFrame</key>
<dict>
<key>CF$UID</key>
- <integer>248</integer>
+ <integer>247</integer>
</dict>
<key>NSNextResponder</key>
<dict>
<key>CF$UID</key>
- <integer>237</integer>
+ <integer>236</integer>
</dict>
<key>NSSuperview</key>
<dict>
<key>CF$UID</key>
- <integer>237</integer>
+ <integer>236</integer>
</dict>
<key>NSvFlags</key>
<integer>256</integer>
@@ -5129,12 +5128,12 @@
<key>NSContents</key>
<dict>
<key>CF$UID</key>
- <integer>250</integer>
+ <integer>249</integer>
</dict>
<key>NSControlView</key>
<dict>
<key>CF$UID</key>
- <integer>247</integer>
+ <integer>246</integer>
</dict>
<key>NSKeyEquivalent</key>
<dict>
@@ -5156,29 +5155,29 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>258</integer>
+ <integer>257</integer>
</dict>
<key>NSCell</key>
<dict>
<key>CF$UID</key>
- <integer>253</integer>
+ <integer>252</integer>
</dict>
<key>NSEnabled</key>
<true/>
<key>NSFrame</key>
<dict>
<key>CF$UID</key>
- <integer>252</integer>
+ <integer>251</integer>
</dict>
<key>NSNextResponder</key>
<dict>
<key>CF$UID</key>
- <integer>237</integer>
+ <integer>236</integer>
</dict>
<key>NSSuperview</key>
<dict>
<key>CF$UID</key>
- <integer>237</integer>
+ <integer>236</integer>
</dict>
<key>NSvFlags</key>
<integer>256</integer>
@@ -5188,7 +5187,7 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>257</integer>
+ <integer>256</integer>
</dict>
<key>NSAllowsTickMarkValuesOnly</key>
<true/>
@@ -5201,12 +5200,12 @@
<key>NSContents</key>
<dict>
<key>CF$UID</key>
- <integer>254</integer>
+ <integer>253</integer>
</dict>
<key>NSControlView</key>
<dict>
<key>CF$UID</key>
- <integer>251</integer>
+ <integer>250</integer>
</dict>
<key>NSMaxValue</key>
<real>8</real>
@@ -5217,7 +5216,7 @@
<key>NSSupport</key>
<dict>
<key>CF$UID</key>
- <integer>255</integer>
+ <integer>254</integer>
</dict>
<key>NSTickMarkPosition</key>
<integer>0</integer>
@@ -5244,7 +5243,7 @@
<key>NSName</key>
<dict>
<key>CF$UID</key>
- <integer>256</integer>
+ <integer>255</integer>
</dict>
<key>NSSize</key>
<real>12</real>
@@ -5284,24 +5283,24 @@
<key>NSCell</key>
<dict>
<key>CF$UID</key>
- <integer>261</integer>
+ <integer>260</integer>
</dict>
<key>NSEnabled</key>
<true/>
<key>NSFrame</key>
<dict>
<key>CF$UID</key>
- <integer>260</integer>
+ <integer>259</integer>
</dict>
<key>NSNextResponder</key>
<dict>
<key>CF$UID</key>
- <integer>237</integer>
+ <integer>236</integer>
</dict>
<key>NSSuperview</key>
<dict>
<key>CF$UID</key>
- <integer>237</integer>
+ <integer>236</integer>
</dict>
<key>NSvFlags</key>
<integer>256</integer>
@@ -5334,12 +5333,12 @@
<key>NSContents</key>
<dict>
<key>CF$UID</key>
- <integer>262</integer>
+ <integer>261</integer>
</dict>
<key>NSControlView</key>
<dict>
<key>CF$UID</key>
- <integer>259</integer>
+ <integer>258</integer>
</dict>
<key>NSKeyEquivalent</key>
<dict>
@@ -5361,29 +5360,29 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>271</integer>
+ <integer>270</integer>
</dict>
<key>NSCell</key>
<dict>
<key>CF$UID</key>
- <integer>265</integer>
+ <integer>264</integer>
</dict>
<key>NSEnabled</key>
<true/>
<key>NSFrame</key>
<dict>
<key>CF$UID</key>
- <integer>264</integer>
+ <integer>263</integer>
</dict>
<key>NSNextResponder</key>
<dict>
<key>CF$UID</key>
- <integer>237</integer>
+ <integer>236</integer>
</dict>
<key>NSSuperview</key>
<dict>
<key>CF$UID</key>
- <integer>237</integer>
+ <integer>236</integer>
</dict>
<key>NSvFlags</key>
<integer>256</integer>
@@ -5393,12 +5392,12 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>270</integer>
+ <integer>269</integer>
</dict>
<key>NSBackgroundColor</key>
<dict>
<key>CF$UID</key>
- <integer>115</integer>
+ <integer>114</integer>
</dict>
<key>NSCellFlags</key>
<integer>67239424</integer>
@@ -5407,12 +5406,12 @@
<key>NSContents</key>
<dict>
<key>CF$UID</key>
- <integer>266</integer>
+ <integer>265</integer>
</dict>
<key>NSControlView</key>
<dict>
<key>CF$UID</key>
- <integer>263</integer>
+ <integer>262</integer>
</dict>
<key>NSSupport</key>
<dict>
@@ -5422,7 +5421,7 @@
<key>NSTextColor</key>
<dict>
<key>CF$UID</key>
- <integer>267</integer>
+ <integer>266</integer>
</dict>
</dict>
<string>Volume</string>
@@ -5430,22 +5429,22 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>113</integer>
+ <integer>112</integer>
</dict>
<key>NSCatalogName</key>
<dict>
<key>CF$UID</key>
- <integer>116</integer>
+ <...
[truncated message content] |
|
From: <fr...@us...> - 2007-04-15 13:02:42
|
Revision: 360
http://svn.sourceforge.net/fuse-for-macosx/?rev=360&view=rev
Author: fredm
Date: 2007-04-15 06:02:43 -0700 (Sun, 15 Apr 2007)
Log Message:
-----------
Fix debugger stack display, tweak debugger window size to avoid stack
and disassembler windows having scrollbars.
Modified Paths:
--------------
branches/Release-0_8_0/fuse/fusepb/controllers/DebuggerController.m
branches/Release-0_8_0/fuse/fusepb/nibs/Debugger.nib/info.nib
branches/Release-0_8_0/fuse/fusepb/nibs/Debugger.nib/keyedobjects.nib
Modified: branches/Release-0_8_0/fuse/fusepb/controllers/DebuggerController.m
===================================================================
--- branches/Release-0_8_0/fuse/fusepb/controllers/DebuggerController.m 2007-04-15 12:57:58 UTC (rev 359)
+++ branches/Release-0_8_0/fuse/fusepb/controllers/DebuggerController.m 2007-04-15 13:02:43 UTC (rev 360)
@@ -387,7 +387,7 @@
[stackContents retain];
- for( address = SP + 38; address >= SP; address -= 2 ) {
+ for( i = 0, address = SP + 38; i < 20; i++, address -= 2 ) {
libspectrum_word contents = readbyte_internal( address ) +
0x100 * readbyte_internal( address + 1 );
Modified: branches/Release-0_8_0/fuse/fusepb/nibs/Debugger.nib/info.nib
===================================================================
--- branches/Release-0_8_0/fuse/fusepb/nibs/Debugger.nib/info.nib 2007-04-15 12:57:58 UTC (rev 359)
+++ branches/Release-0_8_0/fuse/fusepb/nibs/Debugger.nib/info.nib 2007-04-15 13:02:43 UTC (rev 360)
@@ -3,9 +3,9 @@
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
- <string>18 4 356 240 0 0 1024 746 </string>
+ <string>29 5 356 240 0 0 1440 878 </string>
<key>IBFramework Version</key>
- <string>364.0</string>
+ <string>446.1</string>
<key>IBGroupedObjects</key>
<dict>
<key>13</key>
@@ -41,6 +41,6 @@
<integer>5</integer>
</array>
<key>IBSystem Version</key>
- <string>7H63</string>
+ <string>8P2137</string>
</dict>
</plist>
Modified: branches/Release-0_8_0/fuse/fusepb/nibs/Debugger.nib/keyedobjects.nib
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2007-04-15 12:57:57
|
Revision: 359
http://svn.sourceforge.net/fuse-for-macosx/?rev=359&view=rev
Author: fredm
Date: 2007-04-15 05:57:58 -0700 (Sun, 15 Apr 2007)
Log Message:
-----------
Belated 0.8.0 updates plus Spotlight Importer documentation.
Modified Paths:
--------------
branches/Release-0_8_0/fuse/fusepb/resources/Fuse Help/html/changelog.html
branches/Release-0_8_0/fuse/fusepb/resources/Fuse Help/html/tocstart.html
Added Paths:
-----------
branches/Release-0_8_0/fuse/fusepb/resources/Fuse Help/html/spotlight.html
Modified: branches/Release-0_8_0/fuse/fusepb/resources/Fuse Help/html/changelog.html
===================================================================
--- branches/Release-0_8_0/fuse/fusepb/resources/Fuse Help/html/changelog.html 2007-04-11 21:19:42 UTC (rev 358)
+++ branches/Release-0_8_0/fuse/fusepb/resources/Fuse Help/html/changelog.html 2007-04-15 12:57:58 UTC (rev 359)
@@ -11,10 +11,10 @@
<body>
<font face="Lucida Grande,Helvetica,Arial">
<!-- AppleSegStart="What's New In Fuse?" --><a
- name="What's New In Fuse?" id="What's New In Fuse?"></a><!-- AppleSegDescription="This section describes the changes for version ?.?.? of the Fuse emulator." --></font>
+ name="What's New In Fuse?" id="What's New In Fuse?"></a><!-- AppleSegDescription="This section describes the changes for version 0.8.0 of the Fuse emulator." --></font>
<div class="refsect1" xml:lang="en" lang="en">
<h2><font face="Lucida Grande,Helvetica,Arial">What's new in Fuse
-For Mac OS X 0.8.0-pre1</font></h2>
+For Mac OS X 0.8.0</font></h2>
</div>
<ul>
<li><font face="Lucida Grande,Helvetica,Arial">New
Added: branches/Release-0_8_0/fuse/fusepb/resources/Fuse Help/html/spotlight.html
===================================================================
--- branches/Release-0_8_0/fuse/fusepb/resources/Fuse Help/html/spotlight.html (rev 0)
+++ branches/Release-0_8_0/fuse/fusepb/resources/Fuse Help/html/spotlight.html 2007-04-15 12:57:58 UTC (rev 359)
@@ -0,0 +1,55 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<!-- AppleSegStart="Spotlight Importer" -->
+</head>
+<body>
+<font face="Lucida Grande,Helvetica,Arial"><a name="Spotlight Importer"></a><!-- AppleSegDescription="This section describes Fuses support of the Spotlight feature of Mac OS X 10.4 and newer." --></font>
+<h2><font face="Lucida Grande,Helvetica,Arial">Spotlight Importer</font></h2>
+<p><font face="Lucida Grande,Helvetica,Arial">On Mac OS X 10.4 and
+newer, the Fuse Spotlight importer allows Spotlight to find ZX Spectrum
+emulation related files based on metadata in the files. The metadata
+supported is:<br>
+</font></p>
+<h3><font face="Lucida Grande,Helvetica,Arial">TZX Tape images</font></h3>
+<p><font face="Lucida Grande,Helvetica,Arial">Title, publishers,
+authors, year of release, languages, category, original price, loader,
+origin, comment, audio channel count, supported machines and
+peripherals.<br>
+</font></p>
+<h3><font face="Lucida Grande,Helvetica,Arial">Snapshots (SZX, Z80,
+SNA, etc.)</font></h3>
+<p><font face="Lucida Grande,Helvetica,Arial">Machine type, and status
+of the enabled joysticks (Kempston, Cursor, Sinclair, Timex and
+Fuller), ZXATASP and ZXCF IDE peripherals, and the Interface II and
+Timex dock cartridges.<br>
+</font></p>
+<h3><font face="Lucida Grande,Helvetica,Arial">RZX Spectrum recordings</font></h3>
+<p><font face="Lucida Grande,Helvetica,Arial">As snapshots above.<br>
+</font></p>
+<h3><font face="Lucida Grande,Helvetica,Arial">SCR Screen dumps</font></h3>
+<p><font face="Lucida Grande,Helvetica,Arial">Graphics mode, width,
+height, orientation, colour space<br>
+</font></p>
+<h3><font face="Lucida Grande,Helvetica,Arial">Custom Metadata
+Attribute Details</font></h3>
+<p><font face="Lucida Grande,Helvetica,Arial">There are several
+Fuse-specific metadata attributes added by this importer, detailed
+below:<br>
+Category: type of software (arcade adventure, puzzle, word processor,
+...)<br>
+Price: the original price the software sold for (includes currency)<br>
+Loader: protection scheme used in the title (Speedlock 1, Alkatraz, ...)<br>
+Origin: (Original, Budget re-release, ...)<br>
+Machine: (Spectrum 16K, 48K (Issue 1), 48K, 128K, +2, +2A, +3, SE,
+Timex TC2048, Timex TC2068, Timex TS2068, Scorpion ZS 256, Pentagon 128K<br>
+Peripherals: <br>
+</font></p>
+<div style="margin-left: 40px;"><font
+ face="Lucida Grande,Helvetica,Arial">Joysticks: Kempston, Cursor,
+Sinclair 1, Sinclair 2, Timex 1, Timex 2, Fuller</font><br>
+</div>
+<p><font face="Lucida Grande,Helvetica,Arial">GraphicsMode: Standard,
+HiColour, HiRes</font></p>
+</body>
+</html>
Modified: branches/Release-0_8_0/fuse/fusepb/resources/Fuse Help/html/tocstart.html
===================================================================
--- branches/Release-0_8_0/fuse/fusepb/resources/Fuse Help/html/tocstart.html 2007-04-11 21:19:42 UTC (rev 358)
+++ branches/Release-0_8_0/fuse/fusepb/resources/Fuse Help/html/tocstart.html 2007-04-15 12:57:58 UTC (rev 359)
@@ -72,7 +72,12 @@
<p> <font face="Lucida Grande,Helvetica,Arial"> <a
href="trdos.html">TR-DOS Disk Formats</a> </font> </p>
<p> <font face="Lucida Grande,Helvetica,Arial"> <a
- href="compressed.html">Compressed Files</a> </font> </p>
+ href="compressed.html">Compressed Files</a><br>
+ </font><font face="Lucida Grande,Helvetica,Arial"> </font> </p>
+ <p> <font face="Lucida Grande,Helvetica,Arial"> <a
+ href="spotlight.html">Spotlight Importer</a> </font> </p>
+ <p><br>
+ </p>
</td>
<td colspan="3">
<p><font face="Lucida Grande,Helvetica,Arial">Click a topic to
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2007-04-11 21:20:34
|
Revision: 358
http://svn.sourceforge.net/fuse-for-macosx/?rev=358&view=rev
Author: fredm
Date: 2007-04-11 14:19:42 -0700 (Wed, 11 Apr 2007)
Log Message:
-----------
Add GNU style changelog.
Added Paths:
-----------
tags/Release-0_8_0/ChangeLog
Added: tags/Release-0_8_0/ChangeLog
===================================================================
--- tags/Release-0_8_0/ChangeLog (rev 0)
+++ tags/Release-0_8_0/ChangeLog 2007-04-11 21:19:42 UTC (rev 358)
@@ -0,0 +1,3746 @@
+2007-04-11 13:28 fredm
+
+ * .: Create Release-0_8_0 tag.
+
+2007-04-11 13:22 fredm
+
+ * branches/Release-0_8_0/bzip2/English.lproj/InfoPlist.strings,
+ branches/Release-0_8_0/bzip2/Info.plist,
+ branches/Release-0_8_0/bzip2/bzip2/CHANGES,
+ branches/Release-0_8_0/bzip2/bzip2/LICENSE,
+ branches/Release-0_8_0/bzip2/bzip2/Makefile,
+ branches/Release-0_8_0/bzip2/bzip2/Makefile-libbz2_so,
+ branches/Release-0_8_0/bzip2/bzip2/README,
+ branches/Release-0_8_0/bzip2/bzip2/README.COMPILATION.PROBLEMS,
+ branches/Release-0_8_0/bzip2/bzip2/README.XML.STUFF,
+ branches/Release-0_8_0/bzip2/bzip2/Y2K_INFO,
+ branches/Release-0_8_0/bzip2/bzip2/blocksort.c,
+ branches/Release-0_8_0/bzip2/bzip2/bz-fo.xsl,
+ branches/Release-0_8_0/bzip2/bzip2/bzdiff,
+ branches/Release-0_8_0/bzip2/bzip2/bzgrep,
+ branches/Release-0_8_0/bzip2/bzip2/bzip2.1,
+ branches/Release-0_8_0/bzip2/bzip2/bzip2.1.preformatted,
+ branches/Release-0_8_0/bzip2/bzip2/bzip2.c,
+ branches/Release-0_8_0/bzip2/bzip2/bzip2.txt,
+ branches/Release-0_8_0/bzip2/bzip2/bzip2recover.c,
+ branches/Release-0_8_0/bzip2/bzip2/bzlib.c,
+ branches/Release-0_8_0/bzip2/bzip2/bzlib.h,
+ branches/Release-0_8_0/bzip2/bzip2/bzlib_private.h,
+ branches/Release-0_8_0/bzip2/bzip2/compress.c,
+ branches/Release-0_8_0/bzip2/bzip2/crctable.c,
+ branches/Release-0_8_0/bzip2/bzip2/decompress.c,
+ branches/Release-0_8_0/bzip2/bzip2/dlltest.c,
+ branches/Release-0_8_0/bzip2/bzip2/entities.xml,
+ branches/Release-0_8_0/bzip2/bzip2/format.pl,
+ branches/Release-0_8_0/bzip2/bzip2/huffman.c,
+ branches/Release-0_8_0/bzip2/bzip2/manual.html,
+ branches/Release-0_8_0/bzip2/bzip2/manual.pdf,
+ branches/Release-0_8_0/bzip2/bzip2/manual.ps,
+ branches/Release-0_8_0/bzip2/bzip2/manual.xml,
+ branches/Release-0_8_0/bzip2/bzip2/mk251.c,
+ branches/Release-0_8_0/bzip2/bzip2/randtable.c,
+ branches/Release-0_8_0/bzip2/bzip2/spewG.c,
+ branches/Release-0_8_0/bzip2/bzip2/unzcrash.c,
+ branches/Release-0_8_0/bzip2/bzip2/words0,
+ branches/Release-0_8_0/bzip2/bzip2/words2,
+ branches/Release-0_8_0/bzip2/bzip2/words3,
+ branches/Release-0_8_0/bzip2/bzip2/xmlproc.sh: Merge up to
+ bzip2-1.0.4
+
+2007-04-11 12:59 fredm
+
+ * branches/Release-0_8_0/fuse/ChangeLog,
+ branches/Release-0_8_0/fuse/README,
+ branches/Release-0_8_0/fuse/configure.in,
+ branches/Release-0_8_0/fuse/fuse.cpp,
+ branches/Release-0_8_0/fuse/fusepb/English.lproj/InfoPlist.strings,
+ branches/Release-0_8_0/fuse/fusepb/Info-Fuse.plist,
+ branches/Release-0_8_0/fuse/fusepb/config.h,
+ branches/Release-0_8_0/fuse/fusepb/controllers/FuseController.m,
+ branches/Release-0_8_0/fuse/hacking/ChangeLog,
+ branches/Release-0_8_0/fuse/hacking/cvs-tags,
+ branches/Release-0_8_0/fuse/man/fuse.1,
+ branches/Release-0_8_0/fuse/rzx.c: Merge up to fuse-0.8.0
+
+2007-04-11 12:33 fredm
+
+ * branches/Release-0_8_0/libspectrum/Info.plist,
+ branches/Release-0_8_0/libspectrum/libspectrum.xcodeproj/project.pbxproj,
+ branches/Release-0_8_0/libspectrum/libspectrum/ChangeLog,
+ branches/Release-0_8_0/libspectrum/libspectrum/Makefile.am,
+ branches/Release-0_8_0/libspectrum/libspectrum/README,
+ branches/Release-0_8_0/libspectrum/libspectrum/configure.in,
+ branches/Release-0_8_0/libspectrum/libspectrum/doc/cvs-tags,
+ branches/Release-0_8_0/libspectrum/libspectrum/doc/libspectrum.3,
+ branches/Release-0_8_0/libspectrum/libspectrum/hacking/ChangeLog,
+ branches/Release-0_8_0/libspectrum/libspectrum/internals.h,
+ branches/Release-0_8_0/libspectrum/libspectrum/z80.c: Merge up to
+ libspectrum-0.3.0
+
+2007-04-09 11:42 fredm
+
+ * branches/Release-0_8_0/fuse/fusepb/controllers/FuseController.m,
+ branches/Release-0_8_0/fuse/fusepb/controllers/RollbackController.m,
+ branches/Release-0_8_0/fuse/rzx.c,
+ branches/Release-0_8_0/fuse/rzx.h: Merge in changes from Fuse to
+ reset rzx_instructions_offset on rollback to fix replay of rolled
+ back recordings (and some refactoring).
+
+2007-04-09 11:40 fredm
+
+ * branches/Release-0_8_0/fuse/fusepb/English.lproj/InfoPlist.strings,
+ branches/Release-0_8_0/fuse/fusepb/Info-Fuse.plist: Update
+ version number to reflect fuse version 20070404.
+
+2007-04-09 02:29 fredm
+
+ * branches/Release-0_8_0/fuse/compat/mkstemp.c,
+ branches/Release-0_8_0/fuse/hacking/ChangeLog,
+ branches/Release-0_8_0/fuse/joystick.c,
+ branches/Release-0_8_0/fuse/machines/spec_se.c,
+ branches/Release-0_8_0/fuse/periph.c,
+ branches/Release-0_8_0/fuse/printer.c: Merge up to fuse-20070404.
+
+2007-03-10 12:53 fredm
+
+ * branches/Release-0_8_0/fuse/configure.in,
+ branches/Release-0_8_0/fuse/display.c,
+ branches/Release-0_8_0/fuse/fuse.cpp,
+ branches/Release-0_8_0/fuse/fusepb/English.lproj/InfoPlist.strings,
+ branches/Release-0_8_0/fuse/fusepb/Info-Fuse.plist,
+ branches/Release-0_8_0/fuse/fusepb/SDLMain.mm,
+ branches/Release-0_8_0/fuse/fusepb/resources/Fuse
+ Help/html/divide.html,
+ branches/Release-0_8_0/fuse/hacking/ChangeLog,
+ branches/Release-0_8_0/fuse/hacking/cvs-tags,
+ branches/Release-0_8_0/fuse/if1.c,
+ branches/Release-0_8_0/fuse/man/fuse.1,
+ branches/Release-0_8_0/fuse/rzx.c,
+ branches/Release-0_8_0/fuse/settings.dat,
+ branches/Release-0_8_0/fuse/sound.c,
+ branches/Release-0_8_0/fuse/sound/aosound.c,
+ branches/Release-0_8_0/fuse/sound/coreaudiosound.c,
+ branches/Release-0_8_0/fuse/sound/sdlsound.c,
+ branches/Release-0_8_0/fuse/ui.c,
+ branches/Release-0_8_0/fuse/ui/gtk/gtkui.c,
+ branches/Release-0_8_0/fuse/utils.c,
+ branches/Release-0_8_0/fuse/widget/filesel.c,
+ branches/Release-0_8_0/libspectrum/Info.plist,
+ branches/Release-0_8_0/libspectrum/libspectrum.h,
+ branches/Release-0_8_0/libspectrum/libspectrum/ChangeLog,
+ branches/Release-0_8_0/libspectrum/libspectrum/doc/libspectrum.txt,
+ branches/Release-0_8_0/libspectrum/libspectrum/hacking/ChangeLog,
+ branches/Release-0_8_0/libspectrum/libspectrum/internals.h,
+ branches/Release-0_8_0/libspectrum/libspectrum/libspectrum.h.in,
+ branches/Release-0_8_0/libspectrum/libspectrum/rzx.c,
+ branches/Release-0_8_0/libspectrum/libspectrum/tzx_read.c: Merge
+ up to libspectrum-0.3.0-pre2 and fuse-20070310.
+
+2007-02-06 09:16 fredm
+
+ * branches/Release-0_8_0: Make branch for 0.8.0 release tree.
+
+2007-02-06 09:11 fredm
+
+ * trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html: Add
+ more to the changes list in the manual.
+
+2007-02-05 13:47 fredm
+
+ * trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj,
+ trunk/FuseImporter/LibspectrumMetadataImporter.m,
+ trunk/FuseImporter/libspectrum.h, trunk/fuse/ChangeLog,
+ trunk/fuse/Makefile.am, trunk/fuse/README, trunk/fuse/autogen.sh,
+ trunk/fuse/ay.c, trunk/fuse/ay.h, trunk/fuse/compat.h,
+ trunk/fuse/compat/Makefile.am, trunk/fuse/compat/dirname.c,
+ trunk/fuse/configure.in, trunk/fuse/dck.c, trunk/fuse/dck.h,
+ trunk/fuse/debugger/Makefile.am,
+ trunk/fuse/debugger/breakpoint.c,
+ trunk/fuse/debugger/breakpoint.h, trunk/fuse/debugger/command.c,
+ trunk/fuse/debugger/commandl.l, trunk/fuse/debugger/commandy.y,
+ trunk/fuse/debugger/debugger.c, trunk/fuse/debugger/debugger.h,
+ trunk/fuse/debugger/debugger_internals.h,
+ trunk/fuse/debugger/disassemble.c,
+ trunk/fuse/debugger/expression.c, trunk/fuse/display.c,
+ trunk/fuse/display.h, trunk/fuse/divide.c, trunk/fuse/divide.h,
+ trunk/fuse/event.c, trunk/fuse/event.h, trunk/fuse/fuse.cpp,
+ trunk/fuse/fuse.h, trunk/fuse/fusepb/Credits.html,
+ trunk/fuse/fusepb/English.lproj/InfoPlist.strings,
+ trunk/fuse/fusepb/Info-Fuse.plist,
+ trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib,
+ trunk/fuse/fusepb/resources/Fuse Help/Fuse Help idx,
+ trunk/fuse/fusepb/resources/Fuse Help/Fuse Help.helpindex,
+ trunk/fuse/fusepb/resources/Fuse Help/html/about.html,
+ trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html,
+ trunk/fuse/fusepb/resources/Fuse Help/html/divide.html,
+ trunk/fuse/fusepb/resources/Fuse Help/html/filters.html,
+ trunk/fuse/fusepb/resources/Fuse Help/html/preferences.html,
+ trunk/fuse/fusepb/resources/Fuse Help/html/tocstart.html,
+ trunk/fuse/fusepb/settings_cocoa.h, trunk/fuse/hacking/ChangeLog,
+ trunk/fuse/hacking/Makefile.am, trunk/fuse/hacking/cvs-tags,
+ trunk/fuse/ide.c, trunk/fuse/ide.h, trunk/fuse/if1.c,
+ trunk/fuse/if1.h, trunk/fuse/if2.c, trunk/fuse/if2.h,
+ trunk/fuse/input.c, trunk/fuse/input.h, trunk/fuse/joystick.c,
+ trunk/fuse/joystick.h, trunk/fuse/keyboard.c,
+ trunk/fuse/keyboard.h, trunk/fuse/keysyms.dat,
+ trunk/fuse/keysyms.pl, trunk/fuse/lib/Makefile.am,
+ trunk/fuse/loader.c, trunk/fuse/loader.h, trunk/fuse/machine.c,
+ trunk/fuse/machine.h, trunk/fuse/machines/Makefile.am,
+ trunk/fuse/machines/machines.h, trunk/fuse/machines/pentagon.c,
+ trunk/fuse/machines/scorpion.c, trunk/fuse/machines/scorpion.h,
+ trunk/fuse/machines/spec128.c, trunk/fuse/machines/spec128.h,
+ trunk/fuse/machines/spec16.c, trunk/fuse/machines/spec48.c,
+ trunk/fuse/machines/spec48.h, trunk/fuse/machines/spec_se.c,
+ trunk/fuse/machines/specplus2.c,
+ trunk/fuse/machines/specplus2a.c,
+ trunk/fuse/machines/specplus3.c, trunk/fuse/machines/specplus3.h,
+ trunk/fuse/machines/specplus3e.c, trunk/fuse/machines/tc2048.c,
+ trunk/fuse/machines/tc2068.c, trunk/fuse/machines/tc2068.h,
+ trunk/fuse/machines/ts2068.c, trunk/fuse/man/Makefile.am,
+ trunk/fuse/man/fuse.1, trunk/fuse/memory.c, trunk/fuse/memory.h,
+ trunk/fuse/menu.c, trunk/fuse/menu.h, trunk/fuse/menu_data.c,
+ trunk/fuse/menu_data.pl, trunk/fuse/periph.c,
+ trunk/fuse/periph.h, trunk/fuse/perl/Fuse.pm,
+ trunk/fuse/perl/Fuse/Dialog.pm, trunk/fuse/perl/Fuse/Makefile.am,
+ trunk/fuse/perl/Makefile.am, trunk/fuse/perl/cpp-perl.pl,
+ trunk/fuse/pokefinder/Makefile.am,
+ trunk/fuse/pokefinder/pokefinder.c,
+ trunk/fuse/pokefinder/pokefinder.h, trunk/fuse/printer.c,
+ trunk/fuse/printer.h, trunk/fuse/profile.c, trunk/fuse/profile.h,
+ trunk/fuse/psg.c, trunk/fuse/psg.h, trunk/fuse/roms/Makefile.am,
+ trunk/fuse/rzx.c, trunk/fuse/rzx.h, trunk/fuse/scld.c,
+ trunk/fuse/screenshot.c, trunk/fuse/screenshot.h,
+ trunk/fuse/settings-header.pl, trunk/fuse/settings.dat,
+ trunk/fuse/settings.pl, trunk/fuse/simpleide.c, trunk/fuse/slt.c,
+ trunk/fuse/slt.h, trunk/fuse/snapshot.c, trunk/fuse/snapshot.h,
+ trunk/fuse/sound.c, trunk/fuse/sound.h,
+ trunk/fuse/sound/Makefile.am, trunk/fuse/sound/aosound.c,
+ trunk/fuse/sound/coreaudiosound.c, trunk/fuse/sound/dxsound.c,
+ trunk/fuse/sound/lowlevel.h, trunk/fuse/sound/sdlsound.c,
+ trunk/fuse/sound/sfifo.c, trunk/fuse/spectrum.c,
+ trunk/fuse/spectrum.h, trunk/fuse/tape.c, trunk/fuse/tape.h,
+ trunk/fuse/timer.c, trunk/fuse/timer.h, trunk/fuse/trdos.c,
+ trunk/fuse/trdos.h, trunk/fuse/ui.c, trunk/fuse/ui/Makefile.am,
+ trunk/fuse/ui/aalib/Makefile.am,
+ trunk/fuse/ui/aalib/aalibdisplay.c,
+ trunk/fuse/ui/aalib/aalibkeyboard.c,
+ trunk/fuse/ui/aalib/aalibkeyboard.h,
+ trunk/fuse/ui/aalib/aalibui.c, trunk/fuse/ui/aalib/aalibui.h,
+ trunk/fuse/ui/aalib/error.c, trunk/fuse/ui/fb/Makefile.am,
+ trunk/fuse/ui/fb/fbdisplay.c, trunk/fuse/ui/fb/fbdisplay.h,
+ trunk/fuse/ui/fb/fbjoystick.c, trunk/fuse/ui/fb/fbkeyboard.c,
+ trunk/fuse/ui/fb/fbkeyboard.h, trunk/fuse/ui/fb/fbui.c,
+ trunk/fuse/ui/ggi/Makefile.am, trunk/fuse/ui/ggi/ggi_internals.h,
+ trunk/fuse/ui/ggi/ggidisplay.c, trunk/fuse/ui/ggi/ggikeyboard.c,
+ trunk/fuse/ui/ggi/ggiui.c, trunk/fuse/ui/gtk/Makefile.am,
+ trunk/fuse/ui/gtk/binary.c, trunk/fuse/ui/gtk/browse.c,
+ trunk/fuse/ui/gtk/confirm.c, trunk/fuse/ui/gtk/debugger.c,
+ trunk/fuse/ui/gtk/fileselector.c, trunk/fuse/ui/gtk/gtkdisplay.c,
+ trunk/fuse/ui/gtk/gtkinternals.h,
+ trunk/fuse/ui/gtk/gtkjoystick.c, trunk/fuse/ui/gtk/gtkkeyboard.c,
+ trunk/fuse/ui/gtk/gtkui.c, trunk/fuse/ui/gtk/memory.c,
+ trunk/fuse/ui/gtk/options-header.pl,
+ trunk/fuse/ui/gtk/options.pl, trunk/fuse/ui/gtk/picture.c,
+ trunk/fuse/ui/gtk/pixmaps.c, trunk/fuse/ui/gtk/pokefinder.c,
+ trunk/fuse/ui/gtk/rollback.c, trunk/fuse/ui/gtk/roms.c,
+ trunk/fuse/ui/gtk/statusbar.c, trunk/fuse/ui/gtk/stock.c,
+ trunk/fuse/ui/options.dat, trunk/fuse/ui/scaler/Makefile.am,
+ trunk/fuse/ui/scaler/scaler.c, trunk/fuse/ui/scaler/scaler.h,
+ trunk/fuse/ui/scaler/scaler_internals.h,
+ trunk/fuse/ui/scaler/scalers.cpp, trunk/fuse/ui/sdl/Makefile.am,
+ trunk/fuse/ui/sdl/sdldisplay.c, trunk/fuse/ui/sdl/sdldisplay.h,
+ trunk/fuse/ui/sdl/sdljoystick.c, trunk/fuse/ui/sdl/sdljoystick.h,
+ trunk/fuse/ui/sdl/sdlkeyboard.c, trunk/fuse/ui/sdl/sdlkeyboard.h,
+ trunk/fuse/ui/sdl/sdlui.c, trunk/fuse/ui/svga/Makefile.am,
+ trunk/fuse/ui/svga/svgadisplay.c,
+ trunk/fuse/ui/svga/svgadisplay.h,
+ trunk/fuse/ui/svga/svgajoystick.c,
+ trunk/fuse/ui/svga/svgakeyboard.c,
+ trunk/fuse/ui/svga/svgakeyboard.h, trunk/fuse/ui/svga/svgaui.c,
+ trunk/fuse/ui/ui.h, trunk/fuse/ui/uidisplay.h,
+ trunk/fuse/ui/uijoystick.c, trunk/fuse/ui/uijoystick.h,
+ trunk/fuse/ui/win32/Makefile.am, trunk/fuse/ui/win32/debugger.c,
+ trunk/fuse/ui/win32/debugger.h, trunk/fuse/ui/win32/debugger.rc,
+ trunk/fuse/ui/win32/error.c, trunk/fuse/ui/win32/keysyms.c,
+ trunk/fuse/ui/win32/menu_data.c, trunk/fuse/ui/win32/menu_data.h,
+ trunk/fuse/ui/win32/menu_data.rc,
+ trunk/fuse/ui/win32/pokefinder.c,
+ trunk/fuse/ui/win32/pokefinder.h,
+ trunk/fuse/ui/win32/pokefinder.rc,
+ trunk/fuse/ui/win32/statusbar.c,
+ trunk/fuse/ui/win32/win32display.c,
+ trunk/fuse/ui/win32/win32display.h,
+ trunk/fuse/ui/win32/win32internals.h,
+ trunk/fuse/ui/win32/win32keyboard.c,
+ trunk/fuse/ui/win32/win32keyboard.h,
+ trunk/fuse/ui/win32/win32ui.c, trunk/fuse/ui/win32/win32ui.rc,
+ trunk/fuse/ui/xlib/Makefile.am, trunk/fuse/ui/xlib/xdisplay.c,
+ trunk/fuse/ui/xlib/xdisplay.h, trunk/fuse/ui/xlib/xerror.c,
+ trunk/fuse/ui/xlib/xjoystick.c, trunk/fuse/ui/xlib/xkeyboard.c,
+ trunk/fuse/ui/xlib/xkeyboard.h, trunk/fuse/ui/xlib/xui.c,
+ trunk/fuse/ui/xlib/xui.h, trunk/fuse/uidisplay.c,
+ trunk/fuse/ula.c, trunk/fuse/ula.h, trunk/fuse/utils.c,
+ trunk/fuse/utils.h, trunk/fuse/widget/Makefile.am,
+ trunk/fuse/widget/browse.c, trunk/fuse/widget/debugger.c,
+ trunk/fuse/widget/error.c, trunk/fuse/widget/filesel.c,
+ trunk/fuse/widget/menu.c, trunk/fuse/widget/options-header.pl,
+ trunk/fuse/widget/options.pl, trunk/fuse/widget/picture.c,
+ trunk/fuse/widget/roms.c, trunk/fuse/widget/select.c,
+ trunk/fuse/widget/text.c, trunk/fuse/widget/widget.c,
+ trunk/fuse/widget/widget.h, trunk/fuse/widget/widget_internals.h,
+ trunk/fuse/z80/Makefile.am, trunk/fuse/z80/coretest.c,
+ trunk/fuse/z80/harness.pl, trunk/fuse/z80/tests/Makefile.am,
+ trunk/fuse/z80/z80.c, trunk/fuse/z80/z80.h,
+ trunk/fuse/z80/z80.pl, trunk/fuse/z80/z80_macros.h,
+ trunk/fuse/z80/z80_ops.c, trunk/fuse/zxatasp.c,
+ trunk/fuse/zxatasp.h, trunk/fuse/zxcf.c, trunk/fuse/zxcf.h,
+ trunk/libspectrum/libspectrum.h,
+ trunk/libspectrum/libspectrum.xcodeproj/project.pbxproj,
+ trunk/libspectrum/libspectrum/ChangeLog,
+ trunk/libspectrum/libspectrum/Makefile.am,
+ trunk/libspectrum/libspectrum/README,
+ trunk/libspectrum/libspectrum/accessor.pl,
+ trunk/libspectrum/libspectrum/autogen.sh,
+ trunk/libspectrum/libspectrum/bzip2.c,
+ trunk/libspectrum/libspectrum/configure.in,
+ trunk/libspectrum/libspectrum/creator.c,
+ trunk/libspectrum/libspectrum/crypto.c,
+ trunk/libspectrum/libspectrum/dck.c,
+ trunk/libspectrum/libspectrum/dll.c,
+ trunk/libspectrum/libspectrum/doc/Makefile.am,
+ trunk/libspectrum/libspectrum/doc/cvs-tags,
+ trunk/libspectrum/libspectrum/doc/libspectrum.3,
+ trunk/libspectrum/libspectrum/doc/libspectrum.txt,
+ trunk/libspectrum/libspectrum/hacking/ChangeLog,
+ trunk/libspectrum/libspectrum/ide.c,
+ trunk/libspectrum/libspectrum/internals.h,
+ trunk/libspectrum/libspectrum/libspectrum.c,
+ trunk/libspectrum/libspectrum/libspectrum.h.in,
+ trunk/libspectrum/libspectrum/libspectrum.qpg.in,
+ trunk/libspectrum/libspectrum/make-perl.c,
+ trunk/libspectrum/libspectrum/microdrive.c,
+ trunk/libspectrum/libspectrum/myglib/Makefile.am,
+ trunk/libspectrum/libspectrum/myglib/ghash.c,
+ trunk/libspectrum/libspectrum/myglib/gslist.c,
+ trunk/libspectrum/libspectrum/plusd.c,
+ trunk/libspectrum/libspectrum/rzx.c,
+ trunk/libspectrum/libspectrum/sna.c,
+ trunk/libspectrum/libspectrum/snap_accessors.txt,
+ trunk/libspectrum/libspectrum/snapshot.c,
+ trunk/libspectrum/libspectrum/snp.c,
+ trunk/libspectrum/libspectrum/sp.c,
+ trunk/libspectrum/libspectrum/symbol_table.c,
+ trunk/libspectrum/libspectrum/szx.c,
+ trunk/libspectrum/libspectrum/tap.c,
+ trunk/libspectrum/libspectrum/tape.c,
+ trunk/libspectrum/libspectrum/tape_accessors.pl,
+ trunk/libspectrum/libspectrum/tape_accessors.txt,
+ trunk/libspectrum/libspectrum/tape_block.c,
+ trunk/libspectrum/libspectrum/tape_block.h,
+ trunk/libspectrum/libspectrum/tape_set.pl,
+ trunk/libspectrum/libspectrum/timings.c,
+ trunk/libspectrum/libspectrum/tzx_read.c,
+ trunk/libspectrum/libspectrum/tzx_write.c,
+ trunk/libspectrum/libspectrum/warajevo_read.c,
+ trunk/libspectrum/libspectrum/z80.c,
+ trunk/libspectrum/libspectrum/zlib.c,
+ trunk/libspectrum/libspectrum/zxs.c: Merge in vendor libspectrum
+ 0.3.0-pre1 and Fuse 0.8.0-pre1 versions. Update documentation and
+ make adjustments to compensate for upstream changes.
+
+2007-01-09 21:02 fredm
+
+ * trunk/fuse/fuse.cpp, trunk/fuse/fuse.h, trunk/fuse/machine.c,
+ trunk/fuse/sound.c, trunk/fuse/sound.h, trunk/fuse/tape.c: Fix
+ distorted AY sound on snapshot load.
+
+2007-01-09 21:00 fredm
+
+ * trunk/fuse/fusepb/English.lproj/InfoPlist.strings,
+ trunk/fuse/fusepb/Info-Fuse.plist: Move version strings to
+ 20070110.
+
+2007-01-09 14:15 fredm
+
+ * trunk/fuse/profile.c: Provide prototype for memset.
+
+2007-01-09 14:14 fredm
+
+ * trunk/fuse/ui/sdl/sdlkeyboard.c: Also pass on native keysyms to
+ the input layer.
+
+2006-12-17 13:51 fredm
+
+ * trunk/fuse/debugger/breakpoint.c, trunk/fuse/hacking/ChangeLog,
+ trunk/fuse/machine.c, trunk/fuse/man/fuse.1,
+ trunk/fuse/ui/xlib/xdisplay.c, trunk/fuse/widget/widget.c: Merge
+ up to fuse-20061217.
+
+2006-12-17 11:37 fredm
+
+ * trunk/fuse/fusepb/controllers/FuseController.m: When starting an
+ RZX recording from a snapshot, be sure to pass through the embed
+ snapshot preference.
+
+2006-12-17 03:13 fredm
+
+ * trunk/fuse/fusepb, trunk/fuse/fusepb/settings_cocoa.h: Don't
+ ignore settings_cocoa.h and check it in for easier builds from
+ scratch.
+
+2006-12-17 01:26 fredm
+
+ * trunk/fuse/fusepb/English.lproj/InfoPlist.strings,
+ trunk/fuse/fusepb/Info-Fuse.plist: Move version strings to
+ 20061129.
+
+2006-11-26 11:24 fredm
+
+ * trunk/fuse/fusepb/controllers/PreferencesController.m,
+ trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib,
+ trunk/fuse/ui/sdl/sdljoystick.c: Fix joystick support.
+
+2006-11-26 08:44 fredm
+
+ * trunk/fuse/fusepb/resources/Fuse Help/Fuse Help idx,
+ trunk/fuse/fusepb/resources/Fuse Help/Fuse Help.helpindex,
+ trunk/fuse/fusepb/resources/Fuse Help/html/emulation.html,
+ trunk/fuse/fusepb/resources/Fuse Help/html/mappings.html,
+ trunk/fuse/fusepb/resources/Fuse Help/html/menus.html,
+ trunk/fuse/fusepb/resources/Fuse Help/html/preferences.html,
+ trunk/fuse/fusepb/resources/Fuse Help/html/tocstart.html: Some
+ updates to the Fuse manual.
+
+2006-11-26 08:35 fredm
+
+ * trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib: Remove
+ "Auto-save settings" preference as we no longer have manual
+ preference saving support as it is unlike the standard approach
+ on OS X.
+
+2006-11-19 12:09 fredm
+
+ * trunk/fuse/fusepb/controllers/FuseController.m: Make default
+ action on confirmations the action.
+
+2006-11-14 00:34 fredm
+
+ * trunk/fuse/fusepb/English.lproj/InfoPlist.strings,
+ trunk/fuse/fusepb/Info-Fuse.plist: Move version numbers to
+ 20061114
+
+2006-10-22 02:35 fred
+
+ * trunk/fuse/fusepb/nibs/Preferences.nib/info.nib,
+ trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib: Made ROM
+ text boxes small fonts and made reset buttons only enable when
+ there is something to reset.
+
+2006-10-22 01:57 fred
+
+ * trunk/fuse/fusepb/controllers/PreferencesController.h,
+ trunk/fuse/fusepb/controllers/PreferencesController.m,
+ trunk/fuse/fusepb/nibs/Preferences.nib/classes.nib,
+ trunk/fuse/fusepb/nibs/Preferences.nib/info.nib,
+ trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib,
+ trunk/fuse/settings.pl: Allow custom ROMS to be reset back to
+ defaults individually.
+
+2006-10-21 16:38 fred
+
+ * trunk/fuse/fusepb/settings-header.pl,
+ trunk/fuse/machines/tc2048.c, trunk/fuse/settings.pl: Complete
+ merge up to fuse-20061021.
+
+2006-10-21 16:06 fred
+
+ * trunk/fuse/display.c, trunk/fuse/display.h, trunk/fuse/event.c,
+ trunk/fuse/hacking/ChangeLog, trunk/fuse/if1.c, trunk/fuse/if2.c,
+ trunk/fuse/machine.c, trunk/fuse/machine.h,
+ trunk/fuse/machines/pentagon.c, trunk/fuse/machines/scorpion.c,
+ trunk/fuse/machines/spec128.c, trunk/fuse/machines/spec16.c,
+ trunk/fuse/machines/spec48.c, trunk/fuse/machines/spec_se.c,
+ trunk/fuse/machines/specplus2.c,
+ trunk/fuse/machines/specplus2a.c,
+ trunk/fuse/machines/specplus3.c,
+ trunk/fuse/machines/specplus3e.c, trunk/fuse/machines/tc2048.c,
+ trunk/fuse/machines/tc2068.c, trunk/fuse/machines/ts2068.c,
+ trunk/fuse/memory.c, trunk/fuse/profile.c, trunk/fuse/scld.c,
+ trunk/fuse/screenshot.c, trunk/fuse/screenshot.h,
+ trunk/fuse/settings-header.pl, trunk/fuse/settings.dat,
+ trunk/fuse/settings.pl, trunk/fuse/snapshot.c,
+ trunk/fuse/sound/sdlsound.c, trunk/fuse/tape.c,
+ trunk/fuse/ui/fb/fbdisplay.c, trunk/fuse/ui/ggi/ggidisplay.c,
+ trunk/fuse/ui/gtk/gtkdisplay.c, trunk/fuse/ui/gtk/gtkui.c,
+ trunk/fuse/ui/sdl/sdldisplay.c, trunk/fuse/ui/svga/svgadisplay.c,
+ trunk/fuse/ui/uidisplay.h, trunk/fuse/ui/win32/win32display.c,
+ trunk/fuse/ui/xlib/xdisplay.c, trunk/fuse/uidisplay.c,
+ trunk/fuse/widget/menu.c, trunk/fuse/widget/roms.c,
+ trunk/fuse/widget/widget.c: Merge up to fuse-20061021.
+
+2006-10-16 13:42 fred
+
+ * trunk/fuse/fusepb/controllers/PreferencesController.h,
+ trunk/fuse/fusepb/controllers/PreferencesController.m,
+ trunk/fuse/fusepb/nibs/Preferences.nib/classes.nib,
+ trunk/fuse/fusepb/nibs/Preferences.nib/info.nib,
+ trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib: Fix
+ updating ROMS after selecting new image.
+
+2006-09-04 12:55 fred
+
+ * trunk/fuse/fusepb/SDLMain.mm: Updates from SDL 1.2.11
+
+2006-09-04 12:49 fred
+
+ * trunk/fuse/ui/sdl/sdlui.c: Try enabling Altivec blitters again
+ now that screen overruns have been solved?
+
+2006-09-04 05:18 fred
+
+ * trunk/fuse/display.c, trunk/fuse/screenshot.c,
+ trunk/fuse/screenshot.h, trunk/fuse/ui/gtk/gtkui.c,
+ trunk/fuse/widget/menu.c, trunk/fuse/widget/widget.c: Remove
+ screenshot_save, now obsolete.
+
+2006-09-03 15:06 fred
+
+ * trunk/fuse/fusepb/controllers/FuseController.m: Make comments
+ fuse compliant.
+
+2006-09-01 14:28 fred
+
+ * trunk/FuseImporter/libspectrum.h, trunk/fuse/event.c,
+ trunk/fuse/event.h,
+ trunk/fuse/fusepb/controllers/FuseController.m,
+ trunk/fuse/hacking/ChangeLog, trunk/fuse/hacking/cvs-tags,
+ trunk/fuse/hacking/implementation_notes.txt,
+ trunk/fuse/machine.c, trunk/fuse/machine.h,
+ trunk/fuse/machines/scorpion.c, trunk/fuse/machines/spec128.c,
+ trunk/fuse/machines/specplus3.c, trunk/fuse/man/fuse.1,
+ trunk/fuse/memory.c, trunk/fuse/menu.c, trunk/fuse/menu_data.c,
+ trunk/fuse/profile.c, trunk/fuse/scld.c, trunk/fuse/screenshot.c,
+ trunk/fuse/tape.c, trunk/fuse/trdos.h, trunk/fuse/ui/gtk/gtkui.c,
+ trunk/fuse/ui/sdl/sdldisplay.c, trunk/fuse/z80/tests/README,
+ trunk/fuse/z80/tests/cb40.out, trunk/fuse/z80/tests/cb42.out,
+ trunk/fuse/z80/tests/cb44.out, trunk/fuse/z80/tests/cb45.out,
+ trunk/fuse/z80/tests/cb47_1.out, trunk/fuse/z80/tests/cb48.out,
+ trunk/fuse/z80/tests/cb49.out, trunk/fuse/z80/tests/cb4a.out,
+ trunk/fuse/z80/tests/cb4b.out, trunk/fuse/z80/tests/cb4c.out,
+ trunk/fuse/z80/tests/cb4d.out, trunk/fuse/z80/tests/cb4e.out,
+ trunk/fuse/z80/tests/cb4f_1.out, trunk/fuse/z80/tests/cb50.out,
+ trunk/fuse/z80/tests/cb51.out, trunk/fuse/z80/tests/cb52.out,
+ trunk/fuse/z80/tests/cb53.out, trunk/fuse/z80/tests/cb54.out,
+ trunk/fuse/z80/tests/cb55.out, trunk/fuse/z80/tests/cb57.out,
+ trunk/fuse/z80/tests/cb57_1.out, trunk/fuse/z80/tests/cb59.out,
+ trunk/fuse/z80/tests/cb5b.out, trunk/fuse/z80/tests/cb5e.out,
+ trunk/fuse/z80/tests/cb5f_1.out, trunk/fuse/z80/tests/cb60.out,
+ trunk/fuse/z80/tests/cb61.out, trunk/fuse/z80/tests/cb63.out,
+ trunk/fuse/z80/tests/cb64.out, trunk/fuse/z80/tests/cb65.out,
+ trunk/fuse/z80/tests/cb67_1.out, trunk/fuse/z80/tests/cb68.out,
+ trunk/fuse/z80/tests/cb69.out, trunk/fuse/z80/tests/cb6d.out,
+ trunk/fuse/z80/tests/cb6f_1.out, trunk/fuse/z80/tests/cb71.out,
+ trunk/fuse/z80/tests/cb72.out, trunk/fuse/z80/tests/cb73.out,
+ trunk/fuse/z80/tests/cb74.out, trunk/fuse/z80/tests/cb75.out,
+ trunk/fuse/z80/tests/cb76.out, trunk/fuse/z80/tests/cb77_1.out,
+ trunk/fuse/z80/tests/cb78.out, trunk/fuse/z80/tests/cb79.out,
+ trunk/fuse/z80/tests/cb7a.out, trunk/fuse/z80/tests/cb7b.out,
+ trunk/fuse/z80/tests/cb7d.out, trunk/fuse/z80/tests/cb7f.out,
+ trunk/fuse/z80/tests/cb7f_1.out, trunk/fuse/z80/tests/ddcb40.out,
+ trunk/fuse/z80/tests/ddcb41.out, trunk/fuse/z80/tests/ddcb43.out,
+ trunk/fuse/z80/tests/ddcb44.out, trunk/fuse/z80/tests/ddcb47.out,
+ trunk/fuse/z80/tests/ddcb48.out, trunk/fuse/z80/tests/ddcb49.out,
+ trunk/fuse/z80/tests/ddcb4a.out, trunk/fuse/z80/tests/ddcb4b.out,
+ trunk/fuse/z80/tests/ddcb4c.out, trunk/fuse/z80/tests/ddcb4d.out,
+ trunk/fuse/z80/tests/ddcb4e.out, trunk/fuse/z80/tests/ddcb4f.out,
+ trunk/fuse/z80/tests/ddcb51.out, trunk/fuse/z80/tests/ddcb54.out,
+ trunk/fuse/z80/tests/ddcb56.out, trunk/fuse/z80/tests/ddcb57.out,
+ trunk/fuse/z80/tests/ddcb5a.out, trunk/fuse/z80/tests/ddcb5b.out,
+ trunk/fuse/z80/tests/ddcb5e.out, trunk/fuse/z80/tests/ddcb60.out,
+ trunk/fuse/z80/tests/ddcb61.out, trunk/fuse/z80/tests/ddcb62.out,
+ trunk/fuse/z80/tests/ddcb65.out, trunk/fuse/z80/tests/ddcb66.out,
+ trunk/fuse/z80/tests/ddcb69.out, trunk/fuse/z80/tests/ddcb6a.out,
+ trunk/fuse/z80/tests/ddcb6b.out, trunk/fuse/z80/tests/ddcb6c.out,
+ trunk/fuse/z80/tests/ddcb6e.out, trunk/fuse/z80/tests/ddcb70.out,
+ trunk/fuse/z80/tests/ddcb71.out, trunk/fuse/z80/tests/ddcb72.out,
+ trunk/fuse/z80/tests/ddcb73.out, trunk/fuse/z80/tests/ddcb74.out,
+ trunk/fuse/z80/tests/ddcb75.out, trunk/fuse/z80/tests/ddcb76.out,
+ trunk/fuse/z80/tests/ddcb78.out, trunk/fuse/z80/tests/ddcb79.out,
+ trunk/fuse/z80/tests/ddcb7a.out, trunk/fuse/z80/tests/ddcb7b.out,
+ trunk/fuse/z80/tests/ddcb7c.out, trunk/fuse/z80/tests/ddcb7d.out,
+ trunk/fuse/z80/tests/ddcb7e.out, trunk/fuse/z80/tests/ddcb7f.out,
+ trunk/fuse/z80/tests/fdcb40.out, trunk/fuse/z80/tests/fdcb41.out,
+ trunk/fuse/z80/tests/fdcb42.out, trunk/fuse/z80/tests/fdcb43.out,
+ trunk/fuse/z80/tests/fdcb44.out, trunk/fuse/z80/tests/fdcb45.out,
+ trunk/fuse/z80/tests/fdcb46.out, trunk/fuse/z80/tests/fdcb48.out,
+ trunk/fuse/z80/tests/fdcb49.out, trunk/fuse/z80/tests/fdcb4a.out,
+ trunk/fuse/z80/tests/fdcb4b.out, trunk/fuse/z80/tests/fdcb4c.out,
+ trunk/fuse/z80/tests/fdcb4d.out, trunk/fuse/z80/tests/fdcb4e.out,
+ trunk/fuse/z80/tests/fdcb4f.out, trunk/fuse/z80/tests/fdcb50.out,
+ trunk/fuse/z80/tests/fdcb53.out, trunk/fuse/z80/tests/fdcb56.out,
+ trunk/fuse/z80/tests/fdcb57.out, trunk/fuse/z80/tests/fdcb58.out,
+ trunk/fuse/z80/tests/fdcb59.out, trunk/fuse/z80/tests/fdcb5a.out,
+ trunk/fuse/z80/tests/fdcb5b.out, trunk/fuse/z80/tests/fdcb5c.out,
+ trunk/fuse/z80/tests/fdcb5d.out, trunk/fuse/z80/tests/fdcb5f.out,
+ trunk/fuse/z80/tests/fdcb60.out, trunk/fuse/z80/tests/fdcb61.out,
+ trunk/fuse/z80/tests/fdcb62.out, trunk/fuse/z80/tests/fdcb63.out,
+ trunk/fuse/z80/tests/fdcb64.out, trunk/fuse/z80/tests/fdcb65.out,
+ trunk/fuse/z80/tests/fdcb6b.out, trunk/fuse/z80/tests/fdcb6e.out,
+ trunk/fuse/z80/tests/fdcb70.out, trunk/fuse/z80/tests/fdcb71.out,
+ trunk/fuse/z80/tests/fdcb72.out, trunk/fuse/z80/tests/fdcb73.out,
+ trunk/fuse/z80/tests/fdcb74.out, trunk/fuse/z80/tests/fdcb75.out,
+ trunk/fuse/z80/tests/fdcb76.out, trunk/fuse/z80/tests/fdcb77.out,
+ trunk/fuse/z80/tests/fdcb78.out, trunk/fuse/z80/tests/fdcb7a.out,
+ trunk/fuse/z80/tests/fdcb7b.out, trunk/fuse/z80/tests/fdcb7c.out,
+ trunk/fuse/z80/tests/fdcb7d.out, trunk/fuse/z80/tests/fdcb7e.out,
+ trunk/fuse/z80/z80_macros.h, trunk/libspectrum/libspectrum.h,
+ trunk/libspectrum/libspectrum/doc/libspectrum.txt,
+ trunk/libspectrum/libspectrum/hacking/ChangeLog,
+ trunk/libspectrum/libspectrum/libspectrum.h.in,
+ trunk/libspectrum/libspectrum/tape.c,
+ trunk/libspectrum/libspectrum/tape_block.c: Merge up to
+ libspectrum-20060812 and fuse-20060825.
+
+2006-08-31 13:34 fred
+
+ * trunk/fuse/ui/sdl/sdlkeyboard.c: Only allow quit from windowed
+ mode.
+
+2006-08-31 08:14 fred
+
+ * trunk/README: Correct bzip2 directory name in build instructions
+
+2006-08-31 08:02 fred
+
+ * trunk/fuse/display.c, trunk/fuse/display.h, trunk/fuse/event.h,
+ trunk/fuse/hacking/implementation_notes.txt,
+ trunk/fuse/machine.c, trunk/fuse/machine.h,
+ trunk/fuse/machines/scorpion.c, trunk/fuse/machines/spec128.c,
+ trunk/fuse/machines/specplus3.c, trunk/fuse/memory.c,
+ trunk/fuse/scld.c, trunk/fuse/screenshot.c,
+ trunk/fuse/z80/z80_ops.c: Merge in changes from
+ fuse_interpolate_animation branch (rev 194:207), which now
+ comprise moving back to the (fixed) version of the standard Fuse
+ "new" renderer, but incorporating the following from my version:
+ * Restore rev 173 and move display_plot* over to the UIs and
+ remove the screen copy in display.c * Move border updating into
+ the dirty system, fix updating of last border line after it has
+ already been drawn, more tweaks to frame rates in different
+ circumstances. * Don't update the screen more than 25 times a
+ frame when loading from tape only. * Make numbers a little less
+ magic. * Restore display_last_screen for less overdraw in
+ screen/mode switch situations. * Minor event optimisations.
+
+2006-08-29 14:26 fred
+
+ * trunk/fuse/display.c, trunk/fuse/memory.c,
+ trunk/fuse/sound/sdlsound.c, trunk/fuse/timer.c: Merge in 20ms
+ per frame cap to free up emulation speed in OS X.
+
+2006-08-24 12:03 fred
+
+ * trunk/fuse/memory.c: Fix Shock II again (arrgh!!!)
+
+2006-08-18 01:25 fred
+
+ * trunk/fuse/display.c, trunk/fuse/machine.h, trunk/fuse/memory.c,
+ trunk/fuse/z80/z80_ops.c: Fix bugs arising from removal of
+ display events from event system.
+
+2006-08-16 13:12 fred
+
+ * trunk/fuse/display.c, trunk/fuse/display.h, trunk/fuse/event.c,
+ trunk/fuse/event.h, trunk/fuse/machine.c, trunk/fuse/memory.c,
+ trunk/fuse/z80/z80_ops.c: Remove display events from event
+ system.
+
+2006-08-15 01:17 fred
+
+ * trunk/fuse/display.c: Hoist common expression.
+
+2006-08-14 13:44 fred
+
+ * trunk/fuse/fusepb/controllers/PreferencesController.m,
+ trunk/fuse/settings.pl: Fix preferences reset.
+
+2006-08-14 13:42 fred
+
+ * trunk/fuse/fusepb/settings.pl: Remove defunct file (now use
+ ../setttings.pl)
+
+2006-08-14 13:40 fred
+
+ * trunk/fuse/fusepb/controllers/FuseController.m: Remove debugging
+ fprintf
+
+2006-08-14 13:38 fred
+
+ * trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib: Don't
+ hide printer enabled checkbox when printer enabled.
+
+2006-08-14 13:37 fred
+
+ * trunk/fuse/ui/sdl/sdldisplay.c: Fix tape icon display before a
+ tape is played.
+
+2006-08-14 13:35 fred
+
+ * trunk/fuse/ui/sdl/sdlkeyboard.c: Also ignore right command (meta)
+ key
+
+2006-08-12 04:19 fred
+
+ * trunk/fuse/display.c, trunk/fuse/display.h,
+ trunk/fuse/machines/spec128.c, trunk/fuse/memory.c,
+ trunk/fuse/scld.c: Put chunks on a checklist when written to and
+ shortcircuit ULA reads where there have been no changes.
+
+2006-08-09 12:20 fred
+
+ * trunk/fuse/display.c, trunk/fuse/display.h: Make display_get_addr
+ a macro and make border_changes an array rather than a gslist.
+
+2006-08-09 02:57 fred
+
+ * trunk/fuse/event.c: Display events are frequent and nearly always
+ added to the front, and there is only one outstanding at any one
+ time. Add a dedicated slot for display events which are being
+ added to the head of the queue.
+
+2006-08-08 13:34 fred
+
+ * trunk/fuse/display.c: Bulk allocate border changes.
+
+2006-08-07 13:56 fred
+
+ * trunk/fuse/display.c: Don't use get_beam_posision in
+ display_write, replace the three individual display cache
+ elements into a single word for faster aligned access.
+
+2006-08-07 13:55 fred
+
+ * trunk/fuse/event.c: Use a single free element pointer rather than
+ a list for more speed.
+
+2006-08-07 00:57 fred
+
+ * trunk/fuse/display.c, trunk/fuse/display.h,
+ trunk/fuse/fusepb/thumbnail.m, trunk/fuse/screenshot.c,
+ trunk/fuse/ui/fb/fbdisplay.c, trunk/fuse/ui/ggi/ggidisplay.c,
+ trunk/fuse/ui/gtk/gtkdisplay.c, trunk/fuse/ui/sdl/sdldisplay.c,
+ trunk/fuse/ui/svga/svgadisplay.c, trunk/fuse/ui/uidisplay.h,
+ trunk/fuse/ui/win32/win32display.c,
+ trunk/fuse/ui/xlib/xdisplay.c, trunk/fuse/uidisplay.c: Move
+ display_plot* and display_putpixel to the ui level to cut out the
+ extra copy in the SDL UI, remove display_image and replace with
+ display_getpixel.
+
+2006-08-06 13:51 fred
+
+ * trunk/fuse/event.c: Use free event list to store event obects.
+
+2006-08-01 13:30 fred
+
+ * trunk/fuse/display.c: Integrate border with display_last_screen
+ and use display_plot8 for drawing
+
+2006-08-01 05:24 fred
+
+ * trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj,
+ trunk/fuse/fusepb/controllers/FuseController.m,
+ trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib: Complete
+ integration of merge up to fuse-20060731
+
+2006-07-31 14:27 fred
+
+ * trunk/fuse/Makefile.am, trunk/fuse/display.c,
+ trunk/fuse/display.h, trunk/fuse/event.c, trunk/fuse/event.h,
+ trunk/fuse/fuse.cpp, trunk/fuse/hacking/ChangeLog,
+ trunk/fuse/hacking/implementation_notes.txt,
+ trunk/fuse/lib/compressed/tape_128.szx,
+ trunk/fuse/lib/compressed/tape_16.szx,
+ trunk/fuse/lib/compressed/tape_2048.szx,
+ trunk/fuse/lib/compressed/tape_48.szx,
+ trunk/fuse/lib/compressed/tape_pentagon.szx,
+ trunk/fuse/lib/compressed/tape_plus2.szx,
+ trunk/fuse/lib/compressed/tape_scorpion.szx,
+ trunk/fuse/lib/compressed/tape_ts2068.szx,
+ trunk/fuse/lib/uncompressed/tape_128.szx,
+ trunk/fuse/lib/uncompressed/tape_16.szx,
+ trunk/fuse/lib/uncompressed/tape_2048.szx,
+ trunk/fuse/lib/uncompressed/tape_48.szx,
+ trunk/fuse/lib/uncompressed/tape_pentagon.szx,
+ trunk/fuse/lib/uncompressed/tape_plus2.szx,
+ trunk/fuse/lib/uncompressed/tape_scorpion.szx,
+ trunk/fuse/lib/uncompressed/tape_ts2068.szx, trunk/fuse/loader.c,
+ trunk/fuse/loader.h, trunk/fuse/machine.c, trunk/fuse/machine.h,
+ trunk/fuse/machines/scorpion.c, trunk/fuse/machines/spec128.c,
+ trunk/fuse/machines/specplus3.c, trunk/fuse/man/fuse.1,
+ trunk/fuse/memory.c, trunk/fuse/menu.c, trunk/fuse/scld.c,
+ trunk/fuse/screenshot.c, trunk/fuse/settings.dat,
+ trunk/fuse/spectrum.c, trunk/fuse/tape.c, trunk/fuse/tape.h,
+ trunk/fuse/ui/options.dat, trunk/fuse/ula.c,
+ trunk/fuse/z80/tests/03.out, trunk/fuse/z80/tests/09.out,
+ trunk/fuse/z80/tests/0b.out, trunk/fuse/z80/tests/10.out,
+ trunk/fuse/z80/tests/13.out, trunk/fuse/z80/tests/19.out,
+ trunk/fuse/z80/tests/1b.out, trunk/fuse/z80/tests/23.out,
+ trunk/fuse/z80/tests/29.out, trunk/fuse/z80/tests/2b.out,
+ trunk/fuse/z80/tests/33.out, trunk/fuse/z80/tests/39.out,
+ trunk/fuse/z80/tests/3b.out, trunk/fuse/z80/tests/c0_1.out,
+ trunk/fuse/z80/tests/c0_2.out, trunk/fuse/z80/tests/c5.out,
+ trunk/fuse/z80/tests/c7.out, trunk/fuse/z80/tests/c8_1.out,
+ trunk/fuse/z80/tests/c8_2.out, trunk/fuse/z80/tests/cf.out,
+ trunk/fuse/z80/tests/d0_1.out, trunk/fuse/z80/tests/d0_2.out,
+ trunk/fuse/z80/tests/d5.out, trunk/fuse/z80/tests/d7.out,
+ trunk/fuse/z80/tests/d8_1.out, trunk/fuse/z80/tests/d8_2.out,
+ trunk/fuse/z80/tests/dd09.out, trunk/fuse/z80/tests/dd19.out,
+ trunk/fuse/z80/tests/dd23.out, trunk/fuse/z80/tests/dd29.out,
+ trunk/fuse/z80/tests/dd2b.out, trunk/fuse/z80/tests/dd39.out,
+ trunk/fuse/z80/tests/dde5.out, trunk/fuse/z80/tests/ddf9.out,
+ trunk/fuse/z80/tests/df.out, trunk/fuse/z80/tests/e0_1.out,
+ trunk/fuse/z80/tests/e0_2.out, trunk/fuse/z80/tests/e5.out,
+ trunk/fuse/z80/tests/e7.out, trunk/fuse/z80/tests/e8_1.out,
+ trunk/fuse/z80/tests/e8_2.out, trunk/fuse/z80/tests/ed42.out,
+ trunk/fuse/z80/tests/ed47.out, trunk/fuse/z80/tests/ed4a.out,
+ trunk/fuse/z80/tests/ed4f.out, trunk/fuse/z80/tests/ed52.out,
+ trunk/fuse/z80/tests/ed57.out, trunk/fuse/z80/tests/ed5a.out,
+ trunk/fuse/z80/tests/ed5f.out, trunk/fuse/z80/tests/ed62.out,
+ trunk/fuse/z80/tests/ed6a.out, trunk/fuse/z80/tests/ed72.out,
+ trunk/fuse/z80/tests/ed7a.out, trunk/fuse/z80/tests/eda2.out,
+ trunk/fuse/z80/tests/eda3.out, trunk/fuse/z80/tests/edaa.out,
+ trunk/fuse/z80/tests/edab.out, trunk/fuse/z80/tests/edb2.out,
+ trunk/fuse/z80/tests/edb3.out, trunk/fuse/z80/tests/edba.out,
+ trunk/fuse/z80/tests/edbb.out, trunk/fuse/z80/tests/ef.out,
+ trunk/fuse/z80/tests/f0_1.out, trunk/fuse/z80/tests/f0_2.out,
+ trunk/fuse/z80/tests/f5.out, trunk/fuse/z80/tests/f7.out,
+ trunk/fuse/z80/tests/f8_1.out, trunk/fuse/z80/tests/f8_2.out,
+ trunk/fuse/z80/tests/f9.out, trunk/fuse/z80/tests/fd09.out,
+ trunk/fuse/z80/tests/fd19.out, trunk/fuse/z80/tests/fd23.out,
+ trunk/fuse/z80/tests/fd29.out, trunk/fuse/z80/tests/fd2b.out,
+ trunk/fuse/z80/tests/fd39.out, trunk/fuse/z80/tests/fde5.out,
+ trunk/fuse/z80/tests/fdf9.out, trunk/fuse/z80/tests/ff.out,
+ trunk/fuse/z80/z80.c, trunk/fuse/z80/z80.pl,
+ trunk/fuse/z80/z80_macros.h: Merge up to fuse-20060731
+
+2006-07-30 13:15 fred
+
+ * trunk/fuse/widget/menu.c: Fix apparent bug with writing PNG
+ screenshots in widget interface
+
+2006-07-29 07:55 fred
+
+ * trunk/fuse/display.c, trunk/fuse/display.h, trunk/fuse/event.c,
+ trunk/fuse/event.h, trunk/fuse/hacking/implementation_notes.txt,
+ trunk/fuse/machine.c, trunk/fuse/machine.h,
+ trunk/fuse/machines/scorpion.c, trunk/fuse/machines/spec128.c,
+ trunk/fuse/machines/specplus3.c, trunk/fuse/memory.c,
+ trunk/fuse/scld.c, trunk/fuse/screenshot.c: New character based
+ renderer fixes regressions with various demos and mixed mode
+ Timex screens.
+
+2006-07-27 12:06 fred
+
+ * trunk/fuse/display.c, trunk/fuse/hacking/ChangeLog,
+ trunk/fuse/machines/ts2068.c, trunk/fuse/screenshot.c,
+ trunk/fuse/screenshot.h, trunk/fuse/ui/gtk/gtkui.c,
+ trunk/fuse/ui/options.dat, trunk/fuse/widget/menu.c,
+ trunk/fuse/z80/tests/README, trunk/fuse/z80/tests/dd00.in,
+ trunk/fuse/z80/tests/dd00.out, trunk/fuse/z80/tests/ddfd00.in,
+ trunk/fuse/z80/tests/ddfd00.out, trunk/fuse/z80/z80.pl,
+ trunk/fuse/z80/z80_macros.h: Merge up to fuse-20060726.
+
+2006-07-27 10:39 fred
+
+ * trunk/fuse/fuse.cpp: Reenable sound after a pause.
+
+2006-07-26 12:38 fred
+
+ * trunk/fuse/fusepb/settings.pl: Make tape autoload snap for ts2068
+ work with case sensitive filesystems.
+
+2006-07-26 12:37 fred
+
+ * trunk/fuse/machines/ts2068.c, trunk/fuse/settings.dat,
+ trunk/fuse/settings.pl: Make tape autoload snap for ts2068 work
+ with case sensitive filesystems.
+
+2006-07-23 22:19 fred
+
+ * trunk/fuse/fusepb/sdlscreenshot.m: Fix png saving for Intel
+ machines.
+
+2006-07-20 14:22 fred
+
+ * trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib: Add
+ setting to adjust microdrive cartridge size.
+
+2006-07-18 14:06 fred
+
+ * trunk/fuse/fusepb/English.lproj/InfoPlist.strings,
+ trunk/fuse/fusepb/Info-Fuse.plist,
+ trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html: Use
+ date for release numbers for beta.
+
+2006-07-18 12:38 fred
+
+ * trunk/FuseImporter/LibspectrumMetadataImporter.m: Get
+ FuseImporter to recognise RLE pulse blocks too.
+
+2006-07-18 12:26 fred
+
+ * trunk/fuse/fusepb/controllers/FuseController.m,
+ trunk/libspectrum/libspectrum/tape.c: Fix to allow loading of csw
+ and raw files, add libspectrum block description for csw/raw
+ files.
+
+2006-07-17 12:42 fred
+
+ * trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj,
+ trunk/FuseImporter/Info.plist, trunk/FuseImporter/libspectrum.h:
+ Bring FuseImporter up to date with libspectrum-20060716.
+
+2006-07-17 12:23 fred
+
+ * trunk/fuse/.cvsignore, trunk/fuse/AUTHORS, trunk/fuse/COPYING,
+ trunk/fuse/ChangeLog, trunk/fuse/Makefile.am, trunk/fuse/README,
+ trunk/fuse/THANKS, trunk/fuse/TODO, trunk/fuse/acinclude.m4,
+ trunk/fuse/autogen.sh, trunk/fuse/ay.c, trunk/fuse/ay.h,
+ trunk/fuse/compat.h, trunk/fuse/compat/.cvsignore,
+ trunk/fuse/compat/Makefile.am, trunk/fuse/compat/dirname.c,
+ trunk/fuse/compat/getopt.c, trunk/fuse/compat/getopt.h,
+ trunk/fuse/compat/getopt1.c, trunk/fuse/compat/mkstemp.c,
+ trunk/fuse/configure.in, trunk/fuse/dck.c, trunk/fuse/dck.h,
+ trunk/fuse/debugger/.cvsignore, trunk/fuse/debugger/Makefile.am,
+ trunk/fuse/debugger/breakpoint.c,
+ trunk/fuse/debugger/breakpoint.h, trunk/fuse/debugger/command.c,
+ trunk/fuse/debugger/commandl.l, trunk/fuse/debugger/commandy.y,
+ trunk/fuse/debugger/debugger.c, trunk/fuse/debugger/debugger.h,
+ trunk/fuse/debugger/debugger_internals.h,
+ trunk/fuse/debugger/disassemble.c,
+ trunk/fuse/debugger/expression.c, trunk/fuse/display.c,
+ trunk/fuse/display.h, trunk/fuse/divide.c, trunk/fuse/divide.h,
+ trunk/fuse/event.c, trunk/fuse/event.h, trunk/fuse/fuse.cpp,
+ trunk/fuse/fuse.h,
+ trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj,
+ trunk/fuse/fusepb/Info-Fuse.plist,
+ trunk/fuse/fusepb/nibs/Preferences.nib/info.nib,
+ trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib,
+ trunk/fuse/fusepb/resources/Fuse Help/html/menus.html,
+ trunk/fuse/fusepb/resources/csw.icns,
+ trunk/fuse/fusepb/resources/raw.icns,
+ trunk/fuse/hacking/.cvsignore, trunk/fuse/hacking/ChangeLog,
+ trunk/fuse/hacking/Makefile.am,
+ trunk/fuse/hacking/coding_style.txt, trunk/fuse/hacking/cvs-tags,
+ trunk/fuse/hacking/implementation_notes.txt,
+ trunk/fuse/hacking/input.txt, trunk/fuse/hacking/sound.txt,
+ trunk/fuse/hacking/tc2048_tech_notes.txt,
+ trunk/fuse/hacking/timer.txt, trunk/fuse/hacking/ui.txt,
+ trunk/fuse/ide.c, trunk/fuse/ide.h, trunk/fuse/if1.c,
+ trunk/fuse/if1.h, trunk/fuse/if2.c, trunk/fuse/if2.h,
+ trunk/fuse/input.c, trunk/fuse/input.h, trunk/fuse/joystick.c,
+ trunk/fuse/joystick.h, trunk/fuse/kempmouse.c,
+ trunk/fuse/kempmouse.h, trunk/fuse/keyboard.c,
+ trunk/fuse/keyboard.h, trunk/fuse/keysyms.dat,
+ trunk/fuse/lib/.cvsignore, trunk/fuse/lib/Makefile.am,
+ trunk/fuse/lib/cassette.bmp,
+ trunk/fuse/lib/compressed/disk_plus3.szx,
+ trunk/fuse/lib/compressed/tape_128.szx,
+ trunk/fuse/lib/compressed/tape_16.szx,
+ trunk/fuse/lib/compressed/tape_2048.szx,
+ trunk/fuse/lib/compressed/tape_2068.szx,
+ trunk/fuse/lib/compressed/tape_48.szx,
+ trunk/fuse/lib/compressed/tape_pentagon.szx,
+ trunk/fuse/lib/compressed/tape_plus2.szx,
+ trunk/fuse/lib/compressed/tape_plus2a.szx,
+ trunk/fuse/lib/compressed/tape_plus3.szx,
+ trunk/fuse/lib/compressed/tape_plus3e.szx,
+ trunk/fuse/lib/compressed/tape_scorpion.szx,
+ trunk/fuse/lib/compressed/tape_se.szx,
+ trunk/fuse/lib/compressed/tape_ts2068.szx,
+ trunk/fuse/lib/keyboard.scr, trunk/fuse/lib/microdrive.bmp,
+ trunk/fuse/lib/plus3disk.bmp,
+ trunk/fuse/lib/uncompressed/disk_plus3.szx,
+ trunk/fuse/lib/uncompressed/tape_128.szx,
+ trunk/fuse/lib/uncompressed/tape_16.szx,
+ trunk/fuse/lib/uncompressed/tape_2048.szx,
+ trunk/fuse/lib/uncompressed/tape_2068.szx,
+ trunk/fuse/lib/uncompressed/tape_48.szx,
+ trunk/fuse/lib/uncompressed/tape_pentagon.szx,
+ trunk/fuse/lib/uncompressed/tape_plus2.szx,
+ trunk/fuse/lib/uncompressed/tape_plus2a.szx,
+ trunk/fuse/lib/uncompressed/tape_plus3.szx,
+ trunk/fuse/lib/uncompressed/tape_plus3e.szx,
+ trunk/fuse/lib/uncompressed/tape_scorpion.szx,
+ trunk/fuse/lib/uncompressed/tape_se.szx,
+ trunk/fuse/lib/uncompressed/tape_ts2068.szx,
+ trunk/fuse/machine.c, trunk/fuse/machine.h,
+ trunk/fuse/machines/.cvsignore, trunk/fuse/machines/Makefile.am,
+ trunk/fuse/machines/machines.h, trunk/fuse/machines/pentagon.c,
+ trunk/fuse/machines/scorpion.c, trunk/fuse/machines/scorpion.h,
+ trunk/fuse/machines/spec128.c, trunk/fuse/machines/spec128.h,
+ trunk/fuse/machines/spec16.c, trunk/fuse/machines/spec48.c,
+ trunk/fuse/machines/spec48.h, trunk/fuse/machines/spec_se.c,
+ trunk/fuse/machines/specplus2.c,
+ trunk/fuse/machines/specplus2a.c,
+ trunk/fuse/machines/specplus3.c, trunk/fuse/machines/specplus3.h,
+ trunk/fuse/machines/specplus3e.c, trunk/fuse/machines/tc2048.c,
+ trunk/fuse/machines/tc2068.c, trunk/fuse/machines/tc2068.h,
+ trunk/fuse/machines/ts2068.c, trunk/fuse/man/.cvsignore,
+ trunk/fuse/man/Makefile.am, trunk/fuse/man/fuse.1,
+ trunk/fuse/memory.c, trunk/fuse/memory.h, trunk/fuse/menu.c,
+ trunk/fuse/menu.h, trunk/fuse/menu_data.c,
+ trunk/fuse/menu_data.pl, trunk/fuse/periph.c,
+ trunk/fuse/periph.h, trunk/fuse/perl/.cvsignore,
+ trunk/fuse/perl/Fuse.pm, trunk/fuse/perl/Fuse/.cvsignore,
+ trunk/fuse/perl/Fuse/Dialog.pm, trunk/fuse/perl/Fuse/Makefile.am,
+ trunk/fuse/perl/Makefile.am, trunk/fuse/pokefinder/.cvsignore,
+ trunk/fuse/pokefinder/Makefile.am,
+ trunk/fuse/pokefinder/pokefinder.c,
+ trunk/fuse/pokefinder/pokefinder.h, trunk/fuse/printer.c,
+ trunk/fuse/printer.h, trunk/fuse/profile.c, trunk/fuse/profile.h,
+ trunk/fuse/psg.c, trunk/fuse/psg.h, trunk/fuse/roms/.cvsignore,
+ trunk/fuse/roms/128-0.rom, trunk/fuse/roms/128-1.rom,
+ trunk/fuse/roms/128p-0.rom, trunk/fuse/roms/128p-1.rom,
+ trunk/fuse/roms/256s-0.rom, trunk/fuse/roms/256s-1.rom,
+ trunk/fuse/roms/256s-2.rom, trunk/fuse/roms/256s-3.rom,
+ trunk/fuse/roms/48.rom, trunk/fuse/roms/Makefile.am,
+ trunk/fuse/roms/if1-1.rom, trunk/fuse/roms/if1-2.rom,
+ trunk/fuse/roms/plus2-0.rom, trunk/fuse/roms/plus2-1.rom,
+ trunk/fuse/roms/plus3-0.rom, trunk/fuse/roms/plus3-1.rom,
+ trunk/fuse/roms/plus3-2.rom, trunk/fuse/roms/plus3-3.rom,
+ trunk/fuse/roms/plus3e-0.rom, trunk/fuse/roms/plus3e-1.rom,
+ trunk/fuse/roms/plus3e-2.rom, trunk/fuse/roms/plus3e-3.rom,
+ trunk/fuse/roms/se-0.rom, trunk/fuse/roms/se-1.rom,
+ trunk/fuse/roms/tc2048.rom, trunk/fuse/roms/tc2068-0.rom,
+ trunk/fuse/roms/tc2068-1.rom, trunk/fuse/roms/trdos.rom,
+ trunk/fuse/rzx.c, trunk/fuse/rzx.h, trunk/fuse/scld.c,
+ trunk/fuse/scld.h, trunk/fuse/screenshot.c,
+ trunk/fuse/screenshot.h, trunk/fuse/settings.dat,
+ trunk/fuse/simpleide.c, trunk/fuse/simpleide.h, trunk/fuse/slt.c,
+ trunk/fuse/slt.h, trunk/fuse/snapshot.c, trunk/fuse/snapshot.h,
+ trunk/fuse/sound.c, trunk/fuse/sound.h,
+ trunk/fuse/sound/.cvsignore, trunk/fuse/sound/Makefile.am,
+ trunk/fuse/sound/aosound.c, trunk/fuse/sound/dxsound.c,
+ trunk/fuse/sound/hpsound.c, trunk/fuse/sound/lowlevel.h,
+ trunk/fuse/sound/nullsound.c, trunk/fuse/sound/osssound.c,
+ trunk/fuse/sound/sdlsound.c, trunk/fuse/sound/sfifo.c,
+ trunk/fuse/sound/sfifo.h, trunk/fuse/sound/sunsound.c,
+ trunk/fuse/spectrum.c, trunk/fuse/spectrum.h, trunk/fuse/tape.c,
+ trunk/fuse/tape.h, trunk/fuse/timer.c, trunk/fuse/timer.h,
+ trunk/fuse/trdos.c, trunk/fuse/trdos.h, trunk/fuse/ui.c,
+ trunk/fuse/ui/.cvsignore, trunk/fuse/ui/Makefile.am,
+ trunk/fuse/ui/aalib/.cvsignore, trunk/fuse/ui/aalib/Makefile.am,
+ trunk/fuse/ui/aalib/aalibdisplay.c,
+ trunk/fuse/ui/aalib/aalibkeyboard.c,
+ trunk/fuse/ui/aalib/aalibkeyboard.h,
+ trunk/fuse/ui/aalib/aalibui.c, trunk/fuse/ui/aalib/aalibui.h,
+ trunk/fuse/ui/aalib/error.c, trunk/fuse/ui/fb/.cvsignore,
+ trunk/fuse/ui/fb/Makefile.am, trunk/fuse/ui/fb/fbdisplay.c,
+ trunk/fuse/ui/fb/fbdisplay.h, trunk/fuse/ui/fb/fbjoystick.c,
+ trunk/fuse/ui/fb/fbkeyboard.c, trunk/fuse/ui/fb/fbkeyboard.h,
+ trunk/fuse/ui/fb/fbmouse.c, trunk/fuse/ui/fb/fbmouse.h,
+ trunk/fuse/ui/fb/fbui.c, trunk/fuse/ui/ggi/.cvsignore,
+ trunk/fuse/ui/ggi/Makefile.am, trunk/fuse/ui/ggi/ggi_internals.h,
+ trunk/fuse/ui/ggi/ggidisplay.c, trunk/fuse/ui/ggi/ggikeyboard.c,
+ trunk/fuse/ui/ggi/ggiui.c, trunk/fuse/ui/gtk/.cvsignore,
+ trunk/fuse/ui/gtk/Makefile.am, trunk/fuse/ui/gtk/binary.c,
+ trunk/fuse/ui/gtk/browse.c, trunk/fuse/ui/gtk/confirm.c,
+ trunk/fuse/ui/gtk/debugger.c, trunk/fuse/ui/gtk/fileselector.c,
+ trunk/fuse/ui/gtk/gtkdisplay.c, trunk/fuse/ui/gtk/gtkinternals.h,
+ trunk/fuse/ui/gtk/gtkjoystick.c, trunk/fuse/ui/gtk/gtkkeyboard.c,
+ trunk/fuse/ui/gtk/gtkmouse.c, trunk/fuse/ui/gtk/gtkui.c,
+ trunk/fuse/ui/gtk/memory.c, trunk/fuse/ui/gtk/picture.c,
+ trunk/fuse/ui/gtk/pixmaps.c, trunk/fuse/ui/gtk/pokefinder.c,
+ trunk/fuse/ui/gtk/rollback.c, trunk/fuse/ui/gtk/roms.c,
+ trunk/fuse/ui/gtk/statusbar.c, trunk/fuse/ui/gtk/stock.c,
+ trunk/fuse/ui/options.dat, trunk/fuse/ui/scaler/.cvsignore,
+ trunk/fuse/ui/scaler/Makefile.am, trunk/fuse/ui/scaler/scaler.c,
+ trunk/fuse/ui/scaler/scaler.h,
+ trunk/fuse/ui/scaler/scaler_internals.h,
+ trunk/fuse/ui/sdl/.cvsignore, trunk/fuse/ui/sdl/Makefile.am,
+ trunk/fuse/ui/sdl/sdldisplay.c, trunk/fuse/ui/sdl/sdldisplay.h,
+ trunk/fuse/ui/sdl/sdljoystick.c, trunk/fuse/ui/sdl/sdljoystick.h,
+ trunk/fuse/ui/sdl/sdlkeyboard.c, trunk/fuse/ui/sdl/sdlkeyboard.h,
+ trunk/fuse/ui/sdl/sdlui.c, trunk/fuse/ui/svga/.cvsignore,
+ trunk/fuse/ui/svga/Makefile.am, trunk/fuse/ui/svga/svgadisplay.c,
+ trunk/fuse/ui/svga/svgadisplay.h,
+ trunk/fuse/ui/svga/svgajoystick.c,
+ trunk/fuse/ui/svga/svgakeyboard.c,
+ trunk/fuse/ui/svga/svgakeyboard.h, trunk/fuse/ui/svga/svgaui.c,
+ trunk/fuse/ui/ui.h, trunk/fuse/ui/uidisplay.h,
+ trunk/fuse/ui/uijoystick.c, trunk/fuse/ui/uijoystick.h,
+ trunk/fuse/ui/win32/.cvsignore, trunk/fuse/ui/win32/Makefile.am,
+ trunk/fuse/ui/win32/debugger.c, trunk/fuse/ui/win32/debugger.h,
+ trunk/fuse/ui/win32/debugger.rc, trunk/fuse/ui/win32/del_o.bat,
+ trunk/fuse/ui/win32/error.c,
+ trunk/fuse/ui/win32/icons/disk_active.bmp,
+ trunk/fuse/ui/win32/icons/disk_inactive.bmp,
+ trunk/fuse/ui/win32/icons/pause_active.bmp,
+ trunk/fuse/ui/win32/icons/pause_inactive.bmp,
+ trunk/fuse/ui/win32/icons/tape_active.bmp,
+ trunk/fuse/ui/win32/icons/tape_inactive.bmp,
+ trunk/fuse/ui/win32/icons/tape_marker.bmp,
+ trunk/fuse/ui/win32/keysyms.c, trunk/fuse/ui/win32/menu_data.c,
+ trunk/fuse/ui/win32/menu_data.h,
+ trunk/fuse/ui/win32/menu_data.rc,
+ trunk/fuse/ui/win32/pokefinder.c,
+ trunk/fuse/ui/win32/pokefinder.h,
+ trunk/fuse/ui/win32/pokefinder.rc,
+ trunk/fuse/ui/win32/statusbar.c, trunk/fuse/ui/win32/todo.txt,
+ trunk/fuse/ui/win32/win32display.c,
+ trunk/fuse/ui/win32/win32display.h,
+ trunk/fuse/ui/win32/win32internals.h,
+ trunk/fuse/ui/win32/win32keyboard.c,
+ trunk/fuse/ui/win32/win32keyboard.h,
+ trunk/fuse/ui/win32/win32ui.c, trunk/fuse/ui/win32/win32ui.rc,
+ trunk/fuse/ui/xlib/.cvsignore, trunk/fuse/ui/xlib/Makefile.am,
+ trunk/fuse/ui/xlib/xdisplay.c, trunk/fuse/ui/xlib/xdisplay.h,
+ trunk/fuse/ui/xlib/xerror.c, trunk/fuse/ui/xlib/xjoystick.c,
+ trunk/fuse/ui/xlib/xkeyboard.c, trunk/fuse/ui/xlib/xkeyboard.h,
+ trunk/fuse/ui/xlib/xui.c, trunk/fuse/ui/xlib/xui.h,
+ trunk/fuse/uidisplay.c, trunk/fuse/ula.c, trunk/fuse/ula.h,
+ trunk/fuse/utils.c, trunk/fuse/utils.h,
+ trunk/fuse/widget/.cvsignore, trunk/fuse/widget/Makefile.am,
+ trunk/fuse/widget/browse.c, trunk/fuse/widget/debugger.c,
+ trunk/fuse/widget/error.c, trunk/fuse/widget/filesel.c,
+ trunk/fuse/widget/fuse.font.sbf, trunk/fuse/widget/memory.c,
+ trunk/fuse/widget/menu.c, trunk/fuse/widget/mkfusefont.pl,
+ trunk/fuse/widget/picture.c, trunk/fuse/widget/pokefinder.c,
+ trunk/fuse/widget/query.c, trunk/fuse/widget/roms.c,
+ trunk/fuse/widget/select.c, trunk/fuse/widget/text.c,
+ trunk/fuse/widget/widget.c, trunk/fuse/widget/widget.h,
+ trunk/fuse/widget/widget_internals.h, trunk/fuse/z80/.cvsignore,
+ trunk/fuse/z80/Makefile.am, trunk/fuse/z80/coretest.c,
+ trunk/fuse/z80/opcodes_base.dat, trunk/fuse/z80/opcodes_cb.dat,
+ trunk/fuse/z80/opcodes_ddfd.dat,
+ trunk/fuse/z80/opcodes_ddfdcb.dat, trunk/fuse/z80/opcodes_ed.dat,
+ trunk/fuse/z80/tests/.cvsignore, trunk/fuse/z80/tests/00.in,
+ trunk/fuse/z80/tests/00.out, trunk/fuse/z80/tests/01.in,
+ trunk/fuse/z80/tests/01.out, trunk/fuse/z80/tests/02.in,
+ trunk/fuse/z80/tests/02.out, trunk/fuse/z80/tests/03.in,
+ trunk/fuse/z80/tests/03.out, trunk/fuse/z80/tests/04.in,
+ trunk/fuse/z80/tests/04.out, trunk/fuse/z80/tests/05.in,
+ trunk/fuse/z80/tests/05.out, trunk/fuse/z80/tests/06.in,
+ trunk/fuse/z80/tests/06.out, trunk/fuse/z80/tests/07.in,
+ trunk/fuse/z80/tests/07.out, trunk/fuse/z80/tests/08.in,
+ trunk/fuse/z80/tests/08.out, trunk/fuse/z80/tests/09.in,
+ trunk/fuse/z80/tests/09.out, trunk/fuse/z80/tests/0a.in,
+ trunk/fuse/z80/tests/0a.out, trunk/fuse/z80/tests/0b.in,
+ trunk/fuse/z80/tests/0b.out, trunk/fuse/z80/tests/0c.in,
+ trunk/fuse/z80/tests/0c.out, trunk/fuse/z80/tests/0d.in,
+ trunk/fuse/z80/tests/0d.out, trunk/fuse/z80/tests/0e.in,
+ trunk/fuse/z80/tests/0e.out, trunk/fuse/z80/tests/0f.in,
+ trunk/fuse/z80/tests/0f.out, trunk/fuse/z80/tests/10.in,
+ trunk/fuse/z80/tests/10.out, trunk/fuse/z80/tests/11.in,
+ trunk/fuse/z80/tests/11.out, trunk/fuse/z80/tests/12.in,
+ trunk/fuse/z80/tests/12.out, trunk/fuse/z80/tests/13.in,
+ trunk/fuse/z80/tests/13.out, trunk/fuse/z80/tests/14.in,
+ trunk/fuse/z80/tests/14.out, trunk/fuse/z80/tests/15.in,
+ trunk/fuse/z80/tests/15.out, trunk/fuse/z80/tests/16.in,
+ trunk/fuse/z80/tests/16.out, trunk/fuse/z80/tests/17.in,
+ trunk/fuse/z80/tests/17.out, trunk/fuse/z80/tests/18.in,
+ trunk/fuse/z80/tests/18.out, trunk/fuse/z80/tests/19.in,
+ trunk/fuse/z80/tests/19.out, trunk/fuse/z80/tests/1a.in,
+ trunk/fuse/z80/tests/1a.out, trunk/fuse/z80/tests/1b.in,
+ trunk/fuse/z80/tests/1b.out, trunk/fuse/z80/tests/1c.in,
+ trunk/fuse/z80/tests/1c.out, trunk/fuse/z80/tests/1d.in,
+ trunk/fuse/z80/tests/1d.out, trunk/fuse/z80/tests/1e.in,
+ trunk/fuse/z80/tests/1e.out, trunk/fuse/z80/tests/1f.in,
+ trunk/fuse/z80/tests/1f.out, trunk/fuse/z80/tests/20_1.in,
+ trunk/fuse/z80/tests/20_1.out, trunk/fuse/z80/tests/20_2.in,
+ trunk/fuse/z80/tests/20_2.out, trunk/fuse/z80/tests/21.in,
+ trunk/fuse/z80/tests/21.out, trunk/fuse/z80/tests/22.in,
+ trunk/fuse/z80/tests/22.out, trunk/fuse/z80/tests/23.in,
+ trunk/fuse/z80/tests/23.out, trunk/fuse/z80/tests/24.in,
+ trunk/fuse/z80/tests/24.out, trunk/fuse/z80/tests/25.in,
+ trunk/fuse/z80/tests/25.out, trunk/fuse/z80/tests/26.in,
+ trunk/fuse/z80/tests/26.out, trunk/fuse/z80/tests/27.in,
+ trunk/fuse/z80/tests/27.out, trunk/fuse/z80/tests/28_1.in,
+ trunk/fuse/z80/tests/28_1.out, trunk/fuse/z80/tests/28_2.in,
+ trunk/fuse/z80/tests/28_2.out, trunk/fuse/z80/tests/29.in,
+ trunk/fuse/z80/tests/29.out, trunk/fuse/z80/tests/2a.in,
+ trunk/fuse/z80/tests/2a.out, trunk/fuse/z80/tests/2b.in,
+ trunk/fuse/z80/tests/2b.out, trunk/fuse/z80/tests/2c.in,
+ trunk/fuse/z80/tests/2c.out, trunk/fuse/z80/tests/2d.in,
+ trunk/fuse/z80/tests/2d.out, trunk/fuse/z80/tests/2e.in,
+ trunk/fuse/z80/tests/2e.out, trunk/fuse/z80/tests/2f.in,
+ trunk/fuse/z80/tests/2f.out, trunk/fuse/z80/tests/30_1.in,
+ trunk/fuse/z80/tests/30_1.out, trunk/fuse/z80/tests/30_2.in,
+ trunk/fuse/z80/tests/30_2.out, trunk/fuse/z80/tests/31.in,
+ trunk/fuse/z80/tests/31.out, trunk/fuse/z80/tests/32.in,
+ trunk/fuse/z80/tests/32.out, trunk/fuse/z80/tests/33.in,
+ trunk/fuse/z80/tests/33.out, trunk/fuse/z80/tests/34.in,
+ trunk/fuse/z80/tests/34.out, trunk/fuse/z80/tests/35.in,
+ trunk/fuse/z80/tests/35.out, trunk/fuse/z80/tests/36.in,
+ trunk/fuse/z80/tests/36.out, trunk/fuse/z80/tests/37.in,
+ trunk/fuse/z80/tests/37.out, trunk/fuse/z80/tests/37_1.in,
+ trunk/fuse/z80/tests/37_1.out, trunk/fuse/z80/tests/37_2.in,
+ trunk/fuse/z80/tests/37_2.out, trunk/fuse/z80/tests/37_3.in,
+ trunk/fuse/z80/tests/37_3.out, trunk/fuse/z80/tests/38_1.in,
+ trunk/fuse/z80/tests/38_1.out, trunk/fuse/z80/tests/38_2.in,
+ trunk/fuse/z80/tests/38_2.out, trunk/fuse/z80/tests/39.in,
+ trunk/fuse/z80/tests/39.out, trunk/fuse/z80/tests/3a.in,
+ trunk/fuse/z80/tests/3a.out, trunk/fuse/z80/tests/3b.in,
+ trunk/fuse/z80/tests/3b.out, trunk/fuse/z80/tests/3c.in,
+ trunk/fuse/z80/tests/3c.out, trunk/fuse/z80/tests/3d.in,
+ trunk/fuse/z80/tests/3d.out, trunk/fuse/z80/tests/3e.in,
+ trunk/fuse/z80/tests/3e.out, trunk/fuse/z80/tests/3f.in,
+ trunk/fuse/z80/tests/3f.out, trunk/fuse/z80/tests/40.in,
+ trunk/fuse/z80/tests/40.out, trunk/fuse/z80/tests/41.in,
+ trunk/fuse/z80/tests/41.out, trunk/fuse/z80/tests/42.in,
+ trunk/fuse/z80/tests/42.out, trunk/fuse/z80/tests/43.in,
+ trunk/fuse/z80/tests/43.out, trunk/fuse/z80/tests/44.in,
+ trunk/fuse/z80/tests/44.out, trunk/fuse/z80/tests/45.in,
+ trunk/fuse/z80/tests/45.out, trunk/fuse/z80/tests/46.in,
+ trunk/fuse/z80/tests/46.out, trunk/fuse/z80/tests/47.in,
+ trunk/fuse/z80/tests/47.out, trunk/fuse/z80/tests/48.in,
+ trunk/fuse/z80/tests/48.out, trunk/fuse/z80/tests/49.in,
+ trunk/fuse/z80/tests/49.out, trunk/fuse/z80/tests/4a.in,
+ trunk/fuse/z80/tests/4a.out, trunk/fuse/z80/tests/4b.in,
+ trunk/fuse/z80/tests/4b.out, trunk/fuse/z80/tests/4c.in,
+ trunk/fuse/z80/tests/4c.out, trunk/fuse/z80/tests/4d.in,
+ trunk/fuse/z80/tests/4d.out, trunk/fuse/z80/tests/4e.in,
+ trunk/fuse/z80/tests/4e.out, trunk/fuse/z80/tests/4f.in,
+ trunk/fuse/z80/tests/4f.out, trunk/fuse/z80/tests/50.in,
+ trunk/fuse/z80/tests/50.out, trunk/fuse/z80/tests/51.in,
+ trunk/fuse/z80/tests/51.out, trunk/fuse/z80/tests/52.in,
+ trunk/fuse/z80/tests/52.out, trunk/fuse/z80/tests/53.in,
+ trunk/fuse/z80/tests/53.out, trunk/fuse/z80/tests/54.in,
+ trunk/fuse/z80/tests/54.out, trunk/fuse/z80/tests/55.in,
+ trunk/fuse/z80/tests/55.out, trunk/fuse/z80/tests/56.in,
+ trunk/fuse/z80/tests/56.out, trunk/fuse/z80/tests/57.in,
+ trunk/fuse/z80/tests/57.out, trunk/fuse/z80/tests/58.in,
+ trunk/fuse/z80/tests/58.out, trunk/fuse/z80/tests/59.in,
+ trunk/fuse/z80/tests/59.out, trunk/fuse/z80/tests/5a.in,
+ trunk/fuse/z80/tests/5a.out, trunk/fuse/z80/tests/5b.in,
+ trunk/fuse/z80/tests/5b.out, trunk/fuse/z80/tests/5c.in,
+ trunk/fuse/z80/tests/5c.out, trunk/fuse/z80/tests/5d.in,
+ trunk/fuse/z80/tests/5d.out, trunk/fuse/z80/tests/5e.in,
+ trunk/fuse/z80/tests/5e.out, trunk/fuse/z80/tests/5f.in,
+ trunk/fuse/z80/tests/5f.out, trunk/fuse/z80/tests/60.in,
+ trunk/fuse/z80/tests/60.out, trunk/fuse/z80/tests/61.in,
+ trunk/fuse/z80/tests/61.out, trunk/fuse/z80/tests/62.in,
+ trunk/fuse/z80/tests/62.out, trunk/fuse/z80/tests/63.in,
+ trunk/fuse/z80/tests/63.out, trunk/fuse/z80/tests/64.in,
+ trunk/fuse/z80/tests/64.out, trunk/fuse/z80/tests/65.in,
+ trunk/fuse/z80/tests/65.out, trunk/fuse/z80/tests/66.in,
+ trunk/fuse/z80/tests/66.out, trunk/fuse/z80/tests/67.in,
+ trunk/fuse/z80/tests/67.out, trunk/fuse/z80/tests/68.in,
+ trunk/fuse/z80/tests/68.out, trunk/fuse/z80/tests/69.in,
+ trunk/fuse/z80/tests/69.out, trunk/fuse/z80/tests/6a.in,
+ trunk/fuse/z80/tests/6a.out, trunk/fuse/z80/tests/6b.in,
+ trunk/fuse/z80/tests/6b.out, trunk/fuse/z80/tests/6c.in,
+ trunk/fuse/z80/tests/6c.out, trunk/fuse/z80/tests/6d.in,
+ t...
[truncated message content] |
|
From: <fr...@us...> - 2007-04-11 13:28:56
|
Revision: 357
http://svn.sourceforge.net/fuse-for-macosx/?rev=357&view=rev
Author: fredm
Date: 2007-04-11 06:28:46 -0700 (Wed, 11 Apr 2007)
Log Message:
-----------
Create Release-0_8_0 tag.
Added Paths:
-----------
tags/Release-0_8_0/
Copied: tags/Release-0_8_0 (from rev 356, branches/Release-0_8_0)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2007-04-11 13:22:13
|
Revision: 356
http://svn.sourceforge.net/fuse-for-macosx/?rev=356&view=rev
Author: fredm
Date: 2007-04-11 06:22:14 -0700 (Wed, 11 Apr 2007)
Log Message:
-----------
Merge up to bzip2-1.0.4
Modified Paths:
--------------
branches/Release-0_8_0/bzip2/English.lproj/InfoPlist.strings
branches/Release-0_8_0/bzip2/Info.plist
branches/Release-0_8_0/bzip2/bzip2/CHANGES
branches/Release-0_8_0/bzip2/bzip2/LICENSE
branches/Release-0_8_0/bzip2/bzip2/Makefile
branches/Release-0_8_0/bzip2/bzip2/Makefile-libbz2_so
branches/Release-0_8_0/bzip2/bzip2/README
branches/Release-0_8_0/bzip2/bzip2/README.COMPILATION.PROBLEMS
branches/Release-0_8_0/bzip2/bzip2/README.XML.STUFF
branches/Release-0_8_0/bzip2/bzip2/blocksort.c
branches/Release-0_8_0/bzip2/bzip2/bz-fo.xsl
branches/Release-0_8_0/bzip2/bzip2/bzdiff
branches/Release-0_8_0/bzip2/bzip2/bzgrep
branches/Release-0_8_0/bzip2/bzip2/bzip2.1
branches/Release-0_8_0/bzip2/bzip2/bzip2.1.preformatted
branches/Release-0_8_0/bzip2/bzip2/bzip2.c
branches/Release-0_8_0/bzip2/bzip2/bzip2.txt
branches/Release-0_8_0/bzip2/bzip2/bzip2recover.c
branches/Release-0_8_0/bzip2/bzip2/bzlib.c
branches/Release-0_8_0/bzip2/bzip2/bzlib.h
branches/Release-0_8_0/bzip2/bzip2/bzlib_private.h
branches/Release-0_8_0/bzip2/bzip2/compress.c
branches/Release-0_8_0/bzip2/bzip2/crctable.c
branches/Release-0_8_0/bzip2/bzip2/decompress.c
branches/Release-0_8_0/bzip2/bzip2/dlltest.c
branches/Release-0_8_0/bzip2/bzip2/entities.xml
branches/Release-0_8_0/bzip2/bzip2/format.pl
branches/Release-0_8_0/bzip2/bzip2/huffman.c
branches/Release-0_8_0/bzip2/bzip2/manual.html
branches/Release-0_8_0/bzip2/bzip2/manual.pdf
branches/Release-0_8_0/bzip2/bzip2/manual.ps
branches/Release-0_8_0/bzip2/bzip2/manual.xml
branches/Release-0_8_0/bzip2/bzip2/mk251.c
branches/Release-0_8_0/bzip2/bzip2/randtable.c
branches/Release-0_8_0/bzip2/bzip2/spewG.c
branches/Release-0_8_0/bzip2/bzip2/unzcrash.c
branches/Release-0_8_0/bzip2/bzip2/words0
branches/Release-0_8_0/bzip2/bzip2/words2
branches/Release-0_8_0/bzip2/bzip2/words3
branches/Release-0_8_0/bzip2/bzip2/xmlproc.sh
Removed Paths:
-------------
branches/Release-0_8_0/bzip2/bzip2/Y2K_INFO
Modified: branches/Release-0_8_0/bzip2/English.lproj/InfoPlist.strings
===================================================================
(Binary files differ)
Modified: branches/Release-0_8_0/bzip2/Info.plist
===================================================================
--- branches/Release-0_8_0/bzip2/Info.plist 2007-04-11 13:09:54 UTC (rev 355)
+++ branches/Release-0_8_0/bzip2/Info.plist 2007-04-11 13:22:14 UTC (rev 356)
@@ -17,7 +17,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>1.0.3</string>
+ <string>1.0.4</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
Modified: branches/Release-0_8_0/bzip2/bzip2/CHANGES
===================================================================
--- branches/Release-0_8_0/bzip2/bzip2/CHANGES 2007-04-11 13:09:54 UTC (rev 355)
+++ branches/Release-0_8_0/bzip2/bzip2/CHANGES 2007-04-11 13:22:14 UTC (rev 356)
@@ -1,5 +1,18 @@
+ ------------------------------------------------------------------
+ This file is part of bzip2/libbzip2, a program and library for
+ lossless, block-sorting data compression.
+ bzip2/libbzip2 version 1.0.4 of 20 December 2006
+ Copyright (C) 1996-2006 Julian Seward <js...@bz...>
+ Please read the WARNING, DISCLAIMER and PATENTS sections in the
+ README file.
+
+ This program is released under the terms of the license contained
+ in the file LICENSE.
+ ------------------------------------------------------------------
+
+
0.9.0
~~~~~
First version.
@@ -261,7 +274,7 @@
decompressor to crash, loop or access memory which does not
belong to it. If you are using bzip2 or the library to
decompress bitstreams from untrusted sources, an upgrade
- to 1.0.3 is recommended.
+ to 1.0.3 is recommended. This fixes CAN-2005-1260.
* The documentation has been converted to XML, from which html
and pdf can be derived.
@@ -273,3 +286,29 @@
* The BZ_NO_STDIO cpp symbol was not properly observed in 1.0.2.
This has been fixed.
+
+
+1.0.4 (20 Dec 06)
+~~~~~~~~~~~~~~~~~
+Fixes some minor bugs since the last version, 1.0.3.
+
+* Fix file permissions race problem (CAN-2005-0953).
+
+* Avoid possible segfault in BZ2_bzclose. From Coverity's NetBSD
+ scan.
+
+* 'const'/prototype cleanups in the C code.
+
+* Change default install location to /usr/local, and handle multiple
+ 'make install's without error.
+
+* Sanitise file names more carefully in bzgrep. Fixes CAN-2005-0758
+ to the extent that applies to bzgrep.
+
+* Use 'mktemp' rather than 'tempfile' in bzdiff.
+
+* Tighten up a couple of assertions in blocksort.c following automated
+ analysis.
+
+* Fix minor doc/comment bugs.
+
Modified: branches/Release-0_8_0/bzip2/bzip2/LICENSE
===================================================================
--- branches/Release-0_8_0/bzip2/bzip2/LICENSE 2007-04-11 13:09:54 UTC (rev 355)
+++ branches/Release-0_8_0/bzip2/bzip2/LICENSE 2007-04-11 13:22:14 UTC (rev 356)
@@ -1,6 +1,8 @@
+--------------------------------------------------------------------------
+
This program, "bzip2", the associated library "libbzip2", and all
-documentation, are copyright (C) 1996-2005 Julian R Seward. All
+documentation, are copyright (C) 1996-2006 Julian R Seward. All
rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -35,6 +37,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Julian Seward, Cambridge, UK.
-js...@ac...
-bzip2/libbzip2 version 1.0.3 of 15 February 2005
+js...@bz...
+bzip2/libbzip2 version 1.0.4 of 20 December 2006
+--------------------------------------------------------------------------
Modified: branches/Release-0_8_0/bzip2/bzip2/Makefile
===================================================================
--- branches/Release-0_8_0/bzip2/bzip2/Makefile 2007-04-11 13:09:54 UTC (rev 355)
+++ branches/Release-0_8_0/bzip2/bzip2/Makefile 2007-04-11 13:22:14 UTC (rev 356)
@@ -1,3 +1,16 @@
+# ------------------------------------------------------------------
+# This file is part of bzip2/libbzip2, a program and library for
+# lossless, block-sorting data compression.
+#
+# bzip2/libbzip2 version 1.0.4 of 20 December 2006
+# Copyright (C) 1996-2006 Julian Seward <js...@bz...>
+#
+# Please read the WARNING, DISCLAIMER and PATENTS sections in the
+# README file.
+#
+# This program is released under the terms of the license contained
+# in the file LICENSE.
+# ------------------------------------------------------------------
SHELL=/bin/sh
@@ -8,10 +21,10 @@
LDFLAGS=
BIGFILES=-D_FILE_OFFSET_BITS=64
-CFLAGS=-Wall -Winline -O -g $(BIGFILES)
+CFLAGS=-Wall -Winline -O2 -g $(BIGFILES)
# Where you want it installed when you do 'make install'
-PREFIX=/usr
+PREFIX=/usr/local
OBJS= blocksort.o \
@@ -77,14 +90,14 @@
cp -f libbz2.a $(PREFIX)/lib
chmod a+r $(PREFIX)/lib/libbz2.a
cp -f bzgrep $(PREFIX)/bin/bzgrep
- ln $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep
- ln $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep
+ ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep
+ ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep
chmod a+x $(PREFIX)/bin/bzgrep
cp -f bzmore $(PREFIX)/bin/bzmore
- ln $(PREFIX)/bin/bzmore $(PREFIX)/bin/bzless
+ ln -s -f $(PREFIX)/bin/bzmore $(PREFIX)/bin/bzless
chmod a+x $(PREFIX)/bin/bzmore
cp -f bzdiff $(PREFIX)/bin/bzdiff
- ln $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp
+ ln -s -f $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp
chmod a+x $(PREFIX)/bin/bzdiff
cp -f bzgrep.1 bzmore.1 bzdiff.1 $(PREFIX)/man/man1
chmod a+r $(PREFIX)/man/man1/bzgrep.1
@@ -124,10 +137,10 @@
distclean: clean
rm -f manual.ps manual.html manual.pdf
-DISTNAME=bzip2-1.0.3
+DISTNAME=bzip2-1.0.4
dist: check manual
rm -f $(DISTNAME)
- ln -sf . $(DISTNAME)
+ ln -s -f . $(DISTNAME)
tar cvf $(DISTNAME).tar \
$(DISTNAME)/blocksort.c \
$(DISTNAME)/huffman.c \
@@ -167,7 +180,6 @@
$(DISTNAME)/libbz2.dsp \
$(DISTNAME)/dlltest.dsp \
$(DISTNAME)/makefile.msc \
- $(DISTNAME)/Y2K_INFO \
$(DISTNAME)/unzcrash.c \
$(DISTNAME)/spewG.c \
$(DISTNAME)/mk251.c \
Modified: branches/Release-0_8_0/bzip2/bzip2/Makefile-libbz2_so
===================================================================
--- branches/Release-0_8_0/bzip2/bzip2/Makefile-libbz2_so 2007-04-11 13:09:54 UTC (rev 355)
+++ branches/Release-0_8_0/bzip2/bzip2/Makefile-libbz2_so 2007-04-11 13:22:14 UTC (rev 356)
@@ -1,15 +1,30 @@
# This Makefile builds a shared version of the library,
-# libbz2.so.1.0.3, with soname libbz2.so.1.0,
+# libbz2.so.1.0.4, with soname libbz2.so.1.0,
# at least on x86-Linux (RedHat 7.2),
# with gcc-2.96 20000731 (Red Hat Linux 7.1 2.96-98).
-# Please see the README file for some
-# important info about building the library like this.
+# Please see the README file for some important info
+# about building the library like this.
+# ------------------------------------------------------------------
+# This file is part of bzip2/libbzip2, a program and library for
+# lossless, block-sorting data compression.
+#
+# bzip2/libbzip2 version 1.0.4 of 20 December 2006
+# Copyright (C) 1996-2006 Julian Seward <js...@bz...>
+#
+# Please read the WARNING, DISCLAIMER and PATENTS sections in the
+# README file.
+#
+# This program is released under the terms of the license contained
+# in the file LICENSE.
+# ------------------------------------------------------------------
+
+
SHELL=/bin/sh
CC=gcc
BIGFILES=-D_FILE_OFFSET_BITS=64
-CFLAGS=-fpic -fPIC -Wall -Winline -O -g
+CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES)
OBJS= blocksort.o \
huffman.o \
@@ -20,13 +35,13 @@
bzlib.o
all: $(OBJS)
- $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.3 $(OBJS)
- $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.3
+ $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.4 $(OBJS)
+ $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.4
rm -f libbz2.so.1.0
- ln -s libbz2.so.1.0.3 libbz2.so.1.0
+ ln -s libbz2.so.1.0.4 libbz2.so.1.0
clean:
- rm -f $(OBJS) bzip2.o libbz2.so.1.0.3 libbz2.so.1.0 bzip2-shared
+ rm -f $(OBJS) bzip2.o libbz2.so.1.0.4 libbz2.so.1.0 bzip2-shared
blocksort.o: blocksort.c
$(CC) $(CFLAGS) -c blocksort.c
Modified: branches/Release-0_8_0/bzip2/bzip2/README
===================================================================
--- branches/Release-0_8_0/bzip2/bzip2/README 2007-04-11 13:09:54 UTC (rev 355)
+++ branches/Release-0_8_0/bzip2/bzip2/README 2007-04-11 13:22:14 UTC (rev 356)
@@ -1,35 +1,50 @@
-This is the README for bzip2, a block-sorting file compressor, version
-1.0.3. This version is fully compatible with the previous public
-releases, versions 0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1 and 1.0.2.
+This is the README for bzip2/libzip2.
+This version is fully compatible with the previous public releases.
-bzip2-1.0.3 is distributed under a BSD-style license. For details,
-see the file LICENSE.
+------------------------------------------------------------------
+This file is part of bzip2/libbzip2, a program and library for
+lossless, block-sorting data compression.
+bzip2/libbzip2 version 1.0.4 of 20 December 2006
+Copyright (C) 1996-2006 Julian Seward <js...@bz...>
+
+Please read the WARNING, DISCLAIMER and PATENTS sections in this file.
+
+This program is released under the terms of the license contained
+in the file LICENSE.
+------------------------------------------------------------------
+
Complete documentation is available in Postscript form (manual.ps),
PDF (manual.pdf) or html (manual.html). A plain-text version of the
-manual page is available as bzip2.txt. A statement about Y2K issues
-is now included in the file Y2K_INFO.
+manual page is available as bzip2.txt.
HOW TO BUILD -- UNIX
-Type `make'. This builds the library libbz2.a and then the
-programs bzip2 and bzip2recover. Six self-tests are run.
-If the self-tests complete ok, carry on to installation:
+Type 'make'. This builds the library libbz2.a and then the programs
+bzip2 and bzip2recover. Six self-tests are run. If the self-tests
+complete ok, carry on to installation:
-To install in /usr/bin, /usr/lib, /usr/man and /usr/include, type
+To install in /usr/local/bin, /usr/local/lib, /usr/local/man and
+/usr/local/include, type
+
make install
-To install somewhere else, eg, /xxx/yyy/{bin,lib,man,include}, type
+
+To install somewhere else, eg, /xxx/yyy/{bin,lib,man,include}, type
+
make install PREFIX=/xxx/yyy
+
If you are (justifiably) paranoid and want to see what 'make install'
is going to do, you can first do
+
make -n install or
make -n install PREFIX=/xxx/yyy respectively.
-The -n instructs make to show the commands it would execute, but
-not actually execute them.
+The -n instructs make to show the commands it would execute, but not
+actually execute them.
+
HOW TO BUILD -- UNIX, shared library libbz2.so.
Do 'make -f Makefile-libbz2_so'. This Makefile seems to work for
@@ -49,23 +64,25 @@
bzCompress to BZ2_bzCompress, to avoid namespace pollution.
Unfortunately this means that the libbz2.so created by
Makefile-libbz2_so will not work with any program which used an older
-version of the library. Sorry. I do encourage library clients to
-make the effort to upgrade to use version 1.0, since it is both faster
-and more robust than previous versions.
+version of the library. I do encourage library clients to make the
+effort to upgrade to use version 1.0, since it is both faster and more
+robust than previous versions.
HOW TO BUILD -- Windows 95, NT, DOS, Mac, etc.
It's difficult for me to support compilation on all these platforms.
My approach is to collect binaries for these platforms, and put them
-on the master web page (http://sources.redhat.com/bzip2). Look there.
-However (FWIW), bzip2-1.0.X is very standard ANSI C and should compile
+on the master web site (http://www.bzip.org). Look there. However
+(FWIW), bzip2-1.0.X is very standard ANSI C and should compile
unmodified with MS Visual C. If you have difficulties building, you
might want to read README.COMPILATION.PROBLEMS.
At least using MS Visual C++ 6, you can build from the unmodified
sources by issuing, in a command shell:
+
nmake -f makefile.msc
+
(you may need to first run the MSVC-provided script VCVARS32.BAT
so as to set up paths to the MSVC tools correctly).
@@ -86,18 +103,19 @@
WARNING:
- This program (attempts to) compress data by performing several
- non-trivial transformations on it. Unless you are 100% familiar
- with *all* the algorithms contained herein, and with the
- consequences of modifying them, you should NOT meddle with the
- compression or decompression machinery. Incorrect changes can and
- very likely *will* lead to disastrous loss of data.
+ This program and library (attempts to) compress data by
+ performing several non-trivial transformations on it.
+ Unless you are 100% familiar with *all* the algorithms
+ contained herein, and with the consequences of modifying them,
+ you should NOT meddle with the compression or decompression
+ machinery. Incorrect changes can and very likely *will*
+ lead to disastrous loss of data.
DISCLAIMER:
I TAKE NO RESPONSIBILITY FOR ANY LOSS OF DATA ARISING FROM THE
- USE OF THIS PROGRAM, HOWSOEVER CAUSED.
+ USE OF THIS PROGRAM/LIBRARY, HOWSOEVER CAUSED.
Every compression of a file implies an assumption that the
compressed file can be decompressed to reproduce the original.
@@ -110,19 +128,18 @@
PROGRAM UNLESS YOU ARE PREPARED TO ACCEPT THE POSSIBILITY, HOWEVER
SMALL, THAT THE DATA WILL NOT BE RECOVERABLE.
- That is not to say this program is inherently unreliable. Indeed,
- I very much hope the opposite is true. bzip2 has been carefully
- constructed and extensively tested.
+ That is not to say this program is inherently unreliable.
+ Indeed, I very much hope the opposite is true. bzip2/libbzip2
+ has been carefully constructed and extensively tested.
PATENTS:
- To the best of my knowledge, bzip2 does not use any patented
- algorithms. However, I do not have the resources to carry out
- a patent search. Therefore I cannot give any guarantee of the
- above statement.
+ To the best of my knowledge, bzip2/libbzip2 does not use any
+ patented algorithms. However, I do not have the resources
+ to carry out a patent search. Therefore I cannot give any
+ guarantee of the above statement.
-End of legalities.
WHAT'S NEW IN 0.9.0 (as compared to 0.1pl2) ?
@@ -156,21 +173,23 @@
See the CHANGES file.
+WHAT'S NEW IN 1.0.4 ?
+ See the CHANGES file.
+
+
I hope you find bzip2 useful. Feel free to contact me at
js...@bz...
if you have any suggestions or queries. Many people mailed me with
comments, suggestions and patches after the releases of bzip-0.15,
-bzip-0.21, and bzip2 versions 0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1 and
-1.0.2, and the changes in bzip2 are largely a result of this feedback.
-I thank you for your comments.
+bzip-0.21, and bzip2 versions 0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1,
+1.0.2 and 1.0.3, and the changes in bzip2 are largely a result of this
+feedback. I thank you for your comments.
-At least for the time being, bzip2's "home" is (or can be reached via)
-http://www.bzip.org
+bzip2's "home" is http://www.bzip.org/
Julian Seward
js...@bz...
-
Cambridge, UK.
18 July 1996 (version 0.15)
@@ -183,3 +202,4 @@
5 May 2000 (bzip2, version 1.0pre8)
30 December 2001 (bzip2, version 1.0.2pre1)
15 February 2005 (bzip2, version 1.0.3)
+20 December 2006 (bzip2, version 1.0.4)
Modified: branches/Release-0_8_0/bzip2/bzip2/README.COMPILATION.PROBLEMS
===================================================================
--- branches/Release-0_8_0/bzip2/bzip2/README.COMPILATION.PROBLEMS 2007-04-11 13:09:54 UTC (rev 355)
+++ branches/Release-0_8_0/bzip2/bzip2/README.COMPILATION.PROBLEMS 2007-04-11 13:22:14 UTC (rev 356)
@@ -1,32 +1,47 @@
+------------------------------------------------------------------
+This file is part of bzip2/libbzip2, a program and library for
+lossless, block-sorting data compression.
-bzip2-1.0.3 should compile without problems on the vast majority of
+bzip2/libbzip2 version 1.0.4 of 20 December 2006
+Copyright (C) 1996-2006 Julian Seward <js...@bz...>
+
+Please read the WARNING, DISCLAIMER and PATENTS sections in the
+README file.
+
+This program is released under the terms of the license contained
+in the file LICENSE.
+------------------------------------------------------------------
+
+bzip2-1.0.4 should compile without problems on the vast majority of
platforms. Using the supplied Makefile, I've built and tested it
-myself for x86-linux and x86_64-linux. With makefile.msc, Visual C++
+myself for x86-linux and amd64-linux. With makefile.msc, Visual C++
6.0 and nmake, you can build a native Win32 version too. Large file
-support seems to work correctly on at least alpha-tru64unix and
-x86-cygwin32 (on Windows 2000).
+support seems to work correctly on at least on amd64-linux.
When I say "large file" I mean a file of size 2,147,483,648 (2^31)
bytes or above. Many older OSs can't handle files above this size,
but many newer ones can. Large files are pretty huge -- most files
you'll encounter are not Large Files.
-Earlier versions of bzip2 (0.1, 0.9.0, 0.9.5) compiled on a wide
-variety of platforms without difficulty, and I hope this version will
-continue in that tradition. However, in order to support large files,
-I've had to include the define -D_FILE_OFFSET_BITS=64 in the Makefile.
-This can cause problems.
+Early versions of bzip2 (0.1, 0.9.0, 0.9.5) compiled on a wide variety
+of platforms without difficulty, and I hope this version will continue
+in that tradition. However, in order to support large files, I've had
+to include the define -D_FILE_OFFSET_BITS=64 in the Makefile. This
+can cause problems.
The technique of adding -D_FILE_OFFSET_BITS=64 to get large file
support is, as far as I know, the Recommended Way to get correct large
file support. For more details, see the Large File Support
Specification, published by the Large File Summit, at
+
http://ftp.sas.com/standards/large.file
As a general comment, if you get compilation errors which you think
are related to large file support, try removing the above define from
the Makefile, ie, delete the line
+
BIGFILES=-D_FILE_OFFSET_BITS=64
+
from the Makefile, and do 'make clean ; make'. This will give you a
version of bzip2 without large file support, which, for most
applications, is probably not a problem.
@@ -37,3 +52,7 @@
large file support, if you are feeling paranoid. Be aware though that
any compilation problems which affect bzip2 will also affect spewG.c,
alas.
+
+AIX: I have reports that for large file support, you need to specify
+-D_LARGE_FILES rather than -D_FILE_OFFSET_BITS=64. I have not tested
+this myself.
Modified: branches/Release-0_8_0/bzip2/bzip2/README.XML.STUFF
===================================================================
--- branches/Release-0_8_0/bzip2/bzip2/README.XML.STUFF 2007-04-11 13:09:54 UTC (rev 355)
+++ branches/Release-0_8_0/bzip2/bzip2/README.XML.STUFF 2007-04-11 13:22:14 UTC (rev 356)
@@ -1,3 +1,17 @@
+ ----------------------------------------------------------------
+ This file is part of bzip2/libbzip2, a program and library for
+ lossless, block-sorting data compression.
+
+ bzip2/libbzip2 version 1.0.4 of 20 December 2006
+ Copyright (C) 1996-2006 Julian Seward <js...@bz...>
+
+ Please read the WARNING, DISCLAIMER and PATENTS sections in the
+ README file.
+
+ This program is released under the terms of the license contained
+ in the file LICENSE.
+ ----------------------------------------------------------------
+
The script xmlproc.sh takes an xml file as input,
and processes it to create .pdf, .html or .ps output.
It uses format.pl, a perl script to format <pre> blocks nicely,
@@ -9,16 +23,16 @@
Usage:
- xmlproc.sh -v manual.xml
+ ./xmlproc.sh -v manual.xml
Validates an xml file to ensure no dtd-compliance errors
- xmlproc.sh -html manual.xml
+ ./xmlproc.sh -html manual.xml
Output: manual.html
- xmlproc.sh -pdf manual.xml
+ ./xmlproc.sh -pdf manual.xml
Output: manual.pdf
- xmlproc.sh -ps manual.xml
+ ./xmlproc.sh -ps manual.xml
Output: manual.ps
Deleted: branches/Release-0_8_0/bzip2/bzip2/Y2K_INFO
===================================================================
--- branches/Release-0_8_0/bzip2/bzip2/Y2K_INFO 2007-04-11 13:09:54 UTC (rev 355)
+++ branches/Release-0_8_0/bzip2/bzip2/Y2K_INFO 2007-04-11 13:22:14 UTC (rev 356)
@@ -1,34 +0,0 @@
-
-Y2K status of bzip2 and libbzip2, versions 0.1, 0.9.0 and 0.9.5
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Informally speaking:
- bzip2 is a compression program built on top of libbzip2,
- a library which does the real work of compression and
- decompression. As far as I am aware, libbzip2 does not have
- any date-related code at all.
-
- bzip2 itself copies dates from source to destination files
- when compressing or decompressing, using the 'stat' and 'utime'
- UNIX system calls. It doesn't examine, manipulate or store the
- dates in any way. So as far as I can see, there shouldn't be any
- problem with bzip2 providing 'stat' and 'utime' work correctly
- on your system.
-
- On non-unix platforms (those for which BZ_UNIX in bzip2.c is
- not set to 1), bzip2 doesn't even do the date copying.
-
- Overall, informally speaking, I don't think bzip2 or libbzip2
- have a Y2K problem.
-
-Formally speaking:
- I am not prepared to offer you any assurance whatsoever
- regarding Y2K issues in my software. You alone assume the
- entire risk of using the software. The disclaimer of liability
- in the LICENSE file in the bzip2 source distribution continues
- to apply on this issue as with every other issue pertaining
- to the software.
-
-Julian Seward
-Cambridge, UK
-25 August 1999
Modified: branches/Release-0_8_0/bzip2/bzip2/blocksort.c
===================================================================
--- branches/Release-0_8_0/bzip2/bzip2/blocksort.c 2007-04-11 13:09:54 UTC (rev 355)
+++ branches/Release-0_8_0/bzip2/bzip2/blocksort.c 2007-04-11 13:22:14 UTC (rev 356)
@@ -4,68 +4,21 @@
/*--- blocksort.c ---*/
/*-------------------------------------------------------------*/
-/*--
- This file is a part of bzip2 and/or libbzip2, a program and
- library for lossless, block-sorting data compression.
+/* ------------------------------------------------------------------
+ This file is part of bzip2/libbzip2, a program and library for
+ lossless, block-sorting data compression.
- Copyright (C) 1996-2005 Julian R Seward. All rights reserved.
+ bzip2/libbzip2 version 1.0.4 of 20 December 2006
+ Copyright (C) 1996-2006 Julian Seward <js...@bz...>
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
+ Please read the WARNING, DISCLAIMER and PATENTS sections in the
+ README file.
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
+ This program is released under the terms of the license contained
+ in the file LICENSE.
+ ------------------------------------------------------------------ */
- 2. The origin of this software must not be misrepresented; you must
- not claim that you wrote the original software. If you use this
- software in a product, an acknowledgment in the product
- documentation would be appreciated but is not required.
- 3. Altered source versions must be plainly marked as such, and must
- not be misrepresented as being the original software.
-
- 4. The name of the author may not be used to endorse or promote
- products derived from this software without specific prior written
- permission.
-
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
- OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- Julian Seward, Cambridge, UK.
- js...@bz...
- bzip2/libbzip2 version 1.0 of 21 March 2000
-
- This program is based on (at least) the work of:
- Mike Burrows
- David Wheeler
- Peter Fenwick
- Alistair Moffat
- Radford Neal
- Ian H. Witten
- Robert Sedgewick
- Jon L. Bentley
-
- For more information on these sources, see the manual.
-
- To get some idea how the block sorting algorithms in this file
- work, read my paper
- On the Performance of BWT Sorting Algorithms
- in Proceedings of the IEEE Data Compression Conference 2000,
- Snowbird, Utah, USA, 27-30 March 2000. The main sort in this
- file implements the algorithm called cache in the paper.
---*/
-
-
#include "bzlib_private.h"
/*---------------------------------------------*/
@@ -155,7 +108,7 @@
while (sp > 0) {
- AssertH ( sp < FALLBACK_QSORT_STACK_SIZE, 1004 );
+ AssertH ( sp < FALLBACK_QSORT_STACK_SIZE - 1, 1004 );
fpop ( lo, hi );
if (hi - lo < FALLBACK_QSORT_SMALL_THRESH) {
@@ -690,7 +643,7 @@
while (sp > 0) {
- AssertH ( sp < MAIN_QSORT_STACK_SIZE, 1001 );
+ AssertH ( sp < MAIN_QSORT_STACK_SIZE - 2, 1001 );
mpop ( lo, hi, d );
if (hi - lo < MAIN_QSORT_SMALL_THRESH ||
Modified: branches/Release-0_8_0/bzip2/bzip2/bz-fo.xsl
===================================================================
--- branches/Release-0_8_0/bzip2/bzip2/bz-fo.xsl 2007-04-11 13:09:54 UTC (rev 355)
+++ branches/Release-0_8_0/bzip2/bzip2/bz-fo.xsl 2007-04-11 13:22:14 UTC (rev 356)
@@ -254,4 +254,23 @@
</xsl:template>
+<!-- Bug-fix for Suse 10 PassiveTex version -->
+<!-- Precompute attribute values 'cos PassiveTex is too stupid: -->
+<xsl:attribute-set name="component.title.properties">
+ <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
+ <xsl:attribute name="space-before.optimum">
+ <xsl:value-of select="concat($body.font.master, 'pt')"/>
+ </xsl:attribute>
+ <xsl:attribute name="space-before.minimum">
+ <xsl:value-of select="$body.font.master * 0.8"/>
+ <xsl:text>pt</xsl:text>
+ </xsl:attribute>
+ <xsl:attribute name="space-before.maximum">
+ <xsl:value-of select="$body.font.master * 1.2"/>
+ <xsl:text>pt</xsl:text>
+ </xsl:attribute>
+ <xsl:attribute name="hyphenate">false</xsl:attribute>
+</xsl:attribute-set>
+
+
</xsl:stylesheet>
Modified: branches/Release-0_8_0/bzip2/bzip2/bzdiff
===================================================================
--- branches/Release-0_8_0/bzip2/bzip2/bzdiff 2007-04-11 13:09:54 UTC (rev 355)
+++ branches/Release-0_8_0/bzip2/bzip2/bzdiff 2007-04-11 13:22:14 UTC (rev 356)
@@ -12,7 +12,7 @@
# necessary) and fed to cmp or diff. The exit status from cmp
# or diff is preserved.
-PATH="/usr/bin:$PATH"; export PATH
+PATH="/usr/bin:/bin:$PATH"; export PATH
prog=`echo $0 | sed 's|.*/||'`
case "$prog" in
*cmp) comp=${CMP-cmp} ;;
@@ -37,7 +37,7 @@
echo "Usage: $prog [${comp}_options] file [file]"
exit 1
fi
-tmp=`tempfile -d /tmp -p bz` || {
+tmp=`mktemp ${TMPDIR:-/tmp}/bzdiff.XXXXXXXXXX` || {
echo 'cannot create a temporary file' >&2
exit 1
}
Modified: branches/Release-0_8_0/bzip2/bzip2/bzgrep
===================================================================
--- branches/Release-0_8_0/bzip2/bzip2/bzgrep 2007-04-11 13:09:54 UTC (rev 355)
+++ branches/Release-0_8_0/bzip2/bzip2/bzgrep 2007-04-11 13:22:14 UTC (rev 356)
@@ -63,7 +63,11 @@
bzip2 -cdfq "$i" | $grep $opt "$pat"
r=$?
else
- bzip2 -cdfq "$i" | $grep $opt "$pat" | sed "s|^|${i}:|"
+ j=${i//\\/\\\\}
+ j=${j//|/\\|}
+ j=${j//&/\\&}
+ j=`printf "%s" "$j" | tr '\n' ' '`
+ bzip2 -cdfq "$i" | $grep $opt "$pat" | sed "s|^|${j}:|"
r=$?
fi
test "$r" -ne 0 && res="$r"
Modified: branches/Release-0_8_0/bzip2/bzip2/bzip2.1
===================================================================
--- branches/Release-0_8_0/bzip2/bzip2/bzip2.1 2007-04-11 13:09:54 UTC (rev 355)
+++ branches/Release-0_8_0/bzip2/bzip2/bzip2.1 2007-04-11 13:22:14 UTC (rev 356)
@@ -1,7 +1,7 @@
.PU
.TH bzip2 1
.SH NAME
-bzip2, bunzip2 \- a block-sorting file compressor, v1.0.3
+bzip2, bunzip2 \- a block-sorting file compressor, v1.0.4
.br
bzcat \- decompresses files to stdout
.br
@@ -405,11 +405,11 @@
tries hard to detect I/O errors and exit cleanly, but the details of
what the problem is sometimes seem rather misleading.
-This manual page pertains to version 1.0.3 of
+This manual page pertains to version 1.0.4 of
.I bzip2.
Compressed data created by this version is entirely forwards and
backwards compatible with the previous public releases, versions
-0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1 and 1.0.2, but with the following
+0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1, 1.0.2 and 1.0.3, but with the following
exception: 0.9.0 and above can correctly decompress multiple
concatenated compressed files. 0.1pl2 cannot do this; it will stop
after decompressing just the first file in the stream.
Modified: branches/Release-0_8_0/bzip2/bzip2/bzip2.1.preformatted
===================================================================
--- branches/Release-0_8_0/bzip2/bzip2/bzip2.1.preformatted 2007-04-11 13:09:54 UTC (rev 355)
+++ branches/Release-0_8_0/bzip2/bzip2/bzip2.1.preformatted 2007-04-11 13:22:14 UTC (rev 356)
@@ -3,7 +3,7 @@
NNAAMMEE
- bzip2, bunzip2 − a block‐sorting file compressor, v1.0.3
+ bzip2, bunzip2 − a block‐sorting file compressor, v1.0.4
bzcat − decompresses files to stdout
bzip2recover − recovers data from damaged bzip2 files
@@ -348,14 +348,14 @@
but the details of what the problem is sometimes seem
rather misleading.
- This manual page pertains to version 1.0.3 of _b_z_i_p_2_. Com
+ This manual page pertains to version 1.0.4 of _b_z_i_p_2_. Com
pressed data created by this version is entirely forwards
and backwards compatible with the previous public
- releases, versions 0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1 and
- 1.0.2, but with the following exception: 0.9.0 and above
- can correctly decompress multiple concatenated compressed
- files. 0.1pl2 cannot do this; it will stop after decom
- pressing just the first file in the stream.
+ releases, versions 0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1,
+ 1.0.2 and 1.0.3, but with the following exception: 0.9.0
+ and above can correctly decompress multiple concatenated
+ compressed files. 0.1pl2 cannot do this; it will stop
+ after decompressing just the first file in the stream.
_b_z_i_p_2_r_e_c_o_v_e_r versions prior to 1.0.2 used 32‐bit integers
to represent bit positions in compressed files, so they
Modified: branches/Release-0_8_0/bzip2/bzip2/bzip2.c
===================================================================
--- branches/Release-0_8_0/bzip2/bzip2/bzip2.c 2007-04-11 13:09:54 UTC (rev 355)
+++ branches/Release-0_8_0/bzip2/bzip2/bzip2.c 2007-04-11 13:22:14 UTC (rev 356)
@@ -3,118 +3,26 @@
/*--- A block-sorting, lossless compressor bzip2.c ---*/
/*-----------------------------------------------------------*/
-/*--
- This file is a part of bzip2 and/or libbzip2, a program and
- library for lossless, block-sorting data compression.
+/* ------------------------------------------------------------------
+ This file is part of bzip2/libbzip2, a program and library for
+ lossless, block-sorting data compression.
- Copyright (C) 1996-2005 Julian R Seward. All rights reserved.
+ bzip2/libbzip2 version 1.0.4 of 20 December 2006
+ Copyright (C) 1996-2006 Julian Seward <js...@bz...>
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
+ Please read the WARNING, DISCLAIMER and PATENTS sections in the
+ README file.
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
+ This program is released under the terms of the license contained
+ in the file LICENSE.
+ ------------------------------------------------------------------ */
- 2. The origin of this software must not be misrepresented; you must
- not claim that you wrote the original software. If you use this
- software in a product, an acknowledgment in the product
- documentation would be appreciated but is not required.
- 3. Altered source versions must be plainly marked as such, and must
- not be misrepresented as being the original software.
-
- 4. The name of the author may not be used to endorse or promote
- products derived from this software without specific prior written
- permission.
-
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
- OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- Julian Seward, Cambridge, UK.
- js...@bz...
- bzip2/libbzip2 version 1.0 of 21 March 2000
-
- This program is based on (at least) the work of:
- Mike Burrows
- David Wheeler
- Peter Fenwick
- Alistair Moffat
- Radford Neal
- Ian H. Witten
- Robert Sedgewick
- Jon L. Bentley
-
- For more information on these sources, see the manual.
---*/
-
-
-/*----------------------------------------------------*/
-/*--- IMPORTANT ---*/
-/*----------------------------------------------------*/
-
-/*--
- WARNING:
- This program and library (attempts to) compress data by
- performing several non-trivial transformations on it.
- Unless you are 100% familiar with *all* the algorithms
- contained herein, and with the consequences of modifying them,
- you should NOT meddle with the compression or decompression
- machinery. Incorrect changes can and very likely *will*
- lead to disasterous loss of data.
-
- DISCLAIMER:
- I TAKE NO RESPONSIBILITY FOR ANY LOSS OF DATA ARISING FROM THE
- USE OF THIS PROGRAM, HOWSOEVER CAUSED.
-
- Every compression of a file implies an assumption that the
- compressed file can be decompressed to reproduce the original.
- Great efforts in design, coding and testing have been made to
- ensure that this program works correctly. However, the
- complexity of the algorithms, and, in particular, the presence
- of various special cases in the code which occur with very low
- but non-zero probability make it impossible to rule out the
- possibility of bugs remaining in the program. DO NOT COMPRESS
- ANY DATA WITH THIS PROGRAM AND/OR LIBRARY UNLESS YOU ARE PREPARED
- TO ACCEPT THE POSSIBILITY, HOWEVER SMALL, THAT THE DATA WILL
- NOT BE RECOVERABLE.
-
- That is not to say this program is inherently unreliable.
- Indeed, I very much hope the opposite is true. bzip2/libbzip2
- has been carefully constructed and extensively tested.
-
- PATENTS:
- To the best of my knowledge, bzip2/libbzip2 does not use any
- patented algorithms. However, I do not have the resources
- available to carry out a full patent search. Therefore I cannot
- give any guarantee of the above statement.
---*/
-
-
-
-/*----------------------------------------------------*/
-/*--- and now for something much more pleasant :-) ---*/
-/*----------------------------------------------------*/
-
-/*---------------------------------------------*/
-/*--
- Place a 1 beside your platform, and 0 elsewhere.
---*/
-
-/*--
- Generic 32-bit Unix.
- Also works on 64-bit Unix boxes.
- This is the default.
---*/
+/* Place a 1 beside your platform, and 0 elsewhere.
+ Generic 32-bit Unix.
+ Also works on 64-bit Unix boxes.
+ This is the default.
+*/
#define BZ_UNIX 1
/*--
@@ -302,16 +210,17 @@
FILE *outputHandleJustInCase;
Int32 workFactor;
-static void panic ( Char* ) NORETURN;
-static void ioError ( void ) NORETURN;
-static void outOfMemory ( void ) NORETURN;
-static void configError ( void ) NORETURN;
-static void crcError ( void ) NORETURN;
-static void cleanUpAndFail ( Int32 ) NORETURN;
-static void compressedStreamEOF ( void ) NORETURN;
+static void panic ( const Char* ) NORETURN;
+static void ioError ( void ) NORETURN;
+static void outOfMemory ( void ) NORETURN;
+static void configError ( void ) NORETURN;
+static void crcError ( void ) NORETURN;
+static void cleanUpAndFail ( Int32 ) NORETURN;
+static void compressedStreamEOF ( void ) NORETURN;
static void copyFileName ( Char*, Char* );
static void* myMalloc ( Int32 );
+static void applySavedFileAttrToOutputFile ( IntNative fd );
@@ -457,6 +366,9 @@
ret = fflush ( zStream );
if (ret == EOF) goto errhandler_io;
if (zStream != stdout) {
+ Int32 fd = fileno ( zStream );
+ if (fd < 0) goto errhandler_io;
+ applySavedFileAttrToOutputFile ( fd );
ret = fclose ( zStream );
outputHandleJustInCase = NULL;
if (ret == EOF) goto errhandler_io;
@@ -569,6 +481,11 @@
closeok:
if (ferror(zStream)) goto errhandler_io;
+ if (stream != stdout) {
+ Int32 fd = fileno ( stream );
+ if (fd < 0) goto errhandler_io;
+ applySavedFileAttrToOutputFile ( fd );
+ }
ret = fclose ( zStream );
if (ret == EOF) goto errhandler_io;
@@ -826,7 +743,7 @@
/*---------------------------------------------*/
static
-void panic ( Char* s )
+void panic ( const Char* s )
{
fprintf ( stderr,
"\n%s: PANIC -- internal consistency error:\n"
@@ -1039,6 +956,7 @@
For non-Unix platforms, if we are not worrying about
security issues, simple this simply behaves like fopen.
*/
+static
FILE* fopen_output_safely ( Char* name, const char* mode )
{
# if BZ_UNIX
@@ -1129,7 +1047,7 @@
static
-void applySavedMetaInfoToOutputFile ( Char *dstName )
+void applySavedTimeInfoToOutputFile ( Char *dstName )
{
# if BZ_UNIX
IntNative retVal;
@@ -1138,13 +1056,21 @@
uTimBuf.actime = fileMetaInfo.st_atime;
uTimBuf.modtime = fileMetaInfo.st_mtime;
- retVal = chmod ( dstName, fileMetaInfo.st_mode );
+ retVal = utime ( dstName, &uTimBuf );
ERROR_IF_NOT_ZERO ( retVal );
+# endif
+}
- retVal = utime ( dstName, &uTimBuf );
+static
+void applySavedFileAttrToOutputFile ( IntNative fd )
+{
+# if BZ_UNIX
+ IntNative retVal;
+
+ retVal = fchmod ( fd, fileMetaInfo.st_mode );
ERROR_IF_NOT_ZERO ( retVal );
- retVal = chown ( dstName, fileMetaInfo.st_uid, fileMetaInfo.st_gid );
+ (void) fchown ( fd, fileMetaInfo.st_uid, fileMetaInfo.st_gid );
/* chown() will in many cases return with EPERM, which can
be safely ignored.
*/
@@ -1175,13 +1101,13 @@
/*---------------------------------------------*/
#define BZ_N_SUFFIX_PAIRS 4
-Char* zSuffix[BZ_N_SUFFIX_PAIRS]
+const Char* zSuffix[BZ_N_SUFFIX_PAIRS]
= { ".bz2", ".bz", ".tbz2", ".tbz" };
-Char* unzSuffix[BZ_N_SUFFIX_PAIRS]
+const Char* unzSuffix[BZ_N_SUFFIX_PAIRS]
= { "", "", ".tar", ".tar" };
static
-Bool hasSuffix ( Char* s, Char* suffix )
+Bool hasSuffix ( Char* s, const Char* suffix )
{
Int32 ns = strlen(s);
Int32 nx = strlen(suffix);
@@ -1192,7 +1118,8 @@
static
Bool mapSuffix ( Char* name,
- Char* oldSuffix, Char* newSuffix )
+ const Char* oldSuffix,
+ const Char* newSuffix )
{
if (!hasSuffix(name,oldSuffix)) return False;
name[strlen(name)-strlen(oldSuffix)] = 0;
@@ -1217,8 +1144,8 @@
switch (srcMode) {
case SM_I2O:
- copyFileName ( inName, "(stdin)" );
- copyFileName ( outName, "(stdout)" );
+ copyFileName ( inName, (Char*)"(stdin)" );
+ copyFileName ( outName, (Char*)"(stdout)" );
break;
case SM_F2F:
copyFileName ( inName, name );
@@ -1227,7 +1154,7 @@
break;
case SM_F2O:
copyFileName ( inName, name );
- copyFileName ( outName, "(stdout)" );
+ copyFileName ( outName, (Char*)"(stdout)" );
break;
}
@@ -1370,7 +1297,7 @@
/*--- If there was an I/O error, we won't get here. ---*/
if ( srcMode == SM_F2F ) {
- applySavedMetaInfoToOutputFile ( outName );
+ applySavedTimeInfoToOutputFile ( outName );
deleteOutputOnInterrupt = False;
if ( !keepInputFiles ) {
IntNative retVal = remove ( inName );
@@ -1401,8 +1328,8 @@
cantGuess = False;
switch (srcMode) {
case SM_I2O:
- copyFileName ( inName, "(stdin)" );
- copyFileName ( outName, "(stdout)" );
+ copyFileName ( inName, (Char*)"(stdin)" );
+ copyFileName ( outName, (Char*)"(stdout)" );
break;
case SM_F2F:
copyFileName ( inName, name );
@@ -1415,7 +1342,7 @@
break;
case SM_F2O:
copyFileName ( inName, name );
- copyFileName ( outName, "(stdout)" );
+ copyFileName ( outName, (Char*)"(stdout)" );
break;
}
@@ -1548,7 +1475,7 @@
/*--- If there was an I/O error, we won't get here. ---*/
if ( magicNumberOK ) {
if ( srcMode == SM_F2F ) {
- applySavedMetaInfoToOutputFile ( outName );
+ applySavedTimeInfoToOutputFile ( outName );
deleteOutputOnInterrupt = False;
if ( !keepInputFiles ) {
IntNative retVal = remove ( inName );
@@ -1593,9 +1520,9 @@
if (name == NULL && srcMode != SM_I2O)
panic ( "testf: bad modes\n" );
- copyFileName ( outName, "(none)" );
+ copyFileName ( outName, (Char*)"(none)" );
switch (srcMode) {
- case SM_I2O: copyFileName ( inName, "(stdin)" ); break;
+ case SM_I2O: copyFileName ( inName, (Char*)"(stdin)" ); break;
case SM_F2F: copyFileName ( inName, name ); break;
case SM_F2O: copyFileName ( inName, name ); break;
}
@@ -1678,11 +1605,11 @@
"bzip2, a block-sorting file compressor. "
"Version %s.\n"
" \n"
- " Copyright (C) 1996-2005 by Julian Seward.\n"
+ " Copyright (C) 1996-2006 by Julian Seward.\n"
" \n"
" This program is free software; you can redistribute it and/or modify\n"
" it under the terms set out in the LICENSE file, which is included\n"
- " in the bzip2-1.0 source distribution.\n"
+ " in the bzip2-1.0.4 source distribution.\n"
" \n"
" This program is distributed in the hope that it will be useful,\n"
" but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -1885,8 +1812,8 @@
# endif
# endif
- copyFileName ( inName, "(none)" );
- copyFileName ( outName, "(none)" );
+ copyFileName ( inName, (Char*)"(none)" );
+ copyFileName ( outName, (Char*)"(none)" );
copyFileName ( progNameReally, argv[0] );
progName = &progNameReally[0];
@@ -1898,8 +1825,8 @@
expand filename wildcards in arg list.
--*/
argList = NULL;
- addFlagsFromEnvVar ( &argList, "BZIP2" );
- addFlagsFromEnvVar ( &argList, "BZIP" );
+ addFlagsFromEnvVar ( &argList, (Char*)"BZIP2" );
+ addFlagsFromEnvVar ( &argList, (Char*)"BZIP" );
for (i = 1; i <= argc-1; i++)
APPEND_FILESPEC(argList, argv[i]);
Modified: branches/Release-0_8_0/bzip2/bzip2/bzip2.txt
===================================================================
--- branches/Release-0_8_0/bzip2/bzip2/bzip2.txt 2007-04-11 13:09:54 UTC (rev 355)
+++ branches/Release-0_8_0/bzip2/bzip2/bzip2.txt 2007-04-11 13:22:14 UTC (rev 356)
@@ -1,6 +1,6 @@
NAME
- bzip2, bunzip2 - a block-sorting file compressor, v1.0.3
+ bzip2, bunzip2 - a block-sorting file compressor, v1.0.4
bzcat - decompresses files to stdout
bzip2recover - recovers data from damaged bzip2 files
@@ -345,14 +345,14 @@
but the details of what the problem is sometimes seem
rather misleading.
- This manual page pertains to version 1.0.3 of bzip2. Com-
+ This manual page pertains to version 1.0.4 of bzip2. Com-
pressed data created by this version is entirely forwards
and backwards compatible with the previous public
- releases, versions 0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1 and
- 1.0.2, but with the following exception: 0.9.0 and above
- can correctly decompress multiple concatenated compressed
- files. 0.1pl2 cannot do this; it will stop after decom-
- pressing just the first file in the stream.
+ releases, versions 0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1,
+ 1.0.2 and 1.0.3, but with the following exception: 0.9.0
+ and above can correctly decompress multiple concatenated
+ compressed files. 0.1pl2 cannot do this; it will stop
+ after decompressing just the first file in the stream.
bzip2recover versions prior to 1.0.2 used 32-bit integers
to represent bit positions in compressed files, so they
Modified: branches/Release-0_8_0/bzip2/bzip2/bzip2recover.c
===================================================================
--- branches/Release-0_8_0/bzip2/bzip2/bzip2recover.c 2007-04-11 13:09:54 UTC (rev 355)
+++ branches/Release-0_8_0/bzip2/bzip2/bzip2recover.c 2007-04-11 13:22:14 UTC (rev 356)
@@ -1,57 +1,25 @@
-
/*-----------------------------------------------------------*/
/*--- Block recoverer program for bzip2 ---*/
/*--- bzip2recover.c ---*/
/*-----------------------------------------------------------*/
-/*--
- This program is bzip2recover, a program to attempt data
- salvage from damaged files created by the accompanying
- bzip2-1.0.3 program.
+/* ------------------------------------------------------------------
+ This file is part of bzip2/libbzip2, a program and library for
+ lossless, block-sorting data compression.
- Copyright (C) 1996-2005 Julian R Seward. All rights reserved.
+ bzip2/libbzip2 version 1.0.4 of 20 December 2006
+ Copyright (C) 1996-2006 Julian Seward <js...@bz...>
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
+ Please read the WARNING, DISCLAIMER and PATENTS sections in the
+ README file.
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
+ This program is released under the terms of the license contained
+ in the file LICENSE.
+ ------------------------------------------------------------------ */
- 2. The origin of this software must not be misrepresented; you must
- not claim that you wrote the original software. If you use this
- software in a product, an acknowledgment in the product
- documentation would be appreciated but is not required.
+/* This program is a complete hack and should be rewritten properly.
+ It isn't very complicated. */
- 3. Altered source versions must be plainly marked as such, and must
- not be misrepresented as being the original software.
-
- 4. The name of the author may not be used to endorse or promote
- products derived from this software without specific prior written
- permission.
-
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
- OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- Julian Seward, Cambridge, UK.
- js...@bz...
- bzip2/libbzip2 version 1.0.3 of 15 February 2005
---*/
-
-/*--
- This program is a complete hack and should be rewritten
- properly. It isn't very complicated.
---*/
-
#include <stdio.h>
#include <errno.h>
#include <stdlib.h>
@@ -114,7 +82,7 @@
/*---------------------------------------------------*/
/*---------------------------------------------*/
-void readError ( void )
+static void readError ( void )
{
fprintf ( stderr,
"%s: I/O error reading `%s', possible reason follows.\n",
@@ -127,7 +95,7 @@
/*---------------------------------------------*/
-void writeError ( void )
+static void writeError ( void )
{
fprintf ( stderr,
"%s: I/O error reading `%s', possible reason follows.\n",
@@ -140,7 +108,7 @@
/*---------------------------------------------*/
-void mallocFail ( Int32 n )
+static void mallocFail ( Int32 n )
{
fprintf ( stderr,
"%s: malloc failed on request for %d bytes.\n",
@@ -152,7 +120,7 @@
/*---------------------------------------------*/
-void tooManyBlocks ( Int32 max_handled_blocks )
+static void tooManyBlocks ( Int32 max_handled_blocks )
{
fprintf ( stderr,
"%s: `%s' appears to contain more than %d blocks\n",
@@ -183,7 +151,7 @@
/*---------------------------------------------*/
-BitStream* bsOpenReadStream ( FILE* stream )
+static BitStream* bsOpenReadStream ( FILE* stream )
{
BitStream *bs = malloc ( sizeof(BitStream) );
if (bs == NULL) mallocFail ( sizeof(BitStream) );
@@ -196,7 +164,7 @@
/*---------------------------------------------*/
-BitStream* bsOpenWriteStream ( FILE* stream )
+static BitStream* bsOpenWriteStream ( FILE* stream )
{
BitStream *bs = malloc ( sizeof(BitStream) );
if (bs == NULL) mallocFail ( sizeof(BitStream) );
@@ -209,7 +177,7 @@
/*---------------------------------------------*/
-void bsPutBit ( BitStream* bs, Int32 bit )
+static void bsPutBit ( BitStream* bs, Int32 bit )
{
if (bs->buffLive == 8) {
Int32 retVal = putc ( (UChar) bs->buffer, bs->handle );
@@ -228,7 +196,7 @@
/*--
Returns 0 or 1, or 2 to indicate EOF.
--*/
-Int32 bsGetBit ( BitStream* bs )
+static Int32 bsGetBit ( BitStream* bs )
{
if (bs->buffLive > 0) {
bs->buffLive --;
@@ -247,7 +215,7 @@
/*---------------------------------------------*/
-void bsClose ( BitStream* bs )
+static void bsClose ( BitStream* bs )
{
Int32 retVal;
@@ -271,7 +239,7 @@
/*---------------------------------------------*/
-void bsPutUChar ( BitStream* bs, UChar c )
+static void bsPutUChar ( BitStream* bs, UChar c )
{
Int32 i;
for (i = 7; i >= 0; i--)
@@ -280,7 +248,7 @@
/*---------------------------------------------*/
-void bsPutUInt32 ( BitStream* bs, UInt32 c )
+static void bsPutUInt32 ( BitStream* bs, UInt32 c )
{
Int32 i;
@@ -290,7 +258,7 @@
/*---------------------------------------------*/
-Bool endsInBz2 ( Char* name )
+static Bool endsInBz2 ( Char* name )
{
Int32 n = strlen ( name );
if (n <= 4) return False;
@@ -345,7 +313,7 @@
inFileName[0] = outFileName[0] = 0;
fprintf ( stderr,
- "bzip2recover 1.0.3: extracts blocks from damaged .bz2 files.\n" );
+ "bzip2recover 1.0.4: extracts blocks from damaged .bz2 files.\n" );
if (argc != 2) {
fprintf ( stderr, "%s: usage is `%s damaged_file_name'.\n",
Modified: branches/Release-0_8_0/bzip2/bzip2/bzlib.c
===================================================================
--- branches/Release-0_8_0/bzip2/bzip2/bzlib.c 2007-04-11 13:09:54 UTC (rev 355)
+++ branches/Release-0_8_0/bzip2/bzip2/bzlib.c 2007-04-11 13:22:14 UTC (rev 356)
@@ -4,75 +4,30 @@
/*--- bzlib.c ---*/
/*-------------------------------------------------------------*/
-/*--
- This file is a part of bzip2 and/or libbzip2, a program and
- library for lossless, block-sorting data compression.
+/* ------------------------------------------------------------------
+ This file is part of bzip2/libbzip2, a program and library for
+ lossless, block-sorting data compression.
- Copyright (C) 1996-2005 Julian R Seward. All rights reserved.
+ bzip2/libbzip2 version 1.0.4 of 20 December 2006
+ Copyright (C) 1996-2006 Julian Seward <js...@bz...>
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
+ Please read the WARNING, DISCLAIMER and PATENTS sections in the
+ README file.
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
+ This program is released under the terms of the license contained
+ in the file LICENSE.
+ ------------------------------------------------------------------ */
- 2. The origin of this software must not be misrepresented; you must
- not claim that you wrote the original software. If you use this
- software in a product, an acknowledgment in the product
- documentation would be appreciated but is not required.
-
- 3. Altered source versions must be plainly marked as such, and must
- not be misrepresented as being the original software.
-
- 4. The name of the author may not be used to endorse or promote
- products derived from this software without specific prior written
- permission.
-
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
- OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- Julian Seward, Cambridge, UK.
- js...@bz...
- bzip2/libbzip2 version 1.0 of 21 March 2000
-
- This program is based on (at least) the work of:
- Mike Burrows
- David Wheeler
- Peter Fenwick
- Alistair Moffat
- Radford Neal
- Ian H. Witten
- Robert Sedgewick
- Jon L. Bentley
-
- For more information on these sources, see the manual.
---*/
-
-/*--
- CHANGES
- ~~~~~~~
- 0.9.0 -- original version.
-
+/* CHANGES
+ 0.9.0 -- original version.
0.9.0a/b -- no changes in this file.
+ 0.9.0c -- made zero-length BZ_FLUSH work correctly in bzCompress().
+ fixed bzWrite/bzRead to ignore zero-length requests.
+ fixed bzread to correctly handle read requests after EOF.
+ wrong parameter order in call to bzDecompressInit in
+ bzBuffToBuffDecompress. Fixed.
+*/
- 0.9.0c
- * made zero-length BZ_FLUSH work correctly in bzCompress().
- * fixed bzWrite/bzRead to ignore zero-length requests.
- * fixed bzread to correctly handle read requests after EOF.
- * wrong parameter order in call to bzDecompressInit in
- bzBuffToBuffDecompress. Fixed.
---*/
-
#include "bzlib_private.h"
@@ -1394,8 +1349,7 @@
/*---------------------------------------------------*/
/*--
- Code contributed by Yoshioka Tsuneo
- (QWF...@ni.../tsu...@is...),
+ Code contributed by Yoshioka Tsuneo (ts...@rr...)
to support better zlib compatibility.
This code is not _officially_ part of libbzip2 (yet);
I haven't tested it, documented it, or considered the
@@ -1406,7 +1360,7 @@
/*---------------------------------------------------*/
/*--
- return version like "0.9.0c".
+ return version like "0.9.5d, 4-Sept-1999".
--*/
const char * BZ_API(BZ2_bzlibVersion)(void)
{
@@ -1559,9 +1513,10 @@
void BZ_API(BZ2_bzclose) (BZFILE* b)
{
int bzerr;
- FILE *fp = ((bzFile *)b)->handle;
+ FILE *fp;
if (b==NULL) {return;}
+ fp = ((bzFile *)b)->handle;
if(((bzFile*)b)->writing){
BZ2_bzWriteClose(&bzerr,b,0,NULL,NULL);
if(bzerr != BZ_OK){
@@ -1580...
[truncated message content] |
|
From: <fr...@us...> - 2007-04-11 13:09:52
|
Revision: 355
http://svn.sourceforge.net/fuse-for-macosx/?rev=355&view=rev
Author: fredm
Date: 2007-04-11 06:09:54 -0700 (Wed, 11 Apr 2007)
Log Message:
-----------
Tag vendor/bzip2/current as vendor/bzip2/bzip2-1.0.4.
Added Paths:
-----------
vendor/bzip2/bzip2-1.0.4/
Copied: vendor/bzip2/bzip2-1.0.4 (from rev 354, vendor/bzip2/current)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2007-04-11 13:09:41
|
Revision: 354
http://svn.sourceforge.net/fuse-for-macosx/?rev=354&view=rev
Author: fredm
Date: 2007-04-11 06:09:42 -0700 (Wed, 11 Apr 2007)
Log Message:
-----------
Load . into vendor/bzip2/current.
Modified Paths:
--------------
vendor/bzip2/current/CHANGES
vendor/bzip2/current/LICENSE
vendor/bzip2/current/Makefile
vendor/bzip2/current/Makefile-libbz2_so
vendor/bzip2/current/README
vendor/bzip2/current/README.COMPILATION.PROBLEMS
vendor/bzip2/current/README.XML.STUFF
vendor/bzip2/current/blocksort.c
vendor/bzip2/current/bz-fo.xsl
vendor/bzip2/current/bzdiff
vendor/bzip2/current/bzgrep
vendor/bzip2/current/bzip2.1
vendor/bzip2/current/bzip2.1.preformatted
vendor/bzip2/current/bzip2.c
vendor/bzip2/current/bzip2.txt
vendor/bzip2/current/bzip2recover.c
vendor/bzip2/current/bzlib.c
vendor/bzip2/current/bzlib.h
vendor/bzip2/current/bzlib_private.h
vendor/bzip2/current/compress.c
vendor/bzip2/current/crctable.c
vendor/bzip2/current/decompress.c
vendor/bzip2/current/dlltest.c
vendor/bzip2/current/entities.xml
vendor/bzip2/current/format.pl
vendor/bzip2/current/huffman.c
vendor/bzip2/current/manual.html
vendor/bzip2/current/manual.pdf
vendor/bzip2/current/manual.ps
vendor/bzip2/current/manual.xml
vendor/bzip2/current/mk251.c
vendor/bzip2/current/randtable.c
vendor/bzip2/current/spewG.c
vendor/bzip2/current/unzcrash.c
vendor/bzip2/current/words0
vendor/bzip2/current/words2
vendor/bzip2/current/words3
vendor/bzip2/current/xmlproc.sh
Removed Paths:
-------------
vendor/bzip2/current/Y2K_INFO
Modified: vendor/bzip2/current/CHANGES
===================================================================
--- vendor/bzip2/current/CHANGES 2007-04-11 12:59:00 UTC (rev 353)
+++ vendor/bzip2/current/CHANGES 2007-04-11 13:09:42 UTC (rev 354)
@@ -1,5 +1,18 @@
+ ------------------------------------------------------------------
+ This file is part of bzip2/libbzip2, a program and library for
+ lossless, block-sorting data compression.
+ bzip2/libbzip2 version 1.0.4 of 20 December 2006
+ Copyright (C) 1996-2006 Julian Seward <js...@bz...>
+ Please read the WARNING, DISCLAIMER and PATENTS sections in the
+ README file.
+
+ This program is released under the terms of the license contained
+ in the file LICENSE.
+ ------------------------------------------------------------------
+
+
0.9.0
~~~~~
First version.
@@ -261,7 +274,7 @@
decompressor to crash, loop or access memory which does not
belong to it. If you are using bzip2 or the library to
decompress bitstreams from untrusted sources, an upgrade
- to 1.0.3 is recommended.
+ to 1.0.3 is recommended. This fixes CAN-2005-1260.
* The documentation has been converted to XML, from which html
and pdf can be derived.
@@ -273,3 +286,29 @@
* The BZ_NO_STDIO cpp symbol was not properly observed in 1.0.2.
This has been fixed.
+
+
+1.0.4 (20 Dec 06)
+~~~~~~~~~~~~~~~~~
+Fixes some minor bugs since the last version, 1.0.3.
+
+* Fix file permissions race problem (CAN-2005-0953).
+
+* Avoid possible segfault in BZ2_bzclose. From Coverity's NetBSD
+ scan.
+
+* 'const'/prototype cleanups in the C code.
+
+* Change default install location to /usr/local, and handle multiple
+ 'make install's without error.
+
+* Sanitise file names more carefully in bzgrep. Fixes CAN-2005-0758
+ to the extent that applies to bzgrep.
+
+* Use 'mktemp' rather than 'tempfile' in bzdiff.
+
+* Tighten up a couple of assertions in blocksort.c following automated
+ analysis.
+
+* Fix minor doc/comment bugs.
+
Modified: vendor/bzip2/current/LICENSE
===================================================================
--- vendor/bzip2/current/LICENSE 2007-04-11 12:59:00 UTC (rev 353)
+++ vendor/bzip2/current/LICENSE 2007-04-11 13:09:42 UTC (rev 354)
@@ -1,6 +1,8 @@
+--------------------------------------------------------------------------
+
This program, "bzip2", the associated library "libbzip2", and all
-documentation, are copyright (C) 1996-2005 Julian R Seward. All
+documentation, are copyright (C) 1996-2006 Julian R Seward. All
rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -35,6 +37,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Julian Seward, Cambridge, UK.
-js...@ac...
-bzip2/libbzip2 version 1.0.3 of 15 February 2005
+js...@bz...
+bzip2/libbzip2 version 1.0.4 of 20 December 2006
+--------------------------------------------------------------------------
Modified: vendor/bzip2/current/Makefile
===================================================================
--- vendor/bzip2/current/Makefile 2007-04-11 12:59:00 UTC (rev 353)
+++ vendor/bzip2/current/Makefile 2007-04-11 13:09:42 UTC (rev 354)
@@ -1,3 +1,16 @@
+# ------------------------------------------------------------------
+# This file is part of bzip2/libbzip2, a program and library for
+# lossless, block-sorting data compression.
+#
+# bzip2/libbzip2 version 1.0.4 of 20 December 2006
+# Copyright (C) 1996-2006 Julian Seward <js...@bz...>
+#
+# Please read the WARNING, DISCLAIMER and PATENTS sections in the
+# README file.
+#
+# This program is released under the terms of the license contained
+# in the file LICENSE.
+# ------------------------------------------------------------------
SHELL=/bin/sh
@@ -8,10 +21,10 @@
LDFLAGS=
BIGFILES=-D_FILE_OFFSET_BITS=64
-CFLAGS=-Wall -Winline -O -g $(BIGFILES)
+CFLAGS=-Wall -Winline -O2 -g $(BIGFILES)
# Where you want it installed when you do 'make install'
-PREFIX=/usr
+PREFIX=/usr/local
OBJS= blocksort.o \
@@ -77,14 +90,14 @@
cp -f libbz2.a $(PREFIX)/lib
chmod a+r $(PREFIX)/lib/libbz2.a
cp -f bzgrep $(PREFIX)/bin/bzgrep
- ln $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep
- ln $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep
+ ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep
+ ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep
chmod a+x $(PREFIX)/bin/bzgrep
cp -f bzmore $(PREFIX)/bin/bzmore
- ln $(PREFIX)/bin/bzmore $(PREFIX)/bin/bzless
+ ln -s -f $(PREFIX)/bin/bzmore $(PREFIX)/bin/bzless
chmod a+x $(PREFIX)/bin/bzmore
cp -f bzdiff $(PREFIX)/bin/bzdiff
- ln $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp
+ ln -s -f $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp
chmod a+x $(PREFIX)/bin/bzdiff
cp -f bzgrep.1 bzmore.1 bzdiff.1 $(PREFIX)/man/man1
chmod a+r $(PREFIX)/man/man1/bzgrep.1
@@ -124,10 +137,10 @@
distclean: clean
rm -f manual.ps manual.html manual.pdf
-DISTNAME=bzip2-1.0.3
+DISTNAME=bzip2-1.0.4
dist: check manual
rm -f $(DISTNAME)
- ln -sf . $(DISTNAME)
+ ln -s -f . $(DISTNAME)
tar cvf $(DISTNAME).tar \
$(DISTNAME)/blocksort.c \
$(DISTNAME)/huffman.c \
@@ -167,7 +180,6 @@
$(DISTNAME)/libbz2.dsp \
$(DISTNAME)/dlltest.dsp \
$(DISTNAME)/makefile.msc \
- $(DISTNAME)/Y2K_INFO \
$(DISTNAME)/unzcrash.c \
$(DISTNAME)/spewG.c \
$(DISTNAME)/mk251.c \
Modified: vendor/bzip2/current/Makefile-libbz2_so
===================================================================
--- vendor/bzip2/current/Makefile-libbz2_so 2007-04-11 12:59:00 UTC (rev 353)
+++ vendor/bzip2/current/Makefile-libbz2_so 2007-04-11 13:09:42 UTC (rev 354)
@@ -1,15 +1,30 @@
# This Makefile builds a shared version of the library,
-# libbz2.so.1.0.3, with soname libbz2.so.1.0,
+# libbz2.so.1.0.4, with soname libbz2.so.1.0,
# at least on x86-Linux (RedHat 7.2),
# with gcc-2.96 20000731 (Red Hat Linux 7.1 2.96-98).
-# Please see the README file for some
-# important info about building the library like this.
+# Please see the README file for some important info
+# about building the library like this.
+# ------------------------------------------------------------------
+# This file is part of bzip2/libbzip2, a program and library for
+# lossless, block-sorting data compression.
+#
+# bzip2/libbzip2 version 1.0.4 of 20 December 2006
+# Copyright (C) 1996-2006 Julian Seward <js...@bz...>
+#
+# Please read the WARNING, DISCLAIMER and PATENTS sections in the
+# README file.
+#
+# This program is released under the terms of the license contained
+# in the file LICENSE.
+# ------------------------------------------------------------------
+
+
SHELL=/bin/sh
CC=gcc
BIGFILES=-D_FILE_OFFSET_BITS=64
-CFLAGS=-fpic -fPIC -Wall -Winline -O -g
+CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES)
OBJS= blocksort.o \
huffman.o \
@@ -20,13 +35,13 @@
bzlib.o
all: $(OBJS)
- $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.3 $(OBJS)
- $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.3
+ $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.4 $(OBJS)
+ $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.4
rm -f libbz2.so.1.0
- ln -s libbz2.so.1.0.3 libbz2.so.1.0
+ ln -s libbz2.so.1.0.4 libbz2.so.1.0
clean:
- rm -f $(OBJS) bzip2.o libbz2.so.1.0.3 libbz2.so.1.0 bzip2-shared
+ rm -f $(OBJS) bzip2.o libbz2.so.1.0.4 libbz2.so.1.0 bzip2-shared
blocksort.o: blocksort.c
$(CC) $(CFLAGS) -c blocksort.c
Modified: vendor/bzip2/current/README
===================================================================
--- vendor/bzip2/current/README 2007-04-11 12:59:00 UTC (rev 353)
+++ vendor/bzip2/current/README 2007-04-11 13:09:42 UTC (rev 354)
@@ -1,35 +1,50 @@
-This is the README for bzip2, a block-sorting file compressor, version
-1.0.3. This version is fully compatible with the previous public
-releases, versions 0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1 and 1.0.2.
+This is the README for bzip2/libzip2.
+This version is fully compatible with the previous public releases.
-bzip2-1.0.3 is distributed under a BSD-style license. For details,
-see the file LICENSE.
+------------------------------------------------------------------
+This file is part of bzip2/libbzip2, a program and library for
+lossless, block-sorting data compression.
+bzip2/libbzip2 version 1.0.4 of 20 December 2006
+Copyright (C) 1996-2006 Julian Seward <js...@bz...>
+
+Please read the WARNING, DISCLAIMER and PATENTS sections in this file.
+
+This program is released under the terms of the license contained
+in the file LICENSE.
+------------------------------------------------------------------
+
Complete documentation is available in Postscript form (manual.ps),
PDF (manual.pdf) or html (manual.html). A plain-text version of the
-manual page is available as bzip2.txt. A statement about Y2K issues
-is now included in the file Y2K_INFO.
+manual page is available as bzip2.txt.
HOW TO BUILD -- UNIX
-Type `make'. This builds the library libbz2.a and then the
-programs bzip2 and bzip2recover. Six self-tests are run.
-If the self-tests complete ok, carry on to installation:
+Type 'make'. This builds the library libbz2.a and then the programs
+bzip2 and bzip2recover. Six self-tests are run. If the self-tests
+complete ok, carry on to installation:
-To install in /usr/bin, /usr/lib, /usr/man and /usr/include, type
+To install in /usr/local/bin, /usr/local/lib, /usr/local/man and
+/usr/local/include, type
+
make install
-To install somewhere else, eg, /xxx/yyy/{bin,lib,man,include}, type
+
+To install somewhere else, eg, /xxx/yyy/{bin,lib,man,include}, type
+
make install PREFIX=/xxx/yyy
+
If you are (justifiably) paranoid and want to see what 'make install'
is going to do, you can first do
+
make -n install or
make -n install PREFIX=/xxx/yyy respectively.
-The -n instructs make to show the commands it would execute, but
-not actually execute them.
+The -n instructs make to show the commands it would execute, but not
+actually execute them.
+
HOW TO BUILD -- UNIX, shared library libbz2.so.
Do 'make -f Makefile-libbz2_so'. This Makefile seems to work for
@@ -49,23 +64,25 @@
bzCompress to BZ2_bzCompress, to avoid namespace pollution.
Unfortunately this means that the libbz2.so created by
Makefile-libbz2_so will not work with any program which used an older
-version of the library. Sorry. I do encourage library clients to
-make the effort to upgrade to use version 1.0, since it is both faster
-and more robust than previous versions.
+version of the library. I do encourage library clients to make the
+effort to upgrade to use version 1.0, since it is both faster and more
+robust than previous versions.
HOW TO BUILD -- Windows 95, NT, DOS, Mac, etc.
It's difficult for me to support compilation on all these platforms.
My approach is to collect binaries for these platforms, and put them
-on the master web page (http://sources.redhat.com/bzip2). Look there.
-However (FWIW), bzip2-1.0.X is very standard ANSI C and should compile
+on the master web site (http://www.bzip.org). Look there. However
+(FWIW), bzip2-1.0.X is very standard ANSI C and should compile
unmodified with MS Visual C. If you have difficulties building, you
might want to read README.COMPILATION.PROBLEMS.
At least using MS Visual C++ 6, you can build from the unmodified
sources by issuing, in a command shell:
+
nmake -f makefile.msc
+
(you may need to first run the MSVC-provided script VCVARS32.BAT
so as to set up paths to the MSVC tools correctly).
@@ -86,18 +103,19 @@
WARNING:
- This program (attempts to) compress data by performing several
- non-trivial transformations on it. Unless you are 100% familiar
- with *all* the algorithms contained herein, and with the
- consequences of modifying them, you should NOT meddle with the
- compression or decompression machinery. Incorrect changes can and
- very likely *will* lead to disastrous loss of data.
+ This program and library (attempts to) compress data by
+ performing several non-trivial transformations on it.
+ Unless you are 100% familiar with *all* the algorithms
+ contained herein, and with the consequences of modifying them,
+ you should NOT meddle with the compression or decompression
+ machinery. Incorrect changes can and very likely *will*
+ lead to disastrous loss of data.
DISCLAIMER:
I TAKE NO RESPONSIBILITY FOR ANY LOSS OF DATA ARISING FROM THE
- USE OF THIS PROGRAM, HOWSOEVER CAUSED.
+ USE OF THIS PROGRAM/LIBRARY, HOWSOEVER CAUSED.
Every compression of a file implies an assumption that the
compressed file can be decompressed to reproduce the original.
@@ -110,19 +128,18 @@
PROGRAM UNLESS YOU ARE PREPARED TO ACCEPT THE POSSIBILITY, HOWEVER
SMALL, THAT THE DATA WILL NOT BE RECOVERABLE.
- That is not to say this program is inherently unreliable. Indeed,
- I very much hope the opposite is true. bzip2 has been carefully
- constructed and extensively tested.
+ That is not to say this program is inherently unreliable.
+ Indeed, I very much hope the opposite is true. bzip2/libbzip2
+ has been carefully constructed and extensively tested.
PATENTS:
- To the best of my knowledge, bzip2 does not use any patented
- algorithms. However, I do not have the resources to carry out
- a patent search. Therefore I cannot give any guarantee of the
- above statement.
+ To the best of my knowledge, bzip2/libbzip2 does not use any
+ patented algorithms. However, I do not have the resources
+ to carry out a patent search. Therefore I cannot give any
+ guarantee of the above statement.
-End of legalities.
WHAT'S NEW IN 0.9.0 (as compared to 0.1pl2) ?
@@ -156,21 +173,23 @@
See the CHANGES file.
+WHAT'S NEW IN 1.0.4 ?
+ See the CHANGES file.
+
+
I hope you find bzip2 useful. Feel free to contact me at
js...@bz...
if you have any suggestions or queries. Many people mailed me with
comments, suggestions and patches after the releases of bzip-0.15,
-bzip-0.21, and bzip2 versions 0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1 and
-1.0.2, and the changes in bzip2 are largely a result of this feedback.
-I thank you for your comments.
+bzip-0.21, and bzip2 versions 0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1,
+1.0.2 and 1.0.3, and the changes in bzip2 are largely a result of this
+feedback. I thank you for your comments.
-At least for the time being, bzip2's "home" is (or can be reached via)
-http://www.bzip.org
+bzip2's "home" is http://www.bzip.org/
Julian Seward
js...@bz...
-
Cambridge, UK.
18 July 1996 (version 0.15)
@@ -183,3 +202,4 @@
5 May 2000 (bzip2, version 1.0pre8)
30 December 2001 (bzip2, version 1.0.2pre1)
15 February 2005 (bzip2, version 1.0.3)
+20 December 2006 (bzip2, version 1.0.4)
Modified: vendor/bzip2/current/README.COMPILATION.PROBLEMS
===================================================================
--- vendor/bzip2/current/README.COMPILATION.PROBLEMS 2007-04-11 12:59:00 UTC (rev 353)
+++ vendor/bzip2/current/README.COMPILATION.PROBLEMS 2007-04-11 13:09:42 UTC (rev 354)
@@ -1,32 +1,47 @@
+------------------------------------------------------------------
+This file is part of bzip2/libbzip2, a program and library for
+lossless, block-sorting data compression.
-bzip2-1.0.3 should compile without problems on the vast majority of
+bzip2/libbzip2 version 1.0.4 of 20 December 2006
+Copyright (C) 1996-2006 Julian Seward <js...@bz...>
+
+Please read the WARNING, DISCLAIMER and PATENTS sections in the
+README file.
+
+This program is released under the terms of the license contained
+in the file LICENSE.
+------------------------------------------------------------------
+
+bzip2-1.0.4 should compile without problems on the vast majority of
platforms. Using the supplied Makefile, I've built and tested it
-myself for x86-linux and x86_64-linux. With makefile.msc, Visual C++
+myself for x86-linux and amd64-linux. With makefile.msc, Visual C++
6.0 and nmake, you can build a native Win32 version too. Large file
-support seems to work correctly on at least alpha-tru64unix and
-x86-cygwin32 (on Windows 2000).
+support seems to work correctly on at least on amd64-linux.
When I say "large file" I mean a file of size 2,147,483,648 (2^31)
bytes or above. Many older OSs can't handle files above this size,
but many newer ones can. Large files are pretty huge -- most files
you'll encounter are not Large Files.
-Earlier versions of bzip2 (0.1, 0.9.0, 0.9.5) compiled on a wide
-variety of platforms without difficulty, and I hope this version will
-continue in that tradition. However, in order to support large files,
-I've had to include the define -D_FILE_OFFSET_BITS=64 in the Makefile.
-This can cause problems.
+Early versions of bzip2 (0.1, 0.9.0, 0.9.5) compiled on a wide variety
+of platforms without difficulty, and I hope this version will continue
+in that tradition. However, in order to support large files, I've had
+to include the define -D_FILE_OFFSET_BITS=64 in the Makefile. This
+can cause problems.
The technique of adding -D_FILE_OFFSET_BITS=64 to get large file
support is, as far as I know, the Recommended Way to get correct large
file support. For more details, see the Large File Support
Specification, published by the Large File Summit, at
+
http://ftp.sas.com/standards/large.file
As a general comment, if you get compilation errors which you think
are related to large file support, try removing the above define from
the Makefile, ie, delete the line
+
BIGFILES=-D_FILE_OFFSET_BITS=64
+
from the Makefile, and do 'make clean ; make'. This will give you a
version of bzip2 without large file support, which, for most
applications, is probably not a problem.
@@ -37,3 +52,7 @@
large file support, if you are feeling paranoid. Be aware though that
any compilation problems which affect bzip2 will also affect spewG.c,
alas.
+
+AIX: I have reports that for large file support, you need to specify
+-D_LARGE_FILES rather than -D_FILE_OFFSET_BITS=64. I have not tested
+this myself.
Modified: vendor/bzip2/current/README.XML.STUFF
===================================================================
--- vendor/bzip2/current/README.XML.STUFF 2007-04-11 12:59:00 UTC (rev 353)
+++ vendor/bzip2/current/README.XML.STUFF 2007-04-11 13:09:42 UTC (rev 354)
@@ -1,3 +1,17 @@
+ ----------------------------------------------------------------
+ This file is part of bzip2/libbzip2, a program and library for
+ lossless, block-sorting data compression.
+
+ bzip2/libbzip2 version 1.0.4 of 20 December 2006
+ Copyright (C) 1996-2006 Julian Seward <js...@bz...>
+
+ Please read the WARNING, DISCLAIMER and PATENTS sections in the
+ README file.
+
+ This program is released under the terms of the license contained
+ in the file LICENSE.
+ ----------------------------------------------------------------
+
The script xmlproc.sh takes an xml file as input,
and processes it to create .pdf, .html or .ps output.
It uses format.pl, a perl script to format <pre> blocks nicely,
@@ -9,16 +23,16 @@
Usage:
- xmlproc.sh -v manual.xml
+ ./xmlproc.sh -v manual.xml
Validates an xml file to ensure no dtd-compliance errors
- xmlproc.sh -html manual.xml
+ ./xmlproc.sh -html manual.xml
Output: manual.html
- xmlproc.sh -pdf manual.xml
+ ./xmlproc.sh -pdf manual.xml
Output: manual.pdf
- xmlproc.sh -ps manual.xml
+ ./xmlproc.sh -ps manual.xml
Output: manual.ps
Deleted: vendor/bzip2/current/Y2K_INFO
===================================================================
--- vendor/bzip2/current/Y2K_INFO 2007-04-11 12:59:00 UTC (rev 353)
+++ vendor/bzip2/current/Y2K_INFO 2007-04-11 13:09:42 UTC (rev 354)
@@ -1,34 +0,0 @@
-
-Y2K status of bzip2 and libbzip2, versions 0.1, 0.9.0 and 0.9.5
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Informally speaking:
- bzip2 is a compression program built on top of libbzip2,
- a library which does the real work of compression and
- decompression. As far as I am aware, libbzip2 does not have
- any date-related code at all.
-
- bzip2 itself copies dates from source to destination files
- when compressing or decompressing, using the 'stat' and 'utime'
- UNIX system calls. It doesn't examine, manipulate or store the
- dates in any way. So as far as I can see, there shouldn't be any
- problem with bzip2 providing 'stat' and 'utime' work correctly
- on your system.
-
- On non-unix platforms (those for which BZ_UNIX in bzip2.c is
- not set to 1), bzip2 doesn't even do the date copying.
-
- Overall, informally speaking, I don't think bzip2 or libbzip2
- have a Y2K problem.
-
-Formally speaking:
- I am not prepared to offer you any assurance whatsoever
- regarding Y2K issues in my software. You alone assume the
- entire risk of using the software. The disclaimer of liability
- in the LICENSE file in the bzip2 source distribution continues
- to apply on this issue as with every other issue pertaining
- to the software.
-
-Julian Seward
-Cambridge, UK
-25 August 1999
Modified: vendor/bzip2/current/blocksort.c
===================================================================
--- vendor/bzip2/current/blocksort.c 2007-04-11 12:59:00 UTC (rev 353)
+++ vendor/bzip2/current/blocksort.c 2007-04-11 13:09:42 UTC (rev 354)
@@ -4,68 +4,21 @@
/*--- blocksort.c ---*/
/*-------------------------------------------------------------*/
-/*--
- This file is a part of bzip2 and/or libbzip2, a program and
- library for lossless, block-sorting data compression.
+/* ------------------------------------------------------------------
+ This file is part of bzip2/libbzip2, a program and library for
+ lossless, block-sorting data compression.
- Copyright (C) 1996-2005 Julian R Seward. All rights reserved.
+ bzip2/libbzip2 version 1.0.4 of 20 December 2006
+ Copyright (C) 1996-2006 Julian Seward <js...@bz...>
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
+ Please read the WARNING, DISCLAIMER and PATENTS sections in the
+ README file.
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
+ This program is released under the terms of the license contained
+ in the file LICENSE.
+ ------------------------------------------------------------------ */
- 2. The origin of this software must not be misrepresented; you must
- not claim that you wrote the original software. If you use this
- software in a product, an acknowledgment in the product
- documentation would be appreciated but is not required.
- 3. Altered source versions must be plainly marked as such, and must
- not be misrepresented as being the original software.
-
- 4. The name of the author may not be used to endorse or promote
- products derived from this software without specific prior written
- permission.
-
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
- OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- Julian Seward, Cambridge, UK.
- js...@bz...
- bzip2/libbzip2 version 1.0 of 21 March 2000
-
- This program is based on (at least) the work of:
- Mike Burrows
- David Wheeler
- Peter Fenwick
- Alistair Moffat
- Radford Neal
- Ian H. Witten
- Robert Sedgewick
- Jon L. Bentley
-
- For more information on these sources, see the manual.
-
- To get some idea how the block sorting algorithms in this file
- work, read my paper
- On the Performance of BWT Sorting Algorithms
- in Proceedings of the IEEE Data Compression Conference 2000,
- Snowbird, Utah, USA, 27-30 March 2000. The main sort in this
- file implements the algorithm called cache in the paper.
---*/
-
-
#include "bzlib_private.h"
/*---------------------------------------------*/
@@ -155,7 +108,7 @@
while (sp > 0) {
- AssertH ( sp < FALLBACK_QSORT_STACK_SIZE, 1004 );
+ AssertH ( sp < FALLBACK_QSORT_STACK_SIZE - 1, 1004 );
fpop ( lo, hi );
if (hi - lo < FALLBACK_QSORT_SMALL_THRESH) {
@@ -690,7 +643,7 @@
while (sp > 0) {
- AssertH ( sp < MAIN_QSORT_STACK_SIZE, 1001 );
+ AssertH ( sp < MAIN_QSORT_STACK_SIZE - 2, 1001 );
mpop ( lo, hi, d );
if (hi - lo < MAIN_QSORT_SMALL_THRESH ||
Modified: vendor/bzip2/current/bz-fo.xsl
===================================================================
--- vendor/bzip2/current/bz-fo.xsl 2007-04-11 12:59:00 UTC (rev 353)
+++ vendor/bzip2/current/bz-fo.xsl 2007-04-11 13:09:42 UTC (rev 354)
@@ -254,4 +254,23 @@
</xsl:template>
+<!-- Bug-fix for Suse 10 PassiveTex version -->
+<!-- Precompute attribute values 'cos PassiveTex is too stupid: -->
+<xsl:attribute-set name="component.title.properties">
+ <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
+ <xsl:attribute name="space-before.optimum">
+ <xsl:value-of select="concat($body.font.master, 'pt')"/>
+ </xsl:attribute>
+ <xsl:attribute name="space-before.minimum">
+ <xsl:value-of select="$body.font.master * 0.8"/>
+ <xsl:text>pt</xsl:text>
+ </xsl:attribute>
+ <xsl:attribute name="space-before.maximum">
+ <xsl:value-of select="$body.font.master * 1.2"/>
+ <xsl:text>pt</xsl:text>
+ </xsl:attribute>
+ <xsl:attribute name="hyphenate">false</xsl:attribute>
+</xsl:attribute-set>
+
+
</xsl:stylesheet>
Modified: vendor/bzip2/current/bzdiff
===================================================================
--- vendor/bzip2/current/bzdiff 2007-04-11 12:59:00 UTC (rev 353)
+++ vendor/bzip2/current/bzdiff 2007-04-11 13:09:42 UTC (rev 354)
@@ -12,7 +12,7 @@
# necessary) and fed to cmp or diff. The exit status from cmp
# or diff is preserved.
-PATH="/usr/bin:$PATH"; export PATH
+PATH="/usr/bin:/bin:$PATH"; export PATH
prog=`echo $0 | sed 's|.*/||'`
case "$prog" in
*cmp) comp=${CMP-cmp} ;;
@@ -37,7 +37,7 @@
echo "Usage: $prog [${comp}_options] file [file]"
exit 1
fi
-tmp=`tempfile -d /tmp -p bz` || {
+tmp=`mktemp ${TMPDIR:-/tmp}/bzdiff.XXXXXXXXXX` || {
echo 'cannot create a temporary file' >&2
exit 1
}
Modified: vendor/bzip2/current/bzgrep
===================================================================
--- vendor/bzip2/current/bzgrep 2007-04-11 12:59:00 UTC (rev 353)
+++ vendor/bzip2/current/bzgrep 2007-04-11 13:09:42 UTC (rev 354)
@@ -63,7 +63,11 @@
bzip2 -cdfq "$i" | $grep $opt "$pat"
r=$?
else
- bzip2 -cdfq "$i" | $grep $opt "$pat" | sed "s|^|${i}:|"
+ j=${i//\\/\\\\}
+ j=${j//|/\\|}
+ j=${j//&/\\&}
+ j=`printf "%s" "$j" | tr '\n' ' '`
+ bzip2 -cdfq "$i" | $grep $opt "$pat" | sed "s|^|${j}:|"
r=$?
fi
test "$r" -ne 0 && res="$r"
Modified: vendor/bzip2/current/bzip2.1
===================================================================
--- vendor/bzip2/current/bzip2.1 2007-04-11 12:59:00 UTC (rev 353)
+++ vendor/bzip2/current/bzip2.1 2007-04-11 13:09:42 UTC (rev 354)
@@ -1,7 +1,7 @@
.PU
.TH bzip2 1
.SH NAME
-bzip2, bunzip2 \- a block-sorting file compressor, v1.0.3
+bzip2, bunzip2 \- a block-sorting file compressor, v1.0.4
.br
bzcat \- decompresses files to stdout
.br
@@ -405,11 +405,11 @@
tries hard to detect I/O errors and exit cleanly, but the details of
what the problem is sometimes seem rather misleading.
-This manual page pertains to version 1.0.3 of
+This manual page pertains to version 1.0.4 of
.I bzip2.
Compressed data created by this version is entirely forwards and
backwards compatible with the previous public releases, versions
-0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1 and 1.0.2, but with the following
+0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1, 1.0.2 and 1.0.3, but with the following
exception: 0.9.0 and above can correctly decompress multiple
concatenated compressed files. 0.1pl2 cannot do this; it will stop
after decompressing just the first file in the stream.
Modified: vendor/bzip2/current/bzip2.1.preformatted
===================================================================
--- vendor/bzip2/current/bzip2.1.preformatted 2007-04-11 12:59:00 UTC (rev 353)
+++ vendor/bzip2/current/bzip2.1.preformatted 2007-04-11 13:09:42 UTC (rev 354)
@@ -3,7 +3,7 @@
NNAAMMEE
- bzip2, bunzip2 − a block‐sorting file compressor, v1.0.3
+ bzip2, bunzip2 − a block‐sorting file compressor, v1.0.4
bzcat − decompresses files to stdout
bzip2recover − recovers data from damaged bzip2 files
@@ -348,14 +348,14 @@
but the details of what the problem is sometimes seem
rather misleading.
- This manual page pertains to version 1.0.3 of _b_z_i_p_2_. Com
+ This manual page pertains to version 1.0.4 of _b_z_i_p_2_. Com
pressed data created by this version is entirely forwards
and backwards compatible with the previous public
- releases, versions 0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1 and
- 1.0.2, but with the following exception: 0.9.0 and above
- can correctly decompress multiple concatenated compressed
- files. 0.1pl2 cannot do this; it will stop after decom
- pressing just the first file in the stream.
+ releases, versions 0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1,
+ 1.0.2 and 1.0.3, but with the following exception: 0.9.0
+ and above can correctly decompress multiple concatenated
+ compressed files. 0.1pl2 cannot do this; it will stop
+ after decompressing just the first file in the stream.
_b_z_i_p_2_r_e_c_o_v_e_r versions prior to 1.0.2 used 32‐bit integers
to represent bit positions in compressed files, so they
Modified: vendor/bzip2/current/bzip2.c
===================================================================
--- vendor/bzip2/current/bzip2.c 2007-04-11 12:59:00 UTC (rev 353)
+++ vendor/bzip2/current/bzip2.c 2007-04-11 13:09:42 UTC (rev 354)
@@ -3,118 +3,26 @@
/*--- A block-sorting, lossless compressor bzip2.c ---*/
/*-----------------------------------------------------------*/
-/*--
- This file is a part of bzip2 and/or libbzip2, a program and
- library for lossless, block-sorting data compression.
+/* ------------------------------------------------------------------
+ This file is part of bzip2/libbzip2, a program and library for
+ lossless, block-sorting data compression.
- Copyright (C) 1996-2005 Julian R Seward. All rights reserved.
+ bzip2/libbzip2 version 1.0.4 of 20 December 2006
+ Copyright (C) 1996-2006 Julian Seward <js...@bz...>
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
+ Please read the WARNING, DISCLAIMER and PATENTS sections in the
+ README file.
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
+ This program is released under the terms of the license contained
+ in the file LICENSE.
+ ------------------------------------------------------------------ */
- 2. The origin of this software must not be misrepresented; you must
- not claim that you wrote the original software. If you use this
- software in a product, an acknowledgment in the product
- documentation would be appreciated but is not required.
- 3. Altered source versions must be plainly marked as such, and must
- not be misrepresented as being the original software.
-
- 4. The name of the author may not be used to endorse or promote
- products derived from this software without specific prior written
- permission.
-
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
- OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- Julian Seward, Cambridge, UK.
- js...@bz...
- bzip2/libbzip2 version 1.0 of 21 March 2000
-
- This program is based on (at least) the work of:
- Mike Burrows
- David Wheeler
- Peter Fenwick
- Alistair Moffat
- Radford Neal
- Ian H. Witten
- Robert Sedgewick
- Jon L. Bentley
-
- For more information on these sources, see the manual.
---*/
-
-
-/*----------------------------------------------------*/
-/*--- IMPORTANT ---*/
-/*----------------------------------------------------*/
-
-/*--
- WARNING:
- This program and library (attempts to) compress data by
- performing several non-trivial transformations on it.
- Unless you are 100% familiar with *all* the algorithms
- contained herein, and with the consequences of modifying them,
- you should NOT meddle with the compression or decompression
- machinery. Incorrect changes can and very likely *will*
- lead to disasterous loss of data.
-
- DISCLAIMER:
- I TAKE NO RESPONSIBILITY FOR ANY LOSS OF DATA ARISING FROM THE
- USE OF THIS PROGRAM, HOWSOEVER CAUSED.
-
- Every compression of a file implies an assumption that the
- compressed file can be decompressed to reproduce the original.
- Great efforts in design, coding and testing have been made to
- ensure that this program works correctly. However, the
- complexity of the algorithms, and, in particular, the presence
- of various special cases in the code which occur with very low
- but non-zero probability make it impossible to rule out the
- possibility of bugs remaining in the program. DO NOT COMPRESS
- ANY DATA WITH THIS PROGRAM AND/OR LIBRARY UNLESS YOU ARE PREPARED
- TO ACCEPT THE POSSIBILITY, HOWEVER SMALL, THAT THE DATA WILL
- NOT BE RECOVERABLE.
-
- That is not to say this program is inherently unreliable.
- Indeed, I very much hope the opposite is true. bzip2/libbzip2
- has been carefully constructed and extensively tested.
-
- PATENTS:
- To the best of my knowledge, bzip2/libbzip2 does not use any
- patented algorithms. However, I do not have the resources
- available to carry out a full patent search. Therefore I cannot
- give any guarantee of the above statement.
---*/
-
-
-
-/*----------------------------------------------------*/
-/*--- and now for something much more pleasant :-) ---*/
-/*----------------------------------------------------*/
-
-/*---------------------------------------------*/
-/*--
- Place a 1 beside your platform, and 0 elsewhere.
---*/
-
-/*--
- Generic 32-bit Unix.
- Also works on 64-bit Unix boxes.
- This is the default.
---*/
+/* Place a 1 beside your platform, and 0 elsewhere.
+ Generic 32-bit Unix.
+ Also works on 64-bit Unix boxes.
+ This is the default.
+*/
#define BZ_UNIX 1
/*--
@@ -302,16 +210,17 @@
FILE *outputHandleJustInCase;
Int32 workFactor;
-static void panic ( Char* ) NORETURN;
-static void ioError ( void ) NORETURN;
-static void outOfMemory ( void ) NORETURN;
-static void configError ( void ) NORETURN;
-static void crcError ( void ) NORETURN;
-static void cleanUpAndFail ( Int32 ) NORETURN;
-static void compressedStreamEOF ( void ) NORETURN;
+static void panic ( const Char* ) NORETURN;
+static void ioError ( void ) NORETURN;
+static void outOfMemory ( void ) NORETURN;
+static void configError ( void ) NORETURN;
+static void crcError ( void ) NORETURN;
+static void cleanUpAndFail ( Int32 ) NORETURN;
+static void compressedStreamEOF ( void ) NORETURN;
static void copyFileName ( Char*, Char* );
static void* myMalloc ( Int32 );
+static void applySavedFileAttrToOutputFile ( IntNative fd );
@@ -457,6 +366,9 @@
ret = fflush ( zStream );
if (ret == EOF) goto errhandler_io;
if (zStream != stdout) {
+ Int32 fd = fileno ( zStream );
+ if (fd < 0) goto errhandler_io;
+ applySavedFileAttrToOutputFile ( fd );
ret = fclose ( zStream );
outputHandleJustInCase = NULL;
if (ret == EOF) goto errhandler_io;
@@ -569,6 +481,11 @@
closeok:
if (ferror(zStream)) goto errhandler_io;
+ if (stream != stdout) {
+ Int32 fd = fileno ( stream );
+ if (fd < 0) goto errhandler_io;
+ applySavedFileAttrToOutputFile ( fd );
+ }
ret = fclose ( zStream );
if (ret == EOF) goto errhandler_io;
@@ -826,7 +743,7 @@
/*---------------------------------------------*/
static
-void panic ( Char* s )
+void panic ( const Char* s )
{
fprintf ( stderr,
"\n%s: PANIC -- internal consistency error:\n"
@@ -1039,6 +956,7 @@
For non-Unix platforms, if we are not worrying about
security issues, simple this simply behaves like fopen.
*/
+static
FILE* fopen_output_safely ( Char* name, const char* mode )
{
# if BZ_UNIX
@@ -1129,7 +1047,7 @@
static
-void applySavedMetaInfoToOutputFile ( Char *dstName )
+void applySavedTimeInfoToOutputFile ( Char *dstName )
{
# if BZ_UNIX
IntNative retVal;
@@ -1138,13 +1056,21 @@
uTimBuf.actime = fileMetaInfo.st_atime;
uTimBuf.modtime = fileMetaInfo.st_mtime;
- retVal = chmod ( dstName, fileMetaInfo.st_mode );
+ retVal = utime ( dstName, &uTimBuf );
ERROR_IF_NOT_ZERO ( retVal );
+# endif
+}
- retVal = utime ( dstName, &uTimBuf );
+static
+void applySavedFileAttrToOutputFile ( IntNative fd )
+{
+# if BZ_UNIX
+ IntNative retVal;
+
+ retVal = fchmod ( fd, fileMetaInfo.st_mode );
ERROR_IF_NOT_ZERO ( retVal );
- retVal = chown ( dstName, fileMetaInfo.st_uid, fileMetaInfo.st_gid );
+ (void) fchown ( fd, fileMetaInfo.st_uid, fileMetaInfo.st_gid );
/* chown() will in many cases return with EPERM, which can
be safely ignored.
*/
@@ -1175,13 +1101,13 @@
/*---------------------------------------------*/
#define BZ_N_SUFFIX_PAIRS 4
-Char* zSuffix[BZ_N_SUFFIX_PAIRS]
+const Char* zSuffix[BZ_N_SUFFIX_PAIRS]
= { ".bz2", ".bz", ".tbz2", ".tbz" };
-Char* unzSuffix[BZ_N_SUFFIX_PAIRS]
+const Char* unzSuffix[BZ_N_SUFFIX_PAIRS]
= { "", "", ".tar", ".tar" };
static
-Bool hasSuffix ( Char* s, Char* suffix )
+Bool hasSuffix ( Char* s, const Char* suffix )
{
Int32 ns = strlen(s);
Int32 nx = strlen(suffix);
@@ -1192,7 +1118,8 @@
static
Bool mapSuffix ( Char* name,
- Char* oldSuffix, Char* newSuffix )
+ const Char* oldSuffix,
+ const Char* newSuffix )
{
if (!hasSuffix(name,oldSuffix)) return False;
name[strlen(name)-strlen(oldSuffix)] = 0;
@@ -1217,8 +1144,8 @@
switch (srcMode) {
case SM_I2O:
- copyFileName ( inName, "(stdin)" );
- copyFileName ( outName, "(stdout)" );
+ copyFileName ( inName, (Char*)"(stdin)" );
+ copyFileName ( outName, (Char*)"(stdout)" );
break;
case SM_F2F:
copyFileName ( inName, name );
@@ -1227,7 +1154,7 @@
break;
case SM_F2O:
copyFileName ( inName, name );
- copyFileName ( outName, "(stdout)" );
+ copyFileName ( outName, (Char*)"(stdout)" );
break;
}
@@ -1370,7 +1297,7 @@
/*--- If there was an I/O error, we won't get here. ---*/
if ( srcMode == SM_F2F ) {
- applySavedMetaInfoToOutputFile ( outName );
+ applySavedTimeInfoToOutputFile ( outName );
deleteOutputOnInterrupt = False;
if ( !keepInputFiles ) {
IntNative retVal = remove ( inName );
@@ -1401,8 +1328,8 @@
cantGuess = False;
switch (srcMode) {
case SM_I2O:
- copyFileName ( inName, "(stdin)" );
- copyFileName ( outName, "(stdout)" );
+ copyFileName ( inName, (Char*)"(stdin)" );
+ copyFileName ( outName, (Char*)"(stdout)" );
break;
case SM_F2F:
copyFileName ( inName, name );
@@ -1415,7 +1342,7 @@
break;
case SM_F2O:
copyFileName ( inName, name );
- copyFileName ( outName, "(stdout)" );
+ copyFileName ( outName, (Char*)"(stdout)" );
break;
}
@@ -1548,7 +1475,7 @@
/*--- If there was an I/O error, we won't get here. ---*/
if ( magicNumberOK ) {
if ( srcMode == SM_F2F ) {
- applySavedMetaInfoToOutputFile ( outName );
+ applySavedTimeInfoToOutputFile ( outName );
deleteOutputOnInterrupt = False;
if ( !keepInputFiles ) {
IntNative retVal = remove ( inName );
@@ -1593,9 +1520,9 @@
if (name == NULL && srcMode != SM_I2O)
panic ( "testf: bad modes\n" );
- copyFileName ( outName, "(none)" );
+ copyFileName ( outName, (Char*)"(none)" );
switch (srcMode) {
- case SM_I2O: copyFileName ( inName, "(stdin)" ); break;
+ case SM_I2O: copyFileName ( inName, (Char*)"(stdin)" ); break;
case SM_F2F: copyFileName ( inName, name ); break;
case SM_F2O: copyFileName ( inName, name ); break;
}
@@ -1678,11 +1605,11 @@
"bzip2, a block-sorting file compressor. "
"Version %s.\n"
" \n"
- " Copyright (C) 1996-2005 by Julian Seward.\n"
+ " Copyright (C) 1996-2006 by Julian Seward.\n"
" \n"
" This program is free software; you can redistribute it and/or modify\n"
" it under the terms set out in the LICENSE file, which is included\n"
- " in the bzip2-1.0 source distribution.\n"
+ " in the bzip2-1.0.4 source distribution.\n"
" \n"
" This program is distributed in the hope that it will be useful,\n"
" but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -1885,8 +1812,8 @@
# endif
# endif
- copyFileName ( inName, "(none)" );
- copyFileName ( outName, "(none)" );
+ copyFileName ( inName, (Char*)"(none)" );
+ copyFileName ( outName, (Char*)"(none)" );
copyFileName ( progNameReally, argv[0] );
progName = &progNameReally[0];
@@ -1898,8 +1825,8 @@
expand filename wildcards in arg list.
--*/
argList = NULL;
- addFlagsFromEnvVar ( &argList, "BZIP2" );
- addFlagsFromEnvVar ( &argList, "BZIP" );
+ addFlagsFromEnvVar ( &argList, (Char*)"BZIP2" );
+ addFlagsFromEnvVar ( &argList, (Char*)"BZIP" );
for (i = 1; i <= argc-1; i++)
APPEND_FILESPEC(argList, argv[i]);
Modified: vendor/bzip2/current/bzip2.txt
===================================================================
--- vendor/bzip2/current/bzip2.txt 2007-04-11 12:59:00 UTC (rev 353)
+++ vendor/bzip2/current/bzip2.txt 2007-04-11 13:09:42 UTC (rev 354)
@@ -1,6 +1,6 @@
NAME
- bzip2, bunzip2 - a block-sorting file compressor, v1.0.3
+ bzip2, bunzip2 - a block-sorting file compressor, v1.0.4
bzcat - decompresses files to stdout
bzip2recover - recovers data from damaged bzip2 files
@@ -345,14 +345,14 @@
but the details of what the problem is sometimes seem
rather misleading.
- This manual page pertains to version 1.0.3 of bzip2. Com-
+ This manual page pertains to version 1.0.4 of bzip2. Com-
pressed data created by this version is entirely forwards
and backwards compatible with the previous public
- releases, versions 0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1 and
- 1.0.2, but with the following exception: 0.9.0 and above
- can correctly decompress multiple concatenated compressed
- files. 0.1pl2 cannot do this; it will stop after decom-
- pressing just the first file in the stream.
+ releases, versions 0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1,
+ 1.0.2 and 1.0.3, but with the following exception: 0.9.0
+ and above can correctly decompress multiple concatenated
+ compressed files. 0.1pl2 cannot do this; it will stop
+ after decompressing just the first file in the stream.
bzip2recover versions prior to 1.0.2 used 32-bit integers
to represent bit positions in compressed files, so they
Modified: vendor/bzip2/current/bzip2recover.c
===================================================================
--- vendor/bzip2/current/bzip2recover.c 2007-04-11 12:59:00 UTC (rev 353)
+++ vendor/bzip2/current/bzip2recover.c 2007-04-11 13:09:42 UTC (rev 354)
@@ -1,57 +1,25 @@
-
/*-----------------------------------------------------------*/
/*--- Block recoverer program for bzip2 ---*/
/*--- bzip2recover.c ---*/
/*-----------------------------------------------------------*/
-/*--
- This program is bzip2recover, a program to attempt data
- salvage from damaged files created by the accompanying
- bzip2-1.0.3 program.
+/* ------------------------------------------------------------------
+ This file is part of bzip2/libbzip2, a program and library for
+ lossless, block-sorting data compression.
- Copyright (C) 1996-2005 Julian R Seward. All rights reserved.
+ bzip2/libbzip2 version 1.0.4 of 20 December 2006
+ Copyright (C) 1996-2006 Julian Seward <js...@bz...>
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
+ Please read the WARNING, DISCLAIMER and PATENTS sections in the
+ README file.
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
+ This program is released under the terms of the license contained
+ in the file LICENSE.
+ ------------------------------------------------------------------ */
- 2. The origin of this software must not be misrepresented; you must
- not claim that you wrote the original software. If you use this
- software in a product, an acknowledgment in the product
- documentation would be appreciated but is not required.
+/* This program is a complete hack and should be rewritten properly.
+ It isn't very complicated. */
- 3. Altered source versions must be plainly marked as such, and must
- not be misrepresented as being the original software.
-
- 4. The name of the author may not be used to endorse or promote
- products derived from this software without specific prior written
- permission.
-
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
- OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- Julian Seward, Cambridge, UK.
- js...@bz...
- bzip2/libbzip2 version 1.0.3 of 15 February 2005
---*/
-
-/*--
- This program is a complete hack and should be rewritten
- properly. It isn't very complicated.
---*/
-
#include <stdio.h>
#include <errno.h>
#include <stdlib.h>
@@ -114,7 +82,7 @@
/*---------------------------------------------------*/
/*---------------------------------------------*/
-void readError ( void )
+static void readError ( void )
{
fprintf ( stderr,
"%s: I/O error reading `%s', possible reason follows.\n",
@@ -127,7 +95,7 @@
/*---------------------------------------------*/
-void writeError ( void )
+static void writeError ( void )
{
fprintf ( stderr,
"%s: I/O error reading `%s', possible reason follows.\n",
@@ -140,7 +108,7 @@
/*---------------------------------------------*/
-void mallocFail ( Int32 n )
+static void mallocFail ( Int32 n )
{
fprintf ( stderr,
"%s: malloc failed on request for %d bytes.\n",
@@ -152,7 +120,7 @@
/*---------------------------------------------*/
-void tooManyBlocks ( Int32 max_handled_blocks )
+static void tooManyBlocks ( Int32 max_handled_blocks )
{
fprintf ( stderr,
"%s: `%s' appears to contain more than %d blocks\n",
@@ -183,7 +151,7 @@
/*---------------------------------------------*/
-BitStream* bsOpenReadStream ( FILE* stream )
+static BitStream* bsOpenReadStream ( FILE* stream )
{
BitStream *bs = malloc ( sizeof(BitStream) );
if (bs == NULL) mallocFail ( sizeof(BitStream) );
@@ -196,7 +164,7 @@
/*---------------------------------------------*/
-BitStream* bsOpenWriteStream ( FILE* stream )
+static BitStream* bsOpenWriteStream ( FILE* stream )
{
BitStream *bs = malloc ( sizeof(BitStream) );
if (bs == NULL) mallocFail ( sizeof(BitStream) );
@@ -209,7 +177,7 @@
/*---------------------------------------------*/
-void bsPutBit ( BitStream* bs, Int32 bit )
+static void bsPutBit ( BitStream* bs, Int32 bit )
{
if (bs->buffLive == 8) {
Int32 retVal = putc ( (UChar) bs->buffer, bs->handle );
@@ -228,7 +196,7 @@
/*--
Returns 0 or 1, or 2 to indicate EOF.
--*/
-Int32 bsGetBit ( BitStream* bs )
+static Int32 bsGetBit ( BitStream* bs )
{
if (bs->buffLive > 0) {
bs->buffLive --;
@@ -247,7 +215,7 @@
/*---------------------------------------------*/
-void bsClose ( BitStream* bs )
+static void bsClose ( BitStream* bs )
{
Int32 retVal;
@@ -271,7 +239,7 @@
/*---------------------------------------------*/
-void bsPutUChar ( BitStream* bs, UChar c )
+static void bsPutUChar ( BitStream* bs, UChar c )
{
Int32 i;
for (i = 7; i >= 0; i--)
@@ -280,7 +248,7 @@
/*---------------------------------------------*/
-void bsPutUInt32 ( BitStream* bs, UInt32 c )
+static void bsPutUInt32 ( BitStream* bs, UInt32 c )
{
Int32 i;
@@ -290,7 +258,7 @@
/*---------------------------------------------*/
-Bool endsInBz2 ( Char* name )
+static Bool endsInBz2 ( Char* name )
{
Int32 n = strlen ( name );
if (n <= 4) return False;
@@ -345,7 +313,7 @@
inFileName[0] = outFileName[0] = 0;
fprintf ( stderr,
- "bzip2recover 1.0.3: extracts blocks from damaged .bz2 files.\n" );
+ "bzip2recover 1.0.4: extracts blocks from damaged .bz2 files.\n" );
if (argc != 2) {
fprintf ( stderr, "%s: usage is `%s damaged_file_name'.\n",
Modified: vendor/bzip2/current/bzlib.c
===================================================================
--- vendor/bzip2/current/bzlib.c 2007-04-11 12:59:00 UTC (rev 353)
+++ vendor/bzip2/current/bzlib.c 2007-04-11 13:09:42 UTC (rev 354)
@@ -4,75 +4,30 @@
/*--- bzlib.c ---*/
/*-------------------------------------------------------------*/
-/*--
- This file is a part of bzip2 and/or libbzip2, a program and
- library for lossless, block-sorting data compression.
+/* ------------------------------------------------------------------
+ This file is part of bzip2/libbzip2, a program and library for
+ lossless, block-sorting data compression.
- Copyright (C) 1996-2005 Julian R Seward. All rights reserved.
+ bzip2/libbzip2 version 1.0.4 of 20 December 2006
+ Copyright (C) 1996-2006 Julian Seward <js...@bz...>
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
+ Please read the WARNING, DISCLAIMER and PATENTS sections in the
+ README file.
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
+ This program is released under the terms of the license contained
+ in the file LICENSE.
+ ------------------------------------------------------------------ */
- 2. The origin of this software must not be misrepresented; you must
- not claim that you wrote the original software. If you use this
- software in a product, an acknowledgment in the product
- documentation would be appreciated but is not required.
-
- 3. Altered source versions must be plainly marked as such, and must
- not be misrepresented as being the original software.
-
- 4. The name of the author may not be used to endorse or promote
- products derived from this software without specific prior written
- permission.
-
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
- OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- Julian Seward, Cambridge, UK.
- js...@bz...
- bzip2/libbzip2 version 1.0 of 21 March 2000
-
- This program is based on (at least) the work of:
- Mike Burrows
- David Wheeler
- Peter Fenwick
- Alistair Moffat
- Radford Neal
- Ian H. Witten
- Robert Sedgewick
- Jon L. Bentley
-
- For more information on these sources, see the manual.
---*/
-
-/*--
- CHANGES
- ~~~~~~~
- 0.9.0 -- original version.
-
+/* CHANGES
+ 0.9.0 -- original version.
0.9.0a/b -- no changes in this file.
+ 0.9.0c -- made zero-length BZ_FLUSH work correctly in bzCompress().
+ fixed bzWrite/bzRead to ignore zero-length requests.
+ fixed bzread to correctly handle read requests after EOF.
+ wrong parameter order in call to bzDecompressInit in
+ bzBuffToBuffDecompress. Fixed.
+*/
- 0.9.0c
- * made zero-length BZ_FLUSH work correctly in bzCompress().
- * fixed bzWrite/bzRead to ignore zero-length requests.
- * fixed bzread to correctly handle read requests after EOF.
- * wrong parameter order in call to bzDecompressInit in
- bzBuffToBuffDecompress. Fixed.
---*/
-
#include "bzlib_private.h"
@@ -1394,8 +1349,7 @@
/*---------------------------------------------------*/
/*--
- Code contributed by Yoshioka Tsuneo
- (QWF...@ni.../tsu...@is...),
+ Code contributed by Yoshioka Tsuneo (ts...@rr...)
to support better zlib compatibility.
This code is not _officially_ part of libbzip2 (yet);
I haven't tested it, documented it, or considered the
@@ -1406,7 +1360,7 @@
/*---------------------------------------------------*/
/*--
- return version like "0.9.0c".
+ return version like "0.9.5d, 4-Sept-1999".
--*/
const char * BZ_API(BZ2_bzlibVersion)(void)
{
@@ -1559,9 +1513,10 @@
void BZ_API(BZ2_bzclose) (BZFILE* b)
{
int bzerr;
- FILE *fp = ((bzFile *)b)->handle;
+ FILE *fp;
if (b==NULL) {return;}
+ fp = ((bzFile *)b)->handle;
if(((bzFile*)b)->writing){
BZ2_bzWriteClose(&bzerr,b,0,NULL,NULL);
if(bzerr != BZ_OK){
@@ -1580,7 +1535,7 @@
/*--
return last error code
--*/
-static char *bzerrorstrings[] = {
+static const char *bzerrorstrings[] = {
"OK"
,"SEQUENCE_ERROR"
,"PARAM_ERROR"
Modified: vendor/bzip2/current/bzlib.h
===================================================================
--- vendor/bzip2/current/bzlib.h 2007-04-11 12:59:00 UTC (rev 353)
+++ vendor/bzip2/current/bzlib.h 2007-04-11 13:09:42 UTC (rev 354)
@@ -4,61 +4,21 @@
/*--- bzlib.h ---*/
/*-------------------------------------------------------------*/
-/*--
- This file is a part of bzip2 and/or libbzip2, a program and
- library for lossless, block-sorting data compression.
+/* ------------------------------------------------------------------
+ This file is part of bzip2/libbzip2, a program and library for
+ lossless, block-sorting data compression.
- Copyright (C) 1996-2005 Julian R Seward. All rights reserved.
+ bzip2/libbzip2 version 1.0.4 of 20 December 2006
+ Copyright (C) 1996-2006 Julian Seward <js...@bz...>
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
+ Please read the WARNING, DISCLAIMER and PATENTS sections in the
+ README file.
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
+ This program is released under the terms of the license contained
+ in the file LICENSE.
+ ------------------------------------------------------------------ */
- 2. The origin of this software must not be misrepresented; you must
- not claim that you wrote the original software. If you use this
- software in a product, an acknowledgment in the product
- documentation would be appreciated but is not required.
- 3. Altered source versions must be plainly marked as such, and must
- not be misrepresented as being the original software.
-
- 4. The name of...
[truncated message content] |
|
From: <fr...@us...> - 2007-04-11 12:59:03
|
Revision: 353
http://svn.sourceforge.net/fuse-for-macosx/?rev=353&view=rev
Author: fredm
Date: 2007-04-11 05:59:00 -0700 (Wed, 11 Apr 2007)
Log Message:
-----------
Merge up to fuse-0.8.0
Modified Paths:
--------------
branches/Release-0_8_0/fuse/ChangeLog
branches/Release-0_8_0/fuse/README
branches/Release-0_8_0/fuse/configure.in
branches/Release-0_8_0/fuse/fuse.cpp
branches/Release-0_8_0/fuse/fusepb/English.lproj/InfoPlist.strings
branches/Release-0_8_0/fuse/fusepb/Info-Fuse.plist
branches/Release-0_8_0/fuse/fusepb/config.h
branches/Release-0_8_0/fuse/fusepb/controllers/FuseController.m
branches/Release-0_8_0/fuse/hacking/ChangeLog
branches/Release-0_8_0/fuse/hacking/cvs-tags
branches/Release-0_8_0/fuse/man/fuse.1
branches/Release-0_8_0/fuse/rzx.c
Modified: branches/Release-0_8_0/fuse/ChangeLog
===================================================================
--- branches/Release-0_8_0/fuse/ChangeLog 2007-04-11 12:33:42 UTC (rev 352)
+++ branches/Release-0_8_0/fuse/ChangeLog 2007-04-11 12:59:00 UTC (rev 353)
@@ -1,4 +1,4 @@
-2007-??-?? Philip Kendall <phi...@sh...>
+2007-04-11 Philip Kendall <phi...@sh...>
* Fuse 0.8.0 released
@@ -81,6 +81,11 @@
Szasz, Paul van der Laan and other people to whom I apologise
for forgetting).
+ * On a personal note, I (Philip) would like to dedicate the 0.8
+ release of Fuse to the memory of Chris "Oggie" Lightfoot. I
+ don't know whether he would have loved or hated some of the code
+ in Fuse, but I'm sure he would have expressed his opinion.
+
2004-07-16 Philip Kendall <pak...@sr...>
* Fuse 0.7.0 released.
@@ -783,4 +788,4 @@
* Version 0.1.0 released.
-$Id: ChangeLog,v 1.46 2007/02/02 16:21:50 pak21 Exp $
+$Id: ChangeLog,v 1.46.2.1 2007/04/09 16:59:02 pak21 Exp $
Modified: branches/Release-0_8_0/fuse/README
===================================================================
--- branches/Release-0_8_0/fuse/README 2007-04-11 12:33:42 UTC (rev 352)
+++ branches/Release-0_8_0/fuse/README 2007-04-11 12:59:00 UTC (rev 353)
@@ -1,4 +1,4 @@
-The Free Unix Spectrum Emulator (Fuse) 0.7.0
+The Free Unix Spectrum Emulator (Fuse) 0.8.0
============================================
Fuse (the Free Unix Spectrum Emulator) was originally, and somewhat
@@ -10,9 +10,10 @@
What Fuse does have:
-* Working Spectrum 16K/48K/128K/+2/+2A/+3/+3e/SE, Timex TC2048/TC2068,
- Pentagon 128 and Scorpion ZS 256 emulation, running at true Speccy
- speed on any computer you're likely to try it on.
+* Working Spectrum 16K/48K/128K/+2/+2A/+3/+3e/SE, Timex TC2048,
+ TC2068 and TS2068, Pentagon 128 and Scorpion ZS 256 emulation,
+ running at true Speccy speed on any computer you're likely to try it
+ on.
* Support for loading from .tzx files.
* Sound (on systems supporting the Open Sound System, SDL, or OpenBSD/
Solaris's /dev/audio).
@@ -20,8 +21,9 @@
(including Kempston, Sinclair and Cursor joysticks).
* Emulation of some of the printers you could attach to a Spectrum.
* Support for the RZX input recording file format, including
- 'competition mode'.
-* Emulation of the Spectrum +3e, ZXATASP and ZXCF IDE interfaces.
+ rollback and 'competition mode'.
+* Emulation of the DivIDE, Interface I, Kempston mouse, Spectrum +3e,
+ ZXATASP and ZXCF interfaces.
What you'll need to run Fuse
----------------------------
@@ -30,8 +32,8 @@
Required:
-* X, SDL, svgalib, framebuffer support. If you have GTK+, you'll get a
- (much) nicer user interface under X.
+* X, SDL, svgalib or framebuffer support. If you have GTK+, you'll get
+ a (much) nicer user interface under X.
* libspectrum: this is available from
http://fuse-emulator.sourceforge.net/libspectrum.php
@@ -137,6 +139,6 @@
( http://www.worldofspectrum.org/faq/index.html ) first!
Philip Kendall <phi...@sh...>
-16 July 2004
+11 April 2007
-$Id: README,v 1.40 2007/02/02 16:21:50 pak21 Exp $
+$Id: README,v 1.40.2.2 2007/04/11 08:44:19 pak21 Exp $
Modified: branches/Release-0_8_0/fuse/configure.in
===================================================================
--- branches/Release-0_8_0/fuse/configure.in 2007-04-11 12:33:42 UTC (rev 352)
+++ branches/Release-0_8_0/fuse/configure.in 2007-04-11 12:59:00 UTC (rev 353)
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-dnl $Id: configure.in,v 1.155.2.1 2007/03/03 21:26:14 pak21 Exp $
+dnl $Id: configure.in,v 1.155.2.2 2007/04/09 16:59:02 pak21 Exp $
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@
AC_CANONICAL_SYSTEM
dnl Use automake to produce `Makefile.in'
-AM_INIT_AUTOMAKE(fuse, 0.7.0)
+AM_INIT_AUTOMAKE(fuse, 0.8.0)
dnl Checks for programs.
AC_PROG_CC
Modified: branches/Release-0_8_0/fuse/fuse.cpp
===================================================================
--- branches/Release-0_8_0/fuse/fuse.cpp 2007-04-11 12:33:42 UTC (rev 352)
+++ branches/Release-0_8_0/fuse/fuse.cpp 2007-04-11 12:59:00 UTC (rev 353)
@@ -1,7 +1,7 @@
/* fuse.c: The Free Unix Spectrum Emulator
- Copyright (c) 1999-2005 Philip Kendall
+ Copyright (c) 1999-2007 Philip Kendall
- $Id: fuse.c,v 1.133.2.1 2007/02/17 17:12:29 pak21 Exp $
+ $Id: fuse.c,v 1.133.2.3 2007/04/11 09:39:32 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
@@ -272,7 +272,6 @@
size_t i;
unsigned int version[4] = { 0, 0, 0, 0 };
char *custom;
- char *name = "Fuse";
#ifndef WIN32
struct utsname buf;
@@ -308,9 +307,7 @@
error = libspectrum_creator_alloc( &fuse_creator ); if( error ) return error;
- error = libspectrum_creator_set_program(
- fuse_creator, name
- );
+ error = libspectrum_creator_set_program( fuse_creator, "Fuse" );
if( error ) { libspectrum_creator_free( fuse_creator ); return error; }
error = libspectrum_creator_set_major( fuse_creator,
@@ -370,7 +367,7 @@
printf( "\n" );
fuse_show_version();
printf(
- "Copyright (c) 1999-2005 Philip Kendall <phi...@sh...>\n"
+ "Copyright (c) 1999-2007 Philip Kendall <phi...@sh...>\n"
"and others; see the file 'AUTHORS' for more details.\n"
"\n"
"This program is distributed in the hope that it will be useful,\n"
Modified: branches/Release-0_8_0/fuse/fusepb/English.lproj/InfoPlist.strings
===================================================================
(Binary files differ)
Modified: branches/Release-0_8_0/fuse/fusepb/Info-Fuse.plist
===================================================================
--- branches/Release-0_8_0/fuse/fusepb/Info-Fuse.plist 2007-04-11 12:33:42 UTC (rev 352)
+++ branches/Release-0_8_0/fuse/fusepb/Info-Fuse.plist 2007-04-11 12:59:00 UTC (rev 353)
@@ -361,11 +361,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>20070404</string>
+ <string>0.8.0</string>
<key>CFBundleSignature</key>
<string>FUSE</string>
<key>CFBundleVersion</key>
- <string>20070404</string>
+ <string>0.8.0</string>
<key>NSMainNibFile</key>
<string>SDLMain</string>
<key>NSPrincipalClass</key>
Modified: branches/Release-0_8_0/fuse/fusepb/config.h
===================================================================
--- branches/Release-0_8_0/fuse/fusepb/config.h 2007-04-11 12:33:42 UTC (rev 352)
+++ branches/Release-0_8_0/fuse/fusepb/config.h 2007-04-11 12:59:00 UTC (rev 353)
@@ -169,7 +169,7 @@
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION "0.7.0"
+#define VERSION "0.8.0"
/* Define to 1 if your processor stores words with the most significant byte
first (like Motorola and SPARC, unlike Intel and VAX). */
Modified: branches/Release-0_8_0/fuse/fusepb/controllers/FuseController.m
===================================================================
--- branches/Release-0_8_0/fuse/fusepb/controllers/FuseController.m 2007-04-11 12:33:42 UTC (rev 352)
+++ branches/Release-0_8_0/fuse/fusepb/controllers/FuseController.m 2007-04-11 12:59:00 UTC (rev 353)
@@ -524,7 +524,6 @@
- (IBAction)rzx_rollback:(id)sender
{
- libspectrum_snap *snap;
libspectrum_error error;
if( !rzx_recording ) return;
Modified: branches/Release-0_8_0/fuse/hacking/ChangeLog
===================================================================
--- branches/Release-0_8_0/fuse/hacking/ChangeLog 2007-04-11 12:33:42 UTC (rev 352)
+++ branches/Release-0_8_0/fuse/hacking/ChangeLog 2007-04-11 12:59:00 UTC (rev 353)
@@ -1574,3 +1574,12 @@
(thanks, Julian Wiseman) (Fred).
20070404 printer.c: don't buffer output so text is available as it is
printed (Release-0_8_0-branch) (Fred).
+20070409 ChangeLog,README,configure.in,man/fuse.1: updates for 0.8 release
+ (Release-0_8_0-branch).
+20070409 rzx.c: change over to the 'release' DSA key (Release-0_8_0-branch).
+20070409 fuse.c: remove warning (Release-0_8_0-branch).
+20070410 rzx.c: don't allow use of rollback commands during playback (thanks,
+ Julian Wiseman) (Release-0_8_0-branch).
+20070411 README: these aren't all IDE interfaces (Release-0_8_0-branch).
+20070411 fuse.c: update copyright date to 2007 (Release-0_8_0-branch).
+20070411 TAG: Release-0_8_0 (Release-0_8_0-branch).
Modified: branches/Release-0_8_0/fuse/hacking/cvs-tags
===================================================================
--- branches/Release-0_8_0/fuse/hacking/cvs-tags 2007-04-11 12:33:42 UTC (rev 352)
+++ branches/Release-0_8_0/fuse/hacking/cvs-tags 2007-04-11 12:59:00 UTC (rev 353)
@@ -1,6 +1,6 @@
CVS tags for Fuse
-$Id: cvs-tags,v 1.32.2.1 2007/03/03 21:49:10 pak21 Exp $
+$Id: cvs-tags,v 1.32.2.2 2007/04/11 09:41:31 pak21 Exp $
| Release-0_3_1
| Release-0_3_2pre1
@@ -146,6 +146,7 @@
+-\
| | Release-0_8_0-pre1
| | Release-0_8_0-pre2
+| | Release-0_8_0
| |
| | Release-0_8_0-branch
|
Modified: branches/Release-0_8_0/fuse/man/fuse.1
===================================================================
--- branches/Release-0_8_0/fuse/man/fuse.1 2007-04-11 12:33:42 UTC (rev 352)
+++ branches/Release-0_8_0/fuse/man/fuse.1 2007-04-11 12:59:00 UTC (rev 353)
@@ -23,7 +23,7 @@
.\" E-mail: phi...@sh...
.\"
.\"
-.TH fuse 1 "16th July, 2004" "Version 0.7.0" "Emulators"
+.TH fuse 1 "11th April, 2007" "Version 0.8.0" "Emulators"
.\"
.\"------------------------------------------------------------------
.\"
Modified: branches/Release-0_8_0/fuse/rzx.c
===================================================================
--- branches/Release-0_8_0/fuse/rzx.c 2007-04-11 12:33:42 UTC (rev 352)
+++ branches/Release-0_8_0/fuse/rzx.c 2007-04-11 12:59:00 UTC (rev 353)
@@ -1,7 +1,7 @@
/* rzx.c: .rzx files
Copyright (c) 2002-2003 Philip Kendall
- $Id: rzx.c,v 1.70.2.3 2007/02/09 08:21:33 pak21 Exp $
+ $Id: rzx.c,v 1.70.2.5 2007/04/10 08:29:51 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
@@ -79,11 +79,11 @@
/* Fuse's DSA key */
libspectrum_rzx_dsa_key rzx_key = {
- "9E140C4CEA9CA011AA8AD17443CB5DC18DC634908474992D38AB7D4A27038CBB209420BA2CAB8508CED35ADF8CBD31A0A034FC082A168A0E190FFC4CCD21706F", /* p */
- "C52E9CA1804BD021FFAD30E8FB89A94437C2E4CB", /* q */
- "90E56D9493DE80E1A35F922007357888A1A47805FD365AD27BC5F184601EBC74E44F576AA4BF8C5244D202BBAE697C4F9132DFB7AD0A56892A414C96756BD21A", /* g */
- "7810A35AC94EA5750934FB9C922351EE597C71E2B83913C121C6655EA25CE7CBE2C259FA3168F8475B2510AA29C5FEB50ACAB25F34366C2FFC93B3870A522232", /* y */
- "9A4E53CC249750C3194A38A3BE3EDEED28B171A9" /* x */
+ "A9E3BD74E136A9ABD41E614383BB1B01EB24B2CD7B920ED6A62F786A879AC8B00F2FF318BF96F81654214B1A064889FF6D8078858ED00CF61D2047B2AAB7888949F35D166A2BBAAE23A331BD4728A736E76901D74B195B68C4A2BBFB9F005E3655BDE8256C279A626E00C7087A2D575F78D7DC5CA6E392A535FFE47A816BA503", /* p */
+ "FE8D540EED2CAE1983690E2886259F8956FB5A19", /* q */
+ "9680ABFFB98EF2021945ADDF86C21D6EE3F7C8777FB0A0220AB59E9DFA3A3338611B32CFD1F22F8F26547858754ED93BFBDD87DC13C09F42B42A36B2024467D98EB754DEB2847FCA7FC60C81A99CF95133847EA38AD9D037AFE9DD189E9F0EE47624848CEE840D7E3724A39681E71B97ECF777383DC52A48C0A2C93BADA93F4C", /* g */
+ "46605F0514D56BC0B4207A350367A5038DBDD4DD62B7C997D26D0ADC5BE42D01F852C199E34553BCBCE5955FF80E3B402B55316606D7E39C0F500AE5EE41A7B7A4DCE78EC19072C21FCC7BA48DFDC830C17B72BCAA2B2D70D9DFC0AAD9B7E73F7AEB6241E54D55C33E41AB749CAAFBE7AB00F2D74C500E5F5DD63BD299C65778", /* y */
+ "948744AA7A1D1BE9EE65150B0A95A678B4181F0E" /* x */
};
/* By how much is the speed allowed to deviate from 100% whilst recording
@@ -288,7 +288,7 @@
counter_reset();
ui_menu_activate( UI_MENU_ITEM_RECORDING, 1 );
- ui_menu_activate( UI_MENU_ITEM_RECORDING_ROLLBACK, 1 );
+ ui_menu_activate( UI_MENU_ITEM_RECORDING_ROLLBACK, 0 );
return 0;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2007-04-11 12:33:48
|
Revision: 352
http://svn.sourceforge.net/fuse-for-macosx/?rev=352&view=rev
Author: fredm
Date: 2007-04-11 05:33:42 -0700 (Wed, 11 Apr 2007)
Log Message:
-----------
Merge up to libspectrum-0.3.0
Modified Paths:
--------------
branches/Release-0_8_0/libspectrum/Info.plist
branches/Release-0_8_0/libspectrum/libspectrum/ChangeLog
branches/Release-0_8_0/libspectrum/libspectrum/Makefile.am
branches/Release-0_8_0/libspectrum/libspectrum/README
branches/Release-0_8_0/libspectrum/libspectrum/configure.in
branches/Release-0_8_0/libspectrum/libspectrum/doc/cvs-tags
branches/Release-0_8_0/libspectrum/libspectrum/doc/libspectrum.3
branches/Release-0_8_0/libspectrum/libspectrum/hacking/ChangeLog
branches/Release-0_8_0/libspectrum/libspectrum/internals.h
branches/Release-0_8_0/libspectrum/libspectrum/z80.c
branches/Release-0_8_0/libspectrum/libspectrum.xcodeproj/project.pbxproj
Modified: branches/Release-0_8_0/libspectrum/Info.plist
===================================================================
--- branches/Release-0_8_0/libspectrum/Info.plist 2007-04-11 11:52:39 UTC (rev 351)
+++ branches/Release-0_8_0/libspectrum/Info.plist 2007-04-11 12:33:42 UTC (rev 352)
@@ -23,6 +23,6 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>0.3.0-pre2</string>
+ <string>0.3.0</string>
</dict>
</plist>
Modified: branches/Release-0_8_0/libspectrum/libspectrum/ChangeLog
===================================================================
--- branches/Release-0_8_0/libspectrum/libspectrum/ChangeLog 2007-04-11 11:52:39 UTC (rev 351)
+++ branches/Release-0_8_0/libspectrum/libspectrum/ChangeLog 2007-04-11 12:33:42 UTC (rev 352)
@@ -1,4 +1,4 @@
-2007-07-16 Philip Kendall <phi...@sh...>
+2007-04-11 Philip Kendall <phi...@sh...>
* libspectrum 0.3.0 released.
@@ -188,4 +188,4 @@
* libspectrum separated from Fuse just before the 0.5.0 release of
Fuse; see Fuse's ChangeLog for changes up to this point
-$Id: ChangeLog,v 1.12.2.1 2007/02/04 08:54:43 fredm Exp $
+$Id: ChangeLog,v 1.12.2.2 2007/04/11 08:43:07 pak21 Exp $
Modified: branches/Release-0_8_0/libspectrum/libspectrum/Makefile.am
===================================================================
--- branches/Release-0_8_0/libspectrum/libspectrum/Makefile.am 2007-04-11 11:52:39 UTC (rev 351)
+++ branches/Release-0_8_0/libspectrum/libspectrum/Makefile.am 2007-04-11 12:33:42 UTC (rev 352)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2001-2004 Philip Kendall
-## $Id: Makefile.am,v 1.65 2007/02/02 16:35:42 pak21 Exp $
+## $Id: Makefile.am,v 1.65.2.1 2007/04/11 08:43:07 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
@@ -55,7 +55,7 @@
zlib.c \
zxs.c
-libspectrum_la_LDFLAGS = -version-info 4:0:2 -no-undefined
+libspectrum_la_LDFLAGS = -version-info 5:0:0 -no-undefined
libspectrum_la_LIBADD = myglib/libmyglib.la -lm
Modified: branches/Release-0_8_0/libspectrum/libspectrum/README
===================================================================
--- branches/Release-0_8_0/libspectrum/libspectrum/README 2007-04-11 11:52:39 UTC (rev 351)
+++ branches/Release-0_8_0/libspectrum/libspectrum/README 2007-04-11 12:33:42 UTC (rev 352)
@@ -1,4 +1,4 @@
-libspectrum 0.2.2
+libspectrum 0.3.0
=================
libspectrum is a library which is designed to make the input and
@@ -10,9 +10,12 @@
* Snapshots: .z80, .szx, .sna (all read/write), .zxs, .sp., .snp and
+D snapshots (read only).
-* Tape images: .tzx, .tap (read/write) and Warajevo .tap (read only).
+* Tape images: .tzx, .tap (read/write) and Warajevo .tap, Z80Em and
+ CSW version 1 (read only).
* Input recordings: .rzx (read/write).
* Timex cartridges: .dck (read only).
+* IDE hard disk images: .hdf (read/write).
+* Microdrive cartridge images: .mdr (read/write).
On Unix and Mac OS X, compiling libspectrum should just be as easy as
@@ -47,4 +50,4 @@
'configure' for the first time.
Philip Kendall <phi...@sh...>
-16 July 2004
+11 April 2007
Modified: branches/Release-0_8_0/libspectrum/libspectrum/configure.in
===================================================================
--- branches/Release-0_8_0/libspectrum/libspectrum/configure.in 2007-04-11 11:52:39 UTC (rev 351)
+++ branches/Release-0_8_0/libspectrum/libspectrum/configure.in 2007-04-11 12:33:42 UTC (rev 352)
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
dnl Copyright (c) 1999-2004 Philip Kendall
-dnl $Id: configure.in,v 1.35 2007/02/02 16:35:42 pak21 Exp $
+dnl $Id: configure.in,v 1.35.2.1 2007/04/11 08:43:07 pak21 Exp $
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@
AM_CONFIG_HEADER(config.h)
dnl Use automake to produce `Makefile.in'
-AM_INIT_AUTOMAKE(libspectrum, 0.2.2)
+AM_INIT_AUTOMAKE(libspectrum, 0.3.0)
dnl Checks for programs.
AC_PROG_CC
Modified: branches/Release-0_8_0/libspectrum/libspectrum/doc/cvs-tags
===================================================================
--- branches/Release-0_8_0/libspectrum/libspectrum/doc/cvs-tags 2007-04-11 11:52:39 UTC (rev 351)
+++ branches/Release-0_8_0/libspectrum/libspectrum/doc/cvs-tags 2007-04-11 12:33:42 UTC (rev 352)
@@ -53,6 +53,8 @@
|
+-\
| | libspectrum_0_3_0pre1
+| | libspectrum_0_3_0pre2
+| | libspectrum_0_3_0
| |
| | libspectrum_0_3_0-branch
|
Modified: branches/Release-0_8_0/libspectrum/libspectrum/doc/libspectrum.3
===================================================================
--- branches/Release-0_8_0/libspectrum/libspectrum/doc/libspectrum.3 2007-04-11 11:52:39 UTC (rev 351)
+++ branches/Release-0_8_0/libspectrum/libspectrum/doc/libspectrum.3 2007-04-11 12:33:42 UTC (rev 352)
@@ -1,7 +1,7 @@
.\" -*- nroff -*-
.\"
.\" libspectrum.3: libspectrum summary
-.\" Copyright (c) 2004 Philip Kendall
+.\" Copyright (c) 2004-2007 Philip Kendall
.\"
.\" 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
@@ -22,7 +22,7 @@
.\" E-mail: phi...@sh...
.\"
.\"
-.TH libspectrum 3 "16th July, 2004" "Version 0.2.2" "Emulators"
+.TH libspectrum 3 "11th April, 2004" "Version 0.3.0" "Emulators"
.\"
.\"------------------------------------------------------------------
.\"
@@ -45,13 +45,16 @@
Snapshots: .z80, .szx, .sna (all read/write), .zxs, .sp., .snp and +D
snapshots (read only).
.IP \(bu 2
-Tape images: .tzx, .tap (read/write) and Warajevo .tap (read only).
+Tape images: .tzx, .tap (read/write) and Warajevo .tap, Z80Em and CSW
+version 1 (read only).
.IP \(bu 2
Input recordings: .rzx (read/write).
.IP \(bu 2
Timex cartridges: .dck (read only).
.IP \(bu 2
IDE hard disk images: .hdf (read/write).
+.IP \(bu 2
+Microdrive cartridge images: .mdr (read/write).
.PP
Additionally, any files compressed with
.IR bzip2 "(3)"
Modified: branches/Release-0_8_0/libspectrum/libspectrum/hacking/ChangeLog
===================================================================
--- branches/Release-0_8_0/libspectrum/libspectrum/hacking/ChangeLog 2007-04-11 11:52:39 UTC (rev 351)
+++ branches/Release-0_8_0/libspectrum/libspectrum/hacking/ChangeLog 2007-04-11 12:33:42 UTC (rev 352)
@@ -401,3 +401,12 @@
20070217 tzx_read.c: do allocate memory if we have no data but some padding
in tzx_read_data() (libspectrum_0_3_0-branch).
20070303 TAG: libspectrum_0_3_0-pre2 (libspectrum_0_3_0-branch)
+20070310 internals.h: add prototypes for libspectrum_z80em_read and
+ libspectrum_csw_read (libspectrum_0_3_0-branch) (Fred).
+20070324 z80.c: initialise snap->beta_paged (fixes Action Farce II RZX
+ playback; see bug #1654105) (thanks, Jon Needle)
+ (libspectrum_0_3_0-branch).
+20070409 z80.c: remove warning (libspectrum_0_3_0-branch).
+20070411 ChangeLog,Makefile.am,README,configure.in,doc/libspectrum.3: update
+ for 0.3.0 release (libspectrum_0_3_0-branch).
+20070411 TAG: libspectrum_0_3_0
\ No newline at end of file
Modified: branches/Release-0_8_0/libspectrum/libspectrum/internals.h
===================================================================
--- branches/Release-0_8_0/libspectrum/libspectrum/internals.h 2007-04-11 11:52:39 UTC (rev 351)
+++ branches/Release-0_8_0/libspectrum/libspectrum/internals.h 2007-04-11 12:33:42 UTC (rev 352)
@@ -2,7 +2,7 @@
routines, but not by user code
Copyright (c) 2001-2007 Philip Kendall, Darren Salt
- $Id: internals.h,v 1.27 2007/02/02 16:35:42 pak21 Exp $
+ $Id: internals.h,v 1.27.2.1 2007/03/10 12:39:18 fredm 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
@@ -163,14 +163,14 @@
const libspectrum_byte **ptr, size_t length );
/* Format specific tape routines */
-
+
libspectrum_error
libspectrum_z80em_read( libspectrum_tape *tape,
- const libspectrum_byte *buffer, size_t length );
+ const libspectrum_byte *buffer, size_t length );
libspectrum_error
libspectrum_csw_read( libspectrum_tape *tape,
- const libspectrum_byte *buffer, size_t length );
+ const libspectrum_byte *buffer, size_t length );
/* Crypto functions */
Modified: branches/Release-0_8_0/libspectrum/libspectrum/z80.c
===================================================================
--- branches/Release-0_8_0/libspectrum/libspectrum/z80.c 2007-04-11 11:52:39 UTC (rev 351)
+++ branches/Release-0_8_0/libspectrum/libspectrum/z80.c 2007-04-11 12:33:42 UTC (rev 352)
@@ -1,7 +1,7 @@
/* z80.c: Routines for handling .z80 snapshots
Copyright (c) 2001-2004 Philip Kendall, Darren Salt, Fredrick Meunier
- $Id: z80.c,v 1.81 2007/02/02 16:35:44 pak21 Exp $
+ $Id: z80.c,v 1.81.2.2 2007/04/09 17:44:29 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
@@ -203,7 +203,7 @@
{
libspectrum_error error;
const libspectrum_byte *data;
- int version, compressed;
+ int version, compressed = 1;
error = read_header( buffer, snap, &data, &version, &compressed );
if( error != LIBSPECTRUM_ERROR_NONE ) return error;
@@ -212,6 +212,8 @@
version, compressed );
if( error != LIBSPECTRUM_ERROR_NONE ) return error;
+ libspectrum_snap_set_beta_paged( snap, 0 );
+
return LIBSPECTRUM_ERROR_NONE;
}
Modified: branches/Release-0_8_0/libspectrum/libspectrum.xcodeproj/project.pbxproj
===================================================================
--- branches/Release-0_8_0/libspectrum/libspectrum.xcodeproj/project.pbxproj 2007-04-11 11:52:39 UTC (rev 351)
+++ branches/Release-0_8_0/libspectrum/libspectrum.xcodeproj/project.pbxproj 2007-04-11 12:33:42 UTC (rev 352)
@@ -389,7 +389,7 @@
);
FRAMEWORK_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../bzip2/build/Deployment\"";
FRAMEWORK_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../libgcrypt/build/Deployment\"";
- FRAMEWORK_VERSION = 0.2.2;
+ FRAMEWORK_VERSION = 0.3.0;
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -437,7 +437,7 @@
);
FRAMEWORK_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../bzip2/build/Deployment\"";
FRAMEWORK_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../libgcrypt/build/Deployment\"";
- FRAMEWORK_VERSION = 0.2.2;
+ FRAMEWORK_VERSION = 0.3.0;
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_NO_COMMON_BLOCKS = YES;
@@ -483,7 +483,7 @@
);
FRAMEWORK_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../bzip2/build/Deployment\"";
FRAMEWORK_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../libgcrypt/build/Deployment\"";
- FRAMEWORK_VERSION = 0.2.2;
+ FRAMEWORK_VERSION = 0.3.0;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_NO_COMMON_BLOCKS = YES;
GCC_OPTIMIZATION_LEVEL = 2;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2007-04-11 12:04:21
|
Revision: 350
http://svn.sourceforge.net/fuse-for-macosx/?rev=350&view=rev
Author: fredm
Date: 2007-04-11 04:52:28 -0700 (Wed, 11 Apr 2007)
Log Message:
-----------
Load . into vendor/fuse/current.
Modified Paths:
--------------
vendor/fuse/current/ChangeLog
vendor/fuse/current/README
vendor/fuse/current/configure.in
vendor/fuse/current/fuse.c
vendor/fuse/current/hacking/ChangeLog
vendor/fuse/current/hacking/cvs-tags
vendor/fuse/current/man/fuse.1
vendor/fuse/current/rzx.c
Modified: vendor/fuse/current/ChangeLog
===================================================================
--- vendor/fuse/current/ChangeLog 2007-04-11 11:43:41 UTC (rev 349)
+++ vendor/fuse/current/ChangeLog 2007-04-11 11:52:28 UTC (rev 350)
@@ -1,4 +1,4 @@
-2007-??-?? Philip Kendall <phi...@sh...>
+2007-04-11 Philip Kendall <phi...@sh...>
* Fuse 0.8.0 released
@@ -81,6 +81,11 @@
Szasz, Paul van der Laan and other people to whom I apologise
for forgetting).
+ * On a personal note, I (Philip) would like to dedicate the 0.8
+ release of Fuse to the memory of Chris "Oggie" Lightfoot. I
+ don't know whether he would have loved or hated some of the code
+ in Fuse, but I'm sure he would have expressed his opinion.
+
2004-07-16 Philip Kendall <pak...@sr...>
* Fuse 0.7.0 released.
@@ -783,4 +788,4 @@
* Version 0.1.0 released.
-$Id: ChangeLog,v 1.46 2007/02/02 16:21:50 pak21 Exp $
+$Id: ChangeLog,v 1.46.2.1 2007/04/09 16:59:02 pak21 Exp $
Modified: vendor/fuse/current/README
===================================================================
--- vendor/fuse/current/README 2007-04-11 11:43:41 UTC (rev 349)
+++ vendor/fuse/current/README 2007-04-11 11:52:28 UTC (rev 350)
@@ -1,4 +1,4 @@
-The Free Unix Spectrum Emulator (Fuse) 0.7.0
+The Free Unix Spectrum Emulator (Fuse) 0.8.0
============================================
Fuse (the Free Unix Spectrum Emulator) was originally, and somewhat
@@ -10,9 +10,10 @@
What Fuse does have:
-* Working Spectrum 16K/48K/128K/+2/+2A/+3/+3e/SE, Timex TC2048/TC2068,
- Pentagon 128 and Scorpion ZS 256 emulation, running at true Speccy
- speed on any computer you're likely to try it on.
+* Working Spectrum 16K/48K/128K/+2/+2A/+3/+3e/SE, Timex TC2048,
+ TC2068 and TS2068, Pentagon 128 and Scorpion ZS 256 emulation,
+ running at true Speccy speed on any computer you're likely to try it
+ on.
* Support for loading from .tzx files.
* Sound (on systems supporting the Open Sound System, SDL, or OpenBSD/
Solaris's /dev/audio).
@@ -20,8 +21,9 @@
(including Kempston, Sinclair and Cursor joysticks).
* Emulation of some of the printers you could attach to a Spectrum.
* Support for the RZX input recording file format, including
- 'competition mode'.
-* Emulation of the Spectrum +3e, ZXATASP and ZXCF IDE interfaces.
+ rollback and 'competition mode'.
+* Emulation of the DivIDE, Interface I, Kempston mouse, Spectrum +3e,
+ ZXATASP and ZXCF interfaces.
What you'll need to run Fuse
----------------------------
@@ -30,8 +32,8 @@
Required:
-* X, SDL, svgalib, framebuffer support. If you have GTK+, you'll get a
- (much) nicer user interface under X.
+* X, SDL, svgalib or framebuffer support. If you have GTK+, you'll get
+ a (much) nicer user interface under X.
* libspectrum: this is available from
http://fuse-emulator.sourceforge.net/libspectrum.php
@@ -137,6 +139,6 @@
( http://www.worldofspectrum.org/faq/index.html ) first!
Philip Kendall <phi...@sh...>
-16 July 2004
+11 April 2007
-$Id: README,v 1.40 2007/02/02 16:21:50 pak21 Exp $
+$Id: README,v 1.40.2.2 2007/04/11 08:44:19 pak21 Exp $
Modified: vendor/fuse/current/configure.in
===================================================================
--- vendor/fuse/current/configure.in 2007-04-11 11:43:41 UTC (rev 349)
+++ vendor/fuse/current/configure.in 2007-04-11 11:52:28 UTC (rev 350)
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-dnl $Id: configure.in,v 1.155.2.1 2007/03/03 21:26:14 pak21 Exp $
+dnl $Id: configure.in,v 1.155.2.2 2007/04/09 16:59:02 pak21 Exp $
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@
AC_CANONICAL_SYSTEM
dnl Use automake to produce `Makefile.in'
-AM_INIT_AUTOMAKE(fuse, 0.7.0)
+AM_INIT_AUTOMAKE(fuse, 0.8.0)
dnl Checks for programs.
AC_PROG_CC
Modified: vendor/fuse/current/fuse.c
===================================================================
--- vendor/fuse/current/fuse.c 2007-04-11 11:43:41 UTC (rev 349)
+++ vendor/fuse/current/fuse.c 2007-04-11 11:52:28 UTC (rev 350)
@@ -1,7 +1,7 @@
/* fuse.c: The Free Unix Spectrum Emulator
- Copyright (c) 1999-2005 Philip Kendall
+ Copyright (c) 1999-2007 Philip Kendall
- $Id: fuse.c,v 1.133.2.1 2007/02/17 17:12:29 pak21 Exp $
+ $Id: fuse.c,v 1.133.2.3 2007/04/11 09:39:32 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
@@ -305,9 +305,7 @@
error = libspectrum_creator_alloc( &fuse_creator ); if( error ) return error;
- error = libspectrum_creator_set_program(
- fuse_creator, (const libspectrum_byte*)"Fuse"
- );
+ error = libspectrum_creator_set_program( fuse_creator, "Fuse" );
if( error ) { libspectrum_creator_free( fuse_creator ); return error; }
error = libspectrum_creator_set_major( fuse_creator,
@@ -367,7 +365,7 @@
printf( "\n" );
fuse_show_version();
printf(
- "Copyright (c) 1999-2005 Philip Kendall <phi...@sh...>\n"
+ "Copyright (c) 1999-2007 Philip Kendall <phi...@sh...>\n"
"and others; see the file 'AUTHORS' for more details.\n"
"\n"
"This program is distributed in the hope that it will be useful,\n"
Modified: vendor/fuse/current/hacking/ChangeLog
===================================================================
--- vendor/fuse/current/hacking/ChangeLog 2007-04-11 11:43:41 UTC (rev 349)
+++ vendor/fuse/current/hacking/ChangeLog 2007-04-11 11:52:28 UTC (rev 350)
@@ -1574,3 +1574,12 @@
(thanks, Julian Wiseman) (Fred).
20070404 printer.c: don't buffer output so text is available as it is
printed (Release-0_8_0-branch) (Fred).
+20070409 ChangeLog,README,configure.in,man/fuse.1: updates for 0.8 release
+ (Release-0_8_0-branch).
+20070409 rzx.c: change over to the 'release' DSA key (Release-0_8_0-branch).
+20070409 fuse.c: remove warning (Release-0_8_0-branch).
+20070410 rzx.c: don't allow use of rollback commands during playback (thanks,
+ Julian Wiseman) (Release-0_8_0-branch).
+20070411 README: these aren't all IDE interfaces (Release-0_8_0-branch).
+20070411 fuse.c: update copyright date to 2007 (Release-0_8_0-branch).
+20070411 TAG: Release-0_8_0 (Release-0_8_0-branch).
Modified: vendor/fuse/current/hacking/cvs-tags
===================================================================
--- vendor/fuse/current/hacking/cvs-tags 2007-04-11 11:43:41 UTC (rev 349)
+++ vendor/fuse/current/hacking/cvs-tags 2007-04-11 11:52:28 UTC (rev 350)
@@ -1,6 +1,6 @@
CVS tags for Fuse
-$Id: cvs-tags,v 1.32.2.1 2007/03/03 21:49:10 pak21 Exp $
+$Id: cvs-tags,v 1.32.2.2 2007/04/11 09:41:31 pak21 Exp $
| Release-0_3_1
| Release-0_3_2pre1
@@ -146,6 +146,7 @@
+-\
| | Release-0_8_0-pre1
| | Release-0_8_0-pre2
+| | Release-0_8_0
| |
| | Release-0_8_0-branch
|
Modified: vendor/fuse/current/man/fuse.1
===================================================================
--- vendor/fuse/current/man/fuse.1 2007-04-11 11:43:41 UTC (rev 349)
+++ vendor/fuse/current/man/fuse.1 2007-04-11 11:52:28 UTC (rev 350)
@@ -23,7 +23,7 @@
.\" E-mail: phi...@sh...
.\"
.\"
-.TH fuse 1 "16th July, 2004" "Version 0.7.0" "Emulators"
+.TH fuse 1 "11th April, 2007" "Version 0.8.0" "Emulators"
.\"
.\"------------------------------------------------------------------
.\"
Modified: vendor/fuse/current/rzx.c
===================================================================
--- vendor/fuse/current/rzx.c 2007-04-11 11:43:41 UTC (rev 349)
+++ vendor/fuse/current/rzx.c 2007-04-11 11:52:28 UTC (rev 350)
@@ -1,7 +1,7 @@
/* rzx.c: .rzx files
Copyright (c) 2002-2003 Philip Kendall
- $Id: rzx.c,v 1.70.2.3 2007/02/09 08:21:33 pak21 Exp $
+ $Id: rzx.c,v 1.70.2.5 2007/04/10 08:29:51 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
@@ -79,11 +79,11 @@
/* Fuse's DSA key */
libspectrum_rzx_dsa_key rzx_key = {
- "9E140C4CEA9CA011AA8AD17443CB5DC18DC634908474992D38AB7D4A27038CBB209420BA2CAB8508CED35ADF8CBD31A0A034FC082A168A0E190FFC4CCD21706F", /* p */
- "C52E9CA1804BD021FFAD30E8FB89A94437C2E4CB", /* q */
- "90E56D9493DE80E1A35F922007357888A1A47805FD365AD27BC5F184601EBC74E44F576AA4BF8C5244D202BBAE697C4F9132DFB7AD0A56892A414C96756BD21A", /* g */
- "7810A35AC94EA5750934FB9C922351EE597C71E2B83913C121C6655EA25CE7CBE2C259FA3168F8475B2510AA29C5FEB50ACAB25F34366C2FFC93B3870A522232", /* y */
- "9A4E53CC249750C3194A38A3BE3EDEED28B171A9" /* x */
+ "A9E3BD74E136A9ABD41E614383BB1B01EB24B2CD7B920ED6A62F786A879AC8B00F2FF318BF96F81654214B1A064889FF6D8078858ED00CF61D2047B2AAB7888949F35D166A2BBAAE23A331BD4728A736E76901D74B195B68C4A2BBFB9F005E3655BDE8256C279A626E00C7087A2D575F78D7DC5CA6E392A535FFE47A816BA503", /* p */
+ "FE8D540EED2CAE1983690E2886259F8956FB5A19", /* q */
+ "9680ABFFB98EF2021945ADDF86C21D6EE3F7C8777FB0A0220AB59E9DFA3A3338611B32CFD1F22F8F26547858754ED93BFBDD87DC13C09F42B42A36B2024467D98EB754DEB2847FCA7FC60C81A99CF95133847EA38AD9D037AFE9DD189E9F0EE47624848CEE840D7E3724A39681E71B97ECF777383DC52A48C0A2C93BADA93F4C", /* g */
+ "46605F0514D56BC0B4207A350367A5038DBDD4DD62B7C997D26D0ADC5BE42D01F852C199E34553BCBCE5955FF80E3B402B55316606D7E39C0F500AE5EE41A7B7A4DCE78EC19072C21FCC7BA48DFDC830C17B72BCAA2B2D70D9DFC0AAD9B7E73F7AEB6241E54D55C33E41AB749CAAFBE7AB00F2D74C500E5F5DD63BD299C65778", /* y */
+ "948744AA7A1D1BE9EE65150B0A95A678B4181F0E" /* x */
};
/* By how much is the speed allowed to deviate from 100% whilst recording
@@ -288,7 +288,7 @@
counter_reset();
ui_menu_activate( UI_MENU_ITEM_RECORDING, 1 );
- ui_menu_activate( UI_MENU_ITEM_RECORDING_ROLLBACK, 1 );
+ ui_menu_activate( UI_MENU_ITEM_RECORDING_ROLLBACK, 0 );
return 0;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2007-04-11 12:04:17
|
Revision: 351
http://svn.sourceforge.net/fuse-for-macosx/?rev=351&view=rev
Author: fredm
Date: 2007-04-11 04:52:39 -0700 (Wed, 11 Apr 2007)
Log Message:
-----------
Tag vendor/fuse/current as vendor/fuse/fuse-0.8.0.
Added Paths:
-----------
vendor/fuse/fuse-0.8.0/
Copied: vendor/fuse/fuse-0.8.0 (from rev 350, vendor/fuse/current)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2007-04-11 11:45:47
|
Revision: 348
http://svn.sourceforge.net/fuse-for-macosx/?rev=348&view=rev
Author: fredm
Date: 2007-04-11 04:43:26 -0700 (Wed, 11 Apr 2007)
Log Message:
-----------
Load . into vendor/libspectrum/current.
Modified Paths:
--------------
vendor/libspectrum/current/.cvsignore
vendor/libspectrum/current/ChangeLog
vendor/libspectrum/current/Makefile.am
vendor/libspectrum/current/README
vendor/libspectrum/current/configure.in
vendor/libspectrum/current/doc/cvs-tags
vendor/libspectrum/current/doc/libspectrum.3
vendor/libspectrum/current/hacking/ChangeLog
vendor/libspectrum/current/internals.h
vendor/libspectrum/current/z80.c
Modified: vendor/libspectrum/current/.cvsignore
===================================================================
--- vendor/libspectrum/current/.cvsignore 2007-04-09 11:42:58 UTC (rev 347)
+++ vendor/libspectrum/current/.cvsignore 2007-04-11 11:43:26 UTC (rev 348)
@@ -6,17 +6,23 @@
aclocal.m4
autom4te.cache
config.cache
+config.guess
config.h
config.h.in
config.log
config.status
+config.sub
configure
+depcomp
generate.pl
+install-sh
libspectrum.h
libspectrum.la
libspectrum.qpg
libtool
+ltmain.sh
make-perl
+missing
snap_accessors.c
stamp-h
stamp-h.in
Modified: vendor/libspectrum/current/ChangeLog
===================================================================
--- vendor/libspectrum/current/ChangeLog 2007-04-09 11:42:58 UTC (rev 347)
+++ vendor/libspectrum/current/ChangeLog 2007-04-11 11:43:26 UTC (rev 348)
@@ -1,4 +1,4 @@
-2007-07-16 Philip Kendall <phi...@sh...>
+2007-04-11 Philip Kendall <phi...@sh...>
* libspectrum 0.3.0 released.
@@ -188,4 +188,4 @@
* libspectrum separated from Fuse just before the 0.5.0 release of
Fuse; see Fuse's ChangeLog for changes up to this point
-$Id: ChangeLog,v 1.12.2.1 2007/02/04 08:54:43 fredm Exp $
+$Id: ChangeLog,v 1.12.2.2 2007/04/11 08:43:07 pak21 Exp $
Modified: vendor/libspectrum/current/Makefile.am
===================================================================
--- vendor/libspectrum/current/Makefile.am 2007-04-09 11:42:58 UTC (rev 347)
+++ vendor/libspectrum/current/Makefile.am 2007-04-11 11:43:26 UTC (rev 348)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2001-2004 Philip Kendall
-## $Id: Makefile.am,v 1.65 2007/02/02 16:35:42 pak21 Exp $
+## $Id: Makefile.am,v 1.65.2.1 2007/04/11 08:43:07 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
@@ -55,7 +55,7 @@
zlib.c \
zxs.c
-libspectrum_la_LDFLAGS = -version-info 4:0:2 -no-undefined
+libspectrum_la_LDFLAGS = -version-info 5:0:0 -no-undefined
libspectrum_la_LIBADD = myglib/libmyglib.la -lm
Modified: vendor/libspectrum/current/README
===================================================================
--- vendor/libspectrum/current/README 2007-04-09 11:42:58 UTC (rev 347)
+++ vendor/libspectrum/current/README 2007-04-11 11:43:26 UTC (rev 348)
@@ -1,4 +1,4 @@
-libspectrum 0.2.2
+libspectrum 0.3.0
=================
libspectrum is a library which is designed to make the input and
@@ -10,9 +10,12 @@
* Snapshots: .z80, .szx, .sna (all read/write), .zxs, .sp., .snp and
+D snapshots (read only).
-* Tape images: .tzx, .tap (read/write) and Warajevo .tap (read only).
+* Tape images: .tzx, .tap (read/write) and Warajevo .tap, Z80Em and
+ CSW version 1 (read only).
* Input recordings: .rzx (read/write).
* Timex cartridges: .dck (read only).
+* IDE hard disk images: .hdf (read/write).
+* Microdrive cartridge images: .mdr (read/write).
On Unix and Mac OS X, compiling libspectrum should just be as easy as
@@ -47,4 +50,4 @@
'configure' for the first time.
Philip Kendall <phi...@sh...>
-16 July 2004
+11 April 2007
Modified: vendor/libspectrum/current/configure.in
===================================================================
--- vendor/libspectrum/current/configure.in 2007-04-09 11:42:58 UTC (rev 347)
+++ vendor/libspectrum/current/configure.in 2007-04-11 11:43:26 UTC (rev 348)
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
dnl Copyright (c) 1999-2004 Philip Kendall
-dnl $Id: configure.in,v 1.35 2007/02/02 16:35:42 pak21 Exp $
+dnl $Id: configure.in,v 1.35.2.1 2007/04/11 08:43:07 pak21 Exp $
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@
AM_CONFIG_HEADER(config.h)
dnl Use automake to produce `Makefile.in'
-AM_INIT_AUTOMAKE(libspectrum, 0.2.2)
+AM_INIT_AUTOMAKE(libspectrum, 0.3.0)
dnl Checks for programs.
AC_PROG_CC
Modified: vendor/libspectrum/current/doc/cvs-tags
===================================================================
--- vendor/libspectrum/current/doc/cvs-tags 2007-04-09 11:42:58 UTC (rev 347)
+++ vendor/libspectrum/current/doc/cvs-tags 2007-04-11 11:43:26 UTC (rev 348)
@@ -53,6 +53,8 @@
|
+-\
| | libspectrum_0_3_0pre1
+| | libspectrum_0_3_0pre2
+| | libspectrum_0_3_0
| |
| | libspectrum_0_3_0-branch
|
Modified: vendor/libspectrum/current/doc/libspectrum.3
===================================================================
--- vendor/libspectrum/current/doc/libspectrum.3 2007-04-09 11:42:58 UTC (rev 347)
+++ vendor/libspectrum/current/doc/libspectrum.3 2007-04-11 11:43:26 UTC (rev 348)
@@ -1,7 +1,7 @@
.\" -*- nroff -*-
.\"
.\" libspectrum.3: libspectrum summary
-.\" Copyright (c) 2004 Philip Kendall
+.\" Copyright (c) 2004-2007 Philip Kendall
.\"
.\" 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
@@ -22,7 +22,7 @@
.\" E-mail: phi...@sh...
.\"
.\"
-.TH libspectrum 3 "16th July, 2004" "Version 0.2.2" "Emulators"
+.TH libspectrum 3 "11th April, 2004" "Version 0.3.0" "Emulators"
.\"
.\"------------------------------------------------------------------
.\"
@@ -45,13 +45,16 @@
Snapshots: .z80, .szx, .sna (all read/write), .zxs, .sp., .snp and +D
snapshots (read only).
.IP \(bu 2
-Tape images: .tzx, .tap (read/write) and Warajevo .tap (read only).
+Tape images: .tzx, .tap (read/write) and Warajevo .tap, Z80Em and CSW
+version 1 (read only).
.IP \(bu 2
Input recordings: .rzx (read/write).
.IP \(bu 2
Timex cartridges: .dck (read only).
.IP \(bu 2
IDE hard disk images: .hdf (read/write).
+.IP \(bu 2
+Microdrive cartridge images: .mdr (read/write).
.PP
Additionally, any files compressed with
.IR bzip2 "(3)"
Modified: vendor/libspectrum/current/hacking/ChangeLog
===================================================================
--- vendor/libspectrum/current/hacking/ChangeLog 2007-04-09 11:42:58 UTC (rev 347)
+++ vendor/libspectrum/current/hacking/ChangeLog 2007-04-11 11:43:26 UTC (rev 348)
@@ -401,3 +401,12 @@
20070217 tzx_read.c: do allocate memory if we have no data but some padding
in tzx_read_data() (libspectrum_0_3_0-branch).
20070303 TAG: libspectrum_0_3_0-pre2 (libspectrum_0_3_0-branch)
+20070310 internals.h: add prototypes for libspectrum_z80em_read and
+ libspectrum_csw_read (libspectrum_0_3_0-branch) (Fred).
+20070324 z80.c: initialise snap->beta_paged (fixes Action Farce II RZX
+ playback; see bug #1654105) (thanks, Jon Needle)
+ (libspectrum_0_3_0-branch).
+20070409 z80.c: remove warning (libspectrum_0_3_0-branch).
+20070411 ChangeLog,Makefile.am,README,configure.in,doc/libspectrum.3: update
+ for 0.3.0 release (libspectrum_0_3_0-branch).
+20070411 TAG: libspectrum_0_3_0
\ No newline at end of file
Modified: vendor/libspectrum/current/internals.h
===================================================================
--- vendor/libspectrum/current/internals.h 2007-04-09 11:42:58 UTC (rev 347)
+++ vendor/libspectrum/current/internals.h 2007-04-11 11:43:26 UTC (rev 348)
@@ -2,7 +2,7 @@
routines, but not by user code
Copyright (c) 2001-2007 Philip Kendall, Darren Salt
- $Id: internals.h,v 1.27 2007/02/02 16:35:42 pak21 Exp $
+ $Id: internals.h,v 1.27.2.1 2007/03/10 12:39:18 fredm 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
@@ -162,6 +162,16 @@
libspectrum_tape_generalised_data_symbol_table *table,
const libspectrum_byte **ptr, size_t length );
+/* Format specific tape routines */
+
+libspectrum_error
+libspectrum_z80em_read( libspectrum_tape *tape,
+ const libspectrum_byte *buffer, size_t length );
+
+libspectrum_error
+libspectrum_csw_read( libspectrum_tape *tape,
+ const libspectrum_byte *buffer, size_t length );
+
/* Crypto functions */
libspectrum_error
Modified: vendor/libspectrum/current/z80.c
===================================================================
--- vendor/libspectrum/current/z80.c 2007-04-09 11:42:58 UTC (rev 347)
+++ vendor/libspectrum/current/z80.c 2007-04-11 11:43:26 UTC (rev 348)
@@ -1,7 +1,7 @@
/* z80.c: Routines for handling .z80 snapshots
Copyright (c) 2001-2004 Philip Kendall, Darren Salt, Fredrick Meunier
- $Id: z80.c,v 1.81 2007/02/02 16:35:44 pak21 Exp $
+ $Id: z80.c,v 1.81.2.2 2007/04/09 17:44:29 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
@@ -203,7 +203,7 @@
{
libspectrum_error error;
const libspectrum_byte *data;
- int version, compressed;
+ int version, compressed = 1;
error = read_header( buffer, snap, &data, &version, &compressed );
if( error != LIBSPECTRUM_ERROR_NONE ) return error;
@@ -212,6 +212,8 @@
version, compressed );
if( error != LIBSPECTRUM_ERROR_NONE ) return error;
+ libspectrum_snap_set_beta_paged( snap, 0 );
+
return LIBSPECTRUM_ERROR_NONE;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2007-04-11 11:45:46
|
Revision: 349
http://svn.sourceforge.net/fuse-for-macosx/?rev=349&view=rev
Author: fredm
Date: 2007-04-11 04:43:41 -0700 (Wed, 11 Apr 2007)
Log Message:
-----------
Tag vendor/libspectrum/current as vendor/libspectrum/libspectrum-0.3.0.
Added Paths:
-----------
vendor/libspectrum/libspectrum-0.3.0/
Copied: vendor/libspectrum/libspectrum-0.3.0 (from rev 348, vendor/libspectrum/current)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2007-04-09 11:42:57
|
Revision: 347
http://svn.sourceforge.net/fuse-for-macosx/?rev=347&view=rev
Author: fredm
Date: 2007-04-09 04:42:58 -0700 (Mon, 09 Apr 2007)
Log Message:
-----------
Merge in changes from Fuse to reset rzx_instructions_offset on rollback
to fix replay of rolled back recordings (and some refactoring).
Modified Paths:
--------------
branches/Release-0_8_0/fuse/fusepb/controllers/FuseController.m
branches/Release-0_8_0/fuse/fusepb/controllers/RollbackController.m
branches/Release-0_8_0/fuse/rzx.c
branches/Release-0_8_0/fuse/rzx.h
Modified: branches/Release-0_8_0/fuse/fusepb/controllers/FuseController.m
===================================================================
--- branches/Release-0_8_0/fuse/fusepb/controllers/FuseController.m 2007-04-09 11:40:55 UTC (rev 346)
+++ branches/Release-0_8_0/fuse/fusepb/controllers/FuseController.m 2007-04-09 11:42:58 UTC (rev 347)
@@ -531,15 +531,9 @@
fuse_emulation_pause();
- error = libspectrum_rzx_rollback( rzx, &snap );
+ error = rzx_rollback();
if( error ) { fuse_emulation_unpause(); return; }
- error = snapshot_copy_from( snap );
- if( error ) { fuse_emulation_unpause(); return; }
-
- error = libspectrum_rzx_start_input( rzx, tstates );
- if( error ) { fuse_emulation_unpause(); return; }
-
fuse_emulation_unpause();
}
Modified: branches/Release-0_8_0/fuse/fusepb/controllers/RollbackController.m
===================================================================
--- branches/Release-0_8_0/fuse/fusepb/controllers/RollbackController.m 2007-04-09 11:40:55 UTC (rev 346)
+++ branches/Release-0_8_0/fuse/fusepb/controllers/RollbackController.m 2007-04-09 11:42:58 UTC (rev 347)
@@ -79,10 +79,8 @@
[rollbackPoints selectedRow] );
if( error ) [self cancel:self];
- error = snapshot_copy_from( snap );
+ error = rzx_start_after_rollback( snap );
if( error ) [self cancel:self];
-
- libspectrum_rzx_start_input( rzx, tstates );
}
[self cancel:self];
Modified: branches/Release-0_8_0/fuse/rzx.c
===================================================================
--- branches/Release-0_8_0/fuse/rzx.c 2007-04-09 11:40:55 UTC (rev 346)
+++ branches/Release-0_8_0/fuse/rzx.c 2007-04-09 11:42:58 UTC (rev 347)
@@ -480,8 +480,8 @@
return rollback_points;
}
-static int
-start_after_rollback( libspectrum_snap *snap )
+int
+rzx_start_after_rollback( libspectrum_snap *snap )
{
int error;
@@ -506,7 +506,7 @@
error = libspectrum_rzx_rollback( rzx, &snap );
if( error ) return error;
- error = start_after_rollback( snap );
+ error = rzx_start_after_rollback( snap );
if( error ) return error;
return 0;
@@ -528,7 +528,7 @@
error = libspectrum_rzx_rollback_to( rzx, &snap, which );
if( error ) return error;
- error = start_after_rollback( snap );
+ error = rzx_start_after_rollback( snap );
if( error ) return error;
return 0;
Modified: branches/Release-0_8_0/fuse/rzx.h
===================================================================
--- branches/Release-0_8_0/fuse/rzx.h 2007-04-09 11:40:55 UTC (rev 346)
+++ branches/Release-0_8_0/fuse/rzx.h 2007-04-09 11:42:58 UTC (rev 347)
@@ -80,6 +80,8 @@
int rzx_rollback_to( void );
+int rzx_start_after_rollback( libspectrum_snap *snap );
+
GSList* rzx_get_rollback_list( libspectrum_rzx *rzx );
#endif /* #ifndef FUSE_RZX_H */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2007-04-09 11:40:54
|
Revision: 346
http://svn.sourceforge.net/fuse-for-macosx/?rev=346&view=rev
Author: fredm
Date: 2007-04-09 04:40:55 -0700 (Mon, 09 Apr 2007)
Log Message:
-----------
Update version number to reflect fuse version 20070404.
Modified Paths:
--------------
branches/Release-0_8_0/fuse/fusepb/English.lproj/InfoPlist.strings
branches/Release-0_8_0/fuse/fusepb/Info-Fuse.plist
Modified: branches/Release-0_8_0/fuse/fusepb/English.lproj/InfoPlist.strings
===================================================================
(Binary files differ)
Modified: branches/Release-0_8_0/fuse/fusepb/Info-Fuse.plist
===================================================================
--- branches/Release-0_8_0/fuse/fusepb/Info-Fuse.plist 2007-04-09 02:29:58 UTC (rev 345)
+++ branches/Release-0_8_0/fuse/fusepb/Info-Fuse.plist 2007-04-09 11:40:55 UTC (rev 346)
@@ -361,11 +361,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>0.8.0-pre2</string>
+ <string>20070404</string>
<key>CFBundleSignature</key>
<string>FUSE</string>
<key>CFBundleVersion</key>
- <string>0.8.0-pre2</string>
+ <string>20070404</string>
<key>NSMainNibFile</key>
<string>SDLMain</string>
<key>NSPrincipalClass</key>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2007-04-09 02:29:57
|
Revision: 345
http://svn.sourceforge.net/fuse-for-macosx/?rev=345&view=rev
Author: fredm
Date: 2007-04-08 19:29:58 -0700 (Sun, 08 Apr 2007)
Log Message:
-----------
Merge up to fuse-20070404.
Modified Paths:
--------------
branches/Release-0_8_0/fuse/compat/mkstemp.c
branches/Release-0_8_0/fuse/hacking/ChangeLog
branches/Release-0_8_0/fuse/joystick.c
branches/Release-0_8_0/fuse/machines/spec_se.c
branches/Release-0_8_0/fuse/periph.c
branches/Release-0_8_0/fuse/printer.c
Modified: branches/Release-0_8_0/fuse/compat/mkstemp.c
===================================================================
--- branches/Release-0_8_0/fuse/compat/mkstemp.c 2007-04-09 02:18:55 UTC (rev 344)
+++ branches/Release-0_8_0/fuse/compat/mkstemp.c 2007-04-09 02:29:58 UTC (rev 345)
@@ -95,7 +95,6 @@
XXXXXX[5] = letters[v % 62];
fd = open (tmpl, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
- break;
if (fd >= 0)
{
Modified: branches/Release-0_8_0/fuse/hacking/ChangeLog
===================================================================
--- branches/Release-0_8_0/fuse/hacking/ChangeLog 2007-04-09 02:18:55 UTC (rev 344)
+++ branches/Release-0_8_0/fuse/hacking/ChangeLog 2007-04-09 02:29:58 UTC (rev 345)
@@ -1562,3 +1562,15 @@
20070306 display.c: don't overrun line_times array (Release-0_8_0-branch)
(Fred).
20070310 man/fuse.1: add divide url (Release-0_8_0-branch) (Fred).
+20070311 machines/spec_se.c: fix marking Dock and EXROM banks as writable in
+ the SE (Release-0_8_0-branch) (thanks, Andrew Owen) (Fred).
+20070317 compat/mkstemp.c: remove abberant break (thanks, Marek Januszewski)
+ (Release-0_8_0-branch).
+20070321 periph.c: when stopping RZX playback due to overrun, ensure the
+ change is picked up in z80_do_opcodes() (thanks, Julian Wiseman)
+ (Release-0_8_0-branch).
+20070327 joystick.c: don't prompt for joystick config changes when loading a
+ snap during RZX playback (Release-0_8_0-branch)
+ (thanks, Julian Wiseman) (Fred).
+20070404 printer.c: don't buffer output so text is available as it is
+ printed (Release-0_8_0-branch) (Fred).
Modified: branches/Release-0_8_0/fuse/joystick.c
===================================================================
--- branches/Release-0_8_0/fuse/joystick.c 2007-04-09 02:18:55 UTC (rev 344)
+++ branches/Release-0_8_0/fuse/joystick.c 2007-04-09 02:29:58 UTC (rev 345)
@@ -2,7 +2,7 @@
Copyright (c) 2001-2004 Russell Marks, Philip Kendall
Copyright (c) 2003 Darren Salt
- $Id: joystick.c,v 1.25 2007/02/02 16:21:51 pak21 Exp $
+ $Id: joystick.c,v 1.25.2.1 2007/03/27 11:32:23 fredm 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
@@ -32,6 +32,7 @@
#include "joystick.h"
#include "keyboard.h"
#include "periph.h"
+#include "rzx.h"
#include "settings.h"
#include "spectrum.h"
#include "machine.h"
@@ -220,7 +221,8 @@
if( settings_current.joystick_keyboard_output != fuse_type &&
settings_current.joystick_1_output != fuse_type &&
- settings_current.joystick_2_output != fuse_type ) {
+ settings_current.joystick_2_output != fuse_type &&
+ !rzx_playback ) {
switch( ui_confirm_joystick( libspectrum_snap_joystick_list(snap,i),
libspectrum_snap_joystick_inputs(snap,i)) ) {
case UI_CONFIRM_JOYSTICK_KEYBOARD:
Modified: branches/Release-0_8_0/fuse/machines/spec_se.c
===================================================================
--- branches/Release-0_8_0/fuse/machines/spec_se.c 2007-04-09 02:18:55 UTC (rev 344)
+++ branches/Release-0_8_0/fuse/machines/spec_se.c 2007-04-09 02:29:58 UTC (rev 345)
@@ -5,7 +5,7 @@
Copyright (c) 1999-2002 Philip Kendall
Copyright (c) 2002-2003 Fredrick Meunier
- $Id: spec_se.c,v 1.15 2007/02/02 16:21:54 pak21 Exp $
+ $Id: spec_se.c,v 1.15.2.1 2007/03/11 01:06:42 fredm 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
@@ -202,6 +202,10 @@
periph_setup_interface2( PERIPH_PRESENT_OPTIONAL );
periph_update();
+ /* Mark as present/writeable */
+ for( i = 0; i < 34; ++i )
+ memory_map_ram[i].writable = 1;
+
for( i = 0; i < 8; i++ ) {
timex_dock[i] = memory_map_ram[ i + 18 ];
@@ -230,10 +234,6 @@
memset( memory_map_home[4]->page, 0, MEMORY_PAGE_SIZE );
memset( memory_map_home[5]->page, 0, MEMORY_PAGE_SIZE );
- /* Mark as present/writeable */
- for( i = 0; i < 34; ++i )
- memory_map_ram[i].writable = 1;
-
/* RAM pages 1, 3, 5 and 7 contended */
for( i = 0; i < 8; i++ )
memory_map_ram[ 2 * i ].contended =
Modified: branches/Release-0_8_0/fuse/periph.c
===================================================================
--- branches/Release-0_8_0/fuse/periph.c 2007-04-09 02:18:55 UTC (rev 344)
+++ branches/Release-0_8_0/fuse/periph.c 2007-04-09 02:29:58 UTC (rev 345)
@@ -1,7 +1,7 @@
/* periph.c: code for handling peripherals
- Copyright (c) 2005 Philip Kendall
+ Copyright (c) 2005-2007 Philip Kendall
- $Id: periph.c,v 1.20 2007/02/02 16:21:51 pak21 Exp $
+ $Id: periph.c,v 1.20.2.1 2007/03/21 16:21:54 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
@@ -29,6 +29,7 @@
#include "debugger/debugger.h"
#include "divide.h"
+#include "event.h"
#include "if1.h"
#include "if2.h"
#include "joystick.h"
@@ -191,8 +192,15 @@
libspectrum_byte value;
error = libspectrum_rzx_playback( rzx, &value );
- if( error ) { rzx_stop_playback( 1 ); return readport_internal( port ); }
+ if( error ) {
+ rzx_stop_playback( 1 );
+ /* Add a null event to mean we pick up the RZX state change in
+ z80_do_opcodes() */
+ event_add( tstates, EVENT_TYPE_NULL );
+ return readport_internal( port );
+ }
+
return value;
}
Modified: branches/Release-0_8_0/fuse/printer.c
===================================================================
--- branches/Release-0_8_0/fuse/printer.c 2007-04-09 02:18:55 UTC (rev 344)
+++ branches/Release-0_8_0/fuse/printer.c 2007-04-09 02:29:58 UTC (rev 345)
@@ -1,7 +1,7 @@
/* printer.c: Printer support
Copyright (c) 2001-2004 Ian Collier, Russell Marks, Philip Kendall
- $Id: printer.c,v 1.20 2007/02/02 16:21:51 pak21 Exp $
+ $Id: printer.c,v 1.20.2.1 2007/04/04 10:48:08 fredm 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
@@ -182,6 +182,9 @@
return(0);
}
+/* ensure users have immediate access to text file contents */
+setbuf( printer_text_file, NULL );
+
return(1);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2007-04-09 02:18:56
|
Revision: 344
http://svn.sourceforge.net/fuse-for-macosx/?rev=344&view=rev
Author: fredm
Date: 2007-04-08 19:18:55 -0700 (Sun, 08 Apr 2007)
Log Message:
-----------
Tag vendor/fuse/current as vendor/fuse/fuse-20070404.
Added Paths:
-----------
vendor/fuse/fuse-20070404/
Copied: vendor/fuse/fuse-20070404 (from rev 343, vendor/fuse/current)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2007-04-09 02:18:47
|
Revision: 343
http://svn.sourceforge.net/fuse-for-macosx/?rev=343&view=rev
Author: fredm
Date: 2007-04-08 19:18:45 -0700 (Sun, 08 Apr 2007)
Log Message:
-----------
Load . into vendor/fuse/current.
Modified Paths:
--------------
vendor/fuse/current/compat/mkstemp.c
vendor/fuse/current/hacking/ChangeLog
vendor/fuse/current/joystick.c
vendor/fuse/current/machines/spec_se.c
vendor/fuse/current/periph.c
vendor/fuse/current/printer.c
Modified: vendor/fuse/current/compat/mkstemp.c
===================================================================
--- vendor/fuse/current/compat/mkstemp.c 2007-04-07 07:21:59 UTC (rev 342)
+++ vendor/fuse/current/compat/mkstemp.c 2007-04-09 02:18:45 UTC (rev 343)
@@ -95,7 +95,6 @@
XXXXXX[5] = letters[v % 62];
fd = open (tmpl, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
- break;
if (fd >= 0)
{
Modified: vendor/fuse/current/hacking/ChangeLog
===================================================================
--- vendor/fuse/current/hacking/ChangeLog 2007-04-07 07:21:59 UTC (rev 342)
+++ vendor/fuse/current/hacking/ChangeLog 2007-04-09 02:18:45 UTC (rev 343)
@@ -1562,3 +1562,15 @@
20070306 display.c: don't overrun line_times array (Release-0_8_0-branch)
(Fred).
20070310 man/fuse.1: add divide url (Release-0_8_0-branch) (Fred).
+20070311 machines/spec_se.c: fix marking Dock and EXROM banks as writable in
+ the SE (Release-0_8_0-branch) (thanks, Andrew Owen) (Fred).
+20070317 compat/mkstemp.c: remove abberant break (thanks, Marek Januszewski)
+ (Release-0_8_0-branch).
+20070321 periph.c: when stopping RZX playback due to overrun, ensure the
+ change is picked up in z80_do_opcodes() (thanks, Julian Wiseman)
+ (Release-0_8_0-branch).
+20070327 joystick.c: don't prompt for joystick config changes when loading a
+ snap during RZX playback (Release-0_8_0-branch)
+ (thanks, Julian Wiseman) (Fred).
+20070404 printer.c: don't buffer output so text is available as it is
+ printed (Release-0_8_0-branch) (Fred).
Modified: vendor/fuse/current/joystick.c
===================================================================
--- vendor/fuse/current/joystick.c 2007-04-07 07:21:59 UTC (rev 342)
+++ vendor/fuse/current/joystick.c 2007-04-09 02:18:45 UTC (rev 343)
@@ -2,7 +2,7 @@
Copyright (c) 2001-2004 Russell Marks, Philip Kendall
Copyright (c) 2003 Darren Salt
- $Id: joystick.c,v 1.25 2007/02/02 16:21:51 pak21 Exp $
+ $Id: joystick.c,v 1.25.2.1 2007/03/27 11:32:23 fredm 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
@@ -32,6 +32,7 @@
#include "joystick.h"
#include "keyboard.h"
#include "periph.h"
+#include "rzx.h"
#include "settings.h"
#include "spectrum.h"
#include "machine.h"
@@ -217,7 +218,8 @@
if( settings_current.joystick_keyboard_output != fuse_type &&
settings_current.joystick_1_output != fuse_type &&
- settings_current.joystick_2_output != fuse_type ) {
+ settings_current.joystick_2_output != fuse_type &&
+ !rzx_playback ) {
switch( ui_confirm_joystick( libspectrum_snap_joystick_list(snap,i),
libspectrum_snap_joystick_inputs(snap,i)) ) {
case UI_CONFIRM_JOYSTICK_KEYBOARD:
Modified: vendor/fuse/current/machines/spec_se.c
===================================================================
--- vendor/fuse/current/machines/spec_se.c 2007-04-07 07:21:59 UTC (rev 342)
+++ vendor/fuse/current/machines/spec_se.c 2007-04-09 02:18:45 UTC (rev 343)
@@ -5,7 +5,7 @@
Copyright (c) 1999-2002 Philip Kendall
Copyright (c) 2002-2003 Fredrick Meunier
- $Id: spec_se.c,v 1.15 2007/02/02 16:21:54 pak21 Exp $
+ $Id: spec_se.c,v 1.15.2.1 2007/03/11 01:06:42 fredm 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
@@ -202,6 +202,10 @@
periph_setup_interface2( PERIPH_PRESENT_OPTIONAL );
periph_update();
+ /* Mark as present/writeable */
+ for( i = 0; i < 34; ++i )
+ memory_map_ram[i].writable = 1;
+
for( i = 0; i < 8; i++ ) {
timex_dock[i] = memory_map_ram[ i + 18 ];
@@ -230,10 +234,6 @@
memset( memory_map_home[4]->page, 0, MEMORY_PAGE_SIZE );
memset( memory_map_home[5]->page, 0, MEMORY_PAGE_SIZE );
- /* Mark as present/writeable */
- for( i = 0; i < 34; ++i )
- memory_map_ram[i].writable = 1;
-
/* RAM pages 1, 3, 5 and 7 contended */
for( i = 0; i < 8; i++ )
memory_map_ram[ 2 * i ].contended =
Modified: vendor/fuse/current/periph.c
===================================================================
--- vendor/fuse/current/periph.c 2007-04-07 07:21:59 UTC (rev 342)
+++ vendor/fuse/current/periph.c 2007-04-09 02:18:45 UTC (rev 343)
@@ -1,7 +1,7 @@
/* periph.c: code for handling peripherals
- Copyright (c) 2005 Philip Kendall
+ Copyright (c) 2005-2007 Philip Kendall
- $Id: periph.c,v 1.20 2007/02/02 16:21:51 pak21 Exp $
+ $Id: periph.c,v 1.20.2.1 2007/03/21 16:21:54 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
@@ -29,6 +29,7 @@
#include "debugger/debugger.h"
#include "divide.h"
+#include "event.h"
#include "if1.h"
#include "if2.h"
#include "joystick.h"
@@ -191,8 +192,15 @@
libspectrum_byte value;
error = libspectrum_rzx_playback( rzx, &value );
- if( error ) { rzx_stop_playback( 1 ); return readport_internal( port ); }
+ if( error ) {
+ rzx_stop_playback( 1 );
+ /* Add a null event to mean we pick up the RZX state change in
+ z80_do_opcodes() */
+ event_add( tstates, EVENT_TYPE_NULL );
+ return readport_internal( port );
+ }
+
return value;
}
Modified: vendor/fuse/current/printer.c
===================================================================
--- vendor/fuse/current/printer.c 2007-04-07 07:21:59 UTC (rev 342)
+++ vendor/fuse/current/printer.c 2007-04-09 02:18:45 UTC (rev 343)
@@ -1,7 +1,7 @@
/* printer.c: Printer support
Copyright (c) 2001-2004 Ian Collier, Russell Marks, Philip Kendall
- $Id: printer.c,v 1.20 2007/02/02 16:21:51 pak21 Exp $
+ $Id: printer.c,v 1.20.2.1 2007/04/04 10:48:08 fredm 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
@@ -182,6 +182,9 @@
return(0);
}
+/* ensure users have immediate access to text file contents */
+setbuf( printer_text_file, NULL );
+
return(1);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2007-04-07 07:22:03
|
Revision: 342
http://svn.sourceforge.net/fuse-for-macosx/?rev=342&view=rev
Author: fredm
Date: 2007-04-07 00:21:59 -0700 (Sat, 07 Apr 2007)
Log Message:
-----------
Make more changes due to some routines being called from the
Emulator thread rather than the UI one.
Modified Paths:
--------------
branches/fusegl/fuse/fusepb/controllers/FuseController.m
Modified: branches/fusegl/fuse/fusepb/controllers/FuseController.m
===================================================================
--- branches/fusegl/fuse/fusepb/controllers/FuseController.m 2007-04-07 03:26:32 UTC (rev 341)
+++ branches/fusegl/fuse/fusepb/controllers/FuseController.m 2007-04-07 07:21:59 UTC (rev 342)
@@ -1864,7 +1864,7 @@
drive = which == SPECPLUS3_DRIVE_A ? 'A' : 'B';
- if( ![[DisplayOpenGLView instance] specplus3DiskPresent:which] ) {
+ if( !specplus3_disk_present( which ) ) {
ui_error( UI_ERROR_INFO, "No disk present in drive %c:", drive );
return 0;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2007-04-07 03:26:57
|
Revision: 341
http://svn.sourceforge.net/fuse-for-macosx/?rev=341&view=rev
Author: fredm
Date: 2007-04-06 20:26:32 -0700 (Fri, 06 Apr 2007)
Log Message:
-----------
Add volume output adjustment for coreaudio.
Modified Paths:
--------------
branches/fusegl/fuse/TODO
branches/fusegl/fuse/sound/coreaudiosound.c
Modified: branches/fusegl/fuse/TODO
===================================================================
--- branches/fusegl/fuse/TODO 2007-04-06 09:48:36 UTC (rev 340)
+++ branches/fusegl/fuse/TODO 2007-04-07 03:26:32 UTC (rev 341)
@@ -24,18 +24,24 @@
X Make sure that fuse_end is called somewhere on exit
X Restore activity icons
X Restore joystick processing (re-use SDL joystick input files from SDL)
-* Make activity icons transparent
+X Sort out remaining FuseController calls into emulator object/thread
+X Restore application level volume adjustment
* Use double buffered texture (in cocoadisplay have screen 0 and 1 for use of
DisplayOpenGLView and flip between them on frame end), should also have a
mutex taken while DisplayOpenGLView changes and cocoadisplay flips to
prevent thread sync problems
-* Sort out remaining FuseController calls into emulator object/thread
* Quit keyhandling when command key is pressed
* Use sheets rather than modal dialogs (for Save As)
* Put in latest hq[23]x filters (HQ2x_555 from ScummVM should do the trick)
* Make border display optional
* Figure out why minimise icon image is partially blanked when minimise starts
-* Make sure that printer text is available as we go on OS X
* Allow Cmd-w to close as many operations as possible
+* Make activity icons transparent
+* Seperate out sound buffer interleaving code to allow for the use of hardware etc.
+ sound mixing
+* Add .WAV loader using audiofile
+* Shouldn't be able to load Interface II carts in Pentagon
+* Add volume option to standard fuse + a sound API method to set volume (or a
+ parameter to sound_lowlevel_init)
$Id: TODO,v 1.4 2004/03/02 13:38:08 pak21 Exp $
Modified: branches/fusegl/fuse/sound/coreaudiosound.c
===================================================================
--- branches/fusegl/fuse/sound/coreaudiosound.c 2007-04-06 09:48:36 UTC (rev 340)
+++ branches/fusegl/fuse/sound/coreaudiosound.c 2007-04-07 03:26:32 UTC (rev 341)
@@ -66,6 +66,7 @@
UInt32 deviceBufferSize; /* bufferSize returned by
kAudioDevicePropertyBufferSize */
int error;
+ Float32 vol = 1.0 - settings_current.volume / 5.0;
/* get the default output device for the HAL */
count = sizeof( device );
@@ -160,6 +161,18 @@
return 1;
}
+ err = AudioUnitSetParameter( gOutputUnit,
+ kHALOutputParam_Volume,
+ kAudioUnitScope_Global,
+ 0,
+ vol,
+ 0 );
+ if( err ) {
+ ui_error( UI_ERROR_ERROR, "AudioUnitSetParameter-Vol=%4.4s, %ld", (char*)&err,
+ err );
+ return 1;
+ }
+
err = AudioUnitInitialize( gOutputUnit );
if( err ) {
ui_error( UI_ERROR_ERROR, "AudioUnitInitialize=%ld", err );
@@ -258,7 +271,7 @@
ioData->mBuffers[1].mData : 0;
if( out_r ) {
- /* Deinterleave the left and right stereo channels into their approptiate
+ /* Deinterleave the left and right stereo channels into their appropriate
buffers */
while( sfifo_used( &sound_fifo ) && len ) {
f = sfifo_read( &sound_fifo, out_l, deviceFormat.mBytesPerFrame );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2007-04-06 09:48:41
|
Revision: 340
http://svn.sourceforge.net/fuse-for-macosx/?rev=340&view=rev
Author: fredm
Date: 2007-04-06 02:48:36 -0700 (Fri, 06 Apr 2007)
Log Message:
-----------
Make changes due to some routines being called from the Emulator
thread rather than the UI one.
Modified Paths:
--------------
branches/fusegl/fuse/fusepb/controllers/FuseController.m
Modified: branches/fusegl/fuse/fusepb/controllers/FuseController.m
===================================================================
--- branches/fusegl/fuse/fusepb/controllers/FuseController.m 2007-04-06 07:21:52 UTC (rev 339)
+++ branches/fusegl/fuse/fusepb/controllers/FuseController.m 2007-04-06 09:48:36 UTC (rev 340)
@@ -50,6 +50,7 @@
#include "settings.h"
#include "settings_cocoa.h"
#include "snapshot.h"
+#include "tape.h"
#include "thumbnail.h"
#include "ui.h"
#include "uidisplay.h"
@@ -1840,9 +1841,14 @@
if( !filename ) { [[DisplayOpenGLView instance] unpause]; return 1; }
- [[DisplayOpenGLView instance] tapeWrite:filename];
+ /* We will be calling this from the Emulator thread */
+ tape_write( filename );
- [[FuseController singleton] addRecentSnapshot:filename];
+ [[FuseController singleton]
+ performSelectorOnMainThread:@selector(addRecentSnapshotWithString:)
+ withObject:[NSString stringWithUTF8String:filename]
+ waitUntilDone:NO
+ ];
free( filename );
@@ -1870,9 +1876,14 @@
if( !filename ) { [[DisplayOpenGLView instance] unpause]; return 1; }
- [[DisplayOpenGLView instance] specplus3DiskWrite:filename inDrive:which];
+ /* We will be calling this from the Emulator thread */
+ specplus3_disk_write( which, filename );
- [[FuseController singleton] addRecentSnapshot:filename];
+ [[FuseController singleton]
+ performSelectorOnMainThread:@selector(addRecentSnapshotWithString:)
+ withObject:[NSString stringWithUTF8String:filename]
+ waitUntilDone:NO
+ ];
free( filename );
@@ -1901,9 +1912,14 @@
if( !filename ) { [[DisplayOpenGLView instance] unpause]; return 1; }
- [[DisplayOpenGLView instance] trdosDiskWrite:filename inDrive:which];
+ /* We will be calling this from the Emulator thread */
+ trdos_disk_write( which, filename );
- [[FuseController singleton] addRecentSnapshot:filename];
+ [[FuseController singleton]
+ performSelectorOnMainThread:@selector(addRecentSnapshotWithString:)
+ withObject:[NSString stringWithUTF8String:filename]
+ waitUntilDone:NO
+ ];
free( filename );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2007-04-06 07:21:51
|
Revision: 339
http://svn.sourceforge.net/fuse-for-macosx/?rev=339&view=rev
Author: fredm
Date: 2007-04-06 00:21:52 -0700 (Fri, 06 Apr 2007)
Log Message:
-----------
Move specplus3 and trdos menus to Emulator object.
Make menu enabling and disabling happen from main thread.
Modified Paths:
--------------
branches/fusegl/fuse/fusepb/controllers/FuseController.h
branches/fusegl/fuse/fusepb/controllers/FuseController.m
branches/fusegl/fuse/fusepb/models/Emulator.h
branches/fusegl/fuse/fusepb/models/Emulator.m
branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h
branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m
Modified: branches/fusegl/fuse/fusepb/controllers/FuseController.h
===================================================================
--- branches/fusegl/fuse/fusepb/controllers/FuseController.h 2007-04-06 01:54:59 UTC (rev 338)
+++ branches/fusegl/fuse/fusepb/controllers/FuseController.h 2007-04-06 07:21:52 UTC (rev 339)
@@ -132,18 +132,51 @@
- (void) releaseCmdKeys:(NSString *)character:(int)keyCode;
- (void) releaseKey:(int)keyCode;
-- (void)ui_menu_activate_media_cartridge:(int)active;
-- (void)ui_menu_activate_media_cartridge_dock:(int)active;
-- (void)ui_menu_activate_media_cartridge_if2:(int)active;
-- (void)ui_menu_activate_media_disk:(int)active;
-- (void)ui_menu_activate_media_disk_plus3:(int)active;
-- (void)ui_menu_activate_media_disk_trdos:(int)active;
-- (void)ui_menu_activate_media_if1:(int)active;
-- (void)ui_menu_activate_media_ide:(int)active;
-- (void)ui_menu_activate_media_ide_divide:(int)active;
-- (void)ui_menu_activate_media_ide_simple8bit:(int)active;
-- (void)ui_menu_activate_media_ide_zxatasp:(int)active;
-- (void)ui_menu_activate_media_ide_zxcf:(int)active;
+- (void)ui_menu_activate_media_cartridge:(NSNumber*)active;
+- (void)ui_menu_activate_media_cartridge_dock:(NSNumber*)active;
+- (void)ui_menu_activate_media_cartridge_dock_eject:(NSNumber*)active;
+- (void)ui_menu_activate_media_cartridge_if2:(NSNumber*)active;
+- (void)ui_menu_activate_media_cartridge_if2_eject:(NSNumber*)active;
+- (void)ui_menu_activate_media_disk:(NSNumber*)active;
+- (void)ui_menu_activate_media_disk_plus3:(NSNumber*)active;
+- (void)ui_menu_activate_media_disk_plus3_a_eject:(NSNumber*)active;
+- (void)ui_menu_activate_media_disk_plus3_b_eject:(NSNumber*)active;
+- (void)ui_menu_activate_media_disk_trdos:(NSNumber*)active;
+- (void)ui_menu_activate_media_disk_trdos_a_eject:(NSNumber*)active;
+- (void)ui_menu_activate_media_disk_trdos_b_eject:(NSNumber*)active;
+- (void)ui_menu_activate_media_if1:(NSNumber*)active;
+- (void)ui_menu_activate_media_if1_m1_eject:(NSNumber*)active;
+- (void)ui_menu_activate_media_if1_m1_wp_set:(NSNumber*)active;
+- (void)ui_menu_activate_media_if1_m2_eject:(NSNumber*)active;
+- (void)ui_menu_activate_media_if1_m2_wp_set:(NSNumber*)active;
+- (void)ui_menu_activate_media_if1_m3_eject:(NSNumber*)active;
+- (void)ui_menu_activate_media_if1_m3_wp_set:(NSNumber*)active;
+- (void)ui_menu_activate_media_if1_m4_eject:(NSNumber*)active;
+- (void)ui_menu_activate_media_if1_m4_wp_set:(NSNumber*)active;
+- (void)ui_menu_activate_media_if1_m5_eject:(NSNumber*)active;
+- (void)ui_menu_activate_media_if1_m5_wp_set:(NSNumber*)active;
+- (void)ui_menu_activate_media_if1_m6_eject:(NSNumber*)active;
+- (void)ui_menu_activate_media_if1_m6_wp_set:(NSNumber*)active;
+- (void)ui_menu_activate_media_if1_m7_eject:(NSNumber*)active;
+- (void)ui_menu_activate_media_if1_m7_wp_set:(NSNumber*)active;
+- (void)ui_menu_activate_media_if1_m8_eject:(NSNumber*)active;
+- (void)ui_menu_activate_media_if1_m8_wp_set:(NSNumber*)active;
+- (void)ui_menu_activate_media_ide:(NSNumber*)active;
+- (void)ui_menu_activate_media_ide_divide:(NSNumber*)active;
+- (void)ui_menu_activate_media_ide_divide_master_eject:(NSNumber*)active;
+- (void)ui_menu_activate_media_ide_divide_slave_eject:(NSNumber*)active;
+- (void)ui_menu_activate_media_ide_simple8bit:(NSNumber*)active;
+- (void)ui_menu_activate_media_ide_simple8bit_master_eject:(NSNumber*)active;
+- (void)ui_menu_activate_media_ide_simple8bit_slave_eject:(NSNumber*)active;
+- (void)ui_menu_activate_media_ide_zxatasp:(NSNumber*)active;
+- (void)ui_menu_activate_media_ide_zxatasp_master_eject:(NSNumber*)active;
+- (void)ui_menu_activate_media_ide_zxatasp_slave_eject:(NSNumber*)active;
+- (void)ui_menu_activate_media_ide_zxcf:(NSNumber*)active;
+- (void)ui_menu_activate_media_ide_zxcf_eject:(NSNumber*)active;
+- (void)ui_menu_activate_recording:(NSNumber*)active;
+- (void)ui_menu_activate_recording_rollback:(NSNumber*)active;
+- (void)ui_menu_activate_ay_logging:(NSNumber*)active;
+- (void)ui_menu_activate_machine_profiler:(NSNumber*)active;
- (void)openFile:(const char *)filename;
- (void)openRecent:(id)sender;
Modified: branches/fusegl/fuse/fusepb/controllers/FuseController.m
===================================================================
--- branches/fusegl/fuse/fusepb/controllers/FuseController.m 2007-04-06 01:54:59 UTC (rev 338)
+++ branches/fusegl/fuse/fusepb/controllers/FuseController.m 2007-04-06 07:21:52 UTC (rev 339)
@@ -51,7 +51,6 @@
#include "settings_cocoa.h"
#include "snapshot.h"
#include "thumbnail.h"
-#include "trdos.h"
#include "ui.h"
#include "uidisplay.h"
#include "utils.h"
@@ -913,66 +912,234 @@
[NSApp postEvent:event1 atStart:NO];
}
-- (void)ui_menu_activate_media_cartridge:(int)active
+- (void)ui_menu_activate_media_cartridge:(NSNumber*)active
{
- [cart setEnabled:active == 0 ? NO : YES];
+ [cart setEnabled:[active boolValue]];
}
-- (void)ui_menu_activate_media_cartridge_dock:(int)active
+- (void)ui_menu_activate_media_cartridge_dock:(NSNumber*)active
{
- [dock setEnabled:active == 0 ? NO : YES];
+ [dock setEnabled:[active boolValue]];
}
-- (void)ui_menu_activate_media_cartridge_if2:(int)active
+- (void)ui_menu_activate_media_cartridge_dock_eject:(NSNumber*)active
{
- [if2 setEnabled:active == 0 ? NO : YES];
+ dockEject = [active boolValue];
}
-- (void)ui_menu_activate_media_disk:(int)active
+- (void)ui_menu_activate_media_cartridge_if2:(NSNumber*)active
{
- [disk setEnabled:active == 0 ? NO : YES];
+ [if2 setEnabled:[active boolValue]];
}
-- (void)ui_menu_activate_media_disk_plus3:(int)active
+- (void)ui_menu_activate_media_cartridge_if2_eject:(NSNumber*)active
{
- [diskPlus3 setEnabled:active == 0 ? NO : YES];
+ if2Eject = [active boolValue];
}
-- (void)ui_menu_activate_media_disk_trdos:(int)active
+- (void)ui_menu_activate_media_disk:(NSNumber*)active
{
- [diskTrDos setEnabled:active == 0 ? NO : YES];
+ [disk setEnabled:[active boolValue]];
}
-- (void)ui_menu_activate_media_ide:(int)active
+- (void)ui_menu_activate_media_disk_plus3:(NSNumber*)active
{
- [ide setEnabled:active == 0 ? NO : YES];
+ [diskPlus3 setEnabled:[active boolValue]];
}
-- (void)ui_menu_activate_media_ide_divide:(int)active
+- (void)ui_menu_activate_media_disk_plus3_a_eject:(NSNumber*)active
{
- [divide setEnabled:active == 0 ? NO : YES];
+ diskPlus3EjectA = [active boolValue];
}
-- (void)ui_menu_activate_media_ide_simple8bit:(int)active
+- (void)ui_menu_activate_media_disk_plus3_b_eject:(NSNumber*)active
{
- [simple8Bit setEnabled:active == 0 ? NO : YES];
+ diskPlus3EjectB = [active boolValue];
}
-- (void)ui_menu_activate_media_ide_zxatasp:(int)active
+- (void)ui_menu_activate_media_disk_trdos:(NSNumber*)active
{
- [zxatasp setEnabled:active == 0 ? NO : YES];
+ [diskTrDos setEnabled:[active boolValue]];
}
-- (void)ui_menu_activate_media_ide_zxcf:(int)active
+- (void)ui_menu_activate_media_disk_trdos_a_eject:(NSNumber*)active
{
- [zxcf setEnabled:active == 0 ? NO : YES];
+ diskTrdosEjectA = [active boolValue];
}
-- (void)ui_menu_activate_media_if1:(int)active
+- (void)ui_menu_activate_media_disk_trdos_b_eject:(NSNumber*)active
{
- [if1 setEnabled:active == 0 ? NO : YES];
+ diskTrdosEjectB = [active boolValue];
}
+- (void)ui_menu_activate_media_ide:(NSNumber*)active
+{
+ [ide setEnabled:[active boolValue]];
+}
+
+- (void)ui_menu_activate_media_ide_divide:(NSNumber*)active
+{
+ [divide setEnabled:[active boolValue]];
+}
+
+- (void)ui_menu_activate_media_ide_divide_master_eject:(NSNumber*)active
+{
+ ideDivideEjectMaster = [active boolValue];
+}
+
+- (void)ui_menu_activate_media_ide_divide_slave_eject:(NSNumber*)active
+{
+ ideDivideEjectSlave = [active boolValue];
+}
+
+- (void)ui_menu_activate_media_ide_simple8bit:(NSNumber*)active
+{
+ [simple8Bit setEnabled:[active boolValue]];
+}
+
+- (void)ui_menu_activate_media_ide_simple8bit_master_eject:(NSNumber*)active
+{
+ ideSimple8BitEjectMaster = [active boolValue];
+}
+
+- (void)ui_menu_activate_media_ide_simple8bit_slave_eject:(NSNumber*)active
+{
+ ideSimple8BitEjectSlave = [active boolValue];
+}
+
+- (void)ui_menu_activate_media_ide_zxatasp:(NSNumber*)active
+{
+ [zxatasp setEnabled:[active boolValue]];
+}
+
+- (void)ui_menu_activate_media_ide_zxatasp_master_eject:(NSNumber*)active
+{
+ ideZxataspEjectMaster = [active boolValue];
+}
+
+- (void)ui_menu_activate_media_ide_zxatasp_slave_eject:(NSNumber*)active
+{
+ ideZxataspEjectSlave = [active boolValue];
+}
+
+- (void)ui_menu_activate_media_ide_zxcf:(NSNumber*)active
+{
+ [zxcf setEnabled:[active boolValue]];
+}
+
+- (void)ui_menu_activate_media_ide_zxcf_eject:(NSNumber*)active
+{
+ ideZxcfEject = [active boolValue];
+}
+
+- (void)ui_menu_activate_media_if1:(NSNumber*)active
+{
+ [if1 setEnabled:[active boolValue]];
+}
+
+- (void)ui_menu_activate_media_if1_m1_eject:(NSNumber*)active
+{
+ if1M1Eject = [active boolValue];
+}
+
+- (void)ui_menu_activate_media_if1_m1_wp_set:(NSNumber*)active
+{
+ if1M1WpSet = [active boolValue];
+}
+
+- (void)ui_menu_activate_media_if1_m2_eject:(NSNumber*)active
+{
+ if1M2Eject = [active boolValue];
+}
+
+- (void)ui_menu_activate_media_if1_m2_wp_set:(NSNumber*)active
+{
+ if1M2WpSet = [active boolValue];
+}
+
+- (void)ui_menu_activate_media_if1_m3_eject:(NSNumber*)active
+{
+ if1M3Eject = [active boolValue];
+}
+
+- (void)ui_menu_activate_media_if1_m3_wp_set:(NSNumber*)active
+{
+ if1M3WpSet = [active boolValue];
+}
+
+- (void)ui_menu_activate_media_if1_m4_eject:(NSNumber*)active
+{
+ if1M4Eject = [active boolValue];
+}
+
+- (void)ui_menu_activate_media_if1_m4_wp_set:(NSNumber*)active
+{
+ if1M4WpSet = [active boolValue];
+}
+
+- (void)ui_menu_activate_media_if1_m5_eject:(NSNumber*)active
+{
+ if1M5Eject = [active boolValue];
+}
+
+- (void)ui_menu_activate_media_if1_m5_wp_set:(NSNumber*)active
+{
+ if1M5WpSet = [active boolValue];
+}
+
+- (void)ui_menu_activate_media_if1_m6_eject:(NSNumber*)active
+{
+ if1M6Eject = [active boolValue];
+}
+
+- (void)ui_menu_activate_media_if1_m6_wp_set:(NSNumber*)active
+{
+ if1M6WpSet = [active boolValue];
+}
+
+- (void)ui_menu_activate_media_if1_m7_eject:(NSNumber*)active
+{
+ if1M7Eject = [active boolValue];
+}
+
+- (void)ui_menu_activate_media_if1_m8_eject:(NSNumber*)active
+{
+ if1M8Eject = [active boolValue];
+}
+
+- (void)ui_menu_activate_media_if1_m8_wp_set:(NSNumber*)active
+{
+ if1M8WpSet = [active boolValue];
+}
+
+- (void)ui_menu_activate_media_if1_m7_wp_set:(NSNumber*)active
+{
+ if1M7WpSet = [active boolValue];
+}
+
+- (void)ui_menu_activate_recording:(NSNumber*)active
+{
+ record = recordFromSnapshot = play = ![active boolValue];
+ stop = [active boolValue];
+}
+
+- (void)ui_menu_activate_recording_rollback:(NSNumber*)active
+{
+ insert_snap = rollback = rollback_to = [active boolValue];
+}
+
+- (void)ui_menu_activate_ay_logging:(NSNumber*)active
+{
+ recordPsg = ![active boolValue];
+ stopPsg = [active boolValue];
+}
+
+- (void)ui_menu_activate_machine_profiler:(NSNumber*)active
+{
+ profileStart = ![active boolValue];
+ profileStop = [active boolValue];
+}
+
- (BOOL)validateMenuItem:(id <NSMenuItem>)menuItem
{
switch( [menuItem tag] ) {
@@ -1244,9 +1411,9 @@
[self addRecentSnapshot:filename];
if( machine_current->machine == LIBSPECTRUM_MACHINE_PLUS3 ) {
- specplus3_disk_insert_default_autoload( drive, filename );
+ [[DisplayOpenGLView instance] specplus3DiskInsert:filename inDrive:drive];
} else {
- trdos_disk_insert_default_autoload( drive, filename );
+ [[DisplayOpenGLView instance] trdosDiskInsert:filename inDrive:drive];
}
free( filename );
@@ -1429,13 +1596,14 @@
{
[[DisplayOpenGLView instance] pause];
if( machine_current->machine == LIBSPECTRUM_MACHINE_PLUS3 ) {
- specplus3_disk_eject( drive, write );
+ [[DisplayOpenGLView instance] specplus3DiskEject:drive saveFirst:write];
} else {
- trdos_disk_eject( drive, write );
+ [[DisplayOpenGLView instance] trdosDiskEject:drive saveFirst:write];
}
[[DisplayOpenGLView instance] unpause];
}
+/* Runs in Emulator object context */
int
menu_open_snap( void )
{
@@ -1455,139 +1623,174 @@
int
ui_menu_activate( ui_menu_item item, int active )
{
- FuseController *controller = [FuseController singleton];
+ NSNumber* activeBool = [NSNumber numberWithBool:active ? YES : NO];
+ SEL method = nil;
switch( item ) {
case UI_MENU_ITEM_MEDIA_CARTRIDGE:
- [controller ui_menu_activate_media_cartridge:active]; break;
+ method = @selector(ui_menu_activate_media_cartridge:);
+ break;
case UI_MENU_ITEM_MEDIA_CARTRIDGE_DOCK:
- [controller ui_menu_activate_media_cartridge_dock:active];
+ method = @selector(ui_menu_activate_media_cartridge_dock:);
break;
case UI_MENU_ITEM_MEDIA_CARTRIDGE_DOCK_EJECT:
- dockEject = active; break;
+ method = @selector(ui_menu_activate_media_cartridge_dock_eject:);
+ break;
case UI_MENU_ITEM_MEDIA_CARTRIDGE_IF2:
- [controller ui_menu_activate_media_cartridge_if2:active]; break;
+ method = @selector(ui_menu_activate_media_cartridge_if2:);
+ break;
case UI_MENU_ITEM_MEDIA_CARTRIDGE_IF2_EJECT:
- if2Eject = active; break;
+ method = @selector(ui_menu_activate_media_cartridge_if2_eject:);
+ break;
case UI_MENU_ITEM_MEDIA_DISK:
- [controller ui_menu_activate_media_disk:active]; break;
+ method = @selector(ui_menu_activate_media_disk:);
+ break;
case UI_MENU_ITEM_MEDIA_DISK_PLUS3:
- [controller ui_menu_activate_media_disk_plus3:active];
+ method = @selector(ui_menu_activate_media_disk_plus3:);
break;
case UI_MENU_ITEM_MEDIA_DISK_PLUS3_A_EJECT:
- diskPlus3EjectA = active; break;
+ method = @selector(ui_menu_activate_media_disk_plus3_a_eject:);
+ break;
case UI_MENU_ITEM_MEDIA_DISK_PLUS3_B_EJECT:
- diskPlus3EjectB = active; break;
+ method = @selector(ui_menu_activate_media_disk_plus3_b_eject:);
+ break;
case UI_MENU_ITEM_MEDIA_DISK_TRDOS:
- [controller ui_menu_activate_media_disk_trdos:active];
+ method = @selector(ui_menu_activate_media_disk_trdos:);
break;
case UI_MENU_ITEM_MEDIA_DISK_TRDOS_A_EJECT:
- diskTrdosEjectA = active; break;
+ method = @selector(ui_menu_activate_media_disk_trdos_a_eject:);
+ break;
case UI_MENU_ITEM_MEDIA_DISK_TRDOS_B_EJECT:
- diskTrdosEjectB = active; break;
+ method = @selector(ui_menu_activate_media_disk_trdos_b_eject:);
+ break;
case UI_MENU_ITEM_RECORDING:
- record = recordFromSnapshot = play = !active;
- stop = active; break;
+ method = @selector(ui_menu_activate_recording:);
+ break;
case UI_MENU_ITEM_RECORDING_ROLLBACK:
- insert_snap = rollback = rollback_to = active;
+ method = @selector(ui_menu_activate_recording_rollback:);
break;
case UI_MENU_ITEM_AY_LOGGING:
- recordPsg = !active; stopPsg = active; break;
+ method = @selector(ui_menu_activate_ay_logging:);
+ break;
case UI_MENU_ITEM_MEDIA_IDE:
- [controller ui_menu_activate_media_ide:active]; break;
+ method = @selector(ui_menu_activate_media_ide:);
+ break;
case UI_MENU_ITEM_MEDIA_IDE_SIMPLE8BIT:
- [controller ui_menu_activate_media_ide_simple8bit:active];
+ method = @selector(ui_menu_activate_media_ide_simple8bit:);
break;
case UI_MENU_ITEM_MEDIA_IDE_SIMPLE8BIT_MASTER_EJECT:
- ideSimple8BitEjectMaster = active; break;
+ method = @selector(ui_menu_activate_media_ide_simple8bit_master_eject:);
+ break;
case UI_MENU_ITEM_MEDIA_IDE_SIMPLE8BIT_SLAVE_EJECT:
- ideSimple8BitEjectSlave = active; break;
+ method = @selector(ui_menu_activate_media_ide_simple8bit_slave_eject:);
+ break;
case UI_MENU_ITEM_MEDIA_IDE_ZXATASP:
- [controller ui_menu_activate_media_ide_zxatasp:active];
+ method = @selector(ui_menu_activate_media_ide_zxatasp:);
break;
case UI_MENU_ITEM_MEDIA_IDE_ZXATASP_MASTER_EJECT:
- ideZxataspEjectMaster = active; break;
+ method = @selector(ui_menu_activate_media_ide_zxatasp_master_eject:);
+ break;
case UI_MENU_ITEM_MEDIA_IDE_ZXATASP_SLAVE_EJECT:
- ideZxataspEjectSlave = active; break;
+ method = @selector(ui_menu_activate_media_ide_zxatasp_slave_eject:);
+ break;
case UI_MENU_ITEM_MEDIA_IDE_ZXCF:
- [controller ui_menu_activate_media_ide_zxcf:active]; break;
+ method = @selector(ui_menu_activate_media_ide_zxcf:);
+ break;
case UI_MENU_ITEM_MEDIA_IDE_ZXCF_EJECT:
- ideZxcfEject = active; break;
+ method = @selector(ui_menu_activate_media_ide_zxcf_eject:);
+ break;
case UI_MENU_ITEM_MEDIA_IF1:
- [controller ui_menu_activate_media_if1:active]; break;
+ method = @selector(ui_menu_activate_media_if1:);
+ break;
case UI_MENU_ITEM_MEDIA_IF1_M1_EJECT:
- if1M1Eject = active; break;
+ method = @selector(ui_menu_activate_media_if1_m1_eject:);
+ break;
case UI_MENU_ITEM_MEDIA_IF1_M1_WP_SET:
- if1M1WpSet = active; break;
+ method = @selector(ui_menu_activate_media_if1_m1_wp_set:);
+ break;
case UI_MENU_ITEM_MEDIA_IF1_M2_EJECT:
- if1M2Eject = active; break;
+ method = @selector(ui_menu_activate_media_if1_m2_eject:);
+ break;
case UI_MENU_ITEM_MEDIA_IF1_M2_WP_SET:
- if1M2WpSet = active; break;
+ method = @selector(ui_menu_activate_media_if1_m2_wp_set:);
+ break;
case UI_MENU_ITEM_MEDIA_IF1_M3_EJECT:
- if1M3Eject = active; break;
+ method = @selector(ui_menu_activate_media_if1_m3_eject:);
+ break;
case UI_MENU_ITEM_MEDIA_IF1_M3_WP_SET:
- if1M3WpSet = active; break;
+ method = @selector(ui_menu_activate_media_if1_m3_wp_set:);
+ break;
case UI_MENU_ITEM_MEDIA_IF1_M4_EJECT:
- if1M4Eject = active; break;
+ method = @selector(ui_menu_activate_media_if1_m4_eject:);
+ break;
case UI_MENU_ITEM_MEDIA_IF1_M4_WP_SET:
- if1M4WpSet = active; break;
+ method = @selector(ui_menu_activate_media_if1_m4_wp_set:);
+ break;
case UI_MENU_ITEM_MEDIA_IF1_M5_EJECT:
- if1M5Eject = active; break;
+ method = @selector(ui_menu_activate_media_if1_m5_eject:);
+ break;
case UI_MENU_ITEM_MEDIA_IF1_M5_WP_SET:
- if1M5WpSet = active; break;
+ method = @selector(ui_menu_activate_media_if1_m5_wp_set:);
+ break;
case UI_MENU_ITEM_MEDIA_IF1_M6_EJECT:
- if1M6Eject = active; break;
+ method = @selector(ui_menu_activate_media_if1_m6_eject:);
+ break;
case UI_MENU_ITEM_MEDIA_IF1_M6_WP_SET:
- if1M6WpSet = active; break;
+ method = @selector(ui_menu_activate_media_if1_m6_wp_set:);
+ break;
case UI_MENU_ITEM_MEDIA_IF1_M7_EJECT:
- if1M7Eject = active; break;
+ method = @selector(ui_menu_activate_media_if1_m7_eject:);
+ break;
case UI_MENU_ITEM_MEDIA_IF1_M7_WP_SET:
- if1M7WpSet = active; break;
+ method = @selector(ui_menu_activate_media_if1_m7_wp_set:);
+ break;
case UI_MENU_ITEM_MEDIA_IF1_M8_EJECT:
- if1M8Eject = active; break;
+ method = @selector(ui_menu_activate_media_if1_m8_eject:);
+ break;
case UI_MENU_ITEM_MEDIA_IF1_M8_WP_SET:
- if1M8WpSet = active; break;
+ method = @selector(ui_menu_activate_media_if1_m8_wp_set:);
+ break;
case UI_MENU_ITEM_MEDIA_IF1_RS232_UNPLUG_R:
case UI_MENU_ITEM_MEDIA_IF1_RS232_UNPLUG_T:
@@ -1595,19 +1798,20 @@
break;
case UI_MENU_ITEM_MACHINE_PROFILER:
- profileStart = !active;
- profileStop = active;
+ method = @selector(ui_menu_activate_machine_profiler:);
break;
case UI_MENU_ITEM_MEDIA_IDE_DIVIDE:
- [controller ui_menu_activate_media_ide_divide:active];
+ method = @selector(ui_menu_activate_media_ide_divide:);
break;
case UI_MENU_ITEM_MEDIA_IDE_DIVIDE_MASTER_EJECT:
- ideDivideEjectMaster = active; break;
+ method = @selector(ui_menu_activate_media_ide_divide_master_eject:);
+ break;
case UI_MENU_ITEM_MEDIA_IDE_DIVIDE_SLAVE_EJECT:
- ideDivideEjectSlave = active; break;
+ method = @selector(ui_menu_activate_media_ide_divide_slave_eject:);
+ break;
default:
ui_error( UI_ERROR_ERROR, "Attempt to activate unknown menu item %d",
@@ -1616,6 +1820,12 @@
}
+ [[FuseController singleton]
+ performSelectorOnMainThread:method
+ withObject:activeBool
+ waitUntilDone:NO
+ ];
+
return 0;
}
@@ -1648,7 +1858,7 @@
drive = which == SPECPLUS3_DRIVE_A ? 'A' : 'B';
- if( !specplus3_disk_present( which ) ) {
+ if( ![[DisplayOpenGLView instance] specplus3DiskPresent:which] ) {
ui_error( UI_ERROR_INFO, "No disk present in drive %c:", drive );
return 0;
}
@@ -1660,7 +1870,7 @@
if( !filename ) { [[DisplayOpenGLView instance] unpause]; return 1; }
- specplus3_disk_write( which, filename );
+ [[DisplayOpenGLView instance] specplus3DiskWrite:filename inDrive:which];
[[FuseController singleton] addRecentSnapshot:filename];
@@ -1691,7 +1901,7 @@
if( !filename ) { [[DisplayOpenGLView instance] unpause]; return 1; }
- trdos_disk_write( which, filename );
+ [[DisplayOpenGLView instance] trdosDiskWrite:filename inDrive:which];
[[FuseController singleton] addRecentSnapshot:filename];
Modified: branches/fusegl/fuse/fusepb/models/Emulator.h
===================================================================
--- branches/fusegl/fuse/fusepb/models/Emulator.h 2007-04-06 01:54:59 UTC (rev 338)
+++ branches/fusegl/fuse/fusepb/models/Emulator.h 2007-04-06 07:21:52 UTC (rev 339)
@@ -27,6 +27,8 @@
#include <libspectrum.h>
#include "input.h"
+#include "machines/specplus3.h"
+#include "trdos.h"
@interface Emulator : NSObject
{
@@ -77,6 +79,15 @@
-(void) reset;
-(int) nmi;
+-(void) specplus3DiskInsert:(const char *)filename inDrive:(specplus3_drive_number)which;
+-(void) specplus3DiskEject:(specplus3_drive_number)drive saveFirst:(int)write;
+-(int) specplus3DiskPresent:(specplus3_drive_number)which;
+-(void) specplus3DiskWrite:(const char *)filename inDrive:(specplus3_drive_number)which;
+
+-(void) trdosDiskInsert:(const char *)filename inDrive:(trdos_drive_number)which;
+-(void) trdosDiskEject:(trdos_drive_number)drive saveFirst:(int)write;
+-(void) trdosDiskWrite:(const char *)filename inDrive:(trdos_drive_number)which;
+
-(void) snapshotWrite:(const char *)filename;
-(void) screenshotScrRead:(const char *)filename;
Modified: branches/fusegl/fuse/fusepb/models/Emulator.m
===================================================================
--- branches/fusegl/fuse/fusepb/models/Emulator.m 2007-04-06 01:54:59 UTC (rev 338)
+++ branches/fusegl/fuse/fusepb/models/Emulator.m 2007-04-06 07:21:52 UTC (rev 339)
@@ -248,6 +248,41 @@
return event_add( 0, EVENT_TYPE_NMI );
}
+-(void) specplus3DiskInsert:(const char *)filename inDrive:(specplus3_drive_number)which
+{
+ specplus3_disk_insert_default_autoload( which, filename );
+}
+
+-(void) specplus3DiskEject:(specplus3_drive_number)drive saveFirst:(int)write
+{
+ specplus3_disk_eject( drive, write );
+}
+
+-(int) specplus3DiskPresent:(specplus3_drive_number)which
+{
+ return specplus3_disk_present( which );
+}
+
+-(void) specplus3DiskWrite:(const char *)filename inDrive:(specplus3_drive_number)which
+{
+ specplus3_disk_write( which, filename );
+}
+
+-(void) trdosDiskInsert:(const char *)filename inDrive:(trdos_drive_number)which
+{
+ trdos_disk_insert_default_autoload( which, filename );
+}
+
+-(void) trdosDiskEject:(trdos_drive_number)drive saveFirst:(int)write
+{
+ trdos_disk_eject( drive, write );
+}
+
+-(void) trdosDiskWrite:(const char *)filename inDrive:(trdos_drive_number)which
+{
+ trdos_disk_write( which, filename );
+}
+
-(void) snapshotWrite:(const char *)filename
{
snapshot_write( filename );
Modified: branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h
===================================================================
--- branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h 2007-04-06 01:54:59 UTC (rev 338)
+++ branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h 2007-04-06 07:21:52 UTC (rev 339)
@@ -31,6 +31,8 @@
#include <libspectrum.h>
#include "input.h"
+#include "machines/specplus3.h"
+#include "trdos.h"
#include "ui/cocoa/cocoadisplay.h"
#include "ui/ui.h"
@@ -113,6 +115,15 @@
-(void) reset;
-(int) nmi;
+-(void) specplus3DiskInsert:(const char *)filename inDrive:(specplus3_drive_number)which;
+-(void) specplus3DiskEject:(specplus3_drive_number)drive saveFirst:(int)write;
+-(int) specplus3DiskPresent:(specplus3_drive_number)which;
+-(void) specplus3DiskWrite:(const char *)filename inDrive:(specplus3_drive_number)which;
+
+-(void) trdosDiskInsert:(const char *)filename inDrive:(trdos_drive_number)which;
+-(void) trdosDiskEject:(trdos_drive_number)drive saveFirst:(int)write;
+-(void) trdosDiskWrite:(const char *)filename inDrive:(trdos_drive_number)which;
+
-(void) snapshotWrite:(const char *)filename;
-(void) screenshotScrRead:(const char *)filename;
Modified: branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m
===================================================================
--- branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m 2007-04-06 01:54:59 UTC (rev 338)
+++ branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m 2007-04-06 07:21:52 UTC (rev 339)
@@ -629,6 +629,41 @@
return [proxy_emulator nmi];
}
+-(void) specplus3DiskInsert:(const char *)filename inDrive:(specplus3_drive_number)which
+{
+ [proxy_emulator specplus3DiskInsert:filename inDrive:which];
+}
+
+-(void) specplus3DiskEject:(specplus3_drive_number)drive saveFirst:(int)write
+{
+ [proxy_emulator specplus3DiskEject:drive saveFirst:write];
+}
+
+-(int) specplus3DiskPresent:(specplus3_drive_number)which
+{
+ return [proxy_emulator specplus3DiskPresent:which];
+}
+
+-(void) specplus3DiskWrite:(const char *)filename inDrive:(specplus3_drive_number)which
+{
+ [proxy_emulator specplus3DiskWrite:filename inDrive:which];
+}
+
+-(void) trdosDiskInsert:(const char *)filename inDrive:(trdos_drive_number)which
+{
+ [proxy_emulator trdosDiskInsert:filename inDrive:which];
+}
+
+-(void) trdosDiskEject:(trdos_drive_number)drive saveFirst:(int)write
+{
+ [proxy_emulator trdosDiskEject:drive saveFirst:write];
+}
+
+-(void) trdosDiskWrite:(const char *)filename inDrive:(trdos_drive_number)which
+{
+ [proxy_emulator trdosDiskWrite:filename inDrive:which];
+}
+
-(void) snapshotWrite:(const char *)filename
{
[proxy_emulator snapshotWrite:filename];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2007-04-06 01:54:58
|
Revision: 338
http://svn.sourceforge.net/fuse-for-macosx/?rev=338&view=rev
Author: fredm
Date: 2007-04-05 18:54:59 -0700 (Thu, 05 Apr 2007)
Log Message:
-----------
Move settings reset to Emulator object.
Modified Paths:
--------------
branches/fusegl/fuse/fusepb/controllers/FuseController.m
branches/fusegl/fuse/fusepb/models/Emulator.h
branches/fusegl/fuse/fusepb/models/Emulator.m
branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h
branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m
Modified: branches/fusegl/fuse/fusepb/controllers/FuseController.m
===================================================================
--- branches/fusegl/fuse/fusepb/controllers/FuseController.m 2007-04-06 01:42:18 UTC (rev 337)
+++ branches/fusegl/fuse/fusepb/controllers/FuseController.m 2007-04-06 01:54:59 UTC (rev 338)
@@ -698,7 +698,7 @@
- (IBAction)save_options:(id)sender
{
- [[DisplayOpenGLView instance] saveOptions];
+ [[DisplayOpenGLView instance] settingsSave];
}
- (IBAction)fullscreen:(id)sender
@@ -847,9 +847,7 @@
if( error != NSAlertAlternateReturn ) return;
- [NSUserDefaults resetStandardUserDefaults];
-
- error = settings_defaults( &settings_current );
+ error = [[DisplayOpenGLView instance] settingsResetDefaults];
if( error ) ui_error( UI_ERROR_ERROR, "Error resetting preferences" );
}
Modified: branches/fusegl/fuse/fusepb/models/Emulator.h
===================================================================
--- branches/fusegl/fuse/fusepb/models/Emulator.h 2007-04-06 01:42:18 UTC (rev 337)
+++ branches/fusegl/fuse/fusepb/models/Emulator.h 2007-04-06 01:54:59 UTC (rev 338)
@@ -86,7 +86,8 @@
-(void) profileStart;
-(void) profileFinish:(const char *)filename;
--(void) saveOptions;
+-(void) settingsSave;
+-(int) settingsResetDefaults;
-(void) fullscreen;
Modified: branches/fusegl/fuse/fusepb/models/Emulator.m
===================================================================
--- branches/fusegl/fuse/fusepb/models/Emulator.m 2007-04-06 01:42:18 UTC (rev 337)
+++ branches/fusegl/fuse/fusepb/models/Emulator.m 2007-04-06 01:54:59 UTC (rev 338)
@@ -278,11 +278,17 @@
profile_finish( filename );
}
--(void) saveOptions
+-(void) settingsSave
{
settings_write_config( &settings_current );
}
+-(int) settingsResetDefaults
+{
+ [NSUserDefaults resetStandardUserDefaults];
+ return settings_defaults( &settings_current );
+}
+
-(void) fullscreen
{
settings_current.full_screen = 1;
Modified: branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h
===================================================================
--- branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h 2007-04-06 01:42:18 UTC (rev 337)
+++ branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h 2007-04-06 01:54:59 UTC (rev 338)
@@ -122,7 +122,8 @@
-(void) profileStart;
-(void) profileFinish:(const char *)filename;
--(void) saveOptions;
+-(void) settingsSave;
+-(int) settingsResetDefaults;
-(void) fullscreen;
Modified: branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m
===================================================================
--- branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m 2007-04-06 01:42:18 UTC (rev 337)
+++ branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m 2007-04-06 01:54:59 UTC (rev 338)
@@ -659,11 +659,16 @@
[proxy_emulator profileFinish:filename];
}
--(void) saveOptions
+-(void) settingsSave
{
- [proxy_emulator saveOptions];
+ [proxy_emulator settingsSave];
}
+-(int) settingsResetDefaults
+{
+ return [proxy_emulator settingsResetDefaults];
+}
+
-(void) fullscreen
{
[proxy_emulator fullscreen];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|