Merge remote-tracking branch 'upstream-main/master' into gdbserver_osx

Author: desertkun

.gitignore

@@ -79,7 +79,6 @@ tags
 /ui/gtk/options_internals.h
 /ui/null/options.c
 /ui/sdl/keysyms.c
-/ui/svga/keysyms.c
 /ui/widget/fuse.font
 /ui/widget/menu_data.c
 /ui/widget/options.c

AUTHORS

@@ -32,7 +32,7 @@ Fuse has been brought to you by:
 * Matthew Wescott: the AY logging code.
 
 * Marek Januszewski: Some patches making Fuse much closer to compiling under
-  Win32, and fixing up the GTK+ 2.0 interface.
+  Win32, and fixing up the GTK 2.0 interface.
 
 * Sergio Baldoví: improvements to the Win32 UI.
 

ChangeLog

@@ -1,3 +1,111 @@
+2021-??-??  Philip Kendall  <philip-fuse@shadowmagic.org.uk>
+
+        * Fuse 1.?.? released.
+
+        * Emulation core improvements:
+          * Speed up reading emulated memory locations (Jindřich Makovička).
+
+        * UI improvements:
+          * Timex: don't abort if the Timex dock cartridge image is not
+            found (Alberto Garcia).
+          * WidgetUI: rearrange AY register and Z80 flags in the debugger
+            (Gergely Szasz).
+          * GTK UI: Fix loading binary data from deleted files (thanks, Crisis)
+            (Sergio Baldoví).
+
+        * Miscellaneous improvements:
+          * Add ZIP files to the bash completion script (Alberto Garcia).
+
+2021-02-27  Philip Kendall  <philip-fuse@shadowmagic.org.uk>
+
+        * Fuse 1.6.0 released.
+
+        * New features:
+          * Add TTX2000S emulation (Guesser).
+          * Experimental PulseAudio sound driver (Grzegorz Jablonski and Sergio
+            Baldoví).
+
+        * Emulation core improvements:
+          * Fix activation of joystick and IF2 peripherals when loading a
+            snapshot (thanks, ICEknight) (Sergio Baldoví).
+
+        * UI improvements:
+          * New higher resolution keyboard picture on GTK and win32 UIs
+            (thanks, Andrew Owen for the picture) (Sergio Baldoví and Philip
+            Kendall).
+          * GTK UI: Add Fuse icon to the about dialog and the main window
+            (Alberto Garcia).
+          * GTK UI: Load/save binary dialog remembers last values (Derek
+            Fountain).
+          * GTK 3 UI: Improve moving and sizing Fuse's window under Wayland
+            (Sergio Baldoví).
+          * GTK 3 UI: Fix kempston mouse values on Wayland (thanks, Philip
+            Kendall) (Sergio Baldoví).
+          * GTK 3 UI: Fix bug when resizing from 2x to 3x on GTK UI (Sergio
+            Baldoví)
+          * SDL UI: Fix crash when using dispmanx backend on the Raspberry Pi
+            (Jools Wills).
+          * SDL UI: Allow forcing fullscreen mode when SDL doesn't report
+            available screen modes (Sergio Baldoví).
+          * WidgetUI: New dialog to load/save binary data (Gergely Szasz).
+          * WidgetUI: Enable HOME and END keys in menus on widget UIs (Gergely
+            Szasz).
+          * WidgetUI: Use monospaced characters on memory browser (Gergely
+            Szasz).
+          * WidgetUI: Fix crash when trying to overwrite read-only files (Pedro
+            Luis Rodríguez González).
+          * Win32: Fix bitwise operation in debugger (Sergio Baldoví).
+          * Xlib UI: Try to keep graphic filter when the user resize the window
+            (Gergely Szasz).
+
+        * Scaler improvements:
+          * Fix display corruption with HQ 3x scaler (thanks, Philip Kendall)
+            (Sergio Baldoví).
+          * Fix antialiasing effect of AdvMAME3x scaler (Sergio Baldoví).
+          * Add 4x, TV 4x, Pal TV 4x and HQ 4x scalers on GTK, SDL, win32 and
+            Xlib UIs (Sergio Baldoví and Gergely Szasz).
+          * Allow screenshots with TV 3x, PAL TV and Timex 1.5x scalers (Sergio
+            Baldoví).
+
+        * Miscellaneous improvements:
+          * Allow selection of audio driver at build time (thanks, kov_serg)
+            (Alberto Garcia).
+          * Support of SDL 2 for joystick and audio drivers (Alberto Garcia).
+          * Fix GTK 3 build when the GTK version is < 3.20 (thanks, Thrice)
+            (Alberto Garcia).
+          * Fix GTK build with Wayland, Quartz and Windows backends (thanks,
+            Stuart Brady) (Sergio Baldoví).
+          * Various fixes to allow compilation with GCC 10 (Alberto Garcia and
+            Sergio Baldoví).
+          * Suppress a couple of -Wunused-result warnings from gcc (Alberto
+            Garcia).
+          * Improve error message when opening a directory from the command
+            line (thanks, Philip Kendall) (Alberto Garcia and Sergio Baldoví).
+
+2018-12-09  Philip Kendall  <philip-fuse@shadowmagic.org.uk>
+
+        * Fuse 1.5.7 released.
+
+        * UI improvements:
+          * GTK+ 3: Make the offset entry wider in memory browser (Derek
+            Fountain).
+          * GTK+: Remove duplicated surface creation code (Philip Kendall).
+          * GTK+: Remove use of deprecated gtk_device_(un)grab functions
+            (Philip Kendall).
+          * GTK+/Win32: Add *.bin as an allowed filetype to file selectors and
+            amend .fmf filetype (thanks, Allan Turvey) (Sergio Baldoví).
+          * Improve Fuse's window sizing under Wayland; still not right, but
+            better than it was before (Sergio Baldoví).
+          * Improve Fuse's Kempston mouse handling under GTK+ 3.x (Philip
+            Kendall).
+          * Stop Kempston mouse causing a crash under Wayland; still doesn't
+            work properly though (Philip Kendall).
+
+        * Miscellaneous improvements:
+          * "Save binary" command can now save 65536 bytes again (regression
+            introduced in 1.5.6; thanks, thrice) (Philip Kendall).
+          * Remove gcc 8 string overflow warnings (Philip Kendall).
+
 2018-08-06  Philip Kendall  <philip-fuse@shadowmagic.org.uk>
 
         * Fuse 1.5.6 released.

INSTALL

@@ -8,9 +8,8 @@ $ ./configure
 There are now some options you can give to configure; `configure
 --help' will list them all, but the most important are:
 
---with-fb		Use the framebuffer interface, rather than GTK+.
---with-sdl		Use the SDL interface, rather than GTK+.
---with-svgalib		Use the SVGAlib interface.
+--with-fb		Use the framebuffer interface, rather than GTK.
+--with-sdl		Use the SDL interface, rather than GTK.
 --without-gtk		Use the plain Xlib interface.
 
 If glib is installed on your system, Fuse will use this for a couple
@@ -143,7 +142,7 @@ PKG_CONFIG_LIBDIR=/usr/local/i686-w64-mingw32/lib/pkgconfig \
             --prefix=/usr/local/i686-w64-mingw32
 make
 
-Note: you need `libspectrum-8.dll' and the `roms' directory and the `lib'
+Note: you need `libspectrum-9.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

@@ -62,10 +62,13 @@ fuse_LDADD = \
              $(GTK_LIBS) \
              $(GLIB_LIBS) \
              $(PNG_LIBS) \
-             $(SDL_LIBS) \
              $(X_LIBS) \
              $(XML_LIBS)
 
+if USE_SDL
+fuse_LDADD += $(SDL_LIBS)
+endif
+
 fuse_DEPENDENCIES =
 
 EXTRA_fuse_SOURCES =
@@ -87,9 +90,12 @@ AM_CPPFLAGS = \
               $(LIBSPECTRUM_CFLAGS) \
               $(XML_CFLAGS) \
               -DFUSEDATADIR="\"${pkgdatadir}\"" \
-              $(SDL_CFLAGS) \
               $(PNG_CFLAGS)
 
+if USE_SDL
+AM_CPPFLAGS += $(SDL_CFLAGS)
+endif
+
 AM_CFLAGS = $(WARN_CFLAGS) $(PTHREAD_CFLAGS)
 
 noinst_HEADERS = bitmap.h \
@@ -185,7 +191,6 @@ include ui/gtk/Makefile.am
 include ui/null/Makefile.am
 include ui/scaler/Makefile.am
 include ui/sdl/Makefile.am
-include ui/svga/Makefile.am
 include ui/widget/Makefile.am
 include ui/wii/Makefile.am
 include ui/win32/Makefile.am

README

@@ -1,4 +1,4 @@
-The Free Unix Spectrum Emulator (Fuse) 1.5.6
+The Free Unix Spectrum Emulator (Fuse) 1.6.0
 ============================================
 
 Fuse (the Free Unix Spectrum Emulator) was originally, and somewhat
@@ -17,20 +17,23 @@ What Fuse does have:
   Scorpion ZS 256 emulation.
 * Runs at true Speccy speed on any computer you're likely to try it on.
 * Support for loading from .tzx files, including accelerated loading.
-* Sound (on systems supporting the Open Sound System, SDL, or OpenBSD/
-  Solaris's /dev/audio).
+* Sound (on systems supporting the Open Sound System, SDL, OpenBSD/
+  Solaris's /dev/audio, CoreAudio or PulseAudio).
 * Emulation of most of the common joysticks used on the Spectrum
   (including Kempston, Sinclair and Cursor joysticks).
 * Emulation of some of the printers you could attach to a Spectrum.
 * Support for the RZX input recording file format, including
   rollback and 'competition mode'.
-* Emulation of the Currah µSource, DivIDE, DivMMC, Interface 1, Kempston mouse,
-  Multiface One/128/3, Spectrum +3e, ZXATASP, ZXCF and ZXMMC interfaces.
+* 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 DivIDE, DivMMC, Spectrum +3e, ZXATASP, ZXCF and ZXMMC
+  storage interfaces.
 * Emulation of the Beta 128, +D, Didaktik 80/40, DISCiPLE and Opus Discovery
   disk interfaces.
 * Emulation of the Spectranet and SpeccyBoot network interfaces.
+* Emulation of the TTX2000 S Teletext adapter.
 * Support for the Recreated ZX Spectrum Bluetooth keyboard.
 
 Help! <xyz> doesn't work
@@ -48,7 +51,7 @@ Unix, Linux, BSD, etc.
 
 Required:
 
-* X, SDL, svgalib or framebuffer support. If you have GTK+, you'll get
+* X, SDL or framebuffer support. If you have GTK, you'll get
   a (much) nicer user interface under X.
 * libspectrum: this is available from
   http://fuse-emulator.sourceforge.net/libspectrum.php
@@ -111,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>
-6th August, 2018
+27th February, 2021

THANKS

@@ -22,7 +22,7 @@ Some thanks (in alphabetical order):
 
 * Ivan Ruiz Etxabe: for helping test RZX competition mode recording.
 
-* Martin Garton: making the GTK+ user interface compatible with GTK+ 2.0,
+* Martin Garton: making the GTK user interface compatible with GTK 2.0,
   although I then went and broke it in other ways.
 
 * Ian Greenway: for information about reading from unattached ports. If
@@ -60,6 +60,9 @@ Some thanks (in alphabetical order):
 
 * David Muriel: for helping test RZX competition mode recording.
 
+* Andrew Owen: for providing the PNG keyboard image used in GTK and
+  win32 UIs.
+
 * Santiago Romero: for putting me on the track of a bug in Fuse's keyboard
   emulation.
 

compat.h

@@ -182,10 +182,24 @@ int compat_get_tap( const char *interface_name );
 
 /* Socket handling */
 
-#ifndef WIN32
-typedef int compat_socket_t;
-#else                           /* #ifndef WIN32 */
+#ifdef WIN32
+#include <winsock2.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 */
+#include <sys/socket.h>
+#include <netdb.h>
+#include <errno.h>
+#define COMPAT_ENOTCONN ENOTCONN
+#define COMPAT_EWOULDBLOCK EWOULDBLOCK
+#define COMPAT_EINPROGRESS EINPROGRESS
+#define COMPAT_ECONNREFUSED ECONNREFUSED
+typedef int compat_socket_t;
+typedef struct sockaddr compat_sockaddr;
 #endif
 
 extern const compat_socket_t compat_socket_invalid;
@@ -194,6 +208,7 @@ extern const int compat_socket_EBADF;
 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_close( compat_socket_t fd );
 int compat_socket_get_error( void );
 const char *compat_socket_get_strerror( void );

compat/amiga/osname.c

@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <errno.h>
 #include <stdlib.h>

compat/amiga/paths.c

@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <errno.h>
 #ifdef HAVE_LIBGEN_H