mirror of https://github.com/GNOME/gimp.git
Bill Skaggs <weskaggs@primate.ucdavis.edu>
Following up on previous commit, with assist from yosh. * app/tools/gimpnewrectselectoptions.[ch] * app/tools/gimpnewrectselecttool.[ch]: removed * app/tools/gimprectangleselectoptions.[ch]: magic-moved from gimpnewrectselectoptions.[ch] * app/tools/gimprectangleselecttool.[ch]: magic-moved from gimpnewrectselecttool.[ch] * app/tools/Makefile.am * app/tools/gimp-tools.c * app/tools/gimpellipseselecttool.c * app/tools/gimpellipseselecttool.h * app/tools/gimpselectionoptions.c: change file names to refer to moved files.
This commit is contained in:
William Skaggs
parent
5535b4ea92
commit
ca059c11d6
20
ChangeLog
20
ChangeLog
|
|
@ -1,3 +1,23 @@
|
|||
2006-06-10 Bill Skaggs <weskaggs@primate.ucdavis.edu>
|
||||
|
||||
Following up on previous commit, with assist from yosh.
|
||||
|
||||
* app/tools/gimpnewrectselectoptions.[ch]
|
||||
* app/tools/gimpnewrectselecttool.[ch]: removed
|
||||
|
||||
* app/tools/gimprectangleselectoptions.[ch]: magic-moved
|
||||
from gimpnewrectselectoptions.[ch]
|
||||
|
||||
* app/tools/gimprectangleselecttool.[ch]: magic-moved
|
||||
from gimpnewrectselecttool.[ch]
|
||||
|
||||
* app/tools/Makefile.am
|
||||
* app/tools/gimp-tools.c
|
||||
* app/tools/gimpellipseselecttool.c
|
||||
* app/tools/gimpellipseselecttool.h
|
||||
* app/tools/gimpselectionoptions.c: change file names to
|
||||
refer to moved files.
|
||||
|
||||
2006-06-10 Bill Skaggs <weskaggs@primate.ucdavis.edu>
|
||||
|
||||
Here is the big change-over, finally.
|
||||
|
|
|
|||
|
|
@ -116,10 +116,10 @@ libapptools_a_sources = \
|
|||
gimpperspectivetool.h \
|
||||
gimpposterizetool.c \
|
||||
gimpposterizetool.h \
|
||||
gimpnewrectselecttool.c \
|
||||
gimpnewrectselecttool.h \
|
||||
gimpnewrectselectoptions.c \
|
||||
gimpnewrectselectoptions.h \
|
||||
gimprectangleselecttool.c \
|
||||
gimprectangleselecttool.h \
|
||||
gimprectangleselectoptions.c \
|
||||
gimprectangleselectoptions.h \
|
||||
gimprectangletool.c \
|
||||
gimprectangletool.h \
|
||||
gimprectangleoptions.c \
|
||||
|
|
|
|||
|
|
@ -73,8 +73,8 @@
|
|||
#include "gimppenciltool.h"
|
||||
#include "gimpperspectivetool.h"
|
||||
#include "gimpposterizetool.h"
|
||||
#include "gimpnewrectselecttool.h"
|
||||
#include "gimpthresholdtool.h"
|
||||
#include "gimprectangleselecttool.h"
|
||||
#include "gimprotatetool.h"
|
||||
#include "gimpscaletool.h"
|
||||
#include "gimpsheartool.h"
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@
|
|||
|
||||
#include "gimprectangletool.h"
|
||||
#include "gimpellipseselecttool.h"
|
||||
#include "gimpnewrectselectoptions.h"
|
||||
#include "gimprectangleselectoptions.h"
|
||||
#include "gimptoolcontrol.h"
|
||||
|
||||
#include "gimp-intl.h"
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
#define __GIMP_ELLIPSE_SELECT_TOOL_H__
|
||||
|
||||
|
||||
#include "gimpnewrectselecttool.h"
|
||||
#include "gimprectangleselecttool.h"
|
||||
|
||||
|
||||
#define GIMP_TYPE_ELLIPSE_SELECT_TOOL (gimp_ellipse_select_tool_get_type ())
|
||||
|
|
|
|||
|
|
@ -1,84 +0,0 @@
|
|||
/* 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 "libgimpbase/gimpbase.h"
|
||||
#include "libgimpconfig/gimpconfig.h"
|
||||
#include "libgimpwidgets/gimpwidgets.h"
|
||||
|
||||
#include "tools-types.h"
|
||||
|
||||
#include "widgets/gimpwidgets-utils.h"
|
||||
|
||||
#include "gimprectangleoptions.h"
|
||||
#include "gimpnewrectselectoptions.h"
|
||||
#include "gimptooloptions-gui.h"
|
||||
|
||||
#include "gimp-intl.h"
|
||||
|
||||
|
||||
static void gimp_rect_select_options_rectangle_options_iface_init (GimpRectangleOptionsInterface *iface);
|
||||
|
||||
|
||||
G_DEFINE_TYPE_WITH_CODE (GimpRectSelectOptions, gimp_rect_select_options,
|
||||
GIMP_TYPE_SELECTION_OPTIONS,
|
||||
G_IMPLEMENT_INTERFACE (GIMP_TYPE_RECTANGLE_OPTIONS,
|
||||
gimp_rect_select_options_rectangle_options_iface_init))
|
||||
|
||||
|
||||
static void
|
||||
gimp_rect_select_options_class_init (GimpRectSelectOptionsClass *klass)
|
||||
{
|
||||
GObjectClass *object_class = G_OBJECT_CLASS (klass);
|
||||
|
||||
object_class->set_property = gimp_rectangle_options_set_property;
|
||||
object_class->get_property = gimp_rectangle_options_get_property;
|
||||
|
||||
gimp_rectangle_options_install_properties (object_class);
|
||||
}
|
||||
|
||||
static void
|
||||
gimp_rect_select_options_init (GimpRectSelectOptions *options)
|
||||
{
|
||||
}
|
||||
|
||||
static void
|
||||
gimp_rect_select_options_rectangle_options_iface_init (GimpRectangleOptionsInterface *iface)
|
||||
{
|
||||
}
|
||||
|
||||
GtkWidget *
|
||||
gimp_rect_select_options_gui (GimpToolOptions *tool_options)
|
||||
{
|
||||
GtkWidget *vbox;
|
||||
GtkWidget *vbox_rectangle;
|
||||
|
||||
vbox = gimp_selection_options_gui (tool_options);
|
||||
|
||||
/* rectangle options */
|
||||
vbox_rectangle = gimp_rectangle_options_gui (tool_options);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), vbox_rectangle, FALSE, FALSE, 0);
|
||||
gtk_widget_show (vbox_rectangle);
|
||||
|
||||
gimp_rectangle_options_set_highlight (GIMP_RECTANGLE_OPTIONS (tool_options),
|
||||
FALSE);
|
||||
return vbox;
|
||||
}
|
||||
|
|
@ -1,48 +0,0 @@
|
|||
/* 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_RECT_SELECT_OPTIONS_H__
|
||||
#define __GIMP_RECT_SELECT_OPTIONS_H__
|
||||
|
||||
|
||||
#include "gimpselectionoptions.h"
|
||||
|
||||
|
||||
#define GIMP_TYPE_RECT_SELECT_OPTIONS (gimp_rect_select_options_get_type ())
|
||||
#define GIMP_RECT_SELECT_OPTIONS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_RECT_SELECT_OPTIONS, GimpRectSelectOptions))
|
||||
#define GIMP_RECT_SELECT_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_RECT_SELECT_OPTIONS, GimpRectSelectOptionsClass))
|
||||
#define GIMP_IS_RECT_SELECT_OPTIONS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_RECT_SELECT_OPTIONS))
|
||||
#define GIMP_IS_RECT_SELECT_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_RECT_SELECT_OPTIONS))
|
||||
#define GIMP_RECT_SELECT_OPTIONS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_RECT_SELECT_OPTIONS, GimpRectSelectOptionsClass))
|
||||
|
||||
|
||||
typedef struct _GimpRectSelectOptions GimpRectSelectOptions;
|
||||
typedef struct _GimpToolOptionsClass GimpRectSelectOptionsClass;
|
||||
|
||||
struct _GimpRectSelectOptions
|
||||
{
|
||||
GimpSelectionOptions parent_instence;
|
||||
};
|
||||
|
||||
|
||||
GType gimp_rect_select_options_get_type (void) G_GNUC_CONST;
|
||||
|
||||
GtkWidget * gimp_rect_select_options_gui (GimpToolOptions *tool_options);
|
||||
|
||||
|
||||
#endif /* __GIMP_RECT_SELECT_OPTIONS_H__ */
|
||||
|
|
@ -1,625 +0,0 @@
|
|||
/* 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 "libgimpwidgets/gimpwidgets.h"
|
||||
|
||||
#include "tools-types.h"
|
||||
|
||||
#include "base/boundary.h"
|
||||
|
||||
#include "core/gimpchannel.h"
|
||||
#include "core/gimpchannel-select.h"
|
||||
#include "core/gimplayer-floating-sel.h"
|
||||
#include "core/gimpimage.h"
|
||||
#include "core/gimpimage-undo.h"
|
||||
#include "core/gimppickable.h"
|
||||
#include "core/gimptoolinfo.h"
|
||||
#include "core/gimp-utils.h"
|
||||
#include "core/gimpundo.h"
|
||||
#include "core/gimpundostack.h"
|
||||
|
||||
#include "widgets/gimpdialogfactory.h"
|
||||
#include "widgets/gimphelp-ids.h"
|
||||
#include "widgets/gimpviewabledialog.h"
|
||||
#include "widgets/gimpwidgets-utils.h"
|
||||
|
||||
#include "display/gimpcanvas.h"
|
||||
#include "display/gimpdisplay.h"
|
||||
#include "display/gimpdisplayshell.h"
|
||||
#include "display/gimpdisplayshell-transform.h"
|
||||
|
||||
#include "gimpselectiontool.h"
|
||||
#include "gimpselectionoptions.h"
|
||||
#include "gimprectangletool.h"
|
||||
#include "gimprectangleoptions.h"
|
||||
#include "gimpnewrectselecttool.h"
|
||||
#include "gimpnewrectselectoptions.h"
|
||||
#include "gimptoolcontrol.h"
|
||||
|
||||
#include "gimp-intl.h"
|
||||
|
||||
|
||||
static void gimp_rect_select_tool_rectangle_tool_iface_init (GimpRectangleToolInterface *iface);
|
||||
|
||||
static GObject *gimp_rect_select_tool_constructor (GType type,
|
||||
guint n_params,
|
||||
GObjectConstructParam *params);
|
||||
static void gimp_rect_select_tool_finalize (GObject *object);
|
||||
static void gimp_rect_select_tool_control (GimpTool *tool,
|
||||
GimpToolAction action,
|
||||
GimpDisplay *display);
|
||||
static void gimp_rect_select_tool_button_press (GimpTool *tool,
|
||||
GimpCoords *coords,
|
||||
guint32 time,
|
||||
GdkModifierType state,
|
||||
GimpDisplay *display);
|
||||
static void gimp_rect_select_tool_button_release (GimpTool *tool,
|
||||
GimpCoords *coords,
|
||||
guint32 time,
|
||||
GdkModifierType state,
|
||||
GimpDisplay *display);
|
||||
static void gimp_rect_select_tool_modifier_key (GimpTool *tool,
|
||||
GdkModifierType key,
|
||||
gboolean press,
|
||||
GdkModifierType state,
|
||||
GimpDisplay *display);
|
||||
static void gimp_rect_select_tool_oper_update (GimpTool *tool,
|
||||
GimpCoords *coords,
|
||||
GdkModifierType state,
|
||||
gboolean proximity,
|
||||
GimpDisplay *display);
|
||||
static void gimp_rect_select_tool_cursor_update (GimpTool *tool,
|
||||
GimpCoords *coords,
|
||||
GdkModifierType state,
|
||||
GimpDisplay *display);
|
||||
static void gimp_rect_select_tool_select (GimpRectangleTool *rect_tool,
|
||||
gint x,
|
||||
gint y,
|
||||
gint w,
|
||||
gint h);
|
||||
static gboolean gimp_rect_select_tool_execute (GimpRectangleTool *rect_tool,
|
||||
gint x,
|
||||
gint y,
|
||||
gint w,
|
||||
gint h);
|
||||
static void gimp_rect_select_tool_cancel (GimpRectangleTool *rect_tool);
|
||||
static gboolean gimp_rect_select_tool_rectangle_changed (GimpRectangleTool *rect_tool);
|
||||
static void gimp_rect_select_tool_real_select (GimpRectSelectTool *rect_select,
|
||||
SelectOps operation,
|
||||
gint x,
|
||||
gint y,
|
||||
gint w,
|
||||
gint h);
|
||||
|
||||
|
||||
G_DEFINE_TYPE_WITH_CODE (GimpRectSelectTool, gimp_rect_select_tool,
|
||||
GIMP_TYPE_SELECTION_TOOL,
|
||||
G_IMPLEMENT_INTERFACE (GIMP_TYPE_RECTANGLE_TOOL,
|
||||
gimp_rect_select_tool_rectangle_tool_iface_init))
|
||||
|
||||
#define parent_class gimp_rect_select_tool_parent_class
|
||||
|
||||
|
||||
void
|
||||
gimp_rect_select_tool_register (GimpToolRegisterCallback callback,
|
||||
gpointer data)
|
||||
{
|
||||
(* callback) (GIMP_TYPE_RECT_SELECT_TOOL,
|
||||
GIMP_TYPE_RECT_SELECT_OPTIONS,
|
||||
gimp_rect_select_options_gui,
|
||||
0,
|
||||
"gimp-rect-select-tool",
|
||||
_("Rect Select"),
|
||||
_("Select a Rectangular part of an image"),
|
||||
N_("_Rect Select"), "R",
|
||||
NULL, GIMP_HELP_TOOL_RECT_SELECT,
|
||||
GIMP_STOCK_TOOL_RECT_SELECT,
|
||||
data);
|
||||
}
|
||||
|
||||
static void
|
||||
gimp_rect_select_tool_class_init (GimpRectSelectToolClass *klass)
|
||||
{
|
||||
GObjectClass *object_class = G_OBJECT_CLASS (klass);
|
||||
GimpToolClass *tool_class = GIMP_TOOL_CLASS (klass);
|
||||
GimpDrawToolClass *draw_tool_class = GIMP_DRAW_TOOL_CLASS (klass);
|
||||
|
||||
object_class->constructor = gimp_rect_select_tool_constructor;
|
||||
object_class->dispose = gimp_rectangle_tool_dispose;
|
||||
object_class->finalize = gimp_rect_select_tool_finalize;
|
||||
object_class->set_property = gimp_rectangle_tool_set_property;
|
||||
object_class->get_property = gimp_rectangle_tool_get_property;
|
||||
|
||||
gimp_rectangle_tool_install_properties (object_class);
|
||||
|
||||
tool_class->initialize = gimp_rectangle_tool_initialize;
|
||||
tool_class->control = gimp_rect_select_tool_control;
|
||||
tool_class->button_press = gimp_rect_select_tool_button_press;
|
||||
tool_class->button_release = gimp_rect_select_tool_button_release;
|
||||
tool_class->motion = gimp_rectangle_tool_motion;
|
||||
tool_class->key_press = gimp_rectangle_tool_key_press;
|
||||
tool_class->modifier_key = gimp_rect_select_tool_modifier_key;
|
||||
tool_class->oper_update = gimp_rect_select_tool_oper_update;
|
||||
tool_class->cursor_update = gimp_rect_select_tool_cursor_update;
|
||||
|
||||
draw_tool_class->draw = gimp_rectangle_tool_draw;
|
||||
|
||||
klass->select = gimp_rect_select_tool_real_select;
|
||||
}
|
||||
|
||||
static void
|
||||
gimp_rect_select_tool_init (GimpRectSelectTool *rect_select)
|
||||
{
|
||||
GimpTool *tool = GIMP_TOOL (rect_select);
|
||||
GimpRectangleTool *rect_tool = GIMP_RECTANGLE_TOOL (rect_select);
|
||||
|
||||
gimp_tool_control_set_tool_cursor (tool->control, GIMP_TOOL_CURSOR_RECT_SELECT);
|
||||
gimp_rectangle_tool_set_constrain (rect_tool, TRUE);
|
||||
|
||||
rect_select->undo = NULL;
|
||||
rect_select->redo = NULL;
|
||||
}
|
||||
|
||||
static void
|
||||
gimp_rect_select_tool_rectangle_tool_iface_init (GimpRectangleToolInterface *iface)
|
||||
{
|
||||
iface->execute = gimp_rect_select_tool_execute;
|
||||
iface->cancel = gimp_rect_select_tool_cancel;
|
||||
iface->rectangle_changed = gimp_rect_select_tool_rectangle_changed;
|
||||
}
|
||||
|
||||
static GObject *
|
||||
gimp_rect_select_tool_constructor (GType type,
|
||||
guint n_params,
|
||||
GObjectConstructParam *params)
|
||||
{
|
||||
GObject *object;
|
||||
|
||||
object = G_OBJECT_CLASS (parent_class)->constructor (type, n_params, params);
|
||||
|
||||
gimp_rectangle_tool_constructor (object);
|
||||
|
||||
return object;
|
||||
}
|
||||
|
||||
static void
|
||||
gimp_rect_select_tool_finalize (GObject *object)
|
||||
{
|
||||
G_OBJECT_CLASS (parent_class)->finalize (object);
|
||||
}
|
||||
|
||||
static void
|
||||
gimp_rect_select_tool_control (GimpTool *tool,
|
||||
GimpToolAction action,
|
||||
GimpDisplay *display)
|
||||
{
|
||||
gimp_rectangle_tool_control (tool, action, display);
|
||||
|
||||
GIMP_TOOL_CLASS (parent_class)->control (tool, action, display);
|
||||
}
|
||||
|
||||
static void
|
||||
gimp_rect_select_tool_button_press (GimpTool *tool,
|
||||
GimpCoords *coords,
|
||||
guint32 time,
|
||||
GdkModifierType state,
|
||||
GimpDisplay *display)
|
||||
{
|
||||
GimpRectSelectTool *rect_select = GIMP_RECT_SELECT_TOOL (tool);
|
||||
guint function;
|
||||
|
||||
if (tool->display && display != tool->display)
|
||||
gimp_rectangle_tool_cancel (GIMP_RECTANGLE_TOOL (tool));
|
||||
|
||||
g_object_get (tool, "function", &function, NULL);
|
||||
|
||||
if (function == RECT_INACTIVE)
|
||||
{
|
||||
GimpDisplay *old_display;
|
||||
gboolean edit_started;
|
||||
|
||||
old_display = tool->display;
|
||||
tool->display = display;
|
||||
gimp_tool_control_activate (tool->control);
|
||||
|
||||
edit_started = gimp_selection_tool_start_edit (GIMP_SELECTION_TOOL (tool),
|
||||
coords);
|
||||
|
||||
if (gimp_tool_control_is_active (tool->control))
|
||||
gimp_tool_control_halt (tool->control);
|
||||
tool->display = old_display;
|
||||
|
||||
if (edit_started)
|
||||
return;
|
||||
}
|
||||
|
||||
gimp_rectangle_tool_button_press (tool, coords, time, state, display);
|
||||
|
||||
/* if we have an existing rectangle in the current display, then
|
||||
* we have already "executed", and need to undo at this point,
|
||||
* unless the user has done something in the meantime
|
||||
*/
|
||||
g_object_get (tool, "function", &function, NULL);
|
||||
|
||||
if (function == RECT_CREATING)
|
||||
{
|
||||
rect_select->use_saved_op = FALSE;
|
||||
}
|
||||
else
|
||||
{
|
||||
GimpImage *image = tool->display->image;
|
||||
GimpUndo *undo;
|
||||
|
||||
undo = gimp_undo_stack_peek (image->undo_stack);
|
||||
|
||||
if (undo && rect_select->undo == undo)
|
||||
{
|
||||
gimp_image_undo (image);
|
||||
|
||||
/* we will need to redo if the user cancels or executes */
|
||||
rect_select->redo = gimp_undo_stack_peek (image->redo_stack);
|
||||
}
|
||||
}
|
||||
|
||||
rect_select->undo = NULL;
|
||||
}
|
||||
|
||||
static void
|
||||
gimp_rect_select_tool_button_release (GimpTool *tool,
|
||||
GimpCoords *coords,
|
||||
guint32 time,
|
||||
GdkModifierType state,
|
||||
GimpDisplay *display)
|
||||
{
|
||||
GimpRectSelectTool *rect_select = GIMP_RECT_SELECT_TOOL (tool);
|
||||
GimpRectangleTool *rectangle = GIMP_RECTANGLE_TOOL (tool);
|
||||
|
||||
gimp_tool_pop_status (tool, display);
|
||||
|
||||
/*
|
||||
* if the user has not moved the mouse, we need to redo the operation
|
||||
* that was undone on button press.
|
||||
*/
|
||||
if (gimp_rectangle_tool_no_movement (rectangle))
|
||||
{
|
||||
GimpImage *image = tool->display->image;
|
||||
GimpUndo *redo;
|
||||
|
||||
redo = gimp_undo_stack_peek (image->redo_stack);
|
||||
|
||||
if (redo && rect_select->redo == redo)
|
||||
{
|
||||
gimp_image_redo (image);
|
||||
rect_select->redo = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
gimp_rectangle_tool_button_release (tool, coords, time, state, display);
|
||||
|
||||
if ((state & GDK_BUTTON3_MASK))
|
||||
{
|
||||
if (rect_select->redo)
|
||||
{
|
||||
gimp_image_redo (tool->display->image);
|
||||
}
|
||||
|
||||
rect_select->use_saved_op = TRUE; /* is this correct? */
|
||||
}
|
||||
|
||||
rect_select->redo = NULL;
|
||||
}
|
||||
|
||||
static void
|
||||
gimp_rect_select_tool_modifier_key (GimpTool *tool,
|
||||
GdkModifierType key,
|
||||
gboolean press,
|
||||
GdkModifierType state,
|
||||
GimpDisplay *display)
|
||||
{
|
||||
GIMP_TOOL_CLASS (parent_class)->modifier_key (tool, key, press, state,
|
||||
display);
|
||||
}
|
||||
|
||||
static void
|
||||
gimp_rect_select_tool_oper_update (GimpTool *tool,
|
||||
GimpCoords *coords,
|
||||
GdkModifierType state,
|
||||
gboolean proximity,
|
||||
GimpDisplay *display)
|
||||
{
|
||||
guint function;
|
||||
|
||||
gimp_rectangle_tool_oper_update (tool, coords, state, proximity, display);
|
||||
|
||||
g_object_get (tool, "function", &function, NULL);
|
||||
|
||||
if (function == RECT_INACTIVE)
|
||||
GIMP_SELECTION_TOOL (tool)->allow_move = TRUE;
|
||||
else
|
||||
GIMP_SELECTION_TOOL (tool)->allow_move = FALSE;
|
||||
|
||||
GIMP_TOOL_CLASS (parent_class)->oper_update (tool, coords, state, proximity,
|
||||
display);
|
||||
}
|
||||
|
||||
static void
|
||||
gimp_rect_select_tool_cursor_update (GimpTool *tool,
|
||||
GimpCoords *coords,
|
||||
GdkModifierType state,
|
||||
GimpDisplay *display)
|
||||
{
|
||||
gimp_rectangle_tool_cursor_update (tool, coords, state, display);
|
||||
|
||||
GIMP_TOOL_CLASS (parent_class)->cursor_update (tool, coords, state, display);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* This function is called if the user clicks and releases the left
|
||||
* button without moving it. There are four things we might want
|
||||
* to do here:
|
||||
* 1) If there is an existing rectangle and we are inside it, we
|
||||
* convert it into a selection.
|
||||
* 2) If there is an existing rectangle and we are outside it, we
|
||||
* clear it.
|
||||
* 3) If there is no rectangle and we are inside the selection, we
|
||||
* create a rectangle from the selection bounds.
|
||||
* 4) If there is no rectangle and we are outside the selection,
|
||||
* we clear the selection.
|
||||
*/
|
||||
static void
|
||||
gimp_rect_select_tool_select (GimpRectangleTool *rectangle,
|
||||
gint x,
|
||||
gint y,
|
||||
gint w,
|
||||
gint h)
|
||||
{
|
||||
GimpTool *tool = GIMP_TOOL (rectangle);
|
||||
GimpRectSelectTool *rect_select = GIMP_RECT_SELECT_TOOL (rectangle);
|
||||
GimpSelectionOptions *options;
|
||||
GimpImage *image;
|
||||
gboolean rectangle_exists;
|
||||
gboolean auto_shrink;
|
||||
SelectOps operation;
|
||||
|
||||
options = GIMP_SELECTION_OPTIONS (tool->tool_info->tool_options);
|
||||
|
||||
gimp_tool_pop_status (tool, tool->display);
|
||||
|
||||
image = tool->display->image;
|
||||
|
||||
rectangle_exists = (x <= image->width && y <= image->height &&
|
||||
x + w >= 0 && y + h >= 0 &&
|
||||
w > 0 && h > 0);
|
||||
|
||||
g_object_get (options,
|
||||
"auto-shrink", &auto_shrink,
|
||||
NULL);
|
||||
|
||||
if (auto_shrink)
|
||||
{
|
||||
/* FIXME */
|
||||
}
|
||||
|
||||
if (rect_select->use_saved_op)
|
||||
operation = rect_select->operation;
|
||||
else
|
||||
g_object_get (options,
|
||||
"operation", &operation,
|
||||
NULL);
|
||||
|
||||
/* if rectangle exists, turn it into a selection */
|
||||
if (rectangle_exists)
|
||||
GIMP_RECT_SELECT_TOOL_GET_CLASS (rect_select)->select (rect_select,
|
||||
operation,
|
||||
x, y, w, h);
|
||||
}
|
||||
|
||||
static void
|
||||
gimp_rect_select_tool_real_select (GimpRectSelectTool *rect_select,
|
||||
SelectOps operation,
|
||||
gint x,
|
||||
gint y,
|
||||
gint w,
|
||||
gint h)
|
||||
{
|
||||
GimpTool *tool = GIMP_TOOL (rect_select);
|
||||
GimpSelectionOptions *options;
|
||||
|
||||
options = GIMP_SELECTION_OPTIONS (tool->tool_info->tool_options);
|
||||
|
||||
gimp_channel_select_rectangle (gimp_image_get_mask (tool->display->image),
|
||||
x, y, w, h,
|
||||
operation,
|
||||
options->feather,
|
||||
options->feather_radius,
|
||||
options->feather_radius);
|
||||
}
|
||||
|
||||
static gboolean
|
||||
gimp_rect_select_tool_execute (GimpRectangleTool *rectangle,
|
||||
gint x,
|
||||
gint y,
|
||||
gint w,
|
||||
gint h)
|
||||
{
|
||||
if (w == 0 && h == 0)
|
||||
{
|
||||
GimpImage *image = GIMP_TOOL (rectangle)->display->image;
|
||||
GimpChannel *selection = gimp_image_get_mask (image);
|
||||
gint pressx;
|
||||
gint pressy;
|
||||
|
||||
g_object_get (rectangle,
|
||||
"pressx", &pressx,
|
||||
"pressy", &pressy,
|
||||
NULL);
|
||||
|
||||
/* if the click was inside the marching ants */
|
||||
if (gimp_pickable_get_opacity_at (GIMP_PICKABLE (selection),
|
||||
pressx, pressy) > 127)
|
||||
{
|
||||
const BoundSeg *segs_in;
|
||||
const BoundSeg *segs_out;
|
||||
gint n_segs_in;
|
||||
gint n_segs_out;
|
||||
|
||||
if (gimp_channel_boundary (selection,
|
||||
&segs_in, &segs_out,
|
||||
&n_segs_in, &n_segs_out,
|
||||
0, 0, 0, 0))
|
||||
{
|
||||
gint x1 = 0;
|
||||
gint y1 = 0;
|
||||
gint x2 = 0;
|
||||
gint y2 = 0;
|
||||
|
||||
if (n_segs_in > 0)
|
||||
{
|
||||
gint i;
|
||||
|
||||
x1 = segs_in[0].x1;
|
||||
x2 = segs_in[0].x1;
|
||||
y1 = segs_in[0].y1;
|
||||
y2 = segs_in[0].y1;
|
||||
|
||||
for (i = 1; i < n_segs_in; i++)
|
||||
{
|
||||
x1 = MIN (x1, segs_in[i].x1);
|
||||
x2 = MAX (x2, segs_in[i].x1);
|
||||
y1 = MIN (y1, segs_in[i].y1);
|
||||
y2 = MAX (y2, segs_in[i].y1);
|
||||
}
|
||||
}
|
||||
|
||||
g_object_set (rectangle,
|
||||
"x1", x1,
|
||||
"y1", y1,
|
||||
"x2", x2,
|
||||
"y2", y2,
|
||||
NULL);
|
||||
}
|
||||
else
|
||||
{
|
||||
g_object_set (rectangle,
|
||||
"x1", 0,
|
||||
"y1", 0,
|
||||
"x2", image->width,
|
||||
"y2", image->height,
|
||||
NULL);
|
||||
}
|
||||
|
||||
g_object_set (rectangle, "function", RECT_MOVING, NULL);
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
else
|
||||
{
|
||||
/* otherwise clear the selection */
|
||||
gimp_channel_clear (selection, NULL, TRUE);
|
||||
}
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static void
|
||||
gimp_rect_select_tool_cancel (GimpRectangleTool *rectangle)
|
||||
{
|
||||
GimpTool *tool = GIMP_TOOL (rectangle);
|
||||
GimpRectSelectTool *rect_select = GIMP_RECT_SELECT_TOOL (rectangle);
|
||||
|
||||
if (tool->display)
|
||||
{
|
||||
GimpImage *image = tool->display->image;
|
||||
GimpUndo *undo;
|
||||
|
||||
/* if we have an existing rectangle in the current display, then
|
||||
* we have already "executed", and need to undo at this point,
|
||||
* unless the user has done something in the meantime
|
||||
*/
|
||||
undo = gimp_undo_stack_peek (image->undo_stack);
|
||||
|
||||
if (undo && rect_select->undo == undo)
|
||||
{
|
||||
gimp_image_undo (image);
|
||||
gimp_image_flush (image);
|
||||
}
|
||||
}
|
||||
|
||||
rect_select->undo = NULL;
|
||||
rect_select->redo = NULL;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
gimp_rect_select_tool_rectangle_changed (GimpRectangleTool *rectangle)
|
||||
{
|
||||
GimpTool *tool = GIMP_TOOL (rectangle);
|
||||
|
||||
if (tool->display)
|
||||
{
|
||||
GimpRectSelectTool *rect_select = GIMP_RECT_SELECT_TOOL (tool);
|
||||
GimpSelectionOptions *options;
|
||||
GimpImage *image = tool->display->image;
|
||||
GimpUndo *undo;
|
||||
gint x1, y1, x2, y2;
|
||||
|
||||
/* if we got here via button release, we have already undone the
|
||||
* previous operation. But if we got here by some other means,
|
||||
* we need to undo it now.
|
||||
*/
|
||||
undo = gimp_undo_stack_peek (image->undo_stack);
|
||||
|
||||
if (undo && rect_select->undo == undo)
|
||||
{
|
||||
gimp_image_undo (image);
|
||||
rect_select->undo = NULL;
|
||||
}
|
||||
|
||||
g_object_get (rectangle,
|
||||
"x1", &x1,
|
||||
"y1", &y1,
|
||||
"x2", &x2,
|
||||
"y2", &y2,
|
||||
NULL);
|
||||
|
||||
gimp_rect_select_tool_select (rectangle, x1, y1, x2 - x1, y2 - y1);
|
||||
|
||||
/* save the undo that we got when executing */
|
||||
rect_select->undo = gimp_undo_stack_peek (image->undo_stack);
|
||||
rect_select->redo = NULL;
|
||||
|
||||
if (! rect_select->use_saved_op)
|
||||
{
|
||||
/* remember the operation now in case we modify the rectangle */
|
||||
options = GIMP_SELECTION_OPTIONS (tool->tool_info->tool_options);
|
||||
g_object_get (options,
|
||||
"operation", &rect_select->operation,
|
||||
NULL);
|
||||
rect_select->use_saved_op = TRUE;
|
||||
}
|
||||
|
||||
gimp_image_flush (image);
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
|
@ -1,65 +0,0 @@
|
|||
/* 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_RECT_SELECT_TOOL_H__
|
||||
#define __GIMP_RECT_SELECT_TOOL_H__
|
||||
|
||||
#include "gimpselectiontool.h"
|
||||
|
||||
|
||||
#define GIMP_TYPE_RECT_SELECT_TOOL (gimp_rect_select_tool_get_type ())
|
||||
#define GIMP_RECT_SELECT_TOOL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_RECT_SELECT_TOOL, GimpRectSelectTool))
|
||||
#define GIMP_RECT_SELECT_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_RECT_SELECT_TOOL, GimpRectSelectToolClass))
|
||||
#define GIMP_IS_RECT_SELECT_TOOL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_RECT_SELECT_TOOL))
|
||||
#define GIMP_IS_RECT_SELECT_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_RECT_SELECT_TOOL))
|
||||
#define GIMP_RECT_SELECT_TOOL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_RECT_SELECT_TOOL, GimpRectSelectToolClass))
|
||||
|
||||
|
||||
typedef struct _GimpRectSelectTool GimpRectSelectTool;
|
||||
typedef struct _GimpRectSelectToolClass GimpRectSelectToolClass;
|
||||
|
||||
struct _GimpRectSelectTool
|
||||
{
|
||||
GimpSelectionTool parent_instance;
|
||||
|
||||
SelectOps operation; /* remember for use when modifying */
|
||||
gboolean use_saved_op; /* use operation or get from options */
|
||||
GimpUndo *undo;
|
||||
GimpUndo *redo;
|
||||
};
|
||||
|
||||
struct _GimpRectSelectToolClass
|
||||
{
|
||||
GimpSelectionToolClass parent_class;
|
||||
|
||||
void (* select) (GimpRectSelectTool *rect_select,
|
||||
SelectOps operation,
|
||||
gint x,
|
||||
gint y,
|
||||
gint w,
|
||||
gint h);
|
||||
};
|
||||
|
||||
|
||||
void gimp_rect_select_tool_register (GimpToolRegisterCallback callback,
|
||||
gpointer data);
|
||||
|
||||
GType gimp_rect_select_tool_get_type (void) G_GNUC_CONST;
|
||||
|
||||
|
||||
#endif /* __GIMP_RECT_SELECT_TOOL_H__ */
|
||||
|
|
@ -29,7 +29,7 @@
|
|||
#include "widgets/gimpwidgets-utils.h"
|
||||
|
||||
#include "gimprectangleoptions.h"
|
||||
#include "gimpnewrectselectoptions.h"
|
||||
#include "gimprectangleselectoptions.h"
|
||||
#include "gimptooloptions-gui.h"
|
||||
|
||||
#include "gimp-intl.h"
|
||||
|
|
|
|||
|
|
@ -51,8 +51,8 @@
|
|||
#include "gimpselectionoptions.h"
|
||||
#include "gimprectangletool.h"
|
||||
#include "gimprectangleoptions.h"
|
||||
#include "gimpnewrectselecttool.h"
|
||||
#include "gimpnewrectselectoptions.h"
|
||||
#include "gimprectangleselecttool.h"
|
||||
#include "gimprectangleselectoptions.h"
|
||||
#include "gimptoolcontrol.h"
|
||||
|
||||
#include "gimp-intl.h"
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
#include "gimpbycolorselecttool.h"
|
||||
#include "gimpellipseselecttool.h"
|
||||
#include "gimpforegroundselecttool.h"
|
||||
#include "gimpnewrectselecttool.h"
|
||||
#include "gimprectangleselecttool.h"
|
||||
#include "gimpfuzzyselecttool.h"
|
||||
#include "gimpiscissorstool.h"
|
||||
#include "gimpselectionoptions.h"
|
||||
|
|
|
|||
Loading…
Reference in New Issue