Commit 63d3ff38 authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer
Browse files

app/Makefile.am removed

2001-04-18  Michael Natterer  <mitch@gimp.org>

	* app/Makefile.am
	* app/channel_ops.[ch]: removed

	* app/gimpdrawable-offset.[ch]
	* app/gimpimage-duplicate.[ch]: new files without GUI.

	* app/gui/Makefile.am
	* app/gui/offset-dialog.[ch]: new files.

	* app/gui/commands.c
	* app/pdb/channel_ops_cmds.c
	* po/POTFILES.in
	* tools/pdbgen/Makefile.am
	* tools/pdbgen/enums.pl
	* tools/pdbgen/pdb/channel_ops.pdb: changed accordingly.
parent addaad45
2001-04-18 Michael Natterer <mitch@gimp.org>
* app/Makefile.am
* app/channel_ops.[ch]: removed
* app/gimpdrawable-offset.[ch]
* app/gimpimage-duplicate.[ch]: new files without GUI.
* app/gui/Makefile.am
* app/gui/offset-dialog.[ch]: new files.
* app/gui/commands.c
* app/pdb/channel_ops_cmds.c
* po/POTFILES.in
* tools/pdbgen/Makefile.am
* tools/pdbgen/enums.pl
* tools/pdbgen/pdb/channel_ops.pdb: changed accordingly.
2001-04-18 Michael Natterer <mitch@gimp.org>
* app/Makefile.am
......
......@@ -81,8 +81,6 @@ gimp_SOURCES = \
##
## stuff that needs to be split up in core / ui files
##
channel_ops.c \
channel_ops.h \
gdisplay.c \
gdisplay.h \
gdisplay_ops.c \
......@@ -162,6 +160,8 @@ gimp_SOURCES = \
gimpdatalist.h \
gimpdrawable.c \
gimpdrawable.h \
gimpdrawable-offset.c \
gimpdrawable-offset.h \
gimpdrawable-preview.c \
gimpdrawable-preview.h \
gimpgradient.c \
......@@ -174,6 +174,8 @@ gimp_SOURCES = \
gimpimage.h \
gimpimage-convert.c \
gimpimage-convert.h \
gimpimage-duplicate.c \
gimpimage-duplicate.h \
gimpimage-undo.c \
gimpimage-undo.h \
gimplayer.c \
......
......@@ -33,17 +33,17 @@
#include "tools/gimptoolinfo.h"
#include "tools/tool_manager.h"
#include "commands.h"
#include "convert-dialog.h"
#include "errorconsole.h"
#include "info-dialog.h"
#include "info-window.h"
#include "layer-select.h"
#include "offset-dialog.h"
#include "app_procs.h"
#include "commands.h"
#include "context_manager.h"
#include "desaturate.h"
#include "channel_ops.h"
#include "equalize.h"
#include "file-open.h"
#include "file-save.h"
......@@ -55,6 +55,7 @@
#include "gimpdrawable.h"
#include "gimphelp.h"
#include "gimpimage.h"
#include "gimpimage-duplicate.h"
#include "gimplayer.h"
#include "gimprc.h"
#include "gimpui.h"
......@@ -813,7 +814,7 @@ image_offset_cmd_callback (GtkWidget *widget,
GDisplay *gdisp;
return_if_no_display (gdisp);
channel_ops_offset (gdisp->gimage);
offset_dialog_create (gdisp->gimage);
}
void
......@@ -897,7 +898,7 @@ image_duplicate_cmd_callback (GtkWidget *widget,
GDisplay *gdisp;
return_if_no_display (gdisp);
channel_ops_duplicate (gdisp->gimage);
gdisplay_new (gimp_image_duplicate (gdisp->gimage), 0x0101);
}
/***** Layers *****/
......
/* 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 <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "libgimpmath/gimpmath.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "apptypes.h"
#include "paint-funcs/paint-funcs.h"
#include "apptypes.h"
#include "channel_ops.h"
#include "cursorutil.h"
#include "drawable.h"
#include "floating_sel.h"
#include "gdisplay.h"
#include "gimage.h"
#include "gimpchannel.h"
#include "gimpcontext.h"
#include "gimplayer.h"
#include "gimplist.h"
#include "parasitelist.h"
#include "path.h"
#include "pixel_region.h"
#include "tile_manager.h"
#include "libgimp/gimpintl.h"
#define ENTRY_WIDTH 60
typedef struct _OffsetDialog OffsetDialog;
struct _OffsetDialog
{
GtkWidget *dlg;
GtkWidget *off_se;
gboolean wrap_around;
ChannelOffsetType fill_type;
GimpImage *gimage;
};
/* Forward declarations */
static void offset_ok_callback (GtkWidget *widget,
gpointer data);
static void offset_cancel_callback (GtkWidget *widget,
gpointer data);
static void offset_halfheight_callback (GtkWidget *widget,
gpointer data);
void
channel_ops_offset (GimpImage* gimage)
{
OffsetDialog *off_d;
GtkWidget *label;
GtkWidget *check;
GtkWidget *push;
GtkWidget *vbox;
GtkWidget *table;
GtkObject *adjustment;
GtkWidget *spinbutton;
GtkWidget *frame;
GtkWidget *radio_button;
GimpDrawable *drawable;
drawable = gimp_image_active_drawable (gimage);
off_d = g_new (OffsetDialog, 1);
off_d->wrap_around = TRUE;
off_d->fill_type = gimp_drawable_has_alpha (drawable);
off_d->gimage = gimage;
off_d->dlg = gimp_dialog_new (_("Offset"), "offset",
gimp_standard_help_func,
"dialogs/offset.html",
GTK_WIN_POS_NONE,
FALSE, TRUE, FALSE,
_("OK"), offset_ok_callback,
off_d, NULL, NULL, TRUE, FALSE,
_("Cancel"), offset_cancel_callback,
off_d, NULL, NULL, FALSE, TRUE,
NULL);
/* The vbox for first column of options */
vbox = gtk_vbox_new (FALSE, 2);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (off_d->dlg)->vbox), vbox);
/* The table for the offsets */
table = gtk_table_new (3, 2, FALSE);
gtk_table_set_col_spacing (GTK_TABLE (table), 0, 4);
gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
/* The offset labels */
label = gtk_label_new (_("Offset X:"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1,
GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
gtk_widget_show (label);
label = gtk_label_new (_("Y:"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2,
GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
gtk_widget_show (label);
/* The offset sizeentry */
adjustment = gtk_adjustment_new (1, 1, 1, 1, 10, 1);
spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (adjustment), 1, 2);
gtk_spin_button_set_shadow_type (GTK_SPIN_BUTTON (spinbutton),
GTK_SHADOW_NONE);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE);
gtk_widget_set_usize (spinbutton, 75, 0);
off_d->off_se = gimp_size_entry_new (1, gimage->unit, "%a",
TRUE, TRUE, FALSE, 75,
GIMP_SIZE_ENTRY_UPDATE_SIZE);
gimp_size_entry_add_field (GIMP_SIZE_ENTRY (off_d->off_se),
GTK_SPIN_BUTTON (spinbutton), NULL);
gtk_table_attach_defaults (GTK_TABLE (off_d->off_se), spinbutton,
1, 2, 0, 1);
gtk_widget_show (spinbutton);
gtk_table_attach (GTK_TABLE (table), off_d->off_se, 1, 2, 0, 2,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_widget_show (off_d->off_se);
gimp_size_entry_set_unit (GIMP_SIZE_ENTRY (off_d->off_se), GIMP_UNIT_PIXEL);
gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (off_d->off_se), 0,
gimage->xresolution, FALSE);
gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (off_d->off_se), 1,
gimage->yresolution, FALSE);
gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (off_d->off_se), 0,
-gimage->width, gimage->width);
gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (off_d->off_se), 1,
-gimage->height, gimage->height);
gimp_size_entry_set_size (GIMP_SIZE_ENTRY (off_d->off_se), 0,
0, gimage->width);
gimp_size_entry_set_size (GIMP_SIZE_ENTRY (off_d->off_se), 1,
0, gimage->height);
gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (off_d->off_se), 0, 0);
gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (off_d->off_se), 1, 0);
gtk_widget_show (table);
/* The wrap around option */
check = gtk_check_button_new_with_label (_("Wrap Around"));
gtk_box_pack_start (GTK_BOX (vbox), check, FALSE, FALSE, 0);
gtk_widget_show (check);
/* The fill options */
frame =
gimp_radio_group_new2 (TRUE, _("Fill Type"),
gimp_radio_button_update,
&off_d->fill_type, (gpointer) off_d->fill_type,
_("Background"), (gpointer) OFFSET_BACKGROUND, NULL,
_("Transparent"), (gpointer) OFFSET_TRANSPARENT,
&radio_button,
NULL);
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
if (! gimp_drawable_has_alpha (drawable))
gtk_widget_set_sensitive (radio_button, FALSE);
/* The by half height and half width option */
push = gtk_button_new_with_label (_("Offset by (x/2),(y/2)"));
gtk_container_set_border_width (GTK_CONTAINER (push), 2);
gtk_box_pack_start (GTK_BOX (vbox), push, FALSE, FALSE, 0);
gtk_widget_show (push);
/* Hook up the wrap around */
gtk_signal_connect (GTK_OBJECT (check), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update),
&off_d->wrap_around);
gtk_object_set_data (GTK_OBJECT (check), "inverse_sensitive", frame);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), off_d->wrap_around);
/* Hook up the by half */
gtk_signal_connect (GTK_OBJECT (push), "clicked",
(GtkSignalFunc) offset_halfheight_callback,
off_d);
gtk_widget_show (vbox);
gtk_widget_show (off_d->dlg);
}
void
offset (GimpImage *gimage,
GimpDrawable *drawable,
gboolean wrap_around,
ChannelOffsetType 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)
{
GimpRGB color;
gimp_context_get_background (NULL, &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 */
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 */
drawable_update (drawable,
0, 0,
gimp_drawable_width (drawable),
gimp_drawable_height (drawable));
}
/*
* Interface callbacks
*/
static void
offset_ok_callback (GtkWidget *widget,
gpointer data)
{
OffsetDialog *off_d;
GimpImage *gimage;
GimpDrawable *drawable;
gint offset_x;
gint offset_y;
off_d = (OffsetDialog *) data;
if ((gimage = off_d->gimage) != NULL)
{
drawable = gimp_image_active_drawable (gimage);
offset_x = (gint)
RINT (gimp_size_entry_get_refval (GIMP_SIZE_ENTRY (off_d->off_se), 0));