From 10881623cffba00949bddc2345ffd8a353763a05 Mon Sep 17 00:00:00 2001
From: William Kendrick <wkendrick@users.sourceforge.net>
Date: Fri, 27 Jul 2007 02:22:24 +0000
Subject: [PATCH] Added Octagon shape.  (Also means shape tool selector needed
 to scroll in 640x480, which has been done, too.)

---
 data/images/shapes/octagon.png   | Bin 0 -> 274 bytes
 data/images/shapes/octagon_f.png | Bin 0 -> 249 bytes
 docs/CHANGES.txt                 |   4 ++
 src/shapes.h                     |  42 ++++++++++++++++-----
 src/tuxpaint.c                   |  62 +++++++++++++++++++++++++------
 5 files changed, 87 insertions(+), 21 deletions(-)
 create mode 100644 data/images/shapes/octagon.png
 create mode 100644 data/images/shapes/octagon_f.png

diff --git a/data/images/shapes/octagon.png b/data/images/shapes/octagon.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5208b1db4a8ea9298a0fd98d4e1056662c075e5
GIT binary patch
literal 274
zcmeAS@N?(olHy`uVBq!ia0vp^8bB<^!3HGb?#A2&Qfx`y?k)`fL2$v|<&%LToCO|{
z#S9DrbAZ^Fao@XhSwKPd5>H=O_Ur7@OgwUnU+U}t3eER)aSVw#{Pu<+UxNY<>jing
z2b>-54;1dze-h}+*<~Qf+Fg^wYoECI<?Rf{Cy@*;47)!Z3Gw#TUB~^YCz_Fkq4;4-
z$@H#0hbkTSrYqflwBkgV1=l9ib()h}v)fW06`eSq`1sv~qyz?gMfQ@`M{Ai4ZXb56
zWGi4`|M336%I1Zu+J7zg`@3O5-JKx&4YMSE`s(<qUGo#}-rc#r-`}pEkN@fM$G=rx
R7y+Hi;OXk;vd$@?2>_QzXxab(

literal 0
HcmV?d00001

diff --git a/data/images/shapes/octagon_f.png b/data/images/shapes/octagon_f.png
new file mode 100644
index 0000000000000000000000000000000000000000..37d454ba3de56a37e71e2721c1979df4b240030b
GIT binary patch
literal 249
zcmeAS@N?(olHy`uVBq!ia0vp^8bB<^!3HGb?#A2&Qfx`y?k)`fL2$v|<&%LToCO|{
z#S9DrbAZ^Fao@XhSwKPd5>H=O_Ur7@Ogskl_KM{|p*Bw!$B>A_Z*Lg#H7M}3K8zQ)
zowNA6J^S2(L}NF>s5LLWB|P_UTpuu>*TZ35&B{NaXQStEZW3MI^`<r0@!PRd*Q|%T
z6t))ndT8I#E!xGPmT=IFX^ns5Ohe1cG`o2WYz7UCJP8b?4Mqo)Ob^_Z&`f<+FBT@Q
py}$d?lSO5_G~Vg?$vgMCv-{UL&59H}{1xaT22WQ%mvv4FO#n%!Rg3@t

literal 0
HcmV?d00001

diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
index dae3df754..0573d51d9 100644
--- a/docs/CHANGES.txt
+++ b/docs/CHANGES.txt
@@ -19,10 +19,14 @@ $Id$
       + New images can be given solid background colors
         (which the 'Eraser' tool erases to)
 
+  * Tool Improvements:
+    ------------------
     * Added a 'color picker' entry to the color palette; allows choosing
       from over 50,000 colors.  Used by drawing and Magic tools, as well
       as the new 'New' dialog.
 
+    * Added an Octagon shape to the 'Shapes' tool.
+
   * Documentation Imrpovements:
     ---------------------------
     * Improved --usage output.
diff --git a/src/shapes.h b/src/shapes.h
index 22d7fe88f..25915d45c 100644
--- a/src/shapes.h
+++ b/src/shapes.h
@@ -23,7 +23,7 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   (See COPYING.txt)
 
-  June 14, 2002 - July 17, 2007
+  June 14, 2002 - July 26, 2007
   $Id$
 */
 
@@ -47,6 +47,8 @@ enum
   SHAPE_PENTAGON_FILL,
   SHAPE_RHOMBUS,
   SHAPE_RHOMBUS_FILL,
+  SHAPE_OCTAGON,
+  SHAPE_OCTAGON_FILL,
   NUM_SHAPES
 };
 
@@ -67,7 +69,9 @@ const int shape_sides[NUM_SHAPES] = {
   5,				/* Pentagon */
   5,				/* Pentagon */
   4,				/* Rhombus */
-  4				/* Rhombus */
+  4,				/* Rhombus */
+  8,				/* Octagon */
+  8				/* Octagon */
 };
 
 
@@ -87,7 +91,9 @@ const int shape_locked[NUM_SHAPES] = {
   0,				/* Pentagon */
   0,				/* Pentagon */
   0,				/* Rhombus */
-  0				/* Rhombus */
+  0,				/* Rhombus */
+  1,				/* Octagon */
+  1				/* Octagon */
 };
 
 
@@ -107,7 +113,9 @@ const int shape_filled[NUM_SHAPES] = {
   0,				/* Pentagon */
   1,				/* Pentagon */
   0,				/* Rhombus */
-  1				/* Rhombus */
+  1,				/* Rhombus */
+  0,				/* Octagon */
+  1				/* Octagon */
 };
 
 
@@ -128,7 +136,9 @@ const int shape_init_ang[NUM_SHAPES] = {
   162,				/* Pentagon */
   162,				/* Pentagon */
   0,				/* Rhombus */
-  0				/* Rhombus */
+  0,				/* Rhombus */
+  22,				/* Octagon */
+  22				/* Octagon */
 };
 
 
@@ -148,7 +158,9 @@ const int shape_no_rotate[NUM_SHAPES] = {
   0,				/* Pentagon */
   0,				/* Pentagon */
   0,				/* Rhombus */
-  0				/* Rhombus */
+  0,				/* Rhombus */
+  0,				/* Octagon */
+  0				/* Octagon */
 };
 
 
@@ -181,7 +193,11 @@ const char *const shape_names[NUM_SHAPES] = {
 
   // Rhombus shape tool (4 sides, not at right angles)
   gettext_noop("Rhombus"),
-  gettext_noop("Rhombus")
+  gettext_noop("Rhombus"),
+
+  // Octagon shape tool (8 sides)
+  gettext_noop("Octagon"),
+  gettext_noop("Octagon")
 };
 
 
@@ -218,7 +234,13 @@ const char *const shape_tips[NUM_SHAPES] = {
   gettext_noop
     ("A rhombus has four equal sides, and opposite sides are parallel."),
   gettext_noop
-    ("A rhombus has four equal sides, and opposite sides are parallel.")
+    ("A rhombus has four equal sides, and opposite sides are parallel."),
+
+  // Description of an octagon
+  gettext_noop
+    ("An octagon has eight equal sides."),
+  gettext_noop
+    ("An octagon has eight equal sides.")
 };
 
 
@@ -238,5 +260,7 @@ const char *const shape_img_fnames[NUM_SHAPES] = {
   DATA_PREFIX "images/shapes/pentagon.png",
   DATA_PREFIX "images/shapes/pentagon_f.png",
   DATA_PREFIX "images/shapes/diamond.png",
-  DATA_PREFIX "images/shapes/diamond_f.png"
+  DATA_PREFIX "images/shapes/diamond_f.png",
+  DATA_PREFIX "images/shapes/octagon.png",
+  DATA_PREFIX "images/shapes/octagon_f.png"
 };
diff --git a/src/tuxpaint.c b/src/tuxpaint.c
index 21f5570bf..a2790b96f 100644
--- a/src/tuxpaint.c
+++ b/src/tuxpaint.c
@@ -8375,23 +8375,60 @@ static void draw_stamps(void)
 
 static void draw_shapes(void)
 {
-  int i;
+  int i, shape, max, off_y;
   SDL_Rect dest;
 
 
   draw_image_title(TITLE_SHAPES, r_ttoolopt);
 
-  for (i = 0; i < 14 + TOOLOFFSET; i++)
+
+  if (NUM_SHAPES > 14 + TOOLOFFSET)
   {
+    off_y = 24;
+    max = 12 + TOOLOFFSET;
+
+    dest.x = WINDOW_WIDTH - 96;
+    dest.y = 40;
+
+    if (shape_scroll > 0)
+    {
+      SDL_BlitSurface(img_scroll_up, NULL, screen, &dest);
+    }
+    else
+    {
+      SDL_BlitSurface(img_scroll_up_off, NULL, screen, &dest);
+    }
+
+    dest.x = WINDOW_WIDTH - 96;
+    dest.y = 40 + 24 + ((6 + TOOLOFFSET / 2) * 48);
+
+    if (shape_scroll < NUM_SHAPES - 12 - TOOLOFFSET)
+    {
+      SDL_BlitSurface(img_scroll_down, NULL, screen, &dest);
+    }
+    else
+    {
+      SDL_BlitSurface(img_scroll_down_off, NULL, screen, &dest);
+    }
+  }
+  else
+  {
+    off_y = 0;
+    max = 14 + TOOLOFFSET;
+  }
+
+  for (shape = shape_scroll; shape < shape_scroll + max; shape++)
+  {
+    i = shape - shape_scroll;
+
     dest.x = ((i % 2) * 48) + WINDOW_WIDTH - 96;
-    dest.y = ((i / 2) * 48) + 40;
+    dest.y = ((i / 2) * 48) + 40 + off_y;
 
-
-    if (i == cur_shape)
+    if (shape == cur_shape)
     {
       SDL_BlitSurface(img_btn_down, NULL, screen, &dest);
     }
-    else if (i < NUM_SHAPES)
+    else if (shape < NUM_SHAPES)
     {
       SDL_BlitSurface(img_btn_up, NULL, screen, &dest);
     }
@@ -8401,18 +8438,19 @@ static void draw_shapes(void)
     }
 
 
-    if (i < NUM_SHAPES)
+    if (shape < NUM_SHAPES)
     {
       dest.x = ((i % 2) * 48) + 4 + WINDOW_WIDTH - 96;
-      dest.y = ((i / 2) * 48) + 40 + 4;
+      dest.y = ((i / 2) * 48) + 40 + 4 + off_y;
 
-      SDL_BlitSurface(img_shapes[i], NULL, screen, &dest);
+      SDL_BlitSurface(img_shapes[shape], NULL, screen, &dest);
 
       dest.x = ((i % 2) * 48) + 4 + WINDOW_WIDTH - 96 +
-	(40 - img_shape_names[i]->w) / 2;
-      dest.y = ((i / 2) * 48) + 40 + 4 + (44 - img_shape_names[i]->h);
+	(40 - img_shape_names[shape]->w) / 2;
+      dest.y = ((i / 2) * 48) + 40 + 4 +
+               (44 - img_shape_names[shape]->h) + off_y;
 
-      SDL_BlitSurface(img_shape_names[i], NULL, screen, &dest);
+      SDL_BlitSurface(img_shape_names[shape], NULL, screen, &dest);
     }
   }
 }