From 176749ba9cc51a6dcaad9617903ee6d617e318df Mon Sep 17 00:00:00 2001
From: Bill Kendrick <nbs@sonic.net>
Date: Wed, 19 Jan 2022 00:29:05 -0800
Subject: [PATCH] Grok "[no]brushspacing" commandline/config option

For forthcoming feature
---
 src/parse.gperf | 1 +
 src/parse.h     | 1 +
 src/tuxpaint.c  | 8 +++++++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/parse.gperf b/src/parse.gperf
index 54f18d422..415b9bd12 100644
--- a/src/parse.gperf
+++ b/src/parse.gperf
@@ -120,6 +120,7 @@ help,                IMM(help)
 hidecursor,          POSBOOL(hide_cursor)
 keyboard,            POSBOOL(keymouse)
 label,               NEGBOOL(disable_label)
+brushspacing,        NEGBOOL(disable_brushspacing)
 lang,                MULTI(parsertmp_lang)
 locale,              MULTI(parsertmp_locale)
 lockfile,            POSBOOL(ok_to_use_lockfile)
diff --git a/src/parse.h b/src/parse.h
index 237337992..308ad7590 100644
--- a/src/parse.h
+++ b/src/parse.h
@@ -14,6 +14,7 @@ struct cfginfo
   const char *colorfile;
   const char *datadir;
   const char *disable_label;
+  const char *disable_brushspacing;
   const char *disable_magic_controls;
   const char *disable_shape_controls;
   const char *disable_print;
diff --git a/src/tuxpaint.c b/src/tuxpaint.c
index b1be4d67f..fa102c3db 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 - January 18, 2022
+  June 14, 2002 - January 19, 2022
 */
 
 #include "platform.h"
@@ -1299,6 +1299,8 @@ static int starter_personal;
 static int template_personal;
 static int starter_modified;
 
+static int disable_brushspacing;
+
 static Uint8 canvas_color_r, canvas_color_g, canvas_color_b;
 static Uint8 *touched;
 static Uint8 *sim_flood_touched;
@@ -7036,6 +7038,7 @@ void show_usage(int exitcode)
           "  [--nomagiccontrols | --magiccontrols]\n"
           "  [--noshapecontrols | --shapecontrols]\n"
           "  [--nolabel | --label]\n"
+          "  [--nobrushspacing | --brushspacing]\n"
           "  [--newcolorsfirst | --newcolorslast]\n"
           "\n"
           " Languages:\n"
@@ -9077,6 +9080,8 @@ static void draw_brushes(void)
   SDL_Rect src, dest;
   int most;
 
+printf("Disable brush spacing: %d\n", disable_brushspacing);
+
   /* Draw the title: */
   draw_image_title(TITLE_BRUSHES, r_ttoolopt);
 
@@ -23992,6 +23997,7 @@ static void setup_config(char *argv[])
   SETBOOL(all_locale_fonts);
   SETBOOL(autosave_on_quit);
   SETBOOL(disable_label);
+  SETBOOL(disable_brushspacing);
   SETBOOL(disable_magic_controls);
   SETBOOL(disable_shape_controls);
   SETBOOL(disable_print);