dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app/tools/Makefile.am new files ported by Dave Neary <dneary@eircom.net>. 

2001-03-02  Michael Natterer  <mitch@gimp.org>

	* app/tools/Makefile.am
	* app/tools/gimpselectiontool.[ch]: new files ported by
	Dave Neary <dneary@eircom.net>. Changed them a bit to inherit
	from GimpDrawTool and added implementations of "modifier_key"
	and "oper_update" because they are shared by 4 of the old
	selection tools.
This commit is contained in:
Michael Natterer 2001-03-02 15:24:12 +00:00 committed by Michael Natterer
parent 40b20d4e72
commit 5362220ba1
4 changed files with 364 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2001-03-02 Michael Natterer <mitch@gimp.org>
* app/tools/Makefile.am
* app/tools/gimpselectiontool.[ch]: new files ported by
Dave Neary <dneary@eircom.net>. Changed them a bit to inherit
from GimpDrawTool and added implementations of "modifier_key"
and "oper_update" because they are shared by 4 of the old
selection tools.
2001-03-01 Daniel Egger <egger@suse.de>
* app/fileops.c: Applied patch from Dave Neary to fix

4
app/tools/Makefile.am
View File

@ -35,7 +35,9 @@ libapptools_la_SOURCES = \
## dodgeburn.c \
## dodgeburn.h \
gimpdrawtool.c \
gimpdrawgtool.h \
gimpdrawtool.h \
gimpselectiontool.c \
gimpselectiontool.h \
edit_selection.c \
edit_selection.h \
## ellipse_select.c \

296
app/tools/gimpselectiontool.c Normal file
View File

@ -0,0 +1,296 @@
/* 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 "apptypes.h"
#include "cursorutil.h"
#include "gimpdrawtool.h"
#include "gimpimage.h"
#include "gimage_mask.h"
#include "gdisplay.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_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 */
}
}

56
app/tools/gimpselectiontool.h Normal file
View File

@ -0,0 +1,56 @@
/* 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.
*/
#ifndef __GIMP_SELECTION_TOOL_H__
#define __GIMP_SELECTION_TOOL_H__
#include "gimpdrawtool.h"
#define GIMP_TYPE_SELECTION_TOOL (gimp_selection_tool_get_type ())
#define GIMP_SELECTION_TOOL(obj) (GTK_CHECK_CAST ((obj), GIMP_TYPE_SELECTION_TOOL, GimpSelectionTool))
#define GIMP_IS_SELECTION_TOOL(obj) (GTK_CHECK_TYPE ((obj), GIMP_TYPE_SELECTION_TOOL))
#define GIMP_SELECTION_TOOL_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GIMP_TYPE_SELECTION_TOOL, GimpSelectionToolClass))
#define GIMP_IS_SELECTION_TOOL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_SELECTION_TOOL))
typedef struct _GimpSelectionTool GimpSelectionTool;
typedef struct _GimpSelectionToolClass GimpSelectionToolClass;
struct _GimpSelectionTool
{
GimpDrawTool parent_instance;
SelectOps op; /* selection operation (SELECTION_ADD etc.) */
gint current_x; /* these values are updated on every motion event */
gint current_y; /* (enables immediate cursor updating on modifier
* key events). */
};
struct _GimpSelectionToolClass
{
GimpDrawToolClass parent_class;
};
GtkType gimp_selection_tool_get_type (void);
#endif /* __GIMP_SELECTION_TOOL_H__ */