1997-11-25 06:05:25 +08:00
|
|
|
/* 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
|
1998-04-13 13:44:11 +08:00
|
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
1997-11-25 06:05:25 +08:00
|
|
|
*/
|
2000-12-17 05:37:03 +08:00
|
|
|
|
|
|
|
#include "config.h"
|
|
|
|
|
1997-11-25 06:05:25 +08:00
|
|
|
#include <stdlib.h>
|
2000-03-05 08:06:11 +08:00
|
|
|
|
2000-12-17 05:37:03 +08:00
|
|
|
#include <gtk/gtk.h>
|
|
|
|
|
2001-08-06 00:08:19 +08:00
|
|
|
#include "libgimpwidgets/gimpwidgets.h"
|
|
|
|
|
2002-05-03 20:45:22 +08:00
|
|
|
#include "tools-types.h"
|
2001-01-25 06:36:18 +08:00
|
|
|
|
2003-09-03 23:13:19 +08:00
|
|
|
#include "core/gimpchannel.h"
|
2001-05-09 10:32:03 +08:00
|
|
|
#include "core/gimpimage.h"
|
include the new "paint-funcs/paint-funcs-types.h".
2001-11-28 Michael Natterer <mitch@gimp.org>
* app/base/base-types.h: include the new
"paint-funcs/paint-funcs-types.h".
* app/paint-funcs/Makefile.am
* app/paint-funcs/paint-funcs-types.h: new file. Includes
"base/base-types.h".
* app/paint-funcs/paint-funcs.[ch]: removed the enums here,
include "paint-funcs-types.h".
* app/widgets/widgets-types.h: include "display/display-types.h"
* app/display/display-types.h: include "widgets/widgets-types.h".
* app/tools/tools-types.h: include "display/display-types.h"
* app/gui/gui-types.h: include "tools/tools-types.h".
The order of namespaces/dependencies should be (but is not):
(base, paint-funcs) -> (core, file, xcf, pdb) ->
(widgets, display) -> tools -> gui
* app/path.c: include "tools/tools-types.h".
* app/core/Makefile.am
* app/core/gimpimage-guides.[ch]
* app/core/gimpimage-merge.[ch]
* app/core/gimpimage-resize.[ch]
* app/core/gimpimage-scale.[ch]: new files.
* app/core/gimpimage.[ch]: removed the stuff which is in the new
files. Reordered all functions in both the .h and .c files,
commented the groups of functions.
* app/core/gimpcontainer.c: create the handler_id using a counter,
not the address of a pointer, because the address *may* be the
same twice, added debugging output.
* app/core/gimpviewable.[ch]: added primitive support for getting
a preview GdkPixbuf.
* app/nav_window.c
* app/undo.c
* app/undo_history.c
* app/core/gimpimage-duplicate.c
* app/core/gimpimage-mask.[ch]
* app/display/gimpdisplay.c
* app/display/gimpdisplayshell-callbacks.c
* app/display/gimpdisplayshell-dnd.c
* app/display/gimpdisplayshell-render.c
* app/display/gimpdisplayshell-scale.c
* app/display/gimpdisplayshell-scroll.c
* app/gui/image-commands.c
* app/gui/info-window.c
* app/gui/layers-commands.c
* app/gui/palette-import-dialog.c
* app/tools/gimpbycolorselecttool.c
* app/tools/gimpeditselectiontool.c
* app/tools/gimpmeasuretool.c
* app/tools/gimpmovetool.c
* app/widgets/gimpcontainerview-utils.c
* app/xcf/xcf-load.c: changed accordingly, some cleanup.
* tools/pdbgen/pdb/guides.pdb
* tools/pdbgen/pdb/image.pdb: changed accordingly, reordered functions.
* app/plug_in.c: set the labels of the "Repeat" and "Re-Show" menu
items to the name of the last plug-in (Fixes #50986).
* app/display/gimpdisplayshell.[ch]: set the labels of "Undo" and
"Redo" to the resp. undo names. Much simplified the WM icon stuff
by removing most code and using gimp_viewable_get_new_preview_pixbuf().
* app/widgets/gimpbrushfactoryview.c: forgot to assign the GQuark
returned by gimp_container_add_handler().
* app/pdb/guides_cmds.c
* app/pdb/image_cmds.c
* libgimp/gimpimage_pdb.[ch]: regenerated.
2001-11-29 01:51:06 +08:00
|
|
|
#include "core/gimpimage-guides.h"
|
2001-05-09 10:32:03 +08:00
|
|
|
#include "core/gimplayer.h"
|
2002-02-22 06:19:45 +08:00
|
|
|
#include "core/gimplayer-floating-sel.h"
|
2001-11-26 21:17:18 +08:00
|
|
|
#include "core/gimptoolinfo.h"
|
2001-05-09 10:32:03 +08:00
|
|
|
|
2001-09-26 07:23:09 +08:00
|
|
|
#include "display/gimpdisplay.h"
|
2001-10-13 20:52:30 +08:00
|
|
|
#include "display/gimpdisplay-foreach.h"
|
2001-11-01 05:20:09 +08:00
|
|
|
#include "display/gimpdisplayshell.h"
|
2003-03-20 19:31:33 +08:00
|
|
|
#include "display/gimpdisplayshell-appearance.h"
|
2003-01-04 02:01:30 +08:00
|
|
|
#include "display/gimpdisplayshell-transform.h"
|
2001-01-25 06:36:18 +08:00
|
|
|
|
2003-08-22 09:42:57 +08:00
|
|
|
#include "widgets/gimphelp-ids.h"
|
2002-12-20 00:33:29 +08:00
|
|
|
#include "widgets/gimpwidgets-utils.h"
|
|
|
|
|
2001-03-08 09:07:03 +08:00
|
|
|
#include "gimpeditselectiontool.h"
|
2003-02-05 22:39:40 +08:00
|
|
|
#include "gimpmoveoptions.h"
|
2001-03-08 09:07:03 +08:00
|
|
|
#include "gimpmovetool.h"
|
2003-04-16 00:05:52 +08:00
|
|
|
#include "gimptoolcontrol.h"
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2003-03-26 00:38:19 +08:00
|
|
|
#include "gimp-intl.h"
|
1998-12-16 08:37:09 +08:00
|
|
|
|
2000-12-31 12:07:42 +08:00
|
|
|
|
2001-11-26 21:17:18 +08:00
|
|
|
/* local function prototypes */
|
|
|
|
|
2001-11-11 07:03:22 +08:00
|
|
|
static void gimp_move_tool_class_init (GimpMoveToolClass *klass);
|
|
|
|
static void gimp_move_tool_init (GimpMoveTool *move_tool);
|
|
|
|
|
|
|
|
static void gimp_move_tool_control (GimpTool *tool,
|
2002-02-19 01:00:09 +08:00
|
|
|
GimpToolAction action,
|
2001-11-11 07:03:22 +08:00
|
|
|
GimpDisplay *gdisp);
|
|
|
|
static void gimp_move_tool_button_press (GimpTool *tool,
|
|
|
|
GimpCoords *coords,
|
|
|
|
guint32 time,
|
|
|
|
GdkModifierType state,
|
|
|
|
GimpDisplay *gdisp);
|
|
|
|
static void gimp_move_tool_button_release (GimpTool *tool,
|
|
|
|
GimpCoords *coords,
|
|
|
|
guint32 time,
|
|
|
|
GdkModifierType state,
|
|
|
|
GimpDisplay *gdisp);
|
|
|
|
static void gimp_move_tool_motion (GimpTool *tool,
|
|
|
|
GimpCoords *coords,
|
|
|
|
guint32 time,
|
|
|
|
GdkModifierType state,
|
|
|
|
GimpDisplay *gdisp);
|
2001-11-26 21:17:18 +08:00
|
|
|
static void gimp_move_tool_modifier_key (GimpTool *tool,
|
|
|
|
GdkModifierType key,
|
|
|
|
gboolean press,
|
|
|
|
GdkModifierType state,
|
|
|
|
GimpDisplay *gdisp);
|
2001-11-11 07:03:22 +08:00
|
|
|
static void gimp_move_tool_cursor_update (GimpTool *tool,
|
|
|
|
GimpCoords *coords,
|
|
|
|
GdkModifierType state,
|
|
|
|
GimpDisplay *gdisp);
|
|
|
|
|
2001-11-12 22:45:58 +08:00
|
|
|
static void gimp_move_tool_draw (GimpDrawTool *draw_tool);
|
2000-12-31 12:07:42 +08:00
|
|
|
|
2003-02-08 01:12:21 +08:00
|
|
|
static void gimp_move_tool_start_guide (GimpTool *tool,
|
|
|
|
GimpDisplay *gdisp,
|
|
|
|
GimpOrientationType orientation);
|
2002-02-08 01:37:34 +08:00
|
|
|
|
2000-12-31 12:07:42 +08:00
|
|
|
|
2001-11-12 22:45:58 +08:00
|
|
|
static GimpDrawToolClass *parent_class = NULL;
|
2001-02-22 05:56:39 +08:00
|
|
|
|
|
|
|
|
|
|
|
void
|
2002-03-29 11:50:29 +08:00
|
|
|
gimp_move_tool_register (GimpToolRegisterCallback callback,
|
2002-05-03 19:31:08 +08:00
|
|
|
gpointer data)
|
2001-02-22 05:56:39 +08:00
|
|
|
{
|
2002-03-29 11:50:29 +08:00
|
|
|
(* callback) (GIMP_TYPE_MOVE_TOOL,
|
2003-02-05 22:39:40 +08:00
|
|
|
GIMP_TYPE_MOVE_OPTIONS,
|
|
|
|
gimp_move_options_gui,
|
2003-06-28 19:20:37 +08:00
|
|
|
0,
|
2002-03-21 20:17:17 +08:00
|
|
|
"gimp-move-tool",
|
2002-11-01 07:06:09 +08:00
|
|
|
_("Move"),
|
2001-11-21 07:00:47 +08:00
|
|
|
_("Move layers & selections"),
|
2003-07-02 00:22:03 +08:00
|
|
|
N_("/Tools/Transform Tools/_Move"), "M",
|
2003-08-22 09:42:57 +08:00
|
|
|
NULL, GIMP_HELP_TOOL_MOVE,
|
2002-03-29 11:50:29 +08:00
|
|
|
GIMP_STOCK_TOOL_MOVE,
|
2002-05-03 19:31:08 +08:00
|
|
|
data);
|
2001-02-22 05:56:39 +08:00
|
|
|
}
|
|
|
|
|
2001-08-14 22:53:55 +08:00
|
|
|
GType
|
2001-02-22 05:56:39 +08:00
|
|
|
gimp_move_tool_get_type (void)
|
|
|
|
{
|
2001-08-14 22:53:55 +08:00
|
|
|
static GType tool_type = 0;
|
2001-02-22 05:56:39 +08:00
|
|
|
|
|
|
|
if (! tool_type)
|
|
|
|
{
|
2001-08-14 22:53:55 +08:00
|
|
|
static const GTypeInfo tool_info =
|
2001-02-22 05:56:39 +08:00
|
|
|
{
|
|
|
|
sizeof (GimpMoveToolClass),
|
2001-08-14 22:53:55 +08:00
|
|
|
(GBaseInitFunc) NULL,
|
|
|
|
(GBaseFinalizeFunc) NULL,
|
|
|
|
(GClassInitFunc) gimp_move_tool_class_init,
|
|
|
|
NULL, /* class_finalize */
|
|
|
|
NULL, /* class_data */
|
|
|
|
sizeof (GimpMoveTool),
|
|
|
|
0, /* n_preallocs */
|
|
|
|
(GInstanceInitFunc) gimp_move_tool_init,
|
2001-02-22 05:56:39 +08:00
|
|
|
};
|
2001-08-14 22:53:55 +08:00
|
|
|
|
2001-11-12 22:45:58 +08:00
|
|
|
tool_type = g_type_register_static (GIMP_TYPE_DRAW_TOOL,
|
2003-08-22 09:42:57 +08:00
|
|
|
"GimpMoveTool",
|
2001-08-14 22:53:55 +08:00
|
|
|
&tool_info, 0);
|
2001-02-22 05:56:39 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
return tool_type;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gimp_move_tool_class_init (GimpMoveToolClass *klass)
|
|
|
|
{
|
2001-11-12 22:45:58 +08:00
|
|
|
GimpToolClass *tool_class;
|
|
|
|
GimpDrawToolClass *draw_tool_class;
|
2001-02-22 05:56:39 +08:00
|
|
|
|
2001-11-12 22:45:58 +08:00
|
|
|
tool_class = GIMP_TOOL_CLASS (klass);
|
|
|
|
draw_tool_class = GIMP_DRAW_TOOL_CLASS (klass);
|
2001-02-22 05:56:39 +08:00
|
|
|
|
2001-08-14 22:53:55 +08:00
|
|
|
parent_class = g_type_class_peek_parent (klass);
|
2001-02-22 05:56:39 +08:00
|
|
|
|
2001-11-11 07:03:22 +08:00
|
|
|
tool_class->control = gimp_move_tool_control;
|
|
|
|
tool_class->button_press = gimp_move_tool_button_press;
|
|
|
|
tool_class->button_release = gimp_move_tool_button_release;
|
|
|
|
tool_class->motion = gimp_move_tool_motion;
|
2001-02-28 10:53:27 +08:00
|
|
|
tool_class->arrow_key = gimp_edit_selection_tool_arrow_key;
|
2001-11-26 21:17:18 +08:00
|
|
|
tool_class->modifier_key = gimp_move_tool_modifier_key;
|
2001-11-11 07:03:22 +08:00
|
|
|
tool_class->cursor_update = gimp_move_tool_cursor_update;
|
2001-11-12 22:45:58 +08:00
|
|
|
|
|
|
|
draw_tool_class->draw = gimp_move_tool_draw;
|
2001-02-22 05:56:39 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gimp_move_tool_init (GimpMoveTool *move_tool)
|
|
|
|
{
|
|
|
|
GimpTool *tool;
|
|
|
|
|
|
|
|
tool = GIMP_TOOL (move_tool);
|
|
|
|
|
2003-09-17 00:23:38 +08:00
|
|
|
move_tool->layer = NULL;
|
|
|
|
move_tool->guide = NULL;
|
|
|
|
move_tool->guide_disp = NULL;
|
2003-03-28 21:52:01 +08:00
|
|
|
|
|
|
|
move_tool->moving_guide = FALSE;
|
|
|
|
move_tool->guide_position = -1;
|
|
|
|
move_tool->guide_orientation = GIMP_ORIENTATION_UNKNOWN;
|
2001-02-22 05:56:39 +08:00
|
|
|
|
2003-09-17 00:23:38 +08:00
|
|
|
move_tool->saved_type = GIMP_TRANSFORM_TYPE_LAYER;
|
|
|
|
|
2002-05-03 05:03:27 +08:00
|
|
|
gimp_tool_control_set_snap_to (tool->control, FALSE);
|
|
|
|
gimp_tool_control_set_handles_empty_image (tool->control, TRUE);
|
2002-06-17 01:13:39 +08:00
|
|
|
gimp_tool_control_set_tool_cursor (tool->control,
|
|
|
|
GIMP_MOVE_TOOL_CURSOR);
|
2001-02-22 05:56:39 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2002-02-19 01:00:09 +08:00
|
|
|
gimp_move_tool_control (GimpTool *tool,
|
|
|
|
GimpToolAction action,
|
|
|
|
GimpDisplay *gdisp)
|
2001-02-22 05:56:39 +08:00
|
|
|
{
|
2003-08-22 01:40:29 +08:00
|
|
|
GimpDisplayShell *shell;
|
|
|
|
GimpMoveTool *move_tool;
|
2001-02-22 05:56:39 +08:00
|
|
|
|
2003-08-22 01:40:29 +08:00
|
|
|
shell = GIMP_DISPLAY_SHELL (gdisp->shell);
|
2001-08-14 22:53:55 +08:00
|
|
|
move_tool = GIMP_MOVE_TOOL (tool);
|
2001-02-22 05:56:39 +08:00
|
|
|
|
2001-08-14 22:53:55 +08:00
|
|
|
switch (action)
|
2001-02-22 05:56:39 +08:00
|
|
|
{
|
2001-08-14 22:53:55 +08:00
|
|
|
case PAUSE:
|
|
|
|
break;
|
|
|
|
|
|
|
|
case RESUME:
|
2003-08-22 01:40:29 +08:00
|
|
|
if (move_tool->guide && gimp_display_shell_get_show_guides (GIMP_DISPLAY_SHELL (shell)))
|
|
|
|
gimp_display_shell_draw_guide (GIMP_DISPLAY_SHELL (shell),
|
2001-11-01 05:20:09 +08:00
|
|
|
move_tool->guide, TRUE);
|
2001-08-14 22:53:55 +08:00
|
|
|
break;
|
|
|
|
|
|
|
|
case HALT:
|
2003-08-22 01:40:29 +08:00
|
|
|
if (move_tool->guide && gimp_display_shell_get_show_guides (GIMP_DISPLAY_SHELL (shell)))
|
|
|
|
gimp_display_shell_draw_guide (GIMP_DISPLAY_SHELL (shell),
|
2001-11-01 05:20:09 +08:00
|
|
|
move_tool->guide, FALSE);
|
2001-08-14 22:53:55 +08:00
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
break;
|
2001-02-22 05:56:39 +08:00
|
|
|
}
|
|
|
|
|
2001-11-11 07:03:22 +08:00
|
|
|
GIMP_TOOL_CLASS (parent_class)->control (tool, action, gdisp);
|
2001-02-22 05:56:39 +08:00
|
|
|
}
|
1999-04-09 06:25:54 +08:00
|
|
|
|
1997-11-25 06:05:25 +08:00
|
|
|
static void
|
2001-11-11 07:03:22 +08:00
|
|
|
gimp_move_tool_button_press (GimpTool *tool,
|
|
|
|
GimpCoords *coords,
|
|
|
|
guint32 time,
|
|
|
|
GdkModifierType state,
|
|
|
|
GimpDisplay *gdisp)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
2003-03-20 19:31:33 +08:00
|
|
|
GimpDisplayShell *shell;
|
|
|
|
GimpMoveTool *move;
|
|
|
|
GimpMoveOptions *options;
|
|
|
|
GimpLayer *layer;
|
|
|
|
GimpGuide *guide;
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2003-03-20 19:31:33 +08:00
|
|
|
shell = GIMP_DISPLAY_SHELL (gdisp->shell);
|
2003-02-05 22:39:40 +08:00
|
|
|
move = GIMP_MOVE_TOOL (tool);
|
|
|
|
options = GIMP_MOVE_OPTIONS (tool->tool_info->tool_options);
|
2001-11-26 21:17:18 +08:00
|
|
|
|
2000-12-31 12:07:42 +08:00
|
|
|
tool->gdisp = gdisp;
|
2002-02-05 19:35:03 +08:00
|
|
|
|
2003-03-28 21:52:01 +08:00
|
|
|
move->layer = NULL;
|
|
|
|
move->guide = NULL;
|
|
|
|
move->guide_disp = NULL;
|
|
|
|
move->moving_guide = FALSE;
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2003-09-17 00:23:38 +08:00
|
|
|
if (options->move_type == GIMP_TRANSFORM_TYPE_PATH)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
2003-09-17 00:23:38 +08:00
|
|
|
if (options->move_current)
|
|
|
|
{
|
|
|
|
if (gimp_image_get_active_vectors (gdisp->gimage))
|
|
|
|
{
|
|
|
|
init_edit_selection (tool, gdisp, coords, EDIT_VECTORS_TRANSLATE);
|
|
|
|
gimp_tool_control_activate (tool->control);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
GimpVectors *vectors;
|
|
|
|
|
|
|
|
if (gimp_draw_tool_on_vectors (GIMP_DRAW_TOOL (tool), gdisp,
|
|
|
|
coords, 7, 7,
|
|
|
|
NULL, NULL, NULL, NULL, &vectors))
|
|
|
|
{
|
|
|
|
gimp_image_set_active_vectors (gdisp->gimage, vectors);
|
|
|
|
init_edit_selection (tool, gdisp, coords, EDIT_VECTORS_TRANSLATE);
|
|
|
|
gimp_tool_control_activate (tool->control);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (options->move_type == GIMP_TRANSFORM_TYPE_SELECTION)
|
|
|
|
{
|
|
|
|
if (! gimp_channel_is_empty (gimp_image_get_mask (gdisp->gimage)))
|
|
|
|
{
|
|
|
|
init_edit_selection (tool, gdisp, coords, EDIT_MASK_TRANSLATE);
|
|
|
|
gimp_tool_control_activate (tool->control);
|
|
|
|
}
|
1997-11-25 06:05:25 +08:00
|
|
|
}
|
2001-11-26 21:17:18 +08:00
|
|
|
else if (options->move_current)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
2003-09-17 00:23:38 +08:00
|
|
|
if (gimp_image_get_active_layer (gdisp->gimage))
|
|
|
|
{
|
|
|
|
init_edit_selection (tool, gdisp, coords, EDIT_LAYER_TRANSLATE);
|
|
|
|
gimp_tool_control_activate (tool->control);
|
|
|
|
}
|
1997-11-25 06:05:25 +08:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2003-03-20 19:31:33 +08:00
|
|
|
if (gimp_display_shell_get_show_guides (shell) &&
|
2001-11-09 03:14:51 +08:00
|
|
|
(guide = gimp_image_find_guide (gdisp->gimage, coords->x, coords->y)))
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
2003-03-28 21:52:01 +08:00
|
|
|
move->guide = guide;
|
|
|
|
move->guide_disp = gdisp;
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2003-03-28 21:52:01 +08:00
|
|
|
move->moving_guide = TRUE;
|
|
|
|
move->guide_position = guide->position;
|
|
|
|
move->guide_orientation = guide->orientation;
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2002-05-03 19:31:08 +08:00
|
|
|
gimp_tool_control_set_scroll_lock (tool->control, TRUE);
|
|
|
|
gimp_tool_control_activate (tool->control);
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2003-04-13 19:43:47 +08:00
|
|
|
gimp_display_shell_selection_visibility (shell,
|
|
|
|
GIMP_SELECTION_PAUSE);
|
|
|
|
|
2002-02-03 20:10:23 +08:00
|
|
|
gimp_draw_tool_start (GIMP_DRAW_TOOL (tool), gdisp);
|
1997-11-25 06:05:25 +08:00
|
|
|
}
|
2001-11-09 03:14:51 +08:00
|
|
|
else if ((layer = gimp_image_pick_correlate_layer (gdisp->gimage,
|
|
|
|
coords->x,
|
|
|
|
coords->y)))
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
2000-12-29 23:22:01 +08:00
|
|
|
if (gimp_image_floating_sel (gdisp->gimage) &&
|
2001-01-29 07:25:25 +08:00
|
|
|
! gimp_layer_is_floating_sel (layer))
|
2000-03-29 07:39:32 +08:00
|
|
|
{
|
2003-09-17 00:23:38 +08:00
|
|
|
/* If there is a floating selection, and this aint it,
|
|
|
|
* use the move tool to anchor it.
|
|
|
|
*/
|
2000-12-29 23:22:01 +08:00
|
|
|
move->layer = gimp_image_floating_sel (gdisp->gimage);
|
2000-03-29 07:39:32 +08:00
|
|
|
}
|
1997-11-25 06:05:25 +08:00
|
|
|
else
|
|
|
|
{
|
2003-09-17 00:23:38 +08:00
|
|
|
/* Otherwise, init the edit selection */
|
|
|
|
|
2000-12-29 23:22:01 +08:00
|
|
|
gimp_image_set_active_layer (gdisp->gimage, layer);
|
2002-05-16 03:15:23 +08:00
|
|
|
|
Made drawable/layer properties (visibility, opacity etc.) undoable (fixes
2003-03-17 Michael Natterer <mitch@gimp.org>
Made drawable/layer properties (visibility, opacity etc.)
undoable (fixes bug #73893).
* app/core/core-enums.[ch]: added undo types/groups for
visibility, mode, opacity, linked and preserve_trans.
* app/core/Makefile.am
* app/core/core-types.h
* app/core/gimpitemundo.[ch]: new GimpUndo subclass which holds a
ref'ed GimpItem pointer so (1) this doesn't need to be done by all
undo steps related to an item and (2) the item the undo step is
for can be determined from outside the undo system.
* app/core/gimpimage-undo.[ch]: added gimp_image_undo_push_item()
which returns a new GimpItemUndo.
* app/core/gimpimage-undo-push.[ch]: use it for all item related
undo steps. Removed lots of GimpItem, GimpLayer, GimpDrawable
and GimpVectors pointers from the private undo structs. Added
undo push functions for the new undo types added above.
* app/core/gimpdrawable.[ch] (gimp_drawable_set_visible): added
"gboolean push_undo" parameter.
* app/core/gimplayer.[ch] (gimp_layer_set_opacity, _mode,
_preserve_trans, _linked): added "gboolean push_undo" parameters.
* app/core/gimpimage-mask.c
* app/core/gimpimage-merge.c
* app/core/gimplayer-floating-sel.c
* app/tools/gimpmovetool.c
* app/xcf/xcf-load.c
* app/widgets/gimpdrawablelistitem.c
* app/widgets/gimplayerlistitem.c
* app/widgets/gimplayerlistview.c: changed accordingly.
* tools/pdbgen/pdb/channel.pdb
* tools/pdbgen/pdb/layer.pdb: ditto. Added '$undo' paramaters to
the foo_accessors() functions. Removed $func from foo_accesors()
because we don't manipulate items without using getters/setters
any longer.
* app/pdb/channel_cmds.c
* app/pdb/layer_cmds.c: regenerated.
* app/widgets/gimpcellrenderertoggle.[ch]: added "clicked" signal
which carries an additional "GdkModifierType state" parameter as
in GimpCellRendererViewable .
* app/widgets/gimpcontainertreeview.c: emit "clicked" from
the toggle renderer, not "toggled" so the callbacks get the
modifier state.
* app/widgets/gimpdrawabletreeview.c: resurrected the "exclusive
visible by <shift>+click" feature as in 1.2.
* app/widgets/gimplayertreeview.c: compress layer opacity undos by
looking at the top of the undo stack and not pushing an undo if
there already is a GIMP_UNDO_DRAWABLE_OPACITY for the active
layer.
2003-03-18 02:02:41 +08:00
|
|
|
#ifdef __GNUC__
|
|
|
|
#warning FIXME: gimp_layer_set_linked()
|
|
|
|
#endif
|
|
|
|
#if 0
|
2002-05-16 03:15:23 +08:00
|
|
|
if (state & GDK_SHIFT_MASK)
|
|
|
|
gimp_layer_set_linked (layer, ! gimp_layer_get_linked (layer));
|
Made drawable/layer properties (visibility, opacity etc.) undoable (fixes
2003-03-17 Michael Natterer <mitch@gimp.org>
Made drawable/layer properties (visibility, opacity etc.)
undoable (fixes bug #73893).
* app/core/core-enums.[ch]: added undo types/groups for
visibility, mode, opacity, linked and preserve_trans.
* app/core/Makefile.am
* app/core/core-types.h
* app/core/gimpitemundo.[ch]: new GimpUndo subclass which holds a
ref'ed GimpItem pointer so (1) this doesn't need to be done by all
undo steps related to an item and (2) the item the undo step is
for can be determined from outside the undo system.
* app/core/gimpimage-undo.[ch]: added gimp_image_undo_push_item()
which returns a new GimpItemUndo.
* app/core/gimpimage-undo-push.[ch]: use it for all item related
undo steps. Removed lots of GimpItem, GimpLayer, GimpDrawable
and GimpVectors pointers from the private undo structs. Added
undo push functions for the new undo types added above.
* app/core/gimpdrawable.[ch] (gimp_drawable_set_visible): added
"gboolean push_undo" parameter.
* app/core/gimplayer.[ch] (gimp_layer_set_opacity, _mode,
_preserve_trans, _linked): added "gboolean push_undo" parameters.
* app/core/gimpimage-mask.c
* app/core/gimpimage-merge.c
* app/core/gimplayer-floating-sel.c
* app/tools/gimpmovetool.c
* app/xcf/xcf-load.c
* app/widgets/gimpdrawablelistitem.c
* app/widgets/gimplayerlistitem.c
* app/widgets/gimplayerlistview.c: changed accordingly.
* tools/pdbgen/pdb/channel.pdb
* tools/pdbgen/pdb/layer.pdb: ditto. Added '$undo' paramaters to
the foo_accessors() functions. Removed $func from foo_accesors()
because we don't manipulate items without using getters/setters
any longer.
* app/pdb/channel_cmds.c
* app/pdb/layer_cmds.c: regenerated.
* app/widgets/gimpcellrenderertoggle.[ch]: added "clicked" signal
which carries an additional "GdkModifierType state" parameter as
in GimpCellRendererViewable .
* app/widgets/gimpcontainertreeview.c: emit "clicked" from
the toggle renderer, not "toggled" so the callbacks get the
modifier state.
* app/widgets/gimpdrawabletreeview.c: resurrected the "exclusive
visible by <shift>+click" feature as in 1.2.
* app/widgets/gimplayertreeview.c: compress layer opacity undos by
looking at the top of the undo stack and not pushing an undo if
there already is a GIMP_UNDO_DRAWABLE_OPACITY for the active
layer.
2003-03-18 02:02:41 +08:00
|
|
|
#endif
|
2002-05-16 03:15:23 +08:00
|
|
|
|
2001-11-09 03:14:51 +08:00
|
|
|
init_edit_selection (tool, gdisp, coords, EDIT_LAYER_TRANSLATE);
|
1997-11-25 06:05:25 +08:00
|
|
|
}
|
2002-02-05 19:35:03 +08:00
|
|
|
|
2002-05-03 19:31:08 +08:00
|
|
|
gimp_tool_control_activate (tool->control);
|
1997-11-25 06:05:25 +08:00
|
|
|
}
|
|
|
|
}
|
1998-03-16 19:13:24 +08:00
|
|
|
}
|
|
|
|
|
1998-03-19 06:35:31 +08:00
|
|
|
static void
|
2001-11-11 07:03:22 +08:00
|
|
|
gimp_move_tool_button_release (GimpTool *tool,
|
|
|
|
GimpCoords *coords,
|
|
|
|
guint32 time,
|
|
|
|
GdkModifierType state,
|
|
|
|
GimpDisplay *gdisp)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
2002-06-27 06:16:59 +08:00
|
|
|
GimpMoveTool *move;
|
|
|
|
GimpDisplayShell *shell;
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2003-03-28 21:52:01 +08:00
|
|
|
move = GIMP_MOVE_TOOL (tool);
|
2002-06-27 06:16:59 +08:00
|
|
|
shell = GIMP_DISPLAY_SHELL (gdisp->shell);
|
|
|
|
|
2003-01-03 21:59:23 +08:00
|
|
|
gimp_tool_control_halt (tool->control);
|
2001-11-09 03:14:51 +08:00
|
|
|
|
2003-03-28 21:52:01 +08:00
|
|
|
if (move->moving_guide)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
2003-03-28 21:52:01 +08:00
|
|
|
gboolean delete_guide = FALSE;
|
|
|
|
gint x1, y1;
|
|
|
|
gint x2, y2;
|
2001-11-01 05:20:09 +08:00
|
|
|
|
2002-05-03 19:31:08 +08:00
|
|
|
gimp_tool_control_set_scroll_lock (tool->control, FALSE);
|
2003-03-28 21:52:01 +08:00
|
|
|
gimp_draw_tool_stop (GIMP_DRAW_TOOL (tool));
|
|
|
|
|
|
|
|
if (state & GDK_BUTTON3_MASK)
|
|
|
|
{
|
|
|
|
move->moving_guide = FALSE;
|
|
|
|
move->guide_position = -1;
|
|
|
|
move->guide_orientation = GIMP_ORIENTATION_UNKNOWN;
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2003-04-04 01:37:31 +08:00
|
|
|
gimp_display_shell_selection_visibility (shell,
|
|
|
|
GIMP_SELECTION_RESUME);
|
2003-03-28 21:52:01 +08:00
|
|
|
return;
|
|
|
|
}
|
2002-06-27 06:16:59 +08:00
|
|
|
|
|
|
|
gimp_display_shell_untransform_xy (shell,
|
|
|
|
0, 0,
|
|
|
|
&x1, &y1,
|
|
|
|
FALSE, FALSE);
|
|
|
|
gimp_display_shell_untransform_xy (shell,
|
|
|
|
shell->disp_width, shell->disp_height,
|
|
|
|
&x2, &y2,
|
|
|
|
FALSE, FALSE);
|
1997-11-25 06:05:25 +08:00
|
|
|
|
|
|
|
if (x1 < 0) x1 = 0;
|
|
|
|
if (y1 < 0) y1 = 0;
|
2000-03-29 07:39:32 +08:00
|
|
|
if (x2 > gdisp->gimage->width) x2 = gdisp->gimage->width;
|
1997-11-25 06:05:25 +08:00
|
|
|
if (y2 > gdisp->gimage->height) y2 = gdisp->gimage->height;
|
|
|
|
|
2003-03-28 21:52:01 +08:00
|
|
|
switch (move->guide_orientation)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
2003-02-08 01:12:21 +08:00
|
|
|
case GIMP_ORIENTATION_HORIZONTAL:
|
2003-03-28 21:52:01 +08:00
|
|
|
if ((move->guide_position < y1) || (move->guide_position > y2))
|
1999-10-14 07:07:45 +08:00
|
|
|
delete_guide = TRUE;
|
1997-11-25 06:05:25 +08:00
|
|
|
break;
|
2000-12-29 00:19:55 +08:00
|
|
|
|
2003-02-08 01:12:21 +08:00
|
|
|
case GIMP_ORIENTATION_VERTICAL:
|
2003-03-28 21:52:01 +08:00
|
|
|
if ((move->guide_position < x1) || (move->guide_position > x2))
|
1999-10-14 07:07:45 +08:00
|
|
|
delete_guide = TRUE;
|
1997-11-25 06:05:25 +08:00
|
|
|
break;
|
2000-12-29 00:19:55 +08:00
|
|
|
|
|
|
|
default:
|
|
|
|
break;
|
1997-11-25 06:05:25 +08:00
|
|
|
}
|
|
|
|
|
1999-10-14 07:07:45 +08:00
|
|
|
if (delete_guide)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
2003-03-28 21:52:01 +08:00
|
|
|
if (move->guide)
|
|
|
|
{
|
|
|
|
gimp_image_remove_guide (gdisp->gimage, move->guide, TRUE);
|
|
|
|
move->guide = NULL;
|
|
|
|
move->guide_disp = NULL;
|
|
|
|
}
|
1997-11-25 06:05:25 +08:00
|
|
|
}
|
2003-03-28 21:52:01 +08:00
|
|
|
else
|
|
|
|
{
|
|
|
|
if (move->guide)
|
|
|
|
{
|
|
|
|
gimp_image_move_guide (gdisp->gimage, move->guide,
|
|
|
|
move->guide_position, TRUE);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
switch (move->guide_orientation)
|
|
|
|
{
|
|
|
|
case GIMP_ORIENTATION_HORIZONTAL:
|
|
|
|
move->guide = gimp_image_add_hguide (gdisp->gimage,
|
|
|
|
move->guide_position,
|
|
|
|
TRUE);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case GIMP_ORIENTATION_VERTICAL:
|
|
|
|
move->guide = gimp_image_add_vguide (gdisp->gimage,
|
|
|
|
move->guide_position,
|
|
|
|
TRUE);
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
g_assert_not_reached ();
|
|
|
|
}
|
|
|
|
|
|
|
|
move->guide_disp = gdisp;
|
|
|
|
}
|
|
|
|
}
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2001-11-11 07:03:22 +08:00
|
|
|
gimp_display_shell_selection_visibility (shell, GIMP_SELECTION_RESUME);
|
2002-05-09 01:48:24 +08:00
|
|
|
gimp_image_flush (gdisp->gimage);
|
1997-11-25 06:05:25 +08:00
|
|
|
|
|
|
|
if (move->guide)
|
2001-11-01 05:20:09 +08:00
|
|
|
gimp_display_shell_draw_guide (shell, move->guide, TRUE);
|
2003-03-28 21:52:01 +08:00
|
|
|
|
|
|
|
move->moving_guide = FALSE;
|
|
|
|
move->guide_position = -1;
|
|
|
|
move->guide_orientation = GIMP_ORIENTATION_UNKNOWN;
|
1997-11-25 06:05:25 +08:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
1999-10-14 07:07:45 +08:00
|
|
|
/* Take care of the case where the user "cancels" the action */
|
2001-11-09 03:14:51 +08:00
|
|
|
if (! (state & GDK_BUTTON3_MASK))
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
|
|
|
if (move->layer)
|
|
|
|
{
|
|
|
|
floating_sel_anchor (move->layer);
|
2002-05-09 01:48:24 +08:00
|
|
|
gimp_image_flush (gdisp->gimage);
|
1997-11-25 06:05:25 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1998-03-19 06:35:31 +08:00
|
|
|
static void
|
2001-11-11 07:03:22 +08:00
|
|
|
gimp_move_tool_motion (GimpTool *tool,
|
|
|
|
GimpCoords *coords,
|
|
|
|
guint32 time,
|
|
|
|
GdkModifierType state,
|
|
|
|
GimpDisplay *gdisp)
|
1998-03-16 19:13:24 +08:00
|
|
|
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
2003-03-28 21:52:01 +08:00
|
|
|
GimpMoveTool *move;
|
|
|
|
GimpDisplayShell *shell;
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2003-03-28 21:52:01 +08:00
|
|
|
move = GIMP_MOVE_TOOL (tool);
|
|
|
|
shell = GIMP_DISPLAY_SHELL (gdisp->shell);
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2003-03-28 21:52:01 +08:00
|
|
|
if (move->moving_guide)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
2003-03-28 21:52:01 +08:00
|
|
|
gint tx, ty;
|
2001-11-01 05:20:09 +08:00
|
|
|
|
2001-11-12 22:45:58 +08:00
|
|
|
gimp_draw_tool_pause (GIMP_DRAW_TOOL (tool));
|
1999-04-06 07:33:50 +08:00
|
|
|
|
2002-06-27 06:16:59 +08:00
|
|
|
gimp_display_shell_transform_xy (shell,
|
|
|
|
coords->x, coords->y,
|
|
|
|
&tx, &ty,
|
|
|
|
FALSE);
|
2001-11-09 03:14:51 +08:00
|
|
|
|
2003-03-28 21:52:01 +08:00
|
|
|
if (tx < 0 || tx >= shell->disp_width ||
|
|
|
|
ty < 0 || ty >= shell->disp_height)
|
1999-04-06 07:33:50 +08:00
|
|
|
{
|
2003-03-28 21:52:01 +08:00
|
|
|
move->guide_position = -1;
|
1997-11-25 06:05:25 +08:00
|
|
|
}
|
2001-11-09 03:14:51 +08:00
|
|
|
else
|
|
|
|
{
|
2003-03-28 21:52:01 +08:00
|
|
|
if (move->guide_orientation == GIMP_ORIENTATION_HORIZONTAL)
|
|
|
|
move->guide_position = ROUND (coords->y);
|
2001-11-09 03:14:51 +08:00
|
|
|
else
|
2003-03-28 21:52:01 +08:00
|
|
|
move->guide_position = ROUND (coords->x);
|
2001-11-09 03:14:51 +08:00
|
|
|
}
|
2001-11-12 22:45:58 +08:00
|
|
|
|
|
|
|
gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
|
1997-11-25 06:05:25 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2001-11-26 21:17:18 +08:00
|
|
|
static void
|
|
|
|
gimp_move_tool_modifier_key (GimpTool *tool,
|
|
|
|
GdkModifierType key,
|
|
|
|
gboolean press,
|
|
|
|
GdkModifierType state,
|
|
|
|
GimpDisplay *gdisp)
|
|
|
|
{
|
2003-09-17 00:23:38 +08:00
|
|
|
GimpMoveTool *move_tool;
|
2003-02-05 22:39:40 +08:00
|
|
|
GimpMoveOptions *options;
|
2001-11-26 21:17:18 +08:00
|
|
|
|
2003-09-17 00:23:38 +08:00
|
|
|
move_tool = GIMP_MOVE_TOOL (tool);
|
|
|
|
options = GIMP_MOVE_OPTIONS (tool->tool_info->tool_options);
|
2001-11-26 21:17:18 +08:00
|
|
|
|
2003-09-17 00:23:38 +08:00
|
|
|
if (key == GDK_SHIFT_MASK)
|
2001-11-26 21:17:18 +08:00
|
|
|
{
|
2003-09-17 00:23:38 +08:00
|
|
|
g_object_set (options, "move-current", ! options->move_current, NULL);
|
2001-11-26 21:17:18 +08:00
|
|
|
}
|
2003-09-17 00:23:38 +08:00
|
|
|
else if (key == GDK_MOD1_MASK || key == GDK_CONTROL_MASK)
|
2001-11-26 21:17:18 +08:00
|
|
|
{
|
2003-09-17 00:23:38 +08:00
|
|
|
GimpTransformType button_type;
|
|
|
|
|
|
|
|
button_type = options->move_type;
|
|
|
|
|
|
|
|
if (press)
|
|
|
|
{
|
|
|
|
if (key == (state & (GDK_MOD1_MASK | GDK_CONTROL_MASK)))
|
|
|
|
{
|
|
|
|
/* first modifier pressed */
|
|
|
|
|
|
|
|
move_tool->saved_type = options->move_type;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (! (state & (GDK_MOD1_MASK | GDK_CONTROL_MASK)))
|
|
|
|
{
|
|
|
|
/* last modifier released */
|
|
|
|
|
|
|
|
button_type = move_tool->saved_type;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (state & GDK_MOD1_MASK)
|
|
|
|
{
|
|
|
|
button_type = GIMP_TRANSFORM_TYPE_SELECTION;
|
|
|
|
}
|
|
|
|
else if (state & GDK_CONTROL_MASK)
|
|
|
|
{
|
|
|
|
button_type = GIMP_TRANSFORM_TYPE_PATH;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (button_type != options->move_type)
|
|
|
|
{
|
|
|
|
g_object_set (options, "move-type", button_type, NULL);
|
|
|
|
}
|
2001-11-26 21:17:18 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1998-03-19 06:35:31 +08:00
|
|
|
static void
|
2001-11-11 07:03:22 +08:00
|
|
|
gimp_move_tool_cursor_update (GimpTool *tool,
|
|
|
|
GimpCoords *coords,
|
|
|
|
GdkModifierType state,
|
|
|
|
GimpDisplay *gdisp)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
2003-03-20 19:31:33 +08:00
|
|
|
GimpDisplayShell *shell;
|
|
|
|
GimpMoveTool *move;
|
|
|
|
GimpMoveOptions *options;
|
|
|
|
GimpLayer *layer;
|
|
|
|
GimpGuide *guide;
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2003-03-20 19:31:33 +08:00
|
|
|
shell = GIMP_DISPLAY_SHELL (gdisp->shell);
|
2003-02-05 22:39:40 +08:00
|
|
|
move = GIMP_MOVE_TOOL (tool);
|
|
|
|
options = GIMP_MOVE_OPTIONS (tool->tool_info->tool_options);
|
2001-11-26 21:17:18 +08:00
|
|
|
|
2003-09-17 00:23:38 +08:00
|
|
|
if (options->move_type == GIMP_TRANSFORM_TYPE_PATH)
|
|
|
|
{
|
|
|
|
if (options->move_current)
|
|
|
|
{
|
|
|
|
if (gimp_image_get_active_vectors (gdisp->gimage))
|
|
|
|
{
|
|
|
|
gimp_tool_set_cursor (tool, gdisp,
|
|
|
|
GIMP_MOUSE_CURSOR,
|
|
|
|
GIMP_BEZIER_SELECT_TOOL_CURSOR,
|
|
|
|
GIMP_CURSOR_MODIFIER_MOVE);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
gimp_tool_set_cursor (tool, gdisp,
|
|
|
|
GIMP_BAD_CURSOR,
|
|
|
|
GIMP_BEZIER_SELECT_TOOL_CURSOR,
|
|
|
|
GIMP_CURSOR_MODIFIER_MOVE);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (gimp_draw_tool_on_vectors (GIMP_DRAW_TOOL (tool), gdisp,
|
|
|
|
coords, 7, 7,
|
|
|
|
NULL, NULL, NULL, NULL, NULL))
|
|
|
|
{
|
|
|
|
gimp_tool_set_cursor (tool, gdisp,
|
|
|
|
GIMP_MOUSE_CURSOR,
|
|
|
|
GIMP_TOOL_CURSOR_NONE,
|
|
|
|
GIMP_CURSOR_MODIFIER_HAND);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
gimp_tool_set_cursor (tool, gdisp,
|
|
|
|
GIMP_BAD_CURSOR,
|
|
|
|
GIMP_BEZIER_SELECT_TOOL_CURSOR,
|
|
|
|
GIMP_CURSOR_MODIFIER_MOVE);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (options->move_type == GIMP_TRANSFORM_TYPE_SELECTION)
|
2000-03-29 07:39:32 +08:00
|
|
|
{
|
2003-09-17 00:23:38 +08:00
|
|
|
if (! gimp_channel_is_empty (gimp_image_get_mask (gdisp->gimage)))
|
|
|
|
{
|
|
|
|
gimp_tool_set_cursor (tool, gdisp,
|
|
|
|
GIMP_MOUSE_CURSOR,
|
|
|
|
GIMP_RECT_SELECT_TOOL_CURSOR,
|
|
|
|
GIMP_CURSOR_MODIFIER_MOVE);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
gimp_tool_set_cursor (tool, gdisp,
|
|
|
|
GIMP_BAD_CURSOR,
|
|
|
|
GIMP_RECT_SELECT_TOOL_CURSOR,
|
|
|
|
GIMP_CURSOR_MODIFIER_MOVE);
|
|
|
|
}
|
2000-03-29 07:39:32 +08:00
|
|
|
}
|
2001-11-26 21:17:18 +08:00
|
|
|
else if (options->move_current)
|
2000-03-29 07:39:32 +08:00
|
|
|
{
|
2003-09-17 00:23:38 +08:00
|
|
|
if (gimp_image_get_active_layer (gdisp->gimage))
|
|
|
|
{
|
|
|
|
gimp_tool_set_cursor (tool, gdisp,
|
|
|
|
GIMP_MOUSE_CURSOR,
|
|
|
|
GIMP_MOVE_TOOL_CURSOR,
|
|
|
|
GIMP_CURSOR_MODIFIER_NONE);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
gimp_tool_set_cursor (tool, gdisp,
|
|
|
|
GIMP_BAD_CURSOR,
|
|
|
|
GIMP_MOVE_TOOL_CURSOR,
|
|
|
|
GIMP_CURSOR_MODIFIER_NONE);
|
|
|
|
}
|
2000-03-29 07:39:32 +08:00
|
|
|
}
|
1997-11-25 06:05:25 +08:00
|
|
|
else
|
|
|
|
{
|
2003-03-20 19:31:33 +08:00
|
|
|
if (gimp_display_shell_get_show_guides (shell) &&
|
2001-11-09 03:14:51 +08:00
|
|
|
(guide = gimp_image_find_guide (gdisp->gimage, coords->x, coords->y)))
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
2002-02-05 01:43:01 +08:00
|
|
|
gimp_tool_set_cursor (tool, gdisp,
|
|
|
|
GDK_HAND2,
|
|
|
|
GIMP_TOOL_CURSOR_NONE,
|
|
|
|
GIMP_CURSOR_MODIFIER_HAND);
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2003-03-28 21:52:01 +08:00
|
|
|
if (! gimp_tool_control_is_active (tool->control))
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
|
|
|
if (move->guide)
|
|
|
|
{
|
2002-02-05 01:43:01 +08:00
|
|
|
GimpDisplay *old_guide_gdisp;
|
2001-11-01 05:20:09 +08:00
|
|
|
|
2003-03-28 21:52:01 +08:00
|
|
|
old_guide_gdisp =
|
|
|
|
gdisplays_check_valid (move->guide_disp,
|
|
|
|
move->guide_disp->gimage);
|
2002-02-05 01:43:01 +08:00
|
|
|
|
|
|
|
if (old_guide_gdisp)
|
2001-11-01 05:20:09 +08:00
|
|
|
{
|
2002-02-05 01:43:01 +08:00
|
|
|
GimpDisplayShell *shell;
|
|
|
|
|
|
|
|
shell = GIMP_DISPLAY_SHELL (old_guide_gdisp->shell);
|
2001-11-01 05:20:09 +08:00
|
|
|
|
|
|
|
gimp_display_shell_draw_guide (shell, move->guide, FALSE);
|
|
|
|
}
|
1997-11-25 06:05:25 +08:00
|
|
|
}
|
|
|
|
|
2002-02-05 01:43:01 +08:00
|
|
|
gimp_display_shell_draw_guide (GIMP_DISPLAY_SHELL (gdisp->shell),
|
|
|
|
guide, TRUE);
|
2001-11-01 05:20:09 +08:00
|
|
|
|
2003-03-28 21:52:01 +08:00
|
|
|
move->guide = guide;
|
|
|
|
move->guide_disp = gdisp;
|
1997-11-25 06:05:25 +08:00
|
|
|
}
|
|
|
|
}
|
2001-11-09 03:14:51 +08:00
|
|
|
else if ((layer = gimp_image_pick_correlate_layer (gdisp->gimage,
|
|
|
|
coords->x, coords->y)))
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
|
|
|
/* if there is a floating selection, and this aint it... */
|
2000-12-29 23:22:01 +08:00
|
|
|
if (gimp_image_floating_sel (gdisp->gimage) &&
|
2001-01-29 07:25:25 +08:00
|
|
|
! gimp_layer_is_floating_sel (layer))
|
2001-02-25 03:29:47 +08:00
|
|
|
{
|
2002-02-05 01:43:01 +08:00
|
|
|
gimp_tool_set_cursor (tool, gdisp,
|
|
|
|
GIMP_MOUSE_CURSOR,
|
|
|
|
GIMP_RECT_SELECT_TOOL_CURSOR,
|
|
|
|
GIMP_CURSOR_MODIFIER_ANCHOR);
|
2001-02-25 03:29:47 +08:00
|
|
|
}
|
2001-02-25 22:37:12 +08:00
|
|
|
else if (layer == gimp_image_get_active_layer (gdisp->gimage))
|
2001-02-25 03:29:47 +08:00
|
|
|
{
|
2002-02-05 01:43:01 +08:00
|
|
|
gimp_tool_set_cursor (tool, gdisp,
|
|
|
|
GIMP_MOUSE_CURSOR,
|
|
|
|
GIMP_MOVE_TOOL_CURSOR,
|
|
|
|
GIMP_CURSOR_MODIFIER_NONE);
|
2001-02-25 03:29:47 +08:00
|
|
|
}
|
1997-11-25 06:05:25 +08:00
|
|
|
else
|
2001-02-25 03:29:47 +08:00
|
|
|
{
|
2002-02-05 01:43:01 +08:00
|
|
|
gimp_tool_set_cursor (tool, gdisp,
|
|
|
|
GDK_HAND2,
|
|
|
|
GIMP_TOOL_CURSOR_NONE,
|
|
|
|
GIMP_CURSOR_MODIFIER_HAND);
|
2001-02-25 03:29:47 +08:00
|
|
|
}
|
1997-11-25 06:05:25 +08:00
|
|
|
}
|
|
|
|
else
|
2000-03-29 07:39:32 +08:00
|
|
|
{
|
2002-02-05 01:43:01 +08:00
|
|
|
gimp_tool_set_cursor (tool, gdisp,
|
|
|
|
GIMP_BAD_CURSOR,
|
|
|
|
GIMP_MOVE_TOOL_CURSOR,
|
|
|
|
GIMP_CURSOR_MODIFIER_NONE);
|
2000-03-29 07:39:32 +08:00
|
|
|
}
|
1997-11-25 06:05:25 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2001-11-12 22:45:58 +08:00
|
|
|
gimp_move_tool_draw (GimpDrawTool *draw_tool)
|
2001-11-09 03:14:51 +08:00
|
|
|
{
|
2001-11-12 22:45:58 +08:00
|
|
|
GimpMoveTool *move;
|
|
|
|
GimpTool *tool;
|
2001-11-09 03:14:51 +08:00
|
|
|
|
2001-11-12 22:45:58 +08:00
|
|
|
move = GIMP_MOVE_TOOL (draw_tool);
|
|
|
|
tool = GIMP_TOOL (draw_tool);
|
2001-11-09 03:14:51 +08:00
|
|
|
|
2003-03-28 21:52:01 +08:00
|
|
|
if (move->moving_guide && move->guide_position != -1)
|
2001-11-09 03:14:51 +08:00
|
|
|
{
|
2003-03-28 21:52:01 +08:00
|
|
|
switch (move->guide_orientation)
|
2001-11-12 22:45:58 +08:00
|
|
|
{
|
2003-02-08 01:12:21 +08:00
|
|
|
case GIMP_ORIENTATION_HORIZONTAL:
|
2001-11-12 22:45:58 +08:00
|
|
|
gimp_draw_tool_draw_line (draw_tool,
|
2003-03-28 21:52:01 +08:00
|
|
|
0, move->guide_position,
|
|
|
|
draw_tool->gdisp->gimage->width,
|
|
|
|
move->guide_position,
|
2001-11-12 22:45:58 +08:00
|
|
|
FALSE);
|
|
|
|
break;
|
|
|
|
|
2003-02-08 01:12:21 +08:00
|
|
|
case GIMP_ORIENTATION_VERTICAL:
|
2001-11-12 22:45:58 +08:00
|
|
|
gimp_draw_tool_draw_line (draw_tool,
|
2003-03-28 21:52:01 +08:00
|
|
|
move->guide_position, 0,
|
|
|
|
move->guide_position,
|
|
|
|
draw_tool->gdisp->gimage->height,
|
2001-11-12 22:45:58 +08:00
|
|
|
FALSE);
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
2003-03-28 21:52:01 +08:00
|
|
|
g_assert_not_reached ();
|
|
|
|
}
|
2001-11-09 03:14:51 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1997-11-25 06:05:25 +08:00
|
|
|
void
|
2001-10-29 19:47:11 +08:00
|
|
|
gimp_move_tool_start_hguide (GimpTool *tool,
|
|
|
|
GimpDisplay *gdisp)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
2003-02-08 01:12:21 +08:00
|
|
|
gimp_move_tool_start_guide (tool, gdisp, GIMP_ORIENTATION_HORIZONTAL);
|
1997-11-25 06:05:25 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2001-10-29 19:47:11 +08:00
|
|
|
gimp_move_tool_start_vguide (GimpTool *tool,
|
|
|
|
GimpDisplay *gdisp)
|
2002-02-08 01:37:34 +08:00
|
|
|
{
|
2003-02-08 01:12:21 +08:00
|
|
|
gimp_move_tool_start_guide (tool, gdisp, GIMP_ORIENTATION_VERTICAL);
|
2002-02-08 01:37:34 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2003-02-08 01:12:21 +08:00
|
|
|
gimp_move_tool_start_guide (GimpTool *tool,
|
|
|
|
GimpDisplay *gdisp,
|
|
|
|
GimpOrientationType orientation)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
2001-02-22 05:56:39 +08:00
|
|
|
GimpMoveTool *move;
|
|
|
|
|
2002-02-08 01:37:34 +08:00
|
|
|
g_return_if_fail (GIMP_IS_MOVE_TOOL (tool));
|
|
|
|
g_return_if_fail (GIMP_IS_DISPLAY (gdisp));
|
|
|
|
|
2001-02-22 05:56:39 +08:00
|
|
|
move = GIMP_MOVE_TOOL (tool);
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2001-11-11 07:03:22 +08:00
|
|
|
gimp_display_shell_selection_visibility (GIMP_DISPLAY_SHELL (gdisp->shell),
|
|
|
|
GIMP_SELECTION_PAUSE);
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2003-03-28 21:52:01 +08:00
|
|
|
tool->gdisp = gdisp;
|
2002-05-03 19:31:08 +08:00
|
|
|
gimp_tool_control_activate (tool->control);
|
|
|
|
gimp_tool_control_set_scroll_lock (tool->control, TRUE);
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2003-03-28 21:52:01 +08:00
|
|
|
if (move->guide && move->guide_disp)
|
|
|
|
gimp_display_shell_draw_guide (GIMP_DISPLAY_SHELL (move->guide_disp->shell),
|
2001-11-01 05:20:09 +08:00
|
|
|
move->guide, FALSE);
|
1999-10-14 07:07:45 +08:00
|
|
|
|
2003-03-28 21:52:01 +08:00
|
|
|
move->guide = NULL;
|
|
|
|
move->guide_disp = NULL;
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2003-03-28 21:52:01 +08:00
|
|
|
move->moving_guide = TRUE;
|
|
|
|
move->guide_position = -1;
|
|
|
|
move->guide_orientation = orientation;
|
2001-11-12 22:45:58 +08:00
|
|
|
|
2002-02-08 01:37:34 +08:00
|
|
|
gimp_tool_set_cursor (tool, gdisp,
|
|
|
|
GDK_HAND2,
|
|
|
|
GIMP_TOOL_CURSOR_NONE,
|
|
|
|
GIMP_CURSOR_MODIFIER_HAND);
|
|
|
|
|
2002-02-03 20:10:23 +08:00
|
|
|
gimp_draw_tool_start (GIMP_DRAW_TOOL (tool), gdisp);
|
1997-11-25 06:05:25 +08:00
|
|
|
}
|