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

Support for 1024x768, 1280x1024, 1400x1050 and 1600x1200 resolutions!

Browse source 
(Thanks, Shin-Ichi!)
This commit is contained in:
William Kendrick 2004-10-24 21:23:22 +00:00
parent 42529fa427
commit bdc6d1eb4f
9 changed files with 243 additions and 134 deletions
Download patch file Download diff file Expand all files Collapse all files

3
docs/CHANGES.txt
View file

@ -17,6 +17,9 @@ http://www.newbreedsoftware.com/tuxpaint/
* Added "PKG_ROOT" variable to Makefile for Tux Paint RPM building ease.
TOYAMA Shin-ichi <shin1@wmail.plala.or.jp>
* Added larger screen size support: 1024x768, 1280x1024, 1400x1050, 1600x1200
TOYAMA Shin-ichi <shin1@wmail.plala.or.jp>
2004.September.28 (0.9.14)
* New Features:

68
docs/OPTIONS.txt
View file

@ -1,17 +1,17 @@
Tux Paint
version 0.9.15
Options Documentation
Options Documentation
Copyright 2004 by Bill Kendrick
New Breed Software
bill@newbreedsoftware.com
http://www.newbreedsoftware.com/tuxpaint/
[1]bill@newbreedsoftware.com
[2]http://www.newbreedsoftware.com/tuxpaint/
October 23, 2004
October 24, 2004
----------------------------------------------------------------------
---------------------------------------------------------------------------
Tux Paint Config.
@ -20,7 +20,7 @@ Options Documentation
install and use this tool, or want a better understanding of the
available options, please continue reading.
----------------------------------------------------------------------
---------------------------------------------------------------------------
Configuration File
@ -60,20 +60,27 @@ Windows Users
as Plain Text, and make sure the filename doesn't have ".txt" at the
end...
----------------------------------------------------------------------
---------------------------------------------------------------------------
Available Options
The following settings can be set in the configuration file.
(Command-line settings will override these. See the "Command-Line
(Command-line settings will override these. See the "[3]Command-Line
Options" section, below.)
fullscreen=yes
Run the program in full screen mode, rather than in a window.
800x600=yes
Run the program at 800x600 resolution (EXPERIMENTAL), rather
than the smaller 640x480 resolution.
windowsize=SIZE
Run the program at a higher resolution, rather than the default
of 640x480. The SIZE value may be one of:
* 640x480
* 800x600
* 1024x768
* 1280x1024
* 1400x1050
* 1600x1200
nosound=yes
Disable sound effects.
@ -334,7 +341,7 @@ Windows Users
|welsh |cymraeg | |
+-------------------------------------------------+
----------------------------------------------------------------------
---------------------------------------------------------------------------
Overriding System Config. Options using .tuxpaintrc
@ -355,7 +362,7 @@ Windows Users
print=yes
mixedcase=yes
----------------------------------------------------------------------
---------------------------------------------------------------------------
Command-Line Options
@ -363,6 +370,10 @@ Windows Users
--fullscreen
--800x600
--1024x768
--1280x1204
--1400x1050
--1600x1200
--nosound
--noquit
--noprint
@ -418,8 +429,8 @@ Windows Users
--locale locale
Run Tux Paint in one of the support languages. See the
"Choosing a Different Language" section below for the locale
strings (e.g., "de_DE" for German) to use.
"[4]Choosing a Different Language" section below for the
locale strings (e.g., "de_DE" for German) to use.
(If your locale is already set, e.g. with the "$LANG"
environment variable, this option is not necessary, since
@ -450,7 +461,7 @@ Windows Users
By default, the lockfile is stored in "~/.tuxpaint/" under
Linux and Unix, and "userdata\" under Windows.
----------------------------------------------------------------------
---------------------------------------------------------------------------
Command-Line Informational Options
@ -474,7 +485,7 @@ Command-Line Informational Options
--lang help
Display a list of available languages in Tux Paint.
----------------------------------------------------------------------
---------------------------------------------------------------------------
Choosing a Different Language
@ -484,7 +495,8 @@ Command-Line Informational Options
configuration file (e.g., "lang=spanish").
Tux Paint also honors your environment's current locale. (You can
override it on the command-line using the "--locale" option; see above.)
override it on the command-line using the "--locale" option; see
[5]above.)
Use the option "--lang help" to list the available language options
available.
@ -592,7 +604,7 @@ Available Languages
(*) - These languages require their own fonts, since they are not
represented using a Latin character set, like the others. See the
"Special Fonts" section, below.
"[6]Special Fonts" section, below.
Setting Your Environment's Locale
@ -630,7 +642,7 @@ Setting Your Environment's Locale
setenv LANG es_ES ; \
tuxpaint
----------------------------------------------------------------------
---------------------------------------------------------------------------
Windows Users
@ -679,7 +691,7 @@ Setting Your Environment's Locale
Some languages require special fonts be installed. These font files
(which are in TrueType format (TTF)), are much too large to include
with the Tux Paint download, and are available separately. (See the
table above, under the "Choosing a Different Language" section.)
table above, under the "[7]Choosing a Different Language" section.)
When running Tux Paint in a language that requires its own font,
Tux Paint will try to load the font file from its system-wide "fonts"
@ -695,8 +707,20 @@ Setting Your Environment's Locale
/usr/share/tuxpaint/fonts/locale/ko.ttf
You can download fonts for supported languages from Tux Paint's
website, http://www.newbreedsoftware.com/tuxpaint/. (Look in the
website, [8]http://www.newbreedsoftware.com/tuxpaint/. (Look in the
'Fonts' section under 'Download.')
Under Unix and Linux, you can use the Makefile that comes with the
font to install the font in the appropriate location.
References
Visible links
1. mailto:bill@newbreedsoftware.com
2. http://www.newbreedsoftware.com/tuxpaint/
3. file:///home/kendrick/Development/tux/tp/tuxpaint/docs/html/OPTIONS.html#command_line
4. file:///home/kendrick/Development/tux/tp/tuxpaint/docs/html/OPTIONS.html#different_language
5. file:///home/kendrick/Development/tux/tp/tuxpaint/docs/html/OPTIONS.html#locale
6. file:///home/kendrick/Development/tux/tp/tuxpaint/docs/html/OPTIONS.html#special_fonts
7. file:///home/kendrick/Development/tux/tp/tuxpaint/docs/html/OPTIONS.html#different_language
8. http://www.newbreedsoftware.com/tuxpaint/

163
docs/README.txt
View file

@ -1,17 +1,17 @@
Tux Paint
[1]Tux Paint
version 0.9.15
A simple drawing program for children
A simple drawing program for children
Copyright 2004 by Bill Kendrick
New Breed Software
bill@newbreedsoftware.com
http://www.newbreedsoftware.com/tuxpaint/
[2]bill@newbreedsoftware.com
[3]http://www.newbreedsoftware.com/tuxpaint/
June 14, 2002 - October 23, 2004
June 14, 2002 - October 24, 2004
----------------------------------------------------------------------
---------------------------------------------------------------------------
About
@ -30,7 +30,7 @@ License:
behind the program is available. (This allows others to add features,
fix bugs, and use parts of the program in their own GPL'd software.)
See COPYING.txt for the full text of the GPL license.
See [4]COPYING.txt for the full text of the GPL license.
Objectives:
@ -65,7 +65,7 @@ Objectives:
is done by selecting it from a collection of thumbnails.
Access to other files on the computer is restricted.
----------------------------------------------------------------------
---------------------------------------------------------------------------
Using Tux Paint
@ -84,11 +84,11 @@ Loading Tux Paint
If any errors occur, they will be displayed on the terminal (to
"stderr").
----------------------------------------------------------------------
---------------------------------------------------------------------------
Windows Users
[Icon]
[5][Icon]
Tux Paint
If you installed Tux Paint on your computer using the
@ -110,25 +110,25 @@ Loading Tux Paint
If you used the 'ZIP-file' download, Tux Paint's folder will be
wherever you put it when you unzipped the ZIP file.
----------------------------------------------------------------------
---------------------------------------------------------------------------
Mac OS X Users
Simply double-click the "Tux Paint" icon.
----------------------------------------------------------------------
---------------------------------------------------------------------------
Title Screen
When Tux Paint first loads, a title/credits screen will appear.
[Title Screenshot]
[6][Title Screenshot]
Once loading is complete, press a key or click on the mouse to
continue. (Or, after about 30 seconds, the title screen will go away
automatically.)
----------------------------------------------------------------------
---------------------------------------------------------------------------
Main Screen
@ -138,15 +138,15 @@ Main Screen
The toolbar contains the drawing and editing controls.
[Tools: Paint, Stamp, Lines, Shapes, Text, Magic, Undo, Redo, Eraser, New,
Open, Save, Print, Quit]
[7][Tools: Paint, Stamp, Lines, Shapes, Text, Magic, Undo, Redo, Eraser,
New, Open, Save, Print, Quit]
Middle: Drawing Canvas
The largest part of the screen, in the center, is the drawing
canvas. This is, obviously, where you draw!
[(Canvas)]
[8][(Canvas)]
Right Side: Selector
@ -155,14 +155,14 @@ Main Screen
the various brushes available. When the Rubber Stamp tool is
selected, it shows the different shapes you can use.
[Selectors - Brushes, Letters, Shapes, Stamps]
[9][Selectors - Brushes, Letters, Shapes, Stamps]
Lower: Colors
A palette of available colors are shown near the bottom of the
screen.
[Colors - Black, White, Red, Pink, Orange, Yellow, Green, Cyan, Blue,
[10][Colors - Black, White, Red, Pink, Orange, Yellow, Green, Cyan, Blue,
Purple, Brown, Grey]
Bottom: Help Area
@ -170,11 +170,11 @@ Main Screen
At the very bottom of the screen, Tux, the Linux Penguin,
provides tips and other information while you draw.
(For example: 'Pick a shape. Click to pick the center, drag, then let go
when it is the size you want. Move around to rotate it, and click to draw
it.)
[11](For example: 'Pick a shape. Click to pick the center, drag, then let
go when it is the size you want. Move around to rotate it, and click to
draw it.)
----------------------------------------------------------------------
---------------------------------------------------------------------------
Available Tools
@ -192,7 +192,7 @@ Available Tools
As you draw, a sound is played. The bigger the brush, the
lower the pitch.
----------------------------------------------------------------------
---------------------------------------------------------------------------
Stamp (Rubber Stamp)
@ -212,9 +212,9 @@ Available Tools
(NOTE: If the "nostampcontrols" option is set, Tux Paint
won't display the Mirror, Flip, Shrink and Grow controls for
stamps. See the "Options" documentation.)
stamps. See the "[12]Options" documentation.)
----------------------------------------------------------------------
---------------------------------------------------------------------------
Lines
@ -228,7 +228,7 @@ Available Tools
Let go of the mouse to complete the line. A "sproing!" sound
will play.
----------------------------------------------------------------------
---------------------------------------------------------------------------
Shapes
@ -259,7 +259,7 @@ Available Tools
drawn on the canvas when you let go of the
mouse button. (There's no rotation step.)
----------------------------------------------------------------------
---------------------------------------------------------------------------
Text
@ -274,7 +274,7 @@ Available Tools
Click elsewhere in the picture and the current line of text
will move there, where you can continue editing.
----------------------------------------------------------------------
---------------------------------------------------------------------------
Magic (Special Effects)
@ -341,7 +341,7 @@ Available Tools
you quickly fill parts of the picture, as if it
were a coloring book.
----------------------------------------------------------------------
---------------------------------------------------------------------------
Eraser
@ -359,7 +359,7 @@ Available Tools
As you erase, a "squeaky clean" eraser/wiping sound is
played.
----------------------------------------------------------------------
---------------------------------------------------------------------------
Other Controls
@ -371,7 +371,7 @@ Available Tools
Note: You can also press [Control]-[Z] on the keyboard to
undo.
----------------------------------------------------------------------
---------------------------------------------------------------------------
Redo
@ -384,7 +384,7 @@ Available Tools
Note: You can also press [Control]-[R] on the keyboard to
redo.
----------------------------------------------------------------------
---------------------------------------------------------------------------
New
@ -394,7 +394,7 @@ Available Tools
Note: You can also press [Control]-[N] on the keyboard to
start a new drawing.
----------------------------------------------------------------------
---------------------------------------------------------------------------
Open
@ -436,12 +436,12 @@ Available Tools
If choose to open a picture, and your current drawing hasn't
been saved, you will be prompted as to whether you want to
save it or not. (See "Save," below.)
save it or not. (See "[13]Save," below.)
Note: You can also press [Control]-[O] on the keyboard to
get the 'Open' dialog.
----------------------------------------------------------------------
---------------------------------------------------------------------------
Save
@ -461,13 +461,13 @@ Available Tools
create a new entry (a new file).
(NOTE: If either the "saveover" or "saveovernew" options are
set, it won't ask before saving over. See the "Options"
set, it won't ask before saving over. See the "[14]Options"
documentation.)
Note: You can also press [Control]-[S] on the keyboard to
save.
----------------------------------------------------------------------
---------------------------------------------------------------------------
Print
@ -481,7 +481,7 @@ Available Tools
command-line), the "Print" button will be
disabled.
See the "Options" documentation.)
See the "[15]Options" documentation.)
Restricting Printing
@ -494,7 +494,7 @@ Available Tools
For example, with "printdelay=60", you can
print only once a minute.
See the "Options" documentation.)
See the "[16]Options" documentation.)
Printing Command
@ -510,7 +510,7 @@ Available Tools
"printcommand" value in Tux Paint's
configuration file.
See the "Options" documentation.)
See the "[17]Options" documentation.)
Printer Settings
@ -537,9 +537,9 @@ Available Tools
"userdata/print.cfg". Any changes will be saved
there as well.
See the "Options" documentation.)
See the "[18]Options" documentation.)
----------------------------------------------------------------------
---------------------------------------------------------------------------
Quit
@ -548,7 +548,7 @@ Available Tools
(NOTE: The "Quit" button can be disabled (e.g., with the
"--noquit" command-line option), but the [Escape] key will
still work. See the "Options" documentation.)
still work. See the "[19]Options" documentation.)
You will first be prompted as to whether you really want to
quit.
@ -556,13 +556,13 @@ Available Tools
If you choose to quit, and you haven't saved the current
picture, you will first be asked if wish to save it. If it's
not a new image, you will then be asked if you want to save
over the old version, or create a new entry. (See "Save"
over the old version, or create a new entry. (See "[20]Save"
above.)
NOTE: If the image is saved, it will be reloaded
automatically the next time you run Tux Paint!
----------------------------------------------------------------------
---------------------------------------------------------------------------
Loading Other Pictures into Tux Paint
@ -642,7 +642,7 @@ Doing it Manually
Under Windows, this is in the "userdata" folder. Under Mac OS X, this
is in "Library/Preferences/tuxpaint/" in your home directory.
----------------------------------------------------------------------
---------------------------------------------------------------------------
Extending Tux Paint
@ -687,7 +687,7 @@ Where Files Go
/Users/Joe/Library/Preferences/
----------------------------------------------------------------------
---------------------------------------------------------------------------
Personal Files
@ -717,7 +717,7 @@ Where Files Go
(For example, if you created a brush named "flower.png", you would
put it in "~/.tuxpaint/brushes/" under Linux or Unix.)
----------------------------------------------------------------------
---------------------------------------------------------------------------
Brushes
@ -737,7 +737,7 @@ Brushes
it's because you forgot to use alpha transparency! See the
documentation file "PNG.txt" for more information and tips.
----------------------------------------------------------------------
---------------------------------------------------------------------------
Stamps
@ -765,7 +765,7 @@ Stamps
use alpha transparency! See the documentation file "PNG.txt" for
more information and tips.
----------------------------------------------------------------------
---------------------------------------------------------------------------
Description Text
@ -801,7 +801,7 @@ Stamps
them as Plain Text, and make sure they have ".txt" at the end of
the filename...
----------------------------------------------------------------------
---------------------------------------------------------------------------
Sound Effects
@ -823,7 +823,7 @@ Stamps
If no localized sound effect can be loaded, Tux Paint will attempt
to load the 'default' sound file. (e.g., "picture.wav")
----------------------------------------------------------------------
---------------------------------------------------------------------------
Stamp Options
@ -909,7 +909,7 @@ Stamps
named "truck_mirror.png", which will be used when the stamp is
mirrored (rather than using a backwards version of 'truck.png').
----------------------------------------------------------------------
---------------------------------------------------------------------------
Fonts
@ -919,7 +919,7 @@ Fonts
font and provide four different sizes in the 'Letters' selector when
using the 'Text' tool.
----------------------------------------------------------------------
---------------------------------------------------------------------------
'Starters'
@ -971,8 +971,9 @@ Fonts
corresponds to the "reef.png" overlay, or foreground.)
The 'starter' images should be the same size as Tux Paint's canvas. In
the default 640x480 mode, that is 448x376 pixels. (If you're using
800x600 mode, it should be 608x496.)
the default 640x480 mode, that is 448x376 pixels. If you're using
800x600 mode, it should be 608x496. (It should be 192 pixels less
wide, and 104 pixels less tall than the resolution.)
Place them in the "starters" directory. When the 'Open' dialog is
accessed in Tux Paint, the 'starter' images will appear at the
@ -991,37 +992,63 @@ Fonts
picture loaded or started. (In other words, if you base a drawing on a
'starter' image, it will always be affected by it.)
----------------------------------------------------------------------
---------------------------------------------------------------------------
Further Reading
Other documentation included with Tux Paint (in the "docs"
folder/directory) include:
* AUTHORS.txt
* [21]AUTHORS.txt
List of authors and contributors
* CHANGES.txt
* [22]CHANGES.txt
Summary of changed between releases
* COPYING.txt
* [23]COPYING.txt
Copying license (The GNU General Public License)
* INSTALL.txt
* [24]INSTALL.txt
Instructions for compiling/installing, when applicable
* OPTIONS.html
* [25]OPTIONS.html
Detailed instructions on command-line and configuration-file
options, for those who don't want to use Tux Paint Config.
* PNG.txt
* [26]PNG.txt
Notes on creating PNG format images for use in Tux Paint
* TODO.txt
* [27]TODO.txt
A list of pending features or bugs needing fixed
----------------------------------------------------------------------
---------------------------------------------------------------------------
How to Get Help
If you need help, feel free to contact New Breed Software:
http://www.newbreedsoftware.com/
[28]http://www.newbreedsoftware.com/
You may also wish to participate in the numerous Tux Paint mailing
lists:
http://www.newbreedsoftware.com/tuxpaint/lists/
[29]http://www.newbreedsoftware.com/tuxpaint/lists/
References
Visible links
2. mailto:bill@newbreedsoftware.com
3. http://www.newbreedsoftware.com/tuxpaint/
4. file:///home/kendrick/Development/tux/tp/tuxpaint/docs/COPYING.txt
12. file:///home/kendrick/Development/tux/tp/tuxpaint/docs/html/OPTIONS.html
13. file:///home/kendrick/Development/tux/tp/tuxpaint/docs/html/README.html#save
14. file:///home/kendrick/Development/tux/tp/tuxpaint/docs/html/OPTIONS.html
15. file:///home/kendrick/Development/tux/tp/tuxpaint/docs/html/OPTIONS.html
16. file:///home/kendrick/Development/tux/tp/tuxpaint/docs/html/OPTIONS.html
17. file:///home/kendrick/Development/tux/tp/tuxpaint/docs/html/OPTIONS.html
18. file:///home/kendrick/Development/tux/tp/tuxpaint/docs/html/OPTIONS.html
19. file:///home/kendrick/Development/tux/tp/tuxpaint/docs/html/OPTIONS.html
20. file:///home/kendrick/Development/tux/tp/tuxpaint/docs/html/README.html#save
21. file:///home/kendrick/Development/tux/tp/tuxpaint/docs/AUTHORS.txt
22. file:///home/kendrick/Development/tux/tp/tuxpaint/docs/CHANGES.txt
23. file:///home/kendrick/Development/tux/tp/tuxpaint/docs/COPYING.txt
24. file:///home/kendrick/Development/tux/tp/tuxpaint/docs/INSTALL.txt
25. file:///home/kendrick/Development/tux/tp/tuxpaint/docs/html/OPTIONS.html
26. file:///home/kendrick/Development/tux/tp/tuxpaint/docs/PNG.txt
27. file:///home/kendrick/Development/tux/tp/tuxpaint/docs/TODO.txt
28. http://www.newbreedsoftware.com/
29. http://www.newbreedsoftware.com/tuxpaint/lists/

4
docs/TODO.txt
View file

@ -6,12 +6,12 @@ Copyright (c) 2004 by Bill Kendrick
bill@newbreedsoftware.com
http://www.newbreedsoftware.com/tuxpaint/
September 21, 2004
October 24, 2004
BUGS!
-----
* Get Starters to work properly in 800x600 mode.
* Scale down larger images when loading in lower resolution!!!
HIGH-PRIORITY DOCUMENTATION CHANGES:

20
docs/html/OPTIONS.html
View file

@ -22,7 +22,7 @@ New Breed Software</p>
<p><a href="mailto:bill@newbreedsoftware.com">bill@newbreedsoftware.com</a><br>
<a href="http://www.newbreedsoftware.com/tuxpaint/">http://www.newbreedsoftware.com/tuxpaint/</a></p>
<p>October 23, 2004</p>
<p>October 24, 2004</p>
</center>
<hr size=2 noshade>
@ -102,10 +102,18 @@ New Breed Software</p>
Run the program in full screen mode, rather than in a window.
</dd>
<dt><code><b>800x600=yes</b></code></dt>
<dt><code><b>windowsize=<i>SIZE</i></b></code></dt>
<dd>
Run the program at 800x600 resolution (EXPERIMENTAL), rather
than the smaller 640x480 resolution.
Run the program at a higher resolution, rather than the default of 640x480.
The <i>SIZE</i> value may be one of:
<ul>
<li>640x480
<li>800x600
<li>1024x768
<li>1280x1024
<li>1400x1050
<li>1600x1200
</ul>
</dd>
<dt><code><b>nosound=yes</b></code></dt>
@ -591,6 +599,10 @@ New Breed Software</p>
<dt><code><b>
--fullscreen<br>
--800x600<br>
--1024x768<br>
--1280x1204<br>
--1400x1050<br>
--1600x1200<br>
--nosound<br>
--noquit<br>
--noprint<br>

5
docs/html/README.html
View file

@ -23,7 +23,7 @@ New Breed Software</p>
<p><a href="mailto:bill@newbreedsoftware.com">bill@newbreedsoftware.com</a><br>
<a href="http://www.newbreedsoftware.com/tuxpaint/">http://www.newbreedsoftware.com/tuxpaint/</a></p>
<p>June 14, 2002 - October 23, 2004</p>
<p>June 14, 2002 - October 24, 2004</p>
</center>
<hr size=2 noshade>
@ -1327,7 +1327,8 @@ New Breed Software</p>
<p>The 'starter' images should be the same size as Tux&nbsp;Paint's
canvas. In the default 640x480 mode, that is 448x376 pixels.
(If you're using 800x600 mode, it should be 608x496.)</p>
If you're using 800x600 mode, it should be 608x496. (It should be
192 pixels less wide, and 104 pixels less tall than the resolution.)</p>
<p>Place them in the "<code><b>starters</b></code>" directory.
When the 'Open' dialog is accessed in Tux&nbsp;Paint, the 'starter'

11
src/manpage/tuxpaint.1
View file

@ -1,5 +1,5 @@
.\" tuxpaint.1 - 2004.09.13
.TH TUXPAINT 1 "13 Sep 2004" "0.9.14" "Tux Paint"
.\" tuxpaint.1 - 2004.10.24
.TH TUXPAINT 1 "24 Oct 2004" "0.9.15" "Tux Paint"
.SH NAME
tuxpaint -- A drawing program for young children.
@ -10,7 +10,7 @@ tuxpaint -- A drawing program for young children.
.TP 9
.B tuxpaint
[\-\-fullscreen]
[\-\-800x600]
[\-\-800x600 | \-\-1024x768 | \-\-1280x1024 | \-\-1400x1050 | \-\-1600x1200]
[\-\-nosound]
[\-\-noquit]
[\-\-noprint]
@ -102,9 +102,8 @@ configuration files. (See below.)
Run \fITux Paint\fP in full-screen mode, or in a window (default).
.TP 8
.B \-\-800x600 \-\-640x480
Run \fITux Paint\fP at 800x600 resolution (EXPERIMENTAL), or
640x480 resolution (default).
.B \-\-800x600 \-\-1024x768 \-\- 1280x1024 \-\-1400x1050 \-\-1600x1200 \-\-640x480
Run \fITux Paint\fP at higher resolution, or 640x480 resolution (default).
.TP 8
.B \-\-nosound \-\-sound

89
src/tuxpaint.c
View file

@ -21,12 +21,12 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
June 14, 2002 - October 23, 2004
June 14, 2002 - October 24, 2004
*/
#define VER_VERSION "0.9.15"
#define VER_DATE "2004-10-23"
#define VER_DATE "2004-10-24"
/* #define DEBUG */
@ -3871,7 +3871,9 @@ void show_usage(FILE * f, char * prg)
"\n"
"Usage: %s {--usage | --help | --version | --copying}\n"
"\n"
" %s [--windowed | --fullscreen] [--640x480 | --800x600]\n"
" %s [--windowed | --fullscreen]\n"
" %s [--640x480 | --800x600 | --1024x768 |\n"
" %s --1280x1024 | --1400x1050 | --1600x1200]\n"
" %s [--sound | --nosound] [--quit | --noquit]\n"
" %s [--print | --noprint] [--complexshapes | --simpleshapes]\n"
" %s [--mixedcase | --uppercase] [--fancycursors | --nofancycursors]\n"
@ -3896,7 +3898,7 @@ void show_usage(FILE * f, char * prg)
blank, blank, blank,
blank, blank, blank,
blank, blank, blank,
blank,
blank, blank, blank,
#ifdef WIN32
blank,
#endif
@ -4061,6 +4063,7 @@ void setup(int argc, char * argv[])
SDL_Surface * tmp_btn;
Uint8 r, g, b, a;
#endif
SDL_Surface * tmp_imgcurup, * tmp_imgcurdown;
#ifdef __BEOS__
@ -4238,6 +4241,26 @@ void setup(int argc, char * argv[])
{
noshortcuts = 0;
}
else if (strcmp(argv[i], "--1600x1200") == 0)
{
WINDOW_WIDTH = 1600;
WINDOW_HEIGHT = 1200;
}
else if (strcmp(argv[i], "--1400x1050") == 0)
{
WINDOW_WIDTH = 1400;
WINDOW_HEIGHT = 1050;
}
else if (strcmp(argv[i], "--1280x1024") == 0)
{
WINDOW_WIDTH = 1280;
WINDOW_HEIGHT = 1024;
}
else if (strcmp(argv[i], "--1024x768") == 0)
{
WINDOW_WIDTH = 1024;
WINDOW_HEIGHT = 768;
}
else if (strcmp(argv[i], "--800x600") == 0)
{
WINDOW_WIDTH = 800;
@ -5233,20 +5256,19 @@ void setup(int argc, char * argv[])
show_progress_bar();
tmp_imgcurup = loadimage(DATA_PREFIX "images/ui/cursor_up_large.png");
tmp_imgcurdown = loadimage(DATA_PREFIX "images/ui/cursor_down_large.png");
img_cursor_up = thumbnail(tmp_imgcurup, THUMB_W, THUMB_H, 0);
img_cursor_down = thumbnail(tmp_imgcurdown, THUMB_W, THUMB_H, 0);
/* FIXME: Hmm... how should we REALLY deal with this? */
#ifdef SVGA
img_cursor_up = loadimage(DATA_PREFIX "images/ui/cursor_up_large.png");
img_cursor_down = loadimage(DATA_PREFIX "images/ui/cursor_down_large.png");
#else
img_cursor_up = loadimage(DATA_PREFIX "images/ui/cursor_up.png");
img_cursor_down = loadimage(DATA_PREFIX "images/ui/cursor_down.png");
#endif
img_cursor_starter_up = loadimage(DATA_PREFIX
"images/ui/cursor_starter_up.png");
img_cursor_starter_down = loadimage(DATA_PREFIX
"images/ui/cursor_starter_down.png");
tmp_imgcurup = loadimage(DATA_PREFIX "images/ui/cursor_starter_up.png");
tmp_imgcurdown = loadimage(DATA_PREFIX "images/ui/cursor_starter_down.png");
img_cursor_starter_up = thumbnail(tmp_imgcurup, THUMB_W, THUMB_H, 0);
img_cursor_starter_down = thumbnail(tmp_imgcurdown, THUMB_W, THUMB_H, 0);
SDL_FreeSurface(tmp_imgcurup);
SDL_FreeSurface(tmp_imgcurdown);
show_progress_bar();
img_scroll_up = loadimage(DATA_PREFIX "images/ui/scroll_up.png");
img_scroll_down = loadimage(DATA_PREFIX "images/ui/scroll_down.png");
@ -9914,12 +9936,7 @@ int do_open(int want_new_tool)
{
/* Check for coloring-book style 'starter' images first: */
/* FIXME: On Windows, MacOSX, BeOS, etc. -- do it their way! */
#ifdef WIN32
dirname[places_to_look] = strdup(DATA_PREFIX "starters");
#else
dirname[places_to_look] = strdup("/usr/local/share/tuxpaint/starters");
#endif
}
else
{
@ -10792,7 +10809,7 @@ int do_open(int want_new_tool)
SDL_MapRGB(canvas->format, 255, 255, 255));
/* FIXME: What to do when in 640x480 mode, and loading an
800x600 image!? */
800x600 (or larger) image!? */
dest.x = (canvas->w - img->w) / 2;
dest.y = (canvas->h - img->h) / 2;
@ -12326,13 +12343,35 @@ void parse_options(FILE * fi)
{
noshortcuts = 0;
}
else if (strcmp(str, "800x600=yes") == 0)
else if (strcmp(str, "windowsize=1600x1200") == 0)
{
WINDOW_WIDTH = 1600;
WINDOW_HEIGHT = 1200;
}
else if (strcmp(str, "windowsize=1400x1050") == 0)
{
WINDOW_WIDTH = 1400;
WINDOW_HEIGHT = 1050;
}
else if (strcmp(str, "windowsize=1280x1024") == 0)
{
WINDOW_WIDTH = 1280;
WINDOW_HEIGHT = 1024;
}
else if (strcmp(str, "windowsize=1024x768") == 0)
{
WINDOW_WIDTH = 1024;
WINDOW_HEIGHT = 768;
}
else if (strcmp(str, "800x600=yes") == 0 ||
strcmp(str, "windowsize=800x600") == 0)
{
WINDOW_WIDTH = 800;
WINDOW_HEIGHT = 600;
}
else if (strcmp(str, "800x600=no") == 0 ||
strcmp(str, "640x480=yes") == 0)
strcmp(str, "640x480=yes") == 0 ||
strcmp(str, "windowsize=640x480") == 0)
{
WINDOW_WIDTH = 640;
WINDOW_HEIGHT = 480;

14
src/tuxpaint.conf
View file

@ -5,7 +5,7 @@
#
# Bill Kendrick <bill@newbreedsoftware.com>
# Default distribution version last modified:
# May 30, 2004
# October 24, 2004
# The variables described below are initially commented out.
@ -39,11 +39,15 @@
# windowed=yes
### Larger, 800x600 mode (EXPERIMENTAL), or smaller 640x480 mode?
### -------------------------------------------------------------
### Window size / screen resolution. (640x480 is the default.)
### -----------------------------------------------------------
#
# 800x600=yes
# 640x480=yes
# windowsize=1600x1200
# windowsize=1400x1050
# windowsize=1280x1024
# windowsize=1024x768
# windowsize=800x600
# windowsize=640x480
### Disable sound effects?