From 4f902a33973010bd454e92e3a8c8f59a8ffa96c6 Mon Sep 17 00:00:00 2001 From: William Kendrick Date: Sat, 9 Sep 2006 21:50:52 +0000 Subject: [PATCH] Added "startblank" option, to cause Tux Paint to always start with a blank canvas. --- docs/CHANGES.txt | 5 ++++- docs/OPTIONS.txt | 9 ++++++++- docs/html/OPTIONS.html | 10 +++++++++- src/manpage/tuxpaint.1 | 12 ++++++++++-- src/tuxpaint.c | 28 +++++++++++++++++++++++++--- 5 files changed, 56 insertions(+), 8 deletions(-) diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt index 08b0db22b..6e9f3de66 100644 --- a/docs/CHANGES.txt +++ b/docs/CHANGES.txt @@ -9,7 +9,7 @@ http://www.newbreedsoftware.com/tuxpaint/ $Id$ -2006.September.6 (0.9.16) +2006.September.9 (0.9.16) * Interface improvements: ----------------------- @@ -43,6 +43,9 @@ $Id$ Discovered (or assumed) window size and directory settings are shown when tuxpaint-import is first run (even with no arguments). + * "startblank" option added, to cause Tux Paint to always start with + a blank canvas (rather than loading the most-recently-edited image). + * In windowed mode, Tux Paint tries to open its window in the center of the screen (if supported by the OS or window manager). diff --git a/docs/OPTIONS.txt b/docs/OPTIONS.txt index b6aa42970..404722071 100644 --- a/docs/OPTIONS.txt +++ b/docs/OPTIONS.txt @@ -9,7 +9,7 @@ bill@newbreedsoftware.com http://www.newbreedsoftware.com/tuxpaint/ - April 29, 2006 + September 9, 2006 -------------------------------------------------------------------------- @@ -310,6 +310,11 @@ Windows Users situations where the program is only being used for fun, or in a test environment. + startblank=yes + This causes Tux Paint to display a blank canvas when it first + starts up, rather than loading the last image that was being + edited. + lang=LANGUAGE Run Tux Paint in one of the supported languages. Possible choice @@ -474,6 +479,7 @@ Windows Users --1280x1204 --1400x1050 --1600x1200 + --startblank --nosound --noquit --noprint @@ -504,6 +510,7 @@ Windows Users --windowed --640x480 + --startlast --sound --quit --print diff --git a/docs/html/OPTIONS.html b/docs/html/OPTIONS.html index 494bb8da8..6a5e9c608 100644 --- a/docs/html/OPTIONS.html +++ b/docs/html/OPTIONS.html @@ -22,7 +22,7 @@ New Breed Software

bill@newbreedsoftware.com
http://www.newbreedsoftware.com/tuxpaint/

-

April 29, 2006

+

September 9, 2006

@@ -383,6 +383,12 @@ New Breed Software

It can be used in situations where the program is only being used for fun, or in a test environment. + +
startblank=yes +
+ This causes Tux Paint to display a blank canvas when it first + starts up, rather than loading the last image that was being edited. +
lang=LANGUAGE
@@ -752,6 +758,7 @@ New Breed Software

--1280x1204
--1400x1050
--1600x1200
+ --startblank
--nosound
--noquit
--noprint
@@ -785,6 +792,7 @@ New Breed Software

--windowed
--640x480
+ --startlast
--sound
--quit
--print
diff --git a/src/manpage/tuxpaint.1 b/src/manpage/tuxpaint.1 index bf48aa528..a49be0716 100644 --- a/src/manpage/tuxpaint.1 +++ b/src/manpage/tuxpaint.1 @@ -1,5 +1,5 @@ -.\" tuxpaint.1 - 2006.09.08 -.TH TUXPAINT 1 "8 Sept 2006" "0.9.16" "Tux Paint" +.\" tuxpaint.1 - 2006.09.09 +.TH TUXPAINT 1 "9 Sept 2006" "0.9.16" "Tux Paint" .SH NAME tuxpaint -- A drawing program for young children. @@ -11,6 +11,7 @@ tuxpaint -- A drawing program for young children. .B tuxpaint [\-\-fullscreen] [\-\-800x600 | \-\-1024x768 | \-\-1280x1024 | \-\-1400x1050 | \-\-1600x1200 | \-\-WxH ] +[\-\-startblank] [\-\-nosound] [\-\-noquit] [\-\-noprint] @@ -38,6 +39,7 @@ tuxpaint -- A drawing program for young children. .B tuxpaint [\-\-windowed] [\-\-640x480] +[\-\-startlast] [\-\-sound] [\-\-quit] [\-\-print] @@ -244,6 +246,12 @@ The \fInosave\fP option disables \fITux Paint's\fP ability to save files. This can be used in situations where the program is only being used for fun, or in a test environment. +.TP 8 +.B \-\-startblank \-\-startlast +When you start \fITux Paint\fP, it loads the last image that was being worked +on. The \fI\-\-startblank\fP option disables this, so it always starts with +a blank canvas. The default behavior is \fI\-\-startlast\fP. + .SH OPTIONS - LANGUAGE .l Various parts of \fITux Paint\fP have been translated into numerous languages. diff --git a/src/tuxpaint.c b/src/tuxpaint.c index 10b481a93..11d14f8a0 100644 --- a/src/tuxpaint.c +++ b/src/tuxpaint.c @@ -776,7 +776,8 @@ static int fullscreen, disable_quit, simple_shapes, dont_do_xor, use_print_config, dont_load_stamps, noshortcuts, no_button_distinction, mirrorstamps, disable_stamp_controls, disable_save, ok_to_use_lockfile, - alt_print_command_default, scrolling = 0; + alt_print_command_default, scrolling = 0, + start_blank; static int want_alt_printcommand; static int starter_mirrored, starter_flipped, starter_personal; static int recording, playing; @@ -1427,7 +1428,9 @@ int main(int argc, char *argv[]) /* Load current image (if any): */ - load_current(); + if (start_blank == 0) + load_current(); + been_saved = 1; tool_avail[TOOL_SAVE] = 0; @@ -5164,6 +5167,7 @@ static void show_usage(FILE * f, char *prg) " %s [--windowed | --fullscreen]\n" " %s [--640x480 | --800x600 | --1024x768 |\n" " %s --1280x1024 | --1400x1050 | --1600x1200]\n" + " %s [--startblank | --startlast ]\n" " %s [--sound | --nosound] [--quit | --noquit]\n" " %s [--print | --noprint] [--complexshapes | --simpleshapes]\n" " %s [--mixedcase | --uppercase] [--fancycursors | --nofancycursors]\n" @@ -5188,7 +5192,7 @@ static void show_usage(FILE * f, char *prg) prg, prg, blank, blank, blank, blank, blank, blank, - blank, blank, blank, blank, blank, blank, blank, blank, + blank, blank, blank, blank, blank, blank, blank, blank, blank, #ifdef WIN32 blank, #endif @@ -5807,6 +5811,7 @@ static void setup(int argc, char *argv[]) recording = 0; playing = 0; ok_to_use_lockfile = 1; + start_blank = 0; #ifdef __BEOS__ @@ -5920,6 +5925,14 @@ static void setup(int argc, char *argv[]) { fullscreen = 0; } + else if (strcmp(argv[i], "--startblank") == 0 || strcmp(argv[i], "-b") == 0) + { + start_blank = 1; + } + else if (strcmp(argv[i], "--startlast") == 0) + { + start_blank = 0; + } else if (strcmp(argv[i], "--mirrorstamps") == 0) { mirrorstamps = 1; @@ -14529,6 +14542,15 @@ static void parse_options(FILE * fi) { fullscreen = 0; } + else if (strcmp(str, "startblank=yes") == 0) + { + start_blank = 1; + } + else if (strcmp(str, "startblank=no") == 0 || + strcmp(str, "startlast=yes") == 0) + { + start_blank = 0; + } else if (strcmp(str, "nostampcontrols=yes") == 0) { disable_stamp_controls = 1;