[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx:[827] vendor/fuse-emulator/current
Brought to you by:
fredm
From: <fr...@us...> - 2016-10-03 04:43:14
|
Revision: 827 http://sourceforge.net/p/fuse-for-macosx/code/827 Author: fredm Date: 2016-10-03 04:43:11 +0000 (Mon, 03 Oct 2016) Log Message: ----------- Load . into vendor/fuse-emulator/current. Modified Paths: -------------- vendor/fuse-emulator/current/fuse/AUTHORS vendor/fuse-emulator/current/fuse/ChangeLog vendor/fuse-emulator/current/fuse/INSTALL vendor/fuse-emulator/current/fuse/Makefile.am vendor/fuse-emulator/current/fuse/README vendor/fuse-emulator/current/fuse/autogen.sh vendor/fuse-emulator/current/fuse/compat/Makefile.am vendor/fuse-emulator/current/fuse/configure.ac vendor/fuse-emulator/current/fuse/data/Makefile.am vendor/fuse-emulator/current/fuse/data/shell-completion/bash/fuse vendor/fuse-emulator/current/fuse/data/win32/distribution.mk vendor/fuse-emulator/current/fuse/data/win32/installer.nsi.in vendor/fuse-emulator/current/fuse/debugger/Makefile.am vendor/fuse-emulator/current/fuse/debugger/commandl.l vendor/fuse-emulator/current/fuse/debugger/commandy.y vendor/fuse-emulator/current/fuse/display.c vendor/fuse-emulator/current/fuse/hacking/ChangeLog vendor/fuse-emulator/current/fuse/hacking/Makefile.am vendor/fuse-emulator/current/fuse/input.c vendor/fuse-emulator/current/fuse/input.h vendor/fuse-emulator/current/fuse/keyboard.c vendor/fuse-emulator/current/fuse/keysyms.dat vendor/fuse-emulator/current/fuse/keysyms.pl vendor/fuse-emulator/current/fuse/lib/Makefile.am vendor/fuse-emulator/current/fuse/machines/Makefile.am vendor/fuse-emulator/current/fuse/man/Makefile.am vendor/fuse-emulator/current/fuse/man/fuse.1 vendor/fuse-emulator/current/fuse/menu_data.dat vendor/fuse-emulator/current/fuse/menu_data.pl vendor/fuse-emulator/current/fuse/peripherals/Makefile.am vendor/fuse-emulator/current/fuse/peripherals/disk/beta.c vendor/fuse-emulator/current/fuse/peripherals/disk/didaktik.c vendor/fuse-emulator/current/fuse/peripherals/disk/didaktik.h vendor/fuse-emulator/current/fuse/peripherals/disk/disk.c vendor/fuse-emulator/current/fuse/peripherals/disk/trdos.c vendor/fuse-emulator/current/fuse/peripherals/disk/trdos.h vendor/fuse-emulator/current/fuse/peripherals/disk/upd_fdc.c vendor/fuse-emulator/current/fuse/peripherals/usource.c vendor/fuse-emulator/current/fuse/peripherals/usource.h vendor/fuse-emulator/current/fuse/perl/Makefile.am vendor/fuse-emulator/current/fuse/pokefinder/Makefile.am vendor/fuse-emulator/current/fuse/roms/Makefile.am vendor/fuse-emulator/current/fuse/roms/plus3e-0.rom vendor/fuse-emulator/current/fuse/roms/plus3e-1.rom vendor/fuse-emulator/current/fuse/roms/plus3e-2.rom vendor/fuse-emulator/current/fuse/settings-header.pl vendor/fuse-emulator/current/fuse/settings.dat vendor/fuse-emulator/current/fuse/settings.pl vendor/fuse-emulator/current/fuse/sound/Makefile.am vendor/fuse-emulator/current/fuse/svg.c vendor/fuse-emulator/current/fuse/svg.h vendor/fuse-emulator/current/fuse/timer/Makefile.am vendor/fuse-emulator/current/fuse/ui/Makefile.am vendor/fuse-emulator/current/fuse/ui/fb/Makefile.am vendor/fuse-emulator/current/fuse/ui/gtk/Makefile.am vendor/fuse-emulator/current/fuse/ui/gtk/options.pl vendor/fuse-emulator/current/fuse/ui/options.dat vendor/fuse-emulator/current/fuse/ui/scaler/Makefile.am vendor/fuse-emulator/current/fuse/ui/sdl/Makefile.am vendor/fuse-emulator/current/fuse/ui/svga/Makefile.am vendor/fuse-emulator/current/fuse/ui/uimedia.h vendor/fuse-emulator/current/fuse/ui/widget/Makefile.am vendor/fuse-emulator/current/fuse/ui/widget/debugger.c vendor/fuse-emulator/current/fuse/ui/widget/filesel.c vendor/fuse-emulator/current/fuse/ui/widget/menu.c vendor/fuse-emulator/current/fuse/ui/widget/options.pl vendor/fuse-emulator/current/fuse/ui/widget/pokemem.c vendor/fuse-emulator/current/fuse/ui/widget/text.c vendor/fuse-emulator/current/fuse/ui/widget/widget.c vendor/fuse-emulator/current/fuse/ui/widget/widget.h vendor/fuse-emulator/current/fuse/ui/widget/widget_internals.h vendor/fuse-emulator/current/fuse/ui/wii/Makefile.am vendor/fuse-emulator/current/fuse/ui/win32/Makefile.am vendor/fuse-emulator/current/fuse/ui/win32/debugger.rc vendor/fuse-emulator/current/fuse/ui/win32/options-resource.pl vendor/fuse-emulator/current/fuse/ui/win32/options.pl vendor/fuse-emulator/current/fuse/ui/win32/win32internals.h vendor/fuse-emulator/current/fuse/ui/win32/win32joystick.rc vendor/fuse-emulator/current/fuse/ui/win32/win32keyboard.c vendor/fuse-emulator/current/fuse/ui/win32/win32ui.c vendor/fuse-emulator/current/fuse/ui/xlib/Makefile.am vendor/fuse-emulator/current/fuse/uimedia.c vendor/fuse-emulator/current/fuse/unittests/Makefile.am vendor/fuse-emulator/current/fuse/z80/Makefile.am vendor/fuse-emulator/current/fuse/z80/z80.pl vendor/fuse-emulator/current/fuse/z80/z80_debugger_variables.c vendor/fuse-emulator/current/libspectrum/ChangeLog vendor/fuse-emulator/current/libspectrum/Makefile.am vendor/fuse-emulator/current/libspectrum/README vendor/fuse-emulator/current/libspectrum/accessor.pl vendor/fuse-emulator/current/libspectrum/autogen.sh vendor/fuse-emulator/current/libspectrum/configure.ac vendor/fuse-emulator/current/libspectrum/doc/libspectrum.3 vendor/fuse-emulator/current/libspectrum/doc/libspectrum.txt vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog vendor/fuse-emulator/current/libspectrum/libspectrum.h.in vendor/fuse-emulator/current/libspectrum/pzx_read.c vendor/fuse-emulator/current/libspectrum/snap_accessors.txt vendor/fuse-emulator/current/libspectrum/szx.c vendor/fuse-emulator/current/libspectrum/test/Makefile.am vendor/fuse-emulator/current/libspectrum/zip.c vendor/fuse-emulator/current/libspectrum/zip.h Added Paths: ----------- vendor/fuse-emulator/current/fuse/ui/widget/about.c Modified: vendor/fuse-emulator/current/fuse/AUTHORS =================================================================== --- vendor/fuse-emulator/current/fuse/AUTHORS 2016-09-30 12:48:19 UTC (rev 826) +++ vendor/fuse-emulator/current/fuse/AUTHORS 2016-10-03 04:43:11 UTC (rev 827) @@ -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: vendor/fuse-emulator/current/fuse/ChangeLog =================================================================== --- vendor/fuse-emulator/current/fuse/ChangeLog 2016-09-30 12:48:19 UTC (rev 826) +++ vendor/fuse-emulator/current/fuse/ChangeLog 2016-10-03 04:43:11 UTC (rev 827) @@ -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: vendor/fuse-emulator/current/fuse/INSTALL =================================================================== --- vendor/fuse-emulator/current/fuse/INSTALL 2016-09-30 12:48:19 UTC (rev 826) +++ vendor/fuse-emulator/current/fuse/INSTALL 2016-10-03 04:43:11 UTC (rev 827) @@ -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: vendor/fuse-emulator/current/fuse/Makefile.am =================================================================== --- vendor/fuse-emulator/current/fuse/Makefile.am 2016-09-30 12:48:19 UTC (rev 826) +++ vendor/fuse-emulator/current/fuse/Makefile.am 2016-10-03 04:43:11 UTC (rev 827) @@ -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: vendor/fuse-emulator/current/fuse/README =================================================================== --- vendor/fuse-emulator/current/fuse/README 2016-09-30 12:48:19 UTC (rev 826) +++ vendor/fuse-emulator/current/fuse/README 2016-10-03 04:43:11 UTC (rev 827) @@ -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: vendor/fuse-emulator/current/fuse/autogen.sh =================================================================== --- vendor/fuse-emulator/current/fuse/autogen.sh 2016-09-30 12:48:19 UTC (rev 826) +++ vendor/fuse-emulator/current/fuse/autogen.sh 2016-10-03 04:43:11 UTC (rev 827) @@ -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: vendor/fuse-emulator/current/fuse/compat/Makefile.am =================================================================== --- vendor/fuse-emulator/current/fuse/compat/Makefile.am 2016-09-30 12:48:19 UTC (rev 826) +++ vendor/fuse-emulator/current/fuse/compat/Makefile.am 2016-10-03 04:43:11 UTC (rev 827) @@ -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: vendor/fuse-emulator/current/fuse/configure.ac =================================================================== --- vendor/fuse-emulator/current/fuse/configure.ac 2016-09-30 12:48:19 UTC (rev 826) +++ vendor/fuse-emulator/current/fuse/configure.ac 2016-10-03 04:43:11 UTC (rev 827) @@ -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: vendor/fuse-emulator/current/fuse/data/Makefile.am =================================================================== --- vendor/fuse-emulator/current/fuse/data/Makefile.am 2016-09-30 12:48:19 UTC (rev 826) +++ vendor/fuse-emulator/current/fuse/data/Makefile.am 2016-10-03 04:43:11 UTC (rev 827) @@ -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: vendor/fuse-emulator/current/fuse/data/shell-completion/bash/fuse =================================================================== --- vendor/fuse-emulator/current/fuse/data/shell-completion/bash/fuse 2016-09-30 12:48:19 UTC (rev 826) +++ vendor/fuse-emulator/current/fuse/data/shell-completion/bash/fuse 2016-10-03 04:43:11 UTC (rev 827) @@ -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: vendor/fuse-emulator/current/fuse/data/win32/distribution.mk =================================================================== --- vendor/fuse-emulator/current/fuse/data/win32/distribution.mk 2016-09-30 12:48:19 UTC (rev 826) +++ vendor/fuse-emulator/current/fuse/data/win32/distribution.mk 2016-10-03 04:43:11 UTC (rev 827) @@ -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: vendor/fuse-emulator/current/fuse/data/win32/installer.nsi.in =================================================================== --- vendor/fuse-emulator/current/fuse/data/win32/installer.nsi.in 2016-09-30 12:48:19 UTC (rev 826) +++ vendor/fuse-emulator/current/fuse/data/win32/installer.nsi.in 2016-10-03 04:43:11 UTC (rev 827) @@ -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: vendor/fuse-emulator/current/fuse/debugger/Makefile.am =================================================================== --- vendor/fuse-emulator/current/fuse/debugger/Makefile.am 2016-09-30 12:48:19 UTC (rev 826) +++ vendor/fuse-emulator/current/fuse/debugger/Makefile.am 2016-10-03 04:43:11 UTC (rev 827) @@ -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: vendor/fuse-emulator/current/fuse/debugger/commandl.l =================================================================== --- vendor/fuse-emulator/current/fuse/debugger/commandl.l 2016-09-30 12:48:19 UTC (rev 826) +++ vendor/fuse-emulator/current/fuse/debugger/commandl.l 2016-10-03 04:43:11 UTC (rev 827) @@ -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: vendor/fuse-emulator/current/fuse/debugger/commandy.y =================================================================== --- vendor/fuse-emulator/current/fuse/debugger/commandy.y 2016-09-30 12:48:19 UTC (rev 826) +++ vendor/fuse-emulator/current/fuse/debugger/commandy.y 2016-10-03 04:43:11 UTC (rev 827) @@ -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: vendor/fuse-emulator/current/fuse/display.c =================================================================== --- vendor/fuse-emulator/current/fuse/display.c 2016-09-30 12:48:19 UTC (rev 826) +++ vendor/fuse-emulator/current/fuse/display.c 2016-10-03 04:43:11 UTC (rev 827) @@ -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: vendor/fuse-emulator/current/fuse/hacking/ChangeLog =================================================================== --- vendor/fuse-emulator/current/fuse/hacking/ChangeLog 2016-09-30 12:48:19 UTC (rev 826) +++ vendor/fuse-emulator/current/fuse/hacking/ChangeLog 2016-10-03 04:43:11 UTC (rev 827) @@ -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: print summary of enabled features when building fuse + (patch #378) (Alberto Garcia). +20160822 ui/widget/{Makefile.am,about.c,menu.c,widget.[ch],widget_internals.h}: + add About Fuse dialog for widget UIs with less cluttered text (Sergio). +20160822 ui/widget/{debugger.c,filesel.c,options.pl,pokemem.c,text.c, + widget_internals.h}: set the length of text entry widgets on widget UIs + (Sergio). +20160823 ui/win32/options.pl: set the length of text entry widgets on win32 UI + (Sergio). +20160823 display.c,peripherals/disk/upd_fdc.c: fix compilation warnings (Phil). +20160823 input.[ch],keysyms.dat,keysyms.pl: integrate initial Recreated ZX + Spectrum patch (Sergio and ekkehard). +20160823 input.c,keysyms.dat: remove unused code (Phil). +20160825 input.c,man/fuse.1,settings.dat,ui/options.dat: add option to enable + the support of Recreated ZX Spectrum (Sergio). +20160825 keysyms.pl: support (hopefully) Recreated ZX Spectrum on win32 UI + (Sergio). +20160828 ui/win32/options-resource.pl: set the digit filter for text entry + widgets on win32 UI (Sergio). +20160828 peripherals/disk/disk.c: mark position_context_save() and + position_context_restore() as static (Fred). +20160906 z80/z80_debugger_variables.c: remove tautological comparison (Fred). +20160909 man/fuse.1: fix typos in Recreated ZX Spectrum option (Sergio). +20160909 data/shell-completion/bash/fuse: update shell completion with Recreated + ZX Spectrum option (Sergio). +20160910 input.h,keysyms.dat,keysyms.pl: allow the use of ~@\[]{}%?"_ symbol + characters in widget UIs (Sergio). +20160911 keyboard.c,keysyms.pl,ui/win32/{win32internals.h,win32keyboard.c, + win32ui.c}: map non-alphanumeric keys to appropriate spectrum + characters on win32 UI (fixes bug #361) (thanks, Lee Tonks) (Sergio). +20160911 keysyms.pl: detect more non-alphanumeric keys on win32 UI (more from + patches #358) (thanks, thrice) (Sergio). +20160920 man/fuse.1,plus3e-[012].rom: update to v1.43 of the +3e ROMs (Sergio). +20160920 peripherals/disk/beta.c: reset machine when auto-loading TRD/SCL disks + (fixes bug #358) (thanks, BogDan Vatra and Fred) (Sergio). +20160924 ChangeLog,README,configure.ac,man/fuse.1: bump versions to 1.3.0 + (Fred). +20160924 ChangeLog: tweak thanks for Recreated ZX feature and fix typo (Sergio). +20161002 ChangeLog,README,man/fuse.1: update release dates for 1.3.0 (Fred). Modified: vendor/fuse-emulator/current/fuse/hacking/Makefile.am =================================================================== --- vendor/fuse-emulator/current/fuse/hacking/Makefile.am 2016-09-30 12:48:19 UTC (rev 826) +++ vendor/fuse-emulator/current/fuse/hacking/Makefile.am 2016-10-03 04:43:11 UTC (rev 827) @@ -2,7 +2,7 @@ ## Copyright (c) 2002-2011 Philip Kendall ## Copyright (c) 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: vendor/fuse-emulator/current/fuse/input.c =================================================================== --- vendor/fuse-emulator/current/fuse/input.c 2016-09-30 12:48:19 UTC (rev 826) +++ vendor/fuse-emulator/current/fuse/input.c 2016-10-03 04:43:11 UTC (rev 827) @@ -61,11 +61,166 @@ } +static void +send_keyboard_press( input_key keysym ) +{ + const keyboard_spectrum_keys_t *ptr; + + ptr = keyboard_get_spectrum_keys( keysym ); + + if( ptr ) { + keyboard_press( ptr->key1 ); + keyboard_press( ptr->key2 ); + } +} + +static void +send_keyboard_release( input_key keysym ) +{ + const keyboard_spectrum_keys_t *ptr; + + ptr = keyboard_get_spectrum_keys( keysym ); + + if( ptr ) { + keyboard_release( ptr->key1 ); + keyboard_release( ptr->key2 ); + } +} + +static input_key +recreated_is_downkey( int code ) +{ + switch( code ) { + + case INPUT_KEY_a: return INPUT_KEY_1; + case INPUT_KEY_c: return INPUT_KEY_2; + case INPUT_KEY_e: return INPUT_KEY_3; + case INPUT_KEY_g: return INPUT_KEY_4; + case INPUT_KEY_i: return INPUT_KEY_5; + case INPUT_KEY_k: return INPUT_KEY_6; + case INPUT_KEY_m: return INPUT_KEY_7; + case INPUT_KEY_o: return INPUT_KEY_8; + case INPUT_KEY_q: return INPUT_KEY_9; + case INPUT_KEY_s: return INPUT_KEY_0; + case INPUT_KEY_u: return INPUT_KEY_q; + case INPUT_KEY_w: return INPUT_KEY_w; + case INPUT_KEY_y: return INPUT_KEY_e; + case INPUT_KEY_Shift_L | INPUT_KEY_a: return INPUT_KEY_r; + case INPUT_KEY_Shift_L | INPUT_KEY_c: return INPUT_KEY_t; + case INPUT_KEY_Shift_L | INPUT_KEY_e: return INPUT_KEY_y; + case INPUT_KEY_Shift_L | INPUT_KEY_g: return INPUT_KEY_u; + case INPUT_KEY_Shift_L | INPUT_KEY_i: return INPUT_KEY_i; + case INPUT_KEY_Shift_L | INPUT_KEY_k: return INPUT_KEY_o; + case INPUT_KEY_Shift_L | INPUT_KEY_m: return INPUT_KEY_p; + case INPUT_KEY_Shift_L | INPUT_KEY_o: return INPUT_KEY_a; + case INPUT_KEY_Shift_L | INPUT_KEY_q: return INPUT_KEY_s; + case INPUT_KEY_Shift_L | INPUT_KEY_s: return INPUT_KEY_d; + case INPUT_KEY_Shift_L | INPUT_KEY_u: return INPUT_KEY_f; + case INPUT_KEY_Shift_L | INPUT_KEY_w: return INPUT_KEY_g; + case INPUT_KEY_Shift_L | INPUT_KEY_y: return INPUT_KEY_h; + case INPUT_KEY_0: return INPUT_KEY_j; + case INPUT_KEY_2: return INPUT_KEY_k; + case INPUT_KEY_4: return INPUT_KEY_l; + case INPUT_KEY_6: return INPUT_KEY_Return; + case INPUT_KEY_8: return INPUT_KEY_Shift_L; + case INPUT_KEY_Shift_L | INPUT_KEY_comma: return INPUT_KEY_z; + case INPUT_KEY_minus: return INPUT_KEY_x; + case INPUT_KEY_bracketleft: return INPUT_KEY_c; + case INPUT_KEY_semicolon: return INPUT_KEY_v; + case INPUT_KEY_comma: return INPUT_KEY_b; + case INPUT_KEY_slash: return INPUT_KEY_n; + case INPUT_KEY_Shift_L | INPUT_KEY_bracketleft: return INPUT_KEY_m; + case INPUT_KEY_Shift_L | INPUT_KEY_1: return INPUT_KEY_Control_R; + case INPUT_KEY_Shift_L | INPUT_KEY_5: return INPUT_KEY_space; + + } + + return INPUT_KEY_NONE; +} + +static input_key +recreated_is_upkey( int code ) +{ + switch( code ) { + + case INPUT_KEY_b: return INPUT_KEY_1; + case INPUT_KEY_d: return INPUT_KEY_2; + case INPUT_KEY_f: return INPUT_KEY_3; + case INPUT_KEY_h: return INPUT_KEY_4; + case INPUT_KEY_j: return INPUT_KEY_5; + case INPUT_KEY_l: return INPUT_KEY_6; + case INPUT_KEY_n: return INPUT_KEY_7; + case INPUT_KEY_p: return INPUT_KEY_8; + case INPUT_KEY_r: return INPUT_KEY_9; + case INPUT_KEY_t: return INPUT_KEY_0; + case INPUT_KEY_v: return INPUT_KEY_q; + case INPUT_KEY_x: return INPUT_KEY_w; + case INPUT_KEY_z: return INPUT_KEY_e; + case INPUT_KEY_Shift_L | INPUT_KEY_b: return INPUT_KEY_r; + case INPUT_KEY_Shift_L | INPUT_KEY_d: return INPUT_KEY_t; + case INPUT_KEY_Shift_L | INPUT_KEY_f: return INPUT_KEY_y; + case INPUT_KEY_Shift_L | INPUT_KEY_h: return INPUT_KEY_u; + case INPUT_KEY_Shift_L | INPUT_KEY_j: return INPUT_KEY_i; + case INPUT_KEY_Shift_L | INPUT_KEY_l: return INPUT_KEY_o; + case INPUT_KEY_Shift_L | INPUT_KEY_n: return INPUT_KEY_p; + case INPUT_KEY_Shift_L | INPUT_KEY_p: return INPUT_KEY_a; + case INPUT_KEY_Shift_L | INPUT_KEY_r: return INPUT_KEY_s; + case INPUT_KEY_Shift_L | INPUT_KEY_t: return INPUT_KEY_d; + case INPUT_KEY_Shift_L | INPUT_KEY_v: return INPUT_KEY_f; + case INPUT_KEY_Shift_L | INPUT_KEY_x: return INPUT_KEY_g; + case INPUT_KEY_Shift_L | INPUT_KEY_z: return INPUT_KEY_h; + case INPUT_KEY_1: return INPUT_KEY_j; + case INPUT_KEY_3: return INPUT_KEY_k; + case INPUT_KEY_5: return INPUT_KEY_l; + case INPUT_KEY_7: return INPUT_KEY_Return; + case INPUT_KEY_9: return INPUT_KEY_Shift_L; + case INPUT_KEY_Shift_L | INPUT_KEY_period: return INPUT_KEY_z; + case INPUT_KEY_equal: return INPUT_KEY_x; + case INPUT_KEY_bracketright: return INPUT_KEY_c; + case INPUT_KEY_Shift_L | INPUT_KEY_semicolon: return INPUT_KEY_v; + case INPUT_KEY_period: return INPUT_KEY_b; + case INPUT_KEY_Shift_L | INPUT_KEY_slash: return INPUT_KEY_n; + case INPUT_KEY_Shift_L | INPUT_KEY_bracketright: return INPUT_KEY_m; + case INPUT_KEY_Shift_L | INPUT_KEY_4: return INPUT_KEY_Control_R; + case INPUT_KEY_Shift_L | INPUT_KEY_6: return INPUT_KEY_space; + + } + + return INPUT_KEY_NONE; +} + +static int recreated_key_down = 0; + +static void +recreated_keypress( input_key k ) +{ + input_key o; /* remapped key */ + + if( k == INPUT_KEY_Shift_L ) + recreated_key_down |= INPUT_KEY_Shift_L; + + if( k >= 0 && k < 256 ) + recreated_key_down = ( recreated_key_down & ~255 ) | k; + + o = recreated_is_upkey( recreated_key_down ); + if( o ) { + send_keyboard_release( o ); + recreated_key_down = 0; + return; + } + + o = recreated_is_downkey( recreated_key_down ); + if( o ) { + send_keyboard_press( o ); + recreated_key_down = 0; + return; + } +} + static int keypress( const input_event_key_t *event ) { int swallow; - const keyboard_spectrum_keys_t *ptr; if( ui_widget_level >= 0 ) { ui_widget_keyhandler( event->native_key ); @@ -98,11 +253,10 @@ if( swallow ) return 0; - ptr = keyboard_get_spectrum_keys( event->spectrum_key ); - - if( ptr ) { - keyboard_press( ptr->key1 ); - keyboard_press( ptr->key2 ); + if( settings_current.recreated_spectrum ) { + recreated_keypress( event->spectrum_key ); + } else { + send_keyboard_press( event->spectrum_key ); } ui_popup_menu( event->native_key ); @@ -113,13 +267,8 @@ static int keyrelease( const input_event_key_t *event ) { - const keyboard_spectrum_keys_t *ptr; - - ptr = keyboard_get_spectrum_keys( event->spectrum_key ); - - if( ptr ) { - keyboard_release( ptr->key1 ); - keyboard_release( ptr->key2 ); + if( !settings_current.recreated_spectrum ) { + send_keyboard_release( event->spectrum_key ); } /* Joystick emulation via keyboard keys */ Modified: vendor/fuse-emulator/current/fuse/input.h =================================================================== --- vendor/fuse-emulator/current/fuse/input.h 2016-09-30 12:48:19 UTC (rev 826) +++ vendor/fuse-emulator/current/fuse/input.h 2016-10-03 04:43:11 UTC (rev 827) @@ -50,10 +50,11 @@ INPUT_KEY_space = 0x20, INPUT_KEY_exclam, - - INPUT_KEY_numbersign = 0x23, + INPUT_KEY_quotedbl, + INPUT_KEY_numbersign, INPUT_KEY_dollar, - INPUT_KEY_ampersand = 0x26, + INPUT_KEY_percent, + INPUT_KEY_ampersand, INPUT_KEY_apostrophe, INPUT_KEY_parenleft, INPUT_KEY_parenright, @@ -80,6 +81,8 @@ INPUT_KEY_less, INPUT_KEY_equal, INPUT_KEY_greater, + INPUT_KEY_question, + INPUT_KEY_at, INPUT_KEY_A = 0x41, INPUT_KEY_B, @@ -107,9 +110,12 @@ INPUT_KEY_X, INPUT_KEY_Y, INPUT_KEY_Z, - + INPUT_KEY_bracketleft, + INPUT_KEY_backslash, + INPUT_KEY_bracketright, INPUT_KEY_asciicircum = 0x5e, INPUT_KEY_dead_circumflex = 0x5e, + INPUT_KEY_underscore = 0x5f, INPUT_KEY_a = 0x61, INPUT_KEY_b, @@ -137,8 +143,10 @@ INPUT_KEY_x, INPUT_KEY_y, INPUT_KEY_z, - - INPUT_KEY_bar = 0x7c, + INPUT_KEY_braceleft, + INPUT_KEY_bar, + INPUT_KEY_braceright, + INPUT_KEY_asciitilde, INPUT_KEY_BackSpace = 0x7f, INPUT_KEY_KP_Enter = 0x8d, Modified: vendor/fuse-emulator/current/fuse/keyboard.c =================================================================== --- vendor/fuse-emulator/current/fuse/keyboard.c 2016-09-30 12:48:19 UTC (rev 826) +++ vendor/fuse-emulator/current/fuse/keyboard.c 2016-10-03 04:43:11 UTC (rev 827) @@ -106,6 +106,14 @@ { INPUT_KEY_slash, { KEYBOARD_v, KEYBOARD_Symbol } }, { INPUT_KEY_Shift_R, { KEYBOARD_NONE, KEYBOARD_Caps } }, + { INPUT_KEY_asterisk, { KEYBOARD_b, KEYBOARD_Symbol } }, + { INPUT_KEY_dollar, { KEYBOARD_4, KEYBOARD_Symbol } }, + { INPUT_KEY_exclam, { KEYBOARD_1, KEYBOARD_Symbol } }, + { INPUT_KEY_less, { KEYBOARD_r, KEYBOARD_Symbol } }, + { INPUT_KEY_parenright, { KEYBOARD_9, KEYBOARD_Symbol } }, + { INPUT_KEY_colon, { KEYBOARD_z, KEYBOARD_Symbol } }, + { INPUT_KEY_plus, { KEYBOARD_k, KEYBOARD_Symbol } }, + { INPUT_KEY_Control_L, { KEYBOARD_NONE, KEYBOARD_Symbol } }, { INPUT_KEY_Alt_L, { KEYBOARD_NONE, KEYBOARD_Symbol } }, { INPUT_KEY_Meta_L, { KEYBOARD_NONE, KEYBOARD_Symbol } }, Modified: vendor/fuse-emulator/current/fuse/keysyms.dat =================================================================== --- vendor/fuse-emulator/current/fuse/keysyms.dat 2016-09-30 12:48:19 UTC (rev 826) +++ vendor/fuse-emulator/current/fuse/keysyms.dat 2016-10-03 04:43:11 UTC (rev 827) @@ -1,7 +1,7 @@ # keysyms.dat: data file for use by keysyms.pl to generate keysyms.c # Copyright (c) 2000-2001,2004 Philip Kendall, Matan Ziv-Av, Russell Marks -# $Id: keysyms.dat 4698 2012-05-07 02:38:35Z fredm $ +# $Id: keysyms.dat 5798 2016-09-10 15:22:31Z 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 @@ -34,9 +34,10 @@ space exclam - +quotedbl numbersign dollar +percent ampersand apostrophe parenleft @@ -64,6 +65,8 @@ less equal greater +question +at A B @@ -92,8 +95,12 @@ Y Z +bracketleft +backslash +bracketright asciicircum dead_circumflex +underscore a b @@ -122,7 +129,10 @@ y z +braceleft bar +braceright +asciitilde BackSpace KP_Enter Modified: vendor/fuse-emulator/current/fuse/keysyms.pl =================================================================== --- vendor/fuse-emulator/current/fuse/keysyms.pl 2016-09-30 12:48:19 UTC (rev 826) +++ vendor/fuse-emulator/current/fuse/keysyms.pl 2016-10-03 04:43:11 UTC (rev 827) @@ -5,7 +5,7 @@ # Fredrick Meunier, Catalin Mihaila, Stuart Brady # Copyright (c) 2015 Sergio Baldoví -# $Id: keysyms.pl 5434 2016-05-01 04:22:45Z fredm $ +# $Id: keysyms.pl 5800 2016-09-11 06:21:58Z 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 @@ -157,9 +157,10 @@ }, sdl => { headers => [ 'SDL.h' ], - max_length => 15, + max_length => 18, skips => { map { $_ => 1 } ( 'Hyper_L','Hyper_R','Caps_Lock', - 'A' .. 'Z', 'bar', 'dead_circumflex' ) }, + 'A' .. 'Z', 'asciitilde', 'bar', 'dead_circumflex', + 'braceleft', 'braceright', 'percent' ) }, unicode_skips => { map { $_ => 1 } qw( Hyper_L Hyper_R Caps_Lock Escape F1 F2 F3 F4 F5 F6 F7 F8 F9 F10 F11 F12 BackSpace Tab Caps_Lock Return Shift_L Shift_R @@ -170,6 +171,8 @@ translations => { apostrophe => 'QUOTE', asciicircum => 'CARET', + bracketleft => 'LEFTBRACKET', + bracketright => 'RIGHTBRACKET', exclam => 'EXCLAIM', Control_L => 'LCTRL', Control_R => 'RCTRL', @@ -188,8 +191,18 @@ numbersign => '#', ampersand => "&", apostrophe => "'", + asciitilde => "~", + at => "@", + backslash => "\\\\", + braceleft => "{", + braceright => "}", + bracketleft => "[", + bracketright => "]", parenleft => "(", parenright => ")", + percent => "%", + question => "?", + quotedbl => '\\"', asterisk => "*", plus => "+", comma => ',', @@ -203,6 +216,7 @@ greater => '>', asciicircum => '^', bar => '|', + underscore => '_', }, function => \&sdl_keysym, unicode_function => \&sdl_unicode_keysym, @@ -244,18 +258,14 @@ 'dollar','less','greater','exclam', 'ampersand','parenleft','parenright', 'asterisk','plus','colon','bar', - 'asciicircum','dead_circumflex', + 'braceleft','braceright','bracketleft','bracketright', + 'apostrophe','asciicircum','dead_circumflex','asciitilde', + 'at','backslash','comma','equal','minus','numbersign', + 'percent','period','question','quotedbl', + 'semicolon','slash','underscore', 'A' .. 'Z' ) }, translations => { - numbersign => 'OEM_5', - apostrophe => 'OEM_7', - comma => 'OEM_COMMA', - minus => 'OEM_MINUS', - period => 'OEM_PERIOD', - slash => 'OEM_2', BackSpace => 'BACK', - semicolon => 'OEM_1', - equal => 'OEM_PLUS', Page_Up => 'PRIOR', Page_Down => 'NEXT', Caps_Lock => 'CAPITAL', @@ -376,13 +386,13 @@ for( my $i = 0; $i <= $#cooked_keysyms; $i++ ) { next unless defined $cooked_keysyms[$i] and $cooked_keysyms[$i] eq $ui_keysym; - printf " { %3i, INPUT_KEY_%-11s },\n", $i, $keysym; + printf " { %3i, INPUT_KEY_%-12s },\n", $i, $keysym; last; } } else { - printf " { %-$ui_data{$ui}{max_length}s INPUT_KEY_%-11s },\n", + printf " { %-$ui_data{$ui}{max_length}s INPUT_KEY_%-12s },\n", "$ui_keysym,", $keysym; } @@ -418,7 +428,7 @@ $ui_keysym = $ui_data{$ui}{unicode_function}->( $ui_keysym ); - printf " { %-$ui_data{$ui}{max_length}s INPUT_KEY_%-11s },\n", + printf " { %-$ui_data{$ui}{max_length}s INPUT_KEY_%-12s },\n", "$ui_keysym,", $keysym; } @@ -431,3 +441,46 @@ CODE } + +if( $ui eq 'win32' ) { + +print << "CODE"; +keysyms_map_t oem_keysyms_map[] = { + + { '&', INPUT_KEY_ampersand }, + { '\\'', INPUT_KEY_apostrophe }, + { '~', INPUT_KEY_asciitilde }, + { '*', INPUT_KEY_asterisk }, + { '\@', INPUT_KEY_at }, + { '\\\\', INPUT_KEY_backslash }, + { '|', INPUT_KEY_bar }, + { '{', INPUT_KEY_braceleft }, + { '}', INPUT_KEY_braceright }, + { '[', INPUT_KEY_bracketleft }, + { ']', INPUT_KEY_bracketright }, + { ':', INPUT_KEY_colon }, + { ',', INPUT_KEY_comma }, + { '\$', INPUT_KEY_dollar }, + { '=', INPUT_KEY_equal }, + { '!', INPUT_KEY_exclam }, + { '>', INPUT_KEY_greater }, + { '<', INPUT_KEY_less }, + { '-', INPUT_KEY_minus }, + { '#', INPUT_KEY_numbersign }, + { '(', INPUT_KEY_parenleft }, + { ')', INPUT_KEY_parenright }, + { '%', INPUT_KEY_percent }, + { '.', INPUT_KEY_period }, + { '+', INPUT_KEY_plus }, + { '?', INPUT_KEY_question }, + { '"', INPUT_KEY_quotedbl }, + { ';', INPUT_KEY_semicolon }, + { '/', INPUT_KEY_slash }, + { '_', INPUT_KEY_underscore }, + + { 0, 0 } /* End marker: DO NOT MOVE! */ + +}; + +CODE +} Modified: vendor/fuse-emulator/current/fuse/lib/Makefile.am =================================================================== --- vendor/fuse-emulator/current/fuse/lib/Makefile.am 2016-09-30 12:48:19 UTC (rev 826) +++ vendor/fuse-emulator/current/fuse/lib/Makefile.am 2016-10-03 04:43:11 UTC (rev 827) @@ -2,7 +2,7 @@ ## Copyright (c) 1999-2004 Philip Kendall ## Copyright (c) 2015 Sergio Baldoví -## $Id: Makefile.am 5537 2016-05-29 06:17:00Z sbaldovi $ +## $Id: Makefile.am 5536 2016-05-29 06:14:28Z 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 Modified: vendor/fuse-emulator/current/fuse/machines/Makefile.am =================================================================== --- vendor/fuse-emulator/current/fuse/machines/Makefile.am 2016-09-30 12:48:19 UTC (rev 826) +++ vendor/fuse-emulator/current/fuse/machines/Makefile.am 2016-10-03 04:43:11 UTC (rev 827) @@ -2,7 +2,7 @@ ## Copyright (c) 2004 Philip Kendall ## Copyright (c) 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: vendor/fuse-emulator/current/fuse/man/Makefile.am =================================================================== --- vendor/fuse-emulator/current/fuse/man/Makefile.am 2016-09-30 12:48:19 UTC (rev 826) +++ vendor/fuse-emulator/current/fuse/man/Makefile.am 2016-10-03 04:43:11 UTC (rev 827) @@ -2,7 +2,7 @@ ## Copyright (c) 1999-2002 Philip Kendall ## Copyright (c) 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: vendor/fuse-emulator/current/fuse/man/fuse.1 =================================================================== --- vendor/fuse-emulator/current/fuse/man/fuse.1 2016-09-30 12:48:19 UTC (rev 826) +++ vendor/fuse-emulator/current/fuse/man/fuse.1 2016-10-03 04:43:11 UTC (rev 827) @@ -23,7 +23,7 @@ .\" E-mail: phi...@sh... .\" .\" -.TH fuse 1 "21st August, 2016" "Version 1.2.2" "Emulators" +.TH fuse 1 "2nd October, 2016" "Version 1.3.0" "Emulators" .\" .\"------------------------------------------------------------------ .\" @@ -961,6 +961,15 @@ Specify an RZX file to begin recording to. .RE .PP +.B \-\-recreated\-spectrum +.RS +Enable the use of a Recreated ZX Spectrum. This is a Bluetooth keyboard +that can be paired to the device where Fuse is running. The same as +the General Options dialog's +.I "Recreated ZX Spectrum" +option. +.RE +.PP .B \-\-rom\-16 .I file .br @@ -1095,6 +1104,8 @@ .RI ( plus3\-0.rom ", " plus3\-1.rom ", " plus3\-2.rom " and " plus3\-3.rom ), the four ROMs for the +3 .RI ( plus3\-0.rom ", " plus3\-1.rom ", " plus3\-2.rom " and " plus3\-3.rom ), +the four enhanced ROMs for the +3e +.RI ( plus3e\-0.rom ", " plus3e\-1.rom ", " plus3e\-2.rom " and " plus3e\-3.rom ), the TC2048 ROM .RI ( tc2048.rom ), the two ROMs for the TC2068 @@ -2117,6 +2128,12 @@ you run them. .RE .PP +.I "Recreated ZX Spectrum" +.RS +Enable the use of a Recreated ZX Spectrum. This is a Bluetooth keyboard +that can be paired to the device where Fuse is running. +.RE +.PP .I "Allow writes to ROM" .RS If this option is selected, Fuse will happily allow programs to Modified: vendor/fuse-emulator/current/fuse/menu_data.dat =================================================================== --- vendor/fuse-emulator/current/fuse/menu_data.dat 2016-09-30 12:48:19 UTC (rev 826) +++ vendor/fuse-emulator/current/fuse/menu_data.dat 2016-10-03 04:43:11 UTC (rev 827) @@ -1,7 +1,7 @@ # menu_data.dat: Menu structure for Fuse # Copyright (c) 2004-2015 Philip Kendall -# $Id: menu_data.dat 5434 2016-05-01 04:22:45Z fredm $ +# $Id: menu_data.dat 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: vendor/fuse-emulator/current/fuse/menu_data.pl =================================================================== --- vendor/fuse-emulator/current/fuse/menu_data.pl 2016-09-30 12:48:19 UTC (rev 826) +++ vendor/fuse-emulator/current/fuse/menu_data.pl 2016-10-03 04:43:11 UTC (rev 827) @@ -3,7 +3,7 @@ # menu_data.pl: generate the menu structure from menu_data.dat # Copyright (c) 2004-2015 Philip Kendall, Stuart Brady, Marek Januszewski -# $Id: menu_data.pl 5434 2016-05-01 04:22:45Z fredm $ +# $Id: menu_data.pl 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: vendor/fuse-emulator/current/fuse/peripherals/Makefile.am =================================================================== --- vendor/fuse-emulator/current/fuse/peripherals/Makefile.am 2016-09-30 12:48:19 UTC (rev 826) +++ vendor/fuse-emulator/current/fuse/peripherals/Makefile.am 2016-10-03 04:43:11 UTC (rev 827) @@ -3,7 +3,7 @@ ## Copyright (c) 2015 Stuart Brady ## Copyright (c) 2015 Sergio Baldoví -## $Id: Makefile.am 5755 2016-08-17 12:10:38Z fredm $ +## $Id: Makefile.am 5746 2016-08-16 21:55:53Z 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 Modified: vendor/fuse-emulator/current/fuse/peripherals/disk/beta.c =================================================================== --- vendor/fuse-emulator/current/fuse/peripherals/disk/beta.c 2016-09-30 12:48:19 UTC (rev 826) +++ vendor/fuse-emulator/current/fuse/peripherals/disk/beta.c 2016-10-03 04:43:11 UTC (rev 827) @@ -392,9 +392,17 @@ static int ui_drive_autoload( void ) { - PC = 0; - machine_current->ram.last_byte |= 0x10; /* Select ROM 1 */ - beta_page(); + /* Clear AY registers (and more) from current machine */ + machine_reset(1); + + if( ( machine_current->capabilities & + LIBSPECTRUM_MACHINE_CAPABILITY_128_MEMORY ) || + !settings_current.beta128_48boot ) { + PC = 0; + machine_current->ram.last_byte |= 0x10; /* Select ROM 1 */ + beta_page(); + } + return 0; } Modified: vendor/fuse-emulator/current/fuse/peripherals/disk/didaktik.c =================================================================== --- vendor/fuse-emulator/current/fuse/peripherals/disk/didaktik.c 2016-09-30 12:48:19 UTC (rev 826) +++ vendor/fuse-emulator/current/fuse/peripherals/disk/didaktik.c 2016-10-03 04:43:11 UTC (rev 827) @@ -4,7 +4,7 @@ Copyright (c) 2016 Sergio Baldoví Copyright (c) 2016 Fredrick Meunier - $Id: didaktik.c 5677 2016-07-09 13:58:02Z fredm $ + $Id: didaktik.c 5670 2016-07-08 21:33:08Z 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: vendor/fuse-emulator/current/fuse/peripherals/disk/didaktik.h =================================================================== --- vendor/fuse-emulator/current/fuse/peripherals/disk/didaktik.h 2016-09-30 12:48:19 UTC (rev 826) +++ vendor/fuse-emulator/current/fuse/peripherals/disk/didaktik.h 2016-10-03 04:43:11 UTC (rev 827) @@ -1,7 +1,7 @@ /* didaktik.h: Routines for handling the Didaktik 40/80 disk interface Copyright (c) 2015 Gergely Szasz - $Id: didaktik.h 5677 2016-07-09 13:58:02Z fredm $ + $Id: didaktik.h 5670 2016-07-08 21:33:08Z 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: vendor/fuse-emulator/current/fuse/peripherals/disk/disk.c =================================================================== --- vendor/fuse-emulator/current/fuse/peripherals/disk/disk.c 2016-09-30 12:48:19 UTC (rev 826) +++ vendor/fuse-emulator/current/fuse/peripherals/disk/disk.c 2016-10-03 04:43:11 UTC (rev 827) @@ -134,7 +134,7 @@ return 0; } -void +static void position_context_save( const disk_t *d, disk_position_context_t *c ) { c->track = d->track; @@ -144,7 +144,7 @@ c->i = d->i; } -void +static void position_context_restore( disk_t *d, const disk_position_context_t *c ) { d->track = c->track; Modified: vendor/fuse-emulator/current/fuse/peripherals/disk/trdos.c =================================================================== --- vendor/fuse-emulator/current/fuse/peripherals/disk/trdos.c 2016-09-30 12:48:19 UTC (rev 826) +++ vendor/fuse-emulator/current/fuse/peripherals/disk/trdos.c 2016-10-03 04:43:11 UTC (rev 827) @@ -1,7 +1,7 @@ /* trdos.c: Routines for handling the TR-DOS filesystem Copyright (c) 2016 Sergio Baldoví - $Id: trdos.c 5755 2016-08-17 12:10:38Z fredm $ + $Id: trdos.c 5746 2016-08-16 21:55:53Z 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 Modified: vendor/fuse-emulator/current/fuse/peripherals/disk/trdos.h =================================================================== --- vendor/fuse-emulator/current/fuse/peripherals/disk/trdos.h 2016-09-30 12:48:19 UTC (rev 826) +++ vendor/fuse-emulator/current/fuse/peripherals/disk/trdos.h 2016-10-03 04:43:11 UTC (rev 827) @@ -1,7 +1,7 @@ /* trdos.h: Routines for handling the TR-DOS filesystem Copyright (c) 2016 Sergio Baldoví - $Id: trdos.h 5755 2016-08-17 12:10:38Z fredm $ + $Id: trdos.h 5746 2016-08-16 21:55:53Z 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 Modified: vendor/fuse-emulator/current/fuse/peripherals/disk/upd_fdc.c =================================================================== --- vendor/fuse-emulator/current/fuse/peripherals/disk/upd_fdc.c 2016-09-30 12:48:19 UTC (rev 826) +++ vendor/fuse-emulator/current/fuse/peripherals/disk/upd_fdc.c 2016-10-03 04:43:11 UTC (rev 827) @@ -35,10 +35,10 @@ #define MAX_SIZE_CODE 8 -static const int UPD_FDC_MAIN_DRV_0_SEEK = 0x01; -static const int UPD_FDC_MAIN_DRV_1_SEEK = 0x02; -static const int UPD_FDC_MAIN_DRV_2_SEEK = 0x04; -static const int UPD_FDC_MAIN_DRV_3_SEEK = 0x08; +/* static const int UPD_FDC_MAIN_DRV_0_SEEK = 0x01; */ +/* static const int UPD_FDC_MAIN_DRV_1_SEEK = 0x02; */ +/* static const int UPD_FDC_MAIN_DRV_2_SEEK = 0x04; */ +/* static const int UPD_FDC_MAIN_DRV_3_SEEK = 0x08; */ static const int UPD_FDC_MAIN_BUSY = 0x10; static const int UPD_FDC_MAIN_EXECUTION = 0x20; static const int UPD_FDC_MAIN_DATADIR = 0x40; @@ -49,9 +49,9 @@ static const int UPD_FDC_ST0_NOT_READY = 0x08; static const int UPD_FDC_ST0_EQUIP_CHECK = 0x10; static const int UPD_FDC_ST0_SEEK_END = 0x20; -static const int UPD_FDC_ST0_INT_NORMAL = 0x00; /* normal termination */ +/* static const int UPD_FDC_ST0_INT_NORMAL = 0x00; */ /* normal termination */ static const int UPD_FDC_ST0_INT_ABNORM = 0x40; /* abnormal termination */ -static const int UPD_FDC_ST0_INT_INVALID = 0x80; /* invalid command */ +/* static const int UPD_FDC_ST0_INT_INVALID = 0x80; */ /* invalid command */ static const int UPD_FDC_ST0_INT_READY = 0xc0; /* ready signal change */ static const int UPD_FDC_ST1_MISSING_AM = 0x01; @@ -70,7 +70,7 @@ static const int UPD_FDC_ST2_DATA_ERROR = 0x20; /* CRC error in data field */ static const int UPD_FDC_ST2_CONTROL_MARK= 0x40; -static const int UPD_FDC_ST3_TWO_SIDE = 0x08; +/* static const int UPD_FDC_ST3_TWO_SIDE = 0x08; */ static const int UPD_FDC_ST3_TR00 = 0x10; static const int UPD_FDC_ST3_READY = 0x20; static const int UPD_FDC_ST3_WRPROT = 0x40; Modified: vendor/fuse-emulator/current/fuse/peripherals/usource.c =================================================================== --- vendor/fuse-emulator/current/fuse/peripherals/usource.c 2016-09-30 12:48:19 UTC (rev 826) +++ vendor/fuse-emulator/current/fuse/peripherals/usource.c 2016-10-03 04:43:11 UTC (rev 827) @@ -2,7 +2,7 @@ Copyright (c) 2007-2016 Stuart Brady, Philip Kendall Copyright (c) 2016 Fredrick Meunier - $Id: usource.c 5677 2016-07-09 13:58:02Z fredm $ + $Id: usource.c 5670 2016-07-08 21:33:08Z 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: vendor/fuse-emulator/current/fuse/peripherals/usource.h =================================================================== --- vendor/fuse-emulator/current/fuse/peripherals/usource.h 2016-09-30 12:48:19 UTC (rev 826) +++ vendor/fuse-emulator/current/fuse/peripherals/usource.h 2016-10-03 04:43:11 UTC (rev 827) @@ -1,7 +1,7 @@ /* usource.h: Routines for handling the Currah uSource interface Copyright (c) 2007-2016 Stuart Brady, Philip Kendall - $Id: usource.h 5677 2016-07-09 13:58:02Z fredm $ + $Id: usource.h 5670 2016-07-08 21:33:08Z 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: vendor/fuse-emulator/current/fuse/perl/Makefile.am =================================================================== --- vendor/fuse-emulator/current/fuse/perl/Makefile.am 2016-09-30 12:48:19 UTC (rev 826) +++ vendor/fuse-emulator/current/fuse/perl/Makefile.am 2016-10-03 04:43:11 UTC (rev 827) @@ -2,7 +2,7 @@ ## Copyright (c) 2002 Philip Kendall ## Copyright (c) 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: vendor/fuse-emulator/current/fuse/pokefinder/Makefile.am =================================================================== --- vendor/fuse-emulator/current/fuse/pokefinder/Makefile.am 2016-09-30 12:48:19 UTC (rev 826) +++ vendor/fuse-emulator/current/fuse/pokefinder/Makefile.am 2016-10-03 04:43:11 UTC (rev 827) @@ -2,7 +2,7 @@ ## Copyright (c) 2003 Philip Kendall ## Copyright (c) 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: vendor/fuse-emulator/current/fuse/roms/Makefile.am =================================================================== --- vendor/fuse-emulator/current/fuse/roms/Makefile.am 2016-09-30 12:48:19 UTC (rev... [truncated message content] |