"noquit" now disables [Esc] key for quit. Use [Sh]+[Ctrl]+[Esc].

docs/CHANGES.txt

@@ -7,7 +7,7 @@ bill@newbreedsoftware.com
 http://www.newbreedsoftware.com/tuxpaint/
 
 
-2005.January.07 (0.9.15)
+2005.January.08 (0.9.15)
   * Stamp tool improvements:
     ------------------------
     * Greatly improved stamp outlining (to avoid empty rows or columns
@@ -119,6 +119,13 @@ http://www.newbreedsoftware.com/tuxpaint/
       256 to 512.
       Albert Cahalan <albert@users.sourceforge.net>
 
+    * The "noquit" option now prevents the [Escape] key from quitting
+      Tux Paint.  ([Alt]+[F4] and the window close button still work.)
+
+    * Tux Paint can now be quit with [Shift]+[Control]+[Escape], as well.
+      (Useful for when "noquit" and "fullscreen" are set, and the
+      [Alt]+[F4] combination is not possible.)
+  
   * Bug fixes:
     -------------------
     * Lockfile now cleared upon exit, allowing Tux Paint to be re-launched

docs/FAQ.txt

@@ -2,11 +2,11 @@ FAQ.txt for Tux Paint
 
 Tux Paint - A simple drawing program for children.
 
-Copyright 2004 by Bill Kendrick
+Copyright 2005 by Bill Kendrick
 bill@newbreedsoftware.com
 http://www.newbreedsoftware.com/tuxpaint/
 
-September 14, 2002 - September 14, 2004
+September 14, 2002 - January 8, 2005
 
 
 Frequently Asked Questions:
@@ -178,7 +178,7 @@ Frequently Asked Questions:
 	The appropriate fonts for such locales can be downloaded from the
 	Tux Paint website:
 
-	  http://www.newbreedsoftware.com/tuxpaint/download/fonts.php3
+	  http://www.newbreedsoftware.com/tuxpaint/download/fonts/
 
 
   Printing
@@ -398,6 +398,41 @@ Frequently Asked Questions:
       command-line.
 
 
+    I can't quit Tux Paint
+    ----------------------
+      The "noquit" option is set.  This disables the "Quit" button in
+      Tux Paint's toolbar (greying it out), and prevents Tux Paint from
+      being quit using the [Escape] key.
+
+      If Tux Paint is not in fullscreen mode, simply click the
+      window close button on Tux Paint's title bar.
+      (i.e., the "(x) at the upper right.)
+
+      If Tux Paint is in fullscreen mode, you will need to use the
+      [Shift] + [Control] + [Escape] sequence on the keyboard to
+      quit Tux Paint.
+
+      (Note: with or without "noquit" set, you can always use the
+      [Alt] + [F4] combination on your keyboard to quit Tux Paint.)
+
+
+    I don't want "noquit" mode enabled!
+    -----------------------------------
+      If you're running Tux Paint from a command-line, make sure you're
+      not giving it a "--noquit" option.
+
+      If you're running Tux Paint by double-clicking an icon, check the
+      properties of the icon to see if "--noquit" is listed as an argument.
+
+      If "--noquit" isn't on the command-line, check Tux Paint's
+      configuration file ("~/.tuxpaintrc" under Linux and Unix, 
+      "tuxpaint.cfg" under Windows) for a line reading:  "noquit=yes".
+
+      Either remove that line, or simply run Tux Paint with the command-line
+      argument: "--quit", which will override the configuration file's
+      setting.
+
+
     Tux Paint keeps writing weird messages to the screen / to a text file
     ---------------------------------------------------------------------
       A few messages are normal, but if Tux Paint is being extremely verbose

docs/OPTIONS.txt

@@ -9,7 +9,7 @@
                            bill@newbreedsoftware.com
                    http://www.newbreedsoftware.com/tuxpaint/
 
-                                January 6, 2005
+                                January 8, 2005
 
    ---------------------------------------------------------------------------
 
@@ -86,8 +86,16 @@ Windows Users
              Disable sound effects.
 
      noquit=yes
-             Disable the on-screen "Quit" button. (Pressing the [Escape] key
+
-             or clicking the window's close button still works.)
+             Disable the on-screen "Quit" button and prevent the [Escape] key
+             from quitting Tux Paint.
+
+             Using the [Alt] + [F4] keyboard combination or clicking the
+             window's close button (assuming you're not in fullscreen mode)
+             still works to quit Tux Paint.
+
+             You can also use the following keyboard combination to quit:
+             [Shift] + [Control] + [Escape].
 
      noprint=yes
              Disable the printing feature.

docs/README.txt

@@ -3,13 +3,13 @@
 
                      A simple drawing program for children
 
-                        Copyright 2004 by Bill Kendrick
+                        Copyright 2005 by Bill Kendrick
                                New Breed Software
 
                            bill@newbreedsoftware.com
                    http://www.newbreedsoftware.com/tuxpaint/
 
-                       June 14, 2002 - December 11, 2004
+                        June 14, 2002 - January 8, 2005
 
    ---------------------------------------------------------------------------
 
@@ -596,11 +596,7 @@ Available Tools
                  [IMG]
 
                  Clicking the "Quit" button, closing the Tux Paint window, or
-                 pushing the "Escape" key will quit Tux Paint.
+                 pushing the [Escape] key will quit Tux Paint.
-
-                 (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.)
 
                  You will first be prompted as to whether you really want to
                  quit.
@@ -614,6 +610,19 @@ Available Tools
                  NOTE: If the image is saved, it will be reloaded
                  automatically the next time you run Tux Paint!
 
+                 NOTE: The "Quit" button and [Escape] key can be disabled
+                 (e.g., by selecting "Disable 'Quit' Button" in
+                 Tux Paint Config. or running Tux Paint with the "--noquit"
+                 command-line option).
+
+                 In that case, the "window close" button on Tux Paint's title
+                 bar (if not in fullscreen mode) or the [Alt] + [F4] key
+                 sequence may be used to quit.
+
+                 If neither of those are possible, the key sequence of
+                 [Shift] + [Control] + [Escape] may be used to quit. (See the
+                 "Options" documentation.)
+
    ---------------------------------------------------------------------------
 
                      Loading Other Pictures into Tux Paint

docs/html/OPTIONS.html

@@ -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>January 6, 2005</p>
+<p>January 8, 2005</p>
 </center>
 
 <hr size=2 noshade>
@@ -123,9 +123,15 @@ New Breed Software</p>
 
   <dt><code><b>noquit=yes</b></code></dt>
   <dd>
-    Disable the on-screen "Quit" button.
+    <p>Disable the on-screen "Quit" button and prevent the <b>[Escape]</b> key
-    (Pressing the <b>[Escape]</b> key or clicking the window's close
+    from quitting <i>Tux&nbsp;Paint</i>.</p>
-    button still works.)
+    
+    <p>Using the <b>[Alt]</b>&nbsp;+&nbsp;<b>[F4]</b> keyboard combination
+    or clicking the window's close button (assuming you're not in
+    fullscreen mode) still works to quit <i>Tux&nbsp;Paint</i>.</p>
+
+    <p>You can also use the following keyboard combination to quit:
+    <b>[Shift]</b>&nbsp;+&nbsp;<b>[Control]</b>&nbsp;+&nbsp;<b>[Escape]</b>.</p>
   </dd>
   
   <dt><code><b>noprint=yes</b></code></dt>

docs/html/README.html

@@ -17,13 +17,13 @@ version
 </h1>
 <h3>A simple drawing program for children</h3>
 
-<p>Copyright 2004 by Bill Kendrick<br>
+<p>Copyright 2005 by Bill Kendrick<br>
 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 - December 11, 2004</p>
+<p>June 14, 2002 - January 8, 2005</p>
 </center>
 
 <hr size=2 noshade>
@@ -801,13 +801,7 @@ New Breed Software</p>
         <img src="images/tool_quit.png" width=48 height=48 alt="" align=right>
 
         <p>Clicking the "Quit" button, closing the Tux&nbsp;Paint window, or
-        pushing the "Escape" key will quit Tux&nbsp;Paint.</p>
+        pushing the <b>[Escape]</b> key will quit Tux&nbsp;Paint.</p>
-
-	<p>(NOTE: The "Quit" button can be disabled (e.g., with the
-        "<code>--noquit</code>" command-line option), but the <b>[Escape]</b>
-        key will still work.
-	See the "<a href="OPTIONS.html"><i>Options</i></a>"
-	documentation.)</p>
 	
         <p>You will first be prompted as to whether you really want to quit.</p>
 
@@ -819,6 +813,21 @@ New Breed Software</p>
 	<p>NOTE: If the image is saved, it will be reloaded automatically
 	the next time you run Tux&nbsp;Paint!</p>
 
+	<p><b>NOTE:</b> The "Quit" button and <b>[Escape]</b> key can be
+	disabled (e.g., by selecting "Disable&nbsp;'Quit'&nbsp;Button" in
+	<i>Tux&nbsp;Paint&nbsp;Config.</i> or running <i>Tux&nbsp;Paint</i>
+	with the "<code>--noquit</code>" command-line option).</p>
+	
+	<p>In that case, the "window&nbsp;close" button on
+	<i>Tux&nbsp;Paint's</i> title bar (if not in fullscreen mode) or
+	the <b>[Alt]</b>&nbsp;+&nbsp;<b>[F4]</b> key sequence may be used
+	to quit.</p>
+
+	<p>If neither of those are possible, the key sequence of
+	<b>[Shift]</b>&nbsp;+&nbsp;<b>[Control]</b>&nbsp;+&nbsp;<b>[Escape]</b>
+	may be used to quit.  (See the
+	"<a href="OPTIONS.html"><i>Options</i></a>" documentation.)</p>
+	
         <br clear=all>
       </dd>
       </dl>

src/tuxpaint.c

@@ -2460,7 +2460,12 @@ static void mainloop(void)
 	      
 	      handle_keymouse(key, SDL_KEYDOWN);
 
-	      if (key == SDLK_ESCAPE)
+	      if (key == SDLK_ESCAPE && !disable_quit)
+		{
+		  done = do_quit();
+		}
+	      else if (key == SDLK_ESCAPE &&
+		       (mod & KMOD_SHIFT) && (mod & KMOD_CTRL))
 		{
 		  done = do_quit();
 		}