[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx: [366] branches/Release-0_8_0
Brought to you by:
fredm
Menu
▾
▴
[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx: [366] branches/Release-0_8_0
|
From: <fr...@us...> - 2007-05-12 01:09:14
|
Revision: 366
http://svn.sourceforge.net/fuse-for-macosx/?rev=366&view=rev
Author: fredm
Date: 2007-05-11 18:09:14 -0700 (Fri, 11 May 2007)
Log Message:
-----------
Merge up to vendor fuse-0.8.0.1 and libspectrum-0.3.0.1 releases.
Modified Paths:
--------------
branches/Release-0_8_0/fuse/ChangeLog
branches/Release-0_8_0/fuse/README
branches/Release-0_8_0/fuse/acinclude.m4
branches/Release-0_8_0/fuse/configure.in
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/resources/Fuse Help/html/changelog.html
branches/Release-0_8_0/fuse/hacking/ChangeLog
branches/Release-0_8_0/fuse/hacking/cvs-tags
branches/Release-0_8_0/fuse/hacking/ui.txt
branches/Release-0_8_0/fuse/lib/Makefile.am
branches/Release-0_8_0/fuse/machines/pentagon.c
branches/Release-0_8_0/fuse/machines/scorpion.c
branches/Release-0_8_0/fuse/machines/spec128.c
branches/Release-0_8_0/fuse/machines/spec16.c
branches/Release-0_8_0/fuse/machines/spec48.c
branches/Release-0_8_0/fuse/man/fuse.1
branches/Release-0_8_0/fuse/periph.c
branches/Release-0_8_0/fuse/screenshot.c
branches/Release-0_8_0/fuse/snapshot.c
branches/Release-0_8_0/fuse/spectrum.c
branches/Release-0_8_0/fuse/spectrum.h
branches/Release-0_8_0/fuse/ui/fb/fbdisplay.c
branches/Release-0_8_0/fuse/ui/ggi/ggidisplay.c
branches/Release-0_8_0/fuse/ui/gtk/gtkdisplay.c
branches/Release-0_8_0/fuse/ui/scaler/scaler.c
branches/Release-0_8_0/fuse/ui/scaler/scalers.cpp
branches/Release-0_8_0/fuse/ui/sdl/sdldisplay.c
branches/Release-0_8_0/fuse/ui/svga/svgadisplay.c
branches/Release-0_8_0/fuse/ui/uidisplay.h
branches/Release-0_8_0/fuse/ui/win32/win32display.c
branches/Release-0_8_0/fuse/ui/xlib/xdisplay.c
branches/Release-0_8_0/fuse/uidisplay.c
branches/Release-0_8_0/fuse/ula.c
branches/Release-0_8_0/fuse/ula.h
branches/Release-0_8_0/fuse/widget/Makefile.am
branches/Release-0_8_0/fuse/widget/menu.c
branches/Release-0_8_0/fuse/widget/pokefinder.c
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/acinclude.m4
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/doc/libspectrum.txt
branches/Release-0_8_0/libspectrum/libspectrum/hacking/ChangeLog
branches/Release-0_8_0/libspectrum/libspectrum/libspectrum.h.in
branches/Release-0_8_0/libspectrum/libspectrum/tap.c
branches/Release-0_8_0/libspectrum/libspectrum/tzx_read.c
branches/Release-0_8_0/libspectrum/libspectrum.h
branches/Release-0_8_0/libspectrum/libspectrum.xcodeproj/project.pbxproj
Added Paths:
-----------
branches/Release-0_8_0/libspectrum/libspectrum/hacking/.cvsignore
branches/Release-0_8_0/libspectrum/libspectrum/hacking/Makefile.am
Modified: branches/Release-0_8_0/fuse/ChangeLog
===================================================================
--- branches/Release-0_8_0/fuse/ChangeLog 2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/ChangeLog 2007-05-12 01:09:14 UTC (rev 366)
@@ -1,3 +1,22 @@
+2007-05-11 Philip Kendall <phi...@sh...>
+
+ * Fuse 0.8.0.1 released (bug fix release)
+
+ * Fix IN timings and floating bus behaviour: fixes Sidewize (thanks,
+ Pegaz and Mark Woodmass) (Philip Kendall).
+ * Fix widget UI pokefinder and keyboard help picture
+ (thanks, Alberto Garcia) (Philip Kendall and Fredrick Meunier).
+ * Fix crash if fullscreen mode attempted a resolution higher than
+ the native graphics mode could handle (thanks, Alberto Garcia)
+ (Fredrick Meunier).
+ * Ensure ABS, MIN and PATH_MAX are available where needed (Fredrick
+ Meunier).
+ * Distribute autoload snapshots (thanks, Stuart Brady and Arda
+ Erdikmen) (Fredrick Meunier).
+ * Remove flicker when playing back RZX files with embedded
+ snapshots (thanks, Julian Wiseman) (Fredrick Meunier).
+ * Remove warnings when building from CVS (Stuart Brady).
+
2007-04-11 Philip Kendall <phi...@sh...>
* Fuse 0.8.0 released
@@ -788,4 +807,4 @@
* Version 0.1.0 released.
-$Id: ChangeLog,v 1.46.2.1 2007/04/09 16:59:02 pak21 Exp $
+$Id: ChangeLog,v 1.46.2.2 2007/05/10 07:32:38 pak21 Exp $
Modified: branches/Release-0_8_0/fuse/README
===================================================================
--- branches/Release-0_8_0/fuse/README 2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/README 2007-05-12 01:09:14 UTC (rev 366)
@@ -1,5 +1,5 @@
-The Free Unix Spectrum Emulator (Fuse) 0.8.0
-============================================
+The Free Unix Spectrum Emulator (Fuse) 0.8.0.1
+==============================================
Fuse (the Free Unix Spectrum Emulator) was originally, and somewhat
unsurprisingly, an emulator of the ZX Spectrum (a popular 1980s home
@@ -139,6 +139,6 @@
( http://www.worldofspectrum.org/faq/index.html ) first!
Philip Kendall <phi...@sh...>
-11 April 2007
+11 May 2007
-$Id: README,v 1.40.2.2 2007/04/11 08:44:19 pak21 Exp $
+$Id: README,v 1.40.2.3 2007/05/10 07:32:38 pak21 Exp $
Modified: branches/Release-0_8_0/fuse/acinclude.m4
===================================================================
--- branches/Release-0_8_0/fuse/acinclude.m4 2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/acinclude.m4 2007-05-12 01:09:14 UTC (rev 366)
@@ -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
@@ -420,7 +420,7 @@
dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
dnl
-AC_DEFUN(AM_PATH_GTK,
+AC_DEFUN([AM_PATH_GTK],
[dnl
dnl Get the cflags and libraries from the gtk-config script
dnl
Modified: branches/Release-0_8_0/fuse/configure.in
===================================================================
--- branches/Release-0_8_0/fuse/configure.in 2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/configure.in 2007-05-12 01:09:14 UTC (rev 366)
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-dnl $Id: configure.in,v 1.155.2.2 2007/04/09 16:59:02 pak21 Exp $
+dnl $Id: configure.in,v 1.155.2.3 2007/05/10 07:32:38 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.8.0)
+AM_INIT_AUTOMAKE(fuse, 0.8.0.1)
dnl Checks for programs.
AC_PROG_CC
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-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/fusepb/Info-Fuse.plist 2007-05-12 01:09:14 UTC (rev 366)
@@ -365,7 +365,7 @@
<key>CFBundleSignature</key>
<string>FUSE</string>
<key>CFBundleVersion</key>
- <string>0.8.0</string>
+ <string>0.8.0.1</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-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/fusepb/config.h 2007-05-12 01:09:14 UTC (rev 366)
@@ -169,7 +169,7 @@
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION "0.8.0"
+#define VERSION "0.8.0.1"
/* 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/resources/Fuse Help/html/changelog.html
===================================================================
--- branches/Release-0_8_0/fuse/fusepb/resources/Fuse Help/html/changelog.html 2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/fusepb/resources/Fuse Help/html/changelog.html 2007-05-12 01:09:14 UTC (rev 366)
@@ -14,7 +14,37 @@
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</font></h2>
+For Mac OS X 0.8.0.1</font></h2>
+<ul>
+ <li><font face="Lucida Grande,Helvetica,Arial">Emulation core
+improvements:</font></li>
+ <li
+ style="list-style-type: none; list-style-image: none; list-style-position: outside;">
+ <ul>
+ <li><font face="Lucida Grande,Helvetica,Arial">Fix IN timings and
+floating bus behaviour: fixes Sidewize (thanks, Pegaz and Mark
+Woodmass) (Philip Kendall).</font></li>
+ </ul>
+ </li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Miscellaneous </font><font
+ face="Lucida Grande,Helvetica,Arial">bugfixes</font><font
+ face="Lucida Grande,Helvetica,Arial">:</font></li>
+ <li
+ style="list-style-type: none; list-style-image: none; list-style-position: outside;">
+ <ul>
+ <li><font face="Lucida Grande,Helvetica,Arial">Fix crash if
+fullscreen mode attempted a resolution higher than the native graphics
+mode could handle (thanks, Alberto Garcia) (Fredrick Meunier).</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Remove flicker
+when playing back RZX files with embedded snapshots (thanks, Julian
+Wiseman) (Fredrick Meunier).</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Avoid crash when
+reading an invalid TZX file (thanks, crabfists) (Philip Kendall).</font></li>
+ </ul>
+ </li>
+</ul>
+<h2><font><font face="Lucida Grande,Helvetica,Arial">What's new in Fuse
+For Mac OS X 0.8.0</font></font></h2>
</div>
<ul>
<li><font face="Lucida Grande,Helvetica,Arial">New
Modified: branches/Release-0_8_0/fuse/hacking/ChangeLog
===================================================================
--- branches/Release-0_8_0/fuse/hacking/ChangeLog 2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/hacking/ChangeLog 2007-05-12 01:09:14 UTC (rev 366)
@@ -1582,4 +1582,37 @@
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).
+20070416 widget/Makefile.am: distribute fuse.font.sbf and mkfusefont.pl
+ (Release-0_8_0-branch) (Fred).
+20070424 TAG: Release-0_8_0 (Release-0_8_0-branch).
+20070425 uidisplay.c,widget/menu.c: initialise border in help screen and
+ center keyboard picture on help screen (thanks, Alberto Garcia)
+ (Release-0_8_0-branch).
+20070425 widget/pokefinder.c: fix up for non-proportional display
+ (thanks, Alberto Garcia) (Release-0_8_0-branch).
+20070428 hacking/ui.txt,ui/{uidisplay.h,fb/fbdisplay.c,ggi/ggidisplay.c,
+ gtk/gtkdisplay.c,scaler/scaler.c,sdl/sdldisplay.c,
+ svga/svgadisplay.c,win32/win32display.c,xlib/xdisplay.c}:
+ check that we don't exceed maximum fullscreen dimensions with
+ SDL UI and attempt a more graceful failure if things go wrong
+ (fixes bug #1708636; thanks Alberto Garcia) (Release-0_8_0-branch)
+ (Fred).
+20070501 screenshot.c: include limits.h for PATH_MAX (Release-0_8_0-branch)
+ (Fred).
+20070501 ui/scaler/scalers.c: make sure MIN and ABS are defined
+ (Release-0_8_0-branch) (Fred).
+20070503 periph.c,spectrum.[ch],ula.[ch],machines/{pentagon.c,scorpion.c,
+ spec128.c,spec16.c,spec48.c}: fix IN timings and consequent fixes
+ to floating bus behaviour (fixes bug #1708597) (thanks, Pegaz and
+ Mark Woodmass) (Release-0_8_0-branch).
+20070507 lib/Makefile.am: distribute autoload snapshots
+ (thanks Stuart Brady and Arda Erdikmen) (Release-0_8_0-branch)
+ (Fred).
+20070509 snapshot.c: call machine_select() only if the machine has changed
+ (fixes bug #1701246) (thanks, Julian Wiseman) (Release-0_8_0-branch)
+ (Fred).
+20070509 acinclude.m4: remove warnings about underquoted definitions
+ (Release-0_8_0-branch) (Stuart Brady).
+20070510 ChangeLog,README,configure.in,man/fuse.1: doc updates for 0.8.0.1
+ release (Release-0_8_0-branch).
+20070511 TAG: Release-0_8_0_1 (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-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/hacking/cvs-tags 2007-05-12 01:09:14 UTC (rev 366)
@@ -1,6 +1,6 @@
CVS tags for Fuse
-$Id: cvs-tags,v 1.32.2.2 2007/04/11 09:41:31 pak21 Exp $
+$Id: cvs-tags,v 1.32.2.3 2007/05/11 07:27:47 pak21 Exp $
| Release-0_3_1
| Release-0_3_2pre1
@@ -147,6 +147,7 @@
| | Release-0_8_0-pre1
| | Release-0_8_0-pre2
| | Release-0_8_0
+| | Release-0_8_0_1
| |
| | Release-0_8_0-branch
|
Modified: branches/Release-0_8_0/fuse/hacking/ui.txt
===================================================================
--- branches/Release-0_8_0/fuse/hacking/ui.txt 2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/hacking/ui.txt 2007-05-12 01:09:14 UTC (rev 366)
@@ -1,7 +1,7 @@
Some brief instructions on adding another user interface to Fuse
================================================================
-Version: $Id: ui.txt,v 1.9 2003/03/13 14:55:28 pak21 Exp $
+Version: $Id: ui.txt,v 1.9.14.1 2007/04/28 00:23:09 fredm Exp $
In order to add a new user interface (UI) to Fuse, you need to
implement:
@@ -71,7 +71,7 @@
This is called at the end of every spectrum frame, giving the ui a
chance to flush all the drawing done over the course of the frame.
-* void uidisplay_hotswap_gfx_mode( void )
+* int uidisplay_hotswap_gfx_mode( void )
This is called when the user has changed the scaler in use by the
emulator. The ui should change the window to a multiple of the
Modified: branches/Release-0_8_0/fuse/lib/Makefile.am
===================================================================
--- branches/Release-0_8_0/fuse/lib/Makefile.am 2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/lib/Makefile.am 2007-05-12 01:09:14 UTC (rev 366)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 1999-2004 Philip Kendall
-## $Id: Makefile.am,v 1.15 2007/02/02 16:21:53 pak21 Exp $
+## $Id: Makefile.am,v 1.15.2.1 2007/05/07 12:54:24 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
@@ -26,9 +26,8 @@
FILES = cassette.bmp \
keyboard.scr \
microdrive.bmp \
- plus3disk.bmp
-
-noinst_FILES = @AUTOLOAD_SNAPS@/disk_plus3.szx \
+ plus3disk.bmp \
+ @AUTOLOAD_SNAPS@/disk_plus3.szx \
@AUTOLOAD_SNAPS@/tape_128.szx \
@AUTOLOAD_SNAPS@/tape_16.szx \
@AUTOLOAD_SNAPS@/tape_2048.szx \
Modified: branches/Release-0_8_0/fuse/machines/pentagon.c
===================================================================
--- branches/Release-0_8_0/fuse/machines/pentagon.c 2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/machines/pentagon.c 2007-05-12 01:09:14 UTC (rev 366)
@@ -1,7 +1,7 @@
/* pentagon.c: Pentagon 128K specific routines
- Copyright (c) 1999-2004 Philip Kendall and Fredrick Meunier
+ Copyright (c) 1999-2007 Philip Kendall and Fredrick Meunier
- $Id: pentagon.c,v 1.31 2007/02/02 16:21:54 pak21 Exp $
+ $Id: pentagon.c,v 1.31.2.1 2007/05/03 07:31:42 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
@@ -84,7 +84,7 @@
static libspectrum_byte
pentagon_unattached_port( void )
{
- return spectrum_unattached_port( 3 );
+ return spectrum_unattached_port();
}
int
Modified: branches/Release-0_8_0/fuse/machines/scorpion.c
===================================================================
--- branches/Release-0_8_0/fuse/machines/scorpion.c 2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/machines/scorpion.c 2007-05-12 01:09:14 UTC (rev 366)
@@ -1,8 +1,7 @@
/* scorpion.c: Scorpion 256K specific routines
- Copyright (c) 1999-2004 Philip Kendall and Fredrick Meunier
- Copyright (c) 2004 Stuart Brady
+ Copyright (c) 1999-2007 Philip Kendall, Fredrick Meunier and Stuart Brady
- $Id: scorpion.c,v 1.24 2007/02/02 16:21:54 pak21 Exp $
+ $Id: scorpion.c,v 1.24.2.1 2007/05/03 07:31:42 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
@@ -94,7 +93,7 @@
static libspectrum_byte
scorpion_unattached_port( void )
{
- return spectrum_unattached_port( 3 );
+ return spectrum_unattached_port();
}
static libspectrum_byte
Modified: branches/Release-0_8_0/fuse/machines/spec128.c
===================================================================
--- branches/Release-0_8_0/fuse/machines/spec128.c 2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/machines/spec128.c 2007-05-12 01:09:14 UTC (rev 366)
@@ -1,7 +1,7 @@
/* spec128.c: Spectrum 128K specific routines
- Copyright (c) 1999-2004 Philip Kendall
+ Copyright (c) 1999-2007 Philip Kendall
- $Id: spec128.c,v 1.77 2007/02/02 16:21:54 pak21 Exp $
+ $Id: spec128.c,v 1.77.2.1 2007/05/03 07:31:42 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
@@ -61,7 +61,7 @@
libspectrum_byte
spec128_unattached_port( void )
{
- return spectrum_unattached_port( 3 );
+ return spectrum_unattached_port();
}
libspectrum_byte
Modified: branches/Release-0_8_0/fuse/machines/spec16.c
===================================================================
--- branches/Release-0_8_0/fuse/machines/spec16.c 2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/machines/spec16.c 2007-05-12 01:09:14 UTC (rev 366)
@@ -1,7 +1,7 @@
/* spec16.c: Spectrum 16K specific routines
- Copyright (c) 1999-2005 Philip Kendall
+ Copyright (c) 1999-2007 Philip Kendall
- $Id: spec16.c,v 1.32 2007/02/02 16:21:54 pak21 Exp $
+ $Id: spec16.c,v 1.32.2.1 2007/05/03 07:31:42 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
@@ -61,7 +61,7 @@
static libspectrum_byte
spec16_unattached_port( void )
{
- return spectrum_unattached_port( 1 );
+ return spectrum_unattached_port();
}
int spec16_init( fuse_machine_info *machine )
Modified: branches/Release-0_8_0/fuse/machines/spec48.c
===================================================================
--- branches/Release-0_8_0/fuse/machines/spec48.c 2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/machines/spec48.c 2007-05-12 01:09:14 UTC (rev 366)
@@ -1,7 +1,7 @@
/* spec48.c: Spectrum 48K specific routines
- Copyright (c) 1999-2004 Philip Kendall
+ Copyright (c) 1999-2007 Philip Kendall
- $Id: spec48.c,v 1.72 2007/02/02 16:21:54 pak21 Exp $
+ $Id: spec48.c,v 1.72.2.1 2007/05/03 07:31:42 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
@@ -57,7 +57,7 @@
static libspectrum_byte
spec48_unattached_port( void )
{
- return spectrum_unattached_port( 1 );
+ return spectrum_unattached_port();
}
int
Modified: branches/Release-0_8_0/fuse/man/fuse.1
===================================================================
--- branches/Release-0_8_0/fuse/man/fuse.1 2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/man/fuse.1 2007-05-12 01:09:14 UTC (rev 366)
@@ -23,7 +23,7 @@
.\" E-mail: phi...@sh...
.\"
.\"
-.TH fuse 1 "11th April, 2007" "Version 0.8.0" "Emulators"
+.TH fuse 1 "11th May, 2007" "Version 0.8.0.1" "Emulators"
.\"
.\"------------------------------------------------------------------
.\"
Modified: branches/Release-0_8_0/fuse/periph.c
===================================================================
--- branches/Release-0_8_0/fuse/periph.c 2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/periph.c 2007-05-12 01:09:14 UTC (rev 366)
@@ -1,7 +1,7 @@
/* periph.c: code for handling peripherals
Copyright (c) 2005-2007 Philip Kendall
- $Id: periph.c,v 1.20.2.1 2007/03/21 16:21:54 pak21 Exp $
+ $Id: periph.c,v 1.20.2.2 2007/05/03 07:31:42 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
@@ -168,9 +168,10 @@
{
libspectrum_byte b;
- ula_contend_port_preio( port );
+ ula_contend_port_early( port );
+ ula_contend_port_late( port );
b = readport_internal( port );
- ula_contend_port_postio( port );
+ tstates++;
return b;
}
@@ -240,9 +241,9 @@
void
writeport( libspectrum_word port, libspectrum_byte b )
{
- ula_contend_port_preio( port );
+ ula_contend_port_early( port );
writeport_internal( port, b );
- ula_contend_port_postio( port );
+ ula_contend_port_late( port ); tstates++;
}
void
Modified: branches/Release-0_8_0/fuse/screenshot.c
===================================================================
--- branches/Release-0_8_0/fuse/screenshot.c 2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/screenshot.c 2007-05-12 01:09:14 UTC (rev 366)
@@ -1,7 +1,7 @@
/* screenshot.c: Routines for handling .png and .scr screenshots
Copyright (c) 2002-2003 Philip Kendall, Fredrick Meunier
- $Id: screenshot.c,v 1.33 2007/02/02 16:21:52 pak21 Exp $
+ $Id: screenshot.c,v 1.33.2.1 2007/05/01 13:23:51 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
@@ -26,6 +26,7 @@
#include <config.h>
#include <errno.h>
+#include <limits.h>
#include <string.h>
#include <libspectrum.h>
Modified: branches/Release-0_8_0/fuse/snapshot.c
===================================================================
--- branches/Release-0_8_0/fuse/snapshot.c 2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/snapshot.c 2007-05-12 01:09:14 UTC (rev 366)
@@ -1,7 +1,7 @@
/* snapshot.c: snapshot handling routines
Copyright (c) 1999-2004 Philip Kendall
- $Id: snapshot.c,v 1.105 2007/02/02 16:21:52 pak21 Exp $
+ $Id: snapshot.c,v 1.105.2.1 2007/05/09 19:31:02 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
@@ -136,9 +136,13 @@
machine = libspectrum_snap_machine( snap );
- error = machine_select( machine );
- if( error ) {
- error = try_fallback_machine( machine ); if( error ) return error;
+ if( machine != machine_current->machine ) {
+ error = machine_select( machine );
+ if( error ) {
+ error = try_fallback_machine( machine ); if( error ) return error;
+ }
+ } else {
+ machine_reset();
}
capabilities = machine_current->capabilities;
Modified: branches/Release-0_8_0/fuse/spectrum.c
===================================================================
--- branches/Release-0_8_0/fuse/spectrum.c 2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/spectrum.c 2007-05-12 01:09:14 UTC (rev 366)
@@ -1,7 +1,7 @@
/* spectrum.c: Generic Spectrum routines
Copyright (c) 1999-2004 Philip Kendall, Darren Salt
- $Id: spectrum.c,v 1.67 2007/02/02 16:21:52 pak21 Exp $
+ $Id: spectrum.c,v 1.67.2.1 2007/05/03 07:31:42 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
@@ -97,7 +97,7 @@
/* What happens if we read from an unattached port? */
libspectrum_byte
-spectrum_unattached_port( int offset )
+spectrum_unattached_port( void )
{
int line, tstates_through_line, column;
@@ -110,24 +110,26 @@
machine_current->line_times[ DISPLAY_BORDER_HEIGHT ] ) /
machine_current->timings.tstates_per_line;
- /* Idle bus if we're in the lower or upper borders */
+ /* Idle bus if we're in the lower border */
if( line >= DISPLAY_HEIGHT ) return 0xff;
- /* Work out where we are in this line */
+ /* Work out where we are in this line, remembering that line_times[] holds
+ the first pixel we display, not the start of where the Spectrum produced
+ the left border */
tstates_through_line = tstates -
- machine_current->line_times[ DISPLAY_BORDER_HEIGHT + line ];
+ machine_current->line_times[ DISPLAY_BORDER_HEIGHT + line ] +
+ ( machine_current->timings.left_border - DISPLAY_BORDER_WIDTH_COLS * 4 );
/* Idle bus if we're in the left border */
- if( tstates_through_line < machine_current->timings.left_border - offset )
+ if( tstates_through_line < machine_current->timings.left_border )
return 0xff;
/* Or the right border or retrace */
if( tstates_through_line >= machine_current->timings.left_border +
- machine_current->timings.horizontal_screen -
- offset )
+ machine_current->timings.horizontal_screen )
return 0xff;
- column = ( ( tstates_through_line + 1 -
+ column = ( ( tstates_through_line -
machine_current->timings.left_border ) / 8 ) * 2;
switch( tstates_through_line % 8 ) {
@@ -137,24 +139,24 @@
http://www.ramsoft.bbk.org/floatingbus.html
However, the timings used are based on the first byte being
- returned at 14335 (48K) and 14361 (128K) respectively, not
+ returned at 14338 (48K) and 14364 (128K) respectively, not
14347 and 14368 as used by Ramsoft.
In contrast to previous versions of this code, Arkanoid and
Sidewize now work. */
/* Attribute bytes */
- case 3: column++;
- case 1:
+ case 5: column++;
+ case 3:
return RAM[ memory_current_screen ][ display_attr_start[line] + column ];
/* Screen data */
- case 2: column++;
- case 0:
+ case 4: column++;
+ case 2:
return RAM[ memory_current_screen ][ display_line_start[line] + column ];
/* Idle bus */
- case 4: case 5: case 6: case 7:
+ case 0: case 1: case 6: case 7:
return 0xff;
}
Modified: branches/Release-0_8_0/fuse/spectrum.h
===================================================================
--- branches/Release-0_8_0/fuse/spectrum.h 2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/spectrum.h 2007-05-12 01:09:14 UTC (rev 366)
@@ -1,7 +1,7 @@
/* spectrum.h: Spectrum 48K specific routines
Copyright (c) 1999-2004 Philip Kendall, Darren Salt
- $Id: spectrum.h,v 1.45 2007/02/02 16:21:52 pak21 Exp $
+ $Id: spectrum.h,v 1.45.2.1 2007/05/03 07:31:42 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
@@ -66,7 +66,7 @@
} spectrum_raminfo;
-libspectrum_byte spectrum_unattached_port( int offset );
+libspectrum_byte spectrum_unattached_port( void );
/* Miscellaneous stuff */
Modified: branches/Release-0_8_0/fuse/ui/fb/fbdisplay.c
===================================================================
--- branches/Release-0_8_0/fuse/ui/fb/fbdisplay.c 2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/ui/fb/fbdisplay.c 2007-05-12 01:09:14 UTC (rev 366)
@@ -2,7 +2,7 @@
Copyright (c) 2000-2003 Philip Kendall, Matan Ziv-Av, Darren Salt,
Witold Filipczyk
- $Id: fbdisplay.c,v 1.40 2007/02/02 16:21:56 pak21 Exp $
+ $Id: fbdisplay.c,v 1.40.2.1 2007/04/28 00:23: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
@@ -293,10 +293,10 @@
return 1;
}
-void
+int
uidisplay_hotswap_gfx_mode( void )
{
- return;
+ return 0;
}
void
Modified: branches/Release-0_8_0/fuse/ui/ggi/ggidisplay.c
===================================================================
--- branches/Release-0_8_0/fuse/ui/ggi/ggidisplay.c 2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/ui/ggi/ggidisplay.c 2007-05-12 01:09:14 UTC (rev 366)
@@ -1,7 +1,7 @@
/* ggiui.c: Routines for dealing with the GGI user interface
Copyright (c) 2003 Catalin Mihaila, Philip Kendall
- $Id: ggidisplay.c,v 1.6 2007/02/02 16:21:56 pak21 Exp $
+ $Id: ggidisplay.c,v 1.6.2.1 2007/04/28 00:23: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
@@ -160,10 +160,10 @@
}
-void
+int
uidisplay_hotswap_gfx_mode( void )
{
- return;
+ return 0;
}
/* Set one pixel in the display */
Modified: branches/Release-0_8_0/fuse/ui/gtk/gtkdisplay.c
===================================================================
--- branches/Release-0_8_0/fuse/ui/gtk/gtkdisplay.c 2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/ui/gtk/gtkdisplay.c 2007-05-12 01:09:14 UTC (rev 366)
@@ -1,7 +1,7 @@
/* gtkdisplay.c: GTK+ routines for dealing with the Speccy screen
Copyright (c) 2000-2005 Philip Kendall
- $Id: gtkdisplay.c,v 1.59 2007/02/02 16:21:59 pak21 Exp $
+ $Id: gtkdisplay.c,v 1.59.2.1 2007/04/28 00:23: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
@@ -332,7 +332,7 @@
scaled_pitch );
}
-void
+int
uidisplay_hotswap_gfx_mode( void )
{
fuse_emulation_pause();
@@ -341,6 +341,8 @@
display_refresh_all();
fuse_emulation_unpause();
+
+ return 0;
}
int
Modified: branches/Release-0_8_0/fuse/ui/scaler/scaler.c
===================================================================
--- branches/Release-0_8_0/fuse/ui/scaler/scaler.c 2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/ui/scaler/scaler.c 2007-05-12 01:09:14 UTC (rev 366)
@@ -1,7 +1,7 @@
/* scaler.c: code for selecting (etc) scalers
* Copyright (C) 2003 Fredrick Meunier, Philip Kendall
*
- * $Id: scaler.c,v 1.2 2005/04/18 02:55:20 fred Exp $
+ * $Id: scaler.c,v 1.28.2.1 2007/04/28 00:23:08 fredm Exp $
*
* Originally taken from ScummVM - Scumm Interpreter
* Copyright (C) 2001 Ludvig Strigeus
@@ -141,9 +141,7 @@
scaler_flags = scaler_get_flags( current_scaler );
scaler_expander = scaler_get_expander( current_scaler );
- uidisplay_hotswap_gfx_mode();
-
- return 0;
+ return uidisplay_hotswap_gfx_mode();
}
int
Modified: branches/Release-0_8_0/fuse/ui/scaler/scalers.cpp
===================================================================
--- branches/Release-0_8_0/fuse/ui/scaler/scalers.cpp 2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/ui/scaler/scalers.cpp 2007-05-12 01:09:14 UTC (rev 366)
@@ -1,7 +1,7 @@
/* scalers.cpp: the actual graphics scalers
* Copyright (C) 2003 Fredrick Meunier, Philip Kendall
*
- * $Id$
+ * $Id: scalers.c,v 1.37.2.1 2007/05/01 13:26:26 fredm Exp $
*
* Originally taken from ScummVM - Scumm Interpreter
* Copyright (C) 2001 Ludvig Strigeus
@@ -36,6 +36,14 @@
#include "ui/ui.h"
#include "ui/uidisplay.h"
+#ifndef MIN
+#define MIN(a,b) (((a) < (b)) ? (a) : (b))
+#endif
+
+#ifndef ABS
+#define ABS(x) ((x)>=0?(x):-(x))
+#endif
+
/* The actual code for the scalers starts here */
#if SCALER_DATA_SIZE == 2
@@ -1039,16 +1047,6 @@
B = Y + 1.772 (U-128)
*/
-#ifndef ABS
-#define ABS(x) ((x)>=0?(x):-(x))
-#endif /* ABS */
-#ifndef MIN
-#define MIN(a,b) (((a)<(b))?(a):(b))
-#endif /* MIN */
-#ifndef MAX
-#define MAX(a,b) (((a)>(b))?(a):(b))
-#endif /* MAX */
-
#define YUV_TO_R(y, u, v) ( MIN( ABS( ( 8192L * y + 11485L * v + 16384 ) >> 15 ), 255 ) )
#define YUV_TO_G(y, u, v) ( MIN( ABS( ( 8192L * y - 2819L * u - 5850L * v + 16384 ) >> 15 ), 255 ) )
#define YUV_TO_B(y, u, v) ( MIN( ABS( ( 8192L * y + 14516L * u + 16384 ) >> 15 ), 255 ) )
Modified: branches/Release-0_8_0/fuse/ui/sdl/sdldisplay.c
===================================================================
--- branches/Release-0_8_0/fuse/ui/sdl/sdldisplay.c 2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/ui/sdl/sdldisplay.c 2007-05-12 01:09:14 UTC (rev 366)
@@ -1,7 +1,7 @@
/* sdldisplay.c: Routines for dealing with the SDL display
Copyright (c) 2000-2006 Philip Kendall, Matan Ziv-Av, Fredrick Meunier
- $Id: sdldisplay.c,v 1.43 2007/02/02 16:21:59 pak21 Exp $
+ $Id: sdldisplay.c,v 1.43.2.1 2007/04/28 00:23: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
@@ -89,7 +89,7 @@
static int num_rects = 0;
static libspectrum_byte sdldisplay_force_full_refresh = 1;
-static int min_fullscreen_width;
+static int max_fullscreen_height;
static int min_fullscreen_height;
/* The current size of the display (in units of DISPLAY_SCREEN_*) */
@@ -227,12 +227,14 @@
at all */
if( modes == (SDL_Rect **) 0 || modes == (SDL_Rect **) -1 ){
/* Just try whatever we have and see what happens */
- min_fullscreen_width = 320;
+ max_fullscreen_height = 480;
min_fullscreen_height = 240;
} else {
+ /* Record the largest supported fullscreen software mode */
+ max_fullscreen_height = modes[0]->h;
+
/* Record the smallest supported fullscreen software mode */
for( i=0; modes[i]; ++i ) {
- min_fullscreen_width = modes[i]->w;
min_fullscreen_height = modes[i]->h;
}
}
@@ -247,7 +249,7 @@
if ( scaler_select_scaler( current_scaler ) )
scaler_select_scaler( SCALER_NORMAL );
- sdldisplay_load_gfx_mode();
+ if( sdldisplay_load_gfx_mode() ) return 1;
SDL_WM_SetCaption( "Fuse", "Fuse" );
@@ -295,15 +297,17 @@
if( settings_current.full_screen ) {
int i = 0;
while( i < SCALER_NUM &&
- image_height * sdldisplay_current_size <= min_fullscreen_height/2 ) {
+ ( image_height*sdldisplay_current_size <= min_fullscreen_height/2 ||
+ image_height*sdldisplay_current_size > max_fullscreen_height ) ) {
if( windowed_scaler == -1) windowed_scaler = current_scaler;
while( !scaler_is_supported(i) ) i++;
scaler_select_scaler( i++ );
sdldisplay_current_size = scaler_get_scaling_factor( current_scaler );
- /* if we failed to find a suitable size scaler, just use what the user had
- originally */
- if( image_height * sdldisplay_current_size <= min_fullscreen_height/2 ) {
- scaler_select_scaler( windowed_scaler );
+ /* if we failed to find a suitable size scaler, just use normal (what the
+ user had originally may be too big) */
+ if( image_height * sdldisplay_current_size <= min_fullscreen_height/2 ||
+ image_height * sdldisplay_current_size > max_fullscreen_height ) {
+ scaler_select_scaler( SCALER_NORMAL );
sdldisplay_current_size = scaler_get_scaling_factor( current_scaler );
}
}
@@ -339,8 +343,8 @@
: SDL_SWSURFACE
);
if( !sdldisplay_gc ) {
- fprintf( stderr, "%s: couldn't create gc\n", fuse_progname );
- return 1;
+ fprintf( stderr, "%s: couldn't create SDL graphics context\n", fuse_progname );
+ fuse_abort();
}
sdldisplay_is_full_screen =
@@ -367,7 +371,7 @@
if( !tmp_screen ) {
fprintf( stderr, "%s: couldn't create tmp_screen\n", fuse_progname );
- return 1;
+ fuse_abort();
}
sdldisplay_allocate_colours( 16, colour_values, bw_values );
@@ -378,7 +382,7 @@
return 0;
}
-void
+int
uidisplay_hotswap_gfx_mode( void )
{
fuse_emulation_pause();
@@ -390,7 +394,7 @@
}
/* Setup the new GFX mode */
- sdldisplay_load_gfx_mode();
+ if( sdldisplay_load_gfx_mode() ) return 1;
/* reset palette */
SDL_SetColors( sdldisplay_gc, colour_palette, 0, 16 );
@@ -405,6 +409,8 @@
}
fuse_emulation_unpause();
+
+ return 0;
}
static void
@@ -666,8 +672,10 @@
/* We check for a switch to fullscreen here to give systems with a
windowed-only UI a chance to free menu etc. resources before
the switch to fullscreen (e.g. Mac OS X) */
- if( sdldisplay_is_full_screen != settings_current.full_screen ) {
- uidisplay_hotswap_gfx_mode();
+ if( sdldisplay_is_full_screen != settings_current.full_screen &&
+ uidisplay_hotswap_gfx_mode() ) {
+ fprintf( stderr, "%s: Error switching to fullscreen\n", fuse_progname );
+ fuse_abort();
}
/* Force a full redraw if requested */
Modified: branches/Release-0_8_0/fuse/ui/svga/svgadisplay.c
===================================================================
--- branches/Release-0_8_0/fuse/ui/svga/svgadisplay.c 2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/ui/svga/svgadisplay.c 2007-05-12 01:09:14 UTC (rev 366)
@@ -2,7 +2,7 @@
Copyright (c) 2000-2003 Philip Kendall, Matan Ziv-Av, Witold Filipczyk,
Russell Marks
- $Id: svgadisplay.c,v 1.32 2007/02/02 16:21:59 pak21 Exp $
+ $Id: svgadisplay.c,v 1.32.2.1 2007/04/28 00:23: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
@@ -216,10 +216,10 @@
return 0;
}
-void
+int
uidisplay_hotswap_gfx_mode( void )
{
- return;
+ return 0;
}
void
Modified: branches/Release-0_8_0/fuse/ui/uidisplay.h
===================================================================
--- branches/Release-0_8_0/fuse/ui/uidisplay.h 2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/ui/uidisplay.h 2007-05-12 01:09:14 UTC (rev 366)
@@ -1,7 +1,7 @@
/* uidisplay.h: Low-level display routines
Copyright (c) 2000-2003 Philip Kendall
- $Id: uidisplay.h,v 1.23 2007/02/02 16:21:55 pak21 Exp $
+ $Id: uidisplay.h,v 1.23.2.1 2007/04/28 00:23:07 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
@@ -34,7 +34,7 @@
void uidisplay_area( int x, int y, int w, int h );
void uidisplay_frame_end( void );
-void uidisplay_hotswap_gfx_mode( void );
+int uidisplay_hotswap_gfx_mode( void );
int uidisplay_end(void);
@@ -44,8 +44,8 @@
void uidisplay_putpixel( int x, int y, int colour );
void uidisplay_plot8( int x, int y, libspectrum_byte data, libspectrum_byte ink,
- libspectrum_byte paper );
+ libspectrum_byte paper );
void uidisplay_plot16( int x, int y, libspectrum_word data, libspectrum_byte ink,
- libspectrum_byte paper);
+ libspectrum_byte paper);
#endif /* #ifndef FUSE_UIDISPLAY_H */
Modified: branches/Release-0_8_0/fuse/ui/win32/win32display.c
===================================================================
--- branches/Release-0_8_0/fuse/ui/win32/win32display.c 2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/ui/win32/win32display.c 2007-05-12 01:09:14 UTC (rev 366)
@@ -1,7 +1,7 @@
/* win32display.c: Routines for dealing with the Win32 DirectDraw display
Copyright (c) 2003 Philip Kendall, Marek Januszewski
- $Id: win32display.c,v 1.5 2007/02/02 16:22:00 pak21 Exp $
+ $Id: win32display.c,v 1.5.2.1 2007/04/28 00:23: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
@@ -444,7 +444,7 @@
}
-void
+int
uidisplay_hotswap_gfx_mode( void )
{
/* TODO: pause hangs emulator
@@ -455,6 +455,8 @@
/* TODO: pause hangs emulator
fuse_emulation_unpause();
*/
+
+ return 0;
}
int
Modified: branches/Release-0_8_0/fuse/ui/xlib/xdisplay.c
===================================================================
--- branches/Release-0_8_0/fuse/ui/xlib/xdisplay.c 2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/ui/xlib/xdisplay.c 2007-05-12 01:09:14 UTC (rev 366)
@@ -1,7 +1,7 @@
/* xdisplay.c: Routines for dealing with drawing the Speccy's screen via Xlib
Copyright (c) 2000-2005 Philip Kendall, Darren Salt
- $Id: xdisplay.c,v 1.56 2007/02/02 16:22:00 pak21 Exp $
+ $Id: xdisplay.c,v 1.56.2.1 2007/04/28 00:23: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
@@ -496,10 +496,10 @@
if( image ) XDestroyImage( image ); image = 0;
}
-void
+int
uidisplay_hotswap_gfx_mode( void )
{
- return;
+ return 0;
}
int
Modified: branches/Release-0_8_0/fuse/uidisplay.c
===================================================================
--- branches/Release-0_8_0/fuse/uidisplay.c 2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/uidisplay.c 2007-05-12 01:09:14 UTC (rev 366)
@@ -1,7 +1,7 @@
/* uidisplay.c: UI display functions
Copyright (c) 2002-2003 Philip Kendall
- $Id: uidisplay.c,v 1.9 2007/02/02 16:21:52 pak21 Exp $
+ $Id: uidisplay.c,v 1.9.2.1 2007/04/25 03:32:22 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
@@ -65,7 +65,8 @@
data = screen[ display_line_start[y]+x ];
- uidisplay_plot8( x, y, data, ink, paper );
+ uidisplay_plot8( x + DISPLAY_BORDER_WIDTH_COLS, y + DISPLAY_BORDER_HEIGHT,
+ data, ink, paper );
}
}
Modified: branches/Release-0_8_0/fuse/ula.c
===================================================================
--- branches/Release-0_8_0/fuse/ula.c 2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/ula.c 2007-05-12 01:09:14 UTC (rev 366)
@@ -1,7 +1,7 @@
/* ula.c: ULA routines
Copyright (c) 1999-2004 Philip Kendall, Darren Salt
- $Id: ula.c,v 1.5 2007/02/02 16:21:52 pak21 Exp $
+ $Id: ula.c,v 1.5.2.1 2007/05/03 07:31:42 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
@@ -98,7 +98,7 @@
}
void
-ula_contend_port_preio( libspectrum_word port )
+ula_contend_port_early( libspectrum_word port )
{
if( ( port & 0xc000 ) == 0x4000 ) tstates += ula_contention[ tstates ];
@@ -106,20 +106,20 @@
}
void
-ula_contend_port_postio( libspectrum_word port )
+ula_contend_port_late( libspectrum_word port )
{
if( machine_current->ram.port_contended( port ) ) {
- tstates += ula_contention[ tstates ]; tstates += 3;
+ tstates += ula_contention[ tstates ]; tstates += 2;
} else {
if( ( port & 0xc000 ) == 0x4000 ) {
tstates += ula_contention[ tstates ]; tstates++;
tstates += ula_contention[ tstates ]; tstates++;
- tstates += ula_contention[ tstates ]; tstates++;
+ tstates += ula_contention[ tstates ];
} else {
- tstates += 3;
+ tstates += 2;
}
}
Modified: branches/Release-0_8_0/fuse/ula.h
===================================================================
--- branches/Release-0_8_0/fuse/ula.h 2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/ula.h 2007-05-12 01:09:14 UTC (rev 366)
@@ -1,7 +1,7 @@
/* ula.h: ULA routines
Copyright (c) 1999-2004 Philip Kendall, Darren Salt
- $Id: ula.h,v 1.3 2007/02/02 16:21:52 pak21 Exp $
+ $Id: ula.h,v 1.3.2.1 2007/05/03 07:31:42 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
@@ -37,7 +37,7 @@
int ula_from_snapshot( libspectrum_snap *snap );
int ula_to_snapshot( libspectrum_snap *snap );
-void ula_contend_port_preio( libspectrum_word port );
-void ula_contend_port_postio( libspectrum_word port );
+void ula_contend_port_early( libspectrum_word port );
+void ula_contend_port_late( libspectrum_word port );
#endif /* #ifndef FUSE_ULA_H */
Modified: branches/Release-0_8_0/fuse/widget/Makefile.am
===================================================================
--- branches/Release-0_8_0/fuse/widget/Makefile.am 2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/widget/Makefile.am 2007-05-12 01:09:14 UTC (rev 366)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2001,2002 Philip Kendall
-## $Id: Makefile.am,v 1.39 2007/02/02 16:22:00 pak21 Exp $
+## $Id: Makefile.am,v 1.39.2.1 2007/04/16 12:35:07 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
@@ -65,3 +65,6 @@
options.h options.pl options-header.pl
pkgdata_DATA = fuse.font
+
+EXTRA_DIST = mkfusefont.pl \
+ fuse.font.sbf
Modified: branches/Release-0_8_0/fuse/widget/menu.c
===================================================================
--- branches/Release-0_8_0/fuse/widget/menu.c 2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/widget/menu.c 2007-05-12 01:09:14 UTC (rev 366)
@@ -1,7 +1,7 @@
/* menu.c: general menu widget
Copyright (c) 2001-2006 Philip Kendall
- $Id: menu.c,v 1.109 2007/02/02 16:22:00 pak21 Exp $
+ $Id: menu.c,v 1.109.2.1 2007/04/25 03:32:22 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
@@ -553,6 +553,7 @@
info.filename = filename;
info.screen = file.buffer;
+ info.border = 0;
widget_do( WIDGET_TYPE_PICTURE, &info );
Modified: branches/Release-0_8_0/fuse/widget/pokefinder.c
===================================================================
--- branches/Release-0_8_0/fuse/widget/pokefinder.c 2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/widget/pokefinder.c 2007-05-12 01:09:14 UTC (rev 366)
@@ -1,7 +1,7 @@
/* pokefinder.c: The poke finder widget
Copyright (c) 2004 Darren Salt
- $Id: pokefinder.c,v 1.2 2005/03/26 17:25:01 pak21 Exp $
+ $Id: pokefinder.c,v 1.2.6.1 2007/04/25 16:21: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
@@ -52,18 +52,17 @@
widget_pokefinder_draw( void *data )
{
widget_dialog_with_border( 1, 2, 30, 12 );
- widget_printstring( 15 - strlen( title ) / 2, 2, WIDGET_COLOUR_FOREGROUND,
- title );
- widget_printstring( 2, 4, WIDGET_COLOUR_FOREGROUND, "Possible: " );
- widget_printstring( 2, 5, WIDGET_COLOUR_FOREGROUND, "Value: " );
+ widget_print_title( 16, WIDGET_COLOUR_FOREGROUND, title );
+ widget_printstring( 16, 32, WIDGET_COLOUR_FOREGROUND, "Possible: " );
+ widget_printstring( 16, 40, WIDGET_COLOUR_FOREGROUND, "Value: " );
update_possible();
display_possible();
display_value();
- widget_printstring( 2, 12, WIDGET_COLOUR_FOREGROUND,
- "(I)nc'd (D)ec'd (S)earch" );
- widget_printstring( 2, 13, WIDGET_COLOUR_FOREGROUND, "(R)eset (C)lose" );
+ widget_printstring( 16, 96, WIDGET_COLOUR_FOREGROUND,
+ "\x0AI\x09nc'd \x0A" "D\x09" "ec'd \x0AS\x09" "earch" );
+ widget_printstring( 16, 104, WIDGET_COLOUR_FOREGROUND, "\x0AR\x09" "eset \x0A" "C\x09lose" );
widget_display_lines( 2, 12 );
@@ -98,10 +97,10 @@
widget_rectangle( 96, 32, 48, 8, WIDGET_COLOUR_BACKGROUND );
widget_rectangle( 16, 56, 128, 32, WIDGET_COLOUR_BACKGROUND );
widget_rectangle( 16, 88, 136, 8, WIDGET_COLOUR_BACKGROUND );
- widget_rectangle( 144, 104, 56, 8, WIDGET_COLOUR_BACKGROUND );
+ widget_rectangle( 82, 104, 56, 8, WIDGET_COLOUR_BACKGROUND );
snprintf( buf, sizeof( buf ), "%d", pokefinder_count );
- widget_printstring( 12, 4, WIDGET_COLOUR_FOREGROUND, buf );
+ widget_printstring( 96, 32, WIDGET_COLOUR_FOREGROUND, buf );
if( FEW_ENOUGH() ) {
size_t i;
@@ -120,10 +119,10 @@
snprintf( buf, sizeof( buf ), "%2d:%04X", possible_page[i],
possible_offset[i] );
- widget_printstring( x, y, colour, buf );
+ widget_printstring( x * 8, y * 8, colour, buf );
}
- widget_printstring( 18, 13, WIDGET_COLOUR_FOREGROUND, "(B)reak" );
+ widget_printstring( 83, 104, WIDGET_COLOUR_FOREGROUND, "\x0A" "B\x09reak" );
}
widget_display_lines( 4, 10 );
@@ -136,7 +135,7 @@
snprintf( buf, sizeof( buf ), "%d", value );
widget_rectangle( 72, 40, 24, 8, WIDGET_COLOUR_BACKGROUND );
- widget_printstring( 9, 5, WIDGET_COLOUR_FOREGROUND, buf );
+ widget_printstring( 72, 40, WIDGET_COLOUR_FOREGROUND, buf );
widget_display_lines( 5, 1 );
}
@@ -202,10 +201,10 @@
possible_offset[selected], 0, DEBUGGER_BREAKPOINT_LIFE_PERMANENT,
NULL
) ) {
- widget_printstring( 2, 11, WIDGET_COLOUR_FOREGROUND,
+ widget_printstring( 16, 88, WIDGET_COLOUR_FOREGROUND,
"Breakpoint failed" );
} else {
- widget_printstring( 2, 11, WIDGET_COLOUR_FOREGROUND,
+ widget_printstring( 16, 88, WIDGET_COLOUR_FOREGROUND,
"Breakpoint added" );
}
widget_display_lines( 11, 1 );
Modified: branches/Release-0_8_0/libspectrum/Info.plist
===================================================================
--- branches/Release-0_8_0/libspectrum/Info.plist 2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/libspectrum/Info.plist 2007-05-12 01:09:14 UTC (rev 366)
@@ -23,6 +23,6 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>0.3.0</string>
+ <string>0.3.0.1</string>
</dict>
</plist>
Modified: branches/Release-0_8_0/libspectrum/libspectrum/ChangeLog
===================================================================
--- branches/Release-0_8_0/libspectrum/libspectrum/ChangeLog 2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/libspectrum/libspectrum/ChangeLog 2007-05-12 01:09:14 UTC (rev 366)
@@ -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: branches/Release-0_8_0/libspectrum/libspectrum/Makefile.am
===================================================================
--- branches/Release-0_8_0/libspectrum/libspectrum/Makefile.am 2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/libspectrum/libspectrum/Makefile.am 2007-05-12 01:09:14 UTC (rev 366)
@@ -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: branches/Release-0_8_0/libspectrum/libspectrum/README
===================================================================
--- branches/Release-0_8_0/libspectrum/libspectrum/README 2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/libspectrum/libspectrum/README 2007-05-12 01:09:14 UTC (rev 366)
@@ -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: branches/Release-0_8_0/libspectrum/libspectrum/acinclude.m4
===================================================================
--- branches/Release-0_8_0/libspectrum/libspectrum/acinclude.m4 2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/libspectrum/libspectrum/acinclude.m4 2007-05-12 01:09:14 UTC (rev 366)
@@ -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: branches/Release-0_8_0/libspectrum/libspectrum/configure.in
===================================================================
--- branches/Release-0_8_0/libspectrum/libspectrum/configure.in 2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/libspectrum/libspectrum/configure.in 2007-05-12 01:09:14 UTC (rev 366)
@@ -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: branches/Release-0_8_0/libspectrum/libspectrum/doc/cvs-tags
===================================================================
--- branches/Release-0_8_0/libspectrum/libspectrum/doc/cvs-tags 2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/libspectrum/libspectrum/doc/cvs-tags 2007-05-12 01:09:14 UTC (rev 366)
@@ -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: branches/Release-0_8_0/libspectrum/libspectrum/doc/libspectrum.3
===================================================================
--- branches/Release-0_8_0/libspectrum/libspectrum/doc/libspectrum.3 2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/libspectrum/libspectrum/doc/libspectrum.3 2007-05-12 01:09:14 UTC (rev 366)
@@ -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: branches/Release-0_8_0/libspectrum/libspectrum/doc/libspectrum.txt
===================================================================
--- branches/Release-0_8_0/libspectrum/libspectrum/doc/libspectrum.txt 2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/libspectrum/libspectrum/doc/libspectrum.txt 2007-05-12 01:09:14 UTC (rev 366)
@@ -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 $
Copied: branches/Release-0_8_0/libspectrum/libspectrum/hacking/.cvsignore (from rev 365, vendor/libspectrum/current/hacking/.cvsignore)
===================================================================
--- branches/Release-0_8_0/libspectrum/libspectrum/hacking/.cvsignore (rev 0)
+++ branches/Release-0_8_0/libspectrum/libspectrum/hacking/.cvsignore 2007-05-12 01:09:14 UTC (rev 366)
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
Modified: branches/Release-0_8_0/libspectrum/libspectrum/hacking/ChangeLog
===================================================================
--- branches/Release-0_8_0/libspectrum/libspectrum/hacking/ChangeLog 2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/libspectrum/libspectrum/hacking/ChangeLog 2007-05-12 01:09:14 UTC (rev 366)
@@ -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)
Copied: branches/Release-0_8_0/libspectrum/libspectrum/hacking/Makefile.am (from rev 365, vendor/libspectrum/current/hacking/Makefile.am)
===================================================================
--- branches/Release-0_8_0/libspectrum/libspectrum/hacking/Makefile.am (rev 0)
+++ branches/Release-0_8_0/libspectrum/libspectrum/hacking/Makefile.am 2007-05-12 01:09:14 UTC (rev 366)
@@ -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: branches/Release-0_8_0/libspectrum/libspectrum/libspectrum.h.in
================================...
[truncated message content] |
