notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into sdl2.0

Browse source
This commit is contained in:
Pere Pujal i Carabantes 2022-03-16 23:42:49 +01:00
commit 41015efc73
19 changed files with 249 additions and 198 deletions
Download patch file Download diff file Expand all files Collapse all files

10
docs/AUTHORS.txt
View file

@ -19,7 +19,7 @@ June 17, 2002 - December 1, 2021
by Damian Yerrick - http://www.wikipedia.org/wiki/Damian_Yerrick by Damian Yerrick - http://www.wikipedia.org/wiki/Damian_Yerrick
800x600 resolution support patch by: 800x600 resolution support patch by:
TOYAMA Shin-ichi <shin1@wmail.plala.or.jp> TOYAMA Shin-ichi <dolphin6k@wmail.plala.or.jp>
Arbitrary resolution support, smudge magic tool, grass magic tool, Arbitrary resolution support, smudge magic tool, grass magic tool,
brick magic tools, improved stamp tinter, and other fixes by: brick magic tools, improved stamp tinter, and other fixes by:
@ -734,11 +734,11 @@ June 17, 2002 - December 1, 2021
Flavio Pastor <flavio.pastore@zonaitalia.it> Flavio Pastor <flavio.pastore@zonaitalia.it>
* Japanese * Japanese
TOYAMA Shin-ichi <shin1@wmail.plala.or.jp> TOYAMA Shin-ichi <dolphin6k@wmail.plala.or.jp>
* Japanese Input Method * Japanese Input Method
Mark K. Kim <mkkim214@gmail.com> Mark K. Kim <mkkim214@gmail.com>
TOYAMA Shin-ichi <shin1@wmail.plala.or.jp> TOYAMA Shin-ichi <dolphin6k@wmail.plala.or.jp>
* Kabyle translation * Kabyle translation
Yacine Bouklif <yacine_tizi2003@yahoo.fr> Yacine Bouklif <yacine_tizi2003@yahoo.fr>
@ -1077,7 +1077,7 @@ June 17, 2002 - December 1, 2021
* Ports and Packaging * Ports and Packaging
* Windows 32-bit coding and builds * Windows 32-bit coding and builds
TOYAMA Shin-ichi <shin1@wmail.plala.or.jp> TOYAMA Shin-ichi <dolphin6k@wmail.plala.or.jp>
John Popplewell <john@johnnypops.demon.co.uk> John Popplewell <john@johnnypops.demon.co.uk>
* Tweaks to help Windows cross-compiling under Linux * Tweaks to help Windows cross-compiling under Linux
@ -1104,7 +1104,7 @@ June 17, 2002 - December 1, 2021
Ben Armstrong <synrg@sanctuary.nslug.ns.ca> Ben Armstrong <synrg@sanctuary.nslug.ns.ca>
* RedHat Linux / Fedora Core packages and RPM spec file * RedHat Linux / Fedora Core packages and RPM spec file
TOYAMA Shin-ichi <shin1@wmail.plala.or.jp> TOYAMA Shin-ichi <dolphin6k@wmail.plala.or.jp>
Richard June <rjune@bravegnuworld.com> [backup] Richard June <rjune@bravegnuworld.com> [backup]
* Slackware Linux packages * Slackware Linux packages

80
docs/CHANGES.txt
View file

@ -7,7 +7,7 @@ Various contributors (see below, and AUTHORS.txt)
http://www.tuxpaint.org/ http://www.tuxpaint.org/
2022.March.2 (0.9.28) 2022.March.16 (0.9.28)
* Improvements to "Paint" and "Lines" tools: * Improvements to "Paint" and "Lines" tools:
------------------------------------------ ------------------------------------------
* Brush spacing may now be altered within Tux Paint. * Brush spacing may now be altered within Tux Paint.
@ -133,7 +133,7 @@ http://www.tuxpaint.org/
Sveinn í Felli <sv1@fellsnet.is> Sveinn í Felli <sv1@fellsnet.is>
* Japanese translation * Japanese translation
TOYAMA Shin-ichi <shin1@wmail.plala.or.jp> TOYAMA Shin-ichi <dolphin6k@wmail.plala.or.jp>
* Santali translation (Ol-Chiki) * Santali translation (Ol-Chiki)
Prasanta Hembram <prasantahembram720@gmail.com> Prasanta Hembram <prasantahembram720@gmail.com>
@ -162,7 +162,7 @@ http://www.tuxpaint.org/
---------- ----------
* Fixed abnormal exit of threaded font scan which prevented enabling * Fixed abnormal exit of threaded font scan which prevented enabling
text/label tools on some environment such as Rocky Linux 8. text/label tools on some environment such as Rocky Linux 8.
TOYAMA Shin-ichi <shin1@wmail.plala.or.jp> TOYAMA Shin-ichi <dolphin6k@wmail.plala.or.jp>
* Ports & Building: * Ports & Building:
----------------- -----------------
@ -175,7 +175,7 @@ http://www.tuxpaint.org/
* Pass the full path of locale directory to bindtextdomain(). * Pass the full path of locale directory to bindtextdomain().
Workaround to the issue that gettext() can not find translation Workaround to the issue that gettext() can not find translation
files after the update of MinGW/MSYS2 in January 2022. files after the update of MinGW/MSYS2 in January 2022.
TOYAMA Shin-ichi <shin1@wmail.plala.or.jp> TOYAMA Shin-ichi <dolphin6k@wmail.plala.or.jp>
* Initializing layout of onscreen keyboard (osk) to avoid undefined * Initializing layout of onscreen keyboard (osk) to avoid undefined
behavior when changing keyboards. behavior when changing keyboards.
@ -198,12 +198,12 @@ http://www.tuxpaint.org/
* Windows installer will no nlonger show a dialogue to inform * Windows installer will no nlonger show a dialogue to inform
user of uninstallation when "/VERYSILENT" switch is specified user of uninstallation when "/VERYSILENT" switch is specified
(useful for automated installation/uninsta$llation processes). (useful for automated installation/uninsta$llation processes).
TOYAMA Shin-ichi <shin1@wmail.plala.or.jp> TOYAMA Shin-ichi <dolphin6k@wmail.plala.or.jp>
* Standard output and standard error are now redirected to the * Standard output and standard error are now redirected to the
files in User's save directory for example: files in User's save directory for example:
"C:\Users\<username>\AppData\Roaming\TuxPaint" "C:\Users\<username>\AppData\Roaming\TuxPaint"
TOYAMA Shin-ichi <shin1@wmail.plala.or.jp> TOYAMA Shin-ichi <dolphin6k@wmail.plala.or.jp>
* macOS * macOS
Mark Kim <markuskimius@gmail.com> Mark Kim <markuskimius@gmail.com>
@ -379,7 +379,7 @@ http://www.tuxpaint.org/
--------------------- ---------------------
* Allowing Left [Alt] key for switching to Japanese input method * Allowing Left [Alt] key for switching to Japanese input method
(for keyboards that lack a Right [Alt] key). (for keyboards that lack a Right [Alt] key).
TOYAMA Shin-ichi <shin1@wmail.plala.or.jp> TOYAMA Shin-ichi <dolphin6k@wmail.plala.or.jp>
* Catalan translation * Catalan translation
Pere Pujal i Carabantes <perepujal@gmail.com> Pere Pujal i Carabantes <perepujal@gmail.com>
@ -391,7 +391,7 @@ http://www.tuxpaint.org/
Sveinn í Felli <sv1@fellsnet.is> Sveinn í Felli <sv1@fellsnet.is>
* Japanese translation * Japanese translation
TOYAMA Shin-ichi <shin1@wmail.plala.or.jp> TOYAMA Shin-ichi <dolphin6k@wmail.plala.or.jp>
* Portuguese (Portugal) translation * Portuguese (Portugal) translation
Hugo Carvalho <hugokarvalho@hotmail.com> Hugo Carvalho <hugokarvalho@hotmail.com>
@ -420,7 +420,7 @@ http://www.tuxpaint.org/
not supply a needed function.) not supply a needed function.)
* h/t @Miyagi_Andel on Twitter for reporting the crash * h/t @Miyagi_Andel on Twitter for reporting the crash
* h/t Pere Pujal i Carabantes for confirming how to reproduce it * h/t Pere Pujal i Carabantes for confirming how to reproduce it
* TOYAMA Shin-ichi <shin1@wmail.plala.or.jp> dropped the old * TOYAMA Shin-ichi <dolphin6k@wmail.plala.or.jp> dropped the old
code and rebuilt Tux Paint 0.9.26 for Win32 as 0.9.26-5 code and rebuilt Tux Paint 0.9.26 for Win32 as 0.9.26-5
* Note: This means dropping support for Windows 2000 & XP * Note: This means dropping support for Windows 2000 & XP
* (Also, remove Windows-only call to `_nl_locale_name()`, * (Also, remove Windows-only call to `_nl_locale_name()`,
@ -465,10 +465,10 @@ http://www.tuxpaint.org/
translation is supported both for the web site and installer. translation is supported both for the web site and installer.
+ Disabled start menu shortcut to outdated translations of README.html. + Disabled start menu shortcut to outdated translations of README.html.
+ Remove old OpenCandy stuff from Windows .iss file. + Remove old OpenCandy stuff from Windows .iss file.
TOYAMA Shin-ichi <shin1@wmail.plala.or.jp> TOYAMA Shin-ichi <dolphin6k@wmail.plala.or.jp>
* Added shell script to build windows installer and portable zip archive. * Added shell script to build windows installer and portable zip archive.
TOYAMA Shin-ichi <shin1@wmail.plala.or.jp> TOYAMA Shin-ichi <dolphin6k@wmail.plala.or.jp>
* Further work to remove compiler warnings. * Further work to remove compiler warnings.
@ -525,7 +525,7 @@ http://www.tuxpaint.org/
Miguel Anxo Bouzada <mbouzada@gmail.com> Miguel Anxo Bouzada <mbouzada@gmail.com>
+ Japanese + Japanese
TOYAMA Shin-ichi <shin1@wmail.plala.or.jp> TOYAMA Shin-ichi <dolphin6k@wmail.plala.or.jp>
* Adding documentation that covers some of the * Adding documentation that covers some of the
environment variables that Tux Paint utilizes. environment variables that Tux Paint utilizes.
@ -652,7 +652,7 @@ http://www.tuxpaint.org/
* Support for Mingw64 for 64-bit builds * Support for Mingw64 for 64-bit builds
* Ability to find Mingw DLLs by examining EXEs * Ability to find Mingw DLLs by examining EXEs
(new shell script replaces hard-coded list in Makefile) (new shell script replaces hard-coded list in Makefile)
TOYAMA Shin-ichi <shin1@wmail.plala.or.jp> TOYAMA Shin-ichi <dolphin6k@wmail.plala.or.jp>
* New Brushes * New Brushes
----------- -----------
@ -725,7 +725,7 @@ http://www.tuxpaint.org/
Sveinn í Felli <sv1@fellsnet.is> Sveinn í Felli <sv1@fellsnet.is>
* Japanese translation & Japanese README documentation * Japanese translation & Japanese README documentation
TOYAMA Shin-ichi <shin1@wmail.plala.or.jp> TOYAMA Shin-ichi <dolphin6k@wmail.plala.or.jp>
* Norwegian Bokmål translation * Norwegian Bokmål translation
Karl Ove Hufthammer <karl@huftis.org> Karl Ove Hufthammer <karl@huftis.org>
@ -769,10 +769,10 @@ http://www.tuxpaint.org/
STDERR, rather than STDOUT. STDERR, rather than STDOUT.
* Updates to build for Windows (using mingw/msys) * Updates to build for Windows (using mingw/msys)
TOYAMA Shin-ichi <shin1@wmail.plala.or.jp> TOYAMA Shin-ichi <dolphin6k@wmail.plala.or.jp>
* Updates to 'spec' file for Linux RPM builds * Updates to 'spec' file for Linux RPM builds
TOYAMA Shin-ichi <shin1@wmail.plala.or.jp> TOYAMA Shin-ichi <dolphin6k@wmail.plala.or.jp>
* Other Improvements * Other Improvements
------------------ ------------------
@ -988,7 +988,7 @@ http://www.tuxpaint.org/
Flavio Pastore <ironbishop@fsfe.org> Flavio Pastore <ironbishop@fsfe.org>
* Japanese translation * Japanese translation
TOYAMA Shin-ichi <shin1@wmail.plala.or.jp> TOYAMA Shin-ichi <dolphin6k@wmail.plala.or.jp>
* Korean translation * Korean translation
Mark K. Kim <mkkim214@gmail.com> Mark K. Kim <mkkim214@gmail.com>
@ -2086,7 +2086,7 @@ http://www.tuxpaint.org/
+ Plugin .so files were missing. + Plugin .so files were missing.
+ Separated devel packages in RPM spec. + Separated devel packages in RPM spec.
+ Added dependency on SDL_Pango. + Added dependency on SDL_Pango.
TOYAMA Shin-ichi <shin1@wmail.plala.or.jp> TOYAMA Shin-ichi <dolphin6k@wmail.plala.or.jp>
* Placing Tux Paint launcher icon ("tuxpaint.desktop") in * Placing Tux Paint launcher icon ("tuxpaint.desktop") in
'applications', rather than 'gnome/apps/Graphics', per Freedesktop.org 'applications', rather than 'gnome/apps/Graphics', per Freedesktop.org
@ -2174,7 +2174,7 @@ http://www.tuxpaint.org/
* Fixed issues where some strings not appearing under 'nopango' * Fixed issues where some strings not appearing under 'nopango'
(at least on older Fedora CORE and RedHat). (at least on older Fedora CORE and RedHat).
TOYAMA Shin-ichi <shin1@wmail.plala.or.jp> TOYAMA Shin-ichi <dolphin6k@wmail.plala.or.jp>
* New Starters: * New Starters:
------------- -------------
@ -2542,7 +2542,7 @@ http://www.tuxpaint.org/
Flavio "Iron Bishop" Pastore <ironbishop@fsfe.org> Flavio "Iron Bishop" Pastore <ironbishop@fsfe.org>
* Japanese translation * Japanese translation
TOYAMA Shin-ichi <shin1@wmail.plala.or.jp> TOYAMA Shin-ichi <dolphin6k@wmail.plala.or.jp>
* Mexican Spanish translation * Mexican Spanish translation
Ignacio Tike <itike0100@gmail.com> Ignacio Tike <itike0100@gmail.com>
@ -2885,7 +2885,7 @@ http://www.tuxpaint.org/
Kevin Patrick Scannell <kscanne@gmail.com> Kevin Patrick Scannell <kscanne@gmail.com>
* Japanese * Japanese
TOYAMA Shin-ichi <shin1@wmail.plala.or.jp> TOYAMA Shin-ichi <dolphin6k@wmail.plala.or.jp>
* Lithuanian * Lithuanian
Gintaras Gostautas <gintaras@nes.lt> Gintaras Gostautas <gintaras@nes.lt>
@ -3101,7 +3101,7 @@ http://www.tuxpaint.org/
Flavio "Iron Bishop" Pastore <ironbishop@fsfe.org> Flavio "Iron Bishop" Pastore <ironbishop@fsfe.org>
* Japanese * Japanese
TOYAMA Shin-ichi <shin1@wmail.plala.or.jp> TOYAMA Shin-ichi <dolphin6k@wmail.plala.or.jp>
* Japanese font shipped in Tux Paint now includes common educational Kanji * Japanese font shipped in Tux Paint now includes common educational Kanji
@ -3138,7 +3138,7 @@ http://www.tuxpaint.org/
* Including a scaled down version of the Japanese TrueType font (ja.ttf), * Including a scaled down version of the Japanese TrueType font (ja.ttf),
that includes only the characters uses by Tux Paint. that includes only the characters uses by Tux Paint.
For info, see: fonts/locale/ja_docs/ For info, see: fonts/locale/ja_docs/
TOYAMA Shin-ichi <shin1@wmail.plala.or.jp> TOYAMA Shin-ichi <dolphin6k@wmail.plala.or.jp>
* Documentation Improvements: * Documentation Improvements:
--------------------------- ---------------------------
@ -3153,7 +3153,7 @@ http://www.tuxpaint.org/
* Ran source code through "indent -nbfda -npcs -npsl -bli0". * Ran source code through "indent -nbfda -npcs -npsl -bli0".
* "DESTDIR" patch is no longer needed. * "DESTDIR" patch is no longer needed.
TOYAMA Shin-ichi <shin1@wmail.plala.or.jp> TOYAMA Shin-ichi <dolphin6k@wmail.plala.or.jp>
* Split parts of "tuxpaint.c" into separate source files: * Split parts of "tuxpaint.c" into separate source files:
+ "compiler.h": Compiler-version-specific definitions. + "compiler.h": Compiler-version-specific definitions.
@ -3346,7 +3346,7 @@ http://www.tuxpaint.org/
---------------------------- ----------------------------
* Added larger screen size support: * Added larger screen size support:
1024x768, 1280x1024, 1400x1050, 1600x1200 1024x768, 1280x1024, 1400x1050, 1600x1200
TOYAMA Shin-ichi <shin1@wmail.plala.or.jp> TOYAMA Shin-ichi <dolphin6k@wmail.plala.or.jp>
* Arbitrary window sizes allowed (--XXXXxYYYY); useful for more modern * Arbitrary window sizes allowed (--XXXXxYYYY); useful for more modern
displays (e.g., Mac monitors) displays (e.g., Mac monitors)
@ -3510,12 +3510,12 @@ http://www.tuxpaint.org/
John Popplewell <john@johnnypops.demon.co.uk> John Popplewell <john@johnnypops.demon.co.uk>
* There's no longer a need to remove CVS-related things in 'tuxpaint.spec'. * There's no longer a need to remove CVS-related things in 'tuxpaint.spec'.
TOYAMA Shin-ichi <shin1@wmail.plala.or.jp> TOYAMA Shin-ichi <dolphin6k@wmail.plala.or.jp>
* Added "test-option.sh" shell script, which can be used in Makefile * Added "test-option.sh" shell script, which can be used in Makefile
for basic compiler option tests for basic compiler option tests
(e.g., is "-Wdeclaration-after-statement" available?) (e.g., is "-Wdeclaration-after-statement" available?)
TOYAMA Shin-ichi <shin1@wmail.plala.or.jp> TOYAMA Shin-ichi <dolphin6k@wmail.plala.or.jp>
* Created 'release' Makefile target, which generates a .tar.gz * Created 'release' Makefile target, which generates a .tar.gz
(sans CVS-related files) based on the clean source directory. (sans CVS-related files) based on the clean source directory.
@ -3579,13 +3579,13 @@ http://www.tuxpaint.org/
* Added "PKG_ROOT" variable to Makefile, and "tuxpaint.spec" file, * Added "PKG_ROOT" variable to Makefile, and "tuxpaint.spec" file,
for Tux Paint RPM building ease. for Tux Paint RPM building ease.
TOYAMA Shin-ichi <shin1@wmail.plala.or.jp> TOYAMA Shin-ichi <dolphin6k@wmail.plala.or.jp>
* Fixed to compile on old GLIBC system (such as RedHat-6.2) * Fixed to compile on old GLIBC system (such as RedHat-6.2)
TOYAMA Shin-ichi <shin1@wmail.plala.or.jp> TOYAMA Shin-ichi <dolphin6k@wmail.plala.or.jp>
* Fixes to RPM spec file * Fixes to RPM spec file
TOYAMA Shin-ichi <shin1@wmail.plala.or.jp> TOYAMA Shin-ichi <dolphin6k@wmail.plala.or.jp>
* Enabled more compiler warnings, and updated code to prevent them. * Enabled more compiler warnings, and updated code to prevent them.
Albert Cahalan <albert@users.sf.net> Albert Cahalan <albert@users.sf.net>
@ -3692,7 +3692,7 @@ http://www.tuxpaint.org/
Tedi Heriyanto <tedi_h@gmx.net> Tedi Heriyanto <tedi_h@gmx.net>
* Japanese * Japanese
TOYAMA Shin-ichi <shin1@wmail.plala.or.jp> TOYAMA Shin-ichi <dolphin6k@wmail.plala.or.jp>
* Korean * Korean
Mark K. Kim <mkkim214@gmail.com> Mark K. Kim <mkkim214@gmail.com>
@ -3887,7 +3887,7 @@ http://www.tuxpaint.org/
Flavio Pastor <flavio.pastore@zonaitalia.it> Flavio Pastor <flavio.pastore@zonaitalia.it>
* Updated Japanese translation. * Updated Japanese translation.
TOYAMA Shin-ichi <shin1@wmail.plala.or.jp> TOYAMA Shin-ichi <dolphin6k@wmail.plala.or.jp>
* Updated Korean translation. * Updated Korean translation.
Mark K. Kim <mkkim214@gmail.com> Mark K. Kim <mkkim214@gmail.com>
@ -4167,7 +4167,7 @@ http://www.tuxpaint.org/
and you went to the 'Open' dialog. and you went to the 'Open' dialog.
* Fixed prompt bug for larger window sizes * Fixed prompt bug for larger window sizes
TOYAMA Shin-ichi <shin1@wmail.plala.or.jp> TOYAMA Shin-ichi <dolphin6k@wmail.plala.or.jp>
2003.Jun.17 (0.9.11) 2003.Jun.17 (0.9.11)
@ -4195,7 +4195,7 @@ http://www.tuxpaint.org/
Mantas Kriauciunas <monte@mail.lt> Mantas Kriauciunas <monte@mail.lt>
* Set $OUTPUT_CHARSET for Japanese locale, to fix Win32 issue. * Set $OUTPUT_CHARSET for Japanese locale, to fix Win32 issue.
TOYAMA Shin-ichi <shin1@wmail.plala.or.jp> TOYAMA Shin-ichi <dolphin6k@wmail.plala.or.jp>
* Lithuanian translation. * Lithuanian translation.
Mantas Kriauciunas <monte@mail.lt>, Mantas Kriauciunas <monte@mail.lt>,
@ -4293,7 +4293,7 @@ http://www.tuxpaint.org/
Karl Ove Hufthammer <karl@huftis.org> Karl Ove Hufthammer <karl@huftis.org>
* Added Japanese translation to Tux Paint icon (tuxpaint.desktop) * Added Japanese translation to Tux Paint icon (tuxpaint.desktop)
TOYAMA Shin-ichi <shin1@wmail.plala.or.jp> TOYAMA Shin-ichi <dolphin6k@wmail.plala.or.jp>
* Moved Makefile.beos into src/, to keep root directory less cluttered. * Moved Makefile.beos into src/, to keep root directory less cluttered.
@ -4314,7 +4314,7 @@ http://www.tuxpaint.org/
* Removed some debugging output that shouldn't have been kept in. * Removed some debugging output that shouldn't have been kept in.
* Locale-detection code made more robust. (Check LC_MESSAGES, not LC_ALL) * Locale-detection code made more robust. (Check LC_MESSAGES, not LC_ALL)
TOYAMA Shin-ichi <shin1@wmail.plala.or.jp> TOYAMA Shin-ichi <dolphin6k@wmail.plala.or.jp>
* Added support for some useful HTML escape sequences in stamp descriptions * Added support for some useful HTML escape sequences in stamp descriptions
(e.g., "&acute;" for "<22>" ("a" with "'" over it)) (e.g., "&acute;" for "<22>" ("a" with "'" over it))
@ -4350,7 +4350,7 @@ http://www.tuxpaint.org/
selector on the right. selector on the right.
* Fixed Japanese locale detection. * Fixed Japanese locale detection.
TOYAMA Shin-ichi <shin1@wmail.plala.or.jp> TOYAMA Shin-ichi <dolphin6k@wmail.plala.or.jp>
* Stamp description translations can be encoded using UTF-8. * Stamp description translations can be encoded using UTF-8.
Append ".utf8" to the locale code (e.g., "fr.utf8=...") Append ".utf8" to the locale code (e.g., "fr.utf8=...")
@ -4362,7 +4362,7 @@ http://www.tuxpaint.org/
2003.January.26 (0.9.7) 2003.January.26 (0.9.7)
* Translated to Japanese! * Translated to Japanese!
TOYAMA Shin-ichi <shin1@wmail.plala.or.jp> TOYAMA Shin-ichi <dolphin6k@wmail.plala.or.jp>
* Fixed translation bugs with some save-related prompts. * Fixed translation bugs with some save-related prompts.
@ -4386,10 +4386,10 @@ http://www.tuxpaint.org/
if it doesn't exist if it doesn't exist
* Initial support for arbitrary window sizes. (#define SVGA for 800x600) * Initial support for arbitrary window sizes. (#define SVGA for 800x600)
TOYAMA Shin-ichi <shin1@wmail.plala.or.jp> TOYAMA Shin-ichi <dolphin6k@wmail.plala.or.jp>
* Added a few new colors, renamed some old ones. * Added a few new colors, renamed some old ones.
TOYAMA Shin-ichi <shin1@wmail.plala.or.jp> TOYAMA Shin-ichi <dolphin6k@wmail.plala.or.jp>
* Fixed text tool bug when hitting [Enter]/[Return] past bottom of canvas * Fixed text tool bug when hitting [Enter]/[Return] past bottom of canvas

4
docs/en/INSTALL.txt
View file

@ -149,8 +149,8 @@ Compiling and Installation
Windows Users Windows Users
November 3, 2021 Shin-ichi TOYAMA shin1@wmail.plala.or.jp November 3, 2021 Shin-ichi TOYAMA dolphin6k@wmail.plala.or.jp
<shin1@wmail.plala.or.jp> <dolphin6k@wmail.plala.or.jp>
Compiling Set-Up Compiling Set-Up

2
docs/en/html/INSTALL.html
View file

@ -242,7 +242,7 @@
</h3> </h3>
<p style="font-size: small;"> <p style="font-size: small;">
<em> <em>
November 3, 2021 Shin-ichi TOYAMA shin1@wmail.plala.or.jp &lt;<a href="mailto:shin1@wmail.plala.or.jp">shin1@wmail.plala.or.jp</a>&gt; November 3, 2021 Shin-ichi TOYAMA dolphin6k@wmail.plala.or.jp &lt;<a href="mailto:dolphin6k@wmail.plala.or.jp">dolphin6k@wmail.plala.or.jp</a>&gt;
</em> </em>
</p> </p>
<blockquote> <blockquote>

4
docs/es_ES.UTF-8/INSTALL.txt
View file

@ -149,8 +149,8 @@ Compiling and Installation
Windows Users Windows Users
noviembre 3, 2021 Shin-ichi TOYAMA shin1@wmail.plala.or.jp noviembre 3, 2021 Shin-ichi TOYAMA dolphin6k@wmail.plala.or.jp
<shin1@wmail.plala.or.jp> <dolphin6k@wmail.plala.or.jp>
Compiling Set-Up Compiling Set-Up

2
docs/es_ES.UTF-8/html/INSTALL.html
View file

@ -242,7 +242,7 @@
</h3> </h3>
<p style="font-size: small;"> <p style="font-size: small;">
<em> <em>
noviembre 3, 2021 Shin-ichi TOYAMA shin1@wmail.plala.or.jp &lt;<a href="mailto:shin1@wmail.plala.or.jp">shin1@wmail.plala.or.jp</a>&gt; noviembre 3, 2021 Shin-ichi TOYAMA dolphin6k@wmail.plala.or.jp &lt;<a href="mailto:dolphin6k@wmail.plala.or.jp">dolphin6k@wmail.plala.or.jp</a>&gt;
</em> </em>
</p> </p>
<blockquote> <blockquote>

4
docs/fr_FR.UTF-8/INSTALL.txt
View file

@ -152,8 +152,8 @@ Compilation et installation
Utilisateurs de Windows Utilisateurs de Windows
novembre 3, 2021 Shin-ichi TOYAMA shin1@wmail.plala.or.jp novembre 3, 2021 Shin-ichi TOYAMA dolphin6k@wmail.plala.or.jp
<shin1@wmail.plala.or.jp> <dolphin6k@wmail.plala.or.jp>
Réglages pour compilation Réglages pour compilation

2
docs/fr_FR.UTF-8/html/INSTALL.html
View file

@ -242,7 +242,7 @@
</h3> </h3>
<p style="font-size: small;"> <p style="font-size: small;">
<em> <em>
novembre 3, 2021 Shin-ichi TOYAMA shin1@wmail.plala.or.jp &lt;<a href="mailto:shin1@wmail.plala.or.jp">shin1@wmail.plala.or.jp</a>&gt; novembre 3, 2021 Shin-ichi TOYAMA dolphin6k@wmail.plala.or.jp &lt;<a href="mailto:dolphin6k@wmail.plala.or.jp">dolphin6k@wmail.plala.or.jp</a>&gt;
</em> </em>
</p> </p>
<blockquote> <blockquote>

4
docs/gl_ES.UTF-8/INSTALL.txt
View file

@ -153,8 +153,8 @@ Compiling and Installation
Usuarios de Windows Usuarios de Windows
3 de Novembro de 2021 Shin-ichi TOYAMA shin1@wmail.plala.or.jp 3 de Novembro de 2021 Shin-ichi TOYAMA dolphin6k@wmail.plala.or.jp
<shin1@wmail.plala.or.jp> <dolphin6k@wmail.plala.or.jp>
Compiling Set-Up Compiling Set-Up

2
docs/gl_ES.UTF-8/html/INSTALL.html
View file

@ -242,7 +242,7 @@
</h3> </h3>
<p style="font-size: small;"> <p style="font-size: small;">
<em> <em>
3 de Novembro de 2021 Shin-ichi TOYAMA shin1@wmail.plala.or.jp &lt;<a href="mailto:shin1@wmail.plala.or.jp">shin1@wmail.plala.or.jp</a>&gt; 3 de Novembro de 2021 Shin-ichi TOYAMA dolphin6k@wmail.plala.or.jp &lt;<a href="mailto:dolphin6k@wmail.plala.or.jp">dolphin6k@wmail.plala.or.jp</a>&gt;
</em> </em>
</p> </p>
<blockquote> <blockquote>

4
docs/ja_JP.UTF-8/INSTALL.txt
View file

@ -149,8 +149,8 @@ Compiling and Installation
Windows のユーザー Windows のユーザー
2021年11月 3日 Shin-ichi TOYAMA shin1@wmail.plala.or.jp 2021年11月 3日 Shin-ichi TOYAMA dolphin6k@wmail.plala.or.jp
<shin1@wmail.plala.or.jp> <dolphin6k@wmail.plala.or.jp>
Compiling Set-Up Compiling Set-Up

2
docs/ja_JP.UTF-8/html/INSTALL.html
View file

@ -242,7 +242,7 @@
</h3> </h3>
<p style="font-size: small;"> <p style="font-size: small;">
<em> <em>
2021年11月 3日 Shin-ichi TOYAMA shin1@wmail.plala.or.jp &lt;<a href="mailto:shin1@wmail.plala.or.jp">shin1@wmail.plala.or.jp</a>&gt; 2021年11月 3日 Shin-ichi TOYAMA dolphin6k@wmail.plala.or.jp &lt;<a href="mailto:dolphin6k@wmail.plala.or.jp">dolphin6k@wmail.plala.or.jp</a>&gt;
</em> </em>
</p> </p>
<blockquote> <blockquote>

4
docs/outdated/it/AUTHORS.txt
View file

@ -228,7 +228,7 @@ http://www.newbreedsoftware.com/tuxpaint/
Flavio Pastore <ironbishop@fsfe.org> Flavio Pastore <ironbishop@fsfe.org>
* Japanese * Japanese
TOYAMA Shin-ichi <shin1@wmail.plala.or.jp> TOYAMA Shin-ichi <dolphin6k@wmail.plala.or.jp>
* Kinyarwanda * Kinyarwanda
Steve Murphy <murf@e-tools.com> Steve Murphy <murf@e-tools.com>
@ -356,7 +356,7 @@ http://www.newbreedsoftware.com/tuxpaint/
Ben Armstrong <synrg@sanctuary.nslug.ns.ca> Ben Armstrong <synrg@sanctuary.nslug.ns.ca>
* RedHat Linux / Fedora Core packages and RPM spec file * RedHat Linux / Fedora Core packages and RPM spec file
TOYAMA Shin-ichi <shin1@wmail.plala.or.jp> TOYAMA Shin-ichi <dolphin6k@wmail.plala.or.jp>
Richard June <rjune[AT]lumensoftware.com> Richard June <rjune[AT]lumensoftware.com>
* NetBSD packages * NetBSD packages

6
docs/outdated/pl/AUTHORS.txt
View file

@ -22,7 +22,7 @@ http://www.newbreedsoftware.com/tuxpaint/
by Damian Yerrick - http://www.wikipedia.org/wiki/Damian_Yerrick by Damian Yerrick - http://www.wikipedia.org/wiki/Damian_Yerrick
£ata do obs³ugi rozdzielczoœci 800x600 £ata do obs³ugi rozdzielczoœci 800x600
TOYAMA Shin-ichi <shin1@wmail.plala.or.jp> TOYAMA Shin-ichi <dolphin6k@wmail.plala.or.jp>
Obs³uga rozdzielczoœci, smudge magic tool, grass magic tool, Obs³uga rozdzielczoœci, smudge magic tool, grass magic tool,
brick magic tools, improved stamp tinter, and other i inne. brick magic tools, improved stamp tinter, and other i inne.
@ -183,7 +183,7 @@ http://www.newbreedsoftware.com/tuxpaint/
Flavio Pastor <flavio.pastore@zonaitalia.it> Flavio Pastor <flavio.pastore@zonaitalia.it>
* Japanese * Japanese
TOYAMA Shin-ichi <shin1@wmail.plala.or.jp> TOYAMA Shin-ichi <dolphin6k@wmail.plala.or.jp>
* Kinyarwanda * Kinyarwanda
Steve Murphy <murf@e-tools.com> Steve Murphy <murf@e-tools.com>
@ -296,7 +296,7 @@ http://www.newbreedsoftware.com/tuxpaint/
Ben Armstrong <synrg@sanctuary.nslug.ns.ca> Ben Armstrong <synrg@sanctuary.nslug.ns.ca>
* RedHat Linux / Fedora Core packages and RPM spec file * RedHat Linux / Fedora Core packages and RPM spec file
TOYAMA Shin-ichi <shin1@wmail.plala.or.jp> TOYAMA Shin-ichi <dolphin6k@wmail.plala.or.jp>
Richard June <rjune[AT]lumensoftware.com> Richard June <rjune[AT]lumensoftware.com>
* NetBSD packages * NetBSD packages

2
fonts/locale/ja_docs/README.txt
View file

@ -21,5 +21,5 @@ Difference between original are,
bug) are removed. bug) are removed.
b) All Kanji data not used in TuxPaint are removed. b) All Kanji data not used in TuxPaint are removed.
Contributed by TOYAMA Shin-ichi <shin1@wmail.plala.or.jp> Contributed by TOYAMA Shin-ichi <dolphin6k@wmail.plala.or.jp>

6
src/po/ja.po
View file

@ -1,7 +1,7 @@
# Tuxpaint japanese translation. # Tuxpaint japanese translation.
# Copyright (C) 2017 Bill Kendrick # Copyright (C) 2017 Bill Kendrick
# This file is distributed under the same license as the Tuxpaint package. # This file is distributed under the same license as the Tuxpaint package.
# TOYAMA Shin-ichi <shin1@wmail.plala.or.jp>, 2005-2017. # TOYAMA Shin-ichi <dolphin6k@wmail.plala.or.jp>, 2005-2017.
# #
msgid "" msgid ""
msgstr "" msgstr ""
@ -9,8 +9,8 @@ msgstr ""
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-02-10 01:02-0800\n" "POT-Creation-Date: 2022-02-10 01:02-0800\n"
"PO-Revision-Date: 2022-02-04 17:06+0900\n" "PO-Revision-Date: 2022-02-04 17:06+0900\n"
"Last-Translator: Shin-ichi TOYAMA <shin1@wmail.plala.or.jp>\n" "Last-Translator: Shin-ichi TOYAMA <dolphin6k@wmail.plala.or.jp>\n"
"Language-Team: japanese <shin1@wmail.plala.or.jp>\n" "Language-Team: japanese <dolphin6k@wmail.plala.or.jp>\n"
"Language: ja\n" "Language: ja\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"

2
src/test-option.sh
View file

@ -6,7 +6,7 @@
# if successful # if successful
# #
# for Tux Paint # for Tux Paint
# by TOYAMA Shin-ichi <shin1@wmail.plala.or.jp> # by TOYAMA Shin-ichi <dolphin6k@wmail.plala.or.jp>
# #
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by

277
src/tuxpaint.c
View file

@ -22,7 +22,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
June 14, 2002 - March 2, 2022 June 14, 2002 - March 16, 2022
*/ */
#include "platform.h" #include "platform.h"
@ -363,9 +363,9 @@ extern int win32_trash(const char *path);
#undef iswprint #undef iswprint
int iswprint(wchar_t wc) int iswprint(wchar_t wc)
{ {
WORD t; WORD t;
GetStringTypeW(CT_CTYPE1, &wc, 1, &t); GetStringTypeW(CT_CTYPE1, &wc, 1, &t);
return (t & C1_DEFINED) && !(t & C1_CNTRL); return (t & C1_DEFINED) && !(t & C1_CNTRL);
} }
#endif /* WIN32 */ #endif /* WIN32 */
@ -2129,6 +2129,7 @@ static int do_new_dialog_add_colors(SDL_Surface * *thumbs, int num_files, int *d
static int do_color_picker(void); static int do_color_picker(void);
static void draw_color_picker_crosshairs(int color_picker_left, int color_picker_top, int color_picker_val_left, int color_picker_val_top); static void draw_color_picker_crosshairs(int color_picker_left, int color_picker_top, int color_picker_val_left, int color_picker_val_top);
static void draw_color_picker_values(int l, int t); static void draw_color_picker_values(int l, int t);
static void draw_color_picker_palette_and_values(int color_picker_left, int color_picker_top, int color_picker_val_left, int color_picker_val_top);
static void render_color_picker_palette(void); static void render_color_picker_palette(void);
static int do_color_sel(int temp_mode); static int do_color_sel(int temp_mode);
static int do_color_mix(void); static int do_color_mix(void);
@ -4146,7 +4147,7 @@ static void mainloop(void)
/* Shape controls! */ /* Shape controls! */
shape_mode = which; shape_mode = which;
draw_shapes(); draw_shapes();
update_screen_rect(&r_toolopt); update_screen_rect(&r_toolopt);
draw_tux_text(TUX_GREAT, shapemode_tips[shape_mode], 1); draw_tux_text(TUX_GREAT, shapemode_tips[shape_mode], 1);
playsound(screen, 0, SND_CLICK, 0, SNDPOS_RIGHT, SNDDIST_NEAR); playsound(screen, 0, SND_CLICK, 0, SNDPOS_RIGHT, SNDDIST_NEAR);
update_screen_rect(&r_tuxarea); update_screen_rect(&r_tuxarea);
@ -5887,6 +5888,8 @@ static void mainloop(void)
} }
else if (HIT(r_toolopt)) else if (HIT(r_toolopt))
{ {
int control_rows = 0, num_places;
/* mouse cursor code /* mouse cursor code
WARNING: this must be kept in sync with the mouse-click WARNING: this must be kept in sync with the mouse-click
and mouse-click code. (it isn't, currently!) */ and mouse-click code. (it isn't, currently!) */
@ -5901,35 +5904,35 @@ static void mainloop(void)
} }
/* This if/if/if block is awful -bjk 2022.01.19 */ /* This if/if/if block is awful -bjk 2022.01.19 */
int control_rows = 0;
if (cur_tool == TOOL_STAMP && !disable_stamp_controls) if (cur_tool == TOOL_STAMP && !disable_stamp_controls)
control_rows = 3; control_rows = 3;
if (cur_tool == TOOL_LABEL) if (cur_tool == TOOL_LABEL)
{ {
control_rows = 1; control_rows = 1;
if (!disable_stamp_controls) if (!disable_stamp_controls)
control_rows = 3; control_rows = 3;
} }
if (cur_tool == TOOL_TEXT && !disable_stamp_controls) if (cur_tool == TOOL_TEXT && !disable_stamp_controls)
control_rows = 2; control_rows = 2;
if (cur_tool == TOOL_MAGIC) if (cur_tool == TOOL_MAGIC)
{ {
control_rows = 1; control_rows = 1;
if (!disable_magic_controls) if (!disable_magic_controls)
control_rows = 2; control_rows = 2;
} }
if (cur_tool == TOOL_SHAPES && !disable_shape_controls) if (cur_tool == TOOL_SHAPES && !disable_shape_controls)
control_rows = 1; control_rows = 1;
if ((cur_tool == TOOL_BRUSH || cur_tool == TOOL_LINES) && !disable_brushspacing) if ((cur_tool == TOOL_BRUSH || cur_tool == TOOL_LINES) && !disable_brushspacing)
control_rows = 1; control_rows = 1;
int num_places = buttons_tall * gd_toolopt.cols - control_rows * gd_toolopt.cols; num_places = buttons_tall * gd_toolopt.cols - control_rows * gd_toolopt.cols;
if (num_things > num_places) if (num_things > num_places)
{ {
/* Are there scroll buttons? */ /* Are there scroll buttons? */
num_places = num_places - gd_toolopt.cols; /* Two scroll buttons occupy one row */ num_places = num_places - gd_toolopt.cols; /* Two scroll buttons occupy one row */
if (event.button.y < r_ttoolopt.h + img_scroll_up->h) if (event.button.y < r_ttoolopt.h + img_scroll_up->h)
{ {
/* Up button; is it available? */ /* Up button; is it available? */
@ -9807,9 +9810,6 @@ static void draw_fonts(void)
dest.x = WINDOW_WIDTH - r_ttoolopt.w; dest.x = WINDOW_WIDTH - r_ttoolopt.w;
dest.y = r_ttoolopt.h + off_y + (((most - gd_toolopt.cols) / gd_toolopt.cols + TOOLOFFSET / gd_toolopt.cols) * button_h); dest.y = r_ttoolopt.h + off_y + (((most - gd_toolopt.cols) / gd_toolopt.cols + TOOLOFFSET / gd_toolopt.cols) * button_h);
/* if (!disable_stamp_controls)
dest.y = dest.y - (button_h * 2); */
if (font_scroll < num_font_families - (most - gd_toolopt.cols) - TOOLOFFSET) if (font_scroll < num_font_families - (most - gd_toolopt.cols) - TOOLOFFSET)
{ {
SDL_BlitSurface(img_scroll_down, NULL, screen, &dest); SDL_BlitSurface(img_scroll_down, NULL, screen, &dest);
@ -10428,7 +10428,7 @@ static void draw_shapes(void)
SDL_BlitSurface(img_shapes[shape], NULL, screen, &dest); SDL_BlitSurface(img_shapes[shape], NULL, screen, &dest);
dest.x = ((i % 2) * button_w) + (4 * button_w) / ORIGINAL_BUTTON_SIZE + WINDOW_WIDTH - r_ttoolopt.w + ((40 * button_w) / ORIGINAL_BUTTON_SIZE - img_shape_names[shape]->w) / 2; dest.x = ((i % 2) * button_w) + (4 * button_w) / ORIGINAL_BUTTON_SIZE + WINDOW_WIDTH - r_ttoolopt.w + ((40 * button_w) / ORIGINAL_BUTTON_SIZE - img_shape_names[shape]->w) / 2;
dest.y = ((i / 2) * button_h) + r_ttoolopt.h + (4 * button_h) / ORIGINAL_BUTTON_SIZE + ((44 * button_h) / ORIGINAL_BUTTON_SIZE - img_shape_names[shape]->h) + off_y; dest.y = ((i / 2) * button_h) + r_ttoolopt.h + (4 * button_h) / ORIGINAL_BUTTON_SIZE + ((44 * button_h) / ORIGINAL_BUTTON_SIZE - img_shape_names[shape]->h) + off_y;
SDL_BlitSurface(img_shape_names[shape], NULL, screen, &dest); SDL_BlitSurface(img_shape_names[shape], NULL, screen, &dest);
} }
@ -10727,7 +10727,7 @@ static void draw_fills(void)
SDL_BlitSurface(img_fills[i], NULL, screen, &dest); SDL_BlitSurface(img_fills[i], NULL, screen, &dest);
dest.x = ((i % 2) * button_w) + (4 * button_w) / ORIGINAL_BUTTON_SIZE + WINDOW_WIDTH - r_ttoolopt.w + ((40 * button_w) / ORIGINAL_BUTTON_SIZE - img_fill_names[i]->w) / 2; dest.x = ((i % 2) * button_w) + (4 * button_w) / ORIGINAL_BUTTON_SIZE + WINDOW_WIDTH - r_ttoolopt.w + ((40 * button_w) / ORIGINAL_BUTTON_SIZE - img_fill_names[i]->w) / 2;
dest.y = ((i / 2) * button_h) + r_ttoolopt.h + (4 * button_h) / ORIGINAL_BUTTON_SIZE + ((44 * button_h) / ORIGINAL_BUTTON_SIZE - img_fill_names[i]->h) + off_y; dest.y = ((i / 2) * button_h) + r_ttoolopt.h + (4 * button_h) / ORIGINAL_BUTTON_SIZE + ((44 * button_h) / ORIGINAL_BUTTON_SIZE - img_fill_names[i]->h) + off_y;
SDL_BlitSurface(img_fill_names[i], NULL, screen, &dest); SDL_BlitSurface(img_fill_names[i], NULL, screen, &dest);
} }
@ -13665,9 +13665,7 @@ static int do_prompt_image_flash_snd(const char *const text,
SDL_Delay(1); SDL_Delay(1);
if (w == r_ttools.w - 2) if (w == r_ttools.w - 2)
{
SDL_BlitSurface(backup, NULL, screen, NULL); SDL_BlitSurface(backup, NULL, screen, NULL);
}
} }
SDL_FreeSurface(backup); SDL_FreeSurface(backup);
@ -13696,7 +13694,7 @@ static int do_prompt_image_flash_snd(const char *const text,
dest.y = 94 / button_scale + r_ttools.w / button_scale - (w - 4) + i + PROMPTOFFSETY; dest.y = 94 / button_scale + r_ttools.w / button_scale - (w - 4) + i + PROMPTOFFSETY;
dest.w = (PROMPT_W - r_ttools.w * 2) + (w - 4) * 2; dest.w = (PROMPT_W - r_ttools.w * 2) + (w - 4) * 2;
dest.h = (w - 4) * 2; dest.h = (w - 4) * 2;
dest.y = canvas->h / 2 - dest.h / 2 + i + 2; dest.y = canvas->h / 2 - dest.h / 2 + i + 2;
SDL_BlitSurface(alpha_surf, NULL, screen, &dest); SDL_BlitSurface(alpha_surf, NULL, screen, &dest);
} }
@ -13911,14 +13909,14 @@ static int do_prompt_image_flash_snd(const char *const text,
if (event.button.x >= btn_left && event.button.x < btn_left + img_yes->w) if (event.button.x >= btn_left && event.button.x < btn_left + img_yes->w)
{ {
if (event.button.y >= dest_back.y + dest_back.h - 4 - button_h - 4 - button_h && if (event.button.y >= dest_back.y + dest_back.h - 4 - button_h - 4 - button_h &&
event.button.y < dest_back.y + dest_back.h - 4 - button_h - 4 - button_h + img_yes->h) event.button.y < dest_back.y + dest_back.h - 4 - button_h - 4 - button_h + img_yes->h)
{ {
ans = 1; ans = 1;
done = 1; done = 1;
} }
else if (strlen(btn_no) != 0 && else if (strlen(btn_no) != 0 &&
event.button.y >= dest_back.y + dest_back.h - 4 - button_h && event.button.y >= dest_back.y + dest_back.h - 4 - button_h &&
event.button.y < dest_back.y + dest_back.h - 4 - button_h + img_no->h) event.button.y < dest_back.y + dest_back.h - 4 - button_h + img_no->h)
{ {
ans = 0; ans = 0;
done = 1; done = 1;
@ -13933,7 +13931,7 @@ static int do_prompt_image_flash_snd(const char *const text,
event.button.y < dest_back.y + dest_back.h - 4 - button_h - 4 - button_h + img_yes->h) || event.button.y < dest_back.y + dest_back.h - 4 - button_h - 4 - button_h + img_yes->h) ||
(strlen(btn_no) != 0 && (strlen(btn_no) != 0 &&
event.button.y >= dest_back.y + dest_back.h - 4 - button_h && event.button.y >= dest_back.y + dest_back.h - 4 - button_h &&
event.button.y < dest_back.y + dest_back.h - 4 - button_h + img_no->h))) event.button.y < dest_back.y + dest_back.h - 4 - button_h + img_no->h)))
{ {
do_setcursor(cursor_hand); do_setcursor(cursor_hand);
} }
@ -14847,7 +14845,7 @@ static int do_save(int tool, int dont_show_success_results, int autosave)
PROMPT_SAVE_OVER_NO, PROMPT_SAVE_OVER_NO,
img_save_over, NULL, NULL, SND_AREYOUSURE, img_save_over, NULL, NULL, SND_AREYOUSURE,
(TOOL_SAVE % 2) * button_w + button_w / 2, (TOOL_SAVE % 2) * button_w + button_w / 2,
(TOOL_SAVE / 2) * button_h + r_ttools.h + button_h / 2 - tool_scroll * button_h / gd_tools.cols + scroll) == 0) (TOOL_SAVE / 2) * button_h + r_ttools.h + button_h / 2 - tool_scroll * button_h / gd_tools.cols + scroll) == 0)
{ {
/* No - Let's save a new picture! */ /* No - Let's save a new picture! */
@ -15370,13 +15368,13 @@ static void do_png_embed_data(png_structp png_ptr)
{ {
#ifdef WIN32 #ifdef WIN32
wtmpchar = current_node->save_texttool_str[i]; wtmpchar = current_node->save_texttool_str[i];
nbtmpstr = WideCharToMultiByte(CP_UTF8, 0, &wtmpchar, 1, tmpstr, 16, NULL, NULL); nbtmpstr = WideCharToMultiByte(CP_UTF8, 0, &wtmpchar, 1, tmpstr, 16, NULL, NULL);
tmpstr[nbtmpstr] = '\0'; tmpstr[nbtmpstr] = '\0';
fprintf(lfi, "%s", tmpstr); fprintf(lfi, "%s", tmpstr);
#elif defined(__ANDROID__) #elif defined(__ANDROID__)
fprintf(lfi, "%d ", (int)current_node->save_texttool_str[i]); fprintf(lfi, "%d ", (int)current_node->save_texttool_str[i]);
#else #else
fprintf(lfi, "%lc", (wint_t) current_node->save_texttool_str[i]); fprintf(lfi, "%lc", (wint_t) current_node->save_texttool_str[i]);
#endif #endif
} }
fprintf(lfi, "\n"); fprintf(lfi, "\n");
@ -15657,7 +15655,7 @@ static int do_quit(int tool)
done = do_prompt_snd(PROMPT_QUIT_TXT, done = do_prompt_snd(PROMPT_QUIT_TXT,
PROMPT_QUIT_YES, PROMPT_QUIT_NO, SND_AREYOUSURE, PROMPT_QUIT_YES, PROMPT_QUIT_NO, SND_AREYOUSURE,
(TOOL_QUIT % 2) * button_w + button_w / 2, (TOOL_QUIT % 2) * button_w + button_w / 2,
(TOOL_QUIT / 2) * button_h + r_ttools.h + button_h / 2 - tool_scroll * button_h / gd_tools.cols + scroll); (TOOL_QUIT / 2) * button_h + r_ttools.h + button_h / 2 - tool_scroll * button_h / gd_tools.cols + scroll);
} }
else else
{ {
@ -16062,8 +16060,8 @@ static int do_open(void)
{ {
do_prompt_snd(PROMPT_OPEN_NOFILES_TXT, PROMPT_OPEN_NOFILES_YES, "", do_prompt_snd(PROMPT_OPEN_NOFILES_TXT, PROMPT_OPEN_NOFILES_YES, "",
SND_YOUCANNOT, SND_YOUCANNOT,
(TOOL_OPEN % 2) * button_w + button_w / 2, (TOOL_OPEN % 2) * button_w + button_w / 2,
(TOOL_OPEN / 2) * button_h + r_ttools.h + button_h / 2 - tool_scroll * button_h / gd_tools.cols); (TOOL_OPEN / 2) * button_h + r_ttools.h + button_h / 2 - tool_scroll * button_h / gd_tools.cols);
} }
else else
{ {
@ -16523,7 +16521,7 @@ static int do_open(void)
event.button.x < (WINDOW_WIDTH - r_ttoolopt.w)) || event.button.x < (WINDOW_WIDTH - r_ttoolopt.w)) ||
(event.button.x >= (WINDOW_WIDTH - r_ttoolopt.w - button_w - button_w - button_w) && (event.button.x >= (WINDOW_WIDTH - r_ttoolopt.w - button_w - button_w - button_w) &&
event.button.x < (WINDOW_WIDTH - button_w - r_ttoolopt.w) && event.button.x < (WINDOW_WIDTH - button_w - r_ttoolopt.w) &&
/* Both "Erase" and "Export" only work on our own files... */ /* Both "Erase" and "Export" only work on our own files... */
d_places[which] != PLACE_STARTERS_DIR && d_places[which] != PLACE_STARTERS_DIR &&
d_places[which] != PLACE_PERSONAL_STARTERS_DIR)) && d_places[which] != PLACE_PERSONAL_STARTERS_DIR)) &&
event.button.y >= (button_h * buttons_tall + r_ttools.h) - button_h && event.button.y >= (button_h * buttons_tall + r_ttools.h) - button_h &&
@ -16699,7 +16697,7 @@ static int do_open(void)
do_prompt_snd(PROMPT_PICT_EXPORT_FAILED_TXT, PROMPT_EXPORT_YES, "", SND_YOUCANNOT, screen->w / 2, screen->h / 2); do_prompt_snd(PROMPT_PICT_EXPORT_FAILED_TXT, PROMPT_EXPORT_YES, "", SND_YOUCANNOT, screen->w / 2, screen->h / 2);
draw_tux_text(TUX_BORED, instructions, 1); draw_tux_text(TUX_BORED, instructions, 1);
update_list = 1; update_list = 1;
} }
} }
while (!done); while (!done);
@ -17505,18 +17503,18 @@ static int do_slideshow(void)
playsound(screen, 1, SND_CLICK, 1, SNDPOS_RIGHT, SNDDIST_NEAR); playsound(screen, 1, SND_CLICK, 1, SNDPOS_RIGHT, SNDDIST_NEAR);
if (num_selected < 2) if (num_selected < 2)
{ {
/* None selected? Too dangerous to automatically select all (like we do for slideshow playback). /* None selected? Too dangerous to automatically select all (like we do for slideshow playback).
Only 1 selected? No point in saving as GIF. Only 1 selected? No point in saving as GIF.
*/ */
freeme = textdir(gettext_noop("Select 2 or more drawings to turn into an animated GIF.")); freeme = textdir(gettext_noop("Select 2 or more drawings to turn into an animated GIF."));
draw_tux_text(TUX_BORED, freeme, 1); draw_tux_text(TUX_BORED, freeme, 1);
free(freeme); free(freeme);
control_drawtext_timer(2000, instructions, 0); /* N.B. It will draw instructions, regardless */ control_drawtext_timer(2000, instructions, 0); /* N.B. It will draw instructions, regardless */
} }
else else
{ {
export_successful = export_gif(selected, num_selected, dirname, d_names, d_exts, speed); export_successful = export_gif(selected, num_selected, dirname, d_names, d_exts, speed);
/* Redraw entire screen, after export: */ /* Redraw entire screen, after export: */
@ -17538,7 +17536,7 @@ static int do_slideshow(void)
SDL_Flip(screen); SDL_Flip(screen);
update_list = 1; update_list = 1;
} }
} }
else if (event.button.x >= (WINDOW_WIDTH - r_ttoolopt.w - button_w) && else if (event.button.x >= (WINDOW_WIDTH - r_ttoolopt.w - button_w) &&
event.button.x < (WINDOW_WIDTH - r_ttoolopt.w) && event.button.x < (WINDOW_WIDTH - r_ttoolopt.w) &&
@ -17666,8 +17664,8 @@ static int do_slideshow(void)
{ {
draw_tux_text(TUX_BORED, instructions, 1); draw_tux_text(TUX_BORED, instructions, 1);
} }
} }
} }
} }
if (motioner | hatmotioner) if (motioner | hatmotioner)
@ -18319,7 +18317,7 @@ static void print_image(void)
PROMPT_PRINT_NOW_NO, PROMPT_PRINT_NOW_NO,
img_printer, NULL, NULL, SND_AREYOUSURE, img_printer, NULL, NULL, SND_AREYOUSURE,
(TOOL_PRINT % 2) * button_w + button_w / 2, (TOOL_PRINT % 2) * button_w + button_w / 2,
(TOOL_PRINT / 2) * button_h + r_ttools.h + button_h / 2 - tool_scroll * button_h / gd_tools.cols + scroll)) (TOOL_PRINT / 2) * button_h + r_ttools.h + button_h / 2 - tool_scroll * button_h / gd_tools.cols + scroll))
{ {
do_print(); do_print();
@ -22337,9 +22335,6 @@ static int do_color_sel(int temp_mode)
/** /**
* Display a large prompt, allowing the user to pick a * Display a large prompt, allowing the user to pick a
* color from a large palette. * color from a large palette.
*
* FIXME: Various options here would be helpful
* (RGB, HSV, color wheel, etc.) -bjk 2022.01.25
*/ */
static int do_color_picker(void) static int do_color_picker(void)
{ {
@ -22368,6 +22363,7 @@ static int do_color_picker(void)
val_x = val_y = motioner = 0; val_x = val_y = motioner = 0;
valhat_x = valhat_y = hatmotioner = 0; valhat_x = valhat_y = hatmotioner = 0;
int old_cp_x, old_cp_y, old_cp_v; int old_cp_x, old_cp_y, old_cp_v;
int last_motion_within_val_slider;
/* Remember old choices, in case we hit [Back] */ /* Remember old choices, in case we hit [Back] */
old_cp_x = color_picker_x; old_cp_x = color_picker_x;
@ -22435,7 +22431,7 @@ static int do_color_picker(void)
for (i = 8; i > 0; i = i - 2) for (i = 8; i > 0; i = i - 2)
{ {
dest.x = r_final.x + i - 4; dest.x = r_final.x + i - 4;
dest.y = r_final.y + i - 4; dest.y = r_final.y + i - 4;
dest.w = r_final.w + 8; dest.w = r_final.w + 8;
dest.h = r_final.h + 16; dest.h = r_final.h + 16;
@ -22554,7 +22550,7 @@ static int do_color_picker(void)
done = 0; done = 0;
chose = 0; chose = 0;
x = y = 0; x = y = 0;
SDL_WarpMouse(back_left + button_w / 2, back_top - button_w / 2); last_motion_within_val_slider = 0;
do do
{ {
@ -22625,7 +22621,7 @@ static int do_color_picker(void)
event.button.y <= color_picker_val_top + img_color_picker_val->h) event.button.y <= color_picker_val_top + img_color_picker_val->h)
{ {
/* Picked a value from the slider */ /* Picked a value from the slider */
y = event.button.y - color_picker_val_top; y = event.button.y - color_picker_val_top;
color_picker_v = y; color_picker_v = y;
@ -22643,26 +22639,7 @@ static int do_color_picker(void)
/* Redraw hue/sat palette, and val slider, and redraw crosshairs */ /* Redraw hue/sat palette, and val slider, and redraw crosshairs */
draw_color_picker_values(color_picker_val_left, color_picker_val_top); draw_color_picker_palette_and_values(color_picker_left, color_picker_top, color_picker_val_left, color_picker_val_top);
dest.x = color_picker_left;
dest.y = color_picker_top;
SDL_BlitSurface(img_color_picker, NULL, screen, &dest);
SDL_UpdateRect(screen, dest.x, dest.y, dest.w, dest.h);
draw_color_picker_crosshairs(color_picker_left, color_picker_top, color_picker_val_left, color_picker_val_top);
dest.x = color_picker_val_left;
dest.y = color_picker_val_top;
dest.w = img_back->w;
dest.h = img_color_picker_val->h;
SDL_UpdateRect(screen, dest.x, dest.y, dest.w, dest.h);
dest.x = color_picker_left;
dest.y = color_picker_top;
dest.w = img_color_picker->w;
dest.h = img_color_picker->h;
SDL_UpdateRect(screen, dest.x, dest.y, dest.w, dest.h);
} }
else if (event.button.x >= done_left && else if (event.button.x >= done_left &&
event.button.x < done_left + img_yes->w && event.button.x < done_left + img_yes->w &&
@ -22685,21 +22662,29 @@ static int do_color_picker(void)
} }
else if (event.type == SDL_MOUSEMOTION) else if (event.type == SDL_MOUSEMOTION)
{ {
if (event.button.x >= color_picker_left && if (event.button.x >= color_picker_val_left &&
event.button.x < color_picker_left + img_color_picker->w && event.button.y >= color_picker_val_top &&
event.button.y >= color_picker_top && event.button.y < color_picker_top + img_color_picker->h) event.button.x <= color_picker_val_left + img_back->w &&
event.button.y <= color_picker_val_top + img_color_picker_val->h)
{ {
/* Hovering over the colors! */ int tmp_color_picker_v;
do_setcursor(cursor_pipette); /* Hovering over a value from the slider */
y = event.button.y - color_picker_val_top;
tmp_color_picker_v = color_picker_v;
color_picker_v = y;
/* Re-render the palette with the new value */
render_color_picker_palette();
color_picker_v = tmp_color_picker_v;
/* Show a big solid example of the color: */ /* Show a big solid example of the color: */
x = event.button.x - color_picker_left; x = event.button.x - color_picker_left;
y = event.button.y - color_picker_top; y = event.button.y - color_picker_top;
SDL_GetRGB(getpixel_img_color_picker(img_color_picker, x, y), img_color_picker->format, &r, &g, &b); SDL_GetRGB(getpixel_img_color_picker(img_color_picker, color_picker_x, color_picker_y), img_color_picker->format, &r, &g, &b);
dest.x = color_example_dest.x + color_example_dest.w / 4; dest.x = color_example_dest.x + color_example_dest.w / 4;
dest.y = color_example_dest.y + color_example_dest.h / 4; dest.y = color_example_dest.y + color_example_dest.h / 4;
@ -22709,32 +22694,73 @@ static int do_color_picker(void)
SDL_FillRect(screen, &dest, SDL_MapRGB(screen->format, r, g, b)); SDL_FillRect(screen, &dest, SDL_MapRGB(screen->format, r, g, b));
SDL_UpdateRect(screen, dest.x, dest.y, dest.w, dest.h); SDL_UpdateRect(screen, dest.x, dest.y, dest.w, dest.h);
/* Redraw hue/sat palette, and val slider, and redraw crosshairs */
draw_color_picker_palette_and_values(color_picker_left, color_picker_top, color_picker_val_left, color_picker_val_top);
last_motion_within_val_slider = 1;
} }
else else
{ {
/* Revert to current color picker color */ if (last_motion_within_val_slider)
{
render_color_picker_palette();
draw_color_picker_palette_and_values(color_picker_left, color_picker_top, color_picker_val_left, color_picker_val_top);
last_motion_within_val_slider = 0;
}
SDL_GetRGB(getpixel_img_color_picker(img_color_picker, color_picker_x, color_picker_y), if (event.button.x >= color_picker_left &&
img_color_picker->format, &r, &g, &b); event.button.x < color_picker_left + img_color_picker->w &&
event.button.y >= color_picker_top && event.button.y < color_picker_top + img_color_picker->h)
{
/* Hovering over the colors! */
SDL_FillRect(screen, &color_example_dest, SDL_MapRGB(screen->format, r, g, b)); do_setcursor(cursor_pipette);
SDL_UpdateRect(screen,
color_example_dest.x, color_example_dest.y,
color_example_dest.w, color_example_dest.h);
/* Change cursor to arrow (or hand, if over Back or Done): */ /* Show a big solid example of the color: */
if (event.button.x >= back_left && x = event.button.x - color_picker_left;
event.button.x < back_left + img_back->w && y = event.button.y - color_picker_top;
event.button.y >= back_top && event.button.y < back_top + img_back->h)
do_setcursor(cursor_hand); SDL_GetRGB(getpixel_img_color_picker(img_color_picker, x, y), img_color_picker->format, &r, &g, &b);
else if (event.button.x >= done_left &&
event.button.x < done_left + img_yes->w && dest.x = color_example_dest.x + color_example_dest.w / 4;
event.button.y >= done_top && event.button.y < done_top + img_yes->h) dest.y = color_example_dest.y + color_example_dest.h / 4;
do_setcursor(cursor_hand); dest.w = color_example_dest.w / 2;
dest.h = color_example_dest.h / 2;
SDL_FillRect(screen, &dest, SDL_MapRGB(screen->format, r, g, b));
SDL_UpdateRect(screen, dest.x, dest.y, dest.w, dest.h);
}
else else
do_setcursor(cursor_arrow); {
/* Revert to current color picker color */
SDL_GetRGB(getpixel_img_color_picker(img_color_picker, color_picker_x, color_picker_y),
img_color_picker->format, &r, &g, &b);
SDL_FillRect(screen, &color_example_dest, SDL_MapRGB(screen->format, r, g, b));
SDL_UpdateRect(screen,
color_example_dest.x, color_example_dest.y,
color_example_dest.w, color_example_dest.h);
/* Change cursor to arrow (or hand, if over Back or Done): */
if (event.button.x >= back_left &&
event.button.x < back_left + img_back->w &&
event.button.y >= back_top && event.button.y < back_top + img_back->h)
do_setcursor(cursor_hand);
else if (event.button.x >= done_left &&
event.button.x < done_left + img_yes->w &&
event.button.y >= done_top && event.button.y < done_top + img_yes->h)
do_setcursor(cursor_hand);
else
do_setcursor(cursor_arrow);
}
} }
oldpos_x = event.motion.x; oldpos_x = event.motion.x;
@ -22792,6 +22818,31 @@ static int do_color_picker(void)
} }
static void draw_color_picker_palette_and_values(int color_picker_left, int color_picker_top, int color_picker_val_left, int color_picker_val_top) {
SDL_Rect dest;
draw_color_picker_values(color_picker_val_left, color_picker_val_top);
dest.x = color_picker_left;
dest.y = color_picker_top;
SDL_BlitSurface(img_color_picker, NULL, screen, &dest);
SDL_UpdateRect(screen, dest.x, dest.y, dest.w, dest.h);
draw_color_picker_crosshairs(color_picker_left, color_picker_top, color_picker_val_left, color_picker_val_top);
dest.x = color_picker_val_left;
dest.y = color_picker_val_top;
dest.w = img_back->w;
dest.h = img_color_picker_val->h;
SDL_UpdateRect(screen, dest.x, dest.y, dest.w, dest.h);
dest.x = color_picker_left;
dest.y = color_picker_top;
dest.w = img_color_picker->w;
dest.h = img_color_picker->h;
SDL_UpdateRect(screen, dest.x, dest.y, dest.w, dest.h);
}
static void render_color_picker_palette(void) static void render_color_picker_palette(void)
{ {
int x, y; int x, y;
@ -22807,7 +22858,7 @@ static void render_color_picker_palette(void)
((float) x / ((float) img_color_picker->w)), ((float) x / ((float) img_color_picker->w)),
1.0 - (((float) color_picker_v) / ((float) img_color_picker_val->h)), 1.0 - (((float) color_picker_v) / ((float) img_color_picker_val->h)),
&r, &g, &b); &r, &g, &b);
putpixel(img_color_picker, x, y, putpixel(img_color_picker, x, y,
SDL_MapRGBA(img_color_picker->format, r, g, b, 255)); SDL_MapRGBA(img_color_picker->format, r, g, b, 255));
} }
} }
@ -23045,7 +23096,7 @@ static int do_color_mix(void)
for (i = 8; i > 0; i = i - 2) for (i = 8; i > 0; i = i - 2)
{ {
dest.x = r_final.x + i - 4; dest.x = r_final.x + i - 4;
dest.y = r_final.y + i - 4; dest.y = r_final.y + i - 4;
dest.w = r_final.w + 8; dest.w = r_final.w + 8;
dest.h = r_final.h + 16; dest.h = r_final.h + 16;
@ -23378,7 +23429,7 @@ static int do_color_mix(void)
if (!Mix_Playing(0)) if (!Mix_Playing(0))
{ {
eraser_sound = (eraser_sound + 1) % 2; eraser_sound = (eraser_sound + 1) % 2;
playsound(screen, 0, SND_ERASER1 + eraser_sound, 0, SNDPOS_CENTER, SNDDIST_NEAR); playsound(screen, 0, SND_ERASER1 + eraser_sound, 0, SNDPOS_CENTER, SNDDIST_NEAR);
} }
} }
@ -24625,12 +24676,12 @@ static void load_info_about_label_surface(FILE * lfi)
size_t diff, i; size_t diff, i;
wtmpstr = malloc(1024); wtmpstr = malloc(1024);
diff = new_node->save_texttool_len - nwchar; diff = new_node->save_texttool_len - nwchar;
for (i = 0; i < diff; i++) for (i = 0; i < diff; i++)
wtmpstr[i] = L' '; wtmpstr[i] = L' ';
for (i = 0; i <= nwchar; i++) for (i = 0; i <= nwchar; i++)
wtmpstr[i + diff] = new_node->save_texttool_str[i]; wtmpstr[i + diff] = new_node->save_texttool_str[i];
memcpy(new_node->save_texttool_str, wtmpstr, sizeof(wchar_t) * (new_node->save_texttool_len + 1)); memcpy(new_node->save_texttool_str, wtmpstr, sizeof(wchar_t) * (new_node->save_texttool_len + 1));
@ -29038,7 +29089,7 @@ static int export_gif(int *selected, int num_selected, char *dirname, char **d_n
/* FIXME Abort? */ /* FIXME Abort? */
} }
/* Record the raw RGB into a big strip, to be quantized and sliced later */ /* Record the raw RGB into a big strip, to be quantized and sliced later */
for (y = 0; y < overall_h; y++) { for (y = 0; y < overall_h; y++) {
for (x = 0; x < overall_w; x++) { for (x = 0; x < overall_w; x++) {
SDL_GetRGBA(getpixels[screen->format->BytesPerPixel](screen, x, y), screen->format, &r, &g, &b, &a); SDL_GetRGBA(getpixels[screen->format->BytesPerPixel](screen, x, y), screen->format, &r, &g, &b, &a);
@ -29051,7 +29102,7 @@ static int export_gif(int *selected, int num_selected, char *dirname, char **d_n
} }
SDL_Flip(screen); SDL_Flip(screen);
done = export_gif_monitor_events(); done = export_gif_monitor_events();
} }
@ -29060,17 +29111,17 @@ static int export_gif(int *selected, int num_selected, char *dirname, char **d_n
/* Quantize to max 256 (8bpp) colors and generate a suitable palette */ /* Quantize to max 256 (8bpp) colors and generate a suitable palette */
liq_handle = liq_attr_create(); liq_handle = liq_attr_create();
input_image = liq_image_create_rgba(liq_handle, bitmap, overall_w, num_selected * overall_h, 0); input_image = liq_image_create_rgba(liq_handle, bitmap, overall_w, num_selected * overall_h, 0);
liq_set_max_colors(liq_handle, 256); liq_set_max_colors(liq_handle, 256);
show_progress_bar(screen); show_progress_bar(screen);
done = export_gif_monitor_events(); done = export_gif_monitor_events();
#if LIQ_VERSION >= 20800 #if LIQ_VERSION >= 20800
qtiz_status = liq_image_quantize(input_image, liq_handle, &quantization_result); qtiz_status = liq_image_quantize(input_image, liq_handle, &quantization_result);
done = (qtiz_status != LIQ_OK); done = (qtiz_status != LIQ_OK);
#else #else
quantization_result = liq_quantize_image(liq_handle, input_image); quantization_result = liq_quantize_image(liq_handle, input_image);
done = (quantization_result == NULL); done = (quantization_result == NULL);
#endif #endif
if (!done) { if (!done) {
// Use libimagequant to make new image pixels from the palette // Use libimagequant to make new image pixels from the palette
@ -29082,7 +29133,7 @@ static int export_gif(int *selected, int num_selected, char *dirname, char **d_n
palette = liq_get_palette(quantization_result); palette = liq_get_palette(quantization_result);
free(bitmap); free(bitmap);
for (j = 0; j < (int) palette->count; j++) { for (j = 0; j < (int) palette->count; j++) {
gif_palette[j * 3 + 0] = palette->entries[j].r; gif_palette[j * 3 + 0] = palette->entries[j].r;
gif_palette[j * 3 + 1] = palette->entries[j].g; gif_palette[j * 3 + 1] = palette->entries[j].g;
gif_palette[j * 3 + 2] = palette->entries[j].b; gif_palette[j * 3 + 2] = palette->entries[j].b;
@ -29104,22 +29155,22 @@ static int export_gif(int *selected, int num_selected, char *dirname, char **d_n
ge_add_frame(gif, gif_speed); ge_add_frame(gif, gif_speed);
show_progress_bar(screen); show_progress_bar(screen);
done = export_gif_monitor_events(); done = export_gif_monitor_events();
} }
/* Close the GIF */ /* Close the GIF */
ge_close_gif(gif); ge_close_gif(gif);
} else { } else {
fprintf(stderr, "Quantization failed\n"); fprintf(stderr, "Quantization failed\n");
done = 1; done = 1;
} }
if (done) if (done)
{ {
/* Aborted; discard the partially-saved GIF */ /* Aborted; discard the partially-saved GIF */
unlink(gif_fname); unlink(gif_fname);
} }
} }
} }
else else
{ {

30
tuxpaint.spec
View file

@ -101,7 +101,7 @@ rm -rf $RPM_BUILD_ROOT
* Wed Dec 01 2021 <nbs@sonic.net> - * Wed Dec 01 2021 <nbs@sonic.net> -
- Set version number 0.9.28 - Set version number 0.9.28
* Thu Oct 07 2021 <shin1@wmail.plala.or.jp> - * Thu Oct 07 2021 <dolphin6k@wmail.plala.or.jp> -
- Set version number 0.9.27 - Set version number 0.9.27
- doc/Makefile no longer installed - doc/Makefile no longer installed
@ -111,13 +111,13 @@ rm -rf $RPM_BUILD_ROOT
* Mon Jun 22 2020 <nbs@sonic.net> - * Mon Jun 22 2020 <nbs@sonic.net> -
- Set version number 0.9.25 - Set version number 0.9.25
* Fri May 1 2020 <shin1@wmail.plala.or.jp> - * Fri May 1 2020 <dolphin6k@wmail.plala.or.jp> -
- Enabled using xdg-utils for installing icons. - Enabled using xdg-utils for installing icons.
- Wrong date in %changelog - Wrong date in %changelog
- Re-organized %files section - Re-organized %files section
- Correct path for 'tp-magic-config --plugindocprefix' - Correct path for 'tp-magic-config --plugindocprefix'
* Sat Mar 14 2020 <shin1@wmail.plala.or.jp> - * Sat Mar 14 2020 <dolphin6k@wmail.plala.or.jp> -
- Disable target "install-xdg". Add ImageMagick for BuildReq. - Disable target "install-xdg". Add ImageMagick for BuildReq.
* Thu Sep 26 2019 <nbs@sonic.net> - * Thu Sep 26 2019 <nbs@sonic.net> -
@ -126,43 +126,43 @@ rm -rf $RPM_BUILD_ROOT
* Sun Aug 19 2018 <nbs@sonic.net> - * Sun Aug 19 2018 <nbs@sonic.net> -
- Set version number 0.9.23 - Set version number 0.9.23
* Mon Aug 20 2012 <shin1@wmail.plala.or.jp> - * Mon Aug 20 2012 <dolphin6k@wmail.plala.or.jp> -
- Corrected 'Requires' and 'BuildRequires' - Corrected 'Requires' and 'BuildRequires'
* Wed Dec 07 2011 <shin1@wmail.plala.or.jp> - * Wed Dec 07 2011 <dolphin6k@wmail.plala.or.jp> -
- Added bash-completion file - Added bash-completion file
* Wed Jul 1 2009 <nbs@sonic.net> - * Wed Jul 1 2009 <nbs@sonic.net> -
- Set version number 0.9.22 - Set version number 0.9.22
* Sun May 24 2009 <shin1@wmail.plala.or.jp> - * Sun May 24 2009 <dolphin6k@wmail.plala.or.jp> -
- For 0.9.21 - For 0.9.21
- Added dependency for fribidi - Added dependency for fribidi
* Tue Jun 17 2008 <shin1@wmail.plala.or.jp> - * Tue Jun 17 2008 <dolphin6k@wmail.plala.or.jp> -
- Actually set Epoch number - Actually set Epoch number
* Sat Apr 26 2008 <acahalan@gmail.com> - * Sat Apr 26 2008 <acahalan@gmail.com> -
- DESTDIR is the standard name, not PKG_ROOT - DESTDIR is the standard name, not PKG_ROOT
* Fri Mar 21 2008 <shin1@wmail.plala.or.jp> - * Fri Mar 21 2008 <dolphin6k@wmail.plala.or.jp> -
- Set version number 0.9.20 - Set version number 0.9.20
- Set Epoch number - Set Epoch number
- Requirements added for -devel package. - Requirements added for -devel package.
* Sun Mar 02 2008 <shin1@wmail.plala.or.jp> - * Sun Mar 02 2008 <dolphin6k@wmail.plala.or.jp> -
- 0.9.19 - 0.9.19
- Requires SDL_Pango - Requires SDL_Pango
- Included magic tools - Included magic tools
- Separated devel package - Separated devel package
* Fri Jun 01 2007 <shin1@wmail.plala.or.jp> - * Fri Jun 01 2007 <dolphin6k@wmail.plala.or.jp> -
- Requires librsvg2 and libpaper - Requires librsvg2 and libpaper
* Fri Sep 08 2006 <shin1@wmail.plala.or.jp> - * Fri Sep 08 2006 <dolphin6k@wmail.plala.or.jp> -
- New offical URL for tuxpaint (http://www.tuxpaint.org/). - New offical URL for tuxpaint (http://www.tuxpaint.org/).
* Mon Aug 07 2006 <shin1@wmail.plala.or.jp> - * Mon Aug 07 2006 <dolphin6k@wmail.plala.or.jp> -
- "DESTDIR" patch is no longer needed. - "DESTDIR" patch is no longer needed.
* Thu Nov 03 2005 Richard June <rjune[AT]lumensoftware.com - 0:0.9.14-0.lumen.0 * Thu Nov 03 2005 Richard June <rjune[AT]lumensoftware.com - 0:0.9.14-0.lumen.0
@ -173,14 +173,14 @@ rm -rf $RPM_BUILD_ROOT
- Set a proper %changelog entry - Set a proper %changelog entry
* Thu Sep 15 2005 <shin1@wmail.plala.or.jp> - * Thu Sep 15 2005 <dolphin6k@wmail.plala.or.jp> -
- Do not force install desktop icons when Gnome and/or KDE are not installed. - Do not force install desktop icons when Gnome and/or KDE are not installed.
* Sun Mar 27 2005 <shin1@wmail.plala.or.jp> - * Sun Mar 27 2005 <dolphin6k@wmail.plala.or.jp> -
- Some hicolor icons not installed were removed from file list - Some hicolor icons not installed were removed from file list
* Fri Jan 14 2005 <bill@newbreedsoftware.com> - * Fri Jan 14 2005 <bill@newbreedsoftware.com> -
- Changed Group from Amusements/Games to Multimedia/Graphics - Changed Group from Amusements/Games to Multimedia/Graphics
* Tue Sep 21 2004 <shin1@wmail.plala.or.jp> - * Tue Sep 21 2004 <dolphin6k@wmail.plala.or.jp> -
- Initial build for version 0.9.14 - Initial build for version 0.9.14