2003-02-07 Michael Natterer <mitch@gimp.org> Added object properties for almost all tool_options values and registered lots of enums with the type system: Part I (enum and type cleanup): * app/core/core-enums.[ch] * app/core/core-types.h: removed InternalOrientaionType and register GimpOrientationType. Register GimpChannelOps. Removed GimpToolOptionsGUIFunc. * app/xcf/xcf-private.h: added XcfOrientationType with the same values as the old InternalOrientationType * app/xcf/xcf-load.c * app/xcf/xcf-save.c: translate between GimpOrientationType and XcfOrientationType. * app/core/gimpdrawable-transform-utils.[ch] * app/core/gimpdrawable-transform.[ch] * app/core/gimpimage-crop.c * app/core/gimpimage-duplicate.c * app/core/gimpimage-guides.c * app/core/gimpimage-resize.c * app/core/gimpimage-scale.c * app/core/gimpimage.h * app/display/gimpdisplayshell.c * tools/pdbgen/stddefs.pdb * tools/pdbgen/pdb/transform_tools.pdb: changed accordingly. * app/pdb/guides_cmds.c * app/pdb/transform_tools_cmds.c * libgimp/gimpenums.h * libgimpproxy/gimpproxytypes.h * plug-ins/script-fu/script-fu-constants.c * tools/pdbgen/enums.pl: regenerated. * libgimptool/gimptoolenums.[ch]: added GimpTransformGridType. * libgimptool/gimptooltypes.h: removed GimpToolOptionsResetFunc, added GimpToolOptionsGUIFunc. Part II (tool options changes): * app/config/gimpconfig-utils.c (gimp_config_reset_properties): don't reset object properties because they have NULL as default value. * app/widgets/gimppropwidgets.[ch]: added gimp_prop_[enum|boolean]_radio_frame_new(), gimp_prop_paint_mode_menu_new() and gimp_prop_scale_entry_new(), which are all needed by the new tool options GUI code. * app/tools/tool_options.[ch]: removed the "reset_func" since the virtual reset() method is used now. * app/paint/gimpairbrushoptions.[ch] * app/paint/gimpcloneoptions.[ch] * app/paint/gimpconvolveoptions.[ch] * app/paint/gimpdodgeburnoptions.[ch] * app/paint/gimperaseroptions.[ch] * app/paint/gimppaintoptions.[ch] * app/paint/gimpsmudgeoptions.[ch]: added properties all over the place and removed the widget and default_value members from the structs. Renamed some values (e.g. s/type/clone_type/). Don't #include <gtk/gtk.h>. * app/paint/gimpairbrush.c * app/paint/gimpclone.c * app/paint/gimpconvolve.c * app/paint/gimpdodgeburn.c * app/paint/gimperaser.c * app/paint/gimppaintbrush.c * app/paint/gimppaintcore-stroke.c * app/paint/gimppaintcore.c * app/paint/gimppencil.c * app/paint/gimpsmudge.c * app/paint/paint-types.h * app/paint/paint.c: changed accordingly. Don't #include <gtk/gtk.h>. * tools/pdbgen/pdb/paint_tools.pdb: changed accordingly. * app/pdb/paint_tools_cmds.c: regenerated. * app/tools/gimpblendoptions.[ch] * app/tools/gimpbucketfilloptions.[ch] * app/tools/gimpcolorpickeroptions.[ch] * app/tools/gimpcropoptions.[ch] * app/tools/gimpflipoptions.[ch] * app/tools/gimpinkoptions.c * app/tools/gimpmagnifyoptions.[ch] * app/tools/gimpmeasureoptions.[ch] * app/tools/gimpmoveoptions.[ch] * app/tools/gimptextoptions.c * app/tools/paint_options.[ch] * app/tools/selection_options.[ch] * app/tools/transform_options.[ch]: ditto: added properties and removed widget and default_value stuff. Removed most reset functions. Use gimp_prop widgets all over the place, renamed some values as above. * app/tools/Makefile.am * app/tools/gimpairbrushtool.c * app/tools/gimpblendtool.c * app/tools/gimpbucketfilltool.c * app/tools/gimpbycolorselecttool.c * app/tools/gimpclonetool.c * app/tools/gimpconvolvetool.c * app/tools/gimpcroptool.c * app/tools/gimpdodgeburntool.c * app/tools/gimperasertool.c * app/tools/gimpfliptool.c * app/tools/gimpfuzzyselecttool.c * app/tools/gimpmagnifytool.c * app/tools/gimpmovetool.c * app/tools/gimpselectiontool.c * app/tools/gimpsheartool.c * app/tools/gimpsmudgetool.c * app/tools/gimptransformtool.c * app/tools/gimpvectoroptions.c: changed accordingly. Ported the paint_options GUI constructors to gimp_prop widgets. * app/widgets/gimpselectioneditor.c * app/gui/tool-options-dialog.c: changed accordingly.
408 lines
12 KiB
C
408 lines
12 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 <stdlib.h>
|
|
|
|
#include <gtk/gtk.h>
|
|
#include <gdk/gdkkeysyms.h>
|
|
|
|
#include "libgimpwidgets/gimpwidgets.h"
|
|
|
|
#include "tools-types.h"
|
|
|
|
#include "config/gimpdisplayconfig.h"
|
|
|
|
#include "core/gimp.h"
|
|
#include "core/gimpimage.h"
|
|
#include "core/gimptoolinfo.h"
|
|
|
|
#include "display/gimpdisplay.h"
|
|
#include "display/gimpdisplayshell.h"
|
|
#include "display/gimpdisplayshell-scale.h"
|
|
|
|
#include "widgets/gimpenummenu.h"
|
|
#include "widgets/gimpwidgets-utils.h"
|
|
|
|
#include "gimpmagnifyoptions.h"
|
|
#include "gimpmagnifytool.h"
|
|
|
|
#include "libgimp/gimpintl.h"
|
|
|
|
|
|
static void gimp_magnify_tool_class_init (GimpMagnifyToolClass *klass);
|
|
static void gimp_magnify_tool_init (GimpMagnifyTool *tool);
|
|
|
|
static void gimp_magnify_tool_button_press (GimpTool *tool,
|
|
GimpCoords *coords,
|
|
guint32 time,
|
|
GdkModifierType state,
|
|
GimpDisplay *gdisp);
|
|
static void gimp_magnify_tool_button_release (GimpTool *tool,
|
|
GimpCoords *coords,
|
|
guint32 time,
|
|
GdkModifierType state,
|
|
GimpDisplay *gdisp);
|
|
static void gimp_magnify_tool_motion (GimpTool *tool,
|
|
GimpCoords *coords,
|
|
guint32 time,
|
|
GdkModifierType state,
|
|
GimpDisplay *gdisp);
|
|
static void gimp_magnify_tool_modifier_key (GimpTool *tool,
|
|
GdkModifierType key,
|
|
gboolean press,
|
|
GdkModifierType state,
|
|
GimpDisplay *gdisp);
|
|
static void gimp_magnify_tool_cursor_update (GimpTool *tool,
|
|
GimpCoords *coords,
|
|
GdkModifierType state,
|
|
GimpDisplay *gdisp);
|
|
|
|
static void gimp_magnify_tool_draw (GimpDrawTool *draw_tool);
|
|
|
|
static void zoom_in (gint *src,
|
|
gint *dest,
|
|
gint scale);
|
|
static void zoom_out (gint *src,
|
|
gint *dest,
|
|
gint scale);
|
|
|
|
|
|
static GimpDrawToolClass *parent_class = NULL;
|
|
|
|
|
|
/* public functions */
|
|
|
|
void
|
|
gimp_magnify_tool_register (GimpToolRegisterCallback callback,
|
|
gpointer data)
|
|
{
|
|
(* callback) (GIMP_TYPE_MAGNIFY_TOOL,
|
|
GIMP_TYPE_MAGNIFY_OPTIONS,
|
|
gimp_magnify_options_gui,
|
|
FALSE,
|
|
"gimp-magnify-tool",
|
|
_("Magnify"),
|
|
_("Zoom in & out"),
|
|
N_("/Tools/Magnify"), NULL,
|
|
NULL, "tools/magnify.html",
|
|
GIMP_STOCK_TOOL_ZOOM,
|
|
data);
|
|
}
|
|
|
|
GType
|
|
gimp_magnify_tool_get_type (void)
|
|
{
|
|
static GType tool_type = 0;
|
|
|
|
if (! tool_type)
|
|
{
|
|
static const GTypeInfo tool_info =
|
|
{
|
|
sizeof (GimpMagnifyToolClass),
|
|
(GBaseInitFunc) NULL,
|
|
(GBaseFinalizeFunc) NULL,
|
|
(GClassInitFunc) gimp_magnify_tool_class_init,
|
|
NULL, /* class_finalize */
|
|
NULL, /* class_data */
|
|
sizeof (GimpMagnifyTool),
|
|
0, /* n_preallocs */
|
|
(GInstanceInitFunc) gimp_magnify_tool_init,
|
|
};
|
|
|
|
tool_type = g_type_register_static (GIMP_TYPE_DRAW_TOOL,
|
|
"GimpMagnifyTool",
|
|
&tool_info, 0);
|
|
}
|
|
|
|
return tool_type;
|
|
}
|
|
|
|
|
|
/* private functions */
|
|
|
|
static void
|
|
gimp_magnify_tool_class_init (GimpMagnifyToolClass *klass)
|
|
{
|
|
GimpToolClass *tool_class;
|
|
GimpDrawToolClass *draw_tool_class;
|
|
|
|
tool_class = GIMP_TOOL_CLASS (klass);
|
|
draw_tool_class = GIMP_DRAW_TOOL_CLASS (klass);
|
|
|
|
parent_class = g_type_class_peek_parent (klass);
|
|
|
|
tool_class->button_press = gimp_magnify_tool_button_press;
|
|
tool_class->button_release = gimp_magnify_tool_button_release;
|
|
tool_class->motion = gimp_magnify_tool_motion;
|
|
tool_class->modifier_key = gimp_magnify_tool_modifier_key;
|
|
tool_class->cursor_update = gimp_magnify_tool_cursor_update;
|
|
|
|
draw_tool_class->draw = gimp_magnify_tool_draw;
|
|
}
|
|
|
|
static void
|
|
gimp_magnify_tool_init (GimpMagnifyTool *magnify_tool)
|
|
{
|
|
GimpTool *tool;
|
|
|
|
tool = GIMP_TOOL (magnify_tool);
|
|
|
|
magnify_tool->x = 0;
|
|
magnify_tool->y = 0;
|
|
magnify_tool->w = 0;
|
|
magnify_tool->h = 0;
|
|
|
|
gimp_tool_control_set_scroll_lock (tool->control, TRUE);
|
|
gimp_tool_control_set_snap_to (tool->control, FALSE);
|
|
|
|
gimp_tool_control_set_cursor (tool->control,
|
|
GIMP_ZOOM_CURSOR);
|
|
gimp_tool_control_set_tool_cursor (tool->control,
|
|
GIMP_ZOOM_TOOL_CURSOR);
|
|
gimp_tool_control_set_cursor_modifier (tool->control,
|
|
GIMP_CURSOR_MODIFIER_PLUS);
|
|
|
|
gimp_tool_control_set_toggle_cursor (tool->control,
|
|
GIMP_ZOOM_CURSOR);
|
|
gimp_tool_control_set_toggle_tool_cursor (tool->control,
|
|
GIMP_ZOOM_TOOL_CURSOR);
|
|
gimp_tool_control_set_toggle_cursor_modifier (tool->control,
|
|
GIMP_CURSOR_MODIFIER_MINUS);
|
|
}
|
|
|
|
static void
|
|
gimp_magnify_tool_button_press (GimpTool *tool,
|
|
GimpCoords *coords,
|
|
guint32 time,
|
|
GdkModifierType state,
|
|
GimpDisplay *gdisp)
|
|
{
|
|
GimpMagnifyTool *magnify;
|
|
|
|
magnify = GIMP_MAGNIFY_TOOL (tool);
|
|
|
|
magnify->x = coords->x;
|
|
magnify->y = coords->y;
|
|
magnify->w = 0;
|
|
magnify->h = 0;
|
|
|
|
gimp_tool_control_activate (tool->control);
|
|
tool->gdisp = gdisp;
|
|
|
|
gimp_draw_tool_start (GIMP_DRAW_TOOL (tool), gdisp);
|
|
}
|
|
|
|
static void
|
|
gimp_magnify_tool_button_release (GimpTool *tool,
|
|
GimpCoords *coords,
|
|
guint32 time,
|
|
GdkModifierType state,
|
|
GimpDisplay *gdisp)
|
|
{
|
|
GimpMagnifyTool *magnify;
|
|
GimpMagnifyOptions *options;
|
|
GimpDisplayShell *shell;
|
|
gint win_width, win_height;
|
|
gint width, height;
|
|
gint scalesrc, scaledest;
|
|
gint scale;
|
|
gint x1, y1, x2, y2, w, h;
|
|
|
|
magnify = GIMP_MAGNIFY_TOOL (tool);
|
|
options = GIMP_MAGNIFY_OPTIONS (tool->tool_info->tool_options);
|
|
|
|
shell = GIMP_DISPLAY_SHELL (tool->gdisp->shell);
|
|
|
|
gimp_draw_tool_stop (GIMP_DRAW_TOOL (tool));
|
|
|
|
gimp_tool_control_halt (tool->control);
|
|
|
|
/* First take care of the case where the user "cancels" the action */
|
|
if (! (state & GDK_BUTTON3_MASK))
|
|
{
|
|
x1 = (magnify->w < 0) ? magnify->x + magnify->w : magnify->x;
|
|
y1 = (magnify->h < 0) ? magnify->y + magnify->h : magnify->y;
|
|
w = (magnify->w < 0) ? -magnify->w : magnify->w;
|
|
h = (magnify->h < 0) ? -magnify->h : magnify->h;
|
|
x2 = x1 + w;
|
|
y2 = y1 + h;
|
|
|
|
/* these change the user zoom level, so should not be changed to
|
|
* the resolution-aware scale macros -- austin
|
|
*/
|
|
scalesrc = SCALESRC (shell);
|
|
scaledest = SCALEDEST (shell);
|
|
|
|
win_width = shell->disp_width;
|
|
win_height = shell->disp_height;
|
|
width = (win_width * scalesrc) / scaledest;
|
|
height = (win_height * scalesrc) / scaledest;
|
|
|
|
/* we need to compute the mouse movement in screen coordinates */
|
|
if ( (SCALEX (shell, w) < options->threshold) ||
|
|
(SCALEY (shell, h) < options->threshold) )
|
|
scale = 1;
|
|
else
|
|
scale = MIN ((width / w), (height / h));
|
|
|
|
magnify->op = options->zoom_type;
|
|
|
|
switch (magnify->op)
|
|
{
|
|
case GIMP_ZOOM_IN:
|
|
zoom_in (&scalesrc, &scaledest, scale);
|
|
break;
|
|
case GIMP_ZOOM_OUT:
|
|
zoom_out (&scalesrc, &scaledest, scale);
|
|
break;
|
|
}
|
|
|
|
gimp_display_shell_scale_by_values (shell,
|
|
(scaledest << 8) + scalesrc,
|
|
((scaledest * ((x1 + x2) / 2)) / scalesrc -
|
|
(win_width / 2)),
|
|
((scaledest * ((y1 + y2) / 2)) / scalesrc -
|
|
(win_height / 2)),
|
|
options->allow_resize);
|
|
}
|
|
}
|
|
|
|
static void
|
|
gimp_magnify_tool_motion (GimpTool *tool,
|
|
GimpCoords *coords,
|
|
guint32 time,
|
|
GdkModifierType state,
|
|
GimpDisplay *gdisp)
|
|
{
|
|
GimpMagnifyTool *magnify;
|
|
|
|
if (!gimp_tool_control_is_active (tool->control))
|
|
return;
|
|
|
|
magnify = GIMP_MAGNIFY_TOOL (tool);
|
|
|
|
gimp_draw_tool_pause (GIMP_DRAW_TOOL (tool));
|
|
|
|
magnify->w = (coords->x - magnify->x);
|
|
magnify->h = (coords->y - magnify->y);
|
|
|
|
gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
|
|
}
|
|
|
|
static void
|
|
gimp_magnify_tool_modifier_key (GimpTool *tool,
|
|
GdkModifierType key,
|
|
gboolean press,
|
|
GdkModifierType state,
|
|
GimpDisplay *gdisp)
|
|
{
|
|
GimpMagnifyOptions *options;
|
|
|
|
options = GIMP_MAGNIFY_OPTIONS (tool->tool_info->tool_options);
|
|
|
|
if (key == GDK_CONTROL_MASK)
|
|
{
|
|
switch (options->zoom_type)
|
|
{
|
|
case GIMP_ZOOM_IN:
|
|
g_object_set (G_OBJECT (options),
|
|
"zoom-type", GIMP_ZOOM_OUT,
|
|
NULL);
|
|
break;
|
|
|
|
case GIMP_ZOOM_OUT:
|
|
g_object_set (G_OBJECT (options),
|
|
"zoom-type", GIMP_ZOOM_IN,
|
|
NULL);
|
|
break;
|
|
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
static void
|
|
gimp_magnify_tool_cursor_update (GimpTool *tool,
|
|
GimpCoords *coords,
|
|
GdkModifierType state,
|
|
GimpDisplay *gdisp)
|
|
{
|
|
GimpMagnifyOptions *options;
|
|
|
|
options = GIMP_MAGNIFY_OPTIONS (tool->tool_info->tool_options);
|
|
|
|
gimp_tool_control_set_toggle (tool->control,
|
|
options->zoom_type == GIMP_ZOOM_OUT);
|
|
|
|
GIMP_TOOL_CLASS (parent_class)->cursor_update (tool, coords, state, gdisp);
|
|
}
|
|
|
|
static void
|
|
gimp_magnify_tool_draw (GimpDrawTool *draw_tool)
|
|
{
|
|
GimpMagnifyTool *magnify;
|
|
GimpMagnifyOptions *options;
|
|
|
|
magnify = GIMP_MAGNIFY_TOOL (draw_tool);
|
|
options = GIMP_MAGNIFY_OPTIONS (GIMP_TOOL (draw_tool)->tool_info->tool_options);
|
|
|
|
gimp_draw_tool_draw_rectangle (draw_tool,
|
|
FALSE,
|
|
magnify->x,
|
|
magnify->y,
|
|
magnify->w,
|
|
magnify->h,
|
|
FALSE);
|
|
}
|
|
|
|
|
|
/* magnify utility functions */
|
|
|
|
static void
|
|
zoom_in (gint *src,
|
|
gint *dest,
|
|
gint scale)
|
|
{
|
|
while (scale--)
|
|
{
|
|
if (*src > 1)
|
|
(*src)--;
|
|
else
|
|
if (*dest < 0x10)
|
|
(*dest)++;
|
|
}
|
|
}
|
|
|
|
|
|
static void
|
|
zoom_out (gint *src,
|
|
gint *dest,
|
|
gint scale)
|
|
{
|
|
while (scale--)
|
|
{
|
|
if (*dest > 1)
|
|
(*dest)--;
|
|
else
|
|
if (*src < 0x10)
|
|
(*src)++;
|
|
}
|
|
}
|