[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx:[757] trunk/fuse
Brought to you by:
fredm
Menu
▾
▴
[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx:[757] trunk/fuse
|
From: <fr...@us...> - 2013-05-25 05:10:00
|
Revision: 757
http://sourceforge.net/p/fuse-for-macosx/code/757
Author: fredm
Date: 2013-05-25 05:09:56 +0000 (Sat, 25 May 2013)
Log Message:
-----------
Merge up to vendor 1.1.0 release branches r4995.
Revision Links:
--------------
http://sourceforge.net/p/fuse-for-macosx/code/4995
Modified Paths:
--------------
trunk/fuse/AUTHORS
trunk/fuse/ChangeLog
trunk/fuse/Makefile.am
trunk/fuse/README
trunk/fuse/configure.ac
trunk/fuse/fusepb/Credits.html
trunk/fuse/fusepb/English.lproj/InfoPlist.strings
trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
trunk/fuse/fusepb/Info-Fuse.plist
trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html
trunk/fuse/hacking/ChangeLog
trunk/fuse/hacking/Makefile.am
trunk/fuse/lib/Makefile.am
trunk/fuse/man/fuse.1
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/sound/Makefile.am
trunk/fuse/ui/gtk/gtkui.c
trunk/fuse/ui/widget/menu.c
trunk/fuse/ui/widget/options.pl
trunk/fuse/ui/widget/query.c
trunk/fuse/ui/widget/widget.c
trunk/fuse/ui/widget/widget_internals.h
trunk/fuse/ui/wii/Makefile.am
trunk/fuse/ui/win32/win32ui.c
Property Changed:
----------------
trunk/fuse/
Index: trunk/fuse
===================================================================
--- trunk/fuse 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse 2013-05-25 05:09:56 UTC (rev 757)
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-752
+/vendor/fuse-emulator/current/fuse:530-756
/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 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/AUTHORS 2013-05-25 05:09:56 UTC (rev 757)
@@ -34,6 +34,8 @@
* Marek Januszewski: Some patches making Fuse much closer to compiling under
Win32, and fixing up the GTK+ 2.0 interface.
+* Sergio Baldoví: improvements to the Win32 UI.
+
* Stuart Brady: for the Scorpion, +D interface emulation and HP-UX sound
support.
@@ -52,4 +54,4 @@
* Philip Kendall: everything else.
-$Id: AUTHORS 4835 2012-12-31 15:35:45Z zubzero $
+$Id: AUTHORS 4972 2013-05-19 16:46:43Z zubzero $
Modified: trunk/fuse/ChangeLog
===================================================================
--- trunk/fuse/ChangeLog 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/ChangeLog 2013-05-25 05:09:56 UTC (rev 757)
@@ -1,5 +1,14 @@
-2013-05-18 Philip Kendall <phi...@sh...>
+2013-05-24 Philip Kendall <phi...@sh...>
+ * Fuse 1.1.1 released.
+
+ * Distribute PORTING,hacking/valgrind.supp,sound/wiisound.c,
+ tests/success.{mgt.bz2,opd} and ui/wii/wiimouse.h (Stuart Brady).
+ * Add ChangeLog entries for 1.0.0.1 and 1.0.0.1a (Fredrick Meunier).
+ * Release correct version of source files.
+
+2013-05-19 Philip Kendall <phi...@sh...>
+
* Fuse 1.1.0 released.
* Remove ROMs that there is no formal permission to distribute.
@@ -57,6 +66,22 @@
* Various other minor bugfixes.
+2011-04-01 Philip Kendall <phi...@sh...>
+
+ * Fuse 1.0.0.1a released.
+
+ * Remove all ROMs for which there isn't explicit permission to
+ distribute (Philip Kendall).
+
+2011-01-12 Philip Kendall <phi...@sh...>
+
+ * Fuse 1.0.0.1 released.
+
+ * Fix temporary breakpoints on platforms using replacement Glib
+ (Fredrick Meunier, Sergio Baldovi; thanks, Chris Cowley)
+ * Ensure Amiga port can load files (Chris Young)
+ * Fix SVGAlib compilation (rkd77)
+
2010-12-16 Philip Kendall <phi...@sh...>
* Fuse 1.0.0 released.
@@ -1094,4 +1119,4 @@
* Version 0.1.0 released.
-$Id: ChangeLog 4944 2013-05-16 20:55:22Z pak21 $
+$Id: ChangeLog 4995 2013-05-24 19:54:19Z zubzero $
Modified: trunk/fuse/Makefile.am
===================================================================
--- trunk/fuse/Makefile.am 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/Makefile.am 2013-05-25 05:09:56 UTC (rev 757)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 1999-2009 Philip Kendall
-## $Id: Makefile.am 4782 2012-12-02 22:49:57Z sbaldovi $
+## $Id: Makefile.am 4980 2013-05-21 12:37:51Z 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
@@ -203,6 +203,7 @@
EXTRA_DIST = AUTHORS \
INSTALL \
+ PORTING \
README \
THANKS \
keysyms.dat \
Modified: trunk/fuse/README
===================================================================
--- trunk/fuse/README 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/README 2013-05-25 05:09:56 UTC (rev 757)
@@ -1,4 +1,4 @@
-The Free Unix Spectrum Emulator (Fuse) 1.1.0
+The Free Unix Spectrum Emulator (Fuse) 1.1.1
============================================
Fuse (the Free Unix Spectrum Emulator) was originally, and somewhat
@@ -105,6 +105,6 @@
<http://www.worldofspectrum.org/forums/>.
Philip Kendall <phi...@sh...>
-18th May, 2013
+24th May, 2013
-$Id: README 4958 2013-05-18 13:07:46Z zubzero $
+$Id: README 4995 2013-05-24 19:54:19Z zubzero $
Modified: trunk/fuse/configure.ac
===================================================================
--- trunk/fuse/configure.ac 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/configure.ac 2013-05-25 05:09:56 UTC (rev 757)
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-dnl $Id: configure.ac 4898 2013-02-25 22:20:54Z pak21 $
+dnl $Id: configure.ac 4995 2013-05-24 19:54:19Z zubzero $
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.1.0])
+m4_define([fuse_version], [1.1.1])
dnl Product full version
m4_define([fuse_major_version], [1])
m4_define([fuse_minor_version], [1])
-m4_define([fuse_micro_version], [0])
+m4_define([fuse_micro_version], [1])
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])
Modified: trunk/fuse/fusepb/Credits.html
===================================================================
--- trunk/fuse/fusepb/Credits.html 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/fusepb/Credits.html 2013-05-25 05:09:56 UTC (rev 757)
@@ -1,143 +1,194 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
-<head>
- <meta content="text/html; charset=ISO-8859-1"
- http-equiv="content-type">
- <title>Fuse credits</title>
-</head>
-<body>
-<p class="MsoNormal"><span style="font-family: Helvetica;" lang="EN-US">Fuse
-for
-Mac OS X has a home page at:</span></p>
-<p class="MsoNormal"><span style="font-family: Helvetica;" lang="EN-US"><a
- href="http://fuse-for-macosx.sourceforge.net/">http://fuse-for-macosx.sourceforge.net/</a><br>
-</span><br>
-<span style="font-family: Helvetica;" lang="EN-US">If you've got any
-bug reports, suggestions or the like for Fuse, or
-just want to get involved in the development, this is coordinated via
-the Fuse for Mac OS X project page on SourceForge,<br>
-<a href="http://sourceforge.net/projects/fuse-for-macosx/">http://sourceforge.net/projects/fuse-for-macosx/</a><br>
-<br>
-If you're interested in more general Speccy related discussions, visit
-the <a href="http://www.worldofspectrum.org/forums/">World of Spectrum
-Forums</a> or the Usenet group '<a href="news:comp.sys.sinclair">comp.sys.sinclair</a>',
-but
-do read the <a href="http://www.worldofspectrum.org/faq/index.html">FAQ</a>
-first!<br>
-</span></p>
-<p class="MsoNormal"><span style="font-family: Helvetica;" lang="EN-US">Fuse
-has
-been brought to you by:</span></p>
-<ul>
- <li><span style="font-family: Helvetica;" lang="EN-US">Matan Ziv-Av:
-SVGAlib and framebuffer user interfaces, the glib replacement code,
-some
-work on the sound code and the original `widget' code.</span></li>
- <li><span style="font-family: Helvetica;" lang="EN-US">Russell Marks:
-the generic and OSS-specific sound code, the man page, the Kempston
-joystick emulation and lots of bug reports and fixes.</span></li>
- <li><span style="font-family: Helvetica;" lang="EN-US">Ian Collier:
-the original ZX Printer emulation (for xz80).</span></li>
- <li><span style="font-family: Helvetica;" lang="EN-US">John Elliott:
-for lib765, which once provided Fuse's emulation of the +3's FDC, and
-libdsk
-which provides support for more disk image formats see <a
- href="http://www.seasip.demon.co.uk/Unix/LibDsk/">here</a>.</span></li>
- <li><span style="font-family: Helvetica;" lang="EN-US">Darren Salt:
-the original versions of the code for +3 emulation, SLT support, MITSHM
-support (for the Xlib UI), TZX raw data blocks, Spectrum SE support,
-RZX embedded snapshots and compression, the Kempston mouse emulation
-and made many improvements to the widget code.</span></li>
- <li><span style="font-family: Helvetica;" lang="EN-US">Alexander
-Yurchenko: the OpenBSD/Solaris-specific sound code.</span></li>
- <li><span style="font-family: Helvetica;" lang="EN-US">Fredrick
-Meunier: for TC2048 support, the SDL user interface, the graphics
-filters, Pentagon support, Spectrum SE support, Interface
-II support and more.</span></li>
- <li><span style="font-family: Helvetica;" lang="EN-US">Andrew Owen:
-for the keyboard help screens and the file icons.</span></li>
- <li><span style="font-family: Helvetica;" lang="EN-US">Paul van der
-Laan: for the Fuse program icon.<br>
- </span></li>
- <li><span style="font-family: Helvetica;" lang="EN-US">Ludvig
-Strigeus
-and The <a href="http://www.scummvm.org/">ScummVM</a> project: for the
-original graphics filter code and inspiration in improving the windowed
-performance of Fuse.</span></li>
- <li><span style="font-family: Helvetica;" lang="EN-US">Dmitry
-Sanarin:
-the original TR-DOS emulation (for the <a
- href="http://glukalka.sourceforge.net">Glukalka</a> emulator).</span></li>
- <li><span style="font-family: Helvetica;" lang="EN-US">Witold
-Filipczyk:
-TC2068 support and more.</span></li>
- <li><span style="font-family: Helvetica;" lang="EN-US">Matthew
-Westcott: the AY logging code and the DivIDE emulation.</span></li>
- <li><span style="font-family: Helvetica;" lang="EN-US">Marek
-Januszewski:
-Some patches making Fuse much closer to compiling under Win32, and
-fixing
-up the GTK+ 2.0 interface.</span></li>
- <li><span style="font-family: Helvetica;" lang="EN-US">Stuart
-Brady: for the DISCiPLE emulation, +D emulation, Scorpion emulation and HP-UX sound support.</span></li>
- <li><span style="font-family: Helvetica;" lang="EN-US">Garry
-Lancaster: the 8-bit IDE, ZXATASP and ZXCF interface
-emulations.</span></li>
- <li><span style="font-family: Helvetica;" lang="EN-US">Gergely Szasz:
-+3, +D, Opus and Interface I/microdrive emulation, the PAL TV scalers,
-the TV 3x
-scaler, the movie logging code, the libao sound code, and made many
-improvements to the widget code.</span></li>
- <li><span style="font-family: Helvetica;" lang="EN-US">Shay Green:
-the Blip_Buffer band pass filter for beeper and AY output.</span></li>
- <li><span style="font-family: Helvetica;" lang="EN-US">Boris Donko:
-for various Z80 core fixes: missing memory contention on LD (nnnn),A
-instruction, flags on SCF and FLAG_V on DEC, and timing of INC SP.</span></li>
- <li><span style="font-family: Helvetica;" lang="EN-US">Ivan Ruiz
-Etxabe: for helping test RZX competition mode recording.</span></li>
- <li><span style="font-family: Helvetica;" lang="EN-US">David Muriel:
-for helping test RZX competition mode recording.<br>
- </span></li>
- <li><span style="font-family: Helvetica;" lang="EN-US">Ian Greenway:
-for information about reading from unattached ports. If you've got an
-Amiga, you may well like to check out Ian's Spectrum Emulator, <a
- href="http://www.greew.freeserve.co.uk/ASp.html">ASp</a></span></li>
- <li><span style="font-family: Helvetica;" lang="EN-US">Mark Woodmass:
-for putting me on the track of (and finding the solution to) bugs with
-regard to Fuse's R register emulation during HALTs and interrupts and
-Fuse's mask for the memory control port on the 128K/+2 machines. Mark's
-another one who's written an emulator: see '<a
- href="http://www.worldofspectrum.org/emulators.html#pcwin">SPIN</a>'</span></li>
- <li><span style="font-family: Helvetica;" lang="EN-US">Michael D
-Wynne: the Opus Discovery emulation (for the <a
- href="http://www.chuntey.com/">EightyOne</a> Sinclair machines
-emulator)<br>
- </span></li>
- <li><span style="font-family: Helvetica;" lang="EN-US">Joystick
-support frm the </span><span style="font-family: Helvetica;"
- lang="EN-US"><a href="http://www.libsdl.org">Simple DirectMedia Layer</a>
-library</span></li>
- <li><span style="font-family: Helvetica;" lang="EN-US">Philip
-Kendall: everything else.</span></li>
-</ul>
-<p class="MsoNormal"><span style="font-family: Helvetica;" lang="EN-US">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 the
-Free Software Foundation; either version 2 of the License, or
-(at
-your option) any later version. This program is distributed in the hope
-that it will be useful, but WITHOUT ANY WARRENTY; without even the
-implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-PURPOSE.
-See the GNU General Public LIcense for more details. You should
-have received a copy of the GNU General Public License with this
-program; if not, write to the </span></p>
-<span style="font-family: Helvetica;" lang="EN-US">Free Software
-Foundation, Inc.,<br>
-59 Temple Place - Suite 330,<br>
-Boston, MA 02111-1307, USA<br>
-</span>
-<br>
-</body>
+ <head>
+ <meta content="text/html; charset=ISO-8859-1"
+ http-equiv="content-type">
+ <title>Fuse credits</title>
+ </head>
+ <body>
+ <p class="MsoNormal"><span style="font-family: Helvetica;"
+ lang="EN-US">Fuse
+ for
+ Mac OS X has a home page at:</span></p>
+ <p class="MsoNormal"><span style="font-family: Helvetica;"
+ lang="EN-US"><a href="http://fuse-for-macosx.sourceforge.net/">http://fuse-for-macosx.sourceforge.net/</a><br>
+ </span><br>
+ <span style="font-family: Helvetica;" lang="EN-US">If you've got
+ any
+ bug reports, suggestions or the like for Fuse, or
+ just want to get involved in the development, this is
+ coordinated via
+ the Fuse for Mac OS X project page on SourceForge,<br>
+ <a href="http://sourceforge.net/projects/fuse-for-macosx/">http://sourceforge.net/projects/fuse-for-macosx/</a><br>
+ <br>
+ If you're interested in more general Speccy related discussions,
+ visit
+ the <a href="http://www.worldofspectrum.org/forums/">World of
+ Spectrum
+ Forums</a> or the Usenet group '<a
+ href="news:comp.sys.sinclair">comp.sys.sinclair</a>',
+ but
+ do read the <a
+ href="http://www.worldofspectrum.org/faq/index.html">FAQ</a>
+ first!<br>
+ </span></p>
+ <p class="MsoNormal"><span style="font-family: Helvetica;"
+ lang="EN-US">Fuse
+ has
+ been brought to you by:</span></p>
+ <ul>
+ <li><span style="font-family: Helvetica;" lang="EN-US">Matan
+ Ziv-Av:
+ SVGAlib and framebuffer user interfaces, the glib replacement
+ code,
+ some
+ work on the sound code and the original `widget' code.</span></li>
+ <li><span style="font-family: Helvetica;" lang="EN-US">Russell
+ Marks:
+ the generic and OSS-specific sound code, the man page, the
+ Kempston
+ joystick emulation and lots of bug reports and fixes.</span></li>
+ <li><span style="font-family: Helvetica;" lang="EN-US">Ian
+ Collier:
+ the original ZX Printer emulation (for xz80).</span></li>
+ <li><span style="font-family: Helvetica;" lang="EN-US">John
+ Elliott:
+ for lib765, which once provided Fuse's emulation of the +3's
+ FDC, and
+ libdsk
+ which provides support for more disk image formats see <a
+ href="http://www.seasip.demon.co.uk/Unix/LibDsk/">here</a>.</span></li>
+ <li><span style="font-family: Helvetica;" lang="EN-US">Darren
+ Salt:
+ the original versions of the code for +3 emulation, SLT
+ support, MITSHM
+ support (for the Xlib UI), TZX raw data blocks, Spectrum SE
+ support,
+ RZX embedded snapshots and compression, the Kempston mouse
+ emulation
+ and made many improvements to the widget code.</span></li>
+ <li><span style="font-family: Helvetica;" lang="EN-US">Alexander
+ Yurchenko: the OpenBSD/Solaris-specific sound code.</span></li>
+ <li><span style="font-family: Helvetica;" lang="EN-US">Fredrick
+ Meunier: for TC2048 support, the SDL user interface, the
+ graphics
+ filters, Pentagon support, Spectrum SE support, Interface
+ II support and more.</span></li>
+ <li><span style="font-family: Helvetica;" lang="EN-US">Andrew
+ Owen:
+ for the keyboard help screens and the file icons.</span></li>
+ <li><span style="font-family: Helvetica;" lang="EN-US">Paul van
+ der
+ Laan: for the Fuse program icon.<br>
+ </span></li>
+ <li><span style="font-family: Helvetica;" lang="EN-US">Ludvig
+ Strigeus
+ and The <a href="http://www.scummvm.org/">ScummVM</a>
+ project: for the
+ original graphics filter code and inspiration in improving the
+ windowed
+ performance of Fuse.</span></li>
+ <li><span style="font-family: Helvetica;" lang="EN-US">Dmitry
+ Sanarin:
+ the original TR-DOS emulation (for the <a
+ href="http://glukalka.sourceforge.net">Glukalka</a>
+ emulator).</span></li>
+ <li><span style="font-family: Helvetica;" lang="EN-US">Witold
+ Filipczyk:
+ TC2068 support and more.</span></li>
+ <li><span style="font-family: Helvetica;" lang="EN-US">Matthew
+ Westcott: the AY logging code and the DivIDE emulation.</span></li>
+ <li><span style="font-family: Helvetica;" lang="EN-US">Marek
+ Januszewski:
+ Some patches making Fuse much closer to compiling under Win32,
+ and
+ fixing
+ up the GTK+ 2.0 interface.</span></li>
+ <li><span style="font-family: Helvetica;" lang="EN-US">Sergio
+ Baldoví: improvements to the Win32 UI.<br>
+ </span></li>
+ <li><span style="font-family: Helvetica;" lang="EN-US">Stuart
+ Brady: for the DISCiPLE emulation, +D emulation, Scorpion
+ emulation and HP-UX sound support.</span></li>
+ <li><span style="font-family: Helvetica;" lang="EN-US">Garry
+ Lancaster: the 8-bit IDE, ZXATASP and ZXCF interface
+ emulations.</span></li>
+ <li><span style="font-family: Helvetica;" lang="EN-US">Gergely
+ Szasz:
+ +3, +D, Opus and Interface I/microdrive emulation, the PAL TV
+ scalers,
+ the TV 3x
+ scaler, the movie logging code, the libao sound code, and made
+ many
+ improvements to the widget code.</span></li>
+ <li><span style="font-family: Helvetica;" lang="EN-US">Shay Green:
+ the Blip_Buffer band pass filter for beeper and AY output.</span></li>
+ <li><span style="font-family: Helvetica;" lang="EN-US">Boris
+ Donko:
+ for various Z80 core fixes: missing memory contention on LD
+ (nnnn),A
+ instruction, flags on SCF and FLAG_V on DEC, and timing of INC
+ SP.</span></li>
+ <li><span style="font-family: Helvetica;" lang="EN-US">Ivan Ruiz
+ Etxabe: for helping test RZX competition mode recording.</span></li>
+ <li><span style="font-family: Helvetica;" lang="EN-US">David
+ Muriel:
+ for helping test RZX competition mode recording.<br>
+ </span></li>
+ <li><span style="font-family: Helvetica;" lang="EN-US">Ian
+ Greenway:
+ for information about reading from unattached ports. If you've
+ got an
+ Amiga, you may well like to check out Ian's Spectrum Emulator,
+ <a href="http://www.greew.freeserve.co.uk/ASp.html">ASp</a></span></li>
+ <li><span style="font-family: Helvetica;" lang="EN-US">Mark
+ Woodmass:
+ for putting me on the track of (and finding the solution to)
+ bugs with
+ regard to Fuse's R register emulation during HALTs and
+ interrupts and
+ Fuse's mask for the memory control port on the 128K/+2
+ machines. Mark's
+ another one who's written an emulator: see '<a
+ href="http://www.worldofspectrum.org/emulators.html#pcwin">SPIN</a>'</span></li>
+ <li><span style="font-family: Helvetica;" lang="EN-US">Michael D
+ Wynne: the Opus Discovery emulation (for the <a
+ href="http://www.chuntey.com/">EightyOne</a> Sinclair
+ machines
+ emulator)<br>
+ </span></li>
+ <li><span style="font-family: Helvetica;" lang="EN-US">Joystick
+ support frm the </span><span style="font-family: Helvetica;"
+ lang="EN-US"><a href="http://www.libsdl.org">Simple
+ DirectMedia Layer</a>
+ library</span></li>
+ <li><span style="font-family: Helvetica;" lang="EN-US">Philip
+ Kendall: everything else.</span></li>
+ </ul>
+ <p class="MsoNormal"><span style="font-family: Helvetica;"
+ lang="EN-US">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 the
+ Free Software Foundation; either version 2 of the License,
+ or
+ (at
+ your option) any later version. This program is distributed in
+ the hope
+ that it will be useful, but WITHOUT ANY WARRENTY; without even
+ the
+ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.
+ See the GNU General Public LIcense for more details. You
+ should
+ have received a copy of the GNU General Public License with this
+ program; if not, write to the </span></p>
+ <span style="font-family: Helvetica;" lang="EN-US">Free Software
+ Foundation, Inc.,<br>
+ 59 Temple Place - Suite 330,<br>
+ Boston, MA 02111-1307, USA<br>
+ </span>
+ <br>
+ </body>
</html>
Modified: trunk/fuse/fusepb/English.lproj/InfoPlist.strings
===================================================================
(Binary files differ)
Modified: trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
===================================================================
--- trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2013-05-25 05:09:56 UTC (rev 757)
@@ -1879,7 +1879,7 @@
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_MODEL_CPU = "";
GCC_OPTIMIZATION_LEVEL = 0;
- GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ GCC_VERSION = "";
HEADER_SEARCH_PATHS = (
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)/audiofile.framework/Headers",
..,
@@ -1921,7 +1921,7 @@
GCC_ENABLE_CPP_RTTI = NO;
GCC_ENABLE_OBJC_EXCEPTIONS = NO;
GCC_OPTIMIZATION_LEVEL = 2;
- GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ GCC_VERSION = "";
HEADER_SEARCH_PATHS = (
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)/audiofile.framework/Headers",
..,
@@ -1962,7 +1962,7 @@
GCC_ENABLE_CPP_RTTI = NO;
GCC_ENABLE_OBJC_EXCEPTIONS = NO;
GCC_OPTIMIZATION_LEVEL = 2;
- GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ GCC_VERSION = "";
HEADER_SEARCH_PATHS = (
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)/audiofile.framework/Headers",
..,
Modified: trunk/fuse/fusepb/Info-Fuse.plist
===================================================================
--- trunk/fuse/fusepb/Info-Fuse.plist 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/fusepb/Info-Fuse.plist 2013-05-25 05:09:56 UTC (rev 757)
@@ -548,11 +548,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>1.1.0</string>
+ <string>1.1.1</string>
<key>CFBundleSignature</key>
<string>FUSE</string>
<key>CFBundleVersion</key>
- <string>1.1.0</string>
+ <string>1.1.1</string>
<key>NSMainNibFile</key>
<string>MainMenu</string>
<key>NSPrincipalClass</key>
Modified: trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html
===================================================================
--- trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html 2013-05-25 05:09:56 UTC (rev 757)
@@ -12,7 +12,7 @@
<!-- AppleSegStart="What's New In Fuse?" --><a name="What's New In
Fuse?" id="What's New In Fuse?"></a><!-- AppleSegDescription="This section describes the changes for version 1.1.0 of the Fuse emulator." --></font><br>
<h2><font><font face="Lucida Grande,Helvetica,Arial">What's new in
- Fuse For Mac OS X 1.1.0</font></font></h2>
+ Fuse For Mac OS X 1.1.1</font></font></h2>
<ul>
<li><font face="Lucida Grande,Helvetica,Arial">New policy:</font></li>
<li style="list-style-type: none; list-style-image: none;
Modified: trunk/fuse/hacking/ChangeLog
===================================================================
--- trunk/fuse/hacking/ChangeLog 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/hacking/ChangeLog 2013-05-25 05:09:56 UTC (rev 757)
@@ -3401,6 +3401,7 @@
everything else (fixes bug #3084862) (thanks, Phil) (Fred).
20110104 nic: add .deps and Makefile to the ignore property (Fred).
20110109 ui/widget/filesel.c: make Amiga work again (Chris Young).
+20110112 ChangeLog,README,configure.in,man/fuse.1: updates for 1.0.0.1 release.
20110113 ui/win32/installer/fuse.nsi: windows installer improvements; optionally
delete configuration file (fuse.cfg) on uninstall, silently uninstall
previous version if reinstalling to the same folder, include AUTHORS
@@ -3552,8 +3553,11 @@
Makefile.am}: remove ROMs that there is no formal permission to
distribute.
20110327 roms/Makefile.am: distribute README.copyright.
+20110327 ChangeLog,README,configure.in,fuse.c,man/fuse.1: updates for 1.0.0.1a
+ release.
20110328 configure.in: allow the user to say they do not want to use windres
(works around bug #3248008; thanks, Cygnus).
+20110401 ChangeLog,man/fuse.1: didn't manage to release this earlier.
20110401 peripherals/disk/{opus,plusd}.c: remove incorrect use of GCC_UNUSED
(Stuart).
20110401 fuse.c,ui/{gtk/gtkui.c,widget/menu.c},windres.rc: update copyright
@@ -4494,3 +4498,23 @@
confirmation dialogue for reset due to peripheral changes (Sergio).
20130517 README: update date for 1.1 release.
20130518 README: mention DISCiPLE support (Stuart).
+20130518 ui/widget/options.pl: display confirmation dialogue for reset due to
+ peripheral changes (Stuart).
+20130518 ui/widget/options.pl: update peripherals list when a machine reset is
+ not needed (Sergio).
+20130519 ui/widget/{query.c,widget.c,widget_internals.h}: display confirmation
+ messages (Stuart).
+20130519 ui/widget/{options.pl,query.c}: choose no/cancel upon pressing escape
+ for all all confirmation dialogues, and remove workaround for this
+ from peripheral reset confirmation dialogue (Stuart).
+20130519 ui/{gtk/gtkui.c,widget/menu.c,win32/win32ui.c}: use different
+ confirmation messages for hard and soft resets (Stuart).
+20130519 ChangeLog,README,man/fuse.1: update date for 1.1 release (Stuart).
+20130519 AUTHOR,man/fuse.1: Add Sergio Baldoví (Stuart).
+20130519 lib/Makefile.am: distribute tests/success.{mgt.bz2,opd} (Stuart).
+20130519 Makefile.am,hacking/Makefile.am,sound/Makefile.am,ui/wii/Makefile.am:
+ distribute PORTING,hacking/valgrind.supp,sound/wiisound.c,
+ ui/wii/wiimouse.h (Stuart).
+20130524 ChangeLog,README: updates for a "1.1.1" release (Fred).
+20130524 ChangeLog,README,configure.ac,man/fuse.1: fill in date and bump
+ version number (Stuart).
Modified: trunk/fuse/hacking/Makefile.am
===================================================================
--- trunk/fuse/hacking/Makefile.am 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/hacking/Makefile.am 2013-05-25 05:09:56 UTC (rev 757)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2002-2011 Philip Kendall
-## $Id: Makefile.am 4663 2012-02-11 12:48:36Z fredm $
+## $Id: Makefile.am 4980 2013-05-21 12:37:51Z 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
@@ -33,4 +33,5 @@
spectranet.txt \
tc2048_tech_notes.txt \
timer.txt \
- ui.txt
+ ui.txt \
+ valgrind.supp
Modified: trunk/fuse/lib/Makefile.am
===================================================================
--- trunk/fuse/lib/Makefile.am 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/lib/Makefile.am 2013-05-25 05:09:56 UTC (rev 757)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 1999-2004 Philip Kendall
-## $Id: Makefile.am 4624 2012-01-09 20:59:35Z pak21 $
+## $Id: Makefile.am 4980 2013-05-21 12:37:51Z 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
@@ -64,6 +64,8 @@
tests/fatware-success.hdf.bz2 \
tests/idedos-success.hdf.bz2 \
tests/success.mdr \
+ tests/success.mgt.bz2 \
+ tests/success.opd \
tests/success.udi \
uncompressed/disk_plus3.szx \
uncompressed/tape_128.szx \
Modified: trunk/fuse/man/fuse.1
===================================================================
--- trunk/fuse/man/fuse.1 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/man/fuse.1 2013-05-25 05:09:56 UTC (rev 757)
@@ -23,7 +23,7 @@
.\" E-mail: phi...@sh...
.\"
.\"
-.TH fuse 1 "18th May, 2013" "Version 1.1.0" "Emulators"
+.TH fuse 1 "24th May, 2013" "Version 1.1.1" "Emulators"
.\"
.\"------------------------------------------------------------------
.\"
@@ -4779,6 +4779,8 @@
Marek Januszewski wrote various bits of code to make Fuse work under
Win32, including the DirectDraw user interface.
.PP
+Sergio Baldov\('i made many improvements to the Win32 UI.
+.PP
Stuart Brady wrote the DISCiPLE and +D emulation, Scorpion emulation
and the HP-UX sound code.
.PP
Modified: trunk/fuse/peripherals/ide/divide.c
===================================================================
--- trunk/fuse/peripherals/ide/divide.c 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/peripherals/ide/divide.c 2013-05-25 05:09:56 UTC (rev 757)
@@ -1,7 +1,7 @@
/* divide.c: DivIDE interface routines
Copyright (c) 2005-2008 Matthew Westcott, Philip Kendall
- $Id: divide.c 4906 2013-03-10 11:21:37Z fredm $
+ $Id: divide.c 4972 2013-05-19 16:46:43Z zubzero $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/fuse/peripherals/ide/divide.h
===================================================================
--- trunk/fuse/peripherals/ide/divide.h 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/peripherals/ide/divide.h 2013-05-25 05:09:56 UTC (rev 757)
@@ -1,7 +1,7 @@
/* divide.h: DivIDE interface routines
Copyright (c) 2005 Matthew Westcott
- $Id: divide.h 4924 2013-05-05 07:40:02Z sbaldovi $
+ $Id: divide.h 4972 2013-05-19 16:46:43Z zubzero $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/fuse/peripherals/ide/ide.c
===================================================================
--- trunk/fuse/peripherals/ide/ide.c 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/peripherals/ide/ide.c 2013-05-25 05:09:56 UTC (rev 757)
@@ -1,7 +1,7 @@
/* ide.c: Generic routines shared between the various IDE devices
Copyright (c) 2005 Philip Kendall
- $Id: ide.c 4664 2012-02-12 11:51:01Z fredm $
+ $Id: ide.c 4972 2013-05-19 16:46:43Z zubzero $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/fuse/peripherals/ide/ide.h
===================================================================
--- trunk/fuse/peripherals/ide/ide.h 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/peripherals/ide/ide.h 2013-05-25 05:09:56 UTC (rev 757)
@@ -1,7 +1,7 @@
/* ide.h: Generic routines shared between the various IDE devices
Copyright (c) 2005 Philip Kendall
- $Id: ide.h 4664 2012-02-12 11:51:01Z fredm $
+ $Id: ide.h 4972 2013-05-19 16:46:43Z zubzero $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/fuse/peripherals/ide/simpleide.c
===================================================================
--- trunk/fuse/peripherals/ide/simpleide.c 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/peripherals/ide/simpleide.c 2013-05-25 05:09:56 UTC (rev 757)
@@ -3,7 +3,7 @@
2004 Philip Kendall,
2008 Fredrick Meunier
- $Id: simpleide.c 4926 2013-05-05 07:58:18Z sbaldovi $
+ $Id: simpleide.c 4972 2013-05-19 16:46:43Z zubzero $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/fuse/peripherals/ide/simpleide.h
===================================================================
--- trunk/fuse/peripherals/ide/simpleide.h 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/peripherals/ide/simpleide.h 2013-05-25 05:09:56 UTC (rev 757)
@@ -1,7 +1,7 @@
/* simpleide.h: Simple 8-bit IDE interface routines
Copyright (c) 2003-2004 Garry Lancaster
- $Id: simpleide.h 4664 2012-02-12 11:51:01Z fredm $
+ $Id: simpleide.h 4972 2013-05-19 16:46:43Z zubzero $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/fuse/peripherals/ide/zxatasp.c
===================================================================
--- trunk/fuse/peripherals/ide/zxatasp.c 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/peripherals/ide/zxatasp.c 2013-05-25 05:09:56 UTC (rev 757)
@@ -1,7 +1,7 @@
/* zxatasp.c: ZXATASP interface routines
Copyright (c) 2003-2008 Garry Lancaster and Philip Kendall
- $Id: zxatasp.c 4906 2013-03-10 11:21:37Z fredm $
+ $Id: zxatasp.c 4972 2013-05-19 16:46:43Z zubzero $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/fuse/peripherals/ide/zxatasp.h
===================================================================
--- trunk/fuse/peripherals/ide/zxatasp.h 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/peripherals/ide/zxatasp.h 2013-05-25 05:09:56 UTC (rev 757)
@@ -2,7 +2,7 @@
Copyright (c) 2003-2004 Garry Lancaster,
2004 Philip Kendall
- $Id: zxatasp.h 4664 2012-02-12 11:51:01Z fredm $
+ $Id: zxatasp.h 4972 2013-05-19 16:46:43Z zubzero $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/fuse/peripherals/ide/zxcf.c
===================================================================
--- trunk/fuse/peripherals/ide/zxcf.c 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/peripherals/ide/zxcf.c 2013-05-25 05:09:56 UTC (rev 757)
@@ -1,7 +1,7 @@
/* zxcf.c: ZXCF interface routines
Copyright (c) 2003-2008 Garry Lancaster and Philip Kendall
- $Id: zxcf.c 4906 2013-03-10 11:21:37Z fredm $
+ $Id: zxcf.c 4972 2013-05-19 16:46:43Z zubzero $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/fuse/peripherals/ide/zxcf.h
===================================================================
--- trunk/fuse/peripherals/ide/zxcf.h 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/peripherals/ide/zxcf.h 2013-05-25 05:09:56 UTC (rev 757)
@@ -2,7 +2,7 @@
Copyright (c) 2003-2004 Garry Lancaster,
2004 Philip Kendall
- $Id: zxcf.h 4664 2012-02-12 11:51:01Z fredm $
+ $Id: zxcf.h 4972 2013-05-19 16:46:43Z zubzero $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/fuse/sound/Makefile.am
===================================================================
--- trunk/fuse/sound/Makefile.am 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/sound/Makefile.am 2013-05-25 05:09:56 UTC (rev 757)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2004 Philip Kendall
-## $Id: Makefile.am 4743 2012-10-10 13:20:50Z fredm $
+## $Id: Makefile.am 4980 2013-05-21 12:37:51Z 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
@@ -41,6 +41,7 @@
sdlsound.c \
sfifo.c \
sunsound.c \
+ wiisound.c \
win32sound.c
libsound_a_LIBADD = $(SOUND_LIBADD)
Modified: trunk/fuse/ui/gtk/gtkui.c
===================================================================
--- trunk/fuse/ui/gtk/gtkui.c 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/ui/gtk/gtkui.c 2013-05-25 05:09:56 UTC (rev 757)
@@ -1,7 +1,7 @@
/* gtkui.c: GTK+ routines for dealing with the user interface
Copyright (c) 2000-2005 Philip Kendall, Russell Marks
- $Id: gtkui.c 4962 2013-05-19 05:25:15Z sbaldovi $
+ $Id: gtkui.c 4968 2013-05-19 16:11:17Z zubzero $
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
@@ -536,8 +536,12 @@
menu_machine_reset( GtkAction *gtk_action GCC_UNUSED, guint action )
{
int hard_reset = action;
+ const char *message = "Reset?";
- if( gtkui_confirm( "Reset?" ) && machine_reset( hard_reset ) ) {
+ if( hard_reset )
+ message = "Hard reset?";
+
+ if( gtkui_confirm( message ) && machine_reset( hard_reset ) ) {
ui_error( UI_ERROR_ERROR, "couldn't reset machine: giving up!" );
/* FIXME: abort() seems a bit extreme here, but it'll do for now */
Modified: trunk/fuse/ui/widget/menu.c
===================================================================
--- trunk/fuse/ui/widget/menu.c 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/ui/widget/menu.c 2013-05-25 05:09:56 UTC (rev 757)
@@ -1,7 +1,7 @@
/* menu.c: general menu widget
Copyright (c) 2001-2006 Philip Kendall
- $Id: menu.c 4915 2013-04-07 05:32:09Z fredm $
+ $Id: menu.c 4968 2013-05-19 16:11:17Z zubzero $
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
@@ -584,12 +584,18 @@
void
menu_machine_reset( int action )
{
- if( widget_do( WIDGET_TYPE_QUERY, "Reset machine?" ) ||
+ int hard_reset = action;
+ const char *message = "Reset?";
+
+ if( hard_reset )
+ message = "Hard reset?";
+
+ if( widget_do( WIDGET_TYPE_QUERY, message ) ||
!widget_query.confirm )
return;
widget_end_all( WIDGET_FINISHED_OK );
- machine_reset( action );
+ machine_reset( hard_reset );
}
void
Modified: trunk/fuse/ui/widget/options.pl
===================================================================
--- trunk/fuse/ui/widget/options.pl 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/ui/widget/options.pl 2013-05-25 05:09:56 UTC (rev 757)
@@ -1,9 +1,9 @@
#!/usr/bin/perl -w
# options.pl: generate options dialog boxes
-# Copyright (c) 2001-2008 Philip Kendall, Fredrick Meunier
+# Copyright (c) 2001-2013 Philip Kendall, Fredrick Meunier
-# $Id: options.pl 4961 2013-05-19 05:17:30Z sbaldovi $
+# $Id: options.pl 4969 2013-05-19 16:21:14Z zubzero $
# 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
@@ -37,7 +37,7 @@
my @dialogs = Fuse::Dialog::read( shift @ARGV );
print Fuse::GPL( 'options.c: options dialog boxes',
- '2001-2004 Philip Kendall' ) . << "CODE";
+ '2001-2013 Philip Kendall' ) . << "CODE";
/* This file is autogenerated from options.dat by options.pl.
Do not edit unless you know what you\'re doing! */
@@ -363,11 +363,35 @@
int
widget_options_finish( widget_finish_state finished )
{
+ int error;
+
/* If we exited normally, actually set the options */
if( finished == WIDGET_FINISHED_OK ) {
+ /* Get a copy of current settings */
+ settings_info original_settings;
+ memset( &original_settings, 0, sizeof( settings_info ) );
+ settings_copy( &original_settings, &settings_current );
+
+ /* Apply new options */
settings_copy( &settings_current, &widget_options_settings );
- /* Bring the peripherals list into sync with the new options */
- periph_posthook();
+
+ int needs_hard_reset = periph_postcheck();
+
+ if( needs_hard_reset ) {
+ error = widget_do( WIDGET_TYPE_QUERY,
+ "Some options need to reset the machine. Reset?" );
+ if( !error && !widget_query.confirm )
+ settings_copy( &settings_current, &original_settings );
+ else
+ periph_posthook();
+ }
+ else {
+ /* Bring the peripherals list into sync with the new options */
+ periph_posthook();
+ }
+
+ settings_free( &original_settings );
+
/* make the needed UI changes */
uidisplay_hotswap_gfx_mode();
}
Modified: trunk/fuse/ui/widget/query.c
===================================================================
--- trunk/fuse/ui/widget/query.c 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/ui/widget/query.c 2013-05-25 05:09:56 UTC (rev 757)
@@ -1,7 +1,7 @@
/* query.c: The query widgets
Copyright (c) 2004-2008 Darren Salt, Fredrick Meunier
- $Id: query.c 4179 2010-10-08 10:05:55Z fredm $
+ $Id: query.c 4968 2013-05-19 16:11:17Z zubzero $
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
@@ -30,6 +30,7 @@
#include <string.h>
#include "fuse.h"
+#include "utils.h"
#include "widget_internals.h"
widget_query_t widget_query;
@@ -104,12 +105,15 @@
static size_t highlight_line = 0;
+static char **message_lines;
+static size_t num_message_lines;
+
static void
widget_query_line_draw( int left_edge, int width, struct widget_query_entry *menu,
const char *label )
{
int colour = WIDGET_COLOUR_BACKGROUND;
- int y = menu->index * 8 + 24;
+ int y = (menu->index + num_message_lines) * 8 + 24;
if( menu->index == highlight_line ) colour = WIDGET_COLOUR_HIGHLIGHT;
widget_rectangle( left_edge*8+1, y, width*8-2, 1*8, colour );
@@ -121,10 +125,12 @@
const int query_vert_external_margin = 8;
static int
-widget_calculate_query_width( const char *title, widget_query_entry *menu )
+widget_calculate_query_width( const char *title, widget_query_entry *menu,
+ char **lines, int num_lines )
{
widget_query_entry *ptr;
int max_width=0;
+ int i;
if (!menu) {
return 64;
@@ -139,17 +145,34 @@
max_width = total_width;
}
+ for( i=0; i<num_lines; i++) {
+ int total_width = widget_stringwidth( lines[i] )+2*8;
+
+ if( total_width > max_width )
+ max_width = total_width;
+ }
+
return ( max_width + query_vert_external_margin * 2 ) / 8;
}
static int
-internal_query_draw( widget_query_entry *query, int save, const char *data )
+internal_query_draw( widget_query_entry *query, int save, const char *message )
{
widget_query_entry *ptr;
size_t height = 0;
- int menu_width = widget_calculate_query_width( title, query );
+ int menu_width;
int menu_left_edge_x;
+ int i;
+ if( split_message( message, &message_lines, &num_message_lines, 28 ) ) {
+ return 1;
+ }
+
+ menu_width = widget_calculate_query_width( title, query, message_lines,
+ num_message_lines );
+
+ height = num_message_lines;
+
/* How many options do we have? */
for( ptr = query; ptr->text; ptr++ )
height ++;
@@ -161,6 +184,11 @@
widget_printstring( menu_left_edge_x*8+2, 16, WIDGET_COLOUR_TITLE, title );
+ for( i=0; i<num_message_lines; i++ ) {
+ widget_printstring( menu_left_edge_x*8+8, i*8+24,
+ WIDGET_COLOUR_FOREGROUND, message_lines[i] );
+ }
+
for( ptr = query; ptr->text; ptr++ ) {
widget_query_line_draw( menu_left_edge_x, menu_width, ptr, ptr->text );
}
@@ -174,6 +202,7 @@
widget_query_draw( void *data )
{
highlight_line = 0;
+ widget_query.confirm = 0;
return internal_query_draw( query_confirm, 0, (const char *) data );
}
@@ -181,6 +210,7 @@
widget_query_save_draw( void *data )
{
highlight_line = 0;
+ widget_query.save = UI_CONFIRM_SAVE_CANCEL;
return internal_query_draw( query_save, 1, (const char *) data );
}
@@ -191,7 +221,8 @@
int new_highlight_line = 0;
int cursor_pressed = 0;
widget_query_entry *ptr;
- int menu_width = widget_calculate_query_width( title, query );
+ int menu_width = widget_calculate_query_width( title, query, message_lines,
+ num_message_lines );
int menu_left_edge_x = DISPLAY_WIDTH_COLS/2-menu_width/2;
switch( key ) {
@@ -282,3 +313,15 @@
sizeof(query_save)/sizeof(widget_query_entry),
key );
}
+
+int
+widget_query_finish( widget_finish_state finished )
+{
+ int i;
+ for( i=0; i<num_message_lines; i++ ) {
+ free( message_lines[i] );
+ }
+ free( message_lines );
+
+ return 0;
+}
Modified: trunk/fuse/ui/widget/widget.c
===================================================================
--- trunk/fuse/ui/widget/widget.c 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/ui/widget/widget.c 2013-05-25 05:09:56 UTC (rev 757)
@@ -1,7 +1,7 @@
/* widget.c: Simple dialog boxes for all user interfaces.
Copyright (c) 2001-2005 Matan Ziv-Av, Philip Kendall, Russell Marks
- $Id: widget.c 4697 2012-05-07 02:28:52Z fredm $
+ $Id: widget.c 4968 2013-05-19 16:11:17Z zubzero $
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
@@ -692,8 +692,8 @@
{ widget_roms_draw, widget_roms_finish, widget_roms_keyhandler },
{ widget_peripherals_general_draw, widget_options_finish, widget_peripherals_general_keyhandler },
{ widget_peripherals_disk_draw, widget_options_finish, widget_peripherals_disk_keyhandler },
- { widget_query_draw, NULL, widget_query_keyhandler },
- { widget_query_save_draw,NULL, widget_query_save_keyhandler },
+ { widget_query_draw, widget_query_finish, widget_query_keyhandler },
+ { widget_query_save_draw,widget_query_finish, widget_query_save_keyhandler },
{ widget_diskoptions_draw, widget_options_finish, widget_diskoptions_keyhandler },
};
Modified: trunk/fuse/ui/widget/widget_internals.h
===================================================================
--- trunk/fuse/ui/widget/widget_internals.h 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/ui/widget/widget_internals.h 2013-05-25 05:09:56 UTC (rev 757)
@@ -1,7 +1,7 @@
/* widget_internals.h: Functions internal to the widget code
Copyright (c) 2001-2005 Matan Ziv-Av, Philip Kendall
- $Id: widget_internals.h 4543 2011-09-19 01:46:48Z fredm $
+ $Id: widget_internals.h 4968 2013-05-19 16:11:17Z zubzero $
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
@@ -259,6 +259,7 @@
void widget_query_keyhandler( input_key key );
int widget_query_save_draw( void *data );
void widget_query_save_keyhandler( input_key key );
+int widget_query_finish( widget_finish_state finished );
/* The widgets actually available */
Modified: trunk/fuse/ui/wii/Makefile.am
===================================================================
--- trunk/fuse/ui/wii/Makefile.am 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/ui/wii/Makefile.am 2013-05-25 05:09:56 UTC (rev 757)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2001-2009 Philip Kendall, Bjoern Giesler
-## $Id: Makefile.am 4743 2012-10-10 13:20:50Z fredm $
+## $Id: Makefile.am 4980 2013-05-21 12:37:51Z 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
@@ -43,6 +43,7 @@
noinst_HEADERS = wiidisplay.h \
wiikeyboard.h \
- wiikeysyms.h
+ wiikeysyms.h \
+ wiimouse.h
CLEANFILES = keysyms.c
Modified: trunk/fuse/ui/win32/win32ui.c
===================================================================
--- trunk/fuse/ui/win32/win32ui.c 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/ui/win32/win32ui.c 2013-05-25 05:09:56 UTC (rev 757)
@@ -1,7 +1,7 @@
/* win32ui.c: Win32 routines for dealing with the user interface
Copyright (c) 2003-2007 Marek Januszewski, Philip Kendall, Stuart Brady
- $Id: win32ui.c 4849 2013-01-03 23:27:39Z sbaldovi $
+ $Id: win32ui.c 4968 2013-05-19 16:11:17Z zubzero $
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
@@ -564,8 +564,12 @@
menu_machine_reset( int action )
{
int hard_reset = action;
+ const char *message = "Reset?";
+
+ if( hard_reset )
+ message = "Hard reset?";
- if( win32ui_confirm( "Reset?" ) && machine_reset( hard_reset ) ) {
+ if( win32ui_confirm( message ) && machine_reset( hard_reset ) ) {
ui_error( UI_ERROR_ERROR, "couldn't reset machine: giving up!" );
/* FIXME: abort() seems a bit extreme here, but it'll do for now */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
