mirror of
https://gitlab.gnome.org/GNOME/gimp
synced 2024-10-23 21:11:43 +00:00
05e15eb1cc
2001-10-29 Michael Natterer <mitch@gimp.org> Cleanup weekend... * app/app_procs.c: pass "no_interface" to gimp_new(). * app/core/gimp.[ch]: added "gboolean no_interface" and the load_procs and save_procs GSLists. * app/core/gimptoolinfo.[ch]: added a "Gimp" pointer to the GimpToolInfo object so more functions find their context without accessing the global "the_gimp" variable. * app/display/display-types.h: removed the GDisplay -> GimpDisplay typedef. * app/display/gimpdisplay.c: look at gimp->no_interface, don't include "appenv.h". * app/file/file-open.[ch] * app/file/file-save.[ch]: don't use "the_gimp" any more. Instead, pass around lots of "Gimp" pointers. Removed the global load_procs and save_procs variables here. Use access() to find out whether a file is readable/writable, removed the manual voodoo and it's Win32 wrappers. Added an optional (can be NULL) "PlunInProcDef" parameter to file_save(), removed file_save_with_proc(). * app/gui/menus.c: Use the unused "gpointer data" parameter of the GtkItemFactory callbacks to pass a "Gimp" pointer to all of them. This reduces the usage of the global "the_gimp" hack to zero in app/gui/... yeah. * app/gui/channels-commands.c * app/gui/edit-commands.c * app/gui/file-commands.c * app/gui/image-commands.c * app/gui/layers-commands.c * app/gui/palettes-commands.c * app/gui/select-commands.c * app/gui/test-commands.c * app/gui/tools-commands.c * app/gui/view-commands.c: use the passed "Gimp" pointer. * app/gui/color-area.[ch] * app/gui/convert-dialog.c * app/gui/dialogs-constructors.c * app/gui/file-new-dialog.[ch] * app/gui/file-open-dialog.[ch] * app/gui/file-save-dialog.[ch] * app/gui/gui.c * app/gui/info-window.[ch] * app/gui/module-browser.[ch] * app/gui/palette-editor.c * app/gui/palette-import-dialog.[ch] * app/gui/paths-dialog.c * app/gui/preferences-dialog.[ch] * app/gui/resize-dialog.[ch] * app/gui/tool-options-dialog.[ch] * app/gui/toolbox.c: pass around lots more "Gimp" and "GimpContext" pointers and don't use "the_gimp" any more. * app/tools/gimptool.h: added a pointer to the corresponding GimpToolInfo object (which in turn has a pointer to a Gimp). * app/tools/tool_manager.[ch]: set the pointer after creating the tool object. Removed tool_manager_get_info_by_tool() as there is a tool->tool_info pointer now. * app/tools/gimpbezierselecttool.c * app/tools/gimpblendtool.c * app/tools/gimpbrightnesscontrasttool.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/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/gimppainttool.c * app/tools/gimppathtool.c * app/tools/gimpperspectivetool.c * app/tools/gimpposterizetool.c * app/tools/gimprectselecttool.c * app/tools/gimprotatetool.c * app/tools/gimpscaletool.c * app/tools/gimpsheartool.c * app/tools/gimptexttool.c * app/tools/gimpthresholdtool.c * app/tools/path_tool.c * app/tools/xinput_airbrush.c: s/GDisplay/GimpDisplay/g. Use tool->tool_info and tool_info->gimp in some places to get rid of using "the_gimp". Removing the remaining ones involves changing the tool options system and is scheduled next... * app/widgets/gimpdnd.c * app/widgets/gimpdocumentview.c: pass a "Gimp" pointer to all file_open_*() functions. * app/gdisplay_color.[ch] * app/gdisplay_color_ui.[ch] * app/image_map.[ch] * app/nav_window.[ch] * app/path.c * app/path_bezier.c * app/path_transform.h * app/qmask.[ch]: s/GDisplay/GimpDisplay/g * tools/pdbgen/pdb/fileops.pdb: load_procs and save_procs are members of the "Gimp" object now. * tools/pdbgen/pdb/plug_in.pdb: use gimp->no_interface, don't include "appenv.h". * app/pdb/fileops_cmds.c * app/pdb/plug_in_cmds.c: regenerated.
443 lines
12 KiB
C
443 lines
12 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 <stdlib.h>
|
|
|
|
#include <gtk/gtk.h>
|
|
|
|
#include "libgimpmath/gimpmath.h"
|
|
#include "libgimpwidgets/gimpwidgets.h"
|
|
|
|
#include "tools-types.h"
|
|
#include "gui/gui-types.h"
|
|
|
|
#include "core/gimpimage.h"
|
|
|
|
#include "gui/info-dialog.h"
|
|
|
|
#include "display/gimpdisplay.h"
|
|
|
|
#include "gimpsheartool.h"
|
|
#include "tool_manager.h"
|
|
#include "tool_options.h"
|
|
#include "transform_options.h"
|
|
|
|
#include "floating_sel.h"
|
|
#include "gimpprogress.h"
|
|
#include "undo.h"
|
|
|
|
#include "libgimp/gimpintl.h"
|
|
|
|
|
|
/* index into trans_info array */
|
|
#define HORZ_OR_VERT 0
|
|
#define XSHEAR 1
|
|
#define YSHEAR 2
|
|
|
|
/* the minimum movement before direction of shear can be determined (pixels) */
|
|
#define MIN_MOVE 5
|
|
|
|
|
|
/* forward function declarations */
|
|
|
|
static void gimp_shear_tool_class_init (GimpShearToolClass *klass);
|
|
static void gimp_shear_tool_init (GimpShearTool *shear_tool);
|
|
|
|
static TileManager * gimp_shear_tool_transform (GimpTransformTool *transform_tool,
|
|
GimpDisplay *gdisp,
|
|
TransformState state);
|
|
|
|
static void shear_tool_recalc (GimpTool *tool,
|
|
GimpDisplay *gdisp);
|
|
static void shear_tool_motion (GimpTool *tool,
|
|
GimpDisplay *gdisp);
|
|
static void shear_info_update (GimpTool *tool);
|
|
|
|
static void shear_x_mag_changed (GtkWidget *widget,
|
|
gpointer data);
|
|
static void shear_y_mag_changed (GtkWidget *widget,
|
|
gpointer data);
|
|
|
|
|
|
/* variables local to this file */
|
|
static gdouble xshear_val;
|
|
static gdouble yshear_val;
|
|
|
|
static GimpTransformToolClass *parent_class = NULL;
|
|
|
|
static TransformOptions *shear_options = NULL;
|
|
|
|
|
|
/* Public functions */
|
|
|
|
void
|
|
gimp_shear_tool_register (Gimp *gimp)
|
|
{
|
|
tool_manager_register_tool (gimp,
|
|
GIMP_TYPE_SHEAR_TOOL,
|
|
FALSE,
|
|
"gimp:shear_tool",
|
|
_("Shear Tool"),
|
|
_("Shear the layer or selection"),
|
|
N_("/Tools/Transform Tools/Shear"), "<shift>F",
|
|
NULL, "tools/shear.html",
|
|
GIMP_STOCK_TOOL_SHEAR);
|
|
}
|
|
|
|
GType
|
|
gimp_shear_tool_get_type (void)
|
|
{
|
|
static GType tool_type = 0;
|
|
|
|
if (! tool_type)
|
|
{
|
|
static const GTypeInfo tool_info =
|
|
{
|
|
sizeof (GimpShearToolClass),
|
|
(GBaseInitFunc) NULL,
|
|
(GBaseFinalizeFunc) NULL,
|
|
(GClassInitFunc) gimp_shear_tool_class_init,
|
|
NULL, /* class_finalize */
|
|
NULL, /* class_data */
|
|
sizeof (GimpShearTool),
|
|
0, /* n_preallocs */
|
|
(GInstanceInitFunc) gimp_shear_tool_init,
|
|
};
|
|
|
|
tool_type = g_type_register_static (GIMP_TYPE_TRANSFORM_TOOL,
|
|
"GimpShearTool",
|
|
&tool_info, 0);
|
|
}
|
|
|
|
return tool_type;
|
|
}
|
|
|
|
static void
|
|
gimp_shear_tool_class_init (GimpShearToolClass *klass)
|
|
{
|
|
GimpTransformToolClass *trans_class;
|
|
|
|
trans_class = GIMP_TRANSFORM_TOOL_CLASS (klass);
|
|
|
|
parent_class = g_type_class_peek_parent (klass);
|
|
|
|
trans_class->transform = gimp_shear_tool_transform;
|
|
}
|
|
|
|
static void
|
|
gimp_shear_tool_init (GimpShearTool *shear_tool)
|
|
{
|
|
GimpTool *tool;
|
|
GimpTransformTool *tr_tool;
|
|
|
|
tool = GIMP_TOOL (shear_tool);
|
|
tr_tool = GIMP_TRANSFORM_TOOL (shear_tool);
|
|
|
|
if (! shear_options)
|
|
{
|
|
shear_options = transform_options_new (GIMP_TYPE_SHEAR_TOOL,
|
|
transform_options_reset);
|
|
|
|
tool_manager_register_tool_options (GIMP_TYPE_SHEAR_TOOL,
|
|
(GimpToolOptions *) shear_options);
|
|
}
|
|
|
|
tool->tool_cursor = GIMP_SHEAR_TOOL_CURSOR;
|
|
|
|
/* assemble the transformation matrix */
|
|
gimp_matrix3_identity (tr_tool->transform);
|
|
|
|
}
|
|
|
|
TileManager *
|
|
gimp_shear_tool_shear (GimpImage *gimage,
|
|
GimpDrawable *drawable,
|
|
GimpDisplay *gdisp,
|
|
TileManager *float_tiles,
|
|
gboolean interpolation,
|
|
GimpMatrix3 matrix)
|
|
{
|
|
GimpProgress *progress;
|
|
TileManager *ret;
|
|
|
|
progress = progress_start (gdisp, _("Shearing..."), FALSE, NULL, NULL);
|
|
|
|
ret = gimp_transform_tool_do (gimage, drawable, float_tiles,
|
|
interpolation, matrix,
|
|
progress ? progress_update_and_flush :
|
|
(GimpProgressFunc) NULL,
|
|
progress);
|
|
|
|
if (progress)
|
|
progress_end (progress);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static TileManager *
|
|
gimp_shear_tool_transform (GimpTransformTool *transform_tool,
|
|
GimpDisplay *gdisp,
|
|
TransformState state)
|
|
{
|
|
GimpTool *tool;
|
|
tool = GIMP_TOOL (transform_tool);
|
|
|
|
switch (state)
|
|
{
|
|
case TRANSFORM_INIT:
|
|
if (!transform_info)
|
|
{
|
|
transform_info = info_dialog_new (_("Shear Information"),
|
|
gimp_standard_help_func,
|
|
"tools/transform_shear.html");
|
|
|
|
info_dialog_add_spinbutton (transform_info,
|
|
_("Shear Magnitude X:"),
|
|
&xshear_val,
|
|
-65536, 65536, 1, 15, 1, 1, 0,
|
|
G_CALLBACK (shear_x_mag_changed),
|
|
tool);
|
|
|
|
info_dialog_add_spinbutton (transform_info,
|
|
_("Y:"),
|
|
&yshear_val,
|
|
-65536, 65536, 1, 15, 1, 1, 0,
|
|
G_CALLBACK (shear_y_mag_changed),
|
|
tool);
|
|
}
|
|
gtk_widget_set_sensitive (GTK_WIDGET (transform_info->shell), TRUE);
|
|
transform_tool->trans_info[HORZ_OR_VERT] = ORIENTATION_UNKNOWN;
|
|
transform_tool->trans_info[XSHEAR] = 0.0;
|
|
transform_tool->trans_info[YSHEAR] = 0.0;
|
|
|
|
return NULL;
|
|
break;
|
|
|
|
case TRANSFORM_MOTION:
|
|
shear_tool_motion (tool, gdisp);
|
|
shear_tool_recalc (tool, gdisp);
|
|
break;
|
|
|
|
case TRANSFORM_RECALC:
|
|
shear_tool_recalc (tool, gdisp);
|
|
break;
|
|
|
|
case TRANSFORM_FINISH:
|
|
gtk_widget_set_sensitive (GTK_WIDGET (transform_info->shell), FALSE);
|
|
return gimp_shear_tool_shear (gdisp->gimage,
|
|
gimp_image_active_drawable (gdisp->gimage),
|
|
gdisp,
|
|
transform_tool->original,
|
|
gimp_transform_tool_smoothing (),
|
|
transform_tool->transform);
|
|
break;
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
static void
|
|
shear_info_update (GimpTool *tool)
|
|
{
|
|
GimpTransformTool *transform_tool;
|
|
|
|
transform_tool = GIMP_TRANSFORM_TOOL (tool);
|
|
|
|
xshear_val = transform_tool->trans_info[XSHEAR];
|
|
yshear_val = transform_tool->trans_info[YSHEAR];
|
|
|
|
info_dialog_update (transform_info);
|
|
info_dialog_popup (transform_info);
|
|
}
|
|
|
|
static void
|
|
shear_x_mag_changed (GtkWidget *widget,
|
|
gpointer data)
|
|
{
|
|
GimpTool *tool;
|
|
GimpDrawTool *draw_tool;
|
|
GimpTransformTool *transform_tool;
|
|
gint value;
|
|
|
|
tool = (GimpTool *) data;
|
|
|
|
if (tool)
|
|
{
|
|
draw_tool = GIMP_DRAW_TOOL (tool);
|
|
transform_tool = GIMP_TRANSFORM_TOOL (tool);
|
|
|
|
value = GTK_ADJUSTMENT (widget)->value;
|
|
|
|
if (value != transform_tool->trans_info[XSHEAR])
|
|
{
|
|
gimp_draw_tool_pause (draw_tool);
|
|
transform_tool->trans_info[XSHEAR] = value;
|
|
shear_tool_recalc (tool, tool->gdisp);
|
|
gimp_draw_tool_resume (draw_tool);
|
|
}
|
|
}
|
|
}
|
|
|
|
static void
|
|
shear_y_mag_changed (GtkWidget *widget,
|
|
gpointer data)
|
|
{
|
|
GimpTool *tool;
|
|
GimpDrawTool *draw_tool;
|
|
GimpTransformTool *transform_tool;
|
|
gint value;
|
|
|
|
tool = (GimpTool *) data;
|
|
|
|
if (tool)
|
|
{
|
|
draw_tool = GIMP_DRAW_TOOL (tool);
|
|
transform_tool = GIMP_TRANSFORM_TOOL (tool);
|
|
|
|
value = GTK_ADJUSTMENT (widget)->value;
|
|
|
|
if (value != transform_tool->trans_info[YSHEAR])
|
|
{
|
|
gimp_draw_tool_pause (draw_tool);
|
|
transform_tool->trans_info[YSHEAR] = value;
|
|
shear_tool_recalc (tool, tool->gdisp);
|
|
gimp_draw_tool_resume (draw_tool);
|
|
}
|
|
}
|
|
}
|
|
|
|
static void
|
|
shear_tool_motion (GimpTool *tool,
|
|
GimpDisplay *gdisp)
|
|
{
|
|
GimpTransformTool *transform_tool;
|
|
gint diffx, diffy;
|
|
gint dir;
|
|
|
|
transform_tool = GIMP_TRANSFORM_TOOL (tool);
|
|
|
|
diffx = transform_tool->curx - transform_tool->lastx;
|
|
diffy = transform_tool->cury - transform_tool->lasty;
|
|
|
|
/* If we haven't yet decided on which way to control shearing
|
|
* decide using the maximum differential
|
|
*/
|
|
|
|
if (transform_tool->trans_info[HORZ_OR_VERT] == ORIENTATION_UNKNOWN)
|
|
{
|
|
if (abs (diffx) > MIN_MOVE || abs (diffy) > MIN_MOVE)
|
|
{
|
|
if (abs (diffx) > abs (diffy))
|
|
{
|
|
transform_tool->trans_info[HORZ_OR_VERT] = ORIENTATION_HORIZONTAL;
|
|
transform_tool->trans_info[ORIENTATION_VERTICAL] = 0.0;
|
|
}
|
|
else
|
|
{
|
|
transform_tool->trans_info[HORZ_OR_VERT] = ORIENTATION_VERTICAL;
|
|
transform_tool->trans_info[ORIENTATION_HORIZONTAL] = 0.0;
|
|
}
|
|
}
|
|
/* set the current coords to the last ones */
|
|
else
|
|
{
|
|
transform_tool->curx = transform_tool->lastx;
|
|
transform_tool->cury = transform_tool->lasty;
|
|
}
|
|
}
|
|
|
|
/* if the direction is known, keep track of the magnitude */
|
|
if (transform_tool->trans_info[HORZ_OR_VERT] != ORIENTATION_UNKNOWN)
|
|
{
|
|
dir = transform_tool->trans_info[HORZ_OR_VERT];
|
|
switch (transform_tool->function)
|
|
{
|
|
case TRANSFORM_HANDLE_1:
|
|
if (dir == ORIENTATION_HORIZONTAL)
|
|
transform_tool->trans_info[XSHEAR] -= diffx;
|
|
else
|
|
transform_tool->trans_info[YSHEAR] -= diffy;
|
|
break;
|
|
case TRANSFORM_HANDLE_2:
|
|
if (dir == ORIENTATION_HORIZONTAL)
|
|
transform_tool->trans_info[XSHEAR] -= diffx;
|
|
else
|
|
transform_tool->trans_info[YSHEAR] += diffy;
|
|
break;
|
|
case TRANSFORM_HANDLE_3:
|
|
if (dir == ORIENTATION_HORIZONTAL)
|
|
transform_tool->trans_info[XSHEAR] += diffx;
|
|
else
|
|
transform_tool->trans_info[YSHEAR] -= diffy;
|
|
break;
|
|
case TRANSFORM_HANDLE_4:
|
|
if (dir == ORIENTATION_HORIZONTAL)
|
|
transform_tool->trans_info[XSHEAR] += diffx;
|
|
else
|
|
transform_tool->trans_info[YSHEAR] += diffy;
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
static void
|
|
shear_tool_recalc (GimpTool *tool,
|
|
GimpDisplay *gdisp)
|
|
{
|
|
GimpTransformTool *transform_tool;
|
|
gfloat width, height;
|
|
gfloat cx, cy;
|
|
|
|
transform_tool = GIMP_TRANSFORM_TOOL (tool);
|
|
|
|
cx = (transform_tool->x1 + transform_tool->x2) / 2.0;
|
|
cy = (transform_tool->y1 + transform_tool->y2) / 2.0;
|
|
|
|
width = transform_tool->x2 - transform_tool->x1;
|
|
height = transform_tool->y2 - transform_tool->y1;
|
|
|
|
if (width == 0)
|
|
width = 1;
|
|
if (height == 0)
|
|
height = 1;
|
|
|
|
/* assemble the transformation matrix */
|
|
gimp_matrix3_identity (transform_tool->transform);
|
|
gimp_matrix3_translate (transform_tool->transform, -cx, -cy);
|
|
|
|
/* shear matrix */
|
|
if (transform_tool->trans_info[HORZ_OR_VERT] == ORIENTATION_HORIZONTAL)
|
|
gimp_matrix3_xshear (transform_tool->transform,
|
|
(float) transform_tool->trans_info [XSHEAR] / height);
|
|
else
|
|
gimp_matrix3_yshear (transform_tool->transform,
|
|
(float) transform_tool->trans_info [YSHEAR] / width);
|
|
|
|
gimp_matrix3_translate (transform_tool->transform, +cx, +cy);
|
|
|
|
/* transform the bounding box */
|
|
gimp_transform_tool_transform_bounding_box (transform_tool);
|
|
|
|
/* update the information dialog */
|
|
shear_info_update (tool);
|
|
}
|