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 one more... 

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

	* app/tools/Makefile.am
	* app/tools/bucket_fill.[ch]: one more...

	* app/tools/fuzzy_select.c: everything commented out except the
	find_region stuff.

	* app/tools/gimpcolorpickertool.c: cosmetic.

	* app/tools/paint_options.c: #include "bucket_fill.h"

	* app/tools/tool.[ch]: removed STUB()'s.

	* app/tools/tools.c: register it.
This commit is contained in:
Michael Natterer 2001-02-28 01:05:22 +00:00 committed by Michael Natterer
parent 8202cf0203
commit 4e3b5a1e3f
18 changed files with 461 additions and 284 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ChangeLog
View File

@ -1,3 +1,19 @@
2001-02-28 Michael Natterer <mitch@gimp.org>
* app/tools/Makefile.am
* app/tools/bucket_fill.[ch]: one more...
* app/tools/fuzzy_select.c: everything commented out except the
find_region stuff.
* app/tools/gimpcolorpickertool.c: cosmetic.
* app/tools/paint_options.c: #include "bucket_fill.h"
* app/tools/tool.[ch]: removed STUB()'s.
* app/tools/tools.c: register it.
2001-02-28 Michael Natterer <mitch@gimp.org>
* app/tools/Makefile.am

6
app/core/gimpimage-pick-color.c
View File

@ -77,10 +77,10 @@ struct _GimpColorPickerToolOptions
/* local function prototypes */
static void gimp_color_picker_tool_class_init (GimpColorPickerToolClass *klass);
static void gimp_color_picker_tool_init (GimpColorPickerTool *color_picker_tool);
static void gimp_color_picker_tool_class_init (GimpColorPickerToolClass *klass);
static void gimp_color_picker_tool_init (GimpColorPickerTool *color_picker_tool);
static void gimp_color_picker_tool_destroy (GtkObject *object);
static void gimp_color_picker_tool_destroy (GtkObject *object);
static void gimp_color_picker_tool_button_press (GimpTool *tool,
GdkEventButton *bevent,

8
app/tools/Makefile.am
View File

@ -16,8 +16,8 @@ libapptools_la_SOURCES = \
blob.h \
## brightness_contrast.c \
## brightness_contrast.h \
## bucket_fill.c \
## bucket_fill.h \
bucket_fill.c \
bucket_fill.h \
## by_color_select.c \
## by_color_select.h \
## clone.c \
@ -46,8 +46,8 @@ libapptools_la_SOURCES = \
## flip_tool.h \
## free_select.c \
## free_select.h \
## fuzzy_select.c \
## fuzzy_select.h \
fuzzy_select.c \
fuzzy_select.h \
gimptoolinfo.c \
gimptoolinfo.h \
## histogram_tool.c \

247
app/tools/bucket_fill.c
View File

@ -45,22 +45,15 @@
#include "bucket_fill.h"
#include "fuzzy_select.h"
#include "paint_options.h"
#include "tools.h"
#include "tool.h"
#include "tool_manager.h"
#include "pdb/procedural_db.h"
#include "libgimp/gimpintl.h"
#include "pixmaps2.h"
/* the bucket fill structures */
typedef struct _BucketTool BucketTool;
struct _BucketTool
{
gint target_x; /* starting x coord */
gint target_y; /* starting y coord */
};
typedef struct _BucketOptions BucketOptions;
@ -85,37 +78,134 @@ struct _BucketOptions
/* the bucket fill tool options */
static BucketOptions *bucket_options = NULL;
static GimpToolClass *parent_class = NULL;
/* local function prototypes */
static void bucket_fill_button_press (Tool *tool,
GdkEventButton *bevent,
GDisplay *gdisp);
static void bucket_fill_button_release (Tool *tool,
GdkEventButton *bevent,
GDisplay *gdisp);
static void bucket_fill_cursor_update (Tool *tool,
GdkEventMotion *mevent,
GDisplay *gdisp);
static void gimp_bucket_fill_tool_class_init (GimpBucketFillToolClass *klass);
static void gimp_bucket_fill_tool_init (GimpBucketFillTool *bucket_fill_tool);
static void bucket_fill_line_color (guchar *,
guchar *,
guchar *,
gboolean ,
gint ,
gint );
static void bucket_fill_line_pattern (guchar *,
guchar *,
TempBuf *,
gboolean ,
gint ,
gint ,
gint ,
gint );
static void gimp_bucket_fill_tool_destroy (GtkObject *object);
static BucketOptions * bucket_options_new (void);
static void bucket_options_reset (void);
static void gimp_bucket_fill_tool_button_press (GimpTool *tool,
GdkEventButton *bevent,
GDisplay *gdisp);
static void gimp_bucket_fill_tool_button_release (GimpTool *tool,
GdkEventButton *bevent,
GDisplay *gdisp);
static void gimp_bucket_fill_tool_cursor_update (GimpTool *tool,
GdkEventMotion *mevent,
GDisplay *gdisp);
static void gimp_bucket_fill_tool_modifier_key (GimpTool *tool,
GdkEventKey *kevent,
GDisplay *gdisp);
static void bucket_fill_line_color (guchar *,
guchar *,
guchar *,
gboolean ,
gint ,
gint );
static void bucket_fill_line_pattern (guchar *,
guchar *,
TempBuf *,
gboolean ,
gint ,
gint ,
gint ,
gint );
/* functions */
void
gimp_bucket_fill_tool_register (void)
{
tool_manager_register_tool (GIMP_TYPE_BUCKET_FILL_TOOL,
TRUE,
"gimp:bucket_fill_tool",
_("Bucket Fill"),
_("Fill with a color or pattern"),
N_("/Tools/Paint Tools/Bucket Fill"), "<shift>B",
NULL, "tools/bucket_fill.html",
(const gchar **) fill_bits);
}
GtkType
gimp_bucket_fill_tool_get_type (void)
{
static GtkType tool_type = 0;
if (! tool_type)
{
GtkTypeInfo tool_info =
{
"GimpBucketFillTool",
sizeof (GimpBucketFillTool),
sizeof (GimpBucketFillToolClass),
(GtkClassInitFunc) gimp_bucket_fill_tool_class_init,
(GtkObjectInitFunc) gimp_bucket_fill_tool_init,
/* reserved_1 */ NULL,
/* reserved_2 */ NULL,
(GtkClassInitFunc) NULL,
};
tool_type = gtk_type_unique (GIMP_TYPE_TOOL, &tool_info);
}
return tool_type;
}
static void
gimp_bucket_fill_tool_class_init (GimpBucketFillToolClass *klass)
{
GtkObjectClass *object_class;
GimpToolClass *tool_class;
object_class = (GtkObjectClass *) klass;
tool_class = (GimpToolClass *) klass;
parent_class = gtk_type_class (GIMP_TYPE_TOOL);
object_class->destroy = gimp_bucket_fill_tool_destroy;
tool_class->button_press = gimp_bucket_fill_tool_button_press;
tool_class->button_release = gimp_bucket_fill_tool_button_release;
tool_class->modifier_key = gimp_bucket_fill_tool_modifier_key;
tool_class->cursor_update = gimp_bucket_fill_tool_cursor_update;
}
static void
gimp_bucket_fill_tool_init (GimpBucketFillTool *bucket_fill_tool)
{
GimpTool *tool;
tool = GIMP_TOOL (bucket_fill_tool);
if (! bucket_options)
{
bucket_options = bucket_options_new ();
tool_manager_register_tool_options (GIMP_TYPE_BUCKET_FILL_TOOL,
(ToolOptions *) bucket_options);
bucket_options_reset ();
}
tool->scroll_lock = TRUE; /* Disallow scrolling */
}
static void
gimp_bucket_fill_tool_destroy (GtkObject *object)
{
if (GTK_OBJECT_CLASS (parent_class)->destroy)
GTK_OBJECT_CLASS (parent_class)->destroy (object);
}
static void
bucket_options_reset (void)
{
@ -141,11 +231,12 @@ bucket_options_new (void)
GtkWidget *scale;
GtkWidget *frame;
/* the new bucket fill tool options structure */
options = g_new (BucketOptions, 1);
options = g_new0 (BucketOptions, 1);
paint_options_init ((PaintOptions *) options,
BUCKET_FILL,
GIMP_TYPE_BUCKET_FILL_TOOL,
bucket_options_reset);
options->sample_merged = options->sample_merged_d = FALSE;
options->threshold = default_threshold;
options->fill_mode = options->fill_mode_d = FG_BUCKET_FILL;
@ -211,14 +302,14 @@ bucket_options_new (void)
/* bucket fill action functions */
static void
bucket_fill_button_press (Tool *tool,
GdkEventButton *bevent,
GDisplay *gdisp)
gimp_bucket_fill_tool_button_press (GimpTool *tool,
GdkEventButton *bevent,
GDisplay *gdisp)
{
BucketTool *bucket_tool;
gboolean use_offsets;
GimpBucketFillTool *bucket_tool;
gboolean use_offsets;
bucket_tool = (BucketTool *) tool->private;
bucket_tool = GIMP_BUCKET_FILL_TOOL (tool);
use_offsets = (bucket_options->sample_merged) ? FALSE : TRUE;
@ -239,15 +330,15 @@ bucket_fill_button_press (Tool *tool,
}
static void
bucket_fill_button_release (Tool *tool,
GdkEventButton *bevent,
GDisplay *gdisp)
gimp_bucket_fill_tool_button_release (GimpTool *tool,
GdkEventButton *bevent,
GDisplay *gdisp)
{
BucketTool *bucket_tool;
Argument *return_vals;
gint nreturn_vals;
GimpBucketFillTool *bucket_tool;
Argument *return_vals;
gint nreturn_vals;
bucket_tool = (BucketTool *) tool->private;
bucket_tool = GIMP_BUCKET_FILL_TOOL (tool);
gdk_pointer_ungrab (bevent->time);
gdk_flush ();
@ -280,9 +371,9 @@ bucket_fill_button_release (Tool *tool,
}
static void
bucket_fill_cursor_update (Tool *tool,
GdkEventMotion *mevent,
GDisplay *gdisp)
gimp_bucket_fill_tool_cursor_update (GimpTool *tool,
GdkEventMotion *mevent,
GDisplay *gdisp)
{
GimpLayer *layer;
GdkCursorType ctype = GDK_TOP_LEFT_ARROW;
@ -292,6 +383,7 @@ bucket_fill_cursor_update (Tool *tool,
gdisplay_untransform_coords (gdisp, mevent->x, mevent->y,
&x, &y, FALSE, FALSE);
if ((layer = gimp_image_get_active_layer (gdisp->gimage)))
{
gimp_drawable_offsets (GIMP_DRAWABLE (layer), &off_x, &off_y);
@ -331,9 +423,9 @@ bucket_fill_cursor_update (Tool *tool,
}
static void
bucket_fill_modifier_key_func (Tool *tool,
GdkEventKey *kevent,
GDisplay *gdisp)
gimp_bucket_fill_tool_modifier_key (GimpTool *tool,
GdkEventKey *kevent,
GDisplay *gdisp)
{
switch (kevent->keyval)
{
@ -618,48 +710,3 @@ bucket_fill_region (BucketFillMode fill_mode,
}
}
}
/**********************************/
/* Global bucket fill functions */
/**********************************/
Tool *
tools_new_bucket_fill (void)
{
Tool *tool;
BucketTool *private;
/* The tool options */
if (! bucket_options)
{
bucket_options = bucket_options_new ();
tools_register (BUCKET_FILL, (ToolOptions *) bucket_options);
/* press all default buttons */
bucket_options_reset ();
}
tool = tools_new_tool (BUCKET_FILL);
private = g_new0 (BucketTool, 1);
tool->scroll_lock = TRUE; /* Disallow scrolling */
tool->private = (gpointer) private;
tool->button_press_func = bucket_fill_button_press;
tool->button_release_func = bucket_fill_button_release;
tool->modifier_key_func = bucket_fill_modifier_key_func;
tool->cursor_update_func = bucket_fill_cursor_update;
return tool;
}
void
tools_free_bucket_fill (Tool *tool)
{
BucketTool *bucket_tool;
bucket_tool = (BucketTool *) tool->private;
g_free (bucket_tool);
}

78
app/tools/bucket_fill.h
View File

@ -16,8 +16,11 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __BUCKET_FILL_H__
#define __BUCKET_FILL_H__
#ifndef __GIMP_BUCKET_FILL_TOOL_H__
#define __GIMP_BUCKET_FILL_TOOL_H__
#include "tool.h"
typedef enum
@ -28,27 +31,54 @@ typedef enum
} BucketFillMode;
void bucket_fill (GimpImage *gimage,
GimpDrawable *drawable,
BucketFillMode fill_mode,
gint paint_mode,
gdouble opacity,
gdouble threshold,
gboolean sample_merged,
gdouble x,
gdouble y);
void bucket_fill_region (BucketFillMode fill_mode,
PixelRegion *bufPR,
PixelRegion *maskPR,
guchar *col,
TempBuf *pattern,
gint off_x,
gint off_y,
gboolean has_alpha);
Tool * tools_new_bucket_fill (void);
void tools_free_bucket_fill (Tool *tool);
#define GIMP_TYPE_BUCKET_FILL_TOOL (gimp_bucket_fill_tool_get_type ())
#define GIMP_BUCKET_FILL_TOOL(obj) (GTK_CHECK_CAST ((obj), GIMP_TYPE_BUCKET_FILL_TOOL, GimpBucketFillTool))
#define GIMP_IS_BUCKET_FILL_TOOL(obj) (GTK_CHECK_TYPE ((obj), GIMP_TYPE_BUCKET_FILL_TOOL))
#define GIMP_BUCKET_FILL_TOOL_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GIMP_TYPE_BUCKET_FILL_TOOL, GimpBucketFillToolClass))
#define GIMP_IS_BUCKET_FILL_TOOL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_BUCKET_FILL_TOOL))
#endif /* __BUCKET_FILL_H__ */
typedef struct _GimpBucketFillTool GimpBucketFillTool;
typedef struct _GimpBucketFillToolClass GimpBucketFillToolClass;
struct _GimpBucketFillTool
{
GimpTool parent_instance;
gint target_x; /* starting x coord */
gint target_y; /* starting y coord */
};
struct _GimpBucketFillToolClass
{
GimpToolClass parent_class;
};
void gimp_bucket_fill_tool_register (void);
GtkType gimp_bucket_fill_tool_get_type (void);
GimpTool * gimp_bucket_fill_tool_new (void);
void bucket_fill (GimpImage *gimage,
GimpDrawable *drawable,
BucketFillMode fill_mode,
gint paint_mode,
gdouble opacity,
gdouble threshold,
gboolean sample_merged,
gdouble x,
gdouble y);
void bucket_fill_region (BucketFillMode fill_mode,
PixelRegion *bufPR,
PixelRegion *maskPR,
guchar *col,
TempBuf *pattern,
gint off_x,
gint off_y,
gboolean has_alpha);
#endif /* __GIMP_BUCKET_FILL_TOOL_H__ */

16
app/tools/fuzzy_select.c
View File

@ -1,3 +1,6 @@
#warning (everything commented out)
#if 0
/* The GIMP -- an image manipulation program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
@ -15,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#endif
#include "config.h"
#include <stdlib.h>
@ -28,7 +31,6 @@
#include "boundary.h"
#include "cursorutil.h"
#include "draw_core.h"
#include "drawable.h"
#include "edit_selection.h"
#include "gdisplay.h"
@ -44,11 +46,12 @@
#include "rect_select.h"
#include "selection_options.h"
#include "tool_options.h"
#include "tools.h"
#include "tool.h"
#include "tool_manager.h"
#include "libgimp/gimpintl.h"
#if 0
/* the fuzzy selection structures */
typedef struct _FuzzySelect FuzzySelect;
@ -100,7 +103,7 @@ static gint num_segs = 0;
GimpChannel * fuzzy_mask = NULL;
#endif
/*************************************/
/* Fuzzy selection apparatus */
@ -361,7 +364,7 @@ find_contiguous_region (GImage *gimage,
return mask;
}
#if 0
void
fuzzy_select (GImage *gimage,
GimpDrawable *drawable,
@ -686,3 +689,4 @@ tools_free_fuzzy_select (Tool *tool)
draw_core_free (fuzzy_sel->core);
g_free (fuzzy_sel);
}
#endif

247
app/tools/gimpbucketfilltool.c
View File

@ -45,22 +45,15 @@
#include "bucket_fill.h"
#include "fuzzy_select.h"
#include "paint_options.h"
#include "tools.h"
#include "tool.h"
#include "tool_manager.h"
#include "pdb/procedural_db.h"
#include "libgimp/gimpintl.h"
#include "pixmaps2.h"
/* the bucket fill structures */
typedef struct _BucketTool BucketTool;
struct _BucketTool
{
gint target_x; /* starting x coord */
gint target_y; /* starting y coord */
};
typedef struct _BucketOptions BucketOptions;
@ -85,37 +78,134 @@ struct _BucketOptions
/* the bucket fill tool options */
static BucketOptions *bucket_options = NULL;
static GimpToolClass *parent_class = NULL;
/* local function prototypes */
static void bucket_fill_button_press (Tool *tool,
GdkEventButton *bevent,
GDisplay *gdisp);
static void bucket_fill_button_release (Tool *tool,
GdkEventButton *bevent,
GDisplay *gdisp);
static void bucket_fill_cursor_update (Tool *tool,
GdkEventMotion *mevent,
GDisplay *gdisp);
static void gimp_bucket_fill_tool_class_init (GimpBucketFillToolClass *klass);
static void gimp_bucket_fill_tool_init (GimpBucketFillTool *bucket_fill_tool);
static void bucket_fill_line_color (guchar *,
guchar *,
guchar *,
gboolean ,
gint ,
gint );
static void bucket_fill_line_pattern (guchar *,
guchar *,
TempBuf *,
gboolean ,
gint ,
gint ,
gint ,
gint );
static void gimp_bucket_fill_tool_destroy (GtkObject *object);
static BucketOptions * bucket_options_new (void);
static void bucket_options_reset (void);
static void gimp_bucket_fill_tool_button_press (GimpTool *tool,
GdkEventButton *bevent,
GDisplay *gdisp);
static void gimp_bucket_fill_tool_button_release (GimpTool *tool,
GdkEventButton *bevent,
GDisplay *gdisp);
static void gimp_bucket_fill_tool_cursor_update (GimpTool *tool,
GdkEventMotion *mevent,
GDisplay *gdisp);
static void gimp_bucket_fill_tool_modifier_key (GimpTool *tool,
GdkEventKey *kevent,
GDisplay *gdisp);
static void bucket_fill_line_color (guchar *,
guchar *,
guchar *,
gboolean ,
gint ,
gint );
static void bucket_fill_line_pattern (guchar *,
guchar *,
TempBuf *,
gboolean ,
gint ,
gint ,
gint ,
gint );
/* functions */
void
gimp_bucket_fill_tool_register (void)
{
tool_manager_register_tool (GIMP_TYPE_BUCKET_FILL_TOOL,
TRUE,
"gimp:bucket_fill_tool",
_("Bucket Fill"),
_("Fill with a color or pattern"),
N_("/Tools/Paint Tools/Bucket Fill"), "<shift>B",
NULL, "tools/bucket_fill.html",
(const gchar **) fill_bits);
}
GtkType
gimp_bucket_fill_tool_get_type (void)
{
static GtkType tool_type = 0;
if (! tool_type)
{
GtkTypeInfo tool_info =
{
"GimpBucketFillTool",
sizeof (GimpBucketFillTool),
sizeof (GimpBucketFillToolClass),
(GtkClassInitFunc) gimp_bucket_fill_tool_class_init,
(GtkObjectInitFunc) gimp_bucket_fill_tool_init,
/* reserved_1 */ NULL,
/* reserved_2 */ NULL,
(GtkClassInitFunc) NULL,
};
tool_type = gtk_type_unique (GIMP_TYPE_TOOL, &tool_info);
}
return tool_type;
}
static void
gimp_bucket_fill_tool_class_init (GimpBucketFillToolClass *klass)
{
GtkObjectClass *object_class;
GimpToolClass *tool_class;
object_class = (GtkObjectClass *) klass;
tool_class = (GimpToolClass *) klass;
parent_class = gtk_type_class (GIMP_TYPE_TOOL);
object_class->destroy = gimp_bucket_fill_tool_destroy;
tool_class->button_press = gimp_bucket_fill_tool_button_press;
tool_class->button_release = gimp_bucket_fill_tool_button_release;
tool_class->modifier_key = gimp_bucket_fill_tool_modifier_key;
tool_class->cursor_update = gimp_bucket_fill_tool_cursor_update;
}
static void
gimp_bucket_fill_tool_init (GimpBucketFillTool *bucket_fill_tool)
{
GimpTool *tool;
tool = GIMP_TOOL (bucket_fill_tool);
if (! bucket_options)
{
bucket_options = bucket_options_new ();
tool_manager_register_tool_options (GIMP_TYPE_BUCKET_FILL_TOOL,
(ToolOptions *) bucket_options);
bucket_options_reset ();
}
tool->scroll_lock = TRUE; /* Disallow scrolling */
}
static void
gimp_bucket_fill_tool_destroy (GtkObject *object)
{
if (GTK_OBJECT_CLASS (parent_class)->destroy)
GTK_OBJECT_CLASS (parent_class)->destroy (object);
}
static void
bucket_options_reset (void)
{
@ -141,11 +231,12 @@ bucket_options_new (void)
GtkWidget *scale;
GtkWidget *frame;
/* the new bucket fill tool options structure */
options = g_new (BucketOptions, 1);
options = g_new0 (BucketOptions, 1);
paint_options_init ((PaintOptions *) options,
BUCKET_FILL,
GIMP_TYPE_BUCKET_FILL_TOOL,
bucket_options_reset);
options->sample_merged = options->sample_merged_d = FALSE;
options->threshold = default_threshold;
options->fill_mode = options->fill_mode_d = FG_BUCKET_FILL;
@ -211,14 +302,14 @@ bucket_options_new (void)
/* bucket fill action functions */
static void
bucket_fill_button_press (Tool *tool,
GdkEventButton *bevent,
GDisplay *gdisp)
gimp_bucket_fill_tool_button_press (GimpTool *tool,
GdkEventButton *bevent,
GDisplay *gdisp)
{
BucketTool *bucket_tool;
gboolean use_offsets;
GimpBucketFillTool *bucket_tool;
gboolean use_offsets;
bucket_tool = (BucketTool *) tool->private;
bucket_tool = GIMP_BUCKET_FILL_TOOL (tool);
use_offsets = (bucket_options->sample_merged) ? FALSE : TRUE;
@ -239,15 +330,15 @@ bucket_fill_button_press (Tool *tool,
}
static void
bucket_fill_button_release (Tool *tool,
GdkEventButton *bevent,
GDisplay *gdisp)
gimp_bucket_fill_tool_button_release (GimpTool *tool,
GdkEventButton *bevent,
GDisplay *gdisp)
{
BucketTool *bucket_tool;
Argument *return_vals;
gint nreturn_vals;
GimpBucketFillTool *bucket_tool;
Argument *return_vals;
gint nreturn_vals;
bucket_tool = (BucketTool *) tool->private;
bucket_tool = GIMP_BUCKET_FILL_TOOL (tool);
gdk_pointer_ungrab (bevent->time);
gdk_flush ();
@ -280,9 +371,9 @@ bucket_fill_button_release (Tool *tool,
}
static void
bucket_fill_cursor_update (Tool *tool,
GdkEventMotion *mevent,
GDisplay *gdisp)
gimp_bucket_fill_tool_cursor_update (GimpTool *tool,
GdkEventMotion *mevent,
GDisplay *gdisp)
{
GimpLayer *layer;
GdkCursorType ctype = GDK_TOP_LEFT_ARROW;
@ -292,6 +383,7 @@ bucket_fill_cursor_update (Tool *tool,
gdisplay_untransform_coords (gdisp, mevent->x, mevent->y,
&x, &y, FALSE, FALSE);
if ((layer = gimp_image_get_active_layer (gdisp->gimage)))
{
gimp_drawable_offsets (GIMP_DRAWABLE (layer), &off_x, &off_y);
@ -331,9 +423,9 @@ bucket_fill_cursor_update (Tool *tool,
}
static void
bucket_fill_modifier_key_func (Tool *tool,
GdkEventKey *kevent,
GDisplay *gdisp)
gimp_bucket_fill_tool_modifier_key (GimpTool *tool,
GdkEventKey *kevent,
GDisplay *gdisp)
{
switch (kevent->keyval)
{
@ -618,48 +710,3 @@ bucket_fill_region (BucketFillMode fill_mode,
}
}
}
/**********************************/
/* Global bucket fill functions */
/**********************************/
Tool *
tools_new_bucket_fill (void)
{
Tool *tool;
BucketTool *private;
/* The tool options */
if (! bucket_options)
{
bucket_options = bucket_options_new ();
tools_register (BUCKET_FILL, (ToolOptions *) bucket_options);
/* press all default buttons */
bucket_options_reset ();
}
tool = tools_new_tool (BUCKET_FILL);
private = g_new0 (BucketTool, 1);
tool->scroll_lock = TRUE; /* Disallow scrolling */
tool->private = (gpointer) private;
tool->button_press_func = bucket_fill_button_press;
tool->button_release_func = bucket_fill_button_release;
tool->modifier_key_func = bucket_fill_modifier_key_func;
tool->cursor_update_func = bucket_fill_cursor_update;
return tool;
}
void
tools_free_bucket_fill (Tool *tool)
{
BucketTool *bucket_tool;
bucket_tool = (BucketTool *) tool->private;
g_free (bucket_tool);
}

78
app/tools/gimpbucketfilltool.h
View File

@ -16,8 +16,11 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __BUCKET_FILL_H__
#define __BUCKET_FILL_H__
#ifndef __GIMP_BUCKET_FILL_TOOL_H__
#define __GIMP_BUCKET_FILL_TOOL_H__
#include "tool.h"
typedef enum
@ -28,27 +31,54 @@ typedef enum
} BucketFillMode;
void bucket_fill (GimpImage *gimage,
GimpDrawable *drawable,
BucketFillMode fill_mode,
gint paint_mode,
gdouble opacity,
gdouble threshold,
gboolean sample_merged,
gdouble x,
gdouble y);
void bucket_fill_region (BucketFillMode fill_mode,
PixelRegion *bufPR,
PixelRegion *maskPR,
guchar *col,
TempBuf *pattern,
gint off_x,
gint off_y,
gboolean has_alpha);
Tool * tools_new_bucket_fill (void);
void tools_free_bucket_fill (Tool *tool);
#define GIMP_TYPE_BUCKET_FILL_TOOL (gimp_bucket_fill_tool_get_type ())
#define GIMP_BUCKET_FILL_TOOL(obj) (GTK_CHECK_CAST ((obj), GIMP_TYPE_BUCKET_FILL_TOOL, GimpBucketFillTool))
#define GIMP_IS_BUCKET_FILL_TOOL(obj) (GTK_CHECK_TYPE ((obj), GIMP_TYPE_BUCKET_FILL_TOOL))
#define GIMP_BUCKET_FILL_TOOL_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GIMP_TYPE_BUCKET_FILL_TOOL, GimpBucketFillToolClass))
#define GIMP_IS_BUCKET_FILL_TOOL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_BUCKET_FILL_TOOL))
#endif /* __BUCKET_FILL_H__ */
typedef struct _GimpBucketFillTool GimpBucketFillTool;
typedef struct _GimpBucketFillToolClass GimpBucketFillToolClass;
struct _GimpBucketFillTool
{
GimpTool parent_instance;
gint target_x; /* starting x coord */
gint target_y; /* starting y coord */
};
struct _GimpBucketFillToolClass
{
GimpToolClass parent_class;
};
void gimp_bucket_fill_tool_register (void);
GtkType gimp_bucket_fill_tool_get_type (void);
GimpTool * gimp_bucket_fill_tool_new (void);
void bucket_fill (GimpImage *gimage,
GimpDrawable *drawable,
BucketFillMode fill_mode,
gint paint_mode,
gdouble opacity,
gdouble threshold,
gboolean sample_merged,
gdouble x,
gdouble y);
void bucket_fill_region (BucketFillMode fill_mode,
PixelRegion *bufPR,
PixelRegion *maskPR,
guchar *col,
TempBuf *pattern,
gint off_x,
gint off_y,
gboolean has_alpha);
#endif /* __GIMP_BUCKET_FILL_TOOL_H__ */

6
app/tools/gimpcolorpickertool.c
View File

@ -77,10 +77,10 @@ struct _GimpColorPickerToolOptions
/* local function prototypes */
static void gimp_color_picker_tool_class_init (GimpColorPickerToolClass *klass);
static void gimp_color_picker_tool_init (GimpColorPickerTool *color_picker_tool);
static void gimp_color_picker_tool_class_init (GimpColorPickerToolClass *klass);
static void gimp_color_picker_tool_init (GimpColorPickerTool *color_picker_tool);
static void gimp_color_picker_tool_destroy (GtkObject *object);
static void gimp_color_picker_tool_destroy (GtkObject *object);
static void gimp_color_picker_tool_button_press (GimpTool *tool,
GdkEventButton *bevent,

16
app/tools/gimpfuzzyselecttool.c
View File

@ -1,3 +1,6 @@
#warning (everything commented out)
#if 0
/* The GIMP -- an image manipulation program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
@ -15,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#endif
#include "config.h"
#include <stdlib.h>
@ -28,7 +31,6 @@
#include "boundary.h"
#include "cursorutil.h"
#include "draw_core.h"
#include "drawable.h"
#include "edit_selection.h"
#include "gdisplay.h"
@ -44,11 +46,12 @@
#include "rect_select.h"
#include "selection_options.h"
#include "tool_options.h"
#include "tools.h"
#include "tool.h"
#include "tool_manager.h"
#include "libgimp/gimpintl.h"
#if 0
/* the fuzzy selection structures */
typedef struct _FuzzySelect FuzzySelect;
@ -100,7 +103,7 @@ static gint num_segs = 0;
GimpChannel * fuzzy_mask = NULL;
#endif
/*************************************/
/* Fuzzy selection apparatus */
@ -361,7 +364,7 @@ find_contiguous_region (GImage *gimage,
return mask;
}
#if 0
void
fuzzy_select (GImage *gimage,
GimpDrawable *drawable,
@ -686,3 +689,4 @@ tools_free_fuzzy_select (Tool *tool)
draw_core_free (fuzzy_sel->core);
g_free (fuzzy_sel);
}
#endif

1
app/tools/gimppaintoptions-gui.c
View File

@ -33,6 +33,7 @@
#include "tool.h"
#include "tool_manager.h"
#include "bucket_fill.h"
#include "gimppaintbrushtool.h"
#include "ink.h"

16
app/tools/gimpregionselecttool.c
View File

@ -1,3 +1,6 @@
#warning (everything commented out)
#if 0
/* The GIMP -- an image manipulation program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
@ -15,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#endif
#include "config.h"
#include <stdlib.h>
@ -28,7 +31,6 @@
#include "boundary.h"
#include "cursorutil.h"
#include "draw_core.h"
#include "drawable.h"
#include "edit_selection.h"
#include "gdisplay.h"
@ -44,11 +46,12 @@
#include "rect_select.h"
#include "selection_options.h"
#include "tool_options.h"
#include "tools.h"
#include "tool.h"
#include "tool_manager.h"
#include "libgimp/gimpintl.h"
#if 0
/* the fuzzy selection structures */
typedef struct _FuzzySelect FuzzySelect;
@ -100,7 +103,7 @@ static gint num_segs = 0;
GimpChannel * fuzzy_mask = NULL;
#endif
/*************************************/
/* Fuzzy selection apparatus */
@ -361,7 +364,7 @@ find_contiguous_region (GImage *gimage,
return mask;
}
#if 0
void
fuzzy_select (GImage *gimage,
GimpDrawable *drawable,
@ -686,3 +689,4 @@ tools_free_fuzzy_select (Tool *tool)
draw_core_free (fuzzy_sel->core);
g_free (fuzzy_sel);
}
#endif

3
app/tools/gimptool.c
View File

@ -499,7 +499,6 @@ STUB(curves_dialog_hide)
STUB(posterize_dialog_hide)
STUB(move_tool_start_hguide)
STUB(move_tool_start_vguide)
STUB(bucket_fill_region)
STUB(pathpoints_copy)
STUB(pathpoints_free)
STUB(bezier_stroke)
@ -542,7 +541,6 @@ STUB(transform_core_cut)
STUB(flip_tool_flip)
STUB(transform_core_paste)
STUB(free_select)
STUB(find_contiguous_region)
STUB(fuzzy_mask)
STUB(fuzzy_select)
STUB(pencil_non_gui)
@ -558,7 +556,6 @@ STUB(transform_core_do)
STUB(airbrush_non_gui)
STUB(airbrush_non_gui_default)
STUB(blend)
STUB(bucket_fill)
STUB(by_color_select)
STUB(clone_non_gui)
STUB(clone_non_gui_default)

1
app/tools/gimptool.h
View File

@ -28,7 +28,6 @@
#define GIMP_TYPE_ELLIPSE_SELECT_TOOL GTK_TYPE_NONE
#define GIMP_TYPE_FUZZY_SELECT_TOOL GTK_TYPE_NONE
#define GIMP_TYPE_BY_COLOR_SELECT_TOOL GTK_TYPE_NONE
#define GIMP_TYPE_BUCKET_FILL_TOOL GTK_TYPE_NONE
#define GIMP_TYPE_BLEND_TOOL GTK_TYPE_NONE
#define GIMP_TYPE_PENCIL_TOOL GTK_TYPE_NONE
#define GIMP_TYPE_ERASER_TOOL GTK_TYPE_NONE

1
app/tools/paint_options.c
View File

@ -33,6 +33,7 @@
#include "tool.h"
#include "tool_manager.h"
#include "bucket_fill.h"
#include "gimppaintbrushtool.h"
#include "ink.h"

3
app/tools/tool.c
View File

@ -499,7 +499,6 @@ STUB(curves_dialog_hide)
STUB(posterize_dialog_hide)
STUB(move_tool_start_hguide)
STUB(move_tool_start_vguide)
STUB(bucket_fill_region)
STUB(pathpoints_copy)
STUB(pathpoints_free)
STUB(bezier_stroke)
@ -542,7 +541,6 @@ STUB(transform_core_cut)
STUB(flip_tool_flip)
STUB(transform_core_paste)
STUB(free_select)
STUB(find_contiguous_region)
STUB(fuzzy_mask)
STUB(fuzzy_select)
STUB(pencil_non_gui)
@ -558,7 +556,6 @@ STUB(transform_core_do)
STUB(airbrush_non_gui)
STUB(airbrush_non_gui_default)
STUB(blend)
STUB(bucket_fill)
STUB(by_color_select)
STUB(clone_non_gui)
STUB(clone_non_gui_default)

1
app/tools/tool.h
View File

@ -28,7 +28,6 @@
#define GIMP_TYPE_ELLIPSE_SELECT_TOOL GTK_TYPE_NONE
#define GIMP_TYPE_FUZZY_SELECT_TOOL GTK_TYPE_NONE
#define GIMP_TYPE_BY_COLOR_SELECT_TOOL GTK_TYPE_NONE
#define GIMP_TYPE_BUCKET_FILL_TOOL GTK_TYPE_NONE
#define GIMP_TYPE_BLEND_TOOL GTK_TYPE_NONE
#define GIMP_TYPE_PENCIL_TOOL GTK_TYPE_NONE
#define GIMP_TYPE_ERASER_TOOL GTK_TYPE_NONE

1
app/tools/tools.c
View File

@ -60,6 +60,7 @@ register_tools (void)
{
gimp_ink_tool_register ();
gimp_paintbrush_tool_register ();
gimp_bucket_fill_tool_register ();
gimp_measure_tool_register ();
gimp_color_picker_tool_register ();
gimp_text_tool_register ();