notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of ssh://git.code.sf.net/p/tuxpaint/tuxpaint

Browse source
This commit is contained in:
dolphin6k 2021-10-21 18:05:34 +09:00
commit a0dfe6b1df
25 changed files with 433 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

18
docs/CHANGES.txt
View file

@ -8,7 +8,7 @@ http://www.tuxpaint.org/
$Id$
2021.October.19 (0.9.27)
2021.October.20 (0.9.27)
* New Magic Tools:
----------------
* "Lightning" - Draws a bolt of lightning striking between
@ -28,6 +28,9 @@ $Id$
* "Smooth Rainbow" - A smooth, gradient variation of the classic
"Rainbow" Magic tool.
* "Stretch" - Squish and stretch parts of your picture, giving a
fun-house mirror effect.
* Magic Tool Improvements:
------------------------
* "Halftone" works much better, drawing large overlapping circles
@ -180,12 +183,23 @@ $Id$
recipe file (.iss).
Easton Pillay <https://sourceforge.net/u/jedieaston/profile/>
* Remove old OpenCandy stuff from Windows .iss file.
* Other Windows installer updates:
+ Remove old OpenCandy stuff from Windows .iss file.
+ Updated to Inno Setup 6
+ Updated translation files for the installer
+ 64-bit version now to be installed in the standard "Program Files"
folder instead of "Program Files (x86)" as before Current 64bit
users are recommended to uninstall previous version of TuxPaint
before updating to 0.9.27.
+ Disabled start menu shortcut to outdated translations for readme.html.
+ Added language specification to start menu shorcuts for which
translation is supported both for the web site and installer.
TOYAMA Shin-ichi <shin1@wmail.plala.or.jp>
* Added shell script to build windows installer and portable zip archive.
TOYAMA Shin-ichi <shin1@wmail.plala.or.jp>
2021.June.28 (0.9.26)
* New Features
------------

BIN
magic/icons/stretch.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 8.8 KiB

1
magic/magic-docs/en/html/index.html
View file

@ -49,6 +49,7 @@
<li><a href="panels.html">Panels</a></li>
<li><a href="perspective.html">Perspective</a></li>
<li><a href="shift.html">Shift</a></li>
<li><a href="stretch.html">Stretch</a></li>
<li><a href="waves.html">Waves</a></li>
<li><a href="wavelets.html">Wavelets</a></li>
<li><a href="zoom.html">Zoom</a></li>

13
magic/magic-docs/en/html/stretch.html Normal file
View file

@ -0,0 +1,13 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<body><html><head><title>Tux Paint "Magic" Tool: Stretch</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
</head>
<body bgcolor="#FFFFFF" text="#000000" link="#0000FF" vlink="#FF0000" alink="#FF00FF">
<h1 align="center">Tux Paint "Magic" Tool: Stretch</h1>
<h2 align="center">Group: Picture Warps</h2>
<h3 align="center">Author:
Bill Kendrick &lt;<a href="mailto:bill@newbreedsoftware.com">bill@newbreedsoftware.com</a>&gt;</h3>
<p>Click and drag around to stretch and squish parts of the picture.</p>
<hr size="1" noshade />
<p align="center">Tux Paint 0.9.27</p>
</body></html>

1
magic/magic-docs/en/index.txt
View file

@ -45,6 +45,7 @@ Picture Warps
* Panels
* Perspective
* Shift
* Stretch
* Waves
* Wavelets
* Zoom

11
magic/magic-docs/en/stretch.txt Normal file
View file

@ -0,0 +1,11 @@
Tux Paint "Magic" Tool: Stretch
Group: Picture Warps
Author: Bill Kendrick <bill@newbreedsoftware.com>
Click and drag around to stretch and squish parts of the picture.
----------------------------------------------------------------------
Tux Paint 0.9.27

1
magic/magic-docs/es_ES.UTF-8/html/index.html
View file

@ -49,6 +49,7 @@
<li><a href="panels.html">Panels</a></li>
<li><a href="perspective.html">Perspective</a></li>
<li><a href="shift.html">Shift</a></li>
<li><a href="stretch.html">Stretch</a></li>
<li><a href="waves.html">Waves</a></li>
<li><a href="wavelets.html">Wavelets</a></li>
<li><a href="zoom.html">Zoom</a></li>

13
magic/magic-docs/es_ES.UTF-8/html/stretch.html Normal file
View file

@ -0,0 +1,13 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<body><html><head><title>Tux Paint "Magic" Tool: Stretch</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
</head>
<body bgcolor="#FFFFFF" text="#000000" link="#0000FF" vlink="#FF0000" alink="#FF00FF">
<h1 align="center">Tux Paint "Magic" Tool: Stretch</h1>
<h2 align="center">Group: Picture Warps</h2>
<h3 align="center">Author:
Bill Kendrick &lt;<a href="mailto:bill@newbreedsoftware.com">bill@newbreedsoftware.com</a>&gt;</h3>
<p>Click and drag around to stretch and squish parts of the picture.</p>
<hr size="1" noshade />
<p align="center">Tux Paint 0.9.27</p>
</body></html>

1
magic/magic-docs/es_ES.UTF-8/index.txt
View file

@ -45,6 +45,7 @@ Picture Warps
* Panels
* Perspective
* Shift
* Stretch
* Waves
* Wavelets
* Zoom

11
magic/magic-docs/es_ES.UTF-8/stretch.txt Normal file
View file

@ -0,0 +1,11 @@
Tux Paint "Magic" Tool: Stretch
Group: Picture Warps
Author: Bill Kendrick <bill@newbreedsoftware.com>
Click and drag around to stretch and squish parts of the picture.
----------------------------------------------------------------------
Tux Paint 0.9.27

1
magic/magic-docs/fr_FR.UTF-8/html/index.html
View file

@ -49,6 +49,7 @@
<li><a href="panels.html">Panels</a></li>
<li><a href="perspective.html">Perspective</a></li>
<li><a href="shift.html">Shift</a></li>
<li><a href="stretch.html">Stretch</a></li>
<li><a href="waves.html">Waves</a></li>
<li><a href="wavelets.html">Wavelets</a></li>
<li><a href="zoom.html">Zoom</a></li>

13
magic/magic-docs/fr_FR.UTF-8/html/stretch.html Normal file
View file

@ -0,0 +1,13 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<body><html><head><title>Tux Paint "Magic" Tool: Stretch</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
</head>
<body bgcolor="#FFFFFF" text="#000000" link="#0000FF" vlink="#FF0000" alink="#FF00FF">
<h1 align="center">Tux Paint "Magic" Tool: Stretch</h1>
<h2 align="center">Group: Picture Warps</h2>
<h3 align="center">Author:
Bill Kendrick &lt;<a href="mailto:bill@newbreedsoftware.com">bill@newbreedsoftware.com</a>&gt;</h3>
<p>Click and drag around to stretch and squish parts of the picture.</p>
<hr size="1" noshade />
<p align="center">Tux Paint 0.9.27</p>
</body></html>

1
magic/magic-docs/fr_FR.UTF-8/index.txt
View file

@ -45,6 +45,7 @@ Picture Warps
* Panels
* Perspective
* Shift
* Stretch
* Waves
* Wavelets
* Zoom

11
magic/magic-docs/fr_FR.UTF-8/stretch.txt Normal file
View file

@ -0,0 +1,11 @@
Tux Paint "Magic" Tool: Stretch
Group: Picture Warps
Author: Bill Kendrick <bill@newbreedsoftware.com>
Click and drag around to stretch and squish parts of the picture.
----------------------------------------------------------------------
Tux Paint 0.9.27

1
magic/magic-docs/gl_ES.UTF-8/html/index.html
View file

@ -49,6 +49,7 @@
<li><a href="panels.html">Panels</a></li>
<li><a href="perspective.html">Perspective</a></li>
<li><a href="shift.html">Maiúsculas</a></li>
<li><a href="stretch.html">Stretch</a></li>
<li><a href="waves.html">Waves</a></li>
<li><a href="wavelets.html">Wavelets</a></li>
<li><a href="zoom.html">Zoom</a></li>

13
magic/magic-docs/gl_ES.UTF-8/html/stretch.html Normal file
View file

@ -0,0 +1,13 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<body><html><head><title>Tux Paint "Magic" Tool: Stretch</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
</head>
<body bgcolor="#FFFFFF" text="#000000" link="#0000FF" vlink="#FF0000" alink="#FF00FF">
<h1 align="center">Tux Paint "Magic" Tool: Stretch</h1>
<h2 align="center">Group: Picture Warps</h2>
<h3 align="center">Author:
Bill Kendrick &lt;<a href="mailto:bill@newbreedsoftware.com">bill@newbreedsoftware.com</a>&gt;</h3>
<p>Click and drag around to stretch and squish parts of the picture.</p>
<hr size="1" noshade />
<p align="center">Tux Paint 0.9.27</p>
</body></html>

1
magic/magic-docs/gl_ES.UTF-8/index.txt
View file

@ -45,6 +45,7 @@ Picture Warps
* Panels
* Perspective
* Mai**sculas
* Stretch
* Waves
* Wavelets
* Zoom

11
magic/magic-docs/gl_ES.UTF-8/stretch.txt Normal file
View file

@ -0,0 +1,11 @@
Tux Paint "Magic" Tool: Stretch
Group: Picture Warps
Author: Bill Kendrick <bill@newbreedsoftware.com>
Click and drag around to stretch and squish parts of the picture.
----------------------------------------------------------------------
Tux Paint 0.9.27

1
magic/magic-docs/ja_JP.UTF-8/html/index.html
View file

@ -49,6 +49,7 @@
<li><a href="panels.html">Panels</a></li>
<li><a href="perspective.html">Perspective</a></li>
<li><a href="shift.html">Shift</a></li>
<li><a href="stretch.html">Stretch</a></li>
<li><a href="waves.html">Waves</a></li>
<li><a href="wavelets.html">Wavelets</a></li>
<li><a href="zoom.html">Zoom</a></li>

13
magic/magic-docs/ja_JP.UTF-8/html/stretch.html Normal file
View file

@ -0,0 +1,13 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<body><html><head><title>Tux Paint "Magic" Tool: Stretch</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
</head>
<body bgcolor="#FFFFFF" text="#000000" link="#0000FF" vlink="#FF0000" alink="#FF00FF">
<h1 align="center">Tux Paint "Magic" Tool: Stretch</h1>
<h2 align="center">Group: Picture Warps</h2>
<h3 align="center">Author:
Bill Kendrick &lt;<a href="mailto:bill@newbreedsoftware.com">bill@newbreedsoftware.com</a>&gt;</h3>
<p>Click and drag around to stretch and squish parts of the picture.</p>
<hr size="1" noshade />
<p align="center">Tux Paint 0.9.27</p>
</body></html>

1
magic/magic-docs/ja_JP.UTF-8/index.txt
View file

@ -45,6 +45,7 @@ Picture Warps
* Panels
* Perspective
* Shift
* Stretch
* Waves
* Wavelets
* Zoom

11
magic/magic-docs/ja_JP.UTF-8/stretch.txt Normal file
View file

@ -0,0 +1,11 @@
Tux Paint "Magic" Tool: Stretch
Group: Picture Warps
Author: Bill Kendrick <bill@newbreedsoftware.com>
Click and drag around to stretch and squish parts of the picture.
----------------------------------------------------------------------
Tux Paint 0.9.27

BIN
magic/sounds/stretch.ogg Normal file
View file

Binary file not shown.

286
magic/src/stretch.c Normal file
View file

@ -0,0 +1,286 @@
/*
stretch.c
"Stretch" Magic Tools Plugin
Tux Paint - A simple drawing program for children.
By Bill Kendrick
Some parts based on "Blind" Magic Tool by Pere Pujal Carabantes
Copyright (c) 2021
http://www.tuxpaint.org/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt)
*/
#include "tp_magic_api.h"
#include "SDL_image.h"
#include "SDL_mixer.h"
int stretch_side, stretch_start_x, stretch_start_y;
enum stretch_sides
{
STRETCH_DIRECTION_VERT,
STRETCH_DIRECTION_HORIZ
};
enum stretch_tools
{
STRETCH_TOOL_STRETCH,
STRETCH_NUMTOOLS
};
Mix_Chunk *stretch_snd;
// Prototypes
Uint32 stretch_api_version(void);
void stretch_set_color(magic_api * api, Uint8 r, Uint8 g, Uint8 b);
int stretch_init(magic_api * api);
int stretch_get_tool_count(magic_api * api);
SDL_Surface *stretch_get_icon(magic_api * api, int which);
char *stretch_get_name(magic_api * api, int which);
int stretch_get_group(magic_api * api, int which);
char *stretch_get_description(magic_api * api, int which, int mode);
int stretch_requires_colors(magic_api * api, int which);
void stretch_release(magic_api * api, int which,
SDL_Surface * canvas, SDL_Surface * snapshot, int x, int y, SDL_Rect * update_rect);
void stretch_shutdown(magic_api * api);
void stretch_paint_stretch(void *ptr_to_api, int which_tool, SDL_Surface * canvas, SDL_Surface * snapshot, int x, int y);
void stretch_drag(magic_api * api, int which, SDL_Surface * canvas,
SDL_Surface * snapshot, int ox, int oy, int x, int y, SDL_Rect * update_rect);
void stretch_click(magic_api * api, int which, int mode,
SDL_Surface * canvas, SDL_Surface * last, int x, int y, SDL_Rect * update_rect);
void stretch_switchin(magic_api * api, int which, int mode, SDL_Surface * canvas);
void stretch_switchout(magic_api * api, int which, int mode, SDL_Surface * canvas);
int stretch_modes(magic_api * api, int which);
// Housekeeping functions
Uint32 stretch_api_version(void)
{
return (TP_MAGIC_API_VERSION);
}
void stretch_set_color(magic_api * api ATTRIBUTE_UNUSED, Uint8 r ATTRIBUTE_UNUSED, Uint8 g ATTRIBUTE_UNUSED, Uint8 b ATTRIBUTE_UNUSED)
{
}
int stretch_init(magic_api * api)
{
char fname[1024];
snprintf(fname, sizeof(fname), "%s/sounds/magic/stretch.ogg", api->data_directory);
stretch_snd = Mix_LoadWAV(fname);
return (1);
}
int stretch_get_tool_count(magic_api * api ATTRIBUTE_UNUSED)
{
return STRETCH_NUMTOOLS;
}
SDL_Surface *stretch_get_icon(magic_api * api, int which ATTRIBUTE_UNUSED)
{
char fname[1024];
snprintf(fname, sizeof(fname), "%s/images/magic/stretch.png", api->data_directory);
return (IMG_Load(fname));
}
char *stretch_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
{
return strdup(gettext_noop("Stretch"));
}
int stretch_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
{
return MAGIC_TYPE_PICTURE_WARPS;
}
char *stretch_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED)
{
return
strdup(gettext_noop
("Click and drag to stretch part of your picture vertically or horizontally."));
}
int stretch_requires_colors(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
{
return 0;
}
void stretch_release(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED,
SDL_Surface * canvas ATTRIBUTE_UNUSED, SDL_Surface * snapshot ATTRIBUTE_UNUSED,
int x ATTRIBUTE_UNUSED, int y ATTRIBUTE_UNUSED, SDL_Rect * update_rect ATTRIBUTE_UNUSED)
{
}
void stretch_shutdown(magic_api * api ATTRIBUTE_UNUSED)
{
Mix_FreeChunk(stretch_snd);
}
// Interactivity functions
void stretch_drag(magic_api * api, int which ATTRIBUTE_UNUSED, SDL_Surface * canvas,
SDL_Surface * snapshot, int ox ATTRIBUTE_UNUSED, int oy ATTRIBUTE_UNUSED,
int x, int y, SDL_Rect * update_rect)
{
SDL_Rect src, dest;
float xx, yy;
float divisor1, divisor2;
SDL_BlitSurface(snapshot, NULL, canvas, NULL);
switch (stretch_side)
{
case STRETCH_DIRECTION_VERT:
{
if (y != stretch_start_y)
{
divisor1 = (float) y / (float) stretch_start_y;
divisor2 = (float) (canvas->h - y) / (float) (canvas->h - stretch_start_y);
for (yy = 0; yy < y; yy++)
{
src.x = 0;
src.y = (yy / divisor1);
src.w = canvas->w;
src.h = 1;
dest.x = 0;
dest.y = yy;
dest.w = canvas->w;
dest.h = 1;
SDL_BlitSurface(snapshot, &src, canvas, &dest);
}
for (yy = y; yy < canvas->h; yy++)
{
src.x = 0;
src.y = stretch_start_y + ((yy - y) / divisor2);
src.w = canvas->w;
src.h = 1;
dest.x = 0;
dest.y = yy;
dest.w = canvas->w;
dest.h = 1;
SDL_BlitSurface(snapshot, &src, canvas, &dest);
}
api->playsound(stretch_snd, 128, 255);
}
break;
}
case STRETCH_DIRECTION_HORIZ:
{
if (x != stretch_start_x)
{
divisor1 = (float) x / (float) stretch_start_x;
divisor2 = (float) (canvas->w - x) / (float) (canvas->w - stretch_start_x);
for (xx = 0; xx < x; xx++)
{
src.x = (xx / divisor1);
src.y = 0;
src.w = 1;
src.h = canvas->h;
dest.x = xx;
dest.y = 0;
dest.w = 1;
dest.h = canvas->h;
SDL_BlitSurface(snapshot, &src, canvas, &dest);
}
for (xx = x; xx < canvas->w; xx++)
{
src.x = stretch_start_x + ((xx - x) / divisor2);
src.y = 0;
src.w = 1;
src.h = canvas->h;
dest.x = xx;
dest.y = 0;
dest.w = 1;
dest.h = canvas->h;
SDL_BlitSurface(snapshot, &src, canvas, &dest);
}
api->playsound(stretch_snd, (x * 255) / canvas->w, 255);
}
break;
}
}
update_rect->x = 0;
update_rect->y = 0;
update_rect->w = canvas->w;
update_rect->h = canvas->h;
}
void stretch_click(magic_api * api, int which, int mode ATTRIBUTE_UNUSED,
SDL_Surface * canvas, SDL_Surface * last, int x, int y, SDL_Rect * update_rect)
{
if (y < canvas->h / 2)
{
if (x < y)
stretch_side = STRETCH_DIRECTION_HORIZ;
else if (canvas->w - x < y)
stretch_side = STRETCH_DIRECTION_HORIZ;
else
stretch_side = STRETCH_DIRECTION_VERT;
}
else
{
if (x < canvas->h - y)
stretch_side = STRETCH_DIRECTION_HORIZ;
else if (canvas->w - x < canvas->h - y)
stretch_side = STRETCH_DIRECTION_HORIZ;
else
stretch_side = STRETCH_DIRECTION_VERT;
}
stretch_start_x = x;
stretch_start_y = y;
stretch_drag(api, which, canvas, last, x, y, x, y, update_rect);
}
void stretch_switchin(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED,
SDL_Surface * canvas ATTRIBUTE_UNUSED)
{
}
void stretch_switchout(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED,
SDL_Surface * canvas ATTRIBUTE_UNUSED)
{
}
int stretch_modes(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
{
return (MODE_PAINT);
}

11
src/tuxpaint.c
View file

@ -22,7 +22,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt)
June 14, 2002 - October 18, 2021
June 14, 2002 - October 20, 2021
*/
#include "platform.h"
@ -3323,15 +3323,6 @@ static void mainloop(void)
draw_erasers();
draw_colors(COLORSEL_DISABLE);
}
else if (cur_tool == TOOL_FILL)
{
keybd_flag = 0;
cur_thing = cur_fill;
num_things = NUM_FILLS;
thing_scroll = &fill_scroll;
draw_fills();
draw_colors(COLORSEL_DISABLE);
}
else if (cur_tool == TOOL_UNDO)
{
if (cur_undo == newest_undo)