graphics/gimp
graphics/gimp
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp synced 2024-10-19 22:34:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

app/core/core-enums.h moved some more enums into the right place and

Browse source 
2002-03-18  Sven Neumann  <sven@gimp.org>

	* app/core/core-enums.h
	* app/core/core-types.h: moved some more enums into the right place
	and namespacified them.

	* app/undo.c
	* app/core/gimpdrawable-bucket-fill.[ch]
	* app/core/gimpdrawable.c
	* app/core/gimpedit.c
	* app/core/gimpimage-mask.c
	* app/core/gimpimage-new.c
	* app/core/gimpimage-qmask.c
	* app/core/gimplayer.[ch]
	* app/display/gimpdisplayshell-dnd.c
	* app/gui/channels-commands.c
	* app/gui/file-new-dialog.c
	* app/gui/layers-commands.c
	* app/gui/menus.c
	* app/paint-funcs/paint-funcs.c
	* app/tools/gimpbucketfilltool.c
	* tools/pdbgen/pdb/image.pdb
	* tools/pdbgen/pdb/layer.pdb
	* tools/pdbgen/pdb/misc_tools.pdb: changed accordingly.

	* libgimp/gimpcompat.h
	* plug-ins/script-fu/siod-wrapper.c: added compat defines for changed
	GimpMaskApplyMode enum.

	* tools/pdbgen/enums.pl
	* app/pdb/drawable_cmds.c
	* app/pdb/edit_cmds.c
	* app/pdb/image_cmds.c
	* app/pdb/layer_cmds.c
	* app/pdb/misc_tools_cmds.c
	* libgimp/gimpenums.h
	* plug-ins/script-fu/script-fu-constants.c: regenerated.
This commit is contained in:
Sven Neumann 2002-03-18 11:07:34 +00:00 committed by Sven Neumann
parent a177dd1124
commit bba46560ba
42 changed files with 1002 additions and 938 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
ChangeLog
View file

@ -1,3 +1,41 @@
2002-03-18 Sven Neumann <sven@gimp.org>
* app/core/core-enums.h
* app/core/core-types.h: moved some more enums into the right place
and namespacified them.
* app/undo.c
* app/core/gimpdrawable-bucket-fill.[ch]
* app/core/gimpdrawable.c
* app/core/gimpedit.c
* app/core/gimpimage-mask.c
* app/core/gimpimage-new.c
* app/core/gimpimage-qmask.c
* app/core/gimplayer.[ch]
* app/display/gimpdisplayshell-dnd.c
* app/gui/channels-commands.c
* app/gui/file-new-dialog.c
* app/gui/layers-commands.c
* app/gui/menus.c
* app/paint-funcs/paint-funcs.c
* app/tools/gimpbucketfilltool.c
* tools/pdbgen/pdb/image.pdb
* tools/pdbgen/pdb/layer.pdb
* tools/pdbgen/pdb/misc_tools.pdb: changed accordingly.
* libgimp/gimpcompat.h
* plug-ins/script-fu/siod-wrapper.c: added compat defines for changed
GimpMaskApplyMode enum.
* tools/pdbgen/enums.pl
* app/pdb/drawable_cmds.c
* app/pdb/edit_cmds.c
* app/pdb/image_cmds.c
* app/pdb/layer_cmds.c
* app/pdb/misc_tools_cmds.c
* libgimp/gimpenums.h
* plug-ins/script-fu/script-fu-constants.c: regenerated.
2002-03-18 Tuomas Kuosmanen <tigert@ximian.com>
* themes/Default/images/stock-button-eye.png: Added some

4
app/actions/channels-commands.c
View file

@ -232,7 +232,7 @@ new_channel_query_ok_callback (GtkWidget *widget,
gimp_drawable_fill_by_type (GIMP_DRAWABLE (new_channel),
gimp_get_user_context (gimage->gimp),
TRANSPARENT_FILL);
GIMP_TRANSPARENT_FILL);
gimp_image_add_channel (gimage, new_channel, -1);
gdisplays_flush ();
@ -273,7 +273,7 @@ channels_new_channel_query (GimpImage *gimage,
gimp_drawable_fill_by_type (GIMP_DRAWABLE (new_channel),
gimp_get_user_context (gimage->gimp),
TRANSPARENT_FILL);
GIMP_TRANSPARENT_FILL);
gimp_channel_translate (new_channel, off_x, off_y);
gimp_image_add_channel (gimage, new_channel, -1);

50
app/actions/layers-commands.c
View file

@ -299,7 +299,7 @@ layers_apply_layer_mask_cmd_callback (GtkWidget *widget,
flush = ! active_layer->mask->apply_mask || active_layer->mask->show_mask;
gimp_layer_apply_mask (active_layer, APPLY, TRUE);
gimp_layer_apply_mask (active_layer, GIMP_MASK_APPLY, TRUE);
if (flush)
gdisplays_flush ();
@ -320,7 +320,7 @@ layers_delete_layer_mask_cmd_callback (GtkWidget *widget,
flush = active_layer->mask->apply_mask || active_layer->mask->show_mask;
gimp_layer_apply_mask (active_layer, DISCARD, TRUE);
gimp_layer_apply_mask (active_layer, GIMP_MASK_DISCARD, TRUE);
if (flush)
gdisplays_flush ();
@ -425,7 +425,7 @@ struct _NewLayerOptions
GimpImage *gimage;
};
static GimpFillType fill_type = TRANSPARENT_FILL;
static GimpFillType fill_type = GIMP_TRANSPARENT_FILL;
static gchar *layer_name = NULL;
static void
@ -525,7 +525,7 @@ layers_new_layer_query (GimpImage *gimage,
gimp_drawable_fill_by_type (GIMP_DRAWABLE (new_layer),
gimp_get_user_context (gimage->gimp),
TRANSPARENT_FILL);
GIMP_TRANSPARENT_FILL);
gimp_layer_translate (new_layer, off_x, off_y);
gimp_image_add_layer (gimage, new_layer, -1);
@ -651,10 +651,10 @@ layers_new_layer_query (GimpImage *gimage,
&options->fill_type,
GINT_TO_POINTER (options->fill_type),
_("Foreground"), GINT_TO_POINTER (FOREGROUND_FILL), NULL,
_("Background"), GINT_TO_POINTER (BACKGROUND_FILL), NULL,
_("White"), GINT_TO_POINTER (WHITE_FILL), NULL,
_("Transparent"), GINT_TO_POINTER (TRANSPARENT_FILL), NULL,
_("Foreground"), GINT_TO_POINTER (GIMP_FOREGROUND_FILL), NULL,
_("Background"), GINT_TO_POINTER (GIMP_BACKGROUND_FILL), NULL,
_("White"), GINT_TO_POINTER (GIMP_WHITE_FILL), NULL,
_("Transparent"), GINT_TO_POINTER (GIMP_TRANSPARENT_FILL), NULL,
NULL);
@ -796,9 +796,9 @@ typedef struct _AddMaskOptions AddMaskOptions;
struct _AddMaskOptions
{
GtkWidget *query_box;
GimpLayer *layer;
AddMaskType add_mask_type;
GtkWidget *query_box;
GimpLayer *layer;
GimpAddMaskType add_mask_type;
};
static void
@ -832,7 +832,7 @@ layers_add_mask_query (GimpLayer *layer)
/* The new options structure */
options = g_new (AddMaskOptions, 1);
options->layer = layer;
options->add_mask_type = ADD_WHITE_MASK;
options->add_mask_type = GIMP_ADD_WHITE_MASK;
gimage = gimp_item_get_image (GIMP_ITEM (layer));
@ -864,7 +864,7 @@ layers_add_mask_query (GimpLayer *layer)
/* The radio frame and box */
if (gimage->selection_mask)
{
options->add_mask_type = ADD_SELECTION_MASK;
options->add_mask_type = GIMP_ADD_SELECTION_MASK;
frame =
gimp_radio_group_new2 (TRUE, _("Initialize Layer Mask to:"),
@ -873,21 +873,21 @@ layers_add_mask_query (GimpLayer *layer)
GINT_TO_POINTER (options->add_mask_type),
_("Selection"),
GINT_TO_POINTER (ADD_SELECTION_MASK), NULL,
GINT_TO_POINTER (GIMP_ADD_SELECTION_MASK), NULL,
_("Inverse Selection"),
GINT_TO_POINTER (ADD_INVERSE_SELECTION_MASK), NULL,
GINT_TO_POINTER (GIMP_ADD_INVERSE_SELECTION_MASK), NULL,
_("Grayscale Copy of Layer"),
GINT_TO_POINTER (ADD_COPY_MASK), NULL,
GINT_TO_POINTER (GIMP_ADD_COPY_MASK), NULL,
_("Inverse Grayscale Copy of Layer"),
GINT_TO_POINTER (ADD_INVERSE_COPY_MASK), NULL,
GINT_TO_POINTER (GIMP_ADD_INVERSE_COPY_MASK), NULL,
_("White (Full Opacity)"),
GINT_TO_POINTER (ADD_WHITE_MASK), NULL,
GINT_TO_POINTER (GIMP_ADD_WHITE_MASK), NULL,
_("Black (Full Transparency)"),
GINT_TO_POINTER (ADD_BLACK_MASK), NULL,
GINT_TO_POINTER (GIMP_ADD_BLACK_MASK), NULL,
_("Layer's Alpha Channel"),
GINT_TO_POINTER (ADD_ALPHA_MASK), NULL,
GINT_TO_POINTER (GIMP_ADD_ALPHA_MASK), NULL,
NULL);
}
@ -900,16 +900,16 @@ layers_add_mask_query (GimpLayer *layer)
GINT_TO_POINTER (options->add_mask_type),
_("Grayscale Copy of Layer"),
GINT_TO_POINTER (ADD_COPY_MASK), NULL,
GINT_TO_POINTER (GIMP_ADD_COPY_MASK), NULL,
_("Inverse Grayscale Copy of Layer"),
GINT_TO_POINTER (ADD_INVERSE_COPY_MASK), NULL,
GINT_TO_POINTER (GIMP_ADD_INVERSE_COPY_MASK), NULL,
_("White (Full Opacity)"),
GINT_TO_POINTER (ADD_WHITE_MASK), NULL,
GINT_TO_POINTER (GIMP_ADD_WHITE_MASK), NULL,
_("Black (Full Transparency)"),
GINT_TO_POINTER (ADD_BLACK_MASK), NULL,
GINT_TO_POINTER (GIMP_ADD_BLACK_MASK), NULL,
_("Layer's Alpha Channel"),
GINT_TO_POINTER (ADD_ALPHA_MASK), NULL,
GINT_TO_POINTER (GIMP_ADD_ALPHA_MASK), NULL,
NULL);
}

33
app/core/core-enums.h
View file

@ -156,6 +156,22 @@ typedef enum /*< pdb-skip >*/
* non-registered enums; register them if needed
*/
typedef enum /*< skip >*/
{
GIMP_FG_BUCKET_FILL,
GIMP_BG_BUCKET_FILL,
GIMP_PATTERN_BUCKET_FILL
} GimpBucketFillMode;
typedef enum /*< skip >*/
{
GIMP_FOREGROUND_FILL,
GIMP_BACKGROUND_FILL,
GIMP_WHITE_FILL,
GIMP_TRANSPARENT_FILL,
GIMP_NO_FILL
} GimpFillType;
typedef enum /*< pdb-skip >*/ /*< skip >*/
{
GIMP_GRAD_LINEAR = 0,
@ -182,6 +198,23 @@ typedef enum /*< skip >*/
GIMP_INDEXEDA_IMAGE
} GimpImageType;
typedef enum /*< skip >*/
{
GIMP_ADD_WHITE_MASK,
GIMP_ADD_BLACK_MASK,
GIMP_ADD_ALPHA_MASK,
GIMP_ADD_SELECTION_MASK,
GIMP_ADD_INVERSE_SELECTION_MASK,
GIMP_ADD_COPY_MASK,
GIMP_ADD_INVERSE_COPY_MASK
} GimpAddMaskType;
typedef enum /*< skip >*/
{
GIMP_MASK_APPLY,
GIMP_MASK_DISCARD
} GimpMaskApplyMode;
typedef enum /*< skip >*/
{
GIMP_SHADOWS,

33
app/core/core-types.h
View file

@ -36,23 +36,6 @@
/* enums */
typedef enum
{
ADD_WHITE_MASK,
ADD_BLACK_MASK,
ADD_ALPHA_MASK,
ADD_SELECTION_MASK,
ADD_INVERSE_SELECTION_MASK,
ADD_COPY_MASK,
ADD_INVERSE_COPY_MASK
} AddMaskType;
typedef enum
{
APPLY,
DISCARD
} MaskApplyMode;
typedef enum
{
HORIZONTAL,
@ -76,15 +59,6 @@ typedef enum
CHANNEL_OP_INTERSECT
} ChannelOps;
typedef enum
{
FOREGROUND_FILL,
BACKGROUND_FILL,
WHITE_FILL,
TRANSPARENT_FILL,
NO_FILL
} GimpFillType;
typedef enum
{
OFFSET_BACKGROUND,
@ -118,13 +92,6 @@ typedef enum
NODESTRUCT_DITHER = 4 /* NEVER USE NODESTRUCT_DITHER EXPLICITLY */
} ConvertDitherType;
typedef enum
{
FG_BUCKET_FILL,
BG_BUCKET_FILL,
PATTERN_BUCKET_FILL
} BucketFillMode;
typedef enum /*< pdb-skip >*/ /*< skip >*/
{
/* NOTE: If you change this list, please update the textual mapping at

10
app/core/gimp-edit.c
View file

@ -335,21 +335,21 @@ gimp_edit_fill (GimpImage *gimage,
switch (fill_type)
{
case FOREGROUND_FILL:
case GIMP_FOREGROUND_FILL:
gimp_image_get_foreground (gimage, drawable, col);
break;
case BACKGROUND_FILL:
case GIMP_BACKGROUND_FILL:
gimp_image_get_background (gimage, drawable, col);
break;
case WHITE_FILL:
case GIMP_WHITE_FILL:
col[RED_PIX] = 255;
col[GREEN_PIX] = 255;
col[BLUE_PIX] = 255;
break;
case TRANSPARENT_FILL:
case GIMP_TRANSPARENT_FILL:
col[RED_PIX] = 0;
col[GREEN_PIX] = 0;
col[BLUE_PIX] = 0;
@ -357,7 +357,7 @@ gimp_edit_fill (GimpImage *gimage,
col [gimp_drawable_bytes (drawable) - 1] = TRANSPARENT_OPACITY;
break;
case NO_FILL:
case GIMP_NO_FILL:
return TRUE; /* nothing to do, but the fill succeded */
default:

84
app/core/gimpdrawable-bucket-fill.c
View file

@ -48,7 +48,7 @@
/* local function prototypes */
static void gimp_drawable_bucket_fill_region (BucketFillMode fill_mode,
static void gimp_drawable_bucket_fill_region (GimpBucketFillMode fill_mode,
PixelRegion *bufPR,
PixelRegion *maskPR,
guchar *col,
@ -75,15 +75,15 @@ static void gimp_drawable_bucket_fill_line_pattern (guchar *buf,
/* public functions */
void
gimp_drawable_bucket_fill (GimpDrawable *drawable,
BucketFillMode fill_mode,
gint paint_mode,
gdouble opacity,
gboolean fill_transparent,
gdouble threshold,
gboolean sample_merged,
gdouble x,
gdouble y)
gimp_drawable_bucket_fill (GimpDrawable *drawable,
GimpBucketFillMode fill_mode,
gint paint_mode,
gdouble opacity,
gboolean fill_transparent,
gdouble threshold,
gboolean sample_merged,
gdouble x,
gdouble y)
{
GimpImage *gimage;
GimpRGB color;
@ -95,17 +95,17 @@ gimp_drawable_bucket_fill (GimpDrawable *drawable,
g_return_if_fail (GIMP_IS_IMAGE (gimage));
if (fill_mode == FG_BUCKET_FILL)
if (fill_mode == GIMP_FG_BUCKET_FILL)
{
gimp_context_get_foreground (gimp_get_current_context (gimage->gimp),
&color);
}
else if (fill_mode == BG_BUCKET_FILL)
else if (fill_mode == GIMP_BG_BUCKET_FILL)
{
gimp_context_get_background (gimp_get_current_context (gimage->gimp),
&color);
}
else if (fill_mode == PATTERN_BUCKET_FILL)
else if (fill_mode == GIMP_PATTERN_BUCKET_FILL)
{
pattern =
gimp_context_get_pattern (gimp_get_current_context (gimage->gimp));
@ -133,18 +133,18 @@ gimp_drawable_bucket_fill (GimpDrawable *drawable,
}
void
gimp_drawable_bucket_fill_full (GimpDrawable *drawable,
BucketFillMode fill_mode,
const GimpRGB *color,
GimpPattern *pattern,
gint paint_mode,
gdouble opacity,
gboolean do_seed_fill,
gboolean fill_transparent,
gdouble threshold,
gboolean sample_merged,
gdouble x,
gdouble y)
gimp_drawable_bucket_fill_full (GimpDrawable *drawable,
GimpBucketFillMode fill_mode,
const GimpRGB *color,
GimpPattern *pattern,
gint paint_mode,
gdouble opacity,
gboolean do_seed_fill,
gboolean fill_transparent,
gdouble threshold,
gboolean sample_merged,
gdouble x,
gdouble y)
{
GimpImage *gimage;
TileManager *buf_tiles;
@ -158,17 +158,17 @@ gimp_drawable_bucket_fill_full (GimpDrawable *drawable,
gboolean new_buf = FALSE;
g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
g_return_if_fail (fill_mode != PATTERN_BUCKET_FILL ||
g_return_if_fail (fill_mode != GIMP_PATTERN_BUCKET_FILL ||
GIMP_IS_PATTERN (pattern));
g_return_if_fail ((fill_mode != FG_BUCKET_FILL &&
fill_mode != BG_BUCKET_FILL) || color != NULL);
g_return_if_fail ((fill_mode != GIMP_FG_BUCKET_FILL &&
fill_mode != GIMP_BG_BUCKET_FILL) || color != NULL);
gimage = gimp_item_get_image (GIMP_ITEM (drawable));
g_return_if_fail (GIMP_IS_IMAGE (gimage));
if (fill_mode == FG_BUCKET_FILL ||
fill_mode == BG_BUCKET_FILL)
if (fill_mode == GIMP_FG_BUCKET_FILL ||
fill_mode == GIMP_BG_BUCKET_FILL)
{
guchar tmp_col[MAX_CHANNELS];
@ -176,7 +176,7 @@ gimp_drawable_bucket_fill_full (GimpDrawable *drawable,
gimp_image_transform_color (gimage, drawable, tmp_col, col, GIMP_RGB);
}
else if (fill_mode == PATTERN_BUCKET_FILL)
else if (fill_mode == GIMP_PATTERN_BUCKET_FILL)
{
/* If the pattern doesn't match the image in terms of color type,
* transform it. (ie pattern is RGB, image is indexed)
@ -320,14 +320,14 @@ gimp_drawable_bucket_fill_full (GimpDrawable *drawable,
/* private functions */
static void
gimp_drawable_bucket_fill_region (BucketFillMode fill_mode,
PixelRegion *bufPR,
PixelRegion *maskPR,
guchar *col,
TempBuf *pattern,
gint off_x,
gint off_y,
gboolean has_alpha)
gimp_drawable_bucket_fill_region (GimpBucketFillMode fill_mode,
PixelRegion *bufPR,
PixelRegion *maskPR,
guchar *col,
TempBuf *pattern,
gint off_x,
gint off_y,
gboolean has_alpha)
{
guchar *s, *m;
gint y;
@ -347,14 +347,14 @@ gimp_drawable_bucket_fill_region (BucketFillMode fill_mode,
{
switch (fill_mode)
{
case FG_BUCKET_FILL:
case BG_BUCKET_FILL:
case GIMP_FG_BUCKET_FILL:
case GIMP_BG_BUCKET_FILL:
gimp_drawable_bucket_fill_line_color (s, m,
col,
has_alpha,
bufPR->bytes, bufPR->w);
break;
case PATTERN_BUCKET_FILL:
case GIMP_PATTERN_BUCKET_FILL:
gimp_drawable_bucket_fill_line_pattern (s, m,
pattern,
has_alpha,

42
app/core/gimpdrawable-bucket-fill.h
View file

@ -20,28 +20,28 @@
#define __GIMP_DRAWABLE_BUCKET_FILL_H__
void gimp_drawable_bucket_fill (GimpDrawable *drawable,
BucketFillMode fill_mode,
gint paint_mode,
gdouble opacity,
gboolean fill_transparent,
gdouble threshold,
gboolean sample_merged,
gdouble x,
gdouble y);
void gimp_drawable_bucket_fill (GimpDrawable *drawable,
GimpBucketFillMode fill_mode,
gint paint_mode,
gdouble opacity,
gboolean fill_transparent,
gdouble threshold,
gboolean sample_merged,
gdouble x,
gdouble y);
void gimp_drawable_bucket_fill_full (GimpDrawable *drawable,
BucketFillMode fill_mode,
const GimpRGB *color,
GimpPattern *pattern,
gint paint_mode,
gdouble opacity,
gboolean do_seed_fill,
gboolean fill_transparent,
gdouble threshold,
gboolean sample_merged,
gdouble x,
gdouble y);
void gimp_drawable_bucket_fill_full (GimpDrawable *drawable,
GimpBucketFillMode fill_mode,
const GimpRGB *color,
GimpPattern *pattern,
gint paint_mode,
gdouble opacity,
gboolean do_seed_fill,
gboolean fill_transparent,
gdouble threshold,
gboolean sample_merged,
gdouble x,
gdouble y);
#endif /* __GIMP_DRAWABLE_BUCKET_FILL_H__ */

10
app/core/gimpdrawable.c
View file

@ -508,23 +508,23 @@ gimp_drawable_fill_by_type (GimpDrawable *drawable,
switch (fill_type)
{
case FOREGROUND_FILL:
case GIMP_FOREGROUND_FILL:
gimp_context_get_foreground (context, &color);
break;
case BACKGROUND_FILL:
case GIMP_BACKGROUND_FILL:
gimp_context_get_background (context, &color);
break;
case WHITE_FILL:
case GIMP_WHITE_FILL:
gimp_rgb_set (&color, 1.0, 1.0, 1.0);
break;
case TRANSPARENT_FILL:
case GIMP_TRANSPARENT_FILL:
gimp_rgba_set (&color, 0.0, 0.0, 0.0, GIMP_OPACITY_TRANSPARENT);
break;
case NO_FILL:
case GIMP_NO_FILL:
return;
default:

10
app/core/gimpedit.c
View file

@ -335,21 +335,21 @@ gimp_edit_fill (GimpImage *gimage,
switch (fill_type)
{
case FOREGROUND_FILL:
case GIMP_FOREGROUND_FILL:
gimp_image_get_foreground (gimage, drawable, col);
break;
case BACKGROUND_FILL:
case GIMP_BACKGROUND_FILL:
gimp_image_get_background (gimage, drawable, col);
break;
case WHITE_FILL:
case GIMP_WHITE_FILL:
col[RED_PIX] = 255;
col[GREEN_PIX] = 255;
col[BLUE_PIX] = 255;
break;
case TRANSPARENT_FILL:
case GIMP_TRANSPARENT_FILL:
col[RED_PIX] = 0;
col[GREEN_PIX] = 0;
col[BLUE_PIX] = 0;
@ -357,7 +357,7 @@ gimp_edit_fill (GimpImage *gimage,
col [gimp_drawable_bytes (drawable) - 1] = TRANSPARENT_OPACITY;
break;
case NO_FILL:
case GIMP_NO_FILL:
return TRUE; /* nothing to do, but the fill succeded */
default:

2
app/core/gimpimage-mask.c
View file

@ -352,7 +352,7 @@ gimp_image_mask_extract (GimpImage *gimage,
else if (GIMP_IS_LAYER_MASK (drawable))
{
gimp_layer_apply_mask (gimp_layer_mask_get_layer (GIMP_LAYER_MASK (drawable)),
DISCARD, TRUE);
GIMP_MASK_DISCARD, TRUE);
}
else if (GIMP_IS_CHANNEL (drawable))
{

24
app/core/gimpimage-new.c
View file

@ -64,25 +64,25 @@ gimp_image_new_init (Gimp *gimp)
/* Available Fill Types */
new_fill_type = g_new (GimpFillTypeName, 1);
new_fill_type->type = FOREGROUND_FILL;
new_fill_type->type = GIMP_FOREGROUND_FILL;
new_fill_type->name = _("Foreground");
gimp->fill_type_names = g_list_append (gimp->fill_type_names, new_fill_type);
new_fill_type = g_new (GimpFillTypeName, 1);
new_fill_type->type = BACKGROUND_FILL;
new_fill_type->type = GIMP_BACKGROUND_FILL;
new_fill_type->name = _("Background");
gimp->fill_type_names = g_list_append (gimp->fill_type_names, new_fill_type);
new_fill_type = g_new (GimpFillTypeName, 1);
new_fill_type->type = WHITE_FILL;
new_fill_type->type = GIMP_WHITE_FILL;
new_fill_type->name = _("White");
gimp->fill_type_names = g_list_append (gimp->fill_type_names, new_fill_type);
new_fill_type = g_new (GimpFillTypeName, 1);
new_fill_type->type = TRANSPARENT_FILL;
new_fill_type->type = GIMP_TRANSPARENT_FILL;
new_fill_type->name = _("Transparent");
gimp->fill_type_names = g_list_append (gimp->fill_type_names, new_fill_type);
@ -96,7 +96,7 @@ gimp_image_new_init (Gimp *gimp)
gimp->image_new_last_values.yresolution = gimp->config->default_yresolution;
gimp->image_new_last_values.res_unit = gimp->config->default_resolution_units;
gimp->image_new_last_values.type = gimp->config->default_type;
gimp->image_new_last_values.fill_type = BACKGROUND_FILL;
gimp->image_new_last_values.fill_type = GIMP_BACKGROUND_FILL;
gimp->have_current_cut_buffer = FALSE;
}
@ -187,9 +187,9 @@ gimp_image_new_calculate_memsize (GimpImageNewValues *values)
{
gint channels;
channels = ((values->type == GIMP_RGB ? 3 : 1) /* color */ +
(values->fill_type == TRANSPARENT_FILL) /* alpha */ +
1 /* selection */);
channels = ((values->type == GIMP_RGB ? 3 : 1) /* color */ +
(values->fill_type == GIMP_TRANSPARENT_FILL) /* alpha */ +
1 /* selection */);
return channels * values->width * values->height;
}
@ -244,12 +244,12 @@ gimp_image_new_create_image (Gimp *gimp,
switch (values->fill_type)
{
case FOREGROUND_FILL:
case BACKGROUND_FILL:
case WHITE_FILL:
case GIMP_FOREGROUND_FILL:
case GIMP_BACKGROUND_FILL:
case GIMP_WHITE_FILL:
type = (values->type == GIMP_RGB) ? GIMP_RGB_IMAGE : GIMP_GRAY_IMAGE;
break;
case TRANSPARENT_FILL:
case GIMP_TRANSPARENT_FILL:
type = (values->type == GIMP_RGB) ? GIMP_RGBA_IMAGE : GIMP_GRAYA_IMAGE;
break;
default:

2
app/core/gimpimage-qmask.c
View file

@ -89,7 +89,7 @@ gimp_image_set_qmask_state (GimpImage *gimage,
gimp_drawable_fill_by_type (GIMP_DRAWABLE (mask),
gimp_get_current_context (gimage->gimp),
TRANSPARENT_FILL);
GIMP_TRANSPARENT_FILL);
}
else /* if selection */
{

2
app/core/gimpimage-quick-mask.c
View file

@ -89,7 +89,7 @@ gimp_image_set_qmask_state (GimpImage *gimage,
gimp_drawable_fill_by_type (GIMP_DRAWABLE (mask),
gimp_get_current_context (gimage->gimp),
TRANSPARENT_FILL);
GIMP_TRANSPARENT_FILL);
}
else /* if selection */
{

2
app/core/gimpimage-undo-push.c
View file

@ -1917,7 +1917,7 @@ undo_pop_layer_mask (GimpImage *gimage,
{
/* remove layer mask */
gimp_layer_apply_mask (lmu->layer, DISCARD, FALSE);
gimp_layer_apply_mask (lmu->layer, GIMP_MASK_DISCARD, FALSE);
}
else
{

45
app/core/gimplayer.c
View file

@ -607,7 +607,7 @@ gimp_layer_add_mask (GimpLayer *layer,
GimpLayerMask *
gimp_layer_create_mask (const GimpLayer *layer,
AddMaskType add_mask_type)
GimpAddMaskType add_mask_type)
{
PixelRegion srcPR;
PixelRegion destPR;
@ -639,7 +639,7 @@ gimp_layer_create_mask (const GimpLayer *layer,
switch (add_mask_type)
{
case ADD_WHITE_MASK:
case GIMP_ADD_WHITE_MASK:
{
guchar white_mask = OPAQUE_OPACITY;
@ -647,7 +647,7 @@ gimp_layer_create_mask (const GimpLayer *layer,
}
break;
case ADD_BLACK_MASK:
case GIMP_ADD_BLACK_MASK:
{
guchar black_mask = TRANSPARENT_OPACITY;
@ -655,7 +655,7 @@ gimp_layer_create_mask (const GimpLayer *layer,
}
break;
case ADD_ALPHA_MASK:
case GIMP_ADD_ALPHA_MASK:
if (gimp_drawable_has_alpha (GIMP_DRAWABLE (layer)))
{
pixel_region_init (&srcPR, GIMP_DRAWABLE (layer)->tiles,
@ -667,8 +667,8 @@ gimp_layer_create_mask (const GimpLayer *layer,
}
break;
case ADD_SELECTION_MASK:
case ADD_INVERSE_SELECTION_MASK:
case GIMP_ADD_SELECTION_MASK:
case GIMP_ADD_INVERSE_SELECTION_MASK:
{
GimpDrawable *selection;
@ -684,8 +684,8 @@ gimp_layer_create_mask (const GimpLayer *layer,
}
break;
case ADD_COPY_MASK:
case ADD_INVERSE_COPY_MASK:
case GIMP_ADD_COPY_MASK:
case GIMP_ADD_INVERSE_COPY_MASK:
{
TileManager *copy_tiles;
GimpImageType layer_type;
@ -726,15 +726,15 @@ gimp_layer_create_mask (const GimpLayer *layer,
switch (add_mask_type)
{
case ADD_WHITE_MASK:
case ADD_BLACK_MASK:
case ADD_ALPHA_MASK:
case ADD_SELECTION_MASK:
case ADD_COPY_MASK:
case GIMP_ADD_WHITE_MASK:
case GIMP_ADD_BLACK_MASK:
case GIMP_ADD_ALPHA_MASK:
case GIMP_ADD_SELECTION_MASK:
case GIMP_ADD_COPY_MASK:
break;
case ADD_INVERSE_SELECTION_MASK:
case ADD_INVERSE_COPY_MASK:
case GIMP_ADD_INVERSE_SELECTION_MASK:
case GIMP_ADD_INVERSE_COPY_MASK:
gimp_drawable_invert (GIMP_DRAWABLE (mask));
break;
}
@ -743,9 +743,9 @@ gimp_layer_create_mask (const GimpLayer *layer,
}
void
gimp_layer_apply_mask (GimpLayer *layer,
MaskApplyMode mode,
gboolean push_undo)
gimp_layer_apply_mask (GimpLayer *layer,
GimpMaskApplyMode mode,
gboolean push_undo)
{
GimpImage *gimage;
gint off_x;
@ -775,13 +775,16 @@ gimp_layer_apply_mask (GimpLayer *layer,
}
/* check if applying the mask changes the projection */
if ((mode == APPLY && (! layer->mask->apply_mask || layer->mask->show_mask)) ||
(mode == DISCARD && ( layer->mask->apply_mask || layer->mask->show_mask)))
if ((mode == GIMP_MASK_APPLY &&
(! layer->mask->apply_mask || layer->mask->show_mask))
||
(mode == GIMP_MASK_DISCARD &&
( layer->mask->apply_mask || layer->mask->show_mask)))
{
view_changed = TRUE;
}
if (mode == APPLY)
if (mode == GIMP_MASK_APPLY)
{
if (push_undo)
{

4
app/core/gimplayer.h
View file

@ -97,12 +97,12 @@ gboolean gimp_layer_check_scaling (const GimpLayer *layer,
gint new_width,
gint new_height);
GimpLayerMask * gimp_layer_create_mask (const GimpLayer *layer,
AddMaskType mask_type);
GimpAddMaskType mask_type);
GimpLayerMask * gimp_layer_add_mask (GimpLayer *layer,
GimpLayerMask *mask,
gboolean push_undo);
void gimp_layer_apply_mask (GimpLayer *layer,
MaskApplyMode mode,
GimpMaskApplyMode mode,
gboolean push_undo);
void gimp_layer_translate (GimpLayer *layer,
gint off_x,

2
app/dialogs/image-new-dialog.c
View file

@ -532,7 +532,7 @@ file_new_reset_callback (GtkWidget *widget,
GINT_TO_POINTER (info->gimp->config->default_type));
gimp_radio_group_set_active (GTK_RADIO_BUTTON (info->fill_type_w[0]),
GINT_TO_POINTER (BACKGROUND_FILL));
GINT_TO_POINTER (GIMP_BACKGROUND_FILL));
}
static void

12
app/display/gimpdisplayshell-dnd.c
View file

@ -80,10 +80,10 @@ gimp_display_shell_drop_drawable (GtkWidget *widget,
}
static void
gimp_display_shell_bucket_fill (GimpImage *gimage,
BucketFillMode fill_mode,
const GimpRGB *color,
GimpPattern *pattern)
gimp_display_shell_bucket_fill (GimpImage *gimage,
GimpBucketFillMode fill_mode,
const GimpRGB *color,
GimpPattern *pattern)
{
GimpDrawable *drawable;
GimpToolInfo *tool_info;
@ -134,7 +134,7 @@ gimp_display_shell_drop_pattern (GtkWidget *widget,
if (GIMP_IS_PATTERN (viewable))
{
gimp_display_shell_bucket_fill (gdisp->gimage,
PATTERN_BUCKET_FILL,
GIMP_PATTERN_BUCKET_FILL,
NULL,
GIMP_PATTERN (viewable));
}
@ -150,7 +150,7 @@ gimp_display_shell_drop_color (GtkWidget *widget,
gdisp = GIMP_DISPLAY_SHELL (data)->gdisp;
gimp_display_shell_bucket_fill (gdisp->gimage,
FG_BUCKET_FILL,
GIMP_FG_BUCKET_FILL,
color,
NULL);
}

4
app/gui/channels-commands.c
View file

@ -232,7 +232,7 @@ new_channel_query_ok_callback (GtkWidget *widget,
gimp_drawable_fill_by_type (GIMP_DRAWABLE (new_channel),
gimp_get_user_context (gimage->gimp),
TRANSPARENT_FILL);
GIMP_TRANSPARENT_FILL);
gimp_image_add_channel (gimage, new_channel, -1);
gdisplays_flush ();
@ -273,7 +273,7 @@ channels_new_channel_query (GimpImage *gimage,
gimp_drawable_fill_by_type (GIMP_DRAWABLE (new_channel),
gimp_get_user_context (gimage->gimp),
TRANSPARENT_FILL);
GIMP_TRANSPARENT_FILL);
gimp_channel_translate (new_channel, off_x, off_y);
gimp_image_add_channel (gimage, new_channel, -1);

2
app/gui/file-new-dialog.c
View file

@ -532,7 +532,7 @@ file_new_reset_callback (GtkWidget *widget,
GINT_TO_POINTER (info->gimp->config->default_type));
gimp_radio_group_set_active (GTK_RADIO_BUTTON (info->fill_type_w[0]),
GINT_TO_POINTER (BACKGROUND_FILL));
GINT_TO_POINTER (GIMP_BACKGROUND_FILL));
}
static void

50
app/gui/layers-commands.c
View file

@ -299,7 +299,7 @@ layers_apply_layer_mask_cmd_callback (GtkWidget *widget,
flush = ! active_layer->mask->apply_mask || active_layer->mask->show_mask;
gimp_layer_apply_mask (active_layer, APPLY, TRUE);
gimp_layer_apply_mask (active_layer, GIMP_MASK_APPLY, TRUE);
if (flush)
gdisplays_flush ();
@ -320,7 +320,7 @@ layers_delete_layer_mask_cmd_callback (GtkWidget *widget,
flush = active_layer->mask->apply_mask || active_layer->mask->show_mask;
gimp_layer_apply_mask (active_layer, DISCARD, TRUE);
gimp_layer_apply_mask (active_layer, GIMP_MASK_DISCARD, TRUE);
if (flush)
gdisplays_flush ();
@ -425,7 +425,7 @@ struct _NewLayerOptions
GimpImage *gimage;
};
static GimpFillType fill_type = TRANSPARENT_FILL;
static GimpFillType fill_type = GIMP_TRANSPARENT_FILL;
static gchar *layer_name = NULL;
static void
@ -525,7 +525,7 @@ layers_new_layer_query (GimpImage *gimage,
gimp_drawable_fill_by_type (GIMP_DRAWABLE (new_layer),
gimp_get_user_context (gimage->gimp),
TRANSPARENT_FILL);
GIMP_TRANSPARENT_FILL);
gimp_layer_translate (new_layer, off_x, off_y);
gimp_image_add_layer (gimage, new_layer, -1);
@ -651,10 +651,10 @@ layers_new_layer_query (GimpImage *gimage,
&options->fill_type,
GINT_TO_POINTER (options->fill_type),
_("Foreground"), GINT_TO_POINTER (FOREGROUND_FILL), NULL,
_("Background"), GINT_TO_POINTER (BACKGROUND_FILL), NULL,
_("White"), GINT_TO_POINTER (WHITE_FILL), NULL,
_("Transparent"), GINT_TO_POINTER (TRANSPARENT_FILL), NULL,
_("Foreground"), GINT_TO_POINTER (GIMP_FOREGROUND_FILL), NULL,
_("Background"), GINT_TO_POINTER (GIMP_BACKGROUND_FILL), NULL,
_("White"), GINT_TO_POINTER (GIMP_WHITE_FILL), NULL,
_("Transparent"), GINT_TO_POINTER (GIMP_TRANSPARENT_FILL), NULL,
NULL);
@ -796,9 +796,9 @@ typedef struct _AddMaskOptions AddMaskOptions;
struct _AddMaskOptions
{
GtkWidget *query_box;
GimpLayer *layer;
AddMaskType add_mask_type;
GtkWidget *query_box;
GimpLayer *layer;
GimpAddMaskType add_mask_type;
};
static void
@ -832,7 +832,7 @@ layers_add_mask_query (GimpLayer *layer)
/* The new options structure */
options = g_new (AddMaskOptions, 1);
options->layer = layer;
options->add_mask_type = ADD_WHITE_MASK;
options->add_mask_type = GIMP_ADD_WHITE_MASK;
gimage = gimp_item_get_image (GIMP_ITEM (layer));
@ -864,7 +864,7 @@ layers_add_mask_query (GimpLayer *layer)
/* The radio frame and box */
if (gimage->selection_mask)
{
options->add_mask_type = ADD_SELECTION_MASK;
options->add_mask_type = GIMP_ADD_SELECTION_MASK;
frame =
gimp_radio_group_new2 (TRUE, _("Initialize Layer Mask to:"),
@ -873,21 +873,21 @@ layers_add_mask_query (GimpLayer *layer)
GINT_TO_POINTER (options->add_mask_type),
_("Selection"),
GINT_TO_POINTER (ADD_SELECTION_MASK), NULL,
GINT_TO_POINTER (GIMP_ADD_SELECTION_MASK), NULL,
_("Inverse Selection"),
GINT_TO_POINTER (ADD_INVERSE_SELECTION_MASK), NULL,
GINT_TO_POINTER (GIMP_ADD_INVERSE_SELECTION_MASK), NULL,
_("Grayscale Copy of Layer"),
GINT_TO_POINTER (ADD_COPY_MASK), NULL,
GINT_TO_POINTER (GIMP_ADD_COPY_MASK), NULL,
_("Inverse Grayscale Copy of Layer"),
GINT_TO_POINTER (ADD_INVERSE_COPY_MASK), NULL,
GINT_TO_POINTER (GIMP_ADD_INVERSE_COPY_MASK), NULL,
_("White (Full Opacity)"),
GINT_TO_POINTER (ADD_WHITE_MASK), NULL,
GINT_TO_POINTER (GIMP_ADD_WHITE_MASK), NULL,
_("Black (Full Transparency)"),
GINT_TO_POINTER (ADD_BLACK_MASK), NULL,
GINT_TO_POINTER (GIMP_ADD_BLACK_MASK), NULL,
_("Layer's Alpha Channel"),
GINT_TO_POINTER (ADD_ALPHA_MASK), NULL,
GINT_TO_POINTER (GIMP_ADD_ALPHA_MASK), NULL,
NULL);
}
@ -900,16 +900,16 @@ layers_add_mask_query (GimpLayer *layer)
GINT_TO_POINTER (options->add_mask_type),
_("Grayscale Copy of Layer"),
GINT_TO_POINTER (ADD_COPY_MASK), NULL,
GINT_TO_POINTER (GIMP_ADD_COPY_MASK), NULL,
_("Inverse Grayscale Copy of Layer"),
GINT_TO_POINTER (ADD_INVERSE_COPY_MASK), NULL,
GINT_TO_POINTER (GIMP_ADD_INVERSE_COPY_MASK), NULL,
_("White (Full Opacity)"),
GINT_TO_POINTER (ADD_WHITE_MASK), NULL,
GINT_TO_POINTER (GIMP_ADD_WHITE_MASK), NULL,
_("Black (Full Transparency)"),
GINT_TO_POINTER (ADD_BLACK_MASK), NULL,
GINT_TO_POINTER (GIMP_ADD_BLACK_MASK), NULL,
_("Layer's Alpha Channel"),
GINT_TO_POINTER (ADD_ALPHA_MASK), NULL,
GINT_TO_POINTER (GIMP_ADD_ALPHA_MASK), NULL,
NULL);
}

4
app/gui/menus.c
View file

@ -387,12 +387,12 @@ static GimpItemFactoryEntry image_entries[] =
NULL,
"edit/clear.html", NULL },
{ { N_("/Edit/Fill with FG Color"), "<control>comma",
edit_fill_cmd_callback, (guint) FOREGROUND_FILL,
edit_fill_cmd_callback, (guint) GIMP_FOREGROUND_FILL,
"<StockItem>", GIMP_STOCK_TOOL_BUCKET_FILL },
NULL,
"edit/fill.html", NULL },
{ { N_("/Edit/Fill with BG Color"), "<control>period",
edit_fill_cmd_callback, (guint) BACKGROUND_FILL,
edit_fill_cmd_callback, (guint) GIMP_BACKGROUND_FILL,
"<StockItem>", GIMP_STOCK_TOOL_BUCKET_FILL },
NULL,
"edit/fill.html", NULL },

4
app/menus/menus.c
View file

@ -387,12 +387,12 @@ static GimpItemFactoryEntry image_entries[] =
NULL,
"edit/clear.html", NULL },
{ { N_("/Edit/Fill with FG Color"), "<control>comma",
edit_fill_cmd_callback, (guint) FOREGROUND_FILL,
edit_fill_cmd_callback, (guint) GIMP_FOREGROUND_FILL,
"<StockItem>", GIMP_STOCK_TOOL_BUCKET_FILL },
NULL,
"edit/fill.html", NULL },
{ { N_("/Edit/Fill with BG Color"), "<control>period",
edit_fill_cmd_callback, (guint) BACKGROUND_FILL,
edit_fill_cmd_callback, (guint) GIMP_BACKGROUND_FILL,
"<StockItem>", GIMP_STOCK_TOOL_BUCKET_FILL },
NULL,
"edit/fill.html", NULL },

1164
app/paint-funcs/paint-funcs.c
View file

File diff suppressed because it is too large Load diff

4
app/pdb/drawable_cmds.c
View file

@ -158,7 +158,7 @@ drawable_fill_invoker (Gimp *gimp,
success = FALSE;
fill_type = args[1].value.pdb_int;
if (fill_type < FOREGROUND_FILL || fill_type > NO_FILL)
if (fill_type < GIMP_FOREGROUND_FILL || fill_type > GIMP_NO_FILL)
success = FALSE;
if (success)
@ -177,7 +177,7 @@ static ProcArg drawable_fill_inargs[] =
{
GIMP_PDB_INT32,
"fill_type",
"The type of fill: FOREGROUND_FILL (0), BACKGROUND_FILL (1), WHITE_FILL (2), TRANSPARENT_FILL (3), NO_FILL (4)"
"The type of fill: GIMP_FOREGROUND_FILL (0), GIMP_BACKGROUND_FILL (1), GIMP_WHITE_FILL (2), GIMP_TRANSPARENT_FILL (3), GIMP_NO_FILL (4)"
}
};

6
app/pdb/edit_cmds.c
View file

@ -28,7 +28,7 @@
#include "pdb-types.h"
#include "procedural_db.h"
#include "core/core-types.h"
#include "core/core-enums.h"
#include "core/gimp.h"
#include "core/gimpdrawable.h"
#include "core/gimpedit.h"
@ -277,7 +277,7 @@ edit_fill_invoker (Gimp *gimp,
success = FALSE;
fill_type = args[1].value.pdb_int;
if (fill_type < FOREGROUND_FILL || fill_type > NO_FILL)
if (fill_type < GIMP_FOREGROUND_FILL || fill_type > GIMP_NO_FILL)
success = FALSE;
if (success)
@ -299,7 +299,7 @@ static ProcArg edit_fill_inargs[] =
{
GIMP_PDB_INT32,
"fill_type",
"The type of fill: FOREGROUND_FILL (0), BACKGROUND_FILL (1), WHITE_FILL (2), TRANSPARENT_FILL (3), NO_FILL (4)"
"The type of fill: GIMP_FOREGROUND_FILL (0), GIMP_BACKGROUND_FILL (1), GIMP_WHITE_FILL (2), GIMP_TRANSPARENT_FILL (3), GIMP_NO_FILL (4)"
}
};

4
app/pdb/image_cmds.c
View file

@ -1662,7 +1662,7 @@ image_remove_layer_mask_invoker (Gimp *gimp,
success = FALSE;
mode = args[2].value.pdb_int;
if (mode < APPLY || mode > DISCARD)
if (mode < GIMP_MASK_APPLY || mode > GIMP_MASK_DISCARD)
success = FALSE;
if (success)
@ -1686,7 +1686,7 @@ static ProcArg image_remove_layer_mask_inargs[] =
{
GIMP_PDB_INT32,
"mode",
"Removal mode: { APPLY (0), DISCARD (1) }"
"Removal mode: { GIMP_MASK_APPLY (0), GIMP_MASK_DISCARD (1) }"
}
};

7
app/pdb/layer_cmds.c
View file

@ -30,7 +30,6 @@
#include "base/base-enums.h"
#include "core/core-enums.h"
#include "core/core-types.h"
#include "core/gimp.h"
#include "core/gimpcoreconfig.h"
#include "core/gimpimage.h"
@ -313,11 +312,11 @@ layer_create_mask_invoker (Gimp *gimp,
success = FALSE;
mask_type = args[1].value.pdb_int;
if (mask_type < ADD_WHITE_MASK || mask_type > ADD_INVERSE_COPY_MASK)
if (mask_type < GIMP_ADD_WHITE_MASK || mask_type > GIMP_ADD_INVERSE_COPY_MASK)
success = FALSE;
if (success)
success = (mask = gimp_layer_create_mask (layer, (AddMaskType) mask_type)) != NULL;
success = (mask = gimp_layer_create_mask (layer, (GimpAddMaskType) mask_type)) != NULL;
return_args = procedural_db_return_args (&layer_create_mask_proc, success);
@ -337,7 +336,7 @@ static ProcArg layer_create_mask_inargs[] =
{
GIMP_PDB_INT32,
"mask_type",
"The type of mask: { ADD_WHITE_MASK (0), ADD_BLACK_MASK (1), ADD_ALPHA_MASK (2), ADD_SELECTION_MASK (3), ADD_INVERSE_SELECTION_MASK (4), ADD_COPY_MASK (5), ADD_INVERSE_COPY_MASK (6) }"
"The type of mask: { GIMP_ADD_WHITE_MASK (0), GIMP_ADD_BLACK_MASK (1), GIMP_ADD_ALPHA_MASK (2), GIMP_ADD_SELECTION_MASK (3), GIMP_ADD_INVERSE_SELECTION_MASK (4), GIMP_ADD_COPY_MASK (5), GIMP_ADD_INVERSE_COPY_MASK (6) }"
}
};

5
app/pdb/misc_tools_cmds.c
View file

@ -30,7 +30,6 @@
#include "base/base-enums.h"
#include "core/core-enums.h"
#include "core/core-types.h"
#include "core/gimpdrawable-blend.h"
#include "core/gimpdrawable-bucket-fill.h"
#include "core/gimpdrawable.h"
@ -251,7 +250,7 @@ bucket_fill_invoker (Gimp *gimp,
success = FALSE;
fill_mode = args[1].value.pdb_int;
if (fill_mode < FG_BUCKET_FILL || fill_mode > PATTERN_BUCKET_FILL)
if (fill_mode < GIMP_FG_BUCKET_FILL || fill_mode > GIMP_PATTERN_BUCKET_FILL)
success = FALSE;
paint_mode = args[2].value.pdb_int;
@ -300,7 +299,7 @@ static ProcArg bucket_fill_inargs[] =
{
GIMP_PDB_INT32,
"fill_mode",
"The type of fill: { FG_BUCKET_FILL (0), BG_BUCKET_FILL (1), PATTERN_BUCKET_FILL (2) }"
"The type of fill: { GIMP_FG_BUCKET_FILL (0), GIMP_BG_BUCKET_FILL (1), GIMP_PATTERN_BUCKET_FILL (2) }"
},
{
GIMP_PDB_INT32,

48
app/tools/gimpbucketfilltool.c
View file

@ -51,23 +51,23 @@ typedef struct _BucketOptions BucketOptions;
struct _BucketOptions
{
GimpPaintOptions paint_options;
GimpPaintOptions paint_options;
gboolean fill_transparent;
gboolean fill_transparent_d;
GtkWidget *fill_transparent_w;
gboolean fill_transparent;
gboolean fill_transparent_d;
GtkWidget *fill_transparent_w;
gboolean sample_merged;
gboolean sample_merged_d;
GtkWidget *sample_merged_w;
gboolean sample_merged;
gboolean sample_merged_d;
GtkWidget *sample_merged_w;
gdouble threshold;
/* gdouble threshold_d; (from gimprc) */
GtkObject *threshold_w;
gdouble threshold;
/* gdouble threshold_d; (from gimprc) */
GtkObject *threshold_w;
BucketFillMode fill_mode;
BucketFillMode fill_mode_d;
GtkWidget *fill_mode_w[3];
GimpBucketFillMode fill_mode;
GimpBucketFillMode fill_mode_d;
GtkWidget *fill_mode_w[3];
};
@ -262,15 +262,15 @@ gimp_bucket_fill_tool_modifier_key (GimpTool *tool,
{
switch (options->fill_mode)
{
case FG_BUCKET_FILL:
case GIMP_FG_BUCKET_FILL:
gimp_radio_group_set_active
(GTK_RADIO_BUTTON (options->fill_mode_w[0]),
GINT_TO_POINTER (BG_BUCKET_FILL));
GINT_TO_POINTER (GIMP_BG_BUCKET_FILL));
break;
case BG_BUCKET_FILL:
case GIMP_BG_BUCKET_FILL:
gimp_radio_group_set_active
(GTK_RADIO_BUTTON (options->fill_mode_w[0]),
GINT_TO_POINTER (FG_BUCKET_FILL));
GINT_TO_POINTER (GIMP_FG_BUCKET_FILL));
break;
default:
break;
@ -308,13 +308,13 @@ gimp_bucket_fill_tool_cursor_update (GimpTool *tool,
{
switch (options->fill_mode)
{
case FG_BUCKET_FILL:
case GIMP_FG_BUCKET_FILL:
cmodifier = GIMP_CURSOR_MODIFIER_FOREGROUND;
break;
case BG_BUCKET_FILL:
case GIMP_BG_BUCKET_FILL:
cmodifier = GIMP_CURSOR_MODIFIER_BACKGROUND;
break;
case PATTERN_BUCKET_FILL:
case GIMP_PATTERN_BUCKET_FILL:
cmodifier = GIMP_CURSOR_MODIFIER_PATTERN;
break;
}
@ -348,7 +348,7 @@ bucket_options_new (GimpToolInfo *tool_info)
options->fill_transparent = options->fill_transparent_d = TRUE;
options->sample_merged = options->sample_merged_d = FALSE;
options->threshold = gimprc.default_threshold;
options->fill_mode = options->fill_mode_d = FG_BUCKET_FILL;
options->fill_mode = options->fill_mode_d = GIMP_FG_BUCKET_FILL;
/* the main vbox */
vbox = ((GimpToolOptions *) options)->main_vbox;
@ -360,15 +360,15 @@ bucket_options_new (GimpToolInfo *tool_info)
GINT_TO_POINTER (options->fill_mode),
_("FG Color Fill"),
GINT_TO_POINTER (FG_BUCKET_FILL),
GINT_TO_POINTER (GIMP_FG_BUCKET_FILL),
&options->fill_mode_w[0],
_("BG Color Fill"),
GINT_TO_POINTER (BG_BUCKET_FILL),
GINT_TO_POINTER (GIMP_BG_BUCKET_FILL),
&options->fill_mode_w[1],
_("Pattern Fill"),
GINT_TO_POINTER (PATTERN_BUCKET_FILL),
GINT_TO_POINTER (GIMP_PATTERN_BUCKET_FILL),
&options->fill_mode_w[2],
NULL);

2
app/undo.c
View file

@ -1917,7 +1917,7 @@ undo_pop_layer_mask (GimpImage *gimage,
{
/* remove layer mask */
gimp_layer_apply_mask (lmu->layer, DISCARD, FALSE);
gimp_layer_apply_mask (lmu->layer, GIMP_MASK_DISCARD, FALSE);
}
else
{

46
devel-docs/libgimp/tmpl/gimpenums.sgml
View file

@ -20,23 +20,23 @@ Enums and definitions.
</para>
@GIMP_WHITE_MASK:
@GIMP_BLACK_MASK:
@GIMP_ALPHA_MASK:
@GIMP_SELECTION_MASK:
@GIMP_INV_SELECTION_MASK:
@GIMP_COPY_MASK:
@GIMP_INV_COPY_MASK:
@GIMP_ADD_WHITE_MASK:
@GIMP_ADD_BLACK_MASK:
@GIMP_ADD_ALPHA_MASK:
@GIMP_ADD_SELECTION_MASK:
@GIMP_ADD_INVERSE_SELECTION_MASK:
@GIMP_ADD_COPY_MASK:
@GIMP_ADD_INVERSE_COPY_MASK:
<!-- ##### ENUM GimpBlendMode ##### -->
<para>
</para>
@GIMP_FG_BG_RGB:
@GIMP_FG_BG_HSV:
@GIMP_FG_TRANS:
@GIMP_CUSTOM:
@GIMP_FG_BG_RGB_MODE:
@GIMP_FG_BG_HSV_MODE:
@GIMP_FG_TRANSPARENT_MODE:
@GIMP_CUSTOM_MODE:
<!-- ##### ENUM GimpBrushApplicationMode ##### -->
<para>
@ -72,10 +72,10 @@ Enums and definitions.
</para>
@GIMP_ADD:
@GIMP_SUB:
@GIMP_REPLACE:
@GIMP_INTERSECT:
@GIMP_CHANNEL_OP_ADD:
@GIMP_CHANNEL_OP_SUBTRACT:
@GIMP_CHANNEL_OP_REPLACE:
@GIMP_CHANNEL_OP_INTERSECT:
<!-- ##### ENUM GimpChannelType ##### -->
<para>
@ -150,11 +150,11 @@ Enums and definitions.
</para>
@GIMP_FG_IMAGE_FILL:
@GIMP_BG_IMAGE_FILL:
@GIMP_WHITE_IMAGE_FILL:
@GIMP_TRANS_IMAGE_FILL:
@GIMP_NO_IMAGE_FILL:
@GIMP_FOREGROUND_FILL:
@GIMP_BACKGROUND_FILL:
@GIMP_WHITE_FILL:
@GIMP_TRANSPARENT_FILL:
@GIMP_NO_FILL:
<!-- ##### ENUM GimpImageBaseType ##### -->
<para>
@ -257,8 +257,8 @@ Enums and definitions.
</para>
@GIMP_APPLY:
@GIMP_DISCARD:
@GIMP_MASK_APPLY:
@GIMP_MASK_DISCARD:
<!-- ##### ENUM GimpMergeType ##### -->
<para>
@ -284,7 +284,7 @@ Enums and definitions.
</para>
@GIMP_CONTINUOUS:
@GIMP_CONSTANT:
@GIMP_INCREMENTAL:
<!-- ##### ENUM GimpRepeatMode ##### -->

7
libgimp/gimpcompat.h
View file

@ -80,6 +80,13 @@ enum
GIMP_NO_IMAGE_FILL = GIMP_NO_FILL
};
enum
{
GIMP_APPLY = GIMP_MASK_APPLY,
GIMP_DISCARD = GIMP_MASK_DISCARD
};
enum
{
GIMP_CONTINUOUS = GIMP_CONSTANT

48
libgimp/gimpenums.h
View file

@ -24,17 +24,6 @@
G_BEGIN_DECLS
typedef enum
{
GIMP_ADD_WHITE_MASK,
GIMP_ADD_BLACK_MASK,
GIMP_ADD_ALPHA_MASK,
GIMP_ADD_SELECTION_MASK,
GIMP_ADD_INVERSE_SELECTION_MASK,
GIMP_ADD_COPY_MASK,
GIMP_ADD_INVERSE_COPY_MASK
} GimpAddMaskType;
typedef enum
{
GIMP_HARD,
@ -42,13 +31,6 @@ typedef enum
GIMP_PRESSURE
} GimpBrushApplicationMode;
typedef enum
{
GIMP_FG_BUCKET_FILL,
GIMP_BG_BUCKET_FILL,
GIMP_PATTERN_BUCKET_FILL
} GimpBucketFillMode;
typedef enum
{
GIMP_CHANNEL_OP_ADD,
@ -94,6 +76,17 @@ typedef enum
GIMP_BURN
} GimpDodgeBurnType;
typedef enum
{
GIMP_ADD_WHITE_MASK,
GIMP_ADD_BLACK_MASK,
GIMP_ADD_ALPHA_MASK,
GIMP_ADD_SELECTION_MASK,
GIMP_ADD_INVERSE_SELECTION_MASK,
GIMP_ADD_COPY_MASK,
GIMP_ADD_INVERSE_COPY_MASK
} GimpAddMaskType;
typedef enum
{
GIMP_FG_BG_RGB_MODE,
@ -102,6 +95,13 @@ typedef enum
GIMP_CUSTOM_MODE
} GimpBlendMode;
typedef enum
{
GIMP_FG_BUCKET_FILL,
GIMP_BG_BUCKET_FILL,
GIMP_PATTERN_BUCKET_FILL
} GimpBucketFillMode;
typedef enum
{
GIMP_VALUE_LUT,
@ -193,6 +193,12 @@ typedef enum
GIMP_COLOR_ERASE_MODE
} GimpLayerModeEffects;
typedef enum
{
GIMP_MASK_APPLY,
GIMP_MASK_DISCARD
} GimpMaskApplyMode;
typedef enum
{
GIMP_OFFSET_BACKGROUND,
@ -240,12 +246,6 @@ typedef enum
GIMP_MAGENTA_HUES
} GimpHueRange;
typedef enum
{
GIMP_APPLY,
GIMP_DISCARD
} GimpMaskApplyMode;
typedef enum
{
GIMP_EXPAND_AS_NECESSARY,

3
plug-ins/script-fu/scheme-wrapper.c
View file

@ -298,6 +298,9 @@ init_constants (void)
setvar (cintern ("TRANS-IMAGE-FILL"), flocons (GIMP_TRANSPARENT_FILL), NIL);
setvar (cintern ("NO-IMAGE-FILL"), flocons (GIMP_NO_FILL), NIL);
setvar (cintern ("APPLY"), flocons (GIMP_MASK_APPLY), NIL);
setvar (cintern ("DISCARD"), flocons (GIMP_MASK_DISCARD), NIL);
setvar (cintern ("CONTINUOUS"), flocons (GIMP_CONSTANT), NIL);
/* Useful misc stuff */

30
plug-ins/script-fu/script-fu-constants.c
View file

@ -23,22 +23,10 @@
void
init_generated_constants (void)
{
setvar (cintern ("ADD-WHITE-MASK"), flocons (0), NIL);
setvar (cintern ("ADD-BLACK-MASK"), flocons (1), NIL);
setvar (cintern ("ADD-ALPHA-MASK"), flocons (2), NIL);
setvar (cintern ("ADD-SELECTION-MASK"), flocons (3), NIL);
setvar (cintern ("ADD-INVERSE-SELECTION-MASK"), flocons (4), NIL);
setvar (cintern ("ADD-COPY-MASK"), flocons (5), NIL);
setvar (cintern ("ADD-INVERSE-COPY-MASK"), flocons (6), NIL);
setvar (cintern ("HARD"), flocons (0), NIL);
setvar (cintern ("SOFT"), flocons (1), NIL);
setvar (cintern ("PRESSURE"), flocons (2), NIL);
setvar (cintern ("FG-BUCKET-FILL"), flocons (0), NIL);
setvar (cintern ("BG-BUCKET-FILL"), flocons (1), NIL);
setvar (cintern ("PATTERN-BUCKET-FILL"), flocons (2), NIL);
setvar (cintern ("CHANNEL-OP-ADD"), flocons (0), NIL);
setvar (cintern ("CHANNEL-OP-SUBTRACT"), flocons (1), NIL);
setvar (cintern ("CHANNEL-OP-REPLACE"), flocons (2), NIL);
@ -66,11 +54,23 @@ init_generated_constants (void)
setvar (cintern ("DODGE"), flocons (0), NIL);
setvar (cintern ("BURN"), flocons (1), NIL);
setvar (cintern ("ADD-WHITE-MASK"), flocons (0), NIL);
setvar (cintern ("ADD-BLACK-MASK"), flocons (1), NIL);
setvar (cintern ("ADD-ALPHA-MASK"), flocons (2), NIL);
setvar (cintern ("ADD-SELECTION-MASK"), flocons (3), NIL);
setvar (cintern ("ADD-INVERSE-SELECTION-MASK"), flocons (4), NIL);
setvar (cintern ("ADD-COPY-MASK"), flocons (5), NIL);
setvar (cintern ("ADD-INVERSE-COPY-MASK"), flocons (6), NIL);
setvar (cintern ("FG-BG-RGB-MODE"), flocons (0), NIL);
setvar (cintern ("FG-BG-HSV-MODE"), flocons (1), NIL);
setvar (cintern ("FG-TRANSPARENT-MODE"), flocons (2), NIL);
setvar (cintern ("CUSTOM-MODE"), flocons (3), NIL);
setvar (cintern ("FG-BUCKET-FILL"), flocons (0), NIL);
setvar (cintern ("BG-BUCKET-FILL"), flocons (1), NIL);
setvar (cintern ("PATTERN-BUCKET-FILL"), flocons (2), NIL);
setvar (cintern ("VALUE-LUT"), flocons (0), NIL);
setvar (cintern ("RED-LUT"), flocons (1), NIL);
setvar (cintern ("GREEN-LUT"), flocons (2), NIL);
@ -138,6 +138,9 @@ init_generated_constants (void)
setvar (cintern ("HARDLIGHT-MODE"), flocons (18), NIL);
setvar (cintern ("COLOR-ERASE-MODE"), flocons (19), NIL);
setvar (cintern ("MASK-APPLY"), flocons (0), NIL);
setvar (cintern ("MASK-DISCARD"), flocons (1), NIL);
setvar (cintern ("MESSAGE-BOX"), flocons (0), NIL);
setvar (cintern ("CONSOLE"), flocons (1), NIL);
setvar (cintern ("ERROR-CONSOLE"), flocons (2), NIL);
@ -217,9 +220,6 @@ init_generated_constants (void)
setvar (cintern ("BLUE-HUES"), flocons (5), NIL);
setvar (cintern ("MAGENTA-HUES"), flocons (6), NIL);
setvar (cintern ("APPLY"), flocons (0), NIL);
setvar (cintern ("DISCARD"), flocons (1), NIL);
setvar (cintern ("EXPAND-AS-NECESSARY"), flocons (0), NIL);
setvar (cintern ("CLIP-TO-IMAGE"), flocons (1), NIL);
setvar (cintern ("CLIP-TO-BOTTOM-LAYER"), flocons (2), NIL);

3
plug-ins/script-fu/siod-wrapper.c
View file

@ -298,6 +298,9 @@ init_constants (void)
setvar (cintern ("TRANS-IMAGE-FILL"), flocons (GIMP_TRANSPARENT_FILL), NIL);
setvar (cintern ("NO-IMAGE-FILL"), flocons (GIMP_NO_FILL), NIL);
setvar (cintern ("APPLY"), flocons (GIMP_MASK_APPLY), NIL);
setvar (cintern ("DISCARD"), flocons (GIMP_MASK_DISCARD), NIL);
setvar (cintern ("CONTINUOUS"), flocons (GIMP_CONSTANT), NIL);
/* Useful misc stuff */

82
tools/pdbgen/enums.pl
View file

@ -161,27 +161,6 @@ package Gimp::CodeGen::enums;
GIMP_BLUE_LUT => '3',
GIMP_ALPHA_LUT => '4' }
},
AddMaskType =>
{ contig => 1,
header => 'core/core-types.h',
symbols => [ qw(ADD_WHITE_MASK ADD_BLACK_MASK ADD_ALPHA_MASK
ADD_SELECTION_MASK ADD_INVERSE_SELECTION_MASK
ADD_COPY_MASK ADD_INVERSE_COPY_MASK) ],
mapping => { ADD_WHITE_MASK => '0',
ADD_BLACK_MASK => '1',
ADD_ALPHA_MASK => '2',
ADD_SELECTION_MASK => '3',
ADD_INVERSE_SELECTION_MASK => '4',
ADD_COPY_MASK => '5',
ADD_INVERSE_COPY_MASK => '6' }
},
MaskApplyMode =>
{ contig => 1,
header => 'core/core-types.h',
symbols => [ qw(APPLY DISCARD) ],
mapping => { APPLY => '0',
DISCARD => '1' }
},
OrientationType =>
{ contig => 1,
header => 'core/core-types.h',
@ -200,17 +179,6 @@ package Gimp::CodeGen::enums;
CHANNEL_OP_REPLACE => '2',
CHANNEL_OP_INTERSECT => '3' }
},
GimpFillType =>
{ contig => 1,
header => 'core/core-types.h',
symbols => [ qw(FOREGROUND_FILL BACKGROUND_FILL WHITE_FILL
TRANSPARENT_FILL NO_FILL) ],
mapping => { FOREGROUND_FILL => '0',
BACKGROUND_FILL => '1',
WHITE_FILL => '2',
TRANSPARENT_FILL => '3',
NO_FILL => '4' }
},
GimpOffsetType =>
{ contig => 1,
header => 'core/core-types.h',
@ -250,14 +218,6 @@ package Gimp::CodeGen::enums;
FIXED_DITHER => '3',
NODESTRUCT_DITHER => '4' }
},
BucketFillMode =>
{ contig => 1,
header => 'core/core-types.h',
symbols => [ qw(FG_BUCKET_FILL BG_BUCKET_FILL PATTERN_BUCKET_FILL) ],
mapping => { FG_BUCKET_FILL => '0',
BG_BUCKET_FILL => '1',
PATTERN_BUCKET_FILL => '2' }
},
GimpImageBaseType =>
{ contig => 1,
header => 'core/core-enums.h',
@ -318,6 +278,26 @@ package Gimp::CodeGen::enums;
GIMP_REPEAT_SAWTOOTH => '1',
GIMP_REPEAT_TRIANGULAR => '2' }
},
GimpBucketFillMode =>
{ contig => 1,
header => 'core/core-enums.h',
symbols => [ qw(GIMP_FG_BUCKET_FILL GIMP_BG_BUCKET_FILL
GIMP_PATTERN_BUCKET_FILL) ],
mapping => { GIMP_FG_BUCKET_FILL => '0',
GIMP_BG_BUCKET_FILL => '1',
GIMP_PATTERN_BUCKET_FILL => '2' }
},
GimpFillType =>
{ contig => 1,
header => 'core/core-enums.h',
symbols => [ qw(GIMP_FOREGROUND_FILL GIMP_BACKGROUND_FILL
GIMP_WHITE_FILL GIMP_TRANSPARENT_FILL GIMP_NO_FILL) ],
mapping => { GIMP_FOREGROUND_FILL => '0',
GIMP_BACKGROUND_FILL => '1',
GIMP_WHITE_FILL => '2',
GIMP_TRANSPARENT_FILL => '3',
GIMP_NO_FILL => '4' }
},
GimpImageType =>
{ contig => 1,
header => 'core/core-enums.h',
@ -331,6 +311,28 @@ package Gimp::CodeGen::enums;
GIMP_INDEXED_IMAGE => '4',
GIMP_INDEXEDA_IMAGE => '5' }
},
GimpAddMaskType =>
{ contig => 1,
header => 'core/core-enums.h',
symbols => [ qw(GIMP_ADD_WHITE_MASK GIMP_ADD_BLACK_MASK
GIMP_ADD_ALPHA_MASK GIMP_ADD_SELECTION_MASK
GIMP_ADD_INVERSE_SELECTION_MASK GIMP_ADD_COPY_MASK
GIMP_ADD_INVERSE_COPY_MASK) ],
mapping => { GIMP_ADD_WHITE_MASK => '0',
GIMP_ADD_BLACK_MASK => '1',
GIMP_ADD_ALPHA_MASK => '2',
GIMP_ADD_SELECTION_MASK => '3',
GIMP_ADD_INVERSE_SELECTION_MASK => '4',
GIMP_ADD_COPY_MASK => '5',
GIMP_ADD_INVERSE_COPY_MASK => '6' }
},
GimpMaskApplyMode =>
{ contig => 1,
header => 'core/core-enums.h',
symbols => [ qw(GIMP_MASK_APPLY GIMP_MASK_DISCARD) ],
mapping => { GIMP_MASK_APPLY => '0',
GIMP_MASK_DISCARD => '1' }
},
GimpTransferMode =>
{ contig => 1,
header => 'core/core-enums.h',

2
tools/pdbgen/pdb/image.pdb
View file

@ -693,7 +693,7 @@ HELP
@inargs = (
&std_image_arg,
&layer_arg,
{ name => 'mode', type => 'enum MaskApplyMode',
{ name => 'mode', type => 'enum GimpMaskApplyMode',
desc => 'Removal mode: { %%desc%% }' }
);
$inargs[1]->{desc} .= ' from which to remove mask';

4
tools/pdbgen/pdb/layer.pdb
View file

@ -300,7 +300,7 @@ HELP
@inargs = (
&layer_arg,
{ name => 'mask_type', type => 'enum AddMaskType',
{ name => 'mask_type', type => 'enum GimpAddMaskType',
desc => 'The type of mask: { %%desc%% }' }
);
$inargs[0]->{desc} .= ' to which to add the mask';
@ -312,7 +312,7 @@ HELP
%invoke = (
code => <<'CODE'
success = (mask = gimp_layer_create_mask (layer, (AddMaskType) mask_type)) != NULL;
success = (mask = gimp_layer_create_mask (layer, (GimpAddMaskType) mask_type)) != NULL;
CODE
);
}

2
tools/pdbgen/pdb/misc_tools.pdb
View file

@ -150,7 +150,7 @@ HELP
@inargs = (
&drawable_arg,
{ name => 'fill_mode', type => 'enum BucketFillMode',
{ name => 'fill_mode', type => 'enum GimpBucketFillMode',
desc => 'The type of fill: { %%desc%% }' },
{ name => paint_mode, type => 'enum GimpLayerModeEffects',
desc => 'The paint application mode: { %%desc%% }' },