Commit 002ac38a authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann
Browse files

introduced new trigraph keyword /*< pdb-skip >*/ used to skip enums for

2001-12-08  Sven Neumann  <sven@gimp.org>

	* tools/pdbgen/enumgen.pl: introduced new trigraph keyword
	/*< pdb-skip >*/ used to skip enums for inclusion in libgimp when
	parsing headers. The keyword /*< skip >*/ is still used to skip
	enum values. This change is necessary since glib-mkenums also uses
	/*< skip >*/.

	* app/base/base-types.h * app/base/base-enums.h: moved
	GimpCheckType and GimpCheckSize to base-enums.h so they get
	registered with the type system, marked them as /*< pdb-skip >*/.

	* app/core/core-types.h * app/display/display-types.h *
	app/paint-funcs/paint-funcs-types.h * app/tools/gimppainttool.h *
	app/tools/tools-types.h: changed /*< skip >*/ to /*< pdb-skip >*/.
parent a65e1a39
2001-12-08 Sven Neumann <sven@gimp.org>
* tools/pdbgen/enumgen.pl: introduced new trigraph keyword
/*< pdb-skip >*/ used to skip enums for inclusion in libgimp when
parsing headers. The keyword /*< skip >*/ is still used to skip
enum values. This change is necessary since glib-mkenums also uses
/*< skip >*/.
* app/base/base-types.h * app/base/base-enums.h: moved
GimpCheckType and GimpCheckSize to base-enums.h so they get
registered with the type system, marked them as /*< pdb-skip >*/.
* app/core/core-types.h * app/display/display-types.h *
app/paint-funcs/paint-funcs-types.h * app/tools/gimppainttool.h *
app/tools/tools-types.h: changed /*< skip >*/ to /*< pdb-skip >*/.
2001-12-08 Sven Neumann <sven@gimp.org>
* app/core/Makefile.am
......
......@@ -66,4 +66,31 @@ typedef enum
} GimpLayerModeEffects;
#define GIMP_TYPE_CHECK_TYPE (gimp_check_type_get_type ())
GType gimp_check_type_get_type (void) G_GNUC_CONST;
typedef enum /*< pdb-skip >*/
{
GIMP_LIGHT_CHECKS = 0,
GIMP_GRAY_CHECKS = 1,
GIMP_DARK_CHECKS = 2,
GIMP_WHITE_ONLY = 3,
GIMP_GRAY_ONLY = 4,
GIMP_BLACK_ONLY = 5
} GimpCheckType;
#define GIMP_TYPE_CHECK_SIZE (gimp_check_size_get_type ())
GType gimp_check_size_get_type (void) G_GNUC_CONST;
typedef enum /*< pdb-skip >*/
{
GIMP_SMALL_CHECKS = 0,
GIMP_MEDIUM_CHECKS = 1,
GIMP_LARGE_CHECKS = 2
} GimpCheckSize;
#endif /* __BASE_ENUMS_H__ */
......@@ -59,25 +59,7 @@ typedef enum
GIMP_GRAY_LUT = 0 /*< skip >*/
} GimpChannelLutType;
/* Transparency representation */
typedef enum /*< skip >*/
{
GIMP_LIGHT_CHECKS = 0,
GIMP_GRAY_CHECKS = 1,
GIMP_DARK_CHECKS = 2,
GIMP_WHITE_ONLY = 3,
GIMP_GRAY_ONLY = 4,
GIMP_BLACK_ONLY = 5
} GimpCheckType;
typedef enum /*< skip >*/
{
GIMP_SMALL_CHECKS = 0,
GIMP_MEDIUM_CHECKS = 1,
GIMP_LARGE_CHECKS = 2
} GimpCheckSize;
typedef enum /*< skip >*/
typedef enum /*< pdb-skip >*/
{
GIMP_HISTOGRAM_VALUE = 0,
GIMP_HISTOGRAM_RED = 1,
......
......@@ -83,7 +83,7 @@ typedef enum
UNKNOWN
} OrientationType;
typedef enum /*< skip >*/
typedef enum /*< pdb-skip >*/
{
ORIENTATION_UNKNOWN,
ORIENTATION_HORIZONTAL,
......@@ -99,7 +99,7 @@ typedef enum /*< chop=CHANNEL_OP_ >*/
CHANNEL_OP_INTERSECT
} ChannelOps;
typedef enum /*< skip >*/
typedef enum /*< pdb-skip >*/
{
GIMP_SELECTION_OFF,
GIMP_SELECTION_LAYER_OFF,
......@@ -179,7 +179,7 @@ typedef enum
SPIRAL_ANTICLOCKWISE
} GradientType;
typedef enum /*< skip >*/
typedef enum /*< pdb-skip >*/
{
GRAD_LINEAR = 0,
GRAD_CURVED,
......@@ -188,7 +188,7 @@ typedef enum /*< skip >*/
GRAD_SPHERE_DECREASING
} GimpGradientSegmentType;
typedef enum /*< skip >*/
typedef enum /*< pdb-skip >*/
{
GRAD_RGB = 0, /* normal RGB */
GRAD_HSV_CCW, /* counterclockwise hue */
......@@ -210,7 +210,7 @@ typedef enum
REPEAT_TRIANGULAR
} RepeatMode;
typedef enum /*< skip >*/
typedef enum /*< pdb-skip >*/
{
GIMP_TRANSFORM_FORWARD,
GIMP_TRANSFORM_BACKWARD
......
......@@ -23,7 +23,7 @@
#include "widgets/widgets-types.h"
typedef enum /*< skip >*/
typedef enum /*< pdb-skip >*/
{
CURSOR_MODE_TOOL_ICON,
CURSOR_MODE_TOOL_CROSSHAIR,
......
......@@ -33,7 +33,7 @@
* images, floating selections, selective display of intensity
* channels, and display of arbitrary mask channels
*/
typedef enum /*< skip >*/
typedef enum /*< pdb-skip >*/
{
INITIAL_CHANNEL_MASK = 0,
INITIAL_CHANNEL_SELECTION,
......@@ -47,7 +47,7 @@ typedef enum /*< skip >*/
* region into a destination region. This is used for constructing
* layer projections, and for applying image patches to an image
*/
typedef enum /*< skip >*/
typedef enum /*< pdb-skip >*/
{
NO_COMBINATION = 0,
COMBINE_INDEXED_INDEXED,
......
......@@ -25,7 +25,7 @@
/* the different states that the painting function can be called with */
typedef enum /*< skip >*/
typedef enum /*< pdb-skip >*/
{
INIT_PAINT, /* Setup PaintFunc internals */
MOTION_PAINT, /* PaintFunc performs motion-related rendering */
......@@ -36,7 +36,7 @@ typedef enum /*< skip >*/
POSTTRACE_PAINT /* PaintFunc performs window tracing activity following rendering */
} PaintState;
typedef enum /*< skip >*/
typedef enum /*< pdb-skip >*/
{
TOOL_CAN_HANDLE_CHANGING_BRUSH = 0x0001, /* Set for tools that don't mind
* if the brush changes while
......
......@@ -25,7 +25,7 @@
/* the different states that the painting function can be called with */
typedef enum /*< skip >*/
typedef enum /*< pdb-skip >*/
{
INIT_PAINT, /* Setup PaintFunc internals */
MOTION_PAINT, /* PaintFunc performs motion-related rendering */
......@@ -36,7 +36,7 @@ typedef enum /*< skip >*/
POSTTRACE_PAINT /* PaintFunc performs window tracing activity following rendering */
} PaintState;
typedef enum /*< skip >*/
typedef enum /*< pdb-skip >*/
{
TOOL_CAN_HANDLE_CHANGING_BRUSH = 0x0001, /* Set for tools that don't mind
* if the brush changes while
......
......@@ -25,7 +25,7 @@
/* the different states that the painting function can be called with */
typedef enum /*< skip >*/
typedef enum /*< pdb-skip >*/
{
INIT_PAINT, /* Setup PaintFunc internals */
MOTION_PAINT, /* PaintFunc performs motion-related rendering */
......@@ -36,7 +36,7 @@ typedef enum /*< skip >*/
POSTTRACE_PAINT /* PaintFunc performs window tracing activity following rendering */
} PaintState;
typedef enum /*< skip >*/
typedef enum /*< pdb-skip >*/
{
TOOL_CAN_HANDLE_CHANGING_BRUSH = 0x0001, /* Set for tools that don't mind
* if the brush changes while
......
......@@ -90,7 +90,7 @@ typedef enum
ONCE_END_COLOR /* paint once, but keep painting with the end color */
} GradientPaintMode;
typedef enum /*< skip >*/
typedef enum /*< pdb-skip >*/
{
SELECTION_ADD = CHANNEL_OP_ADD,
SELECTION_SUB = CHANNEL_OP_SUB,
......@@ -102,7 +102,7 @@ typedef enum /*< skip >*/
} SelectOps;
/* The possible states for tools */
typedef enum /*< skip >*/
typedef enum /*< pdb-skip >*/
{
INACTIVE,
ACTIVE,
......@@ -110,7 +110,7 @@ typedef enum /*< skip >*/
} ToolState;
/* Tool control actions */
typedef enum /*< skip >*/
typedef enum /*< pdb-skip >*/
{
PAUSE,
RESUME,
......@@ -118,7 +118,7 @@ typedef enum /*< skip >*/
} ToolAction;
/* possible transform functions */
typedef enum /*< skip >*/
typedef enum /*< pdb-skip >*/
{
TRANSFORM_CREATING,
TRANSFORM_HANDLE_1,
......@@ -129,7 +129,7 @@ typedef enum /*< skip >*/
} TransformAction;
/* the different states that the transformation function can be called with */
typedef enum /*< skip >*/
typedef enum /*< pdb-skip >*/
{
TRANSFORM_INIT,
TRANSFORM_MOTION,
......
......@@ -74,7 +74,7 @@ my $footer = <<'FOOTER';
FOOTER
my ($enumname, $contig, $symbols, @nicks, @mapping, $before);
my ($chop, $skip, $xform);
my ($chop, $skip, $pdbskip, $xform);
# Most of this enum parsing stuff was swiped from makeenums.pl in GTK+
sub parse_options {
......@@ -82,7 +82,7 @@ sub parse_options {
my @opts;
for $opt (split /\s*,\s*/, $opts) {
my ($key,$val) = $opt =~ /\s*(\w+)(?:=(\S+))?/;
my ($key,$val) = $opt =~ /\s*([\w-]+)(?:=(\S+))?/;
defined $val or $val = 1;
push @opts, $key, $val;
}
......@@ -201,10 +201,12 @@ while (<>) {
my %options = parse_options($2);
$chop = $options{"chop"};
$skip = $options{"skip"};
$pdbskip = $options{"pdb-skip"};
$xform = $options{"xform"};
} else {
$chop = undef;
$skip = undef;
$pdbskip = undef;
$xform = undef;
}
# Didn't have trailing '{' look on next lines
......@@ -242,7 +244,7 @@ while (<>) {
$ARGV =~ s@(?:(?:..|app)/)*@@;
$code .= <<ENTRY if !$skip;
$code .= <<ENTRY if !$pdbskip;
: $enumname =>
: { contig => $contig,
: header => '$ARGV',
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment