mirror of
https://gitlab.gnome.org/GNOME/gimp
synced 2024-10-23 21:11:43 +00:00
02fde14c95
2001-11-08 Michael Natterer <mitch@gimp.org> * app/Makefile.am: build display/ before tools/. * app/devices.c: devices_check_change(): added all events which have a GdkDevice pointer. * app/gimpprogress.c: include "display-types.h" instead of "core-types.h". * app/core/Makefile.am * app/core/gimpdrawable-bucket-fill.[ch]: new files: the bucket_fill stuff taken from tools/gimpbucketfilltool.[ch]. * app/core/core-types.h: added "BucketFillMode". * app/core/gimpimage-mask-select.[ch]: cleanup. * app/core/gimpmarshal.list: added more marshallers for GimpTool's new signal signatures. * app/core/gimpmarshal.[ch]: regenerated. * app/display/Makefile.am * app/display/gimpdisplayshell-dnd.[ch] * app/display/gimpdisplayshell-layer-select.[ch]: new files: the canvas drop callbacks from gimpdisplayshell-callbacks.[ch] and the stuff formerly knows as gui/layer-select.[ch]. * app/display/gimpdisplay.h: don't include "gui/gui-types.h". * app/display/gximage.c: include "display-types.h". * app/display/gimpdisplay-foreach.c * app/display/gimpdisplayshell.[ch]: call gdsplay_delete(), don't destroy the shell widget. * app/gui/Makefile.am * app/gui/layer-select.[ch]: removed. * app/gui/gradients-commands.c: fixed "Save as POV" fprintf()s. * app/gui/preferences-dialog.c: removed the layer_select stuff because it is useless with the new preview system. * app/gui/tool-options-dialog.c: send the correct data to the close_callback. * app/gui/tools-commands.c: changed to follow the new gimp_tool_initialize() semantics (see below). Tool & canvas event handling chainsawing: * app/tools/tools-types.h: new struct GimpCoords which contains x, y, pressure, tilt etc. * app/display/gimpdisplayshell-callbacks.[ch]: added utility functions which transparently retreive the current event's GimpCoords or take it from the device directly if the event has none. Pass GimpCoords _in_image_coordinates_ to all tool functions. Most important: don't pass GdkEvents and display coordinates to tools any more. * app/tools/gimptool.[ch]: changed virtual functions to take GimpCoords, time and state separately instead of GdkEvents. * app/tools/gimpbezierselecttool.c * app/tools/gimpblendtool.c * app/tools/gimpbucketfilltool.[ch] * app/tools/gimpbycolorselecttool.c * app/tools/gimpclonetool.c * app/tools/gimpcolorpickertool.c * app/tools/gimpconvolvetool.c * app/tools/gimpcroptool.[ch] * app/tools/gimpcurvestool.c * app/tools/gimpdodgeburntool.c * app/tools/gimpdrawtool.c * app/tools/gimpeditselectiontool.[ch] * app/tools/gimperasertool.c * app/tools/gimpfliptool.c * app/tools/gimpfreeselecttool.[ch] * app/tools/gimpfuzzyselecttool.c * app/tools/gimpinktool.c * app/tools/gimpiscissorstool.c * app/tools/gimpmagnifytool.c * app/tools/gimpmeasuretool.c * app/tools/gimpmovetool.c * app/tools/gimppainttool.c * app/tools/gimppathtool.[ch] * app/tools/gimprectselecttool.c * app/tools/gimprotatetool.c * app/tools/gimpselectiontool.[ch] * app/tools/gimpsmudgetool.c * app/tools/gimptexttool.c * app/tools/gimptransformtool.[ch] * app/tools/path_tool.[ch] * app/tools/selection_options.c: tons and tons of changes: - changed to use the new virtual function parameters. - removed zillions of gdisplay_untransform_coords(). - get the active drawable's offsets manually in many cases. (questionable, but IMHO ok because it's obvious and not simply a "TRUE" passed to some function) - reordered some functions to be consistent across tools. - some tools had to be changed to work on image coords, not display ones (esp. crop). - fixed strange rotate tool behaviour which should be backported to stable. - some stuff i came across. - indentation and other paranoia. - rounding of coordinated may be broken in some tools. - new bugs guaranteed. * app/tools/tool_manager.[ch]: new semantic of tool_manager_initialize_active() (looked at the places where it was used from and put common code together). Should be a bit better now :) * app/tools/gimpblendtool.c * app/tools/transform_options.c: use the new GTK+ feature that a widget (toggle button) can be a frame's title for this tools' tool options. * app/widgets/widgets-types.h: stuff. * themes/Default/gtkrc: s/GtkDialog/GimpDialog/. * tools/pdbgen/Makefile.am: don't scan tools/gimpbucketfilltool.h any more. * tools/pdbgen/enums.pl: regenerated. * tools/pdbgen/pdb/tools.pdb: changed bucket_fill wrapper. * app/pdb/tools_cmds.c: regenerated.
215 lines
7.2 KiB
C
215 lines
7.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 <gtk/gtk.h>
|
|
#include <gdk/gdkkeysyms.h>
|
|
|
|
#include "tools-types.h"
|
|
|
|
#include "core/gimpimage.h"
|
|
#include "core/gimpimage-mask.h"
|
|
|
|
#include "display/gimpdisplay.h"
|
|
#include "display/gimpdisplayshell.h"
|
|
|
|
#include "gimpdrawtool.h"
|
|
#include "gimpselectiontool.h"
|
|
|
|
|
|
static void gimp_selection_tool_class_init (GimpSelectionToolClass *klass);
|
|
static void gimp_selection_tool_init (GimpSelectionTool *selection_tool);
|
|
|
|
static void gimp_selection_tool_oper_update (GimpTool *tool,
|
|
GimpCoords *coords,
|
|
GdkModifierType state,
|
|
GimpDisplay *gdisp);
|
|
static void gimp_selection_tool_cursor_update (GimpTool *tool,
|
|
GimpCoords *coords,
|
|
GdkModifierType state,
|
|
GimpDisplay *gdisp);
|
|
|
|
|
|
static GimpDrawToolClass *parent_class = NULL;
|
|
|
|
|
|
GType
|
|
gimp_selection_tool_get_type (void)
|
|
{
|
|
static GType tool_type = 0;
|
|
|
|
if (! tool_type)
|
|
{
|
|
static const GTypeInfo tool_info =
|
|
{
|
|
sizeof (GimpSelectionToolClass),
|
|
(GBaseInitFunc) NULL,
|
|
(GBaseFinalizeFunc) NULL,
|
|
(GClassInitFunc) gimp_selection_tool_class_init,
|
|
NULL, /* class_finalize */
|
|
NULL, /* class_data */
|
|
sizeof (GimpSelectionTool),
|
|
0, /* n_preallocs */
|
|
(GInstanceInitFunc) gimp_selection_tool_init,
|
|
};
|
|
|
|
tool_type = g_type_register_static (GIMP_TYPE_DRAW_TOOL,
|
|
"GimpSelectionTool",
|
|
&tool_info, 0);
|
|
}
|
|
|
|
return tool_type;
|
|
}
|
|
|
|
static void
|
|
gimp_selection_tool_class_init (GimpSelectionToolClass *klass)
|
|
{
|
|
GimpToolClass *tool_class;
|
|
|
|
tool_class = GIMP_TOOL_CLASS (klass);
|
|
|
|
parent_class = g_type_class_peek_parent (klass);
|
|
|
|
tool_class->oper_update = gimp_selection_tool_oper_update;
|
|
tool_class->cursor_update = gimp_selection_tool_cursor_update;
|
|
}
|
|
|
|
static void
|
|
gimp_selection_tool_init (GimpSelectionTool *selection_tool)
|
|
{
|
|
GimpTool *tool;
|
|
|
|
tool = GIMP_TOOL (selection_tool);
|
|
|
|
selection_tool->op = SELECTION_REPLACE;
|
|
}
|
|
|
|
static void
|
|
gimp_selection_tool_oper_update (GimpTool *tool,
|
|
GimpCoords *coords,
|
|
GdkModifierType state,
|
|
GimpDisplay *gdisp)
|
|
{
|
|
GimpSelectionTool *selection_tool;
|
|
GimpLayer *layer;
|
|
GimpLayer *floating_sel;
|
|
|
|
selection_tool = GIMP_SELECTION_TOOL (tool);
|
|
|
|
if (tool->state == ACTIVE)
|
|
return;
|
|
|
|
layer = gimp_image_pick_correlate_layer (gdisp->gimage,
|
|
coords->x, coords->y);
|
|
floating_sel = gimp_image_floating_sel (gdisp->gimage);
|
|
|
|
if ((state & GDK_MOD1_MASK) && ! gimage_mask_is_empty (gdisp->gimage))
|
|
{
|
|
selection_tool->op = SELECTION_MOVE_MASK; /* move the selection mask */
|
|
}
|
|
else if (! (state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK)) &&
|
|
layer &&
|
|
(layer == floating_sel ||
|
|
(gimage_mask_value (gdisp->gimage, coords->x, coords->y) &&
|
|
floating_sel == NULL)))
|
|
{
|
|
selection_tool->op = SELECTION_MOVE; /* move the selection */
|
|
}
|
|
else if ((state & GDK_CONTROL_MASK) && (state & GDK_SHIFT_MASK))
|
|
{
|
|
selection_tool->op = SELECTION_INTERSECT; /* intersect with selection */
|
|
}
|
|
else if (state & GDK_SHIFT_MASK)
|
|
{
|
|
selection_tool->op = SELECTION_ADD; /* add to the selection */
|
|
}
|
|
else if (state & GDK_CONTROL_MASK)
|
|
{
|
|
selection_tool->op = SELECTION_SUB; /* subtract from the selection */
|
|
}
|
|
else if (floating_sel)
|
|
{
|
|
selection_tool->op = SELECTION_ANCHOR; /* anchor the selection */
|
|
}
|
|
else
|
|
{
|
|
selection_tool->op = SELECTION_REPLACE; /* replace the selection */
|
|
}
|
|
}
|
|
|
|
static void
|
|
gimp_selection_tool_cursor_update (GimpTool *tool,
|
|
GimpCoords *coords,
|
|
GdkModifierType state,
|
|
GimpDisplay *gdisp)
|
|
{
|
|
GimpSelectionTool *selection_tool;
|
|
GimpDisplayShell *shell;
|
|
|
|
selection_tool = GIMP_SELECTION_TOOL (tool);
|
|
|
|
shell = GIMP_DISPLAY_SHELL (gdisp->shell);
|
|
|
|
switch (selection_tool->op)
|
|
{
|
|
case SELECTION_ADD:
|
|
gimp_display_shell_install_tool_cursor (shell,
|
|
GIMP_MOUSE_CURSOR,
|
|
tool->tool_cursor,
|
|
GIMP_CURSOR_MODIFIER_PLUS);
|
|
break;
|
|
case SELECTION_SUB:
|
|
gimp_display_shell_install_tool_cursor (shell,
|
|
GIMP_MOUSE_CURSOR,
|
|
tool->tool_cursor,
|
|
GIMP_CURSOR_MODIFIER_MINUS);
|
|
break;
|
|
case SELECTION_INTERSECT:
|
|
gimp_display_shell_install_tool_cursor (shell,
|
|
GIMP_MOUSE_CURSOR,
|
|
tool->tool_cursor,
|
|
GIMP_CURSOR_MODIFIER_INTERSECT);
|
|
break;
|
|
case SELECTION_REPLACE:
|
|
gimp_display_shell_install_tool_cursor (shell,
|
|
GIMP_MOUSE_CURSOR,
|
|
tool->tool_cursor,
|
|
GIMP_CURSOR_MODIFIER_NONE);
|
|
break;
|
|
case SELECTION_MOVE_MASK:
|
|
gimp_display_shell_install_tool_cursor (shell,
|
|
GIMP_MOUSE_CURSOR,
|
|
tool->tool_cursor,
|
|
GIMP_CURSOR_MODIFIER_MOVE);
|
|
break;
|
|
case SELECTION_MOVE:
|
|
gimp_display_shell_install_tool_cursor (shell,
|
|
GIMP_MOUSE_CURSOR,
|
|
GIMP_MOVE_TOOL_CURSOR,
|
|
GIMP_CURSOR_MODIFIER_NONE);
|
|
break;
|
|
case SELECTION_ANCHOR:
|
|
gimp_display_shell_install_tool_cursor (shell,
|
|
GIMP_MOUSE_CURSOR,
|
|
tool->tool_cursor,
|
|
GIMP_CURSOR_MODIFIER_ANCHOR);
|
|
break;
|
|
}
|
|
}
|