Gimp/app/tools/gimpselectiontool.c
Michael Natterer 99e78c7074 General cleanup of the selection tools and their PDB wrappers:
2001-10-22  Michael Natterer  <mitch@gimp.org>

	General cleanup of the selection tools and their PDB wrappers:

	* app/core/Makefile.am
	* app/core/gimpimage-contiguous-region.[ch]
	* app/core/gimpimage-mask-select.[ch]: new files providing a clean,
	uniform API for the selection functionalities. Changed order of
	parameters to be consistent, removed code duplication.

	The region returned by the "by_color" function is not really
	contiguous but the API is so similar to "by_seed" and it's used
	in the same context so it's fair enough to put them together.

	Also, I'm not sure if the two is_pixel_sufficiently_different()
	I've optimized away were meant to do *exactly* the same. Added
	a comment there to remember the former difference.

	* app/core/gimpchannel.[ch] (gimp_channel_feather): removed the
	"output" channel parameter and made it optionally push an undo
	(like the other channel operations do).

	* app/core/gimpimage-mask.c: call gimp_channel_feather() with
	"push_undo == TRUE", removed some useless comments.

	* app/tools/gimpbycolorselecttool.[ch]
	* app/tools/gimpellipseselecttool.[ch]
	* app/tools/gimpfreeselecttool.[ch]
	* app/tools/gimpfuzzyselecttool.[ch]
	* app/tools/gimprectselecttool.[ch]: removed all the actual
	selection functionality and call the new gimp_image_mask_select_*()
	and gimp_image_contiguous_region_*() functions instead.

	* app/tools/gimpbezierselecttool.c
	* app/tools/gimpiscissorstool.c: use new function
	gimp_image_mask_select_channel() instead of doing the same manually.

	* app/tools/gimpbucketfilltool.c: find_contiguous_region() ->
	gimp_image_contiguous_region_by_seed().

	* tools/pdbgen/Makefile.am
	* tools/pdbgen/groups.pl
	* tools/pdbgen/pdb/selection_tools.pdb: added new group "Selection
	Tools" which depends only on "core/" stuff (not on "tools/" any
	more, brrrr).

	* tools/pdbgen/pdb/text_tool.pdb: don't include "appenv.h"

	* tools/pdbgen/pdb/tools.pdb: removed the selection tools.

	* app/pdb/Makefile.am
	* app/pdb/selection_tools_cmds.c: new file.

	* app/pdb/internal_procs.c
	* app/pdb/text_tool_cmds.c
	* app/pdb/tools_cmds.c: regenerated.

	* libgimp/Makefile.am
	* libgimp/gimp_pdb.h
	* libgimp/gimpselectiontools_pdb.[ch]: new files.

	* libgimp/gimptools_pdb.[ch]: regenerated

	Misc cleanups:

	* app/app_procs.c: call splash_create() with "no_splash_image"
	as parameter.

	* app/display/gimpdisplay-render.c
	* app/display/gximage.c: don't include "appenv.h".

	* app/gui/gui.c: call session_restore() only if "restore_session"
	is TRUE.

	* app/gui/session.c: don't "if(restore_session)" here and don't
	include "appenv.h"

	* app/gui/splash.[ch]: added "gboolean show_image" parameter to
	splash_create(), don't include "appenv.h"

	* app/tools/gimppainttool.[ch]: added a "GimpGradient" parameter
	to gimp_paint_tool_get_color_from_gradient().

	* app/tools/gimppaintbrushtool.c: pass the gradient.

	* app/tools/gimpselectiontool.c
	* app/tools/gimptransformtool.c
	* app/tools/tool_manager.c: s/GDisplay/GimpDisplay/.

	* app/widgets/gimpcontainergridview.[ch]: removed the "white_style"
	class variable and don't fiddle around with colors and styles...

	* themes/Default/gtkrc: ...do the same here with a simple rc style.
2001-10-22 12:13:44 +00:00

286 lines
8.6 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 "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_cursor_update (GimpTool *tool,
GdkEventMotion *mevent,
GimpDisplay *gdisp);
static void gimp_selection_tool_oper_update (GimpTool *tool,
GdkEventMotion *mevent,
GimpDisplay *gdisp);
static void gimp_selection_tool_modifier_key (GimpTool *tool,
GdkEventKey *kevent,
GimpDisplay *gdisp);
static void gimp_selection_tool_update_op_state (GimpSelectionTool *selection_tool,
gint x,
gint y,
gint 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->cursor_update = gimp_selection_tool_cursor_update;
tool_class->oper_update = gimp_selection_tool_oper_update;
tool_class->modifier_key = gimp_selection_tool_modifier_key;
}
static void
gimp_selection_tool_init (GimpSelectionTool *selection_tool)
{
GimpTool *tool;
tool = GIMP_TOOL (selection_tool);
selection_tool->current_x = 0;
selection_tool->current_y = 0;
selection_tool->op = SELECTION_REPLACE;
tool->preserve = FALSE; /* Don't preserve on drawable change */
}
static void
gimp_selection_tool_cursor_update (GimpTool *tool,
GdkEventMotion *mevent,
GimpDisplay *gdisp)
{
GimpSelectionTool *selection_tool;
selection_tool = GIMP_SELECTION_TOOL (tool);
switch (selection_tool->op)
{
case SELECTION_ADD:
gdisplay_install_tool_cursor (gdisp,
GIMP_MOUSE_CURSOR,
tool->tool_cursor,
GIMP_CURSOR_MODIFIER_PLUS);
break;
case SELECTION_SUB:
gdisplay_install_tool_cursor (gdisp,
GIMP_MOUSE_CURSOR,
tool->tool_cursor,
GIMP_CURSOR_MODIFIER_MINUS);
break;
case SELECTION_INTERSECT:
gdisplay_install_tool_cursor (gdisp,
GIMP_MOUSE_CURSOR,
tool->tool_cursor,
GIMP_CURSOR_MODIFIER_INTERSECT);
break;
case SELECTION_REPLACE:
gdisplay_install_tool_cursor (gdisp,
GIMP_MOUSE_CURSOR,
tool->tool_cursor,
GIMP_CURSOR_MODIFIER_NONE);
break;
case SELECTION_MOVE_MASK:
gdisplay_install_tool_cursor (gdisp,
GIMP_MOUSE_CURSOR,
tool->tool_cursor,
GIMP_CURSOR_MODIFIER_MOVE);
break;
case SELECTION_MOVE:
gdisplay_install_tool_cursor (gdisp,
GIMP_MOUSE_CURSOR,
GIMP_MOVE_TOOL_CURSOR,
GIMP_CURSOR_MODIFIER_NONE);
break;
case SELECTION_ANCHOR:
gdisplay_install_tool_cursor (gdisp,
GIMP_MOUSE_CURSOR,
tool->tool_cursor,
GIMP_CURSOR_MODIFIER_ANCHOR);
break;
}
}
static void
gimp_selection_tool_oper_update (GimpTool *tool,
GdkEventMotion *mevent,
GimpDisplay *gdisp)
{
GimpSelectionTool *selection_tool;
selection_tool = GIMP_SELECTION_TOOL (tool);
selection_tool->current_x = mevent->x;
selection_tool->current_y = mevent->y;
gimp_selection_tool_update_op_state (selection_tool,
selection_tool->current_x,
selection_tool->current_y,
mevent->state,
gdisp);
}
static void
gimp_selection_tool_modifier_key (GimpTool *tool,
GdkEventKey *kevent,
GimpDisplay *gdisp)
{
GimpSelectionTool *selection_tool;
gint state;
selection_tool = GIMP_SELECTION_TOOL (tool);
state = kevent->state;
switch (kevent->keyval)
{
case GDK_Alt_L: case GDK_Alt_R:
if (state & GDK_MOD1_MASK)
state &= ~GDK_MOD1_MASK;
else
state |= GDK_MOD1_MASK;
break;
case GDK_Shift_L: case GDK_Shift_R:
if (state & GDK_SHIFT_MASK)
state &= ~GDK_SHIFT_MASK;
else
state |= GDK_SHIFT_MASK;
break;
case GDK_Control_L: case GDK_Control_R:
if (state & GDK_CONTROL_MASK)
state &= ~GDK_CONTROL_MASK;
else
state |= GDK_CONTROL_MASK;
break;
}
gimp_selection_tool_update_op_state (selection_tool,
selection_tool->current_x,
selection_tool->current_y,
state, gdisp);
}
static void
gimp_selection_tool_update_op_state (GimpSelectionTool *selection_tool,
gint x,
gint y,
gint state,
GimpDisplay *gdisp)
{
GimpLayer *layer;
GimpLayer *floating_sel;
gint tx, ty;
if (GIMP_TOOL (selection_tool)->state == ACTIVE)
return;
gdisplay_untransform_coords (gdisp, x, y, &tx, &ty, FALSE, FALSE);
layer = gimp_image_pick_correlate_layer (gdisp->gimage, tx, ty);
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 just the selection mask */
}
else if (!(state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK)) &&
layer &&
(layer == floating_sel ||
(gdisplay_mask_value (gdisp, x, y) &&
floating_sel == NULL)))
{
selection_tool->op = SELECTION_MOVE; /* move the selection */
}
else if ((state & GDK_SHIFT_MASK) &&
!(state & GDK_CONTROL_MASK))
{
selection_tool->op = SELECTION_ADD; /* add to the selection */
}
else if ((state & GDK_CONTROL_MASK) &&
!(state & GDK_SHIFT_MASK))
{
selection_tool->op = SELECTION_SUB; /* subtract from the selection */
}
else if ((state & GDK_CONTROL_MASK) &&
(state & GDK_SHIFT_MASK))
{
selection_tool->op = SELECTION_INTERSECT; /* intersect with selection */
}
else if (floating_sel)
{
selection_tool->op = SELECTION_ANCHOR; /* anchor the selection */
}
else
{
selection_tool->op = SELECTION_REPLACE; /* replace the selection */
}
}