2006-12-10 05:33:38 +08:00
|
|
|
/* GIMP - The GNU Image Manipulation Program
|
1997-11-25 06:05:25 +08:00
|
|
|
* 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
|
1998-04-13 13:44:11 +08:00
|
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
1997-11-25 06:05:25 +08:00
|
|
|
*/
|
2000-12-17 05:37:03 +08:00
|
|
|
|
app/appenv.h New file. Includes <math.h>. Move G_PI, RINT(), ROUND() etc
1999-09-01 Tor Lillqvist <tml@iki.fi>
* app/appenv.h
* libgimp/gimpmath.h: New file. Includes <math.h>. Move G_PI,
RINT(), ROUND() etc from app/appenv.h here, so plug-ins can
use them, too. Remove some commented-out old stuff in appenv.h.
* libgimp/gimp.h: Include gimpmath.h.
* libgimp/gimp.c (gimp_main): Win32: Don't install signal
handlers, we can't do anything useful in the handler ourselves
anyway (it would be nice to print out a backtrace, but that seems
pretty hard to do, even if not impossible). Let Windows inform the
user about the crash. If the plug-in was compiled with MSVC, and
the user also has it, she is offered a chance to start the
debugger automatically anyway.
* app/*several*.c: Include gimpmath.h for G_PI etc. Don't include
<math.h>, as gimpmath.h includes it.
* plug-ins/*/*many*.c: Include config.h. Don't include <math.h>.
Remove all the duplicated definitions of G_PI and rint(). Use
RINT() instead of rint().
* app/app_procs.[ch]: app_exit() takes a gboolean.
* app/batch.c
* app/commands.c
* app/interface.c: Call app_exit() with FALSE or TRUE.
* app/main.c (on_error): Call gimp_fatal_error. (main): Don't
install any signal handler on Win32 here, either.
* app/errors.c (gimp_fatal_error, gimp_terminate): Win32: Format
the message and call MessageBox with it. g_on_error_query doesn't
do anything useful on Win32, and printf'ing a message to stdout or
stderr doesn't do anything, either, in a windowing application.
1999-09-02 04:30:56 +08:00
|
|
|
#include "config.h"
|
|
|
|
|
1999-09-02 09:41:18 +08:00
|
|
|
#include <stdlib.h>
|
|
|
|
|
2008-10-10 04:24:04 +08:00
|
|
|
#include <gegl.h>
|
2000-12-17 05:37:03 +08:00
|
|
|
#include <gtk/gtk.h>
|
|
|
|
|
2001-01-25 06:36:18 +08:00
|
|
|
#include "libgimpwidgets/gimpwidgets.h"
|
2001-01-24 07:56:18 +08:00
|
|
|
|
2002-05-03 20:45:22 +08:00
|
|
|
#include "tools-types.h"
|
2000-12-17 05:37:03 +08:00
|
|
|
|
2001-05-09 10:32:03 +08:00
|
|
|
#include "core/gimpdrawable.h"
|
2001-11-10 00:54:56 +08:00
|
|
|
#include "core/gimpdrawable-blend.h"
|
2001-05-09 10:32:03 +08:00
|
|
|
#include "core/gimpgradient.h"
|
|
|
|
#include "core/gimpimage.h"
|
2004-08-11 02:47:21 +08:00
|
|
|
#include "core/gimpprogress.h"
|
2001-05-09 10:32:03 +08:00
|
|
|
|
2003-08-22 09:42:57 +08:00
|
|
|
#include "widgets/gimphelp-ids.h"
|
2007-01-21 09:24:51 +08:00
|
|
|
#include "widgets/gimpwidgets-utils.h"
|
2003-08-22 09:42:57 +08:00
|
|
|
|
2001-09-26 07:23:09 +08:00
|
|
|
#include "display/gimpdisplay.h"
|
|
|
|
|
2003-02-05 22:39:40 +08:00
|
|
|
#include "gimpblendoptions.h"
|
2001-03-12 04:01:14 +08:00
|
|
|
#include "gimpblendtool.h"
|
2003-04-16 00:05:52 +08:00
|
|
|
#include "gimptoolcontrol.h"
|
2004-08-23 05:48:50 +08:00
|
|
|
#include "tools-utils.h"
|
2001-03-12 04:01:14 +08:00
|
|
|
|
2003-03-26 00:38:19 +08:00
|
|
|
#include "gimp-intl.h"
|
2000-04-28 01:27:28 +08:00
|
|
|
|
1998-07-08 14:41:58 +08:00
|
|
|
|
2008-01-15 05:23:02 +08:00
|
|
|
#define TARGET_SIZE 15
|
1998-07-27 05:49:42 +08:00
|
|
|
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2001-03-12 04:01:14 +08:00
|
|
|
/* local function prototypes */
|
1999-04-09 06:25:54 +08:00
|
|
|
|
2007-02-28 02:55:12 +08:00
|
|
|
static gboolean gimp_blend_tool_initialize (GimpTool *tool,
|
|
|
|
GimpDisplay *display,
|
|
|
|
GError **error);
|
|
|
|
static void gimp_blend_tool_button_press (GimpTool *tool,
|
2008-11-01 23:17:36 +08:00
|
|
|
const GimpCoords *coords,
|
2007-02-28 02:55:12 +08:00
|
|
|
guint32 time,
|
|
|
|
GdkModifierType state,
|
|
|
|
GimpDisplay *display);
|
|
|
|
static void gimp_blend_tool_button_release (GimpTool *tool,
|
2008-11-01 23:17:36 +08:00
|
|
|
const GimpCoords *coords,
|
2007-02-28 02:55:12 +08:00
|
|
|
guint32 time,
|
|
|
|
GdkModifierType state,
|
|
|
|
GimpButtonReleaseType release_type,
|
|
|
|
GimpDisplay *display);
|
|
|
|
static void gimp_blend_tool_motion (GimpTool *tool,
|
2008-11-01 23:17:36 +08:00
|
|
|
const GimpCoords *coords,
|
2007-02-28 02:55:12 +08:00
|
|
|
guint32 time,
|
|
|
|
GdkModifierType state,
|
|
|
|
GimpDisplay *display);
|
|
|
|
static void gimp_blend_tool_active_modifier_key (GimpTool *tool,
|
|
|
|
GdkModifierType key,
|
|
|
|
gboolean press,
|
|
|
|
GdkModifierType state,
|
|
|
|
GimpDisplay *display);
|
|
|
|
static void gimp_blend_tool_cursor_update (GimpTool *tool,
|
2008-11-01 23:17:36 +08:00
|
|
|
const GimpCoords *coords,
|
2007-02-28 02:55:12 +08:00
|
|
|
GdkModifierType state,
|
|
|
|
GimpDisplay *display);
|
|
|
|
|
|
|
|
static void gimp_blend_tool_draw (GimpDrawTool *draw_tool);
|
|
|
|
|
|
|
|
static void gimp_blend_tool_push_status (GimpBlendTool *blend_tool,
|
|
|
|
GdkModifierType state,
|
|
|
|
GimpDisplay *display);
|
2006-09-13 18:06:49 +08:00
|
|
|
|
2005-12-13 17:13:50 +08:00
|
|
|
|
2006-05-15 17:46:31 +08:00
|
|
|
G_DEFINE_TYPE (GimpBlendTool, gimp_blend_tool, GIMP_TYPE_DRAW_TOOL)
|
2005-12-13 17:13:50 +08:00
|
|
|
|
|
|
|
#define parent_class gimp_blend_tool_parent_class
|
1999-04-09 06:25:54 +08:00
|
|
|
|
2001-11-10 00:54:56 +08:00
|
|
|
|
2001-03-12 04:01:14 +08:00
|
|
|
void
|
2002-03-29 11:50:29 +08:00
|
|
|
gimp_blend_tool_register (GimpToolRegisterCallback callback,
|
2002-05-03 19:31:08 +08:00
|
|
|
gpointer data)
|
2001-03-12 04:01:14 +08:00
|
|
|
{
|
2002-03-29 11:50:29 +08:00
|
|
|
(* callback) (GIMP_TYPE_BLEND_TOOL,
|
2003-02-05 22:39:40 +08:00
|
|
|
GIMP_TYPE_BLEND_OPTIONS,
|
|
|
|
gimp_blend_options_gui,
|
2004-05-04 19:26:22 +08:00
|
|
|
GIMP_CONTEXT_FOREGROUND_MASK |
|
|
|
|
GIMP_CONTEXT_BACKGROUND_MASK |
|
2003-06-28 19:20:37 +08:00
|
|
|
GIMP_CONTEXT_OPACITY_MASK |
|
|
|
|
GIMP_CONTEXT_PAINT_MODE_MASK |
|
|
|
|
GIMP_CONTEXT_GRADIENT_MASK,
|
2002-03-21 20:17:17 +08:00
|
|
|
"gimp-blend-tool",
|
2001-11-21 07:00:47 +08:00
|
|
|
_("Blend"),
|
2006-09-19 02:00:22 +08:00
|
|
|
_("Blend Tool: Fill selected area with a color gradient"),
|
2004-04-29 21:19:28 +08:00
|
|
|
N_("Blen_d"), "L",
|
2003-08-22 09:42:57 +08:00
|
|
|
NULL, GIMP_HELP_TOOL_BLEND,
|
2002-03-29 11:50:29 +08:00
|
|
|
GIMP_STOCK_TOOL_BLEND,
|
2002-05-03 19:31:08 +08:00
|
|
|
data);
|
1999-04-09 06:25:54 +08:00
|
|
|
}
|
|
|
|
|
2001-03-12 04:01:14 +08:00
|
|
|
static void
|
|
|
|
gimp_blend_tool_class_init (GimpBlendToolClass *klass)
|
|
|
|
{
|
2005-03-04 19:42:46 +08:00
|
|
|
GimpToolClass *tool_class = GIMP_TOOL_CLASS (klass);
|
|
|
|
GimpDrawToolClass *draw_tool_class = GIMP_DRAW_TOOL_CLASS (klass);
|
2000-02-14 06:26:41 +08:00
|
|
|
|
2006-09-27 04:55:40 +08:00
|
|
|
tool_class->initialize = gimp_blend_tool_initialize;
|
2006-09-13 03:36:05 +08:00
|
|
|
tool_class->button_press = gimp_blend_tool_button_press;
|
|
|
|
tool_class->button_release = gimp_blend_tool_button_release;
|
|
|
|
tool_class->motion = gimp_blend_tool_motion;
|
|
|
|
tool_class->active_modifier_key = gimp_blend_tool_active_modifier_key;
|
|
|
|
tool_class->cursor_update = gimp_blend_tool_cursor_update;
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2006-09-13 03:36:05 +08:00
|
|
|
draw_tool_class->draw = gimp_blend_tool_draw;
|
2001-03-12 04:01:14 +08:00
|
|
|
}
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2001-03-12 04:01:14 +08:00
|
|
|
static void
|
|
|
|
gimp_blend_tool_init (GimpBlendTool *blend_tool)
|
|
|
|
{
|
2005-03-04 19:42:46 +08:00
|
|
|
GimpTool *tool = GIMP_TOOL (blend_tool);
|
2002-02-05 01:43:01 +08:00
|
|
|
|
2005-03-05 03:05:40 +08:00
|
|
|
gimp_tool_control_set_scroll_lock (tool->control, TRUE);
|
2006-06-02 04:30:52 +08:00
|
|
|
gimp_tool_control_set_cursor (tool->control,
|
|
|
|
GIMP_CURSOR_MOUSE);
|
2005-03-05 03:05:40 +08:00
|
|
|
gimp_tool_control_set_tool_cursor (tool->control,
|
|
|
|
GIMP_TOOL_CURSOR_BLEND);
|
|
|
|
gimp_tool_control_set_action_value_1 (tool->control,
|
|
|
|
"context/context-opacity-set");
|
|
|
|
gimp_tool_control_set_action_object_1 (tool->control,
|
|
|
|
"context/context-gradient-select-set");
|
2001-03-12 04:01:14 +08:00
|
|
|
}
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2006-09-27 04:55:40 +08:00
|
|
|
static gboolean
|
|
|
|
gimp_blend_tool_initialize (GimpTool *tool,
|
|
|
|
GimpDisplay *display,
|
|
|
|
GError **error)
|
|
|
|
{
|
2007-07-19 22:59:51 +08:00
|
|
|
GimpDrawable *drawable = gimp_image_get_active_drawable (display->image);
|
2006-09-27 04:55:40 +08:00
|
|
|
|
|
|
|
if (! GIMP_TOOL_CLASS (parent_class)->initialize (tool, display, error))
|
|
|
|
{
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (gimp_drawable_is_indexed (drawable))
|
|
|
|
{
|
2008-11-04 20:33:09 +08:00
|
|
|
g_set_error_literal (error, 0, 0,
|
|
|
|
_("Blend does not operate on indexed layers."));
|
2006-09-27 04:55:40 +08:00
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
1997-11-25 06:05:25 +08:00
|
|
|
static void
|
2008-11-01 23:17:36 +08:00
|
|
|
gimp_blend_tool_button_press (GimpTool *tool,
|
|
|
|
const GimpCoords *coords,
|
|
|
|
guint32 time,
|
|
|
|
GdkModifierType state,
|
|
|
|
GimpDisplay *display)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
2005-03-04 19:42:46 +08:00
|
|
|
GimpBlendTool *blend_tool = GIMP_BLEND_TOOL (tool);
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2007-03-09 02:07:38 +08:00
|
|
|
blend_tool->start_x = blend_tool->end_x = coords->x;
|
|
|
|
blend_tool->start_y = blend_tool->end_y = coords->y;
|
2003-02-04 07:54:19 +08:00
|
|
|
|
2007-03-09 02:07:38 +08:00
|
|
|
blend_tool->last_x = blend_tool->mouse_x = coords->x;
|
|
|
|
blend_tool->last_y = blend_tool->mouse_y = coords->y;
|
2001-11-10 00:54:56 +08:00
|
|
|
|
2006-03-29 01:55:52 +08:00
|
|
|
tool->display = display;
|
2002-03-29 11:50:29 +08:00
|
|
|
|
2002-05-03 19:31:08 +08:00
|
|
|
gimp_tool_control_activate (tool->control);
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2007-01-21 09:24:51 +08:00
|
|
|
gimp_blend_tool_push_status (blend_tool, state, display);
|
1998-07-27 05:49:42 +08:00
|
|
|
|
2006-03-29 01:55:52 +08:00
|
|
|
gimp_draw_tool_start (GIMP_DRAW_TOOL (tool), display);
|
1997-11-25 06:05:25 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2007-02-28 02:55:12 +08:00
|
|
|
gimp_blend_tool_button_release (GimpTool *tool,
|
2008-11-01 23:17:36 +08:00
|
|
|
const GimpCoords *coords,
|
2007-02-28 02:55:12 +08:00
|
|
|
guint32 time,
|
|
|
|
GdkModifierType state,
|
|
|
|
GimpButtonReleaseType release_type,
|
|
|
|
GimpDisplay *display)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
2006-09-06 02:25:31 +08:00
|
|
|
GimpBlendTool *blend_tool = GIMP_BLEND_TOOL (tool);
|
|
|
|
GimpBlendOptions *options = GIMP_BLEND_TOOL_GET_OPTIONS (tool);
|
|
|
|
GimpPaintOptions *paint_options = GIMP_PAINT_OPTIONS (options);
|
|
|
|
GimpContext *context = GIMP_CONTEXT (options);
|
|
|
|
GimpImage *image = display->image;
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2006-03-29 01:55:52 +08:00
|
|
|
gimp_tool_pop_status (tool, display);
|
1998-07-27 05:49:42 +08:00
|
|
|
|
2001-03-12 04:01:14 +08:00
|
|
|
gimp_draw_tool_stop (GIMP_DRAW_TOOL (tool));
|
|
|
|
|
2003-01-03 21:59:23 +08:00
|
|
|
gimp_tool_control_halt (tool->control);
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2007-02-28 02:55:12 +08:00
|
|
|
if ((release_type != GIMP_BUTTON_RELEASE_CANCEL) &&
|
2007-03-09 02:07:38 +08:00
|
|
|
((blend_tool->start_x != blend_tool->end_x) ||
|
|
|
|
(blend_tool->start_y != blend_tool->end_y)))
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
2007-07-19 22:59:51 +08:00
|
|
|
GimpDrawable *drawable = gimp_image_get_active_drawable (image);
|
2004-08-11 02:47:21 +08:00
|
|
|
GimpProgress *progress;
|
2007-03-22 00:06:11 +08:00
|
|
|
gint off_x;
|
|
|
|
gint off_y;
|
2004-08-11 02:47:21 +08:00
|
|
|
|
2006-03-29 01:55:52 +08:00
|
|
|
progress = gimp_progress_start (GIMP_PROGRESS (display),
|
2005-10-01 01:50:50 +08:00
|
|
|
_("Blending"), FALSE);
|
Bit of a large checkin this - it's basically three things: 1 - GimpModules
Sun Jan 11 00:24:21 GMT 1999 Austin Donnelly <austin@greenend.org.uk>
Bit of a large checkin this - it's basically three things:
1 - GimpModules using gmodules to dynamically load and
initialise modules at gimp start of day.
2 - Color selectors now register themselves with a color
notebook.
3 - progress bars have been cleaned up a bit, so now have
progress indictations on all transform tool and gradient
fill operations. Not done bucket fill, but that seems to
be the next candidate.
New directories:
* modules/: new directory for dynamically loadable modules.
New files:
* modules/.cvsignore
* modules/Makefile.am
* modules/colorsel_gtk.c: GTK color selector wrapped up as a
color selector the gimp can use.
* app/gimpprogress.[ch]: progress bars within gimp core, either as
popups, or in the status bar. This is mainly code moved out
of plug-in.c
* app/color_notebook.[ch]: color selector notebook, implementing
very similar interface to color_select.h so it can be used as
a drop-in replacement for it.
* libgimp/color_selector.h: API color selectors need to implement
to become a page in the color_notebook.
* libgimp/gimpmodule.h: API gimp modules need to implement to be
initialised by gimp at start of day.
Modified files:
* Makefile.am: add modules/ to SUBDIRS
* libgimp/Makefile.am: install gimpmodule.h and color_selector.h
* app/gimprc.[ch]: recognise module-path variable.
* gimprc.in: set module-path variable to something sensible
(currently "${gimp_dir}/modules:${gimp_plugin_dir}/modules").
* app/Makefile.am: build color notebook and gimpprogress
* app/app_procs.c: register internal GIMP color selector with
color notebook.
* app/asupsample.c: call progress function less frequently for
better performance.
* app/asupsample.h: progress_func_t typedef moved to gimpprogress.h
* app/blend.c: make callbacks to a progress function
* app/color_area.c: use a color notebook rather than a color selector
* app/color_panel.c: ditto
* app/color_select.c: export color selector interface for notebook
* app/color_select.h: color_select_init() prototype
* app/flip_tool.c: flip the image every time, rather than every
second click.
* app/interface.c: move progress bar stuff out to
gimpprogress.c. Make the code actually work while we're at it.
* app/interface.h: move prototypes for progress functions out to
gimpprogress.h
* app/plug_in.c: load and initialise modules (if possible). Move
progress bar handling code out to gimpprogress.c
* app/plug_in.h: keep only a gimp_progress * for each plugin, not
a whole bunch of GtkWidgets.
* app/scale_tool.c
* app/rotate_tool.c
* app/shear_tool.c
* app/perspective_tool.c: progress bar during operation.
De-sensitise the dialog to discourage the user from running
two transforms in parallel.
* app/transform_core.c: recalculate grid coords when bounding box
changes. Only initialise the action area of the dialog once,
to avoid multiple "ok" / "reset" buttons appearing. Undraw
transform tool with correct matrix to get rid of handle
remains on screen. Call a progress function as we apply the
transform matrix. A few new i18n markups. Invalidate
floating selection marching ants after applying matrix.
* app/transform_core.h: transform_core_do() takes an optional
progress callback argument (and data).
* plug-ins/oilify/oilify.c: send progress bar updates after every
pixel region, not only if they processed a multiple of 5
pixels (which was quite unlikely, and therefore gave a jerky
progress indication).
1999-01-11 08:57:33 +08:00
|
|
|
|
2008-11-03 07:03:29 +08:00
|
|
|
gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
|
2007-03-09 02:07:38 +08:00
|
|
|
|
2007-07-19 22:59:51 +08:00
|
|
|
gimp_drawable_blend (drawable,
|
2004-04-15 07:37:34 +08:00
|
|
|
context,
|
2002-06-12 21:48:47 +08:00
|
|
|
GIMP_CUSTOM_MODE,
|
2003-02-06 00:59:04 +08:00
|
|
|
gimp_context_get_paint_mode (context),
|
2001-11-20 21:53:21 +08:00
|
|
|
options->gradient_type,
|
2003-02-06 00:59:04 +08:00
|
|
|
gimp_context_get_opacity (context),
|
2001-11-20 21:53:21 +08:00
|
|
|
options->offset,
|
2003-07-22 22:24:11 +08:00
|
|
|
paint_options->gradient_options->gradient_repeat,
|
|
|
|
paint_options->gradient_options->gradient_reverse,
|
2001-11-20 21:53:21 +08:00
|
|
|
options->supersample,
|
2003-02-08 01:12:21 +08:00
|
|
|
options->supersample_depth,
|
|
|
|
options->supersample_threshold,
|
2003-07-21 09:13:35 +08:00
|
|
|
options->dither,
|
2007-03-09 02:07:38 +08:00
|
|
|
blend_tool->start_x - off_x,
|
|
|
|
blend_tool->start_y - off_y,
|
2007-03-22 00:06:11 +08:00
|
|
|
blend_tool->end_x - off_x,
|
2007-03-09 02:07:38 +08:00
|
|
|
blend_tool->end_y - off_y,
|
2001-11-10 00:54:56 +08:00
|
|
|
progress);
|
Bit of a large checkin this - it's basically three things: 1 - GimpModules
Sun Jan 11 00:24:21 GMT 1999 Austin Donnelly <austin@greenend.org.uk>
Bit of a large checkin this - it's basically three things:
1 - GimpModules using gmodules to dynamically load and
initialise modules at gimp start of day.
2 - Color selectors now register themselves with a color
notebook.
3 - progress bars have been cleaned up a bit, so now have
progress indictations on all transform tool and gradient
fill operations. Not done bucket fill, but that seems to
be the next candidate.
New directories:
* modules/: new directory for dynamically loadable modules.
New files:
* modules/.cvsignore
* modules/Makefile.am
* modules/colorsel_gtk.c: GTK color selector wrapped up as a
color selector the gimp can use.
* app/gimpprogress.[ch]: progress bars within gimp core, either as
popups, or in the status bar. This is mainly code moved out
of plug-in.c
* app/color_notebook.[ch]: color selector notebook, implementing
very similar interface to color_select.h so it can be used as
a drop-in replacement for it.
* libgimp/color_selector.h: API color selectors need to implement
to become a page in the color_notebook.
* libgimp/gimpmodule.h: API gimp modules need to implement to be
initialised by gimp at start of day.
Modified files:
* Makefile.am: add modules/ to SUBDIRS
* libgimp/Makefile.am: install gimpmodule.h and color_selector.h
* app/gimprc.[ch]: recognise module-path variable.
* gimprc.in: set module-path variable to something sensible
(currently "${gimp_dir}/modules:${gimp_plugin_dir}/modules").
* app/Makefile.am: build color notebook and gimpprogress
* app/app_procs.c: register internal GIMP color selector with
color notebook.
* app/asupsample.c: call progress function less frequently for
better performance.
* app/asupsample.h: progress_func_t typedef moved to gimpprogress.h
* app/blend.c: make callbacks to a progress function
* app/color_area.c: use a color notebook rather than a color selector
* app/color_panel.c: ditto
* app/color_select.c: export color selector interface for notebook
* app/color_select.h: color_select_init() prototype
* app/flip_tool.c: flip the image every time, rather than every
second click.
* app/interface.c: move progress bar stuff out to
gimpprogress.c. Make the code actually work while we're at it.
* app/interface.h: move prototypes for progress functions out to
gimpprogress.h
* app/plug_in.c: load and initialise modules (if possible). Move
progress bar handling code out to gimpprogress.c
* app/plug_in.h: keep only a gimp_progress * for each plugin, not
a whole bunch of GtkWidgets.
* app/scale_tool.c
* app/rotate_tool.c
* app/shear_tool.c
* app/perspective_tool.c: progress bar during operation.
De-sensitise the dialog to discourage the user from running
two transforms in parallel.
* app/transform_core.c: recalculate grid coords when bounding box
changes. Only initialise the action area of the dialog once,
to avoid multiple "ok" / "reset" buttons appearing. Undraw
transform tool with correct matrix to get rid of handle
remains on screen. Call a progress function as we apply the
transform matrix. A few new i18n markups. Invalidate
floating selection marching ants after applying matrix.
* app/transform_core.h: transform_core_do() takes an optional
progress callback argument (and data).
* plug-ins/oilify/oilify.c: send progress bar updates after every
pixel region, not only if they processed a multiple of 5
pixels (which was quite unlikely, and therefore gave a jerky
progress indication).
1999-01-11 08:57:33 +08:00
|
|
|
|
|
|
|
if (progress)
|
2004-08-11 02:47:21 +08:00
|
|
|
gimp_progress_end (progress);
|
Bit of a large checkin this - it's basically three things: 1 - GimpModules
Sun Jan 11 00:24:21 GMT 1999 Austin Donnelly <austin@greenend.org.uk>
Bit of a large checkin this - it's basically three things:
1 - GimpModules using gmodules to dynamically load and
initialise modules at gimp start of day.
2 - Color selectors now register themselves with a color
notebook.
3 - progress bars have been cleaned up a bit, so now have
progress indictations on all transform tool and gradient
fill operations. Not done bucket fill, but that seems to
be the next candidate.
New directories:
* modules/: new directory for dynamically loadable modules.
New files:
* modules/.cvsignore
* modules/Makefile.am
* modules/colorsel_gtk.c: GTK color selector wrapped up as a
color selector the gimp can use.
* app/gimpprogress.[ch]: progress bars within gimp core, either as
popups, or in the status bar. This is mainly code moved out
of plug-in.c
* app/color_notebook.[ch]: color selector notebook, implementing
very similar interface to color_select.h so it can be used as
a drop-in replacement for it.
* libgimp/color_selector.h: API color selectors need to implement
to become a page in the color_notebook.
* libgimp/gimpmodule.h: API gimp modules need to implement to be
initialised by gimp at start of day.
Modified files:
* Makefile.am: add modules/ to SUBDIRS
* libgimp/Makefile.am: install gimpmodule.h and color_selector.h
* app/gimprc.[ch]: recognise module-path variable.
* gimprc.in: set module-path variable to something sensible
(currently "${gimp_dir}/modules:${gimp_plugin_dir}/modules").
* app/Makefile.am: build color notebook and gimpprogress
* app/app_procs.c: register internal GIMP color selector with
color notebook.
* app/asupsample.c: call progress function less frequently for
better performance.
* app/asupsample.h: progress_func_t typedef moved to gimpprogress.h
* app/blend.c: make callbacks to a progress function
* app/color_area.c: use a color notebook rather than a color selector
* app/color_panel.c: ditto
* app/color_select.c: export color selector interface for notebook
* app/color_select.h: color_select_init() prototype
* app/flip_tool.c: flip the image every time, rather than every
second click.
* app/interface.c: move progress bar stuff out to
gimpprogress.c. Make the code actually work while we're at it.
* app/interface.h: move prototypes for progress functions out to
gimpprogress.h
* app/plug_in.c: load and initialise modules (if possible). Move
progress bar handling code out to gimpprogress.c
* app/plug_in.h: keep only a gimp_progress * for each plugin, not
a whole bunch of GtkWidgets.
* app/scale_tool.c
* app/rotate_tool.c
* app/shear_tool.c
* app/perspective_tool.c: progress bar during operation.
De-sensitise the dialog to discourage the user from running
two transforms in parallel.
* app/transform_core.c: recalculate grid coords when bounding box
changes. Only initialise the action area of the dialog once,
to avoid multiple "ok" / "reset" buttons appearing. Undraw
transform tool with correct matrix to get rid of handle
remains on screen. Call a progress function as we apply the
transform matrix. A few new i18n markups. Invalidate
floating selection marching ants after applying matrix.
* app/transform_core.h: transform_core_do() takes an optional
progress callback argument (and data).
* plug-ins/oilify/oilify.c: send progress bar updates after every
pixel region, not only if they processed a multiple of 5
pixels (which was quite unlikely, and therefore gave a jerky
progress indication).
1999-01-11 08:57:33 +08:00
|
|
|
|
2006-03-29 01:08:36 +08:00
|
|
|
gimp_image_flush (image);
|
1997-11-25 06:05:25 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2008-11-01 23:17:36 +08:00
|
|
|
gimp_blend_tool_motion (GimpTool *tool,
|
|
|
|
const GimpCoords *coords,
|
|
|
|
guint32 time,
|
|
|
|
GdkModifierType state,
|
|
|
|
GimpDisplay *display)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
2005-03-04 19:42:46 +08:00
|
|
|
GimpBlendTool *blend_tool = GIMP_BLEND_TOOL (tool);
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2001-03-12 04:01:14 +08:00
|
|
|
gimp_draw_tool_pause (GIMP_DRAW_TOOL (tool));
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2007-03-09 02:07:38 +08:00
|
|
|
blend_tool->mouse_x = coords->x;
|
|
|
|
blend_tool->mouse_y = coords->y;
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2007-03-09 02:07:38 +08:00
|
|
|
/* Move the whole line if alt is pressed */
|
|
|
|
if (state & GDK_MOD1_MASK)
|
|
|
|
{
|
|
|
|
gdouble dx = blend_tool->last_x - coords->x;
|
|
|
|
gdouble dy = blend_tool->last_y - coords->y;
|
2006-09-13 03:36:05 +08:00
|
|
|
|
2007-03-09 02:07:38 +08:00
|
|
|
blend_tool->start_x -= dx;
|
|
|
|
blend_tool->start_y -= dy;
|
|
|
|
|
|
|
|
blend_tool->end_x -= dx;
|
|
|
|
blend_tool->end_y -= dy;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
blend_tool->end_x = coords->x;
|
|
|
|
blend_tool->end_y = coords->y;
|
|
|
|
}
|
1999-09-03 02:56:39 +08:00
|
|
|
|
2001-11-09 03:14:51 +08:00
|
|
|
if (state & GDK_CONTROL_MASK)
|
1999-09-21 17:11:42 +08:00
|
|
|
{
|
2007-03-09 02:07:38 +08:00
|
|
|
gimp_tool_motion_constrain (blend_tool->start_x, blend_tool->start_y,
|
2008-01-15 05:23:02 +08:00
|
|
|
&blend_tool->end_x, &blend_tool->end_y,
|
2008-01-16 05:05:57 +08:00
|
|
|
GIMP_TOOL_CONSTRAIN_15_DEGREES);
|
1999-09-21 17:11:42 +08:00
|
|
|
}
|
1999-07-27 02:13:10 +08:00
|
|
|
|
2006-03-29 01:55:52 +08:00
|
|
|
gimp_tool_pop_status (tool, display);
|
2007-01-21 09:24:51 +08:00
|
|
|
gimp_blend_tool_push_status (blend_tool, state, display);
|
1998-07-27 05:49:42 +08:00
|
|
|
|
2001-03-12 04:01:14 +08:00
|
|
|
gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
|
2007-03-09 02:07:38 +08:00
|
|
|
|
|
|
|
blend_tool->last_x = coords->x;
|
|
|
|
blend_tool->last_y = coords->y;
|
1997-11-25 06:05:25 +08:00
|
|
|
}
|
|
|
|
|
2006-09-13 03:36:05 +08:00
|
|
|
static void
|
|
|
|
gimp_blend_tool_active_modifier_key (GimpTool *tool,
|
|
|
|
GdkModifierType key,
|
|
|
|
gboolean press,
|
|
|
|
GdkModifierType state,
|
|
|
|
GimpDisplay *display)
|
|
|
|
{
|
|
|
|
GimpBlendTool *blend_tool = GIMP_BLEND_TOOL (tool);
|
|
|
|
|
|
|
|
if (key == GDK_CONTROL_MASK)
|
|
|
|
{
|
|
|
|
gimp_draw_tool_pause (GIMP_DRAW_TOOL (tool));
|
|
|
|
|
2007-03-09 02:07:38 +08:00
|
|
|
blend_tool->end_x = blend_tool->mouse_x;
|
|
|
|
blend_tool->end_y = blend_tool->mouse_y;
|
2006-09-13 03:36:05 +08:00
|
|
|
|
2007-03-09 02:07:38 +08:00
|
|
|
/* Restrict to multiples of 15 degrees if ctrl is pressed */
|
2006-09-13 03:36:05 +08:00
|
|
|
if (press)
|
|
|
|
{
|
2007-03-09 02:07:38 +08:00
|
|
|
gimp_tool_motion_constrain (blend_tool->start_x, blend_tool->start_y,
|
2008-01-15 05:23:02 +08:00
|
|
|
&blend_tool->end_x, &blend_tool->end_y,
|
2008-01-16 05:05:57 +08:00
|
|
|
GIMP_TOOL_CONSTRAIN_15_DEGREES);
|
2006-09-13 03:36:05 +08:00
|
|
|
}
|
|
|
|
|
2006-09-13 18:06:49 +08:00
|
|
|
gimp_tool_pop_status (tool, display);
|
2007-01-21 09:24:51 +08:00
|
|
|
gimp_blend_tool_push_status (blend_tool, state, display);
|
2006-09-13 18:06:49 +08:00
|
|
|
|
2006-09-13 03:36:05 +08:00
|
|
|
gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1997-11-25 06:05:25 +08:00
|
|
|
static void
|
2008-11-01 23:17:36 +08:00
|
|
|
gimp_blend_tool_cursor_update (GimpTool *tool,
|
|
|
|
const GimpCoords *coords,
|
|
|
|
GdkModifierType state,
|
|
|
|
GimpDisplay *display)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
2007-07-19 22:59:51 +08:00
|
|
|
switch (gimp_drawable_type (gimp_image_get_active_drawable (display->image)))
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
2001-12-12 02:11:56 +08:00
|
|
|
case GIMP_INDEXED_IMAGE:
|
|
|
|
case GIMP_INDEXEDA_IMAGE:
|
2006-06-02 04:30:52 +08:00
|
|
|
gimp_tool_control_set_cursor_modifier (tool->control,
|
|
|
|
GIMP_CURSOR_MODIFIER_BAD);
|
1997-11-25 06:05:25 +08:00
|
|
|
break;
|
|
|
|
default:
|
2006-06-02 04:30:52 +08:00
|
|
|
gimp_tool_control_set_cursor_modifier (tool->control,
|
|
|
|
GIMP_CURSOR_MODIFIER_NONE);
|
1997-11-25 06:05:25 +08:00
|
|
|
break;
|
|
|
|
}
|
2002-02-05 01:43:01 +08:00
|
|
|
|
2006-03-29 01:55:52 +08:00
|
|
|
GIMP_TOOL_CLASS (parent_class)->cursor_update (tool, coords, state, display);
|
1997-11-25 06:05:25 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2001-03-12 04:01:14 +08:00
|
|
|
gimp_blend_tool_draw (GimpDrawTool *draw_tool)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
2005-03-04 19:42:46 +08:00
|
|
|
GimpBlendTool *blend_tool = GIMP_BLEND_TOOL (draw_tool);
|
1997-11-25 06:05:25 +08:00
|
|
|
|
|
|
|
/* Draw start target */
|
2001-11-16 05:17:36 +08:00
|
|
|
gimp_draw_tool_draw_handle (draw_tool,
|
|
|
|
GIMP_HANDLE_CROSS,
|
2008-04-19 05:05:29 +08:00
|
|
|
blend_tool->start_x,
|
|
|
|
blend_tool->start_y,
|
2001-11-16 05:17:36 +08:00
|
|
|
TARGET_SIZE,
|
|
|
|
TARGET_SIZE,
|
|
|
|
GTK_ANCHOR_CENTER,
|
2007-03-09 02:07:38 +08:00
|
|
|
FALSE);
|
1997-11-25 06:05:25 +08:00
|
|
|
|
|
|
|
/* Draw end target */
|
2001-11-16 05:17:36 +08:00
|
|
|
gimp_draw_tool_draw_handle (draw_tool,
|
|
|
|
GIMP_HANDLE_CROSS,
|
2008-04-19 05:05:29 +08:00
|
|
|
blend_tool->end_x,
|
|
|
|
blend_tool->end_y,
|
2001-11-16 05:17:36 +08:00
|
|
|
TARGET_SIZE,
|
|
|
|
TARGET_SIZE,
|
|
|
|
GTK_ANCHOR_CENTER,
|
2007-03-09 02:07:38 +08:00
|
|
|
FALSE);
|
1997-11-25 06:05:25 +08:00
|
|
|
|
|
|
|
/* Draw the line between the start and end coords */
|
2001-11-12 22:45:58 +08:00
|
|
|
gimp_draw_tool_draw_line (draw_tool,
|
2008-04-19 05:05:29 +08:00
|
|
|
blend_tool->start_x,
|
|
|
|
blend_tool->start_y,
|
|
|
|
blend_tool->end_x,
|
|
|
|
blend_tool->end_y,
|
2007-03-09 02:07:38 +08:00
|
|
|
FALSE);
|
1997-11-25 06:05:25 +08:00
|
|
|
}
|
2006-09-13 18:06:49 +08:00
|
|
|
|
|
|
|
static void
|
2007-01-21 09:24:51 +08:00
|
|
|
gimp_blend_tool_push_status (GimpBlendTool *blend_tool,
|
|
|
|
GdkModifierType state,
|
|
|
|
GimpDisplay *display)
|
2006-09-13 18:06:49 +08:00
|
|
|
{
|
2008-08-21 00:22:09 +08:00
|
|
|
GimpTool *tool = GIMP_TOOL (blend_tool);
|
|
|
|
gchar *status_help;
|
2007-01-21 09:24:51 +08:00
|
|
|
|
|
|
|
status_help = gimp_suggest_modifiers ("",
|
2007-03-09 07:33:55 +08:00
|
|
|
((GDK_CONTROL_MASK | GDK_MOD1_MASK)
|
|
|
|
& ~state),
|
2007-01-21 09:24:51 +08:00
|
|
|
NULL,
|
|
|
|
_("%s for constrained angles"),
|
2007-03-09 07:33:55 +08:00
|
|
|
_("%s to move the whole line"));
|
2008-08-21 00:22:09 +08:00
|
|
|
|
|
|
|
gimp_tool_push_status_coords (tool, display,
|
|
|
|
gimp_tool_control_get_precision (tool->control),
|
2006-09-13 18:06:49 +08:00
|
|
|
_("Blend: "),
|
2007-03-09 02:07:38 +08:00
|
|
|
blend_tool->end_x - blend_tool->start_x,
|
2006-09-13 18:06:49 +08:00
|
|
|
", ",
|
2007-03-09 02:07:38 +08:00
|
|
|
blend_tool->end_y - blend_tool->start_y,
|
2007-01-21 09:24:51 +08:00
|
|
|
status_help);
|
2008-08-21 00:22:09 +08:00
|
|
|
|
2007-01-21 09:24:51 +08:00
|
|
|
g_free (status_help);
|
2006-09-13 18:06:49 +08:00
|
|
|
}
|