mirror of
https://gitlab.gnome.org/GNOME/gimp
synced 2024-10-22 12:32:37 +00:00
d1a76d93f7
2006-06-02 Michael Natterer <mitch@gimp.org> * cursors/Makefile.am * cursors/cursor-corner-bottom-left.png * cursors/cursor-corner-bottom-right.png * cursors/cursor-corner-top-left.png * cursors/cursor-corner-top-right.png * cursors/cursor-side-bottom.png * cursors/cursor-side-left.png * cursors/cursor-side-right.png * cursors/cursor-side-top.png * cursors/xbm/cursor-corner-bottom-left-mask.xbm * cursors/xbm/cursor-corner-bottom-left.xbm * cursors/xbm/cursor-corner-bottom-right-mask.xbm * cursors/xbm/cursor-corner-bottom-right.xbm * cursors/xbm/cursor-corner-top-left-mask.xbm * cursors/xbm/cursor-corner-top-left.xbm * cursors/xbm/cursor-corner-top-right-mask.xbm * cursors/xbm/cursor-corner-top-right.xbm * cursors/xbm/cursor-side-bottom-mask.xbm * cursors/xbm/cursor-side-bottom.xbm * cursors/xbm/cursor-side-left-mask.xbm * cursors/xbm/cursor-side-left.xbm * cursors/xbm/cursor-side-right-mask.xbm * cursors/xbm/cursor-side-right.xbm * cursors/xbm/cursor-side-top-mask.xbm * cursors/xbm/cursor-side-top.xbm: new cursors for edge and corner resizing. They perfectly align with the small crosshair and can be used together with tool cursors and cursor modifiers. * cursors/gimp-tool-cursors.xcf: add them here too. * app/widgets/widgets-enums.h: add them to the GimpCursorType enum. * app/widgets/gimpcursor.c: add them here too. * app/display/gimpdisplayshell-cursor.c: treat them like the small crosshair (don't replace them by the small crosshair but use them as-is). Also allow the bad modifier with the large crosshair. * app/tools/gimprectangletool.c (gimp_rectangle_tool_cursor_update): use the new cursors. Don't call gimp_tool_set_cursor() here. (gimp_rectangle_tool_response): reset "function" to RECT_CREATING when resetting the tool. * app/tools/gimpselectiontool.[ch] (struct GimpSelectionTool): added boolean member "allow_move" which defalts to TRUE. (gimp_selection_tool_oper_update): don't move masks, floating selections or anything when "allow_move" is FALSE. Changed behavior of click inside a selection to simply create a new selection, need to press alt+shift now to drag-float the selection. Please test this, it's apretty fundamental change! (gimp_selection_tool_cursor_update): use the tool's configured cursor instead of always GIMP_CURSOR_MOUSE, so this function can be called after gimp_rectangle_tool_cursor_update() to add the plus, minus etc. modifiers. * app/tools/gimpnewrectselecttool.c: implement GimpTool::cursor_update() and call gimp_rectangle_tool_cursor_update() from there. Chain up to get the plus, minus etc. modifiers added. Re-enble selection moving: (gimp_new_rect_select_tool_oper_update): set GimpSelectionTool's "allow_move" to FALSE unless the rectangle tool is in an idle state. (gimp_new_rect_select_tool_button_press): allow a selection moving to be started if the rectangle tool is idle. Fall back to starting a rect select if gimp_selection_tool_start_edit() returned FALSE.
363 lines
11 KiB
C
363 lines
11 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 "libgimpbase/gimpbase.h"
|
|
#include "libgimpwidgets/gimpwidgets.h"
|
|
|
|
#include "tools-types.h"
|
|
|
|
#include "core/gimpchannel.h"
|
|
#include "core/gimpimage.h"
|
|
#include "core/gimppickable.h"
|
|
#include "core/gimptoolinfo.h"
|
|
|
|
#include "display/gimpdisplay.h"
|
|
|
|
#include "gimpeditselectiontool.h"
|
|
#include "gimpselectiontool.h"
|
|
#include "gimpselectionoptions.h"
|
|
#include "gimptoolcontrol.h"
|
|
|
|
#include "gimp-intl.h"
|
|
|
|
|
|
static void gimp_selection_tool_control (GimpTool *tool,
|
|
GimpToolAction action,
|
|
GimpDisplay *display);
|
|
static void gimp_selection_tool_modifier_key (GimpTool *tool,
|
|
GdkModifierType key,
|
|
gboolean press,
|
|
GdkModifierType state,
|
|
GimpDisplay *display);
|
|
static void gimp_selection_tool_oper_update (GimpTool *tool,
|
|
GimpCoords *coords,
|
|
GdkModifierType state,
|
|
gboolean proximity,
|
|
GimpDisplay *display);
|
|
static void gimp_selection_tool_cursor_update (GimpTool *tool,
|
|
GimpCoords *coords,
|
|
GdkModifierType state,
|
|
GimpDisplay *display);
|
|
|
|
|
|
G_DEFINE_TYPE (GimpSelectionTool, gimp_selection_tool, GIMP_TYPE_DRAW_TOOL)
|
|
|
|
#define parent_class gimp_selection_tool_parent_class
|
|
|
|
|
|
static void
|
|
gimp_selection_tool_class_init (GimpSelectionToolClass *klass)
|
|
{
|
|
GimpToolClass *tool_class = GIMP_TOOL_CLASS (klass);
|
|
|
|
tool_class->control = gimp_selection_tool_control;
|
|
tool_class->modifier_key = gimp_selection_tool_modifier_key;
|
|
tool_class->key_press = gimp_edit_selection_tool_key_press;
|
|
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)
|
|
{
|
|
selection_tool->op = SELECTION_REPLACE;
|
|
selection_tool->saved_op = SELECTION_REPLACE;
|
|
|
|
selection_tool->allow_move = TRUE;
|
|
}
|
|
|
|
static void
|
|
gimp_selection_tool_control (GimpTool *tool,
|
|
GimpToolAction action,
|
|
GimpDisplay *display)
|
|
{
|
|
switch (action)
|
|
{
|
|
case GIMP_TOOL_ACTION_PAUSE:
|
|
case GIMP_TOOL_ACTION_RESUME:
|
|
break;
|
|
|
|
case GIMP_TOOL_ACTION_HALT:
|
|
gimp_tool_pop_status (tool, display);
|
|
break;
|
|
}
|
|
|
|
GIMP_TOOL_CLASS (parent_class)->control (tool, action, display);
|
|
}
|
|
|
|
static void
|
|
gimp_selection_tool_modifier_key (GimpTool *tool,
|
|
GdkModifierType key,
|
|
gboolean press,
|
|
GdkModifierType state,
|
|
GimpDisplay *display)
|
|
{
|
|
GimpSelectionTool *selection_tool = GIMP_SELECTION_TOOL (tool);
|
|
GimpSelectionOptions *options;
|
|
|
|
options = GIMP_SELECTION_OPTIONS (tool->tool_info->tool_options);
|
|
|
|
if (key == GDK_SHIFT_MASK || key == GDK_CONTROL_MASK)
|
|
{
|
|
SelectOps button_op = options->operation;
|
|
|
|
if (press)
|
|
{
|
|
if (key == (state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK)))
|
|
{
|
|
/* first modifier pressed */
|
|
|
|
selection_tool->saved_op = options->operation;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
if (! (state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK)))
|
|
{
|
|
/* last modifier released */
|
|
|
|
button_op = selection_tool->saved_op;
|
|
}
|
|
}
|
|
|
|
if ((state & GDK_CONTROL_MASK) && (state & GDK_SHIFT_MASK))
|
|
{
|
|
button_op = SELECTION_INTERSECT;
|
|
}
|
|
else if (state & GDK_SHIFT_MASK)
|
|
{
|
|
button_op = SELECTION_ADD;
|
|
}
|
|
else if (state & GDK_CONTROL_MASK)
|
|
{
|
|
button_op = SELECTION_SUBTRACT;
|
|
}
|
|
|
|
if (button_op != options->operation)
|
|
{
|
|
g_object_set (options, "operation", button_op, NULL);
|
|
}
|
|
}
|
|
}
|
|
|
|
static void
|
|
gimp_selection_tool_oper_update (GimpTool *tool,
|
|
GimpCoords *coords,
|
|
GdkModifierType state,
|
|
gboolean proximity,
|
|
GimpDisplay *display)
|
|
{
|
|
GimpSelectionTool *selection_tool = GIMP_SELECTION_TOOL (tool);
|
|
GimpSelectionOptions *options;
|
|
GimpChannel *selection;
|
|
GimpLayer *layer;
|
|
GimpLayer *floating_sel;
|
|
gboolean move_layer = FALSE;
|
|
gboolean move_floating_sel = FALSE;
|
|
|
|
options = GIMP_SELECTION_OPTIONS (tool->tool_info->tool_options);
|
|
|
|
selection = gimp_image_get_mask (display->image);
|
|
layer = gimp_image_pick_correlate_layer (display->image,
|
|
coords->x, coords->y);
|
|
floating_sel = gimp_image_floating_sel (display->image);
|
|
|
|
if (layer)
|
|
{
|
|
if (floating_sel)
|
|
{
|
|
if (layer == floating_sel)
|
|
move_floating_sel = TRUE;
|
|
}
|
|
else if (gimp_pickable_get_opacity_at (GIMP_PICKABLE (selection),
|
|
coords->x, coords->y))
|
|
{
|
|
move_layer = TRUE;
|
|
}
|
|
}
|
|
|
|
if (selection_tool->allow_move &&
|
|
(state & GDK_MOD1_MASK) && (state & GDK_CONTROL_MASK) && move_layer)
|
|
{
|
|
selection_tool->op = SELECTION_MOVE_COPY; /* move a copy of the selection */
|
|
}
|
|
else if (selection_tool->allow_move &&
|
|
(state & GDK_MOD1_MASK) && (state & GDK_SHIFT_MASK) && move_layer)
|
|
{
|
|
selection_tool->op = SELECTION_MOVE; /* move the selection */
|
|
}
|
|
else if (selection_tool->allow_move &&
|
|
(state & GDK_MOD1_MASK) && ! gimp_channel_is_empty (selection))
|
|
{
|
|
selection_tool->op = SELECTION_MOVE_MASK; /* move the selection mask */
|
|
}
|
|
else if (selection_tool->allow_move &&
|
|
! (state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK)) &&
|
|
move_floating_sel)
|
|
{
|
|
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_SUBTRACT; /* subtract from the selection */
|
|
}
|
|
else if (floating_sel)
|
|
{
|
|
selection_tool->op = SELECTION_ANCHOR; /* anchor the selection */
|
|
}
|
|
else
|
|
{
|
|
selection_tool->op = options->operation;
|
|
}
|
|
|
|
gimp_tool_pop_status (tool, display);
|
|
|
|
if (proximity)
|
|
{
|
|
const gchar *status = NULL;
|
|
|
|
if (! gimp_enum_get_value (GIMP_TYPE_CHANNEL_OPS, selection_tool->op,
|
|
NULL, NULL, &status, NULL))
|
|
{
|
|
switch (selection_tool->op)
|
|
{
|
|
case SELECTION_MOVE_MASK:
|
|
status = _("Move the selection mask");
|
|
break;
|
|
|
|
case SELECTION_MOVE:
|
|
status = _("Move the selected pixels");
|
|
break;
|
|
|
|
case SELECTION_MOVE_COPY:
|
|
status = _("Move a copy of the selected pixels");
|
|
break;
|
|
|
|
case SELECTION_ANCHOR:
|
|
status = _("Anchor the floating selection");
|
|
break;
|
|
|
|
default:
|
|
g_return_if_reached ();
|
|
}
|
|
}
|
|
|
|
if (status)
|
|
gimp_tool_push_status (tool, display, status);
|
|
}
|
|
}
|
|
|
|
static void
|
|
gimp_selection_tool_cursor_update (GimpTool *tool,
|
|
GimpCoords *coords,
|
|
GdkModifierType state,
|
|
GimpDisplay *display)
|
|
{
|
|
GimpSelectionTool *selection_tool = GIMP_SELECTION_TOOL (tool);
|
|
GimpToolCursorType tool_cursor;
|
|
GimpCursorModifier modifier;
|
|
|
|
tool_cursor = gimp_tool_control_get_tool_cursor (tool->control);
|
|
modifier = GIMP_CURSOR_MODIFIER_NONE;
|
|
|
|
switch (selection_tool->op)
|
|
{
|
|
case SELECTION_ADD:
|
|
modifier = GIMP_CURSOR_MODIFIER_PLUS;
|
|
break;
|
|
case SELECTION_SUBTRACT:
|
|
modifier = GIMP_CURSOR_MODIFIER_MINUS;
|
|
break;
|
|
case SELECTION_INTERSECT:
|
|
modifier = GIMP_CURSOR_MODIFIER_INTERSECT;
|
|
break;
|
|
case SELECTION_REPLACE:
|
|
break;
|
|
case SELECTION_MOVE_MASK:
|
|
modifier = GIMP_CURSOR_MODIFIER_MOVE;
|
|
break;
|
|
case SELECTION_MOVE:
|
|
case SELECTION_MOVE_COPY:
|
|
tool_cursor = GIMP_TOOL_CURSOR_MOVE;
|
|
break;
|
|
case SELECTION_ANCHOR:
|
|
modifier = GIMP_CURSOR_MODIFIER_ANCHOR;
|
|
break;
|
|
}
|
|
|
|
gimp_tool_set_cursor (tool, display,
|
|
gimp_tool_control_get_cursor (tool->control),
|
|
tool_cursor,
|
|
modifier);
|
|
}
|
|
|
|
|
|
/* public functions */
|
|
|
|
gboolean
|
|
gimp_selection_tool_start_edit (GimpSelectionTool *sel_tool,
|
|
GimpCoords *coords)
|
|
{
|
|
GimpTool *tool;
|
|
|
|
g_return_val_if_fail (GIMP_IS_SELECTION_TOOL (sel_tool), FALSE);
|
|
g_return_val_if_fail (coords != NULL, FALSE);
|
|
|
|
tool = GIMP_TOOL (sel_tool);
|
|
|
|
g_return_val_if_fail (GIMP_IS_DISPLAY (tool->display), FALSE);
|
|
g_return_val_if_fail (gimp_tool_control_is_active (tool->control), FALSE);
|
|
|
|
switch (sel_tool->op)
|
|
{
|
|
case SELECTION_MOVE_MASK:
|
|
gimp_edit_selection_tool_start (tool, tool->display, coords,
|
|
GIMP_TRANSLATE_MODE_MASK, FALSE);
|
|
return TRUE;
|
|
|
|
case SELECTION_MOVE:
|
|
gimp_edit_selection_tool_start (tool, tool->display, coords,
|
|
GIMP_TRANSLATE_MODE_MASK_TO_LAYER, FALSE);
|
|
return TRUE;
|
|
|
|
case SELECTION_MOVE_COPY:
|
|
gimp_edit_selection_tool_start (tool, tool->display, coords,
|
|
GIMP_TRANSLATE_MODE_MASK_COPY_TO_LAYER,
|
|
FALSE);
|
|
return TRUE;
|
|
|
|
default:
|
|
break;
|
|
}
|
|
|
|
return FALSE;
|
|
}
|