mirror of
https://gitlab.gnome.org/GNOME/gimp
synced 2024-10-23 21:11:43 +00:00
f0372cad0f
2003-10-06 Michael Natterer <mitch@gimp.org> Treat changes to the selection like changes to any other drawable: * app/core/gimpchannel.c * app/core/gimpchannel-combine.c: call gimp_drawable_update() after changing the channel. * app/core/gimpimage.[ch]: added struct GimpImageFlushAccumulator with one member "gboolean mask_changed". Connect to "update" of the selection and set accum.mask_changed to TRUE in the callback. Added default implementation for GimpImage::flush() and emit "mask_changed" there. Unrelated: * app/core/gimpimage.h: removed GimpGuide struct... * app/core/gimpimage-guides.h: ...and added it here. * app/core/gimpimage-undo-push.c (undo_pop_mask) (undo_pop_channel_mod): don't distinguish between selection and non-selection channels and just call gimp_drawable_update(). * app/core/gimpundo.h * app/core/gimpimage-undo.c: removed "gboolean mask_changed" from the GimpUndoAccumulator struct since we don't have to care about that signal explicitly any more. * app/display/gimpdisplay-foreach.[ch]: removed gimp_displays_flush(). * tools/pdbgen/pdb/display.pdb (displays_flush_invoker): call gimp_image_flush() on all images so the flush accumulator is honored. This generalization enables the removal of more special purpose code which was needed to treat the selection different: * app/core/gimpimage-mask-select.[ch]: removed... * app/core/gimpchannel-select.[ch]: ...and added under a new name because it's not selection specific any more. * app/core/gimpimage-mask.[ch]: removed... * app/core/gimpselection.[ch]: ...added the two remaining functions here. Removed all calls to gimp_image_mask_changed(). * app/core/Makefile.am * app/core/gimp-edit.c * app/core/gimpdrawable-transform.c * app/core/gimpimage-scale.c * app/core/gimpimage-snap.c * app/display/gimpdisplayshell.c * app/gui/channels-commands.c * app/gui/layers-commands.c * app/gui/select-commands.c * app/gui/vectors-commands.c * app/tools/gimpbycolorselecttool.c * app/tools/gimpeditselectiontool.c * app/tools/gimpellipseselecttool.c * app/tools/gimpfreeselecttool.c * app/tools/gimpfuzzyselecttool.c * app/tools/gimpiscissorstool.c * app/tools/gimprectselecttool.c * app/tools/gimptransformtool.c * app/widgets/gimpchanneltreeview.c * app/widgets/gimpselectioneditor.c * app/widgets/gimpvectorstreeview.c * app/xcf/xcf-save.c * tools/pdbgen/pdb/paths.pdb * tools/pdbgen/pdb/selection.pdb * tools/pdbgen/pdb/selection_tools.pdb: changed accordingly. * app/core/gimpdrawable-bucket-fill.c * app/core/gimpimage-colormap.c * app/core/gimplayer-floating-sel.c * app/core/gimplayer.c * app/gui/image-menu.c * app/paint/gimppaintcore.c * app/tools/gimpcroptool.c * app/tools/gimpinkoptions.c * app/tools/gimpvectortool.c: removed useless and/or obsolete #includes. * app/pdb/display_cmds.c * app/pdb/paths_cmds.c * app/pdb/selection_cmds.c * app/pdb/selection_tools_cmds.c: regenerated.
309 lines
10 KiB
C
309 lines
10 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 "libgimpcolor/gimpcolor.h"
|
|
#include "libgimpwidgets/gimpwidgets.h"
|
|
|
|
#include "tools-types.h"
|
|
|
|
#include "core/gimpchannel-select.h"
|
|
#include "core/gimpdrawable.h"
|
|
#include "core/gimpimage.h"
|
|
#include "core/gimpimage-projection.h"
|
|
#include "core/gimptoolinfo.h"
|
|
|
|
#include "widgets/gimphelp-ids.h"
|
|
|
|
#include "display/gimpdisplay.h"
|
|
|
|
#include "gimpbycolorselecttool.h"
|
|
#include "gimpselectionoptions.h"
|
|
#include "gimptoolcontrol.h"
|
|
|
|
#include "gimp-intl.h"
|
|
|
|
|
|
static void gimp_by_color_select_tool_class_init (GimpByColorSelectToolClass *klass);
|
|
static void gimp_by_color_select_tool_init (GimpByColorSelectTool *by_color_select);
|
|
|
|
static void gimp_by_color_select_tool_button_press (GimpTool *tool,
|
|
GimpCoords *coords,
|
|
guint32 time,
|
|
GdkModifierType state,
|
|
GimpDisplay *gdisp);
|
|
static void gimp_by_color_select_tool_button_release (GimpTool *tool,
|
|
GimpCoords *coords,
|
|
guint32 time,
|
|
GdkModifierType state,
|
|
GimpDisplay *gdisp);
|
|
static void gimp_by_color_select_tool_oper_update (GimpTool *tool,
|
|
GimpCoords *coords,
|
|
GdkModifierType state,
|
|
GimpDisplay *gdisp);
|
|
static void gimp_by_color_select_tool_cursor_update (GimpTool *tool,
|
|
GimpCoords *coords,
|
|
GdkModifierType state,
|
|
GimpDisplay *gdisp);
|
|
|
|
|
|
static GimpSelectionToolClass *parent_class = NULL;
|
|
|
|
|
|
/* public functions */
|
|
|
|
void
|
|
gimp_by_color_select_tool_register (GimpToolRegisterCallback callback,
|
|
gpointer data)
|
|
{
|
|
(* callback) (GIMP_TYPE_BY_COLOR_SELECT_TOOL,
|
|
GIMP_TYPE_SELECTION_OPTIONS,
|
|
gimp_selection_options_gui,
|
|
0,
|
|
"gimp-by-color-select-tool",
|
|
_("Select By Color"),
|
|
_("Select regions by color"),
|
|
N_("/Tools/Selection Tools/_By Color Select"), NULL,
|
|
NULL, GIMP_HELP_TOOL_BY_COLOR_SELECT,
|
|
GIMP_STOCK_TOOL_BY_COLOR_SELECT,
|
|
data);
|
|
}
|
|
|
|
GType
|
|
gimp_by_color_select_tool_get_type (void)
|
|
{
|
|
static GType tool_type = 0;
|
|
|
|
if (! tool_type)
|
|
{
|
|
static const GTypeInfo tool_info =
|
|
{
|
|
sizeof (GimpByColorSelectToolClass),
|
|
(GBaseInitFunc) NULL,
|
|
(GBaseFinalizeFunc) NULL,
|
|
(GClassInitFunc) gimp_by_color_select_tool_class_init,
|
|
NULL, /* class_finalize */
|
|
NULL, /* class_data */
|
|
sizeof (GimpByColorSelectTool),
|
|
0, /* n_preallocs */
|
|
(GInstanceInitFunc) gimp_by_color_select_tool_init,
|
|
};
|
|
|
|
tool_type = g_type_register_static (GIMP_TYPE_SELECTION_TOOL,
|
|
"GimpByColorSelectTool",
|
|
&tool_info, 0);
|
|
}
|
|
|
|
return tool_type;
|
|
}
|
|
|
|
|
|
/* private functions */
|
|
|
|
static void
|
|
gimp_by_color_select_tool_class_init (GimpByColorSelectToolClass *klass)
|
|
{
|
|
GimpToolClass *tool_class;
|
|
|
|
tool_class = GIMP_TOOL_CLASS (klass);
|
|
|
|
parent_class = g_type_class_peek_parent (klass);
|
|
|
|
tool_class->button_press = gimp_by_color_select_tool_button_press;
|
|
tool_class->button_release = gimp_by_color_select_tool_button_release;
|
|
tool_class->oper_update = gimp_by_color_select_tool_oper_update;
|
|
tool_class->cursor_update = gimp_by_color_select_tool_cursor_update;
|
|
}
|
|
|
|
static void
|
|
gimp_by_color_select_tool_init (GimpByColorSelectTool *by_color_select)
|
|
{
|
|
GimpTool *tool;
|
|
|
|
tool = GIMP_TOOL (by_color_select);
|
|
|
|
gimp_tool_control_set_preserve (tool->control, FALSE);
|
|
gimp_tool_control_set_preserve (tool->control, GIMP_RECT_SELECT_TOOL_CURSOR);
|
|
|
|
by_color_select->x = 0;
|
|
by_color_select->y = 0;
|
|
}
|
|
|
|
static void
|
|
gimp_by_color_select_tool_button_press (GimpTool *tool,
|
|
GimpCoords *coords,
|
|
guint32 time,
|
|
GdkModifierType state,
|
|
GimpDisplay *gdisp)
|
|
{
|
|
GimpByColorSelectTool *by_color_sel;
|
|
GimpSelectionOptions *options;
|
|
|
|
by_color_sel = GIMP_BY_COLOR_SELECT_TOOL (tool);
|
|
options = GIMP_SELECTION_OPTIONS (tool->tool_info->tool_options);
|
|
|
|
tool->drawable = gimp_image_active_drawable (gdisp->gimage);
|
|
|
|
gimp_tool_control_activate (tool->control);
|
|
tool->gdisp = gdisp;
|
|
|
|
by_color_sel->x = coords->x;
|
|
by_color_sel->y = coords->y;
|
|
|
|
if (! options->sample_merged)
|
|
{
|
|
gint off_x, off_y;
|
|
|
|
gimp_item_offsets (GIMP_ITEM (gimp_image_active_drawable (gdisp->gimage)),
|
|
&off_x, &off_y);
|
|
|
|
by_color_sel->x -= off_x;
|
|
by_color_sel->y -= off_y;
|
|
}
|
|
}
|
|
|
|
static void
|
|
gimp_by_color_select_tool_button_release (GimpTool *tool,
|
|
GimpCoords *coords,
|
|
guint32 time,
|
|
GdkModifierType state,
|
|
GimpDisplay *gdisp)
|
|
{
|
|
GimpByColorSelectTool *by_color_sel;
|
|
GimpSelectionTool *sel_tool;
|
|
GimpSelectionOptions *options;
|
|
GimpDrawable *drawable;
|
|
guchar *col;
|
|
GimpRGB color;
|
|
|
|
by_color_sel = GIMP_BY_COLOR_SELECT_TOOL (tool);
|
|
sel_tool = GIMP_SELECTION_TOOL (tool);
|
|
options = GIMP_SELECTION_OPTIONS (tool->tool_info->tool_options);
|
|
|
|
drawable = gimp_image_active_drawable (gdisp->gimage);
|
|
|
|
gimp_tool_control_halt (tool->control);
|
|
|
|
/* First take care of the case where the user "cancels" the action */
|
|
if (! (state & GDK_BUTTON3_MASK))
|
|
{
|
|
if (by_color_sel->x >= 0 &&
|
|
by_color_sel->y >= 0 &&
|
|
by_color_sel->x < gimp_item_width (GIMP_ITEM (drawable)) &&
|
|
by_color_sel->y < gimp_item_height (GIMP_ITEM (drawable)))
|
|
{
|
|
/* Get the start color */
|
|
if (options->sample_merged)
|
|
{
|
|
if (!(col = gimp_image_projection_get_color_at (gdisp->gimage,
|
|
by_color_sel->x,
|
|
by_color_sel->y)))
|
|
return;
|
|
}
|
|
else
|
|
{
|
|
if (!(col = gimp_drawable_get_color_at (drawable,
|
|
by_color_sel->x,
|
|
by_color_sel->y)))
|
|
return;
|
|
}
|
|
|
|
gimp_rgba_set_uchar (&color, col[0], col[1], col[2], col[3]);
|
|
g_free (col);
|
|
|
|
gimp_channel_select_by_color (gimp_image_get_mask (gdisp->gimage),
|
|
drawable,
|
|
options->sample_merged,
|
|
&color,
|
|
options->threshold,
|
|
options->select_transparent,
|
|
sel_tool->op,
|
|
options->antialias,
|
|
options->feather,
|
|
options->feather_radius,
|
|
options->feather_radius);
|
|
|
|
gimp_image_flush (gdisp->gimage);
|
|
}
|
|
}
|
|
}
|
|
|
|
static void
|
|
gimp_by_color_select_tool_oper_update (GimpTool *tool,
|
|
GimpCoords *coords,
|
|
GdkModifierType state,
|
|
GimpDisplay *gdisp)
|
|
{
|
|
GimpSelectionTool *sel_tool;
|
|
GimpSelectionOptions *options;
|
|
|
|
if (gimp_tool_control_is_active (tool->control))
|
|
return;
|
|
|
|
sel_tool = GIMP_SELECTION_TOOL (tool);
|
|
options = GIMP_SELECTION_OPTIONS (tool->tool_info->tool_options);
|
|
|
|
if ((state & GDK_CONTROL_MASK) && (state & GDK_SHIFT_MASK))
|
|
{
|
|
sel_tool->op = SELECTION_INTERSECT; /* intersect with selection */
|
|
}
|
|
else if (state & GDK_SHIFT_MASK)
|
|
{
|
|
sel_tool->op = SELECTION_ADD; /* add to the selection */
|
|
}
|
|
else if (state & GDK_CONTROL_MASK)
|
|
{
|
|
sel_tool->op = SELECTION_SUBTRACT; /* subtract from the selection */
|
|
}
|
|
else
|
|
{
|
|
sel_tool->op = options->operation;
|
|
}
|
|
}
|
|
|
|
static void
|
|
gimp_by_color_select_tool_cursor_update (GimpTool *tool,
|
|
GimpCoords *coords,
|
|
GdkModifierType state,
|
|
GimpDisplay *gdisp)
|
|
{
|
|
GimpByColorSelectTool *by_col_sel;
|
|
GimpSelectionOptions *options;
|
|
GimpLayer *layer;
|
|
|
|
by_col_sel = GIMP_BY_COLOR_SELECT_TOOL (tool);
|
|
options = GIMP_SELECTION_OPTIONS (tool->tool_info->tool_options);
|
|
|
|
layer = gimp_image_pick_correlate_layer (gdisp->gimage, coords->x, coords->y);
|
|
|
|
if (! options->sample_merged &&
|
|
layer && layer != gdisp->gimage->active_layer)
|
|
{
|
|
gimp_tool_control_set_cursor (tool->control, GIMP_BAD_CURSOR);
|
|
}
|
|
else
|
|
{
|
|
gimp_tool_control_set_cursor (tool->control, GIMP_MOUSE_CURSOR);
|
|
}
|
|
|
|
GIMP_TOOL_CLASS (parent_class)->cursor_update (tool, coords, state, gdisp);
|
|
}
|