2002-05-03 Michael Natterer <mitch@gimp.org> * devel-docs/Makefile.am * devel-docs/includes.txt: new file documenting the core's include policy. * HACKING: mention it here. * libgimptool/gimptooltypes.h: removed GimpToolOptions here. * app/core/core-types.h: and added it here. This is a temp hack needed because GimpToolInfo needs to know the GimpToolOptions type. * libgimpproxy/gimpproxytypes.h: regenerated. * libgimptool/gimptoolmodule.h: don't include gimptooltypes.h here... * libgimptool/gimptoolmodule.c: ...but here. * app/config/gimpconfig-params.c: include "libgimpbase/gimpbase.h" entirely, not single files from it. * app/core/gimp.c * app/core/gimpcontext.c * app/core/gimpcoreconfig.c * app/core/gimpdatafactory.c * app/core/gimpdocuments.c * app/core/gimpdrawable-blend.c * app/core/gimpdrawable-bucket-fill.c * app/core/gimpdrawable-offset.c * app/core/gimpdrawable-transform.c * app/core/gimpdrawable.c * app/core/gimpedit.c * app/core/gimpimage-convert.c * app/core/gimpimage-crop.c * app/core/gimpimage-duplicate.c * app/core/gimpimage-guides.c * app/core/gimpimage-mask.c * app/core/gimpimage-merge.c * app/core/gimpimage-new.c * app/core/gimpimage-projection.c * app/core/gimpimage-qmask.c * app/core/gimpimage-resize.c * app/core/gimpimage-scale.c * app/core/gimpimage.c * app/core/gimpitem.c * app/core/gimpmodules.c * app/core/gimppaintinfo.c * app/core/gimpparasite.c * app/core/gimppreviewcache.c * app/core/gimptoolinfo.c * app/core/gimpunit.c: include "core-types.h" and no other types file. * app/display/gimpdisplay.c * app/display/gimpdisplayshell-callbacks.c * app/display/gimpdisplayshell.c: include "tools/tools-types.h" instead of "libgimptool/gimptooltypes.h", warn about inclusion on "gui/gui-types.h" * app/file/file-open.c * app/file/file-save.c: don't include "libgimptool/gimptooltypes.h". * app/gui/about-dialog.c * app/gui/brush-select.c * app/gui/brushes-commands.c * app/gui/color-select.c * app/gui/data-commands.c * app/gui/device-status-dialog.c * app/gui/dialogs.c * app/gui/gradients-commands.c * app/gui/help-commands.c * app/gui/info-window.c * app/gui/palettes-commands.c * app/gui/patterns-commands.c * app/gui/resize-dialog.c * app/gui/tips-dialog.c * app/gui/tool-options-dialog.c: include "gui-types.h" and no other types file. * 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-stroke.c * app/paint/gimppaintcore.c * app/paint/gimppaintoptions.c * app/paint/gimppencil.c * app/paint/gimpsmudge.c * app/paint/paint.c: include "paint-types.h" and no other types file. * app/pdb/pdb-types.h: don't include "libgimptool/gimptooltypes.h". * app/plug-in/plug-in-progress.c: warn about inclusion of "display/display-types.h" * app/tools/tools-types.h: include "libgimptool/gimptooltypes.h". * app/tools/gimpairbrushtool.c * app/tools/gimpbezierselecttool.c * app/tools/gimpblendtool.c * app/tools/gimpbrightnesscontrasttool.c * app/tools/gimpbucketfilltool.c * app/tools/gimpbycolorselecttool.c * app/tools/gimpclonetool.c * app/tools/gimpcolorbalancetool.c * app/tools/gimpcolorpickertool.c * app/tools/gimpconvolvetool.c * app/tools/gimpcroptool.c * app/tools/gimpcurvestool.c * app/tools/gimpdodgeburntool.c * app/tools/gimpdrawtool.c * app/tools/gimpeditselectiontool.c * app/tools/gimpellipseselecttool.c * app/tools/gimperasertool.c * app/tools/gimpfliptool.c * app/tools/gimpfreeselecttool.c * app/tools/gimpfuzzyselecttool.c * app/tools/gimphistogramtool.c * app/tools/gimphuesaturationtool.c * app/tools/gimpinktool.c * app/tools/gimplevelstool.c * app/tools/gimpmagnifytool.c * app/tools/gimpmeasuretool.c * app/tools/gimpmovetool.c * app/tools/gimppaintbrushtool.c * app/tools/gimppainttool.c * app/tools/gimppathtool.c * app/tools/gimppenciltool.c * app/tools/gimpperspectivetool.c * app/tools/gimpposterizetool.c * app/tools/gimprectselecttool.c * app/tools/gimprotatetool.c * app/tools/gimpscaletool.c * app/tools/gimpselectiontool.c * app/tools/gimpsheartool.c * app/tools/gimpsmudgetool.c * app/tools/gimptexttool.c * app/tools/gimpthresholdtool.c * app/tools/gimptoolcontrol.c * app/tools/gimptoolcontrol.h * app/tools/gimptransformtool.c * app/tools/gimpvectortool.c * app/tools/tools.c: include "tools-types.h" and no other types file, warn about inclusion of "gui/gui-types.h". * app/widgets/gimpcolorpanel.c * app/widgets/gimptoolbox-color-area.c: warn about inclusion of "gui/gui-types.h". * app/xcf/xcf-load.c * app/xcf/xcf.c: don't include "libgimptool/gimptooltypes.h". Split tool-safe-mode up in two files, one including libgimpproxy, one libgimp. * plug-ins/tools/Makefile.am * plug-ins/tools/tool-safe-mode-plug-in.[ch]: new files including libgimp/ stuff only. * plug-ins/tools/tool-safe-mode.[ch]: include libgimpproxy/ and libgimptool/ but don't include libgimp/ because of conflicting declarations. Unrelated: * app/tools/gimpclonetool.c: create the clone core so we don't crash. * app/gui/file-open-dialog.c: changed the way we create previews so that only out-of-date previews are created on a click in the preview area. Unconditional creation can still be forced by <Ctrl>+click. Changed the tooltip to document this.
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 == GIMP_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));
|
|
}
|