From: <fr...@us...> - 2016-06-01 10:46:13
|
Revision: 804 http://sourceforge.net/p/fuse-for-macosx/code/804 Author: fredm Date: 2016-06-01 10:46:07 +0000 (Wed, 01 Jun 2016) Log Message: ----------- Merge up to vendor 1.2.0 release branches r5525. Revision Links: -------------- http://sourceforge.net/p/fuse-for-macosx/code/5525 Modified Paths: -------------- trunk/fuse/AUTHORS trunk/fuse/ChangeLog trunk/fuse/INSTALL trunk/fuse/Makefile.am trunk/fuse/README trunk/fuse/THANKS trunk/fuse/autogen.sh trunk/fuse/bitmap.h trunk/fuse/compat/Makefile.am trunk/fuse/compat/amiga/osname.c trunk/fuse/compat/amiga/paths.c trunk/fuse/compat/linux/paths.c trunk/fuse/compat/morphos/osname.c trunk/fuse/compat/unix/dir.c trunk/fuse/compat/unix/file.c trunk/fuse/compat/unix/osname.c trunk/fuse/compat/unix/paths.c trunk/fuse/compat/unix/socket.c trunk/fuse/compat/unix/timer.c trunk/fuse/compat/unix/tuntap.c trunk/fuse/compat/wii/dir.c trunk/fuse/compat/wii/osname.c trunk/fuse/compat/wii/paths.c trunk/fuse/compat/wii/timer.c trunk/fuse/compat/win32/osname.c trunk/fuse/compat/win32/paths.c trunk/fuse/compat/win32/socket.c trunk/fuse/compat/win32/timer.c trunk/fuse/compat.h trunk/fuse/configure.ac trunk/fuse/data/Makefile.am trunk/fuse/data/fuse.desktop.in trunk/fuse/data/fuse.xml.in trunk/fuse/debugger/Makefile.am trunk/fuse/debugger/breakpoint.c trunk/fuse/debugger/breakpoint.h trunk/fuse/debugger/command.c trunk/fuse/debugger/commandl.l trunk/fuse/debugger/commandy.y trunk/fuse/debugger/debugger.c trunk/fuse/debugger/debugger.h trunk/fuse/debugger/debugger_internals.h trunk/fuse/debugger/disassemble.c trunk/fuse/debugger/event.c trunk/fuse/debugger/expression.c trunk/fuse/debugger/variable.c trunk/fuse/display.c trunk/fuse/display.h trunk/fuse/event.c trunk/fuse/event.h trunk/fuse/fuse.c trunk/fuse/fuse.h trunk/fuse/fusepb/English.lproj/InfoPlist.strings trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj trunk/fuse/fusepb/FuseMenus.m trunk/fuse/fusepb/Info-Fuse.plist trunk/fuse/fusepb/controllers/DebuggerController.h trunk/fuse/fusepb/controllers/DebuggerController.m trunk/fuse/fusepb/controllers/FuseController.h trunk/fuse/fusepb/controllers/FuseController.m trunk/fuse/fusepb/controllers/PreferencesController.m trunk/fuse/fusepb/models/Emulator.h trunk/fuse/fusepb/models/Emulator.m trunk/fuse/fusepb/resources/Fuse Help/html/about.html trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html trunk/fuse/fusepb/resources/Fuse Help/html/disciple.html trunk/fuse/fusepb/resources/Fuse Help/html/divide.html trunk/fuse/fusepb/resources/Fuse Help/html/formats.html trunk/fuse/fusepb/resources/Fuse Help/html/general.html trunk/fuse/fusepb/resources/Fuse Help/html/menus.html trunk/fuse/fusepb/resources/Fuse Help/html/monitor.html trunk/fuse/fusepb/resources/Fuse Help/html/peripherals.html trunk/fuse/fusepb/resources/Fuse Help/html/plusd.html trunk/fuse/fusepb/resources/Fuse Help/html/tocstart.html trunk/fuse/fusepb/settings-cocoa-header.pl trunk/fuse/fusepb/settings-header.pl trunk/fuse/fusepb/settings_cocoa.h trunk/fuse/fusepb/views/DisplayOpenGLView.h trunk/fuse/fusepb/views/DisplayOpenGLView.m trunk/fuse/fusepb/xibs/Debugger.xib trunk/fuse/fusepb/xibs/MainMenu.xib trunk/fuse/fusepb/xibs/Preferences.xib trunk/fuse/hacking/ChangeLog trunk/fuse/hacking/Makefile.am trunk/fuse/hacking/peripheral_tests.txt trunk/fuse/input.c trunk/fuse/input.h trunk/fuse/keyboard.c trunk/fuse/keyboard.h trunk/fuse/keysyms.pl trunk/fuse/lib/Makefile.am trunk/fuse/loader.c trunk/fuse/loader.h trunk/fuse/m4/ax_pthread.m4 trunk/fuse/m4/pkg.m4 trunk/fuse/machine.c trunk/fuse/machine.h trunk/fuse/machines/Makefile.am trunk/fuse/machines/machines.h trunk/fuse/machines/machines_periph.c trunk/fuse/machines/machines_periph.h trunk/fuse/machines/pentagon.c trunk/fuse/machines/pentagon.h trunk/fuse/machines/pentagon1024.c trunk/fuse/machines/pentagon512.c trunk/fuse/machines/scorpion.c trunk/fuse/machines/scorpion.h trunk/fuse/machines/spec128.c trunk/fuse/machines/spec128.h trunk/fuse/machines/spec16.c trunk/fuse/machines/spec48.c trunk/fuse/machines/spec48.h trunk/fuse/machines/spec48_ntsc.c trunk/fuse/machines/spec_se.c trunk/fuse/machines/specplus2.c trunk/fuse/machines/specplus2a.c trunk/fuse/machines/specplus3.c trunk/fuse/machines/specplus3.h trunk/fuse/machines/specplus3e.c trunk/fuse/machines/tc2048.c trunk/fuse/machines/tc2068.c trunk/fuse/machines/tc2068.h trunk/fuse/machines/ts2068.c trunk/fuse/man/Makefile.am trunk/fuse/man/fuse.1 trunk/fuse/memory.c trunk/fuse/memory.h trunk/fuse/mempool.c trunk/fuse/mempool.h trunk/fuse/menu.c trunk/fuse/menu.h trunk/fuse/menu_data.dat trunk/fuse/menu_data.pl trunk/fuse/module.c trunk/fuse/module.h trunk/fuse/movie.c trunk/fuse/movie.h trunk/fuse/movie_tables.h trunk/fuse/periph.c trunk/fuse/periph.h trunk/fuse/peripherals/Makefile.am trunk/fuse/peripherals/ay.c trunk/fuse/peripherals/ay.h trunk/fuse/peripherals/dck.c trunk/fuse/peripherals/dck.h trunk/fuse/peripherals/disk/beta.c trunk/fuse/peripherals/disk/beta.h trunk/fuse/peripherals/disk/crc.c trunk/fuse/peripherals/disk/crc.h trunk/fuse/peripherals/disk/disciple.c trunk/fuse/peripherals/disk/disciple.h trunk/fuse/peripherals/disk/disk.c trunk/fuse/peripherals/disk/disk.h trunk/fuse/peripherals/disk/fdd.c trunk/fuse/peripherals/disk/fdd.h trunk/fuse/peripherals/disk/opus.c trunk/fuse/peripherals/disk/opus.h trunk/fuse/peripherals/disk/plusd.c trunk/fuse/peripherals/disk/plusd.h trunk/fuse/peripherals/disk/upd_fdc.c trunk/fuse/peripherals/disk/upd_fdc.h trunk/fuse/peripherals/disk/wd_fdc.c trunk/fuse/peripherals/disk/wd_fdc.h trunk/fuse/peripherals/flash/am29f010.c trunk/fuse/peripherals/flash/am29f010.h trunk/fuse/peripherals/fuller.c trunk/fuse/peripherals/fuller.h trunk/fuse/peripherals/ide/divide.c trunk/fuse/peripherals/ide/divide.h trunk/fuse/peripherals/ide/ide.c trunk/fuse/peripherals/ide/ide.h trunk/fuse/peripherals/ide/simpleide.c trunk/fuse/peripherals/ide/simpleide.h trunk/fuse/peripherals/ide/zxatasp.c trunk/fuse/peripherals/ide/zxatasp.h trunk/fuse/peripherals/ide/zxcf.c trunk/fuse/peripherals/ide/zxcf.h trunk/fuse/peripherals/if1.c trunk/fuse/peripherals/if1.h trunk/fuse/peripherals/if2.c trunk/fuse/peripherals/if2.h trunk/fuse/peripherals/joystick.c trunk/fuse/peripherals/joystick.h trunk/fuse/peripherals/kempmouse.c trunk/fuse/peripherals/kempmouse.h trunk/fuse/peripherals/melodik.c trunk/fuse/peripherals/melodik.h trunk/fuse/peripherals/nic/enc28j60.c trunk/fuse/peripherals/nic/enc28j60.h trunk/fuse/peripherals/nic/w5100.c trunk/fuse/peripherals/nic/w5100.h trunk/fuse/peripherals/nic/w5100_internals.h trunk/fuse/peripherals/nic/w5100_socket.c trunk/fuse/peripherals/printer.c trunk/fuse/peripherals/printer.h trunk/fuse/peripherals/scld.c trunk/fuse/peripherals/scld.h trunk/fuse/peripherals/speccyboot.c trunk/fuse/peripherals/speccyboot.h trunk/fuse/peripherals/specdrum.c trunk/fuse/peripherals/specdrum.h trunk/fuse/peripherals/spectranet.c trunk/fuse/peripherals/spectranet.h trunk/fuse/peripherals/ula.c trunk/fuse/peripherals/ula.h trunk/fuse/perl/Fuse/Dialog.pm trunk/fuse/perl/Makefile.am trunk/fuse/pokefinder/Makefile.am trunk/fuse/pokefinder/pokefinder.c trunk/fuse/pokefinder/pokefinder.h trunk/fuse/pokefinder/pokemem.c trunk/fuse/pokefinder/pokemem.h trunk/fuse/profile.c trunk/fuse/profile.h trunk/fuse/psg.c trunk/fuse/psg.h trunk/fuse/rectangle.c trunk/fuse/rectangle.h trunk/fuse/roms/Makefile.am trunk/fuse/roms/se-0.rom trunk/fuse/roms/se-1.rom trunk/fuse/rzx.c trunk/fuse/rzx.h trunk/fuse/screenshot.c trunk/fuse/screenshot.h trunk/fuse/settings-header.pl trunk/fuse/settings.dat trunk/fuse/settings.pl trunk/fuse/slt.c trunk/fuse/slt.h trunk/fuse/snapshot.c trunk/fuse/snapshot.h trunk/fuse/sound/Makefile.am trunk/fuse/sound/alsasound.c trunk/fuse/sound/aosound.c trunk/fuse/sound/blipbuffer.h trunk/fuse/sound/dxsound.c trunk/fuse/sound/hpsound.c trunk/fuse/sound/nullsound.c trunk/fuse/sound/osssound.c trunk/fuse/sound/sdlsound.c trunk/fuse/sound/sunsound.c trunk/fuse/sound/wiisound.c trunk/fuse/sound/win32sound.c trunk/fuse/sound.c trunk/fuse/sound.h trunk/fuse/spectrum.c trunk/fuse/spectrum.h trunk/fuse/tape.c trunk/fuse/tape.h trunk/fuse/timer/Makefile.am trunk/fuse/timer/native.c trunk/fuse/timer/sdl.c trunk/fuse/timer/timer.c trunk/fuse/timer/timer.h trunk/fuse/ui/Makefile.am trunk/fuse/ui/cocoa/cocoadisplay.m trunk/fuse/ui/cocoa/cocoascreenshot.m trunk/fuse/ui/cocoa/cocoaui.m trunk/fuse/ui/cocoa/options-cocoa-header.pl trunk/fuse/ui/cocoa/options-header.pl trunk/fuse/ui/cocoa/options.pl trunk/fuse/ui/fb/Makefile.am trunk/fuse/ui/fb/fbdisplay.c trunk/fuse/ui/fb/fbdisplay.h trunk/fuse/ui/fb/fbjoystick.c trunk/fuse/ui/fb/fbkeyboard.c trunk/fuse/ui/fb/fbkeyboard.h trunk/fuse/ui/fb/fbmouse.c trunk/fuse/ui/fb/fbmouse.h trunk/fuse/ui/fb/fbui.c trunk/fuse/ui/gtk/Makefile.am trunk/fuse/ui/gtk/binary.c trunk/fuse/ui/gtk/browse.c trunk/fuse/ui/gtk/confirm.c trunk/fuse/ui/gtk/debugger.c trunk/fuse/ui/gtk/fileselector.c trunk/fuse/ui/gtk/gtkcompat.c trunk/fuse/ui/gtk/gtkcompat.h trunk/fuse/ui/gtk/gtkdisplay.c trunk/fuse/ui/gtk/gtkinternals.h trunk/fuse/ui/gtk/gtkjoystick.c trunk/fuse/ui/gtk/gtkkeyboard.c trunk/fuse/ui/gtk/gtkmouse.c trunk/fuse/ui/gtk/gtkui.c trunk/fuse/ui/gtk/memory.c trunk/fuse/ui/gtk/options.pl trunk/fuse/ui/gtk/picture.c trunk/fuse/ui/gtk/pixmaps.c trunk/fuse/ui/gtk/pokefinder.c trunk/fuse/ui/gtk/pokemem.c trunk/fuse/ui/gtk/rollback.c trunk/fuse/ui/gtk/roms.c trunk/fuse/ui/gtk/statusbar.c trunk/fuse/ui/gtk/stock.c trunk/fuse/ui/options.dat trunk/fuse/ui/scaler/Makefile.am trunk/fuse/ui/scaler/scaler.c trunk/fuse/ui/scaler/scaler_hq2x.c trunk/fuse/ui/scaler/scaler_hq3x.c trunk/fuse/ui/scaler/scaler_internals.h trunk/fuse/ui/scaler/scalers.c trunk/fuse/ui/sdl/Makefile.am trunk/fuse/ui/sdl/sdldisplay.c trunk/fuse/ui/sdl/sdldisplay.h trunk/fuse/ui/sdl/sdljoystick.c trunk/fuse/ui/sdl/sdljoystick.h trunk/fuse/ui/sdl/sdlkeyboard.c trunk/fuse/ui/sdl/sdlkeyboard.h trunk/fuse/ui/sdl/sdlui.c trunk/fuse/ui/svga/Makefile.am trunk/fuse/ui/svga/svgadisplay.c trunk/fuse/ui/svga/svgadisplay.h trunk/fuse/ui/svga/svgajoystick.c trunk/fuse/ui/svga/svgakeyboard.c trunk/fuse/ui/svga/svgakeyboard.h trunk/fuse/ui/svga/svgaui.c trunk/fuse/ui/ui.h trunk/fuse/ui/uidisplay.h trunk/fuse/ui/uijoystick.c trunk/fuse/ui/uijoystick.h trunk/fuse/ui/widget/Makefile.am trunk/fuse/ui/widget/browse.c trunk/fuse/ui/widget/debugger.c trunk/fuse/ui/widget/error.c trunk/fuse/ui/widget/filesel.c trunk/fuse/ui/widget/memory.c trunk/fuse/ui/widget/menu.c trunk/fuse/ui/widget/mkfusefont.pl trunk/fuse/ui/widget/options.pl trunk/fuse/ui/widget/picture.c trunk/fuse/ui/widget/pokefinder.c trunk/fuse/ui/widget/pokemem.c trunk/fuse/ui/widget/query.c trunk/fuse/ui/widget/roms.c trunk/fuse/ui/widget/select.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/wii/wiidisplay.c trunk/fuse/ui/wii/wiidisplay.h trunk/fuse/ui/wii/wiijoystick.c trunk/fuse/ui/wii/wiikeyboard.c trunk/fuse/ui/wii/wiikeyboard.h trunk/fuse/ui/wii/wiikeysyms.h trunk/fuse/ui/wii/wiimouse.c trunk/fuse/ui/wii/wiimouse.h trunk/fuse/ui/wii/wiiui.c trunk/fuse/ui/win32/Makefile.am trunk/fuse/ui/win32/about.c trunk/fuse/ui/win32/about.h trunk/fuse/ui/win32/binary.c trunk/fuse/ui/win32/binary.h trunk/fuse/ui/win32/browse.c trunk/fuse/ui/win32/browse.h trunk/fuse/ui/win32/confirm.c trunk/fuse/ui/win32/debugger.c trunk/fuse/ui/win32/debugger.h trunk/fuse/ui/win32/debugger.rc trunk/fuse/ui/win32/fileselector.c trunk/fuse/ui/win32/hyperlinks.c trunk/fuse/ui/win32/hyperlinks.h trunk/fuse/ui/win32/memorybrowser.c trunk/fuse/ui/win32/memorybrowser.h trunk/fuse/ui/win32/options-resource.pl trunk/fuse/ui/win32/options.pl trunk/fuse/ui/win32/picture.c trunk/fuse/ui/win32/picture.h trunk/fuse/ui/win32/pokefinder.c trunk/fuse/ui/win32/pokefinder.h trunk/fuse/ui/win32/pokemem.c trunk/fuse/ui/win32/pokemem.h trunk/fuse/ui/win32/rollback.c trunk/fuse/ui/win32/rollback.h trunk/fuse/ui/win32/roms.c trunk/fuse/ui/win32/roms.h trunk/fuse/ui/win32/statusbar.c trunk/fuse/ui/win32/win32display.c trunk/fuse/ui/win32/win32internals.h trunk/fuse/ui/win32/win32joystick.c trunk/fuse/ui/win32/win32joystick.h trunk/fuse/ui/win32/win32joystick.rc trunk/fuse/ui/win32/win32keyboard.c trunk/fuse/ui/win32/win32mouse.c trunk/fuse/ui/win32/win32ui.c trunk/fuse/ui/xlib/Makefile.am trunk/fuse/ui/xlib/xdisplay.c trunk/fuse/ui/xlib/xdisplay.h trunk/fuse/ui/xlib/xerror.c trunk/fuse/ui/xlib/xjoystick.c trunk/fuse/ui/xlib/xkeyboard.c trunk/fuse/ui/xlib/xkeyboard.h trunk/fuse/ui/xlib/xstatusbar.pl trunk/fuse/ui/xlib/xui.c trunk/fuse/ui/xlib/xui.h trunk/fuse/ui.c trunk/fuse/uidisplay.c trunk/fuse/unittests/Makefile.am trunk/fuse/unittests/unittests.c trunk/fuse/unittests/unittests.h trunk/fuse/utils.c trunk/fuse/utils.h trunk/fuse/windres.rc trunk/fuse/z80/Makefile.am trunk/fuse/z80/coretest.c trunk/fuse/z80/z80.c trunk/fuse/z80/z80.h trunk/fuse/z80/z80.pl trunk/fuse/z80/z80_checks.h trunk/fuse/z80/z80_macros.h trunk/fuse/z80/z80_ops.c Added Paths: ----------- trunk/fuse/data/shell-completion/ trunk/fuse/data/win32/ trunk/fuse/fusepb/resources/Fuse Help/html/didaktik80.html trunk/fuse/hacking/code_beautifiers.txt trunk/fuse/hacking/uncrustify.cfg trunk/fuse/lib/tests/success.d80.bz2 trunk/fuse/m4/ax_create_stdint_h.m4 trunk/fuse/peripherals/disk/didaktik.c trunk/fuse/peripherals/disk/didaktik.h trunk/fuse/peripherals/usource.c trunk/fuse/peripherals/usource.h trunk/fuse/svg.c trunk/fuse/svg.h trunk/fuse/ui/uimedia.h trunk/fuse/uimedia.c Removed Paths: ------------- trunk/fuse/compat/amiga/Makefile.am trunk/fuse/compat/linux/Makefile.am trunk/fuse/compat/morphos/Makefile.am trunk/fuse/compat/unix/Makefile.am trunk/fuse/compat/wii/Makefile.am trunk/fuse/compat/win32/Makefile.am trunk/fuse/peripherals/disk/Makefile.am trunk/fuse/peripherals/flash/Makefile.am trunk/fuse/peripherals/ide/Makefile.am trunk/fuse/peripherals/nic/Makefile.am trunk/fuse/perl/Fuse/Makefile.am trunk/fuse/ui/win32/fuse.manifest.in trunk/fuse/ui/win32/icons/Makefile.am trunk/fuse/ui/win32/installer/ trunk/fuse/winfuse.ico trunk/fuse/z80/tests/Makefile.am Property Changed: ---------------- trunk/fuse/ trunk/fuse/AUTHORS trunk/fuse/COPYING trunk/fuse/ChangeLog trunk/fuse/INSTALL trunk/fuse/Makefile.am trunk/fuse/PORTING trunk/fuse/README trunk/fuse/THANKS trunk/fuse/autogen.sh trunk/fuse/bitmap.h trunk/fuse/compat/Makefile.am trunk/fuse/compat/amiga/osname.c trunk/fuse/compat/amiga/paths.c trunk/fuse/compat/dirname.c trunk/fuse/compat/getopt.c trunk/fuse/compat/getopt.h trunk/fuse/compat/getopt1.c trunk/fuse/compat/linux/paths.c trunk/fuse/compat/mkstemp.c trunk/fuse/compat/morphos/osname.c trunk/fuse/compat/unix/dir.c trunk/fuse/compat/unix/file.c trunk/fuse/compat/unix/osname.c trunk/fuse/compat/unix/paths.c trunk/fuse/compat/unix/socket.c trunk/fuse/compat/unix/timer.c trunk/fuse/compat/unix/tuntap.c trunk/fuse/compat/wii/dir.c trunk/fuse/compat/wii/osname.c trunk/fuse/compat/wii/paths.c trunk/fuse/compat/wii/timer.c trunk/fuse/compat/win32/osname.c trunk/fuse/compat/win32/paths.c trunk/fuse/compat/win32/socket.c trunk/fuse/compat/win32/timer.c trunk/fuse/compat.h trunk/fuse/configure.ac trunk/fuse/data/Makefile.am trunk/fuse/debugger/Makefile.am trunk/fuse/debugger/breakpoint.c trunk/fuse/debugger/breakpoint.h trunk/fuse/debugger/command.c trunk/fuse/debugger/debugger.c trunk/fuse/debugger/debugger.h trunk/fuse/debugger/debugger_internals.h trunk/fuse/debugger/disassemble.c trunk/fuse/debugger/event.c trunk/fuse/debugger/expression.c trunk/fuse/debugger/variable.c trunk/fuse/display.c trunk/fuse/display.h trunk/fuse/event.c trunk/fuse/event.h trunk/fuse/fuse.c trunk/fuse/fuse.h trunk/fuse/hacking/Makefile.am trunk/fuse/input.c trunk/fuse/input.h trunk/fuse/keyboard.c trunk/fuse/keyboard.h trunk/fuse/keysyms.dat trunk/fuse/keysyms.pl trunk/fuse/lib/Makefile.am trunk/fuse/loader.c trunk/fuse/loader.h trunk/fuse/m4/ax_pthread.m4 trunk/fuse/m4/glib-2.0.m4 trunk/fuse/m4/gtk-2.0.m4 trunk/fuse/m4/libxml.m4 trunk/fuse/m4/pkg.m4 trunk/fuse/m4/sdl.m4 trunk/fuse/machine.c trunk/fuse/machine.h trunk/fuse/machines/Makefile.am trunk/fuse/machines/machines.h trunk/fuse/machines/machines_periph.c trunk/fuse/machines/machines_periph.h trunk/fuse/machines/pentagon.c trunk/fuse/machines/pentagon.h trunk/fuse/machines/pentagon1024.c trunk/fuse/machines/pentagon512.c trunk/fuse/machines/scorpion.c trunk/fuse/machines/scorpion.h trunk/fuse/machines/spec128.c trunk/fuse/machines/spec128.h trunk/fuse/machines/spec16.c trunk/fuse/machines/spec48.c trunk/fuse/machines/spec48.h trunk/fuse/machines/spec48_ntsc.c trunk/fuse/machines/spec_se.c trunk/fuse/machines/specplus2.c trunk/fuse/machines/specplus2a.c trunk/fuse/machines/specplus3.c trunk/fuse/machines/specplus3.h trunk/fuse/machines/specplus3e.c trunk/fuse/machines/tc2048.c trunk/fuse/machines/tc2068.c trunk/fuse/machines/tc2068.h trunk/fuse/machines/ts2068.c trunk/fuse/man/Makefile.am trunk/fuse/man/fuse.1 trunk/fuse/memory.c trunk/fuse/memory.h trunk/fuse/mempool.c trunk/fuse/mempool.h trunk/fuse/menu.c trunk/fuse/menu.h trunk/fuse/menu_data.dat trunk/fuse/menu_data.pl trunk/fuse/module.c trunk/fuse/module.h trunk/fuse/movie.c trunk/fuse/movie.h trunk/fuse/movie_tables.h trunk/fuse/periph.c trunk/fuse/periph.h trunk/fuse/peripherals/Makefile.am trunk/fuse/peripherals/ay.c trunk/fuse/peripherals/ay.h trunk/fuse/peripherals/dck.c trunk/fuse/peripherals/dck.h trunk/fuse/peripherals/disk/beta.c trunk/fuse/peripherals/disk/beta.h trunk/fuse/peripherals/disk/crc.c trunk/fuse/peripherals/disk/crc.h trunk/fuse/peripherals/disk/disciple.c trunk/fuse/peripherals/disk/disciple.h trunk/fuse/peripherals/disk/disk.c trunk/fuse/peripherals/disk/disk.h trunk/fuse/peripherals/disk/fdd.c trunk/fuse/peripherals/disk/fdd.h trunk/fuse/peripherals/disk/opus.c trunk/fuse/peripherals/disk/opus.h trunk/fuse/peripherals/disk/plusd.c trunk/fuse/peripherals/disk/plusd.h trunk/fuse/peripherals/disk/upd_fdc.c trunk/fuse/peripherals/disk/upd_fdc.h trunk/fuse/peripherals/disk/wd_fdc.c trunk/fuse/peripherals/disk/wd_fdc.h trunk/fuse/peripherals/flash/am29f010.c trunk/fuse/peripherals/flash/am29f010.h trunk/fuse/peripherals/fuller.c trunk/fuse/peripherals/fuller.h trunk/fuse/peripherals/ide/divide.c trunk/fuse/peripherals/ide/divide.h trunk/fuse/peripherals/ide/ide.c trunk/fuse/peripherals/ide/ide.h trunk/fuse/peripherals/ide/simpleide.c trunk/fuse/peripherals/ide/simpleide.h trunk/fuse/peripherals/ide/zxatasp.c trunk/fuse/peripherals/ide/zxatasp.h trunk/fuse/peripherals/ide/zxcf.c trunk/fuse/peripherals/ide/zxcf.h trunk/fuse/peripherals/if1.c trunk/fuse/peripherals/if1.h trunk/fuse/peripherals/if2.c trunk/fuse/peripherals/if2.h trunk/fuse/peripherals/joystick.c trunk/fuse/peripherals/joystick.h trunk/fuse/peripherals/kempmouse.c trunk/fuse/peripherals/kempmouse.h trunk/fuse/peripherals/melodik.c trunk/fuse/peripherals/melodik.h trunk/fuse/peripherals/nic/enc28j60.c trunk/fuse/peripherals/nic/enc28j60.h trunk/fuse/peripherals/nic/w5100.c trunk/fuse/peripherals/nic/w5100.h trunk/fuse/peripherals/nic/w5100_internals.h trunk/fuse/peripherals/nic/w5100_socket.c trunk/fuse/peripherals/printer.c trunk/fuse/peripherals/printer.h trunk/fuse/peripherals/scld.c trunk/fuse/peripherals/scld.h trunk/fuse/peripherals/speccyboot.c trunk/fuse/peripherals/speccyboot.h trunk/fuse/peripherals/specdrum.c trunk/fuse/peripherals/specdrum.h trunk/fuse/peripherals/spectranet.c trunk/fuse/peripherals/spectranet.h trunk/fuse/peripherals/ula.c trunk/fuse/peripherals/ula.h trunk/fuse/perl/Makefile.am trunk/fuse/perl/cpp-perl.pl trunk/fuse/pokefinder/Makefile.am trunk/fuse/pokefinder/pokefinder.c trunk/fuse/pokefinder/pokefinder.h trunk/fuse/pokefinder/pokemem.c trunk/fuse/pokefinder/pokemem.h trunk/fuse/profile.c trunk/fuse/profile.h trunk/fuse/psg.c trunk/fuse/psg.h trunk/fuse/rectangle.c trunk/fuse/rectangle.h trunk/fuse/roms/Makefile.am trunk/fuse/rzx.c trunk/fuse/rzx.h trunk/fuse/screenshot.c trunk/fuse/screenshot.h trunk/fuse/settings-header.pl trunk/fuse/settings.dat trunk/fuse/settings.pl trunk/fuse/slt.c trunk/fuse/slt.h trunk/fuse/snapshot.c trunk/fuse/snapshot.h trunk/fuse/sound/Makefile.am trunk/fuse/sound/alsasound.c trunk/fuse/sound/aosound.c trunk/fuse/sound/blipbuffer.c trunk/fuse/sound/blipbuffer.h trunk/fuse/sound/coreaudiosound.c trunk/fuse/sound/dxsound.c trunk/fuse/sound/hpsound.c trunk/fuse/sound/nullsound.c trunk/fuse/sound/osssound.c trunk/fuse/sound/sdlsound.c trunk/fuse/sound/sfifo.c trunk/fuse/sound/sfifo.h trunk/fuse/sound/sunsound.c trunk/fuse/sound/wiisound.c trunk/fuse/sound/win32sound.c trunk/fuse/sound.c trunk/fuse/sound.h trunk/fuse/spectrum.c trunk/fuse/spectrum.h trunk/fuse/tape.c trunk/fuse/tape.h trunk/fuse/timer/Makefile.am trunk/fuse/timer/native.c trunk/fuse/timer/sdl.c trunk/fuse/timer/timer.c trunk/fuse/timer/timer.h trunk/fuse/ui/Makefile.am trunk/fuse/ui/fb/Makefile.am trunk/fuse/ui/fb/fbdisplay.c trunk/fuse/ui/fb/fbdisplay.h trunk/fuse/ui/fb/fbjoystick.c trunk/fuse/ui/fb/fbkeyboard.c trunk/fuse/ui/fb/fbkeyboard.h trunk/fuse/ui/fb/fbmouse.c trunk/fuse/ui/fb/fbmouse.h trunk/fuse/ui/fb/fbui.c trunk/fuse/ui/gtk/Makefile.am trunk/fuse/ui/gtk/binary.c trunk/fuse/ui/gtk/browse.c trunk/fuse/ui/gtk/confirm.c trunk/fuse/ui/gtk/debugger.c trunk/fuse/ui/gtk/fileselector.c trunk/fuse/ui/gtk/gtkcompat.c trunk/fuse/ui/gtk/gtkcompat.h trunk/fuse/ui/gtk/gtkdisplay.c trunk/fuse/ui/gtk/gtkinternals.h trunk/fuse/ui/gtk/gtkjoystick.c trunk/fuse/ui/gtk/gtkkeyboard.c trunk/fuse/ui/gtk/gtkmouse.c trunk/fuse/ui/gtk/gtkui.c trunk/fuse/ui/gtk/memory.c trunk/fuse/ui/gtk/options-header.pl trunk/fuse/ui/gtk/options.pl trunk/fuse/ui/gtk/picture.c trunk/fuse/ui/gtk/pixmaps.c trunk/fuse/ui/gtk/pokefinder.c trunk/fuse/ui/gtk/pokemem.c trunk/fuse/ui/gtk/rollback.c trunk/fuse/ui/gtk/roms.c trunk/fuse/ui/gtk/statusbar.c trunk/fuse/ui/gtk/stock.c trunk/fuse/ui/options.dat trunk/fuse/ui/scaler/Makefile.am trunk/fuse/ui/scaler/scaler.c trunk/fuse/ui/scaler/scaler.h trunk/fuse/ui/scaler/scaler_hq2x.c trunk/fuse/ui/scaler/scaler_hq3x.c trunk/fuse/ui/scaler/scaler_internals.h trunk/fuse/ui/scaler/scalers.c trunk/fuse/ui/sdl/Makefile.am trunk/fuse/ui/sdl/sdldisplay.c trunk/fuse/ui/sdl/sdldisplay.h trunk/fuse/ui/sdl/sdljoystick.c trunk/fuse/ui/sdl/sdljoystick.h trunk/fuse/ui/sdl/sdlkeyboard.c trunk/fuse/ui/sdl/sdlkeyboard.h trunk/fuse/ui/sdl/sdlui.c trunk/fuse/ui/svga/Makefile.am trunk/fuse/ui/svga/svgadisplay.c trunk/fuse/ui/svga/svgadisplay.h trunk/fuse/ui/svga/svgajoystick.c trunk/fuse/ui/svga/svgakeyboard.c trunk/fuse/ui/svga/svgakeyboard.h trunk/fuse/ui/svga/svgaui.c trunk/fuse/ui/ui.h trunk/fuse/ui/uidisplay.h trunk/fuse/ui/uijoystick.c trunk/fuse/ui/uijoystick.h trunk/fuse/ui/widget/Makefile.am trunk/fuse/ui/widget/browse.c trunk/fuse/ui/widget/debugger.c trunk/fuse/ui/widget/error.c trunk/fuse/ui/widget/filesel.c trunk/fuse/ui/widget/memory.c trunk/fuse/ui/widget/menu.c trunk/fuse/ui/widget/mkfusefont.pl trunk/fuse/ui/widget/options-header.pl trunk/fuse/ui/widget/options.pl trunk/fuse/ui/widget/picture.c trunk/fuse/ui/widget/pokefinder.c trunk/fuse/ui/widget/pokemem.c trunk/fuse/ui/widget/query.c trunk/fuse/ui/widget/roms.c trunk/fuse/ui/widget/select.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/wii/wiidisplay.c trunk/fuse/ui/wii/wiidisplay.h trunk/fuse/ui/wii/wiijoystick.c trunk/fuse/ui/wii/wiikeyboard.c trunk/fuse/ui/wii/wiikeyboard.h trunk/fuse/ui/wii/wiikeysyms.h trunk/fuse/ui/wii/wiimouse.c trunk/fuse/ui/wii/wiimouse.h trunk/fuse/ui/wii/wiiui.c trunk/fuse/ui/win32/Makefile.am trunk/fuse/ui/win32/about.c trunk/fuse/ui/win32/about.h trunk/fuse/ui/win32/binary.c trunk/fuse/ui/win32/binary.h trunk/fuse/ui/win32/browse.c trunk/fuse/ui/win32/browse.h trunk/fuse/ui/win32/confirm.c trunk/fuse/ui/win32/debugger.c trunk/fuse/ui/win32/debugger.h trunk/fuse/ui/win32/fileselector.c trunk/fuse/ui/win32/hyperlinks.c trunk/fuse/ui/win32/hyperlinks.h trunk/fuse/ui/win32/memorybrowser.c trunk/fuse/ui/win32/memorybrowser.h trunk/fuse/ui/win32/options-header.pl trunk/fuse/ui/win32/options-resource.pl trunk/fuse/ui/win32/options.pl trunk/fuse/ui/win32/picture.c trunk/fuse/ui/win32/picture.h trunk/fuse/ui/win32/pokefinder.c trunk/fuse/ui/win32/pokefinder.h trunk/fuse/ui/win32/pokemem.c trunk/fuse/ui/win32/pokemem.h trunk/fuse/ui/win32/rollback.c trunk/fuse/ui/win32/rollback.h trunk/fuse/ui/win32/roms.c trunk/fuse/ui/win32/roms.h trunk/fuse/ui/win32/select_template.h trunk/fuse/ui/win32/statusbar.c trunk/fuse/ui/win32/win32display.c trunk/fuse/ui/win32/win32internals.h trunk/fuse/ui/win32/win32joystick.c trunk/fuse/ui/win32/win32joystick.h trunk/fuse/ui/win32/win32keyboard.c trunk/fuse/ui/win32/win32mouse.c trunk/fuse/ui/win32/win32ui.c trunk/fuse/ui/xlib/Makefile.am trunk/fuse/ui/xlib/xdisplay.c trunk/fuse/ui/xlib/xdisplay.h trunk/fuse/ui/xlib/xerror.c trunk/fuse/ui/xlib/xjoystick.c trunk/fuse/ui/xlib/xkeyboard.c trunk/fuse/ui/xlib/xkeyboard.h trunk/fuse/ui/xlib/xstatusbar.pl trunk/fuse/ui/xlib/xui.c trunk/fuse/ui/xlib/xui.h trunk/fuse/ui.c trunk/fuse/uidisplay.c trunk/fuse/unittests/Makefile.am trunk/fuse/unittests/unittests.c trunk/fuse/unittests/unittests.h trunk/fuse/utils.c trunk/fuse/utils.h trunk/fuse/windres.rc trunk/fuse/z80/Makefile.am trunk/fuse/z80/coretest.c trunk/fuse/z80/opcodes_base.dat trunk/fuse/z80/opcodes_cb.dat trunk/fuse/z80/opcodes_ddfd.dat trunk/fuse/z80/opcodes_ddfdcb.dat trunk/fuse/z80/opcodes_ed.dat trunk/fuse/z80/z80.c trunk/fuse/z80/z80.h trunk/fuse/z80/z80.pl trunk/fuse/z80/z80_checks.h trunk/fuse/z80/z80_macros.h trunk/fuse/z80/z80_ops.c Index: trunk/fuse =================================================================== --- trunk/fuse 2016-05-25 11:30:52 UTC (rev 803) +++ trunk/fuse 2016-06-01 10:46:07 UTC (rev 804) 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-761 +/vendor/fuse-emulator/current/fuse:530-803 /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-05-25 11:30:52 UTC (rev 803) +++ trunk/fuse/AUTHORS 2016-06-01 10:46:07 UTC (rev 804) @@ -11,7 +11,7 @@ * John Elliott: for lib765, which provided Fuse's original emulation of the +3's FDC, and libdsk which provided support for more disk image formats: - see http://www.seasip.demon.co.uk/Unix/LibDsk/ + see http://www.seasip.info/Unix/LibDsk/index.html * Darren Salt: the original versions of the code for +3 emulation, SLT support, MITSHM support (for the Xlib UI), TZX raw data blocks, @@ -41,8 +41,8 @@ * Garry Lancaster: the simple 8-bit IDE, ZXATASP and ZXCF support. -* Gergely Szasz: +3, +D, Opus and Interface 1/Microdrive emulation, the 'movie' - code and the ao sound driver. +* Gergely Szasz: +3, +D, Opus, Didaktik 80 and Interface 1/Microdrive emulation, + the 'movie' code and the ALSO and ao sound drivers. * Bjoern Giesler: the original Wii port. @@ -54,4 +54,4 @@ * Philip Kendall: everything else. -$Id: AUTHORS 4972 2013-05-19 16:46:43Z zubzero $ +$Id: AUTHORS 5357 2016-02-23 23:43:54Z sbaldovi $ Property changes on: trunk/fuse/AUTHORS ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: trunk/fuse/COPYING =================================================================== --- trunk/fuse/COPYING 2016-05-25 11:30:52 UTC (rev 803) +++ trunk/fuse/COPYING 2016-06-01 10:46:07 UTC (rev 804) Property changes on: trunk/fuse/COPYING ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Modified: trunk/fuse/ChangeLog =================================================================== --- trunk/fuse/ChangeLog 2016-05-25 11:30:52 UTC (rev 803) +++ trunk/fuse/ChangeLog 2016-06-01 10:46:07 UTC (rev 804) @@ -1,3 +1,172 @@ +2016-??-?? Philip Kendall <phi...@sh...> + + * Fuse 1.2.0 released. + + * New features: + * Add Currah µSource emulation (Stuart Brady). + * Add Didaktik 80/40 emulation (Gergely Szasz). + * Capture BASIC video functions to SVG file (Stefano Bodrato). + * Support bash completion (Sergio Baldoví). + + * Emulation core improvements: + * Allow continuing RZX recordings if there is a final snapshot in the + RZX (Sergio Baldoví). + * Fix the prune function on RZX rollback (Sergio Baldoví). + * Fix loading of EDSK files with Sector Offset block (Sergio Baldoví). + * Fix speech in Cobra's Arc - Medium Case.tzx when loaded with tape + traps enabled (thanks, zx81 and Sergio Baldoví) (Fredrick Meunier). + * Migrate disk "index event" handling to the FDD layer and have the + FDC layer use it for their STATUS registers (Gergely Szasz). + * Set AF, AF' and SP to 0xffff on reset (Stuart Brady). + * Leave most registers unchanged on a soft reset (Stuart Brady). + * Emulate interrupt and NMI timings more precisely (Stuart Brady). + * Emulate NMOS and CMOS Z80 variants (Stuart Brady). + * Switch to 2KB page size (Stuart Brady). + * Implement WD2797 emulation (Gergely Szasz). + * Skip tape traps if VERIFY is requested (UB880D). + * Fix inaccurate output when AY envelopes are used (Matthew Westcott + and Fredrick Meunier) + * Fix some peripherals activation when loading snapshots (Sergio + Baldoví). + * Fix loading sound with some custom loaders (Fredrick Meunier). + * Centralise the "Disk icon" update code to the FDD layer (Gergely + Szasz). + * Check if data blocks are headers for handling PZX files (Fredrick + Meunier). + * Correct display of pulses in PZX pulse block for tape browser + (Fredrick Meunier). + * Fix disk image corruption after saving UDI files (Sergio Baldoví). + * Check ready status after loading a disk into floppy disk drive + (thanks, John Elliott) (Sergio Baldoví). + * Fix overlapped SEEK commands (Sergio Baldoví). + * Fix length of data returned by READ_DIAG (thanks, Fredrick Meunier) + (Sergio Baldoví). + + * Machine specific improvements: + * The Timex SCLD is contended in all of the home, Dock and Exrom banks + in the 0x4000 - 0x7FFF range (thanks, rga24 from WoS) (Fredrick + Meunier). + * Clear all Opus RAM on hard reset (Stuart Brady). + * Ensure the ZX Printer does not require a hard reset to enable + (thanks, RMartins) (Fredrick Meunier). + * Fix timing of events when emulating Scorpion (Stuart Brady). + * Ensure we have successfully selected a Pentagon or a Timex machine + before inserting their media (Fredrick Meunier). + * Fix Beta 128 type II commands (thanks, windale and BogDan Vatra) + (Sergio Baldoví). + * Don't enable the Beta 128 interface when loading a snapshot on a + machine with Beta built-in (thanks, windale and BogDan Vatra) + (Fredrick Meunier). + * Lock port +3 1FFDh if paging is disabled (Brian Ruthven and Fredrick + Meunier). + * Spectranet: fix segfault in error handling when setting SO_REUSEADDR + (Stuart Brady). + * Prefer Scorpion to Pentagon when loading SCL/TRD disks for better + timing compatibility (part of feature request #90) (thanks, windale) + (Sergio Baldoví). + * Update SE ROMs to v4.07 (thanks, Andrew Owen) (Sergio Baldoví). + + * Debugger improvements: + * Fix disassembly of LD (HL), LD (IX) and LD (IY) (BogDan Vatra). + * Add I and R register setting and getting to the debugger (Sergio + Baldoví). + * Show the status of the halted flag in the debugger (Stuart Brady). + * Fix time breakpoints later than a frame in the future (Sergio + Baldoví). + * Timex EXROM and Dock text was truncated in the debugger UI (thanks, + Andrew Owen and Sergio Baldoví) (Fredrick Meunier). + * Don't trap on breakpoints whilst halted (Stuart Brady). + * Win32: relocate halted flag and set monospaced font (Sergio + Baldoví). + * Fix memory issues when removing a matched breakpoint (Tom Seddon). + * Signal the UI when the breakpoints list is changed (BogDan Vatra). + * Document IF token for conditional expressions in debugger section + (thanks, TK90XFan) (Sergio Baldoví). + * Fix documentation of address syntax used in debugger section + (Sergio Baldoví). + * Allow debugger to dereference memory locations (Philip Kendall). + + * Miscellaneous improvements: + * Remove warnings in aosound (Rene Ladan). + * Fix save tape traps with SE ROM (Andrew Owen and Fredrick Meunier). + * Don't ignore the return code from setuid() (Sergio Baldoví). + * Fix condition used in --with-desktop-dir option (thanks, wiz) + (Sergio Baldoví). + * Fix uninitialised keyboard button settings in GTK UI (UB880D). + * Fix pause when minimising Fuse on Windows (Sergio Baldoví). + * Generic FDD UI handling cleanup (Alex Badea). + * Remove unused macros on disk peripherals (Sergio Baldoví). + * Fix bad prototypes for activate signal on GTK UI (Sergio Baldoví). + * Ensure exiting on GTK UI when there are active breakpoints (Sergio + Baldoví). + * Improve scrolling of disassembly list on Win32 UI (Sergio Baldoví). + * Make mousewheel scrolling on memory browser GTK+ 3.4 compatible and + keep the selected row (Sergio Baldoví). + * Ignore unused-but-set-variable warnings for option dialogs on Win32 + UI (Sergio Baldoví). + * Link to autoload snapshot for NTSC Spectrum (Sergio Baldoví). + * Fix desktop integration rules to cope with VPATH builds (Sergio + Baldoví). + * Modernise autoconf support (Sergio Baldoví Baldoví). + * Use unzipped tapes for peripheral tests (thanks, Phil Reynolds) + (Sergio Baldoví). + * Fix empty list in pokefinder on GTK+ 3 (Sergio Baldoví). + * Prefer GTK+ 3 to GTK+ 2 (Sergio Baldoví). + * Abort start if we can't drop root privileges (Fredrick Meunier). + * Use real GLib if and only if libspectrum does and make GTK+ UI + depend on real GLib (Stuart Brady). + * Split tape/Microdrive options into a new Media Options dialogue + (Stuart Brady). + * Fix memory leak in joystick UI (Sergio Baldoví). + * Don't show an error when rewinding an empty tape (Sergio Baldoví). + * GTK UI: clear out row mark in tape browser when selecting another + block (Sergio Baldoví). + * Add missing const qualifiers and casts (Stuart and Sergio Baldoví). + * Split Select ROMs menu into Machines and Peripherals (Gergely + Szasz). + * Only try to load the fallback ROM if it is different to the standard + one (Fredrick Meunier). + * Use PATH_MAX instead of FILENAME_MAX as our standard compatibility + define (thanks, Brian Ruthven) (Fredrick Meunier). + * WidgetUI: Fix build on Solaris (thanks, Brian Ruthven) (Fredrick + Meunier). + * Fix C89 compilation (Adrien Destugues). + * Standardise the number of joystick buttons across UIs (UB880D). + * Add static to functions where appropriate (Stuart Brady). + * Track port attachment for each data bus line (Stuart Brady). + * Switch to using non-recursive makefile (thanks, Stuart Brady) + (Sergio Baldoví). + * Move Windows resources that are UI-independent to data/win32 + (Sergio Baldoví). + * Fix segfault due to inconsistent SETUP_CHECK() and CHECK() ordering + (UB880D; thanks, Guesser). + * Rename 'Interface I' to 'Interface 1' (thanks, Stuart Brady) (Sergio + Baldoví). + * Win32: fix compilation with mingwrt 4.0+ (Kirben). + * Replace various deprecated GTK+ functions: gtk_widget_modify_font, + GtkStock, gtk_tree_view_set_rules_hint(), + deprecated gdk_cursor_new() (Sergio Baldoví). + * Remove obsolete gtk_window_set_wmclass (Sergio Baldoví). + * Update URLs in documentation (Sergio Baldoví). + * Win32 UI: fix compilation with MinGW-w64 toolchain (lordhoto). + * Fix the build of SDL UI on Windows (Sergio Baldoví). + * Use compat_file_exists() instead of stat() in read_config_file() and + utils_find_file_path() (BogDan Vatra). + * Fix fdd_strerror() reading past the end of the fdd_error array + (BogDan Vatra). + * Use tape traps if we are using a custom ROM if the instructions at + the entry points have been preserved (thanks, Alberto Garcia) + (Fredrick Meunier). + * GTK+ and Win32 UI: add file filters in open/save dialogs (thanks, + Crisis) (Sergio Baldoví). + * Don't show hidden files/directories in the file selector on Widget + UIs (Sergio Baldoví). + * Remember filename when saving a recently formatted disk (Sergio + Baldoví). + * GTK UI: Change the resizing method for GTK+ UI for better + compatibility with GTK+ 3.20+ (thanks, Alberto Garcia) (Sergio + Baldoví). + 2013-05-24 Philip Kendall <phi...@sh...> * Fuse 1.1.1 released. @@ -1119,4 +1288,4 @@ * Version 0.1.0 released. -$Id: ChangeLog 4995 2013-05-24 19:54:19Z zubzero $ +$Id: ChangeLog 5519 2016-05-23 19:15:02Z pak21 $ Property changes on: trunk/fuse/ChangeLog ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Modified: trunk/fuse/INSTALL =================================================================== --- trunk/fuse/INSTALL 2016-05-25 11:30:52 UTC (rev 803) +++ trunk/fuse/INSTALL 2016-06-01 10:46:07 UTC (rev 804) @@ -64,8 +64,7 @@ ./configure --target=powerpc-gekko --host=powerpc-gekko \ --with-wii \ - --without-libxml2 --without-libiconv --without-gpm \ - --without-x --without-glib \ + --without-libxml2 --without-libiconv --without-gpm --without-x \ CFLAGS="-g -I$DEVKITPPC/include -I$DEVKITPRO/libogc/include -DGEKKO" \ LDFLAGS="-g -mrvl -mcpu=750 -meabi -mhard-float \ -Wl,-Map,fuse.elf.map -L$DEVKITPPC/lib \ @@ -82,8 +81,8 @@ Building the Win32 version of Fuse ---------------------------------- -You'll need to have the MinGW <http://www.mingw.org> or MinGW-w64 toolchain -<http://mingw-w64.sourceforge.net>, e.g., on Debian: +You'll need to have the MinGW <http://www.mingw.org/> or Mingw-w64 toolchain +<http://mingw-w64.org/>, e.g., on Debian: `apt-get install mingw32 mingw32-binutils mingw32-runtime' On Windows, besides the former toolchain, you'll need an environment that @@ -91,21 +90,21 @@ Cygwin <http://cygwin.com>. The next examples build libspectrum and Fuse without any external library for -the sake of clarity, but all these libraries successfully compile with MingGW +the sake of clarity, but all these libraries successfully compile with a MinGW environment - in case of problems with compiling any of the libs please refer to the lib's homepage for help. 1) On Linux, first have to compile libspectrum: ./configure --host=i586-mingw32msvc --without-libaudiofile --without-zlib \ - --without-libgcrypt --without-bzip2 --without-glib --prefix=`pwd` + --without-libgcrypt --without-bzip2 --with-fake-glib --prefix=`pwd` make install This should `install' into the source directory. Then, compile Fuse: -./configure --host=i586-mingw32msvc --without-glib --prefix=`pwd` \ +./configure --host=i586-mingw32msvc --prefix=`pwd` \ --with-libspectrum-prefix=`pwd`/../libspectrum --with-win32 \ --without-libxml2 --without-zlib --without-png --without-x make @@ -119,28 +118,28 @@ 2) On Windows, using MSYS + MinGW toolchain, first build libspectrum: -./configure --without-glib --without-libaudiofile --without-libgcrypt \ +./configure --with-fake-glib --without-libaudiofile --without-libgcrypt \ --without-zlib --without-bzip2 --prefix=/usr/local make install Then, build Fuse: -./configure --with-win32 --without-glib --without-libxml2 --without-zlib \ - --without-png --prefix=/usr/local +./configure --with-win32 --without-libxml2 --without-zlib --without-png \ + --prefix=/usr/local make -3) On Windows, using Cygwin + MinGW toolchain, first build libspectrum: +3) On Windows, using Cygwin + Mingw-w64 toolchain, first build libspectrum: -./configure --build=i686-pc-cygwin --host=i686-pc-mingw32 --without-glib \ +./configure --build=i686-pc-cygwin --host=i686-w64-mingw32 --with-fake-glib \ --without-libaudiofile --without-libgcrypt --without-zlib \ - --without-bzip2 --prefix=/usr/local/i686-pc + --without-bzip2 --prefix=/usr/local/i686-w64-mingw32 make install Then, build Fuse: -./configure --build=i686-pc-cygwin --host=i686-pc-mingw32 --with-win32 \ - --without-glib --without-libxml2 --without-zlib --without-png \ - --prefix=/usr/local/i686-pc +./configure --build=i686-pc-cygwin --host=i686-w64-mingw32 --without-libxml2 \ + --without-zlib --without-png --with-win32 \ + --prefix=/usr/local/i686-w64-mingw32 make Note: you need `libspectrum-8.dll' and the `roms' directory and the `lib' @@ -162,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 4763 2012-11-16 11:01:59Z fredm $ +$Id: INSTALL 5407 2016-04-25 21:59:53Z sbaldovi $ Property changes on: trunk/fuse/INSTALL ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Modified: trunk/fuse/Makefile.am =================================================================== --- trunk/fuse/Makefile.am 2016-05-25 11:30:52 UTC (rev 803) +++ trunk/fuse/Makefile.am 2016-06-01 10:46:07 UTC (rev 804) @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in -## Copyright (c) 1999-2009 Philip Kendall +## Copyright (c) 1999-2015 Philip Kendall -## $Id: Makefile.am 5003 2013-05-26 16:24:03Z sbaldovi $ +## $Id: Makefile.am 5434 2016-05-01 04:22:45Z 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 @@ -21,45 +21,12 @@ ## ## E-mail: phi...@sh... -AUTOMAKE_OPTIONS = foreign - ACLOCAL_AMFLAGS = -I m4 bin_PROGRAMS = fuse -SUBDIRS = @COMPAT_SUBDIR@ \ - data \ - debugger \ - hacking \ - lib \ - machines \ - man \ - peripherals \ - perl \ - pokefinder \ - roms \ - sound \ - timer \ - ui \ - unittests \ - z80 +noinst_PROGRAMS = -DIST_SUBDIRS = data \ - debugger \ - hacking \ - lib \ - machines \ - man \ - peripherals \ - perl \ - pokefinder \ - roms \ - sound \ - timer \ - ui \ - unittests \ - z80 - fuse_SOURCES = display.c \ event.c \ fuse.c \ @@ -83,94 +50,49 @@ snapshot.c \ sound.c \ spectrum.c \ + svg.c \ tape.c \ ui.c \ uidisplay.c \ + uimedia.c \ utils.c -if COMPAT_DIRNAME -fuse_SOURCES += compat/dirname.c -endif +fuse_LDADD = \ + $(PTHREAD_LIBS) \ + $(LIBSPEC_LIBS) \ + $(GTK_LIBS) \ + $(GLIB_LIBS) \ + $(PNG_LIBS) \ + $(SDL_LIBS) \ + $(X_LIBS) \ + $(XML_LIBS) -if COMPAT_GETOPT -fuse_SOURCES += compat/getopt.c compat/getopt1.c -endif +fuse_DEPENDENCIES = -if COMPAT_MKSTEMP -fuse_SOURCES += compat/mkstemp.c -endif +EXTRA_fuse_SOURCES = -if COMPAT_WIN32 -fuse_SOURCES += windres.rc -endif - -EXTRA_fuse_SOURCES = windres.rc - -fuse_LDADD = debugger/libdebugger.a \ -@UI_LIBS@ \ -debugger/libdebugger.a \ -machines/libmachines.a \ -peripherals/libperipherals.a \ -peripherals/disk/libdisk.a \ -peripherals/flash/libflash.a \ -peripherals/ide/libide.a \ -peripherals/nic/libnic.a \ -pokefinder/libpokefinder.a \ -sound/libsound.a \ -timer/libtimer.a \ -ui/scaler/libscaler.a \ -unittests/libunittests.a \ -z80/libz80.a \ -@LIBSPEC_LIBS@ \ -@GLIB_LIBS@ \ -@PNG_LIBS@ \ -@SOUND_LIBS@ \ -@SDL_LIBS@ \ -@X_LIBS@ \ -@XML_LIBS@ \ -compat/@COMPAT_OSNAME@/libcompatos.a \ -@WINDRES_OBJ@ - -fuse_DEPENDENCIES = debugger/libdebugger.a \ -@UI_LIBS@ \ -debugger/libdebugger.a \ -machines/libmachines.a \ -peripherals/libperipherals.a \ -peripherals/disk/libdisk.a \ -peripherals/flash/libflash.a \ -peripherals/ide/libide.a \ -peripherals/nic/libnic.a \ -pokefinder/libpokefinder.a \ -sound/libsound.a \ -timer/libtimer.a \ -ui/scaler/libscaler.a \ -unittests/libunittests.a \ -z80/libz80.a \ -compat/@COMPAT_OSNAME@/libcompatos.a \ -@WINDRES_OBJ@ - BUILT_SOURCES = options.h settings.c settings.h -windres.o: windres.rc winfuse.ico ui/win32/*.rc - @WINDRES@ -I$(srcdir) -I. $(srcdir)/windres.rc @LIBSPEC_CFLAGS@ @CPPFLAGS@ windres.o - settings.c: settings.pl settings.dat - @PERL@ -I$(srcdir)/perl $(srcdir)/settings.pl $(srcdir)/settings.dat > $@.tmp && mv $@.tmp $@ + $(AM_V_GEN)$(PERL) -I$(srcdir)/perl $(srcdir)/settings.pl $(srcdir)/settings.dat > $@.tmp && mv $@.tmp $@ settings.h: settings-header.pl settings.dat - @PERL@ -I$(srcdir)/perl $(srcdir)/settings-header.pl $(srcdir)/settings.dat > $@.tmp && mv $@.tmp $@ + $(AM_V_GEN)$(PERL) -I$(srcdir)/perl $(srcdir)/settings-header.pl $(srcdir)/settings.dat > $@.tmp && mv $@.tmp $@ -if WIDGET -options.h: $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/@WIDGET@/options-header.pl $(srcdir)/ui/options.dat $(srcdir)/perl/Fuse.pm $(srcdir)/perl/Fuse/Dialog.pm - @PERL@ $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/options.dat | @PERL@ -I$(srcdir)/perl $(srcdir)/ui/@WIDGET@/options-header.pl - public > $@.tmp && mv $@.tmp $@ -else -options.h: $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/@UI@/options-header.pl $(srcdir)/ui/options.dat $(srcdir)/perl/Fuse.pm $(srcdir)/perl/Fuse/Dialog.pm - @PERL@ $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/options.dat | @PERL@ -I$(srcdir)/perl $(srcdir)/ui/@UI@/options-header.pl - public > $@.tmp && mv $@.tmp $@ -endif +options.h: $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/@OPTIONS_DIR@/options-header.pl $(srcdir)/ui/options.dat $(srcdir)/perl/Fuse.pm $(srcdir)/perl/Fuse/Dialog.pm + $(AM_V_GEN)$(PERL) $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/options.dat | $(PERL) -I$(srcdir)/perl $(srcdir)/ui/@OPTIONS_DIR@/options-header.pl - public > $@.tmp && mv $@.tmp $@ -AM_CPPFLAGS = @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@ \ -@XML_CFLAGS@ -DFUSEDATADIR="\"${pkgdatadir}\"" @SDL_CFLAGS@ +AM_CPPFLAGS = \ + $(GLIB_CFLAGS) \ + $(GTK_CFLAGS) \ + $(LIBSPEC_CFLAGS) \ + $(XML_CFLAGS) \ + -DFUSEDATADIR="\"${pkgdatadir}\"" \ + $(SDL_CFLAGS) \ + $(PNG_CFLAGS) +AM_CFLAGS = $(WARN_CFLAGS) $(PTHREAD_CFLAGS) + noinst_HEADERS = bitmap.h \ compat.h \ display.h \ @@ -196,6 +118,7 @@ snapshot.h \ sound.h \ spectrum.h \ + svg.h \ tape.h \ utils.h \ options.h \ @@ -208,6 +131,7 @@ THANKS \ keysyms.dat \ keysyms.pl \ + m4/ax_pthread.m4 \ m4/glib-2.0.m4 \ m4/gtk-2.0.m4 \ m4/libxml.m4 \ @@ -215,115 +139,54 @@ m4/sdl.m4 \ menu_data.dat \ menu_data.pl \ + settings.dat \ settings.pl \ - settings-header.pl \ - settings.dat \ - winfuse.ico + settings-header.pl CLEANFILES = options.h \ settings.c \ settings.h -include compat/Makefile.am +DISTCLEANFILES = -if COMPAT_WIN32 +pkgdata_DATA = -package_win32=$(PACKAGE)-$(PACKAGE_VERSION)-win32 -top_win32dir=$(top_builddir)/$(package_win32) -install-win32: all - test -n "$(DESTDIR)" || { echo "ERROR: set DESTDIR path"; exit 1; } - $(MKDIR_P) $(DESTDIR)/roms/ || exit 1 - $(MKDIR_P) $(DESTDIR)/lib/ || exit 1 - cp $(top_srcdir)/roms/*.rom $(DESTDIR)/roms - cp $(top_srcdir)/roms/README.copyright $(DESTDIR)/roms - cp $(top_srcdir)/lib/*.bmp $(DESTDIR)/lib - cp $(top_srcdir)/lib/*.scr $(DESTDIR)/lib - cp $(top_builddir)/lib/*.szx $(DESTDIR)/lib -# Copy fuse executable (we should manually copy the required libraries) - cp $(top_builddir)/.libs/fuse$(EXEEXT) $(DESTDIR) || \ - cp $(top_builddir)/fuse$(EXEEXT) $(DESTDIR) -# Get text files - for file in AUTHORS ChangeLog COPYING README; \ - do cp "$(top_srcdir)/$$file" "$(DESTDIR)/$$file.txt"; \ - done -# Get manuals - if test -n "$(MAN2HTML)"; then \ - $(MAN2HTML) -r $(top_srcdir)/man/fuse.1 | sed '1d' > $(DESTDIR)/fuse.html; \ - else \ - test -z "$(GROFF)" || $(GROFF) -Thtml -man $(top_srcdir)/man/fuse.1 > $(DESTDIR)/fuse.html; \ - fi -# Convert to DOS line endings - test -z "$(UNIX2DOS)" || find $(DESTDIR) -type f \( -name "*.txt" -or -name "*.html" -or -name "*.copyright" \) -exec $(UNIX2DOS) {} \; +## Resources for Windows executables +if COMPAT_WIN32 -install-win32-strip: install-win32 - test -z "$(STRIP)" || $(STRIP) $(DESTDIR)/fuse$(EXEEXT) +fuse_SOURCES += windres.rc +fuse_LDADD += windres.o +fuse_DEPENDENCIES += windres.o -dist-win32-dir: - $(MAKE) DESTDIR="$(top_win32dir)" install-win32-strip +windres.o: windres.rc data/win32/winfuse.ico data/win32/fuse.manifest $(ui_win32_res) + $(AM_V_GEN)$(WINDRES) -I$(srcdir) -I. $(srcdir)/windres.rc $(LIBSPEC_CFLAGS) $(CPPFLAGS) windres.o -dist-win32-zip: dist-win32-dir - rm -f -- $(top_builddir)/$(package_win32).zip - rm -f -- $(top_builddir)/$(package_win32).zip.sha1 - test -n "$(top_win32dir)" || exit 1 - @test `find $(top_win32dir) -type f -name \*.dll -print | wc -l` -ne 0 || \ - { echo "ERROR: external libraries not found in $(top_win32dir). Please, manually copy them."; exit 1; } - cd $(top_win32dir) && \ - zip -q -9 -r $(abs_top_builddir)/$(package_win32).zip . - -sha1sum $(top_builddir)/$(package_win32).zip > $(top_builddir)/$(package_win32).zip.sha1 && \ - { test -z "$(UNIX2DOS)" || $(UNIX2DOS) $(top_builddir)/$(package_win32).zip.sha1; } +endif -dist-win32-7z: dist-win32-dir - rm -f -- $(top_builddir)/$(package_win32).7z - rm -f -- $(top_builddir)/$(package_win32).7z.sha1 - test -n "$(top_win32dir)" || exit 1 - @test `find $(top_win32dir) -type f -name \*.dll -print | wc -l` -ne 0 || \ - { echo "ERROR: external libraries not found in $(top_win32dir). Please, manually copy them."; exit 1; } - cd $(top_win32dir) && \ - 7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on -bd $(abs_top_builddir)/$(package_win32).7z . - -sha1sum $(top_builddir)/$(package_win32).7z > $(top_builddir)/$(package_win32).7z.sha1 && \ - { test -z "$(UNIX2DOS)" || $(UNIX2DOS) $(top_builddir)/$(package_win32).7z.sha1; } -dist-win32-exe: dist-win32-dir - rm -f -- $(top_builddir)/$(package_win32)-setup.exe - rm -f -- $(top_builddir)/$(package_win32)-setup.exe.sha1 - test -n "$(top_win32dir)" || exit 1 - @test `find $(top_win32dir) -type f -name \*.dll -print | wc -l` -ne 0 || \ - { echo "ERROR: external libraries not found in $(top_win32dir). Please, manually copy them."; exit 1; } -# Locate NSIS in system path, MSYS drive or Cygwin drive - @NSISFILE="$(abs_top_builddir)/ui/win32/installer/fuse.nsi"; \ - if makensis -VERSION > /dev/null 2>&1; then \ - MAKENSIS="makensis"; \ - elif [ -x "/c/Program Files/NSIS/makensis" ]; then \ - MAKENSIS="/c/Program\ Files/NSIS/makensis"; \ - elif [ -x "/cygdrive/c/Program Files/NSIS/makensis" ]; then \ - MAKENSIS="/cygdrive/c/Program\ Files/NSIS/makensis"; \ - else \ - echo 'ERROR: cannot locate makensis tool'; exit 1; \ - fi; \ - case "`uname -s`" in \ - CYGWIN*) NSISFILE=`cygpath -m $$NSISFILE`;; \ - esac; \ - cd $(top_win32dir); \ - eval "$$MAKENSIS -V2 -NOCD $$NSISFILE" - mv $(top_win32dir)/$(package_win32)-setup.exe $(top_builddir) - -sha1sum $(top_builddir)/$(package_win32)-setup.exe > $(top_builddir)/$(package_win32)-setup.exe.sha1 && \ - { test -z "$(UNIX2DOS)" || $(UNIX2DOS) $(top_builddir)/$(package_win32)-setup.exe.sha1; } - -dist-win32: dist-win32-zip dist-win32-7z dist-win32-exe - -distclean-win32: - if test -d "$(top_builddir)/$(package_win32)"; then \ - rm -rf -- "$(top_builddir)/$(package_win32)"; \ - fi - rm -f -- $(top_builddir)/$(package_win32).zip - rm -f -- $(top_builddir)/$(package_win32).zip.sha1 - rm -f -- $(top_builddir)/$(package_win32).7z - rm -f -- $(top_builddir)/$(package_win32).7z.sha1 - rm -f -- $(top_builddir)/$(package_win32)-setup.exe - rm -f -- $(top_builddir)/$(package_win32)-setup.exe.sha1 - -.PHONY: install-win32 install-win32-strip dist-win32 dist-win32-dir \ - dist-win32-zip dist-win32-7z dist-win32-exe distclean-win32 - -endif +include compat/Makefile.am +include data/Makefile.am +include debugger/Makefile.am +include hacking/Makefile.am +include lib/Makefile.am +include machines/Makefile.am +include man/Makefile.am +include peripherals/Makefile.am +include perl/Makefile.am +include pokefinder/Makefile.am +include roms/Makefile.am +include sound/Makefile.am +include timer/Makefile.am +include ui/Makefile.am +include ui/fb/Makefile.am +include ui/gtk/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 +include ui/xlib/Makefile.am +include unittests/Makefile.am +include z80/Makefile.am Property changes on: trunk/fuse/Makefile.am ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: trunk/fuse/PORTING =================================================================== --- trunk/fuse/PORTING 2016-05-25 11:30:52 UTC (rev 803) +++ trunk/fuse/PORTING 2016-06-01 10:46:07 UTC (rev 804) Property changes on: trunk/fuse/PORTING ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Modified: trunk/fuse/README =================================================================== --- trunk/fuse/README 2016-05-25 11:30:52 UTC (rev 803) +++ trunk/fuse/README 2016-06-01 10:46:07 UTC (rev 804) @@ -1,4 +1,4 @@ -The Free Unix Spectrum Emulator (Fuse) 1.1.1 +The Free Unix Spectrum Emulator (Fuse) 1.2.0 ============================================ Fuse (the Free Unix Spectrum Emulator) was originally, and somewhat @@ -25,7 +25,8 @@ * Support for the RZX input recording file format, including rollback and 'competition mode'. * Emulation of the DivIDE, Interface 1, Kempston mouse, Spectrum +3e, - ZXATASP, ZXCF, Beta 128, Opus Discovery, +D and DISCiPLE interfaces. + ZXATASP, ZXCF, Beta 128, Opus Discovery, +D, DISCiPLE and Didaktik 80/40 + interfaces. Help! <xyz> doesn't work ------------------------ @@ -107,4 +108,4 @@ Philip Kendall <phi...@sh...> 24th May, 2013 -$Id: README 4995 2013-05-24 19:54:19Z zubzero $ +$Id: README 5403 2016-04-25 13:10:53Z fredm $ Property changes on: trunk/fuse/README ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Modified: trunk/fuse/THANKS =================================================================== --- trunk/fuse/THANKS 2016-05-25 11:30:52 UTC (rev 803) +++ trunk/fuse/THANKS 2016-06-01 10:46:07 UTC (rev 804) @@ -29,7 +29,7 @@ you've got an Amiga, you may well like to check out Ian's Spectrum Emulator, ASp: http://www.lasernet.plus.com/asp.html -* Shawn Hargreaves: for Allegro (http://alleg.sourceforge.net/) +* Shawn Hargreaves: for Allegro (http://liballeg.org/) (again, used by previous versions of Fuse for the graphical display) * Steven Harrison: for helping track down why the SDL sound routines @@ -44,7 +44,7 @@ emulations (see `AUTHORS') * Gerton Lunter: his wonderful z80 - (ftp://ftp.worldofspectrum.org/pub/sinclair/emulators/pc/dos/z80-400.zip) + (http://www.worldofspectrum.org/pub/sinclair/emulators/pc/windows/z80-400.zip) got me started on this emulation lark all those years ago... * Anders Holmberg: for reporting a bug in the z80 v1.45 load routines. Anders @@ -102,4 +102,4 @@ * Matan Ziv-Av: for various bits of code (see `AUTHORS') -$Id: THANKS 4882 2013-02-15 23:47:37Z sbaldovi $ +$Id: THANKS 5357 2016-0... [truncated message content] |