Merge 1.7.0 from upstream

.gitattributes

@@ -0,0 +1,5 @@
+/settings.dat text
+/menu_data.dat text
+/keysyms.dat text
+/ui/options.dat text
+/z80/*.dat text

.gitignore

@@ -2,6 +2,7 @@
 *.swp
 *.orig
 .DS_Store
+.grepai
 .vscode
 /aclocal.m4
 /autom4te.cache
@@ -15,8 +16,8 @@
 /config.sub
 /configure
 /cscope.out
-/data/fuse.desktop
 /data/fuse.xml
+/data/net.sourceforge.fuse_emulator.Fuse.desktop
 /data/shell-completion/bash.txt
 /data/shell-completion/man.txt
 /data/shell-completion/settings.txt
@@ -70,12 +71,14 @@
 /stamp-h.in
 tags
 /ui/fb/keysyms.c
-/ui/gtk/keysyms.c
-/ui/gtk/menu_data.c
-/ui/gtk/menu_data.ui
-/ui/gtk/options.c
-/ui/gtk/options.h
-/ui/gtk/options_internals.h
+/ui/gtk3/keysyms.c
+/ui/gtk3/menu_data.c
+/ui/gtk3/menu_data.ui
+/ui/gtk3/options.c
+/ui/gtk3/options.h
+/ui/gtk3/options_internals.h
+/ui/gtk3/resources.c
+/ui/gtk3/resources.h
 /ui/null/options.c
 /ui/sdl/keysyms.c
 /ui/widget/fuse.font
@@ -93,6 +96,10 @@ tags
 /ui/win32/options.rc
 /ui/xlib/keysyms.c
 /ui/xlib/xpixmaps.c
+/unittests/displaytest
+/unittests/sdl2displaytest
+/unittests/sdl2joysticktest
+/unittests/sdl2mousetest
 /ylwrap
 /z80/coretest
 /z80/coretest.exe

ChangeLog

@@ -1,9 +1,81 @@
-2021-??-??  Philip Kendall  <philip-fuse@shadowmagic.org.uk>
+2026-??-??  Philip Kendall  <philip-fuse@shadowmagic.org.uk>
 
-        * Fuse 1.?.? released.
+        * Fuse 1.x.x released.
+
+        * New features:
+          * Add SDL 2 compatibility (thanks, Gergely Szasz, Vitaly Greck,
+            Marc Serdeliuc, Sergio Baldoví and Alberto Garcia)
+            (Fredrick Meunier)
+
+        * UI improvements:
+          * Make 2x the default display scaler so Fuse is more usable on
+            modern screens (Fredrick Meunier).
+
+        * Emulation core improvements:
+          * Speed up display dirty-bit scanning with __builtin_ctz (Fredrick
+            Meunier).
+
+        * Debugger improvements:
+          * Remove $-prefixed hex digit syntax from the debugger to prevent
+            clashes with variables (fixes bug #407) (thanks, Gergely Szasz and
+            Sergio Baldoví).
+
+        * Deprecated features removed:
+          * Remove GTK2 support from the build and codebase (Derek Fountain).
+
+        * Miscellaneous improvements:
+          * Win32: don't abort startup if networking is blocked; instead,
+            disable Spectranet with a warning (Fredrick Meunier).
+          * Use LIBSPECTRUM_SUPPORTS_WAV to gate WAV support (Fredrick
+            Meunier).
+          * Correct libspectrum DLL version (thanks, Guesser) (Fredrick
+            Meunier).
+          * Suppress or fix various compiler warnings, including common-symbol
+            alignment warnings on macOS (Derek Fountain and Fredrick Meunier).
+          * Fix out-of-tree builds by using full paths in generated #includes
+            (Alberto Garcia).
+          * Add an AppStream metainfo file (Alberto Garcia).
+          * Document the profiler menu options (fixes bug #303) (Fredrick
+            Meunier).
+
+        * Testing improvements:
+          * Add unit tests for display rendering and dirty-region handling
+            (Philip Kendall and Fredrick Meunier).
+          * Expand unit test coverage for bitmap operations, mempool_strdup and
+            utils_safe_strdup edge cases (Fredrick Meunier).
+
+        * Various other minor bugfixes.
+
+2026-03-21  Philip Kendall  <philip-fuse@shadowmagic.org.uk>
+
+        * Fuse 1.7.0 released.
+
+        * New features:
+          * Add Currah µSpeech emulation (Stuart Brady, Vic Chwe and Sergio
+            Baldoví).
 
         * Emulation core improvements:
           * Speed up reading emulated memory locations (Jindřich Makovička).
+          * More accurate emulation of AM29F010B flash ROM (Guesser).
+          * EDSK disk images: allow loading unformatted disk images (fixes
+            bug #455) (Gergely Szasz).
+          * EDSK disk images: allow merging disk sides with different bytes
+            per track (fixes bug #454) (Gergely Szasz).
+          * EDSK disk images: handle special "Stored data length" extension
+            per Simon Owen's spec, fixing load of Cabal, NARC and Robin of
+            Sherlock (fixes bug #452) (Gergely Szasz).
+          * EDSK disk images: pad disk tracks to a multiple of 256 bytes,
+            fixing Action Countdown, Discology +3, Genial, Gonzzalezz, SP5
+            and Trigger (Lightgun) (fixes bug #451) (Gergely Szasz).
+          * Fix SCAN bug in uPD765 FDC, allowing formatting on CP/M Plus and
+            Fuzix (fixes bug #453) (thanks, Phil Reynolds and Vic Chwe)
+            (Gergely Szasz).
+          * TTX2000S: improve teletext datastream code; protect against
+            desynchronised packet streams and fast-forward buffer after
+            emulation is paused (Guesser and Sergio Baldoví).
+          * Spectranet: raise W5100 CON and DISCON socket interrupts on state
+            transitions, fixing delayed connect/disconnect detection in BASIC
+            channels/streams (fixes bug #513) (Guesser).
 
         * UI improvements:
           * Timex: don't abort if the Timex dock cartridge image is not
@@ -12,9 +84,32 @@
             (Gergely Szasz).
           * GTK UI: Fix loading binary data from deleted files (thanks, Crisis)
             (Sergio Baldoví).
+          * GTK UI: use PNG instead of XPM for toolbar icons, fixing display
+            with gdk-pixbuf >= 2.42.11 (fixes bug #509) (Alberto Garcia).
+          * GTK UI: fix memory leak of tape_marker_pixbuf when the tape
+            browser is closed (Alberto Garcia).
+          * GTK UI: remove use of deprecated gdk_keymap_get_default (Philip
+            Kendall).
+          * Move sound peripherals into their own "Peripherals/Sound" menu
+            (Miroslav Ďurčík and Sergio Baldoví).
+          * Win32 UI: fix handling of multiple monitors (fixes bug #491)
+            (Miroslav Ďurčík).
+          * Win32 UI: suppress unwanted window maximising on title bar
+            double-click (fixes bug #488) (Miroslav Ďurčík).
 
         * Miscellaneous improvements:
           * Add ZIP files to the bash completion script (Alberto Garcia).
+          * Prevent potential segmentation fault due to overflow when emulation
+            speed is set very high (Pete Moore).
+          * Cap tstates of timer event to further prevent segfault (fixes
+            bug #504) (Pete Moore and Philip Kendall).
+          * Remove SVGAlib UI (Sergio Baldoví).
+          * Remove MIME types for obscure and generic file formats, and rename
+            'icon' to 'generic-icon' in the MIME info file (fixes bug #494)
+            (Alberto Garcia and Sergio Baldoví).
+          * Replace obsolete autoconf macros (Sergio Baldoví).
+          * Add support for loading .S snapshot files (Miroslav Ďurčík).
+          * Add missing include in ui/uijoystick.c (Viorel).
 
 2021-02-27  Philip Kendall  <philip-fuse@shadowmagic.org.uk>
 

INSTALL

@@ -142,7 +142,7 @@ PKG_CONFIG_LIBDIR=/usr/local/i686-w64-mingw32/lib/pkgconfig \
             --prefix=/usr/local/i686-w64-mingw32
 make
 
-Note: you need `libspectrum-9.dll' and the `roms' directory and the `lib'
+Note: you need `libspectrum-18.dll' and the `roms' directory and the `lib'
   directory to `fuse' run perfectly. You may copy this file and directories
   into that directory where `fuse.exe' exists. On Windows you may need to
   copy all files from `lib/uncompressed' into `lib'. Alternatively, you could

Makefile.am

@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-## Copyright (c) 1999-2015 Philip Kendall
+## Copyright (c) 1999-2017 Philip Kendall
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -65,8 +65,12 @@ fuse_LDADD = \
              $(X_LIBS) \
              $(XML_LIBS)
 
-if USE_SDL
-fuse_LDADD += $(SDL_LIBS)
+if USE_SDL1
+fuse_LDADD += $(SDL1_LIBS)
+endif
+
+if USE_SDL2
+fuse_LDADD += $(SDL2_LIBS)
 endif
 
 fuse_DEPENDENCIES =
@@ -92,8 +96,12 @@ AM_CPPFLAGS = \
               -DFUSEDATADIR="\"${pkgdatadir}\"" \
               $(PNG_CFLAGS)
 
-if USE_SDL
-AM_CPPFLAGS += $(SDL_CFLAGS)
+if USE_SDL1
+AM_CPPFLAGS += $(SDL1_CFLAGS)
+endif
+
+if USE_SDL2
+AM_CPPFLAGS += $(SDL2_CFLAGS)
 endif
 
 AM_CFLAGS = $(WARN_CFLAGS) $(PTHREAD_CFLAGS)
@@ -140,7 +148,6 @@ EXTRA_DIST = AUTHORS \
 	     m4/ax_create_stdint_h.m4 \
 	     m4/ax_pthread.m4 \
 	     m4/ax_string_strcasecmp.m4 \
-	     m4/gtk-2.0.m4 \
 	     m4/pkg.m4 \
 	     m4/sdl.m4 \
 	     menu_data.dat \
@@ -157,12 +164,18 @@ DISTCLEANFILES =
 
 pkgdata_DATA =
 
+test: z80/coretest unittests/displaytest
+	z80/coretest $(srcdir)/z80/tests/tests.in > z80/tests.actual
+	cmp z80/tests.actual $(srcdir)/z80/tests/tests.expected
+	./unittests/displaytest
+
 
 ## Resources for Windows executables
 if COMPAT_WIN32
 
+fuse_LDFLAGS = -mwindows
 fuse_SOURCES += windres.rc
-fuse_LDADD += windres.o
+fuse_LDADD += -lcomctl32 -lwinmm windres.o
 fuse_DEPENDENCIES += windres.o
 
 windres.o: windres.rc data/win32/winfuse.ico data/win32/fuse.manifest $(ui_win32_res)
@@ -187,13 +200,21 @@ include sound/Makefile.am
 include timer/Makefile.am
 include ui/Makefile.am
 include ui/fb/Makefile.am
-include ui/gtk/Makefile.am
+include ui/gtk3/Makefile.am
 include ui/null/Makefile.am
 include ui/scaler/Makefile.am
 include ui/sdl/Makefile.am
+include ui/sdl2/Makefile.am
 include ui/widget/Makefile.am
 include ui/wii/Makefile.am
 include ui/win32/Makefile.am
 include ui/xlib/Makefile.am
 include unittests/Makefile.am
 include z80/Makefile.am
+
+check-local: fuse unittests/displaytest unittests/sdl2displaytest unittests/sdl2joysticktest unittests/sdl2mousetest
+	$(top_builddir)/fuse --unittests
+	$(top_builddir)/unittests/displaytest
+	$(top_builddir)/unittests/sdl2displaytest
+	$(top_builddir)/unittests/sdl2joysticktest
+	$(top_builddir)/unittests/sdl2mousetest

README

@@ -1,4 +1,4 @@
-The Free Unix Spectrum Emulator (Fuse) 1.6.0
+The Free Unix Spectrum Emulator (Fuse) 1.7.0
 ============================================
 
 Fuse (the Free Unix Spectrum Emulator) was originally, and somewhat
@@ -26,8 +26,8 @@ What Fuse does have:
   rollback and 'competition mode'.
 * Emulation of the Currah µSource, Interface 1, Kempston mouse,
   Multiface One/128/3 and TTX2000S interfaces.
-* Emulation of the Covox, Fuller audio box, Melodik and SpecDrum audio
-  interfaces.
+* Emulation of the Covox, Currah µSpeech, Fuller audio box, Melodik and
+  SpecDrum audio interfaces.
 * Emulation of the DivIDE, DivMMC, Spectrum +3e, ZXATASP, ZXCF and ZXMMC
   storage interfaces.
 * Emulation of the Beta 128, +D, Didaktik 80/40, DISCiPLE and Opus Discovery
@@ -114,4 +114,4 @@ Usenet newsgroup `comp.sys.sinclair' or the World of Spectrum forums
 <http://www.worldofspectrum.org/forums/>.
 
 Philip Kendall <philip-fuse@shadowmagic.org.uk>
-27th February, 2021
+10th March, 2026

compat.h

@@ -1,7 +1,7 @@
 /* compat.h: various compatibility bits
    Copyright (c) 2003-2012 Philip Kendall
    Copyright (c) 2015 Stuart Brady
-   Copyright (c) 2015 Sergio Baldoví
+   Copyright (c) 2015-2016 Sergio Baldoví
 
    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
@@ -117,7 +117,6 @@ typedef enum utils_aux_type {
   UTILS_AUXILIARY_LIB,		/* Something from the lib/ directory */
   UTILS_AUXILIARY_ROM,		/* Something from the roms/ directory */
   UTILS_AUXILIARY_WIDGET,	/* Something from the widget/ directory */
-  UTILS_AUXILIARY_GTK,		/* Something from the gtk/ directory */
 
 } utils_aux_type;
 
@@ -133,16 +132,12 @@ typedef struct path_context {
 int compat_osname( char *buffer, size_t length );
 const char* compat_get_temp_path( void );
 const char* compat_get_config_path( void );
+const char* compat_get_fallback_config_path( void );
 int compat_is_absolute_path( const char *path );
 int compat_get_next_path( path_context *ctx );
 
 typedef FILE* compat_fd;
-
-#ifndef GEKKO
 typedef DIR* compat_dir;
-#else                           /* #ifndef GEKKO */
-typedef DIR_ITER* compat_dir;
-#endif                          /* #ifndef GEKKO */
 
 extern const compat_fd COMPAT_FILE_OPEN_FAILED;
 
@@ -184,13 +179,18 @@ int compat_get_tap( const char *interface_name );
 
 #ifdef WIN32
 #include <winsock2.h>
+#include <ws2tcpip.h>
 #define COMPAT_ENOTCONN WSAENOTCONN
 #define COMPAT_EWOULDBLOCK WSAEWOULDBLOCK
 #define COMPAT_EINPROGRESS WSAEINPROGRESS
 #define COMPAT_ECONNREFUSED WSAECONNREFUSED
 typedef SOCKET compat_socket_t;
 typedef SOCKADDR compat_sockaddr;
-#else  /* #ifndef WIN32 */
+#elif GEKKO
+/* no sockets under WII, just define the minimum
+   to feed the below compat_ declarations  */
+typedef int compat_socket_t;
+#else  /* #ifndef WIN32 && GEKKO */
 #include <sys/socket.h>
 #include <netdb.h>
 #include <errno.h>
@@ -209,6 +209,7 @@ void compat_socket_networking_init( void );
 void compat_socket_networking_end( void );
 
 int compat_socket_blocking_mode( compat_socket_t fd, int blocking );
+int compat_socket_get_fionread( compat_socket_t fd, u_long *bytes );
 int compat_socket_close( compat_socket_t fd );
 int compat_socket_get_error( void );
 const char *compat_socket_get_strerror( void );

compat/Makefile.am

@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-## Copyright (c) 2003-2013 Philip Kendall
+## Copyright (c) 2003-2016 Philip Kendall
 ## Copyright (c) 2015 Sergio Baldoví
 
 ## This program is free software; you can redistribute it and/or modify
@@ -83,7 +83,7 @@ endif
 ## Wii routines
 if COMPAT_WII
 fuse_SOURCES += \
-                compat/wii/dir.c \
+                compat/unix/dir.c \
                 compat/unix/file.c \
                 compat/wii/osname.c \
                 compat/wii/paths.c \

compat/amiga/paths.c

@@ -46,6 +46,12 @@ compat_get_config_path( void )
   return "PROGDIR:settings";
 }
 
+const char*
+compat_get_fallback_config_path( void )
+{
+  return NULL;
+}
+
 int
 compat_is_absolute_path( const char *path )
 {
@@ -72,7 +78,6 @@ compat_get_next_path( path_context *ctx )
     case UTILS_AUXILIARY_LIB: strncpy( ctx->path, "PROGDIR:lib/", PATH_MAX); return 1;
     case UTILS_AUXILIARY_ROM: strncpy( ctx->path, "PROGDIR:roms/", PATH_MAX); return 1;
     case UTILS_AUXILIARY_WIDGET: strncpy( ctx->path, "PROGDIR:ui/widget/", PATH_MAX); return 1;
-    case UTILS_AUXILIARY_GTK: strncpy( ctx->path, "PROGDIR:ui/gtk/", PATH_MAX); return 1;
     default:
       ui_error( UI_ERROR_ERROR, "unknown auxiliary file type %d", ctx->type );
       return 0;