[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx:[829] trunk
Brought to you by:
fredm
Menu
▾
▴
[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx:[829] trunk
|
From: <fr...@us...> - 2016-10-03 12:02:52
|
Revision: 829
http://sourceforge.net/p/fuse-for-macosx/code/829
Author: fredm
Date: 2016-10-03 12:02:48 +0000 (Mon, 03 Oct 2016)
Log Message:
-----------
Merge up to vendor release 1.3.0.
Modified Paths:
--------------
trunk/FuseGenerator/config.h
trunk/FuseImporter/config.h
trunk/fuse/AUTHORS
trunk/fuse/ChangeLog
trunk/fuse/INSTALL
trunk/fuse/Makefile.am
trunk/fuse/README
trunk/fuse/autogen.sh
trunk/fuse/compat/Makefile.am
trunk/fuse/configure.ac
trunk/fuse/data/Makefile.am
trunk/fuse/data/shell-completion/bash/fuse
trunk/fuse/data/win32/distribution.mk
trunk/fuse/data/win32/installer.nsi.in
trunk/fuse/debugger/Makefile.am
trunk/fuse/debugger/commandl.l
trunk/fuse/debugger/commandy.y
trunk/fuse/display.c
trunk/fuse/fusepb/English.lproj/InfoPlist.strings
trunk/fuse/fusepb/Info-Fuse.plist
trunk/fuse/fusepb/config.h
trunk/fuse/fusepb/keystate.c
trunk/fuse/fusepb/libspectrum.h
trunk/fuse/fusepb/models/Emulator.m
trunk/fuse/fusepb/resources/Fuse Help/Fuse Help.helpindex
trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html
trunk/fuse/fusepb/resources/Fuse Help/html/general.html
trunk/fuse/fusepb/xibs/Preferences.xib
trunk/fuse/hacking/ChangeLog
trunk/fuse/hacking/Makefile.am
trunk/fuse/input.c
trunk/fuse/input.h
trunk/fuse/keyboard.c
trunk/fuse/keysyms.dat
trunk/fuse/keysyms.pl
trunk/fuse/lib/Makefile.am
trunk/fuse/machines/Makefile.am
trunk/fuse/man/Makefile.am
trunk/fuse/man/fuse.1
trunk/fuse/menu_data.dat
trunk/fuse/menu_data.pl
trunk/fuse/peripherals/Makefile.am
trunk/fuse/peripherals/disk/beta.c
trunk/fuse/peripherals/disk/didaktik.c
trunk/fuse/peripherals/disk/didaktik.h
trunk/fuse/peripherals/disk/trdos.c
trunk/fuse/peripherals/disk/trdos.h
trunk/fuse/peripherals/disk/upd_fdc.c
trunk/fuse/peripherals/usource.c
trunk/fuse/peripherals/usource.h
trunk/fuse/perl/Makefile.am
trunk/fuse/pokefinder/Makefile.am
trunk/fuse/roms/Makefile.am
trunk/fuse/roms/plus3e-0.rom
trunk/fuse/roms/plus3e-1.rom
trunk/fuse/roms/plus3e-2.rom
trunk/fuse/settings-header.pl
trunk/fuse/settings.dat
trunk/fuse/settings.pl
trunk/fuse/sound/Makefile.am
trunk/fuse/svg.c
trunk/fuse/svg.h
trunk/fuse/timer/Makefile.am
trunk/fuse/ui/Makefile.am
trunk/fuse/ui/cocoa/keysyms.m
trunk/fuse/ui/fb/Makefile.am
trunk/fuse/ui/gtk/Makefile.am
trunk/fuse/ui/gtk/options.pl
trunk/fuse/ui/options.dat
trunk/fuse/ui/scaler/Makefile.am
trunk/fuse/ui/sdl/Makefile.am
trunk/fuse/ui/svga/Makefile.am
trunk/fuse/ui/uimedia.h
trunk/fuse/ui/widget/Makefile.am
trunk/fuse/ui/widget/debugger.c
trunk/fuse/ui/widget/filesel.c
trunk/fuse/ui/widget/menu.c
trunk/fuse/ui/widget/options.pl
trunk/fuse/ui/widget/pokemem.c
trunk/fuse/ui/widget/text.c
trunk/fuse/ui/widget/widget.c
trunk/fuse/ui/widget/widget.h
trunk/fuse/ui/widget/widget_internals.h
trunk/fuse/ui/wii/Makefile.am
trunk/fuse/ui/win32/Makefile.am
trunk/fuse/ui/win32/debugger.rc
trunk/fuse/ui/win32/options-resource.pl
trunk/fuse/ui/win32/options.pl
trunk/fuse/ui/win32/win32internals.h
trunk/fuse/ui/win32/win32joystick.rc
trunk/fuse/ui/win32/win32keyboard.c
trunk/fuse/ui/win32/win32ui.c
trunk/fuse/ui/xlib/Makefile.am
trunk/fuse/uimedia.c
trunk/fuse/unittests/Makefile.am
trunk/fuse/z80/Makefile.am
trunk/fuse/z80/z80.pl
trunk/fuse/z80/z80_debugger_variables.c
trunk/libspectrum/Info.plist
trunk/libspectrum/config.h
trunk/libspectrum/libspectrum/ChangeLog
trunk/libspectrum/libspectrum/Makefile.am
trunk/libspectrum/libspectrum/README
trunk/libspectrum/libspectrum/accessor.pl
trunk/libspectrum/libspectrum/autogen.sh
trunk/libspectrum/libspectrum/configure.ac
trunk/libspectrum/libspectrum/doc/libspectrum.3
trunk/libspectrum/libspectrum/doc/libspectrum.txt
trunk/libspectrum/libspectrum/hacking/ChangeLog
trunk/libspectrum/libspectrum/libspectrum.h.in
trunk/libspectrum/libspectrum/pzx_read.c
trunk/libspectrum/libspectrum/snap_accessors.txt
trunk/libspectrum/libspectrum/szx.c
trunk/libspectrum/libspectrum/test/Makefile.am
trunk/libspectrum/libspectrum/zip.c
trunk/libspectrum/libspectrum/zip.h
trunk/libspectrum/libspectrum.h
trunk/libspectrum/libspectrum.xcodeproj/project.pbxproj
Added Paths:
-----------
trunk/fuse/ui/widget/about.c
Property Changed:
----------------
trunk/fuse/
trunk/libspectrum/libspectrum/
Modified: trunk/FuseGenerator/config.h
===================================================================
--- trunk/FuseGenerator/config.h 2016-10-03 04:43:34 UTC (rev 828)
+++ trunk/FuseGenerator/config.h 2016-10-03 12:02:48 UTC (rev 829)
@@ -83,7 +83,7 @@
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION "1.2.1"
+#define VERSION "1.3.0"
/* Define to 1 if your processor stores words with the most significant byte
first (like Motorola and SPARC, unlike Intel and VAX). */
Modified: trunk/FuseImporter/config.h
===================================================================
--- trunk/FuseImporter/config.h 2016-10-03 04:43:34 UTC (rev 828)
+++ trunk/FuseImporter/config.h 2016-10-03 12:02:48 UTC (rev 829)
@@ -83,7 +83,7 @@
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION "1.2.1"
+#define VERSION "1.3.0"
/* Define to 1 if your processor stores words with the most significant byte
first (like Motorola and SPARC, unlike Intel and VAX). */
Index: trunk/fuse
===================================================================
--- trunk/fuse 2016-10-03 04:43:34 UTC (rev 828)
+++ trunk/fuse 2016-10-03 12:02:48 UTC (rev 829)
Property changes on: trunk/fuse
___________________________________________________________________
Modified: svn:mergeinfo
## -1,5 +1,5 ##
/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-821
+/vendor/fuse-emulator/current/fuse:530-828
/vendor/fuse-emulator/fuse-1.0.0a/fuse:668-669
/vendor/fuse-emulator/fuse-r4617/fuse:686
\ No newline at end of property
Modified: trunk/fuse/AUTHORS
===================================================================
--- trunk/fuse/AUTHORS 2016-10-03 04:43:34 UTC (rev 828)
+++ trunk/fuse/AUTHORS 2016-10-03 12:02:48 UTC (rev 829)
@@ -54,4 +54,4 @@
* Philip Kendall: everything else.
-$Id: AUTHORS 5569 2016-06-01 11:12:38Z fredm $
+$Id: AUTHORS 5606 2016-06-07 11:32:25Z fredm $
Modified: trunk/fuse/ChangeLog
===================================================================
--- trunk/fuse/ChangeLog 2016-10-03 04:43:34 UTC (rev 828)
+++ trunk/fuse/ChangeLog 2016-10-03 12:02:48 UTC (rev 829)
@@ -1,3 +1,25 @@
+2016-10-02 Philip Kendall <phi...@sh...>
+
+ * Fuse 1.3.0 released.
+
+ * New features:
+ * Recreated ZX Spectrum Bluetooth keyboard support (thanks, thrice,
+ Philip Kendall and Sergio Baldoví) (Ekkehard Morgenstern).
+
+ * Emulation core improvements:
+ * Reset machine when auto-loading TRD/SCL disks (thanks, BogDan Vatra
+ and Fredrick Meunier) (Sergio Baldoví).
+
+ * Machine specific improvements:
+ * Update +3e ROMs to v1.43 (Sergio Baldoví; thanks, Garry Lancaster).
+
+ * Miscellaneous improvements:
+ * WidgetUI: Add About Fuse dialog with less cluttered text (Sergio
+ Baldoví).
+ * Print summary of enabled features when building Fuse (Alberto
+ Garcia).
+ * Various minor bugfixes.
+
2016-08-21 Philip Kendall <phi...@sh...>
* Fuse 1.2.2 released.
@@ -1351,4 +1373,4 @@
* Version 0.1.0 released.
-$Id: ChangeLog 5761 2016-08-21 05:10:02Z fredm $
+$Id: ChangeLog 5818 2016-10-02 11:35:56Z fredm $
Modified: trunk/fuse/INSTALL
===================================================================
--- trunk/fuse/INSTALL 2016-10-03 04:43:34 UTC (rev 828)
+++ trunk/fuse/INSTALL 2016-10-03 12:02:48 UTC (rev 829)
@@ -161,4 +161,4 @@
respectively. That will make a temporary subdirectory (fuse-VERSION-win32)
in the build directory and then will create a package.
-$Id: INSTALL 5407 2016-04-25 21:59:53Z sbaldovi $
+$Id: INSTALL 5406 2016-04-25 21:52:03Z sbaldovi $
Modified: trunk/fuse/Makefile.am
===================================================================
--- trunk/fuse/Makefile.am 2016-10-03 04:43:34 UTC (rev 828)
+++ trunk/fuse/Makefile.am 2016-10-03 12:02:48 UTC (rev 829)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 1999-2015 Philip Kendall
-## $Id: Makefile.am 5735 2016-08-14 13:02:21Z fredm $
+## $Id: Makefile.am 5731 2016-08-12 13:18:42Z fredm $
## 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
Modified: trunk/fuse/README
===================================================================
--- trunk/fuse/README 2016-10-03 04:43:34 UTC (rev 828)
+++ trunk/fuse/README 2016-10-03 12:02:48 UTC (rev 829)
@@ -1,4 +1,4 @@
-The Free Unix Spectrum Emulator (Fuse) 1.2.2
+The Free Unix Spectrum Emulator (Fuse) 1.3.0
============================================
Fuse (the Free Unix Spectrum Emulator) was originally, and somewhat
@@ -108,6 +108,6 @@
<http://www.worldofspectrum.org/forums/>.
Philip Kendall <phi...@sh...>
-21st August, 2016
+2nd October, 2016
-$Id: README 5761 2016-08-21 05:10:02Z fredm $
+$Id: README 5818 2016-10-02 11:35:56Z fredm $
Modified: trunk/fuse/autogen.sh
===================================================================
--- trunk/fuse/autogen.sh 2016-10-03 04:43:34 UTC (rev 828)
+++ trunk/fuse/autogen.sh 2016-10-03 12:02:48 UTC (rev 829)
@@ -4,7 +4,7 @@
# Copyright (c) 2004 Philip Kendall
# Copyright (c) 2014 Sergio Baldoví
-# $Id: autogen.sh 5434 2016-05-01 04:22:45Z fredm $
+# $Id: autogen.sh 5432 2016-05-01 04:16:09Z fredm $
# 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
Modified: trunk/fuse/compat/Makefile.am
===================================================================
--- trunk/fuse/compat/Makefile.am 2016-10-03 04:43:34 UTC (rev 828)
+++ trunk/fuse/compat/Makefile.am 2016-10-03 12:02:48 UTC (rev 829)
@@ -2,7 +2,7 @@
## Copyright (c) 2003-2013 Philip Kendall
## Copyright (c) 2015 Sergio Baldoví
-## $Id: Makefile.am 5677 2016-07-09 13:58:02Z fredm $
+## $Id: Makefile.am 5621 2016-06-09 10:29:12Z fredm $
## 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
Modified: trunk/fuse/configure.ac
===================================================================
--- trunk/fuse/configure.ac 2016-10-03 04:43:34 UTC (rev 828)
+++ trunk/fuse/configure.ac 2016-10-03 12:02:48 UTC (rev 829)
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-dnl $Id: configure.ac 5761 2016-08-21 05:10:02Z fredm $
+dnl $Id: configure.ac 5809 2016-09-24 04:27:40Z fredm $
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
@@ -20,12 +20,12 @@
dnl E-mail: phi...@sh...
dnl Package version
-m4_define([fuse_version], [1.2.2])
+m4_define([fuse_version], [1.3.0])
dnl Product full version
m4_define([fuse_major_version], [1])
-m4_define([fuse_minor_version], [2])
-m4_define([fuse_micro_version], [2])
+m4_define([fuse_minor_version], [3])
+m4_define([fuse_micro_version], [0])
m4_define([fuse_nano_version], [0])
m4_define([fuse_full_version], [fuse_major_version.fuse_minor_version.fuse_micro_version.fuse_nano_version])
m4_define([fuse_rc_version], [fuse_major_version,fuse_minor_version,fuse_micro_version,fuse_nano_version])
@@ -461,9 +461,10 @@
zlib=yes)
AC_MSG_RESULT($zlib)
if test "$zlib" = yes; then
+ zlib=no
AC_CHECK_HEADERS(
zlib.h,
- AC_SEARCH_LIBS(compress2, z zdll)
+ AC_SEARCH_LIBS(compress2, z zdll, zlib=yes)
)
fi
@@ -511,7 +512,8 @@
[PNG],
[libpng],
[AC_DEFINE([USE_LIBPNG], 1, [Defined if we're going to be using the installed libpng])],
- [AC_MSG_WARN([libpng not found - saving screenshots disabled])]
+ [AC_MSG_WARN([libpng not found - saving screenshots disabled])
+ libpng=no]
)
fi
@@ -583,40 +585,44 @@
AC_MSG_CHECKING(which sound routines to use)
if test "$UI" = sdl; then
SOUND_LIBADD='sound/sdlsound.$(OBJEXT)' SOUND_LIBS='' sound_fifo=yes
- AC_MSG_RESULT(SDL)
+ audio_driver="SDL"
elif test "$dxsound_available" = yes; then
SOUND_LIBADD='sound/dxsound.$(OBJEXT)' SOUND_LIBS='-ldsound -lole32 -ldxguid'
- AC_MSG_RESULT(DirectX)
+ audio_driver="DirectX"
AC_DEFINE([DIRECTSOUND_VERSION], 0x0700, [DirectX 7 or higher is required])
elif test "$win32sound_available" = yes; then
SOUND_LIBADD='sound/win32sound.$(OBJEXT)' SOUND_LIBS='-lwinmm'
- AC_MSG_RESULT(win32sound)
+ audio_driver="win32sound"
elif test "$alsa_available" = yes; then
SOUND_LIBADD='sound/alsasound.$(OBJEXT)' SOUND_LIBS='-lasound'
- AC_MSG_RESULT(ALSA)
+ audio_driver="ALSA"
elif test "$ao_available" = yes; then
SOUND_LIBADD='sound/aosound.$(OBJEXT)' SOUND_LIBS='-lao'
- AC_MSG_RESULT(libao)
+ audio_driver="libao"
elif test "$ac_cv_header_dsound_h" = yes; then
# Later selection between these two
SOUND_LIBADD='sound/sunsound.$(OBJEXT) sound/hpsound.$(OBJEXT)' SOUND_LIBS=''
- AC_MSG_RESULT(Solaris or HP/UX)
+ audio_driver="Solaris or HP/UX"
elif test "$ac_cv_header_sys_soundcard_h" = yes; then
SOUND_LIBADD='sound/osssound.$(OBJEXT)' SOUND_LIBS=''
- AC_MSG_RESULT(OSS)
+ audio_driver="OSS"
elif test "$ac_cv_header_sys_audioio_h" = yes; then
dnl OpenBSD
SOUND_LIBADD='sound/sunsound.$(OBJEXT)' SOUND_LIBS=''
- AC_MSG_RESULT(OpenBSD)
+ audio_driver="OpenBSD"
elif test "$coreaudio_available" = yes; then
SOUND_LIBADD='sound/coreaudiosound.$(OBJEXT)' SOUND_LIBS='-framework CoreAudio -framework AudioUnit' sound_fifo=yes
- AC_MSG_RESULT(CoreAudio)
+ audio_driver="CoreAudio"
elif test "$wii" = yes; then
SOUND_LIBADD='sound/wiisound.$(OBJEXT)' SOUND_LIBS='' sound_fifo=yes
- AC_MSG_RESULT(Wii)
+ audio_driver="Wii"
else
SOUND_LIBADD='sound/nullsound.$(OBJEXT)' SOUND_LIBS=''
- AC_MSG_RESULT(none)
+ audio_driver="none"
+fi
+
+AC_MSG_RESULT($audio_driver)
+if test "$audio_driver" = "none"; then
AC_DEFINE([NO_SOUND], 1, [Defined if no sound code is present])
AC_MSG_WARN(No sound library has been found)
fi
@@ -683,7 +689,8 @@
SDL_VERSION=1.2.4
AM_PATH_SDL($SDL_VERSION,
AC_DEFINE([USE_JOYSTICK], 1, [Defined if we're using hardware joysticks]),
- AC_MSG_WARN([SDL version $SDL_VERSION not found - joystick support disabled]))
+ AC_MSG_WARN([SDL version $SDL_VERSION not found - joystick support disabled])
+ stick=no)
fi
;;
wii)
@@ -702,7 +709,8 @@
LIBS="$LIBS -ljsw";
AC_DEFINE([USE_JOYSTICK], 1,
[Defined if we're using hardware joysticks]),
- AC_MSG_WARN(jsw.h not found - joystick support disabled))
+ AC_MSG_WARN(jsw.h not found - joystick support disabled)
+ stick=no)
fi
fi
@@ -718,7 +726,8 @@
[XML],
[libxml-2.0],
[AC_DEFINE([HAVE_LIB_XML2], 1, [Defined if we've got libxml2])],
- [AC_MSG_WARN([libxml2 not found - config file will use ini format])]
+ [AC_MSG_WARN([libxml2 not found - config file will use ini format])
+ libxml2="no"]
)
fi
@@ -859,7 +868,7 @@
AC_ARG_ENABLE(desktop-integration,
AS_HELP_STRING([--enable-desktop-integration], [add menu entry and file associations]),
if test "$enableval" = yes; then desktopintegration=yes; else desktopintegration=no; fi,
-desktdesktopintegration=no)
+desktopintegration=no)
AC_MSG_CHECKING(whether to install desktop file)
AC_MSG_RESULT($desktopintegration)
AM_CONDITIONAL(DESKTOP_INTEGRATION, test "$desktopintegration" = yes)
@@ -937,3 +946,40 @@
])
AC_OUTPUT
+
+dnl Status summary
+echo ""
+echo "****************************"
+echo "*** Libspectrum features ***"
+echo "****************************"
+echo ""
+echo "Internal GLib replacement: ${fakeglib}"
+echo "zlib support: ${LIBSPEC_HAVE_ZLIB:-no}"
+echo "bzip2 support: ${LIBSPEC_HAVE_BZ2:-no}"
+echo "audiofile support: ${LIBSPEC_HAVE_AUDIOFILE:-no}"
+echo ""
+echo "********************"
+echo "*** Fuse options ***"
+echo "********************"
+echo ""
+echo "User interface: ${UI}"
+if test "${UI}" = "gtk"; then
+ echo "Using GTK+ 3: ${gtk3}"
+fi
+if test x"${gpm}" != "x"; then
+ echo "libgpm support: ${gpm}"
+fi
+echo "Joystick support: ${stick}"
+if test "${stick}" = "yes"; then
+ echo "Using libjsw for joystick support: ${libjsw}"
+fi
+echo "zlib support: ${zlib}"
+echo "libxml2 support: ${libxml2}"
+echo "libpng support: ${libpng}"
+echo "Audio driver: ${audio_driver}"
+echo "Spectranet support: ${build_spectranet}"
+echo "SpeccyBoot support: ${linux_tap:-no}"
+echo "Desktop integration: ${desktopintegration}"
+echo ""
+echo "Type 'make' to compile Fuse"
+echo ""
Modified: trunk/fuse/data/Makefile.am
===================================================================
--- trunk/fuse/data/Makefile.am 2016-10-03 04:43:34 UTC (rev 828)
+++ trunk/fuse/data/Makefile.am 2016-10-03 12:02:48 UTC (rev 829)
@@ -2,7 +2,7 @@
## Copyright (c) 2011 Philip Kendall
## Copyright (c) 2013-2015 Sergio Baldoví
-## $Id: Makefile.am 5434 2016-05-01 04:22:45Z fredm $
+## $Id: Makefile.am 5432 2016-05-01 04:16:09Z fredm $
## 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
Modified: trunk/fuse/data/shell-completion/bash/fuse
===================================================================
--- trunk/fuse/data/shell-completion/bash/fuse 2016-10-03 04:43:34 UTC (rev 828)
+++ trunk/fuse/data/shell-completion/bash/fuse 2016-10-03 12:02:48 UTC (rev 829)
@@ -220,7 +220,7 @@
--no-melodik --no-mouse-swap-buttons
--no-movie-stop-after-rzx --no-opus --no-pal-tv2x
--no-plus3-detect-speedlock --no-plusd --no-printer
- --no-raw-s-net --no-rs232-handshake
+ --no-raw-s-net --no-recreated-spectrum --no-rs232-handshake
--no-rzx-autosaves --no-simpleide --no-slt --no-sound
--no-sound-force-8bit --no-speccyboot --no-specdrum
--no-spectranet --no-spectranet-disable --no-statusbar
@@ -229,7 +229,8 @@
--no-zxatasp-write-protect --no-zxcf --no-zxcf-upload
--no-zxprinter --opus --opusdisk --pal-tv2x --playback
--plus3-detect-speedlock --plus3disk --plusd --plusddisk
- --printer --rate --raw-s-net --record --rom-128-0 --rom-128-1
+ --printer --rate --raw-s-net --record --recreated-spectrum
+ --rom-128-0 --rom-128-1
--rom-16 --rom-48 --rom-beta128 --rom-didaktik80 --rom-disciple
--rom-interface-1 --rom-opus
--rom-pentagon-0 --rom-pentagon-1 --rom-pentagon-2
Modified: trunk/fuse/data/win32/distribution.mk
===================================================================
--- trunk/fuse/data/win32/distribution.mk 2016-10-03 04:43:34 UTC (rev 828)
+++ trunk/fuse/data/win32/distribution.mk 2016-10-03 12:02:48 UTC (rev 829)
@@ -1,7 +1,7 @@
## This file does not need automake. Include in the final Makefile.
## Copyright (c) 2013-2016 Sergio Baldoví
-## $Id: distribution.mk 5434 2016-05-01 04:22:45Z fredm $
+## $Id: distribution.mk 5432 2016-05-01 04:16:09Z fredm $
## 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
Modified: trunk/fuse/data/win32/installer.nsi.in
===================================================================
--- trunk/fuse/data/win32/installer.nsi.in 2016-10-03 04:43:34 UTC (rev 828)
+++ trunk/fuse/data/win32/installer.nsi.in 2016-10-03 12:02:48 UTC (rev 829)
@@ -2,7 +2,7 @@
## Copyright (c) 2009 Marek Januszewski
## Copyright (c) 2016 Sergio Baldoví
-## $Id: installer.nsi.in 5434 2016-05-01 04:22:45Z fredm $
+## $Id: installer.nsi.in 5432 2016-05-01 04:16:09Z fredm $
## 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
Modified: trunk/fuse/debugger/Makefile.am
===================================================================
--- trunk/fuse/debugger/Makefile.am 2016-10-03 04:43:34 UTC (rev 828)
+++ trunk/fuse/debugger/Makefile.am 2016-10-03 12:02:48 UTC (rev 829)
@@ -2,7 +2,7 @@
## Copyright (c) 2001-2016 Philip Kendall
## Copyright (c) 2015 Sergio Baldoví
-## $Id: Makefile.am 5677 2016-07-09 13:58:02Z fredm $
+## $Id: Makefile.am 5661 2016-07-01 19:00:28Z 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
Modified: trunk/fuse/debugger/commandl.l
===================================================================
--- trunk/fuse/debugger/commandl.l 2016-10-03 04:43:34 UTC (rev 828)
+++ trunk/fuse/debugger/commandl.l 2016-10-03 12:02:48 UTC (rev 829)
@@ -2,7 +2,7 @@
Copyright (c) 2002-2016 Philip Kendall
Copyright (c) 2015 Sergio Baldoví
- $Id: commandl.l 5677 2016-07-09 13:58:02Z fredm $
+ $Id: commandl.l 5661 2016-07-01 19:00:28Z 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
Modified: trunk/fuse/debugger/commandy.y
===================================================================
--- trunk/fuse/debugger/commandy.y 2016-10-03 04:43:34 UTC (rev 828)
+++ trunk/fuse/debugger/commandy.y 2016-10-03 12:02:48 UTC (rev 829)
@@ -2,7 +2,7 @@
Copyright (c) 2002-2016 Philip Kendall
Copyright (c) 2015 Sergio Baldoví
- $Id: commandy.y 5677 2016-07-09 13:58:02Z fredm $
+ $Id: commandy.y 5661 2016-07-01 19:00:28Z 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
Modified: trunk/fuse/display.c
===================================================================
--- trunk/fuse/display.c 2016-10-03 04:43:34 UTC (rev 828)
+++ trunk/fuse/display.c 2016-10-03 12:02:48 UTC (rev 829)
@@ -100,9 +100,6 @@
/* Used to signify that we're redrawing the entire screen */
static int display_redraw_all;
-/* Value used to signify a border line has more than one colour on it. */
-static const int display_border_mixed = 0xff;
-
/* The last point at which we updated the screen display */
int critical_region_x = 0, critical_region_y = 0;
Modified: trunk/fuse/fusepb/English.lproj/InfoPlist.strings
===================================================================
(Binary files differ)
Modified: trunk/fuse/fusepb/Info-Fuse.plist
===================================================================
--- trunk/fuse/fusepb/Info-Fuse.plist 2016-10-03 04:43:34 UTC (rev 828)
+++ trunk/fuse/fusepb/Info-Fuse.plist 2016-10-03 12:02:48 UTC (rev 829)
@@ -582,11 +582,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>1.2.2</string>
+ <string>1.3.0</string>
<key>CFBundleSignature</key>
<string>FUSE</string>
<key>CFBundleVersion</key>
- <string>1.2.2</string>
+ <string>1.3.0</string>
<key>NSMainNibFile</key>
<string>MainMenu</string>
<key>NSPrincipalClass</key>
Modified: trunk/fuse/fusepb/config.h
===================================================================
--- trunk/fuse/fusepb/config.h 2016-10-03 04:43:34 UTC (rev 828)
+++ trunk/fuse/fusepb/config.h 2016-10-03 12:02:48 UTC (rev 829)
@@ -167,7 +167,7 @@
/* #undef USE_WIDGET */
/* Version number of package */
-#define VERSION "1.2.2"
+#define VERSION "1.3.0"
/* Define to 1 if your processor stores words with the most significant byte
first (like Motorola and SPARC, unlike Intel and VAX). */
Modified: trunk/fuse/fusepb/keystate.c
===================================================================
--- trunk/fuse/fusepb/keystate.c 2016-10-03 04:43:34 UTC (rev 828)
+++ trunk/fuse/fusepb/keystate.c 2016-10-03 12:02:48 UTC (rev 829)
@@ -30,6 +30,7 @@
#include "input.h"
#include "keyboard.h"
#include "keystate.h"
+#include "settings.h"
enum states {
NONE,
@@ -151,7 +152,21 @@
void
process_keyevent( enum events event, input_key keysym )
{
- if(event < MAX_EVENTS && current_state < MAX_STATES) {
+ if( settings_current.recreated_spectrum ) {
+ switch( event ) {
+ case PRESS_NORMAL:
+ case PRESS_SPECIAL:
+ press_key( keysym );
+ break;
+ case RELEASE_NORMAL:
+ case RELEASE_SPECIAL:
+ release_key( keysym );
+ break;
+ default:
+ // do nothing
+ break;
+ }
+ } else if(event < MAX_EVENTS && current_state < MAX_STATES) {
state_table[current_state][event]( keysym ); /* call the action procedure */
} else {
/* invalid event/state - shouldn't happen, just ignore for now */
Modified: trunk/fuse/fusepb/libspectrum.h
===================================================================
--- trunk/fuse/fusepb/libspectrum.h 2016-10-03 04:43:34 UTC (rev 828)
+++ trunk/fuse/fusepb/libspectrum.h 2016-10-03 12:02:48 UTC (rev 829)
@@ -1,7 +1,7 @@
/* libspectrum.h: the library for dealing with ZX Spectrum emulator files
Copyright (c) 2001-2015 Philip Kendall, Darren Salt, Fredrick Meunier
- $Id: libspectrum.h.in 5733 2016-08-14 12:45:40Z fredm $
+ $Id: libspectrum.h.in 5718 2016-08-07 12:21:23Z fredm $
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
Modified: trunk/fuse/fusepb/models/Emulator.m
===================================================================
--- trunk/fuse/fusepb/models/Emulator.m 2016-10-03 04:43:34 UTC (rev 828)
+++ trunk/fuse/fusepb/models/Emulator.m 2016-10-03 12:02:48 UTC (rev 829)
@@ -712,7 +712,7 @@
case INPUT_KEY_ampersand:
case INPUT_KEY_parenleft:
case INPUT_KEY_parenright:
- case INPUT_KEY_carat:
+ case INPUT_KEY_asciicircum:
case INPUT_KEY_asterisk:
return YES;
break;
Modified: trunk/fuse/fusepb/resources/Fuse Help/Fuse Help.helpindex
===================================================================
(Binary files differ)
Modified: trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html
===================================================================
--- trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html 2016-10-03 04:43:34 UTC (rev 828)
+++ trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html 2016-10-03 12:02:48 UTC (rev 829)
@@ -12,6 +12,50 @@
<!-- AppleSegStart="What's New In Fuse?" --><a name="What's New In
Fuse?" id="What's New In Fuse?"></a><!-- AppleSegDescription="This section describes the changes for version 1.2.1 of the Fuse emulator." --></font><br>
<h2><font><font face="Lucida Grande,Helvetica,Arial">What's new in
+ Fuse For Mac OS X 1.3.0</font></font></h2>
+ <ul>
+ <li><font face="Lucida Grande,Helvetica,Arial"><font face="Lucida
+ Grande,Helvetica,Arial">New features</font>:</font></li>
+ <li style="list-style-type: none; list-style-image: none;
+ list-style-position: outside;">
+ <ul>
+ <li><font face="Lucida Grande,Helvetica,Arial">Recreated ZX
+ Spectrum Bluetooth keyboard support (thanks, thrice,
+ Philip Kendall and Sergio Baldoví) (Ekkehard Morgenstern).</font></li>
+ </ul>
+ </li>
+ <li style="list-style-type: none; list-style-image: none;
+ list-style-position: outside;"><br>
+ </li>
+ <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">Reset machine
+ when auto-loading </font><font face="Lucida
+ Grande,Helvetica,Arial"><font face="Lucida
+ Grande,Helvetica,Arial">TR-DOS</font> disks (thanks,
+ BogDan Vatra and Fredrick Meunier) (Sergio Baldoví).</font></li>
+ </ul>
+ </li>
+ <li style="list-style-type: none; list-style-image: none;
+ list-style-position: outside;"><br>
+ </li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Machine specific
+ 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">Update +3e ROMs
+ to v1.43 (Sergio Baldoví; thanks, Garry Lancaster).</font></li>
+ </ul>
+ <br>
+ </li>
+ <li><font face="Lucida Grande,Helvetica,Arial"><font face="Lucida
+ Grande,Helvetica,Arial">Various other minor bugfixes.</font></font></li>
+ </ul>
+ <h2><font><font face="Lucida Grande,Helvetica,Arial">What's new in
Fuse For Mac OS X 1.2.2</font></font></h2>
<ul>
<li><font face="Lucida Grande,Helvetica,Arial"><font face="Lucida
@@ -20,8 +64,8 @@
list-style-position: outside;">
<ul>
<li><font face="Lucida Grande,Helvetica,Arial">Support loading
- first tape, snapshot, dock cartridge or input recording (RZX)
- file found inside .zip files (Patrik Rak and Sergio
+ first tape, snapshot, dock cartridge or input recording
+ (RZX) file found inside .zip files (Patrik Rak and Sergio
Baldoví).</font></li>
<li><font face="Lucida Grande,Helvetica,Arial">Support
auto-booting TR-DOS disk images without a boot file
@@ -329,183 +373,5 @@
<li><font face="Lucida Grande,Helvetica,Arial">Various other minor
bugfixes.</font></li>
</ul>
- <h2><font><font face="Lucida Grande,Helvetica,Arial">What's new in
- Fuse For Mac OS X 1.1.1.1</font></font></h2>
- <ul>
- <li><font face="Lucida Grande,Helvetica,Arial">Miscellaneous
- 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 kernel
- panic resizing window during screen updates (Fredrick
- Meunier).</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">Restore support
- for playing emulator recordings (RZX files) with no
- embedded snapshot</font><font face="Lucida
- Grande,Helvetica,Arial"> (Fredrick Meunier).</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">Restore support
- for competition mode emulator recordings (RZX files) </font><font
- face="Lucida Grande,Helvetica,Arial"><font face="Lucida
- Grande,Helvetica,Arial">(Fredrick Meunier).</font></font></li>
- <li><font face="Lucida Grande,Helvetica,Arial"><font
- face="Lucida Grande,Helvetica,Arial">Fix sound loop when
- pausing emulator</font></font><font face="Lucida
- Grande,Helvetica,Arial"> (Fredrick Meunier).</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">Now requires
- Mac OS X 10.8+</font></li>
- </ul>
- </li>
- </ul>
- <h2><font><font face="Lucida Grande,Helvetica,Arial">What's new in
- Fuse For Mac OS X 1.1.1</font></font></h2>
- <ul>
- <li><font face="Lucida Grande,Helvetica,Arial">New policy:</font></li>
- <li style="list-style-type: none; list-style-image: none;
- list-style-position: outside;">
- <ul>
- <li><font face="Lucida Grande,Helvetica,Arial">Remove all ROMs
- for which there isn't explicit permission to distribute
- (Philip Kendall). All the affected hardware is still
- supported, but the ROM images will need to be obtained
- elsewhere and then the Fuse preferences set to refer to
- these new ROM images. This applies to the following
- machines; Pentagon series and Scorpion, and the following
- interfaces; Interface I, Opus Discovery, Betadisk.</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">Any changes
- that enable and disable peripherals may result in a hard
- reset of the emulated machine if required for proper
- emulation of the hardware.<br>
- </font></li>
- </ul>
- <br>
- </li>
- <li><font face="Lucida Grande,Helvetica,Arial">New features:</font></li>
- <li style="list-style-type: none; list-style-image: none;
- list-style-position: outside;">
- <ul>
- <li><font face="Lucida Grande,Helvetica,Arial">Add Spectranet
- Ethernet interface emulation (Philip Kendall).</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">Add SpecDrum
- sound interface emulation (Jon Mitchell).</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">Add DISCiPLE
- disk interface emulation (Stuart Brady), note that
- Sinclair Network emulation is not provided, and the
- interface is not available under 128K emulation in this
- release.</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">Support reading
- PZX files (Fredrick Meunier).</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">Add support for
- POK files (Sergio Baldoví).</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">Add recording
- of movies to FMF files (Gergely Szasz).</font></li>
- </ul>
- </li>
- <li style="list-style-type: none; list-style-image: none;
- list-style-position: outside;"><br>
- </li>
- <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">Add support for
- ABC AY stereo (Stuart Brady).</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">Correct
- feedback in AY noise generator (Patrik Rak).</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">MIC bit only
- isn't enough to drive the speaker (Fredrick Meunier).</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">Mirror
- Interface 1 ROM to the second 8Kb of ROM as in the real
- interface (Fredrick Meunier, with thanks to mcleod_ideafix
- and zx81).</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">Support the
- Beta interface setting to not auto-boot the interface on
- 48K machines (ketmar).</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">Support setting
- late timings from snapshots (Fredrick Meunier).</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">Add separate
- switch to enable ZX Printer emulation (Fredrick Meunier).</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">Reset machine
- when installed peripherals are changed (Fredrick Meunier).</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">Fix memory disk
- image corrupted after save (Sergio Baldoví).</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">Allow up to 15
- joystick buttons to be defined to accommodate e.g. XBox
- 360 ABXY button use (Fredrick Meunier).</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">Fix loading of
- EDSK files with redundant sector images (Fredrick
- Meunier).<br>
- </font></li>
- </ul>
- <br>
- </li>
- <li><font face="Lucida Grande,Helvetica,Arial">Machine specific
- improvements:</font></li>
- <li style="list-style: none outside none;">
- <ul>
- <li><font face="Lucida Grande,Helvetica,Arial">Read and write
- all potential 1024k worth of memory pages from a snap
- (ketmar and Fredrick Meunier).</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">Initialise the
- Pentagon 1024k memory ports from a snapshot (ketmar and
- Fredrick Meunier).</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">Restore the
- paged state of the Beta ROM when loading Pentagon
- 128k/512k/1024k snapshots (ketmar and Fredrick Meunier).</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">Fix SE writing
- dock and exrom pages to snapshots (Fredrick Meunier).</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">Update SE ROMs
- to v4.04 (Fredrick Meunier).</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">Update to v1.38
- of the +3e ROMs (thanks, Guesser) (Fredrick Meunier).<br>
- </font></li>
- </ul>
- </li>
- <li style="list-style-type: none; list-style-image: none;
- list-style-position: outside;"><br>
- </li>
- <li><font face="Lucida Grande,Helvetica,Arial">Debugger
- 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">Disassemble ED
- 4D as RETI (Simon Owen).</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">Add IM, IFF1
- and IFF2 setting and getting to the debugger (Alex Badea).</font></li>
- </ul>
- <br>
- </li>
- <li><font face="Lucida Grande,Helvetica,Arial">Miscellaneous
- improvements:</font></li>
- <ul>
- <li><font face="Lucida Grande,Helvetica,Arial">Support for the
- TZX set signal level block (Fredrick Meunier).</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">Support setting
- late timings from snapshots (Fredrick Meunier).</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">Fix 16x9
- panoramic widescreen and non-panoramic non-4/3 widescreen
- (thanks, Adam Meath)</font><font face="Lucida
- Grande,Helvetica,Arial"><font face="Lucida
- Grande,Helvetica,Arial"> (Fredrick Meunier)</font>.</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">Properly handle
- opening and closing windows more than once</font><font
- face="Lucida Grande,Helvetica,Arial"><font face="Lucida
- Grande,Helvetica,Arial"> (Fredrick Meunier)</font>.</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">Fix display of
- memory map in debugger</font><font face="Lucida
- Grande,Helvetica,Arial"><font face="Lucida
- Grande,Helvetica,Arial"><font face="Lucida
- Grande,Helvetica,Arial"> (Fredrick Meunier)</font></font>.</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">Updated retina
- icon images from Paul van der Laan.<br>
- </font></li>
- </ul>
- <li style="list-style: none outside none;"><br>
- </li>
- <li><font face="Lucida Grande,Helvetica,Arial">Various other minor
- bugfixes.</font></li>
- </ul>
</body>
</html>
Modified: trunk/fuse/fusepb/resources/Fuse Help/html/general.html
===================================================================
--- trunk/fuse/fusepb/resources/Fuse Help/html/general.html 2016-10-03 04:43:34 UTC (rev 828)
+++ trunk/fuse/fusepb/resources/Fuse Help/html/general.html 2016-10-03 12:02:48 UTC (rev 829)
@@ -2,7 +2,7 @@
<html>
<head>
<meta http-equiv="content-type" content="text/html;
- charset=ISO-8859-1">
+ charset=windows-1252">
<!-- AppleSegStart="General Preferences" -->
<title>General Preferences</title>
</head>
@@ -135,10 +135,21 @@
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>
+ value, to let you run those games.</font></td>
</tr>
<tr>
+ <td valign="top"><span class="emphasis"><font face="Lucida
+ Grande,Helvetica,Arial"><em>Use Recreated ZX Spectrum
+ keyboard</em></font></span></td>
+ <td valign="top"><font face="Lucida Grande,Helvetica,Arial"><font
+ face="Lucida Grande,Helvetica,Arial">Enable the use of a
+ Recreated ZX Spectrum in game mode. This is a Bluetooth
+ keyboard in the shape of a 48K ZX Spectrum that can be paired
+ your Mac to give an authentic feeling of using a real ZX
+ Spectrum. While this mode is enabled, your Mac keyboard will
+ not give correct input to the emulator.</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>
@@ -147,21 +158,17 @@
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>
+ some real hardware.</font></td>
</tr>
<tr>
- <td style="vertical-align: top;"><span class="emphasis"><font
- face="Lucida Grande,Helvetica,Arial"><em>Z80
- is CMOS</em></font></span></td>
- <td style="vertical-align: top;"><font face="Lucida
- Grande,Helvetica,Arial">If selected, Fuse will emulate a
- CMOS Z80, as opposed to an NMOS Z80. The undocumented
- `OUT (C),0' instruction will be replaced with
- `OUT (C),255' and emulation of a minor timing bug in the
- NMOS Z80's `LD A,I' and `LD A,R' instructions will be
- disabled.</font> <span class="emphasis"><font
- face="Lucida Grande,Helvetica,Arial"><em></em></font></span></td>
+ <td style="vertical-align: top;"><span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em>Z80 is CMOS</em></font></span></td>
+ <td style="vertical-align: top;"><font face="Lucida
+ Grande,Helvetica,Arial">If selected, Fuse will emulate a
+ CMOS Z80, as opposed to an NMOS Z80. The undocumented `OUT
+ (C),0' instruction will be replaced with `OUT (C),255' and
+ emulation of a minor timing bug in the NMOS Z80's `LD A,I'
+ and `LD A,R' instructions will be disabled.</font></td>
</tr>
<tr>
<td style="vertical-align: top;"><span class="emphasis"><font
Modified: trunk/fuse/fusepb/xibs/Preferences.xib
===================================================================
--- trunk/fuse/fusepb/xibs/Preferences.xib 2016-10-03 04:43:34 UTC (rev 828)
+++ trunk/fuse/fusepb/xibs/Preferences.xib 2016-10-03 12:02:48 UTC (rev 829)
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10116" systemVersion="15F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
<dependencies>
<deployment version="1080" identifier="macosx"/>
- <development version="6300" identifier="xcode"/>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10116"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11201"/>
+ <capability name="box content view" minToolsVersion="7.0"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="PreferencesController">
@@ -116,8 +116,8 @@
<action selector="resetUserDefaults:" target="-2" id="932"/>
</connections>
</button>
- <button id="1348">
- <rect key="frame" x="293" y="149" width="151" height="18"/>
+ <button misplaced="YES" id="1348">
+ <rect key="frame" x="293" y="129" width="151" height="18"/>
<autoresizingMask key="autoresizingMask"/>
<buttonCell key="cell" type="check" title="Late CPU timings" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="1379">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -127,8 +127,8 @@
<binding destination="270" name="value" keyPath="values.latetimings" id="1402"/>
</connections>
</button>
- <button id="Uch-Bs-QML">
- <rect key="frame" x="293" y="129" width="151" height="18"/>
+ <button misplaced="YES" id="Uch-Bs-QML">
+ <rect key="frame" x="293" y="109" width="151" height="18"/>
<autoresizingMask key="autoresizingMask"/>
<buttonCell key="cell" type="check" title="Z80 is CMOS" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="qDh-Th-upD">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -280,8 +280,8 @@
<binding destination="270" name="value" keyPath="values.rate" id="Zrv-JU-bcU"/>
</connections>
</textField>
- <button id="1354">
- <rect key="frame" x="293" y="109" width="151" height="18"/>
+ <button misplaced="YES" id="1354">
+ <rect key="frame" x="293" y="89" width="151" height="18"/>
<autoresizingMask key="autoresizingMask"/>
<buttonCell key="cell" type="check" title="Allow writes to ROM" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="1369">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -291,8 +291,8 @@
<binding destination="270" name="value" keyPath="values.writableroms" id="1403"/>
</connections>
</button>
- <button id="1355">
- <rect key="frame" x="293" y="69" width="214" height="18"/>
+ <button misplaced="YES" id="1355">
+ <rect key="frame" x="293" y="49" width="214" height="18"/>
<autoresizingMask key="autoresizingMask"/>
<buttonCell key="cell" type="check" title="Set joysticks on snapshot load" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="1368">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -302,8 +302,8 @@
<binding destination="270" name="value" keyPath="values.joyprompt" id="1407"/>
</connections>
</button>
- <button id="1357">
- <rect key="frame" x="293" y="89" width="105" height="18"/>
+ <button misplaced="YES" id="1357">
+ <rect key="frame" x="293" y="69" width="105" height="18"/>
<autoresizingMask key="autoresizingMask"/>
<buttonCell key="cell" type="check" title="Use .slt traps" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="1366">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -314,6 +314,17 @@
<outlet property="nextKeyView" destination="1354" id="1380"/>
</connections>
</button>
+ <button misplaced="YES" id="Oae-GO-4G1">
+ <rect key="frame" x="293" y="149" width="255" height="18"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <buttonCell key="cell" type="check" title="Use Recreated ZX Spectrum keyboard" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="qRM-aw-x1T">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ <font key="font" metaFont="system"/>
+ </buttonCell>
+ <connections>
+ <binding destination="270" name="value" keyPath="values.recreatedspectrum" id="7OV-FA-rfE"/>
+ </connections>
+ </button>
</subviews>
</customView>
<customView id="1408" userLabel="Sound">
@@ -461,10 +472,10 @@
<rect key="frame" x="0.0" y="0.0" width="627" height="472"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<subviews>
- <box autoresizesSubviews="NO" title="External sound interface" borderType="line" id="1833">
+ <box autoresizesSubviews="NO" borderType="line" title="External sound interface" id="1833">
<rect key="frame" x="398" y="334" width="212" height="118"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
- <view key="contentView">
+ <view key="contentView" id="3G9-p5-WYZ">
<rect key="frame" x="1" y="1" width="210" height="102"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
@@ -513,13 +524,11 @@
</matrix>
</subviews>
</view>
- <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
- <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</box>
<box title="Mass storage/ROM Interfaces" id="1434">
<rect key="frame" x="18" y="154" width="378" height="298"/>
<autoresizingMask key="autoresizingMask"/>
- <view key="contentView">
+ <view key="contentView" id="y0s-Gg-gqJ">
<rect key="frame" x="2" y="2" width="374" height="281"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
@@ -735,13 +744,11 @@
</matrix>
</subviews>
</view>
- <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
- <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</box>
<box title="Printers" id="1433">
<rect key="frame" x="17" y="16" width="591" height="134"/>
<autoresizingMask key="autoresizingMask"/>
- <view key="contentView">
+ <view key="contentView" id="ojx-X9-Ioy">
<rect key="frame" x="2" y="2" width="587" height="117"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
@@ -833,8 +840,6 @@
</textField>
</subviews>
</view>
- <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
- <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</box>
</subviews>
<point key="canvasLocation" x="325.5" y="-570"/>
@@ -935,7 +940,7 @@
<box title="Keyboard" id="1509">
<rect key="frame" x="73" y="288" width="481" height="73"/>
<autoresizingMask key="autoresizingMask"/>
- <view key="contentView">
+ <view key="contentView" id="e3X-3f-W4t">
<rect key="frame" x="2" y="2" width="477" height="53"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
@@ -972,14 +977,12 @@
</textField>
</subviews>
</view>
- <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
- <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<font key="titleFont" metaFont="system"/>
</box>
<box title="Joystick 1" id="1508">
<rect key="frame" x="73" y="182" width="481" height="102"/>
<autoresizingMask key="autoresizingMask"/>
- <view key="contentView">
+ <view key="contentView" id="iCW-jZ-kNN">
<rect key="frame" x="2" y="2" width="477" height="82"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
@@ -1052,14 +1055,12 @@
</button>
</subviews>
</view>
- <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
- <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<font key="titleFont" metaFont="system"/>
</box>
<box title="Joystick 2" id="1507">
<rect key="frame" x="73" y="78" width="481" height="100"/>
<autoresizingMask key="autoresizingMask"/>
- <view key="contentView">
+ <view key="contentView" id="c2z-Ze-SIE">
<rect key="frame" x="2" y="2" width="477" height="80"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
@@ -1131,8 +1132,6 @@
</button>
</subviews>
</view>
- <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
- <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<font key="titleFont" metaFont="system"/>
</box>
<button id="1435">
@@ -1253,11 +1252,11 @@
<rect key="frame" x="20" y="20" width="137" height="303"/>
<autoresizingMask key="autoresizingMask"/>
<clipView key="contentView" id="RVo-Sg-mDk">
- <rect key="frame" x="1" y="17" width="135" height="285"/>
+ <rect key="frame" x="1" y="0.0" width="135" height="302"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnReordering="NO" columnResizing="NO" multipleSelection="NO" emptySelection="NO" autosaveColumns="NO" headerView="1631" id="1634">
- <rect key="frame" x="0.0" y="0.0" width="120" height="19"/>
+ <rect key="frame" x="0.0" y="0.0" width="135" height="285"/>
<autoresizingMask key="autoresizingMask"/>
<size key="intercellSpacing" width="3" height="2"/>
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -1289,7 +1288,6 @@
</connections>
</tableView>
</subviews>
- <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
</clipView>
<scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="1632">
<rect key="frame" x="-100" y="-100" width="120" height="15"/>
@@ -1404,11 +1402,11 @@
<rect key="frame" x="-149" y="171" width="137" height="303"/>
<autoresizingMask key="autoresizingMask"/>
<clipView key="contentView" id="7ih-tq-3PK">
- <rect key="frame" x="1" y="17" width="135" height="285"/>
+ <rect key="frame" x="1" y="0.0" width="135" height="302"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnReordering="NO" columnResizing="NO" multipleSelection="NO" emptySelection="NO" autosaveColumns="NO" headerView="1612" id="1615">
- <rect key="frame" x="0.0" y="0.0" width="120" height="19"/>
+ <rect key="frame" x="0.0" y="0.0" width="135" height="285"/>
<autoresizingMask key="autoresizingMask"/>
<size key="intercellSpacing" width="3" height="2"/>
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -1429,7 +1427,6 @@
</tableColumns>
</tableView>
</subviews>
- <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
</clipView>
<scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="1613">
<rect key="frame" x="-100" y="-100" width="120" height="15"/>
Modified: trunk/fuse/hacking/ChangeLog
===================================================================
--- trunk/fuse/hacking/ChangeLog 2016-10-03 04:43:34 UTC (rev 828)
+++ trunk/fuse/hacking/ChangeLog 2016-10-03 12:02:48 UTC (rev 829)
@@ -5407,3 +5407,42 @@
(Sergio).
20160821 ChangeLog,README,configure.ac,man/fuse.1: update release dates and mark
this release as 1.2.2 (Fred).
+20160822 configure.ac: pr...
[truncated message content] |