0cbbef4025
2001-05-13 Michael Natterer <mitch@gimp.org> * app/Makefile.am * app/cursorutil.[ch]: removed. Stuff now lives in app_procs.[ch] and in widgets/gimpcursor.[ch] * app/appenv.h: added the "gimp_busy" boolean. * app/app_procs.[ch]: added the "busy" stuff here. * app/gui/gui.[ch]: "busy" stuff for the gui. * app/widgets/Makefile.am * app/widgets/gimpcursor.[ch]: exports only one function: gimp_cursor_new() which returns a GdkCursor which has to be destroyed. * app/apptypes.h * app/appenums.h: removed the cursor types. * app/widgets/widgets-types.h: added here. * app/tools/gimpeditselectiontool.[ch]: added gtkutil_compress_motion() here (will go to some utils file in widgets/). * app/tools/tools-types.h: #include "widgets/widgets-types.h" * app/dialog_handler.c * app/disp_callbacks.c * app/gdisplay.[ch] * app/nav_window.c * app/scroll.c * app/xcf.c * app/core/gimpimage-convert.c * app/core/gimpimage-duplicate.c * app/core/gimpimage.c * app/gui/file-open-dialog.c * app/tools/gimpblendtool.c * app/tools/gimpbucketfilltool.c * app/tools/gimpcroptool.c * app/tools/gimpfuzzyselecttool.c * app/tools/gimptransformtool.c * tools/pdbgen/pdb/image.pdb * app/pdb/image_cmds.c: use the new cursor and "busy" functions. * app/gdisplay.h * app/core/gimpbrush.c: added some ugly cross-includes. * app/context_manager.c * app/gdisplay_ops.c * app/gimprc.c * app/core/gimpdrawable-offset.c * app/gui/file-save-dialog.c * app/gui/gradient-editor.c * app/gui/preferences-dialog.c * app/tools/gimpbezierselecttool.c * app/tools/gimpbycolorselecttool.c * app/tools/gimpclonetool.c * app/tools/gimpcolorpickertool.c * app/tools/gimperasertool.c * app/tools/gimpfliptool.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/gimprectselecttool.c * app/tools/gimprotatetool.c * app/tools/gimpselectiontool.c: removed inclusion of "cursorutil.h"
296 lines
8.9 KiB
C
296 lines
8.9 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 "gimpdrawtool.h"
|
|
#include "gimpselectiontool.h"
|
|
|
|
#include "gdisplay.h"
|
|
|
|
|
|
static void gimp_selection_tool_class_init (GimpSelectionToolClass *klass);
|
|
static void gimp_selection_tool_init (GimpSelectionTool *selection_tool);
|
|
|
|
static void gimp_selection_tool_destroy (GtkObject *object);
|
|
|
|
static void gimp_selection_tool_cursor_update (GimpTool *tool,
|
|
GdkEventMotion *mevent,
|
|
GDisplay *gdisp);
|
|
static void gimp_selection_tool_oper_update (GimpTool *tool,
|
|
GdkEventMotion *mevent,
|
|
GDisplay *gdisp);
|
|
static void gimp_selection_tool_modifier_key (GimpTool *tool,
|
|
GdkEventKey *kevent,
|
|
GDisplay *gdisp);
|
|
|
|
static void gimp_selection_tool_update_op_state (GimpSelectionTool *selection_tool,
|
|
gint x,
|
|
gint y,
|
|
gint state,
|
|
GDisplay *gdisp);
|
|
|
|
|
|
static GimpDrawToolClass *parent_class = NULL;
|
|
|
|
|
|
GtkType
|
|
gimp_selection_tool_get_type (void)
|
|
{
|
|
static GtkType selection_tool_type = 0;
|
|
|
|
if (! selection_tool_type)
|
|
{
|
|
GtkTypeInfo selection_tool_info =
|
|
{
|
|
"GimpSelectionTool",
|
|
sizeof (GimpSelectionTool),
|
|
sizeof (GimpSelectionToolClass),
|
|
(GtkClassInitFunc) gimp_selection_tool_class_init,
|
|
(GtkObjectInitFunc) gimp_selection_tool_init,
|
|
/* reserved_1 */ NULL,
|
|
/* reserved_2 */ NULL
|
|
};
|
|
|
|
selection_tool_type = gtk_type_unique (GIMP_TYPE_DRAW_TOOL,
|
|
&selection_tool_info);
|
|
}
|
|
|
|
return selection_tool_type;
|
|
}
|
|
|
|
static void
|
|
gimp_selection_tool_class_init (GimpSelectionToolClass *klass)
|
|
{
|
|
GtkObjectClass *object_class;
|
|
GimpToolClass *tool_class;
|
|
|
|
object_class = (GtkObjectClass *) klass;
|
|
tool_class = (GimpToolClass *) klass;
|
|
|
|
parent_class = gtk_type_class (GIMP_TYPE_DRAW_TOOL);
|
|
|
|
object_class->destroy = gimp_selection_tool_destroy;
|
|
|
|
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_destroy (GtkObject *object)
|
|
{
|
|
if (GTK_OBJECT_CLASS (parent_class)->destroy)
|
|
GTK_OBJECT_CLASS (parent_class)->destroy (object);
|
|
}
|
|
|
|
static void
|
|
gimp_selection_tool_cursor_update (GimpTool *tool,
|
|
GdkEventMotion *mevent,
|
|
GDisplay *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,
|
|
GDisplay *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,
|
|
GDisplay *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,
|
|
GDisplay *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 */
|
|
}
|
|
}
|