From ed85a6c8f1c49914619b14e8638a28f28366c906 Mon Sep 17 00:00:00 2001
From: William Kendrick <wkendrick@users.sourceforge.net>
Date: Wed, 23 Nov 2005 21:48:16 +0000
Subject: [PATCH] Added missing "--buttondistinction" command-line option.
 Documented "no button distinction" feature in --usage and man page.

---
 src/manpage/tuxpaint.1 | 15 +++++++++++++--
 src/tuxpaint.c         |  9 +++++++--
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/manpage/tuxpaint.1 b/src/manpage/tuxpaint.1
index 1ef650a20..dbf101a2b 100644
--- a/src/manpage/tuxpaint.1
+++ b/src/manpage/tuxpaint.1
@@ -1,5 +1,5 @@
-.\" tuxpaint.1 - 2005.11.20
-.TH TUXPAINT 1 "20 Nov 2005" "0.9.15" "Tux Paint"
+.\" tuxpaint.1 - 2005.11.23
+.TH TUXPAINT 1 "23 Nov 2005" "0.9.15" "Tux Paint"
 .SH NAME
 tuxpaint -- A drawing program for young children.
 
@@ -21,6 +21,7 @@ tuxpaint -- A drawing program for young children.
 [\-\-grab]
 [\-\-noshortcuts]
 [\-\-nowheelmouse]
+[\-\-nobuttondistinction]
 [\-\-nofancycursors]
 [\-\-nooutlines]
 [\-\-nostamps]
@@ -47,6 +48,7 @@ tuxpaint -- A drawing program for young children.
 [\-\-dontgrab]
 [\-\-shortcuts]
 [\-\-wheelmouse]
+[\-\-buttondistinction]
 [\-\-fancycursors]
 [\-\-outlines]
 [\-\-stamps]
@@ -169,6 +171,15 @@ wheel completely ignored, with the \fI\-\-nowheelmouse\fP option.
 This is useful for children who aren't yet comfortable with the mouse.
 Default is to support the wheel.
 
+.TP 8
+.B \-\-nobuttondistinction \-\-buttondistinction
+By default, only mouse button #1 (typically the leftmost mouse button
+on mice with more than one button) can be used for interacting with
+\fITux Paint\fP.  With the \fI\-\-nobuttondistinction\fP option,
+mouse buttons #2 (middle) and #3 (right) can be used, as well.
+This is useful for children who aren't yet comfortable with the mouse.
+Default is to only recognize button #1.
+
 .TP 8
 .B \-\-nofancycursors \-\-fancycursors
 Disable or enable (default) the 'fancy' mouse pointer shapes in \fITux Paint\fP.
diff --git a/src/tuxpaint.c b/src/tuxpaint.c
index 314022e15..1b0bd10d0 100644
--- a/src/tuxpaint.c
+++ b/src/tuxpaint.c
@@ -22,7 +22,7 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   (See COPYING.txt)
   
-  June 14, 2002 - November 20, 2005
+  June 14, 2002 - November 23, 2005
 */
 
 
@@ -6436,6 +6436,7 @@ static void show_usage(FILE * f, char * prg)
 	  "  %s [--mixedcase | --uppercase]   [--fancycursors | --nofancycursors]\n"
 	  "  %s [--mouse | --keyboard]        [--dontgrab | --grab]\n"
 	  "  %s [--noshortcuts | --shortcuts] [--wheelmouse | --nowheelmouse]\n"
+	  "  %s [--nobuttondistinction | --buttondistinction ]\n"
 	  "  %s [--outlines | --nooutlines]   [--stamps | --nostamps]\n"
 	  "  %s [--sysfonts | --nosysfonts]\n"
 	  "  %s [--nostampcontrols | --stampcontrols]\n"
@@ -6462,7 +6463,7 @@ static void show_usage(FILE * f, char * prg)
 	  blank,
 #endif
 	  blank, blank, blank,
-	  blank);
+	  blank, blank);
 
   free(blank);
 }
@@ -7986,6 +7987,10 @@ static void setup(int argc, char * argv[])
 	{
 	  no_button_distinction = 1;
 	}
+      else if (strcmp(argv[i], "--buttondistinction") == 0)
+	{
+	  no_button_distinction = 0;
+	}
       else if (strcmp(argv[i], "--sysfonts") == 0)
 	{
 	  no_system_fonts = 0;