2002-02-25 Michael Natterer <mitch@gimp.org> * app/core/Makefile.am * app/core/core-types.h * app/core/gimpitem.[ch]: new base class for something which is a child of an image, has a PDB ID, a tattoo, parasites and emits a "removed" signal. * app/core/gimpdrawable.[ch] * app/vectors/gimpvectors.[ch]: derive from GimpItem. Removed lots of stuff from GimpDrawable. * app/core/gimp.[ch]: changed gimp->drawable_table and gimp->next_drawable_ID to gimp->item_table and gimp->next_item_id. * app/undo.[ch]: s/undo_push_drawable_parasite/undo_push_item_parasite/, minor cleanups. * app/core/gimplayer.[ch]: changed gimp_layer_new_from_tiles() and gimp_layer_new_from_drawable() to take the "dest_gimage" as second, not first parameter. * app/image_map.c * app/core/gimpchannel.c * app/core/gimpdrawable-blend.c * app/core/gimpdrawable-bucket-fill.c * app/core/gimpdrawable-histogram.c * app/core/gimpdrawable-offset.c * app/core/gimpdrawable-preview.c * app/core/gimpdrawable-transform.c * app/core/gimpedit.c * app/core/gimpimage-duplicate.c * app/core/gimpimage-mask.c * app/core/gimpimage-merge.c * app/core/gimpimage-pick-color.c * app/core/gimpimage.c * app/core/gimplayer-floating-sel.c * app/display/gimpdisplayshell-dnd.c * app/file/file-save.c * app/gui/channels-commands.c * app/gui/file-save-dialog.c * app/gui/layers-commands.c * app/gui/offset-dialog.c * app/gui/paths-dialog.c * app/gui/toolbox.c * app/paint/gimpairbrush.c * app/paint/gimpclone.c * app/paint/gimpconvolve.c * app/paint/gimpdodgeburn.c * app/paint/gimperaser.c * app/paint/gimppaintbrush.c * app/paint/gimppaintcore.c * app/paint/gimppencil.c * app/paint/gimpsmudge.c * app/plug-in/plug-in.c * app/tools/gimpbezierselecttool.c * app/tools/gimpbycolorselecttool.c * app/tools/gimpinktool.c * app/tools/gimppainttool.c * app/xcf/xcf-load.c * app/xcf/xcf-save.c * app/widgets/gimpdrawablepreview.c: changed accordingly. * app/widgets/Makefile.am * app/widgets/widgets-types.h * app/widgets/gimpitemlistview.[ch]: new widget implementing most of the stuff formerly done by GimpDrawableListView. * app/widgets/gimpchannellistview.c * app/widgets/gimpdrawablelistitem.c * app/widgets/gimpdrawablelistview.[ch] * app/widgets/gimplayerlistview.c: changed accordingly. * app/widgets/gimpdnd.[ch]: added a vectors DND type. * app/gui/menus.c * app/gui/dialogs.c * app/gui/dialogs-constructors.[ch]: added a vectors dialog and a vectors item_factory. * app/gui/Makefile.am * app/gui/vectors-commands.[ch]: new files implementing the callbacks for the new vectors dialog and item_factory. * app/pdb/pdb_glue.h: some more ugly hacks to keep intermediate perl code working... * tools/pdbgen/pdb.pl: added a vectors type, use GimpItem for all ID lookups. * tools/pdbgen/pdb/channel.pdb * tools/pdbgen/pdb/color.pdb * tools/pdbgen/pdb/drawable.pdb * tools/pdbgen/pdb/edit.pdb * tools/pdbgen/pdb/image.pdb * tools/pdbgen/pdb/layer.pdb * tools/pdbgen/pdb/misc_tools.pdb * tools/pdbgen/pdb/parasite.pdb * tools/pdbgen/pdb/selection.pdb * tools/pdbgen/pdb/selection_tools.pdb: misc changes according to stuff above. * app/pdb/channel_cmds.c * app/pdb/color_cmds.c * app/pdb/drawable_cmds.c * app/pdb/edit_cmds.c * app/pdb/floating_sel_cmds.c * app/pdb/image_cmds.c * app/pdb/layer_cmds.c * app/pdb/misc_tools_cmds.c * app/pdb/paint_tools_cmds.c * app/pdb/parasite_cmds.c * app/pdb/selection_cmds.c * app/pdb/selection_tools_cmds.c * app/pdb/text_tool_cmds.c * app/pdb/transform_tools_cmds.c: regenerated.
326 lines
8.2 KiB
C
326 lines
8.2 KiB
C
/* The GIMP -- an image manipulation program
|
|
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
|
|
*
|
|
* 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.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#include <string.h>
|
|
|
|
#include <glib-object.h>
|
|
|
|
#include "libgimpcolor/gimpcolor.h"
|
|
#include "libgimpmath/gimpmath.h"
|
|
|
|
#include "core-types.h"
|
|
|
|
#include "base/pixel-region.h"
|
|
#include "base/tile-manager.h"
|
|
|
|
#include "paint-funcs/paint-funcs.h"
|
|
|
|
#include "gimp.h"
|
|
#include "gimpcontext.h"
|
|
#include "gimpdrawable.h"
|
|
#include "gimpdrawable-offset.h"
|
|
#include "gimpimage.h"
|
|
|
|
|
|
void
|
|
gimp_drawable_offset (GimpDrawable *drawable,
|
|
gboolean wrap_around,
|
|
GimpOffsetType fill_type,
|
|
gint offset_x,
|
|
gint offset_y)
|
|
{
|
|
PixelRegion srcPR, destPR;
|
|
TileManager *new_tiles;
|
|
gint width, height;
|
|
gint src_x, src_y;
|
|
gint dest_x, dest_y;
|
|
guchar fill[MAX_CHANNELS] = { 0 };
|
|
|
|
if (! drawable)
|
|
return;
|
|
|
|
width = gimp_drawable_width (drawable);
|
|
height = gimp_drawable_height (drawable);
|
|
|
|
if (wrap_around)
|
|
{
|
|
/* avoid modulo operation on negative values */
|
|
while (offset_x < 0)
|
|
offset_x += width;
|
|
while (offset_y < 0)
|
|
offset_y += height;
|
|
|
|
offset_x %= width;
|
|
offset_y %= height;
|
|
}
|
|
else
|
|
{
|
|
offset_x = CLAMP (offset_x, -width, width);
|
|
offset_y = CLAMP (offset_y, -height, height);
|
|
}
|
|
|
|
if (offset_x == 0 && offset_y == 0)
|
|
return;
|
|
|
|
new_tiles = tile_manager_new (width, height, gimp_drawable_bytes (drawable));
|
|
if (offset_x >= 0)
|
|
{
|
|
src_x = 0;
|
|
dest_x = offset_x;
|
|
width = CLAMP ((width - offset_x), 0, width);
|
|
}
|
|
else
|
|
{
|
|
src_x = -offset_x;
|
|
dest_x = 0;
|
|
width = CLAMP ((width + offset_x), 0, width);
|
|
}
|
|
|
|
if (offset_y >= 0)
|
|
{
|
|
src_y = 0;
|
|
dest_y = offset_y;
|
|
height = CLAMP ((height - offset_y), 0, height);
|
|
}
|
|
else
|
|
{
|
|
src_y = -offset_y;
|
|
dest_y = 0;
|
|
height = CLAMP ((height + offset_y), 0, height);
|
|
}
|
|
|
|
/* Copy the center region */
|
|
if (width && height)
|
|
{
|
|
pixel_region_init (&srcPR, gimp_drawable_data (drawable),
|
|
src_x, src_y, width, height, FALSE);
|
|
pixel_region_init (&destPR, new_tiles,
|
|
dest_x, dest_y, width, height, TRUE);
|
|
|
|
copy_region (&srcPR, &destPR);
|
|
}
|
|
|
|
/* Copy appropriately for wrap around */
|
|
if (wrap_around == TRUE)
|
|
{
|
|
if (offset_x >= 0 && offset_y >= 0)
|
|
{
|
|
src_x = gimp_drawable_width (drawable) - offset_x;
|
|
src_y = gimp_drawable_height (drawable) - offset_y;
|
|
}
|
|
else if (offset_x >= 0 && offset_y < 0)
|
|
{
|
|
src_x = gimp_drawable_width (drawable) - offset_x;
|
|
src_y = 0;
|
|
}
|
|
else if (offset_x < 0 && offset_y >= 0)
|
|
{
|
|
src_x = 0;
|
|
src_y = gimp_drawable_height (drawable) - offset_y;
|
|
}
|
|
else if (offset_x < 0 && offset_y < 0)
|
|
{
|
|
src_x = 0;
|
|
src_y = 0;
|
|
}
|
|
|
|
dest_x = (src_x + offset_x) % gimp_drawable_width (drawable);
|
|
if (dest_x < 0)
|
|
dest_x = gimp_drawable_width (drawable) + dest_x;
|
|
dest_y = (src_y + offset_y) % gimp_drawable_height (drawable);
|
|
if (dest_y < 0)
|
|
dest_y = gimp_drawable_height (drawable) + dest_y;
|
|
|
|
/* intersecting region */
|
|
if (offset_x != 0 && offset_y != 0)
|
|
{
|
|
pixel_region_init (&srcPR, gimp_drawable_data (drawable),
|
|
src_x, src_y, ABS (offset_x), ABS (offset_y)
|
|
, FALSE);
|
|
pixel_region_init (&destPR, new_tiles,
|
|
dest_x, dest_y, ABS (offset_x), ABS (offset_y),
|
|
TRUE);
|
|
copy_region (&srcPR, &destPR);
|
|
}
|
|
|
|
/* X offset */
|
|
if (offset_x != 0)
|
|
{
|
|
if (offset_y >= 0)
|
|
{
|
|
pixel_region_init (&srcPR, gimp_drawable_data (drawable),
|
|
src_x, 0, ABS (offset_x),
|
|
gimp_drawable_height (drawable) - ABS (offset_y),
|
|
FALSE);
|
|
pixel_region_init (&destPR, new_tiles,
|
|
dest_x, dest_y + offset_y,
|
|
ABS (offset_x),
|
|
gimp_drawable_height (drawable) - ABS (offset_y),
|
|
TRUE);
|
|
}
|
|
else if (offset_y < 0)
|
|
{
|
|
pixel_region_init (&srcPR, gimp_drawable_data (drawable),
|
|
src_x, src_y - offset_y,
|
|
ABS (offset_x),
|
|
gimp_drawable_height (drawable) - ABS (offset_y),
|
|
FALSE);
|
|
pixel_region_init (&destPR, new_tiles,
|
|
dest_x, 0,
|
|
ABS (offset_x),
|
|
gimp_drawable_height (drawable) - ABS (offset_y),
|
|
TRUE);
|
|
}
|
|
|
|
copy_region (&srcPR, &destPR);
|
|
}
|
|
|
|
/* X offset */
|
|
if (offset_y != 0)
|
|
{
|
|
if (offset_x >= 0)
|
|
{
|
|
pixel_region_init (&srcPR, gimp_drawable_data (drawable),
|
|
0, src_y,
|
|
gimp_drawable_width (drawable) - ABS (offset_x),
|
|
ABS (offset_y), FALSE);
|
|
pixel_region_init (&destPR, new_tiles, dest_x + offset_x, dest_y,
|
|
gimp_drawable_width (drawable) - ABS (offset_x),
|
|
ABS (offset_y), TRUE);
|
|
}
|
|
else if (offset_x < 0)
|
|
{
|
|
pixel_region_init (&srcPR, gimp_drawable_data (drawable),
|
|
src_x - offset_x, src_y,
|
|
gimp_drawable_width (drawable) - ABS (offset_x),
|
|
ABS (offset_y), FALSE);
|
|
pixel_region_init (&destPR, new_tiles, 0, dest_y,
|
|
gimp_drawable_width (drawable) - ABS (offset_x),
|
|
ABS (offset_y), TRUE);
|
|
}
|
|
|
|
copy_region (&srcPR, &destPR);
|
|
}
|
|
}
|
|
/* Otherwise, fill the vacated regions */
|
|
else
|
|
{
|
|
if (fill_type == OFFSET_BACKGROUND)
|
|
{
|
|
Gimp *gimp;
|
|
GimpRGB color;
|
|
|
|
gimp = gimp_item_get_image (GIMP_ITEM (drawable))->gimp;
|
|
|
|
gimp_context_get_background (gimp_get_current_context (gimp), &color);
|
|
|
|
gimp_rgb_get_uchar (&color, &fill[0], &fill[1], &fill[2]);
|
|
|
|
if (gimp_drawable_has_alpha (drawable))
|
|
fill[gimp_drawable_bytes (drawable) - 1] = OPAQUE_OPACITY;
|
|
}
|
|
|
|
if (offset_x >= 0 && offset_y >= 0)
|
|
{
|
|
dest_x = 0;
|
|
dest_y = 0;
|
|
}
|
|
else if (offset_x >= 0 && offset_y < 0)
|
|
{
|
|
dest_x = 0;
|
|
dest_y = gimp_drawable_height (drawable) + offset_y;
|
|
}
|
|
else if (offset_x < 0 && offset_y >= 0)
|
|
{
|
|
dest_x = gimp_drawable_width (drawable) + offset_x;
|
|
dest_y = 0;
|
|
}
|
|
else if (offset_x < 0 && offset_y < 0)
|
|
{
|
|
dest_x = gimp_drawable_width (drawable) + offset_x;
|
|
dest_y = gimp_drawable_height (drawable) + offset_y;
|
|
}
|
|
|
|
/* intersecting region */
|
|
if (offset_x != 0 && offset_y != 0)
|
|
{
|
|
pixel_region_init (&destPR, new_tiles, dest_x, dest_y,
|
|
ABS (offset_x), ABS (offset_y), TRUE);
|
|
color_region (&destPR, fill);
|
|
}
|
|
|
|
/* X offset */
|
|
if (offset_x != 0)
|
|
{
|
|
if (offset_y >= 0)
|
|
pixel_region_init (&destPR, new_tiles,
|
|
dest_x, dest_y + offset_y,
|
|
ABS (offset_x),
|
|
gimp_drawable_height (drawable) - ABS (offset_y),
|
|
TRUE);
|
|
else if (offset_y < 0)
|
|
pixel_region_init (&destPR, new_tiles,
|
|
dest_x, 0,
|
|
ABS (offset_x),
|
|
gimp_drawable_height (drawable) - ABS (offset_y),
|
|
TRUE);
|
|
|
|
color_region (&destPR, fill);
|
|
}
|
|
|
|
/* X offset */
|
|
if (offset_y != 0)
|
|
{
|
|
if (offset_x >= 0)
|
|
pixel_region_init (&destPR, new_tiles,
|
|
dest_x + offset_x,
|
|
dest_y,
|
|
gimp_drawable_width (drawable) - ABS (offset_x),
|
|
ABS (offset_y),
|
|
TRUE);
|
|
else if (offset_x < 0)
|
|
pixel_region_init (&destPR, new_tiles,
|
|
0, dest_y,
|
|
gimp_drawable_width (drawable) - ABS (offset_x),
|
|
ABS (offset_y),
|
|
TRUE);
|
|
|
|
color_region (&destPR, fill);
|
|
}
|
|
}
|
|
|
|
/* push an undo */
|
|
gimp_drawable_apply_image (drawable,
|
|
0, 0,
|
|
gimp_drawable_width (drawable),
|
|
gimp_drawable_height (drawable),
|
|
gimp_drawable_data (drawable),
|
|
FALSE);
|
|
|
|
/* swap the tiles */
|
|
drawable->tiles = new_tiles;
|
|
|
|
|
|
/* update the drawable */
|
|
gimp_drawable_update (drawable,
|
|
0, 0,
|
|
gimp_drawable_width (drawable),
|
|
gimp_drawable_height (drawable));
|
|
}
|