[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx:[763] branches/Release-1_1_0
Brought to you by:
fredm
Menu
▾
▴
[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx:[763] branches/Release-1_1_0
|
From: <fr...@us...> - 2013-06-01 07:15:04
|
Revision: 763
http://sourceforge.net/p/fuse-for-macosx/code/763
Author: fredm
Date: 2013-06-01 07:15:01 +0000 (Sat, 01 Jun 2013)
Log Message:
-----------
Merge r762 from trunk.
Revision Links:
--------------
http://sourceforge.net/p/fuse-for-macosx/code/762
Modified Paths:
--------------
branches/Release-1_1_0/fuse/Makefile.am
branches/Release-1_1_0/fuse/fusepb/resources/Fuse Help/html/general.html
branches/Release-1_1_0/fuse/fusepb/resources/Fuse Help/html/joysticks.html
branches/Release-1_1_0/fuse/fusepb/resources/Fuse Help/html/spectranet.html
branches/Release-1_1_0/fuse/hacking/ChangeLog
branches/Release-1_1_0/fuse/man/fuse.1
branches/Release-1_1_0/fuse/pokefinder/pokemem.c
branches/Release-1_1_0/fuse/ui/win32/installer/fuse.nsi.in
Property Changed:
----------------
branches/Release-1_1_0/
branches/Release-1_1_0/fuse/
Index: branches/Release-1_1_0
===================================================================
--- branches/Release-1_1_0 2013-06-01 07:10:26 UTC (rev 762)
+++ branches/Release-1_1_0 2013-06-01 07:15:01 UTC (rev 763)
Property changes on: branches/Release-1_1_0
___________________________________________________________________
Added: svn:mergeinfo
## -0,0 +1 ##
+/trunk:762
\ No newline at end of property
Index: branches/Release-1_1_0/fuse
===================================================================
--- branches/Release-1_1_0/fuse 2013-06-01 07:10:26 UTC (rev 762)
+++ branches/Release-1_1_0/fuse 2013-06-01 07:15:01 UTC (rev 763)
Property changes on: branches/Release-1_1_0/fuse
___________________________________________________________________
Modified: svn:mergeinfo
## -1,5 +1,6 ##
+/trunk/fuse:762
/vendor/fuse-emulator/0.10.0/fuse:556-557
/vendor/fuse-emulator/0.10.0-pre1/fuse:545-546
-/vendor/fuse-emulator/current/fuse:530-756
+/vendor/fuse-emulator/current/fuse:530-761
/vendor/fuse-emulator/fuse-1.0.0a/fuse:668-669
/vendor/fuse-emulator/fuse-r4617/fuse:686
\ No newline at end of property
Modified: branches/Release-1_1_0/fuse/Makefile.am
===================================================================
--- branches/Release-1_1_0/fuse/Makefile.am 2013-06-01 07:10:26 UTC (rev 762)
+++ branches/Release-1_1_0/fuse/Makefile.am 2013-06-01 07:15:01 UTC (rev 763)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 1999-2009 Philip Kendall
-## $Id: Makefile.am 4980 2013-05-21 12:37:51Z fredm $
+## $Id: Makefile.am 5003 2013-05-26 16:24:03Z sbaldovi $
## 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
@@ -244,7 +244,7 @@
cp $(top_builddir)/.libs/fuse$(EXEEXT) $(DESTDIR) || \
cp $(top_builddir)/fuse$(EXEEXT) $(DESTDIR)
# Get text files
- for file in AUTHORS COPYING README; \
+ for file in AUTHORS ChangeLog COPYING README; \
do cp "$(top_srcdir)/$$file" "$(DESTDIR)/$$file.txt"; \
done
# Get manuals
Modified: branches/Release-1_1_0/fuse/fusepb/resources/Fuse Help/html/general.html
===================================================================
--- branches/Release-1_1_0/fuse/fusepb/resources/Fuse Help/html/general.html 2013-06-01 07:10:26 UTC (rev 762)
+++ branches/Release-1_1_0/fuse/fusepb/resources/Fuse Help/html/general.html 2013-06-01 07:15:01 UTC (rev 763)
@@ -1,207 +1,199 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
-<head>
- <meta http-equiv="content-type"
- content="text/html; charset=ISO-8859-1">
-<!-- AppleSegStart="General Preferences" -->
- <title>General Preferences</title>
-</head>
-<body>
-<font face="Lucida Grande,Helvetica,Arial"><a name="General Preferences"></a><!-- AppleSegDescription="This section describes the Fuse general preferences dialog." --></font>
-<h2><font face="Lucida Grande,Helvetica,Arial"><span
- style="font-style: italic;">General</span> preferences</font></h2>
-<p><font face="Lucida Grande,Helvetica,Arial">The General pane of Fuse
-preferences lets you configure miscellaneous Fuse options.<br>
-</font></p>
-<table style="text-align: left; width: 100%;" cellpadding="2"
- cellspacing="2">
- <tbody>
- <tr>
- <th style="vertical-align: top;"><font style="font-weight: bold;"
- face="Lucida Grande,Helvetica,Arial">OPTION</font><br>
- </th>
- <th style="vertical-align: top;"><font style="font-weight: bold;"
- face="Lucida Grande,Helvetica,Arial">DESCRIPTION</font><br>
- </th>
- </tr>
- <tr>
- <td style="vertical-align: top;"><span class="emphasis"><font
- face="Lucida Grande,Helvetica,Arial"><em>Emulation
-speed</em></font></span></td>
- <td style="vertical-align: top;"><span class="emphasis"><font
- face="Lucida Grande,Helvetica,Arial"><em></em></font></span><font
- face="Lucida Grande,Helvetica,Arial">Set how fast Fuse will
-attempt to emulate the Spectrum, as a percentage of the speed at
-which the real machine runs. If your machine isn't fast enough to
-keep up with the requested speed, Fuse will just run as fast as it
-can. Note that if the emulation speed is 1%, no sound
-output will be produced.</font></td>
- </tr>
- <tr>
- <td style="vertical-align: top;"><span class="emphasis"><font
- face="Lucida Grande,Helvetica,Arial"><em>Screen
-refresh
-rate</em></font></span></td>
- <td style="vertical-align: top;"><font
- face="Lucida Grande,Helvetica,Arial">Specify the frame rate,
-the ratio of spectrum frame updates to real frame updates. This is
-useful if your machine is having trouble keeping up with the
-spectrum screen updates.</font></td>
- </tr>
- <tr>
- <td style="vertical-align: top;"><span class="emphasis"><font
- face="Lucida Grande,Helvetica,Arial"><em>Issue
-2
-keyboard</em></font></span></td>
- <td style="vertical-align: top;"><font
- face="Lucida Grande,Helvetica,Arial">Early versions of the
-Spectrum used a different value for unused bits on the keyboard
-input ports, and a few games depended on the old value of these
-bits. Enabling this option switches to the old value, to let you </font><font
- face="Lucida Grande,Helvetica,Arial">run those games.</font></td>
- </tr>
- <tr>
- <td style="vertical-align: top;"><span class="emphasis"><font
- face="Lucida Grande,Helvetica,Arial"><em>Late
-timings</em></font></span></td>
- <td style="vertical-align: top;"><font
- face="Lucida Grande,Helvetica,Arial">If
-selected,
-Fuse
-will
-cause all screen-related timings (for example, when
-the screen is rendered and when memory contention occurs) to be one
-tstate later than "normal", an effect which is present on some real
-hardware.</font>
- <span class="emphasis"><font face="Lucida Grande,Helvetica,Arial"><em></em></font></span></td>
- </tr>
- <tr>
- <td style="vertical-align: top;"><span class="emphasis"><font
- face="Lucida Grande,Helvetica,Arial"><em>Use
-tape
-traps</em></font></span></td>
- <td style="vertical-align: top;"><font
- face="Lucida Grande,Helvetica,Arial">Ordinarily, Fuse
-intercepts calls to the ROM tape-loading routine in order to load
-from tape files more quickly when possible. But this can (rarely)
-interfere with TZX loading; disabling this option avoids the
-problem at the cost of slower (i.e. always real-time) tape-loading.
-When tape-loading traps are disabled, you need to start tape
-playback manually, by choosing the<span class="emphasis"><em>Tape,
-Play</em></span> menu item.</font></td>
- </tr>
- <tr>
- <td style="vertical-align: top;"><span class="emphasis"><font
- face="Lucida Grande,Helvetica,Arial"><em>Fast
-tape
-loading</em></font></span></td>
- <td style="vertical-align: top;"><font
- face="Lucida Grande,Helvetica,Arial">If this option is
-enabled, then Fuse will run at the fastest possible speed when the
-virtual tape is playing, thus dramatically reducing the time it
-takes to load programs. You may wish to disable this option if you
-wish to stop the tape at a specific point.</font></td>
- </tr>
- <tr>
- <td style="vertical-align: top;"><span class="emphasis"><font
- face="Lucida Grande,Helvetica,Arial"><em>Detect
-tape
-loaders</em></font></span></td>
- <td style="vertical-align: top;"><font
- face="Lucida Grande,Helvetica,Arial">If
-this
-option
-is enabled, Fuse
-will attempt to detect when a loading routine is in progress, and then
-automatically start the virtual tape to load the program in. This is
-done by using a heuristic to identify a
-loading routine, so is by no means infalliable, but works in most cases.</font></td>
- </tr>
- <tr>
- <td style="vertical-align: top;"><span class="emphasis"><font
- face="Lucida Grande,Helvetica,Arial"><em>Auto-load
-media</em></font></span></td>
- <td style="vertical-align: top;"><font
- face="Lucida Grande,Helvetica,Arial">On many occasions when
-you open a tape or disk file, it's because it's got a program in
-you want to load and run. If this option is selected, this will
-automatically happen for you when you open one of these files using the
- </font><font face="Lucida Grande,Helvetica,Arial"><span
- class="emphasis"><em>File,
-Open...</em></span></font><font face="Lucida Grande,Helvetica,Arial">
-menu option - you must then use the Media menu to use tapes or disks
-for saving data to, or for loading data into an already running program.</font></td>
- </tr>
- <tr>
- <td style="vertical-align: top;"><span class="emphasis"><font
- face="Lucida Grande,Helvetica,Arial"><em>Use
-.slt
-traps</em></font></span></td>
- <td style="vertical-align: top;"><font
- face="Lucida Grande,Helvetica,Arial">The multi-load aspect of
-SLT files requires a trap instruction to be supported. This
-instruction is not generally used except for this trap, but since
-it's not inconceivable that a program could be wanting to use the
-real instruction instead, you can choose whether to support the
-trap or not.</font></td>
- </tr>
- <tr>
- <td style="vertical-align: top;"><span class="emphasis"><font
- face="Lucida Grande,Helvetica,Arial"><em>Confirm
-actions</em></font></span></td>
- <td style="vertical-align: top;"><font
- face="Lucida Grande,Helvetica,Arial">Specify
-whether `dangerous' actions (those which could cause data loss, for
-example resetting the Spectrum) require confirmation before occuring.</font></td>
- </tr>
- <tr>
- <td style="vertical-align: top;"><span class="emphasis"><font
- face="Lucida Grande,Helvetica,Arial"><em>Allow
-writes
-to
-ROM</em></font></span></td>
- <td style="vertical-align: top;"><font
- face="Lucida Grande,Helvetica,Arial">If this option is
-selected, Fuse will happily allow programs to overwrite what would
-normally be ROM. This probably isn't very useful in most
-circumstances, especially as the 48K ROM overwrites parts of
-itself.</font></td>
- </tr>
- <tr>
- <td style="vertical-align: top;"><span class="emphasis"><font
- face="Lucida Grande,Helvetica,Arial"><em>Show
-tape/disk
-status</em></font></span></td>
- <td style="vertical-align: top;"><font
- face="Lucida Grande,Helvetica,Arial">Enables the status icons
-showing whether the disk and tape are being accessed.</font></td>
- </tr>
- <tr>
- <td style="vertical-align: top;"><span class="emphasis"><font
- face="Lucida Grande,Helvetica,Arial"><em>Set
-joysticks
-on
-snapshot
-load</em></font></span></td>
- <td style="vertical-align: top;"><font
- face="Lucida Grande,Helvetica,Arial">Controls
-whether Fuse should
-allow snapshot files to override your current joystick configuration.</font></td>
- </tr>
- <tr>
- <td style="vertical-align: top;"><span class="emphasis"><font
- face="Lucida Grande,Helvetica,Arial"><em>Reset
-Preferences</em></font></span></td>
- <td style="vertical-align: top;"><font
- face="Lucida Grande,Helvetica,Arial">This causes all of Fuse's
-current preferences to be discarded and replaced with the default
-values as shipped.</font></td>
- </tr>
- </tbody>
-</table>
-<span class="emphasis"><font face="Lucida Grande,Helvetica,Arial"><em></em></font></span><font
- face="Lucida Grande,Helvetica,Arial"></font>
-<p><span class="emphasis"><font face="Lucida Grande,Helvetica,Arial"><em></em></font></span>
-<!-- AppleSegEnd --></p>
-</body>
+ <head>
+ <meta http-equiv="content-type" content="text/html;
+ charset=ISO-8859-1">
+ <!-- AppleSegStart="General Preferences" -->
+ <title>General Preferences</title>
+ </head>
+ <body>
+ <font face="Lucida Grande,Helvetica,Arial"><a name="General
+ Preferences"></a><!-- AppleSegDescription="This section describes the Fuse general preferences dialog." --></font>
+ <h2><font face="Lucida Grande,Helvetica,Arial"><span
+ style="font-style: italic;">General</span> preferences</font></h2>
+ <p><font face="Lucida Grande,Helvetica,Arial">The General pane of
+ Fuse preferences lets you configure miscellaneous Fuse options.<br>
+ </font></p>
+ <table style="text-align: left; width: 100%;" cellpadding="2"
+ cellspacing="2">
+ <tbody>
+ <tr>
+ <th style="vertical-align: top;"><font style="font-weight:
+ bold;" face="Lucida Grande,Helvetica,Arial">OPTION</font><br>
+ </th>
+ <th style="vertical-align: top;"><font style="font-weight:
+ bold;" face="Lucida Grande,Helvetica,Arial">DESCRIPTION</font><br>
+ </th>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;"><span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em>Emulation speed</em></font></span></td>
+ <td style="vertical-align: top;"><span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em></em></font></span><font
+ face="Lucida Grande,Helvetica,Arial">Set how fast Fuse
+ will attempt to emulate the Spectrum, as a percentage of
+ the speed at which the real machine runs. If your machine
+ isn't fast enough to keep up with the requested speed,
+ Fuse will just run as fast as it can. Note that if the
+ emulation speed is 1%, no sound output will be produced.</font></td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;"><span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em>Screen refresh
+ rate</em></font></span></td>
+ <td style="vertical-align: top;"><font face="Lucida
+ Grande,Helvetica,Arial">Specify the frame rate, the ratio
+ of spectrum frame updates to real frame updates. This is
+ useful if your machine is having trouble keeping up with
+ the spectrum screen updates.</font></td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;"><span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em>Use tape traps</em></font></span></td>
+ <td style="vertical-align: top;"><font face="Lucida
+ Grande,Helvetica,Arial">Ordinarily, Fuse intercepts calls
+ to the ROM tape-loading routine in order to load from tape
+ files more quickly when possible. But this can (rarely)
+ interfere with TZX loading; disabling this option avoids
+ the problem at the cost of slower (i.e. always real-time)
+ tape-loading. When tape-loading traps are disabled, you
+ need to start tape playback manually, by choosing the<span
+ class="emphasis"><em>Tape, Play</em></span> menu item.</font></td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;"><span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em>Fast tape
+ loading</em></font></span></td>
+ <td style="vertical-align: top;"><font face="Lucida
+ Grande,Helvetica,Arial">If this option is enabled, then
+ Fuse will run at the fastest possible speed when the
+ virtual tape is playing, thus dramatically reducing the
+ time it takes to load programs. You may wish to disable
+ this option if you wish to stop the tape at a specific
+ point.</font></td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;"><span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em>Accelerate
+ loaders</em></font></span></td>
+ <td style="vertical-align: top;"><font face="Lucida
+ Grande,Helvetica,Arial">If this option is enabled, then
+ Fuse will attempt to accelerate tape loaders by "short
+ circuiting" the loading loop. This will in general speed
+ up loading, but may cause some loaders to fail.</font></td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;"><span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em>Detect tape
+ loaders</em></font></span></td>
+ <td style="vertical-align: top;"><font face="Lucida
+ Grande,Helvetica,Arial">If this option is enabled, Fuse
+ will attempt to detect when a loading routine is in
+ progress, and then automatically start the virtual tape to
+ load the program in. This is done by using a heuristic to
+ identify a loading routine, so is by no means infalliable,
+ but works in most cases.</font></td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;"><span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em>Auto-load media</em></font></span></td>
+ <td style="vertical-align: top;"><font face="Lucida
+ Grande,Helvetica,Arial">On many occasions when you open a
+ tape or disk file, it's because it's got a program in you
+ want to load and run. If this option is selected, this
+ will automatically happen for you when you open one of
+ these files using the </font><font face="Lucida
+ Grande,Helvetica,Arial"><span class="emphasis"><em>File,
+ Open...</em></span></font><font face="Lucida
+ Grande,Helvetica,Arial"> menu option - you must then use
+ the Media menu to use tapes or disks for saving data to,
+ or for loading data into an already running program.</font></td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;"><span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em>Show tape/disk
+ status</em></font></span></td>
+ <td style="vertical-align: top;"><font face="Lucida
+ Grande,Helvetica,Arial">Enables the status icons showing
+ whether the disk and tape are being accessed.</font></td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;"><span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em>Confirm actions</em></font></span></td>
+ <td style="vertical-align: top;"><font face="Lucida
+ Grande,Helvetica,Arial">Specify whether `dangerous'
+ actions (those which could cause data loss, for example
+ resetting the Spectrum) require confirmation before
+ occuring.</font></td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;"><span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em>Issue 2
+ keyboard</em></font></span></td>
+ <td style="vertical-align: top;"><font face="Lucida
+ Grande,Helvetica,Arial">Early versions of the Spectrum
+ used a different value for unused bits on the keyboard
+ input ports, and a few games depended on the old value of
+ these bits. Enabling this option switches to the old
+ value, to let you </font><font face="Lucida
+ Grande,Helvetica,Arial">run those games.</font></td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;"><span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em>Late CPU
+ timings</em></font></span></td>
+ <td style="vertical-align: top;"><font face="Lucida
+ Grande,Helvetica,Arial">If selected, Fuse will cause all
+ screen-related timings (for example, when the screen is
+ rendered and when memory contention occurs) to be one
+ tstate later than "normal", an effect which is present on
+ some real hardware.</font> <span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em></em></font></span></td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;"><span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em>Allow writes to
+ ROM</em></font></span></td>
+ <td style="vertical-align: top;"><font face="Lucida
+ Grande,Helvetica,Arial">If this option is selected, Fuse
+ will happily allow programs to overwrite what would
+ normally be ROM. This probably isn't very useful in most
+ circumstances, especially as the 48K ROM overwrites parts
+ of itself.</font></td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;"><span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em>Use .slt traps</em></font></span></td>
+ <td style="vertical-align: top;"><font face="Lucida
+ Grande,Helvetica,Arial">The multi-load aspect of SLT files
+ requires a trap instruction to be supported. This
+ instruction is not generally used except for this trap,
+ but since it's not inconceivable that a program could be
+ wanting to use the real instruction instead, you can
+ choose whether to support the trap or not.</font></td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;"><span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em>Set joysticks
+ on snapshot load</em></font></span></td>
+ <td style="vertical-align: top;"><font face="Lucida
+ Grande,Helvetica,Arial">Controls whether Fuse should allow
+ snapshot files to override your current joystick
+ configuration.</font></td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;"><span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em>Reset
+ Preferences</em></font></span></td>
+ <td style="vertical-align: top;"><font face="Lucida
+ Grande,Helvetica,Arial">This causes all of Fuse's current
+ preferences to be discarded and replaced with the default
+ values as shipped.</font></td>
+ </tr>
+ </tbody>
+ </table>
+ <span class="emphasis"><font face="Lucida Grande,Helvetica,Arial"><em></em></font></span>
+ <p><span class="emphasis"><font face="Lucida Grande,Helvetica,Arial"><em></em></font></span>
+ <!-- AppleSegEnd --></p>
+ </body>
</html>
Modified: branches/Release-1_1_0/fuse/fusepb/resources/Fuse Help/html/joysticks.html
===================================================================
--- branches/Release-1_1_0/fuse/fusepb/resources/Fuse Help/html/joysticks.html 2013-06-01 07:10:26 UTC (rev 762)
+++ branches/Release-1_1_0/fuse/fusepb/resources/Fuse Help/html/joysticks.html 2013-06-01 07:15:01 UTC (rev 763)
@@ -43,12 +43,16 @@
face="Lucida Grande,Helvetica,Arial"><em>Kempston</em></font></span>
<font face="Lucida Grande,Helvetica,Arial">A Kempston joystick,
read from input port 31. Note that the <span class="emphasis"><em>Peripherals
+
+
preferences > Kempston interface</em></span> option must
also be set for the input to be recognised.</font></p>
<p style="margin-left: 40px;"> <span class="emphasis"><font
face="Lucida Grande,Helvetica,Arial"><em>Sinclair 1</em></font></span>
<span class="emphasis"><font face="Lucida Grande,Helvetica,Arial"><em>Sinclair
+
+
2</em></font></span> <font face="Lucida
Grande,Helvetica,Arial">The `left' and `right' Sinclair
joysticks, equivalent to pressing 1 (left), 2 (right), 3 (down),
@@ -58,6 +62,8 @@
face="Lucida Grande,Helvetica,Arial"><em>Timex 1</em></font></span>
<span class="emphasis"><font face="Lucida Grande,Helvetica,Arial"><em>Timex
+
+
2</em></font></span> <font face="Lucida
Grande,Helvetica,Arial">The `left' and `right' joysticks as
attached to the Timex 2068s built-in joystick interface.</font></p>
@@ -81,6 +87,20 @@
</tr>
<tr>
<td style="vertical-align: top;"><span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em>Interface II</em></font></span></td>
+ <td style="vertical-align: top;"><font face="Lucida
+ Grande,Helvetica,Arial">If this option is selected, Fuse
+ will emulate a cartridge port as found on the Interface
+ II. Cartridges can then be inserted and removed via the <span
+ class="emphasis"><em>Media > Cartridge</em></span>
+ menu. Note that the Pentagon, Scorpion, Interface II,
+ ZXATASP and ZXCF all use the same hardware mechanism for
+ accessing some of their extended features, so only one of
+ these should be selected at once or unpredictable
+ behaviour will occur.</font></td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;"><span class="emphasis"><font
face="Lucida Grande,Helvetica,Arial"><em>Kempston
joystick interface</em></font></span></td>
<td style="vertical-align: top;"><font face="Lucida
@@ -108,17 +128,12 @@
</tr>
<tr>
<td style="vertical-align: top;"><span class="emphasis"><font
- face="Lucida Grande,Helvetica,Arial"><em>Interface II</em></font></span></td>
+ face="Lucida Grande,Helvetica,Arial"><em>Swap mouse
+ buttons</em></font></span></td>
<td style="vertical-align: top;"><font face="Lucida
- Grande,Helvetica,Arial">If this option is selected, Fuse
- will emulate a cartridge port as found on the Interface
- II. Cartridges can then be inserted and removed via the <span
- class="emphasis"><em>Media > Cartridge</em></span>
- menu. Note that the Pentagon, Scorpion, Interface II,
- ZXATASP and ZXCF all use the same hardware mechanism for
- accessing some of their extended features, so only one of
- these should be selected at once or unpredictable
- behaviour will occur.</font></td>
+ Grande,Helvetica,Arial">If this option is enabled, the
+ left and right mouse buttons will be swapped when
+ emulating a Kempston mouse.</font></td>
</tr>
</tbody>
</table>
Modified: branches/Release-1_1_0/fuse/fusepb/resources/Fuse Help/html/spectranet.html
===================================================================
--- branches/Release-1_1_0/fuse/fusepb/resources/Fuse Help/html/spectranet.html 2013-06-01 07:10:26 UTC (rev 762)
+++ branches/Release-1_1_0/fuse/fusepb/resources/Fuse Help/html/spectranet.html 2013-06-01 07:15:01 UTC (rev 763)
@@ -25,6 +25,9 @@
+
+
+
preferences</em></span></font></a><font face="Lucida
Grande,Helvetica,Arial"> dialog, and the state of its </font><font
face="Lucida Grande,Helvetica,Arial">automatic page-in</font><font
@@ -67,6 +70,9 @@
+
+
+
preferences</em></span></font></a><font face="Lucida
Grande,Helvetica,Arial"> dialog</font><font face="Lucida
Grande,Helvetica,Arial">. Once that's done, open the installer
@@ -96,6 +102,9 @@
+
+
+
disable</span></font><font face="Lucida
Grande,Helvetica,Arial"><span class="emphasis"><em></em></span></font>
<font face="Lucida Grande,Helvetica,Arial">option</font><font
@@ -111,15 +120,9 @@
Spectranet" and ending with the Spectranet's IP address (which
will be 255.255.255.255 at this stage).<br>
<br>
- If you see all that, type the following command:<br>
- </font></p>
- <font face="Lucida Grande,Helvetica,Arial"><big><span
- style="font-family: monospace;">%cfgnew</span></big><br>
- </font>
- <p><font face="Lucida Grande,Helvetica,Arial">Which will show the
- standard 0 OK, 0:1 at the bottom of the screen. Now, trigger an
- NMI (the Machine > NMI menu option) and you should get a
- white on blue Spectranet NMI menu with five options.<br>
+ Now, trigger an NMI (the Machine > NMI menu option) and you
+ should get a white on blue Spectranet NMI menu with five
+ options.<br>
<br>
Select [A] Configure network settings - this should lead you to
another menu, which will scroll of the top of the screen; don't
@@ -171,6 +174,9 @@
+
+
+
: 255.255.255.000</span><br style="font-family: monospace;">
<span style="font-family: monospace;">Default gateway :
192.168.000.001</span><br style="font-family: monospace;">
@@ -189,6 +195,9 @@
+
+
+
: fuse</span><br style="font-family: monospace;">
<br style="font-family: monospace;">
<span style="font-family: monospace;"><menu options></span></big><font
@@ -199,11 +208,22 @@
Exit, at which point you'll be returned to BASIC. Reset the
Spectrum again and you'll see the same four line status display,
but this time with your IP address on the last line.<br>
- <br>
- Congratulations! You have now installed the Spectranet firmware.
- To save having to go through all that every time you start Fuse,
- save a .szx snapshot at this point, and load that in every time
- you want to use the Spectranet.</font></p>
+ </font><br>
+ <font face="Lucida Grande,Helvetica,Arial"><font face="Lucida
+ Grande,Helvetica,Arial">Now type the following commands:<br>
+ </font> <font face="Lucida Grande,Helvetica,Arial"><big><span
+ style="font-family: monospace;">%cfgnew<br>
+ %cfgcommit</span></big></font><big><br>
+ </big> </font> </p>
+ <p><font face="Lucida Grande,Helvetica,Arial">Which will show the
+ standard <font face="Lucida Grande,Helvetica,Arial"><big><span
+ style="font-family: monospace;">0 OK, 0:1</span></big></font>
+ at the bottom of the screen. </font></p>
+ <p><font face="Lucida Grande,Helvetica,Arial"> Congratulations! You
+ have now installed the Spectranet firmware. To save having to go
+ through all that every time you start Fuse, save a .szx snapshot
+ at this point, and load that in every time you want to use the
+ Spectranet.</font></p>
<!-- AppleSegEnd -->
</body>
</html>
Modified: branches/Release-1_1_0/fuse/hacking/ChangeLog
===================================================================
--- branches/Release-1_1_0/fuse/hacking/ChangeLog 2013-06-01 07:10:26 UTC (rev 762)
+++ branches/Release-1_1_0/fuse/hacking/ChangeLog 2013-06-01 07:15:01 UTC (rev 763)
@@ -4518,3 +4518,13 @@
20130524 ChangeLog,README: updates for a "1.1.1" release (Fred).
20130524 ChangeLog,README,configure.ac,man/fuse.1: fill in date and bump
version number (Stuart).
+20130526 Makefile.am,ui/win32/installer/fuse.nsi.in: distribute ChangeLog and
+ build notes in Windows packages (Sergio).
+20130527 pokefinder/pokemem.c: fix crash when opening a file without extension
+ (patch #312) (UB880D and Sergio).
+20130531 man/fuse.1: correct Spectranet initialisation script (thanks, Guesser)
+ (Fred).
+20130531 man/fuse.1: add missing documentation (fixes bug #282) (Stuart).
+20130531 ui/win32/installer/fuse.nsi.in: adding Fuse to the OpenWith list for
+ file extensions could result in an true association under some
+ circumstances on Windows 7 (thanks, Alessandro Grussu) (Sergio).
Modified: branches/Release-1_1_0/fuse/man/fuse.1
===================================================================
--- branches/Release-1_1_0/fuse/man/fuse.1 2013-06-01 07:10:26 UTC (rev 762)
+++ branches/Release-1_1_0/fuse/man/fuse.1 2013-06-01 07:15:01 UTC (rev 763)
@@ -1988,6 +1988,13 @@
you wish to stop the tape at a specific point.
.RE
.PP
+.I "Accelerate loaders"
+.RS
+If this option is enabled, then Fuse will attempt to accelerate tape
+loaders by \(lqshort circuiting\(rq the loading loop. This will in
+general speed up loading, but may cause some loaders to fail.
+.RE
+.PP
.I "Detect loaders"
.RS
If this option is enabled, Fuse will attempt to detect when a loading
@@ -2046,6 +2053,14 @@
If the value smaller than 4 or greater than 254 Fuse assumes 4 or 254.
.RE
.PP
+.I "Random length MDR cartridge"
+.RS
+If this option is enabled, Fuse will use a random Microdrive cartridge
+length instead of the length specified in the
+.I "MDR cartridge len"
+option.
+.RE
+.PP
.I "RS-232 handshake"
.RS
If you turn this option off, Fuse assumes the RS-232 line other end is
@@ -2211,6 +2226,12 @@
connected mouse may be used.
.RE
.PP
+.I "Swap mouse buttons"
+.RS
+If this option is enabled, the left and right mouse buttons will be swapped
+when emulating a Kempston mouse.
+.RE
+.PP
.I "Fuller Box"
.RS
If this option is selected, Fuse will emulate a Fuller Box AY sound and
@@ -2365,14 +2386,6 @@
section for more details.
.RE
.PP
-.I "Opus Discovery interface"
-.RS
-If this option is selected, Fuse will emulate the Opus Discovery interface.
-See the
-.B "OPUS DISCOVERY EMULATION"
-section for more details.
-.RE
-.PP
.I "+D interface"
.RS
If this option is selected, Fuse will emulate the +D interface. See the
@@ -2395,8 +2408,22 @@
section for more details. Beta\ 128 emulation is enabled for the
Pentagon and Scorpion machines regardless of this option.
.RE
+.PP
+.I "Beta\ 128 auto-boot in 48K\ machines"
+.RS
+If this option is selected, then when a Beta\ 128 interface is used in 48K
+or TC2048 emulation, the machine will boot directly into the TR-DOS system.
.RE
.PP
+.I "Opus Discovery interface"
+.RS
+If this option is selected, Fuse will emulate the Opus Discovery interface.
+See the
+.B "OPUS DISCOVERY EMULATION"
+section for more details.
+.RE
+.RE
+.PP
.I "Options, RZX..."
.RS
Display the RZX Options dialog, letting you configure how Fuse's deals
@@ -3740,11 +3767,7 @@
starting with \(lqAlioth Spectranet\(rq and ending with the Spectranet's IP
address (which will be 255.255.255.255 at this stage).
.PP
-If you see all that, type the following command:
-.PP
-%cfgnew
-.PP
-Which will show the standard 0 OK, 0:1 at the bottom of the screen. Now trigger an NMI (the Machine / NMI menu option)
+Now trigger an NMI (the Machine / NMI menu option)
and you should get a white on blue Spectranet NMI menu with five
options.
.PP
@@ -3798,7 +3821,17 @@
.PP
If everything looks correct, select [I] Save changes and exit (you'll
see a brief \(lqSaving configuration...\(rq message) followed by [E] Exit,
-at which point you'll be returned to BASIC. Reset the Spectrum again
+at which point you'll be returned to BASIC.
+.PP
+Now type the following commands:
+.PP
+%cfgnew
+.br
+%cfgcommit
+.PP
+Which will show the standard 0 OK, 0:1 at the bottom of the screen.
+.PP
+Reset the Spectrum again
and you'll see the same four line status display, but this time with
your IP address on the last line.
.PP
Modified: branches/Release-1_1_0/fuse/pokefinder/pokemem.c
===================================================================
--- branches/Release-1_1_0/fuse/pokefinder/pokemem.c 2013-06-01 07:10:26 UTC (rev 762)
+++ branches/Release-1_1_0/fuse/pokefinder/pokemem.c 2013-06-01 07:15:01 UTC (rev 763)
@@ -1,7 +1,7 @@
/* pokemem.c: help with handling pokes
Copyright (c) 2011 Philip Kendall, Sergio Baldoví
- $Id: pokemem.c 4785 2012-12-07 23:56:40Z sbaldovi $
+ $Id: pokemem.c 5005 2013-05-29 21:17:26Z pak21 $
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
@@ -487,8 +487,8 @@
int
pokemem_find_pokfile( const char *path )
{
- int n, has_extension;
- size_t length, filename_size, last_dot, last_slash;
+ int n, has_extension, last_dot, last_slash;
+ size_t length, filename_size;
char *test_file, *c;
if( pokfile ) return 1; /* Previous .pok file already found */
@@ -507,7 +507,7 @@
c = strrchr( test_file, '.' );
last_dot = ( c )? c - test_file : -1;
- has_extension = ( last_dot > last_slash );
+ has_extension = ( last_dot > last_slash + 1 );
/* Try .pok extension */
if( has_extension ) {
@@ -532,15 +532,16 @@
}
/* Browse POKES/ directory */
- if( last_slash ) {
+ if( last_slash >= 0 ) {
n = last_slash + 1; /* insert directory */
- filename_size = ( has_extension )? last_dot - last_slash - 1 :
- strlen( &path[n] );
+ filename_size =
+ ( has_extension )? (unsigned int) ( last_dot - last_slash - 1 ) :
+ strlen( &path[n] );
test_file[ n ] = '\0';
strncat( test_file, "POKES", 5 );
} else {
n = 0; /* prepend directory */
- filename_size = ( has_extension )? last_dot : length;
+ filename_size = ( has_extension )? (unsigned int) last_dot : length;
strncpy( test_file, "POKES", 5 );
test_file[ 5 ] = '\0';
}
Modified: branches/Release-1_1_0/fuse/ui/win32/installer/fuse.nsi.in
===================================================================
--- branches/Release-1_1_0/fuse/ui/win32/installer/fuse.nsi.in 2013-06-01 07:10:26 UTC (rev 762)
+++ branches/Release-1_1_0/fuse/ui/win32/installer/fuse.nsi.in 2013-06-01 07:15:01 UTC (rev 763)
@@ -1,7 +1,7 @@
## NSIS (nsis.sf.net) script to produce installer for win32 platform
## Copyright (c) 2009 Marek Januszewski
-## $Id: fuse.nsi.in 4775 2012-11-26 23:03:36Z sbaldovi $
+## $Id: fuse.nsi.in 5010 2013-05-31 18:32:45Z sbaldovi $
## 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
@@ -116,10 +116,6 @@
${CallArtificialFunction} UnRegisterExtension_
!macroend
-!macro AddOpenWithListCall _EXTENSION
- WriteRegStr HKLM "Software\Classes\${_EXTENSION}\OpenWithProgids" "${PROG_ID}" ""
-!macroend
-
!macro SelectUnregisteredExt_
Exch $R1 ;section
Exch
@@ -146,6 +142,9 @@
Exch $R0 ;extension
Push $0
+ ; Recommend Fuse in the Open With list
+ WriteRegStr HKLM "Software\Classes\$R0\OpenWithProgids" "${PROG_ID}" ""
+
; Read global file association
ReadRegStr $0 HKLM "Software\Classes\$R0" ""
StrCmp "$0" "" NoBackup ; is it empty
@@ -211,7 +210,6 @@
!define SelectUnregisteredExt `!insertmacro SelectUnregisteredExtCall`
!define RegisterExtension `!insertmacro RegisterExtensionCall`
!define UnRegisterExtension `!insertmacro UnRegisterExtensionCall`
-!define AddOpenWithList `!insertmacro AddOpenWithListCall`
;--------------------------------
; Uninstall previous version
@@ -246,10 +244,12 @@
; Installation files
File "AUTHORS.txt"
+ File "ChangeLog.txt"
File "COPYING.txt"
File "fuse.exe"
File "fuse.html"
File "README.txt"
+ File /nonfatal "README-win32.txt"
File "*.dll"
SetOutPath $INSTDIR\lib
File "lib\*"
@@ -303,14 +303,6 @@
WriteRegStr HKLM "Software\Classes\${PROG_ID}\shell\open\command" "" '"$INSTDIR\fuse.exe" "%1"'
WriteRegStr HKLM "Software\Classes\Applications\fuse.exe" "NoOpenWith" ""
- ; Recommend Fuse for known extensions
- ${AddOpenWithList} ".pzx"
- ${AddOpenWithList} ".rzx"
- ${AddOpenWithList} ".sna"
- ${AddOpenWithList} ".szx"
- ${AddOpenWithList} ".tap"
- ${AddOpenWithList} ".tzx"
- ${AddOpenWithList} ".z80"
System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
SectionEnd
@@ -362,10 +354,12 @@
Delete "$INSTDIR\roms\*"
RMDir "$INSTDIR\roms"
Delete "$INSTDIR\AUTHORS.txt"
+ Delete "$INSTDIR\ChangeLog.txt"
Delete "$INSTDIR\COPYING.txt"
Delete "$INSTDIR\fuse.exe"
Delete "$INSTDIR\fuse.html"
Delete "$INSTDIR\README.txt"
+ Delete "$INSTDIR\README-win32.txt"
Delete "$INSTDIR\*.dll"
RMDir "$INSTDIR"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
