Support for 1024x768, 1280x1024, 1400x1050 and 1600x1200 resolutions!
(Thanks, Shin-Ichi!)
This commit is contained in:
William Kendrick
parent
42529fa427
commit
bdc6d1eb4f
9 changed files with 243 additions and 134 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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?
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue