diff --git a/ChangeLog b/ChangeLog index 3bad89d792..4fcd3e5f22 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2001-01-19 Michael Natterer + + * app/Makefile.am + * app/appenums.h + * app/apptypes.h: moved all enums from apptypes.h to the new file + appenums.h + + * tools/pdbgen/Makefile.am + * tools/pdbgen/app.pl + * tools/pdbgen/enums.pl: changed accordingly. Removed some files + from the list of files to scan for enums. + + * TODO.xml: added two minor UI issues. + 2001-01-18 Sven Neumann * plug-ins/common/gqbist.c: fixed typo, adjusted coding style diff --git a/TODO.xml b/TODO.xml index b394128ee6..394ac6b53a 100644 --- a/TODO.xml +++ b/TODO.xml @@ -347,6 +347,34 @@ + + Add an Option to separately switch off the Layer Boundary + +

+ Currently the Layer boundary (the yellow dotted line around + the active layer) can only be switched off together with the + selection. This is evil. +

+ + + GIMP Developer List <gimp-developer@xcf.berkeley.edu> + + + + + Display the Memory Consumption of the Image + +

+ The current memory size of the image should always be + available in the interface. Also show the new size of the + image in the "Resize" and "Set Canvas Size" dialogs. +

+ + + GIMP Developer List <gimp-developer@xcf.berkeley.edu> + + +
diff --git a/app/Makefile.am b/app/Makefile.am index e3f3302d2a..7a79210f29 100644 --- a/app/Makefile.am +++ b/app/Makefile.am @@ -32,6 +32,7 @@ gimp_SOURCES = \ airbrush.h \ app_procs.c \ app_procs.h \ + appenums.h \ appenv.h \ apptypes.h \ asupsample.c \ diff --git a/app/appenums.h b/app/appenums.h new file mode 100644 index 0000000000..b931245618 --- /dev/null +++ b/app/appenums.h @@ -0,0 +1,325 @@ +/* The GIMP -- an image manipulation program + * Copyright (C) 1995 Spencer Kimball and Peter Mattis + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifndef __APPENUMS_H__ +#define __APPENUMS_H__ + + +/* Base image types */ +typedef enum +{ + RGB, + GRAY, + INDEXED +} GimpImageBaseType; + +/* Image types */ +typedef enum +{ + RGB_GIMAGE, /*< nick=RGB_IMAGE >*/ + RGBA_GIMAGE, /*< nick=RGBA_IMAGE >*/ + GRAY_GIMAGE, /*< nick=GRAY_IMAGE >*/ + GRAYA_GIMAGE, /*< nick=GRAYA_IMAGE >*/ + INDEXED_GIMAGE, /*< nick=INDEXED_IMAGE >*/ + INDEXEDA_GIMAGE /*< nick=INDEXEDA_IMAGE >*/ +} GimpImageType; + +/* Fill types */ +typedef enum +{ + FOREGROUND_FILL, /*< nick=FG_IMAGE_FILL >*/ + BACKGROUND_FILL, /*< nick=BG_IMAGE_FILL >*/ + WHITE_FILL, /*< nick=WHITE_IMAGE_FILL >*/ + TRANSPARENT_FILL, /*< nick=TRANS_IMAGE_FILL >*/ + NO_FILL /*< nick=NO_IMAGE_FILL >*/ +} GimpFillType; + +/* Layer modes */ +typedef enum +{ + NORMAL_MODE, + DISSOLVE_MODE, + BEHIND_MODE, + MULTIPLY_MODE, + SCREEN_MODE, + OVERLAY_MODE, + DIFFERENCE_MODE, + ADDITION_MODE, + SUBTRACT_MODE, + DARKEN_ONLY_MODE, + LIGHTEN_ONLY_MODE, + HUE_MODE, + SATURATION_MODE, + COLOR_MODE, + VALUE_MODE, + DIVIDE_MODE, + DODGE_MODE, + BURN_MODE, + HARDLIGHT_MODE, + ERASE_MODE, /*< skip >*/ + REPLACE_MODE, /*< skip >*/ + ANTI_ERASE_MODE /*< skip >*/ +} LayerModeEffects; + +/* Types of convolutions */ +typedef enum +{ + NORMAL_CONVOL, /* Negative numbers truncated */ + ABSOLUTE_CONVOL, /* Absolute value */ + NEGATIVE_CONVOL /* add 127 to values */ +} ConvolutionType; + +/* Brush application types */ +typedef enum +{ + HARD, /* pencil */ + SOFT, /* paintbrush */ + PRESSURE /* paintbrush with variable pressure */ +} BrushApplicationMode; + +/* Paint application modes */ +typedef enum +{ + CONSTANT, /*< nick=CONTINUOUS >*/ /* pencil, paintbrush, airbrush, clone */ + INCREMENTAL /* convolve, smudge */ +} PaintApplicationMode; + +typedef enum +{ + APPLY, + DISCARD +} MaskApplyMode; + +typedef enum /*< chop=ADD_ >*/ +{ + ADD_WHITE_MASK, + ADD_BLACK_MASK, + ADD_ALPHA_MASK +} AddMaskType; + +/* gradient paint modes */ +typedef enum +{ + ONCE_FORWARD, /* paint through once, then stop */ + ONCE_BACKWARDS, /* paint once, then stop, but run the gradient the other way */ + LOOP_SAWTOOTH, /* keep painting, looping through the grad start->end,start->end /|/|/| */ + LOOP_TRIANGLE, /* keep paiting, looping though the grad start->end,end->start /\/\/\/ */ + ONCE_END_COLOR /* paint once, but keep painting with the end color */ +} GradientPaintMode; + + +/* gradient paint modes */ +typedef enum +{ + LINEAR_INTERPOLATION, + CUBIC_INTERPOLATION, + NEAREST_NEIGHBOR_INTERPOLATION +} InterpolationType; + +typedef enum /*< skip >*/ +{ + ORIENTATION_UNKNOWN, + ORIENTATION_HORIZONTAL, + ORIENTATION_VERTICAL +} InternalOrientationType; + +typedef enum +{ + HORIZONTAL, + VERTICAL, + UNKNOWN +} OrientationType; + +/* Procedural database types */ +typedef enum +{ + PDB_INT32, + PDB_INT16, + PDB_INT8, + PDB_FLOAT, + PDB_STRING, + PDB_INT32ARRAY, + PDB_INT16ARRAY, + PDB_INT8ARRAY, + PDB_FLOATARRAY, + PDB_STRINGARRAY, + PDB_COLOR, + PDB_REGION, + PDB_DISPLAY, + PDB_IMAGE, + PDB_LAYER, + PDB_CHANNEL, + PDB_DRAWABLE, + PDB_SELECTION, + PDB_BOUNDARY, + PDB_PATH, + PDB_PARASITE, + PDB_STATUS, + PDB_END +} PDBArgType; + +/* Error types */ +typedef enum +{ + PDB_EXECUTION_ERROR, + PDB_CALLING_ERROR, + PDB_PASS_THROUGH, + PDB_SUCCESS, + PDB_CANCEL +} PDBStatusType; + +/* Procedure types */ +typedef enum /*< chop=PDB_ >*/ +{ + PDB_INTERNAL, + PDB_PLUGIN, + PDB_EXTENSION, + PDB_TEMPORARY +} PDBProcType; + +/* Selection Boolean operations */ +typedef enum /*< chop=CHANNEL_OP_ >*/ +{ + CHANNEL_OP_ADD, + CHANNEL_OP_SUB, + CHANNEL_OP_REPLACE, + CHANNEL_OP_INTERSECT +} ChannelOps; + +typedef enum /*< skip >*/ +{ + SELECTION_ADD = CHANNEL_OP_ADD, + SELECTION_SUB = CHANNEL_OP_SUB, + SELECTION_REPLACE = CHANNEL_OP_REPLACE, + SELECTION_INTERSECT = CHANNEL_OP_INTERSECT, + SELECTION_MOVE_MASK, + SELECTION_MOVE, + SELECTION_ANCHOR +} SelectOps; + +/* The possible states for tools */ +typedef enum /*< skip >*/ +{ + INACTIVE, + ACTIVE, + PAUSED +} ToolState; + +/* Tool control actions */ +typedef enum /*< skip >*/ +{ + PAUSE, + RESUME, + HALT, + CURSOR_UPDATE, + DESTROY, + RECREATE +} ToolAction; + +/* Tool types */ +typedef enum /*< skip >*/ +{ + TOOL_TYPE_NONE = -1, + FIRST_TOOLBOX_TOOL = 0, + RECT_SELECT = FIRST_TOOLBOX_TOOL, + ELLIPSE_SELECT, + FREE_SELECT, + FUZZY_SELECT, + BEZIER_SELECT, + ISCISSORS, + MOVE, + MAGNIFY, + CROP, + ROTATE, + SCALE, + SHEAR, + PERSPECTIVE, + FLIP, + TEXT, + COLOR_PICKER, + BUCKET_FILL, + BLEND, + PENCIL, + PAINTBRUSH, + AIRBRUSH, + INK, + CLONE, + ERASER, + SMUDGE, + CONVOLVE, + DODGEBURN, + MEASURE, + LAST_TOOLBOX_TOOL = MEASURE, + + /* Non-toolbox tools */ + BY_COLOR_SELECT, + COLOR_BALANCE, + BRIGHTNESS_CONTRAST, + HUE_SATURATION, + POSTERIZE, + THRESHOLD, + CURVES, + LEVELS, + HISTOGRAM +} ToolType; + +/* possible transform functions */ +typedef enum /*< skip >*/ +{ + TRANSFORM_CREATING, + TRANSFORM_HANDLE_1, + TRANSFORM_HANDLE_2, + TRANSFORM_HANDLE_3, + TRANSFORM_HANDLE_4, + TRANSFORM_HANDLE_CENTER +} TransformAction; + +/* the different states that the transformation function can be called with */ +typedef enum /*< skip >*/ +{ + TRANSFORM_INIT, + TRANSFORM_MOTION, + TRANSFORM_RECALC, + TRANSFORM_FINISH +} TransformState; + +typedef enum /*< skip >*/ +{ + CURSOR_MODE_TOOL_ICON, + CURSOR_MODE_TOOL_CROSSHAIR, + CURSOR_MODE_CROSSHAIR +} CursorMode; + +typedef enum /*< skip >*/ +{ + CURSOR_MODIFIER_NONE, + CURSOR_MODIFIER_PLUS, + CURSOR_MODIFIER_MINUS, + CURSOR_MODIFIER_INTERSECT, + CURSOR_MODIFIER_MOVE, + CURSOR_MODIFIER_RESIZE, + CURSOR_MODIFIER_CONTROL, + CURSOR_MODIFIER_ANCHOR, + CURSOR_MODIFIER_FOREGROUND, + CURSOR_MODIFIER_BACKGROUND, + CURSOR_MODIFIER_PATTERN, + CURSOR_MODIFIER_HAND +} CursorModifier; + + +#endif /* __APPENUMS_H__ */ diff --git a/app/apptypes.h b/app/apptypes.h index 46d4dbc5ed..94fbc49977 100644 --- a/app/apptypes.h +++ b/app/apptypes.h @@ -19,13 +19,6 @@ #ifndef __APPTYPES_H__ #define __APPTYPES_H__ -/* To avoid problems with headers including each others like spaghetti - * (even recursively), and various types not being defined when they - * are needed depending on the order you happen to include headers, - * this file defines those enumeration and opaque struct types that - * don't depend on any other header. These problems began creeping up - * when we started to actually use these enums in function prototypes. - */ #include "undo_types.h" @@ -37,309 +30,7 @@ #include "libgimp/gimpuitypes.h" - -/* Should we instead use the enums in libgimp/gimpenums.h? */ - -/* Base image types */ -typedef enum -{ - RGB, - GRAY, - INDEXED -} GimpImageBaseType; - -/* Image types */ -typedef enum -{ - RGB_GIMAGE, /*< nick=RGB_IMAGE >*/ - RGBA_GIMAGE, /*< nick=RGBA_IMAGE >*/ - GRAY_GIMAGE, /*< nick=GRAY_IMAGE >*/ - GRAYA_GIMAGE, /*< nick=GRAYA_IMAGE >*/ - INDEXED_GIMAGE, /*< nick=INDEXED_IMAGE >*/ - INDEXEDA_GIMAGE /*< nick=INDEXEDA_IMAGE >*/ -} GimpImageType; - -/* Fill types */ -typedef enum -{ - FOREGROUND_FILL, /*< nick=FG_IMAGE_FILL >*/ - BACKGROUND_FILL, /*< nick=BG_IMAGE_FILL >*/ - WHITE_FILL, /*< nick=WHITE_IMAGE_FILL >*/ - TRANSPARENT_FILL, /*< nick=TRANS_IMAGE_FILL >*/ - NO_FILL /*< nick=NO_IMAGE_FILL >*/ -} GimpFillType; - -/* Layer modes */ -typedef enum -{ - NORMAL_MODE, - DISSOLVE_MODE, - BEHIND_MODE, - MULTIPLY_MODE, - SCREEN_MODE, - OVERLAY_MODE, - DIFFERENCE_MODE, - ADDITION_MODE, - SUBTRACT_MODE, - DARKEN_ONLY_MODE, - LIGHTEN_ONLY_MODE, - HUE_MODE, - SATURATION_MODE, - COLOR_MODE, - VALUE_MODE, - DIVIDE_MODE, - DODGE_MODE, - BURN_MODE, - HARDLIGHT_MODE, - ERASE_MODE, /*< skip >*/ - REPLACE_MODE, /*< skip >*/ - ANTI_ERASE_MODE /*< skip >*/ -} LayerModeEffects; - -/* Types of convolutions */ -typedef enum -{ - NORMAL_CONVOL, /* Negative numbers truncated */ - ABSOLUTE_CONVOL, /* Absolute value */ - NEGATIVE_CONVOL /* add 127 to values */ -} ConvolutionType; - -/* Brush application types */ -typedef enum -{ - HARD, /* pencil */ - SOFT, /* paintbrush */ - PRESSURE /* paintbrush with variable pressure */ -} BrushApplicationMode; - -/* Paint application modes */ -typedef enum -{ - CONSTANT, /*< nick=CONTINUOUS >*/ /* pencil, paintbrush, airbrush, clone */ - INCREMENTAL /* convolve, smudge */ -} PaintApplicationMode; - -typedef enum -{ - APPLY, - DISCARD -} MaskApplyMode; - -typedef enum /*< chop=ADD_ >*/ -{ - ADD_WHITE_MASK, - ADD_BLACK_MASK, - ADD_ALPHA_MASK -} AddMaskType; - -/* gradient paint modes */ -typedef enum -{ - ONCE_FORWARD, /* paint through once, then stop */ - ONCE_BACKWARDS, /* paint once, then stop, but run the gradient the other way */ - LOOP_SAWTOOTH, /* keep painting, looping through the grad start->end,start->end /|/|/| */ - LOOP_TRIANGLE, /* keep paiting, looping though the grad start->end,end->start /\/\/\/ */ - ONCE_END_COLOR /* paint once, but keep painting with the end color */ -} GradientPaintMode; - - -/* gradient paint modes */ -typedef enum -{ - LINEAR_INTERPOLATION, - CUBIC_INTERPOLATION, - NEAREST_NEIGHBOR_INTERPOLATION -} InterpolationType; - -typedef enum /*< skip >*/ -{ - ORIENTATION_UNKNOWN, - ORIENTATION_HORIZONTAL, - ORIENTATION_VERTICAL -} InternalOrientationType; - -typedef enum -{ - HORIZONTAL, - VERTICAL, - UNKNOWN -} OrientationType; - -/* Procedural database types */ -typedef enum -{ - PDB_INT32, - PDB_INT16, - PDB_INT8, - PDB_FLOAT, - PDB_STRING, - PDB_INT32ARRAY, - PDB_INT16ARRAY, - PDB_INT8ARRAY, - PDB_FLOATARRAY, - PDB_STRINGARRAY, - PDB_COLOR, - PDB_REGION, - PDB_DISPLAY, - PDB_IMAGE, - PDB_LAYER, - PDB_CHANNEL, - PDB_DRAWABLE, - PDB_SELECTION, - PDB_BOUNDARY, - PDB_PATH, - PDB_PARASITE, - PDB_STATUS, - PDB_END -} PDBArgType; - -/* Error types */ -typedef enum -{ - PDB_EXECUTION_ERROR, - PDB_CALLING_ERROR, - PDB_PASS_THROUGH, - PDB_SUCCESS, - PDB_CANCEL -} PDBStatusType; - -/* Procedure types */ -typedef enum /*< chop=PDB_ >*/ -{ - PDB_INTERNAL, - PDB_PLUGIN, - PDB_EXTENSION, - PDB_TEMPORARY -} PDBProcType; - -/* Selection Boolean operations */ -typedef enum /*< chop=CHANNEL_OP_ >*/ -{ - CHANNEL_OP_ADD, - CHANNEL_OP_SUB, - CHANNEL_OP_REPLACE, - CHANNEL_OP_INTERSECT -} ChannelOps; - -typedef enum /*< skip >*/ -{ - SELECTION_ADD = CHANNEL_OP_ADD, - SELECTION_SUB = CHANNEL_OP_SUB, - SELECTION_REPLACE = CHANNEL_OP_REPLACE, - SELECTION_INTERSECT = CHANNEL_OP_INTERSECT, - SELECTION_MOVE_MASK, - SELECTION_MOVE, - SELECTION_ANCHOR -} SelectOps; - -/* The possible states for tools */ -typedef enum /*< skip >*/ -{ - INACTIVE, - ACTIVE, - PAUSED -} ToolState; - -/* Tool control actions */ -typedef enum /*< skip >*/ -{ - PAUSE, - RESUME, - HALT, - CURSOR_UPDATE, - DESTROY, - RECREATE -} ToolAction; - -/* Tool types */ -typedef enum /*< skip >*/ -{ - TOOL_TYPE_NONE = -1, - FIRST_TOOLBOX_TOOL = 0, - RECT_SELECT = FIRST_TOOLBOX_TOOL, - ELLIPSE_SELECT, - FREE_SELECT, - FUZZY_SELECT, - BEZIER_SELECT, - ISCISSORS, - MOVE, - MAGNIFY, - CROP, - ROTATE, - SCALE, - SHEAR, - PERSPECTIVE, - FLIP, - TEXT, - COLOR_PICKER, - BUCKET_FILL, - BLEND, - PENCIL, - PAINTBRUSH, - AIRBRUSH, - INK, - CLONE, - ERASER, - SMUDGE, - CONVOLVE, - DODGEBURN, - MEASURE, - LAST_TOOLBOX_TOOL = MEASURE, - - /* Non-toolbox tools */ - BY_COLOR_SELECT, - COLOR_BALANCE, - BRIGHTNESS_CONTRAST, - HUE_SATURATION, - POSTERIZE, - THRESHOLD, - CURVES, - LEVELS, - HISTOGRAM -} ToolType; - -/* possible transform functions */ -typedef enum /*< skip >*/ -{ - TRANSFORM_CREATING, - TRANSFORM_HANDLE_1, - TRANSFORM_HANDLE_2, - TRANSFORM_HANDLE_3, - TRANSFORM_HANDLE_4, - TRANSFORM_HANDLE_CENTER -} TransformAction; - -/* the different states that the transformation function can be called with */ -typedef enum /*< skip >*/ -{ - TRANSFORM_INIT, - TRANSFORM_MOTION, - TRANSFORM_RECALC, - TRANSFORM_FINISH -} TransformState; - -typedef enum /*< skip >*/ -{ - CURSOR_MODE_TOOL_ICON, - CURSOR_MODE_TOOL_CROSSHAIR, - CURSOR_MODE_CROSSHAIR -} CursorMode; - -typedef enum /*< skip >*/ -{ - CURSOR_MODIFIER_NONE, - CURSOR_MODIFIER_PLUS, - CURSOR_MODIFIER_MINUS, - CURSOR_MODIFIER_INTERSECT, - CURSOR_MODIFIER_MOVE, - CURSOR_MODIFIER_RESIZE, - CURSOR_MODIFIER_CONTROL, - CURSOR_MODIFIER_ANCHOR, - CURSOR_MODIFIER_FOREGROUND, - CURSOR_MODIFIER_BACKGROUND, - CURSOR_MODIFIER_PATTERN, - CURSOR_MODIFIER_HAND -} CursorModifier; +#include "appenums.h" /* objects */ @@ -347,7 +38,7 @@ typedef enum /*< skip >*/ typedef struct _GimpObject GimpObject; typedef struct _GimpSet GimpSet; -typedef guint GimpSetHandlerId; +typedef guint GimpSetHandlerId; typedef struct _GimpList GimpList; @@ -361,11 +52,11 @@ typedef GimpChannel Channel; /* convenience */ typedef struct _GimpLayer GimpLayer; typedef struct _GimpLayerMask GimpLayerMask; -typedef GimpLayer Layer; /* convenience */ -typedef GimpLayerMask LayerMask; /* convenience */ +typedef GimpLayer Layer; /* convenience */ +typedef GimpLayerMask LayerMask; /* convenience */ typedef struct _GimpImage GimpImage; -typedef GimpImage GImage; +typedef GimpImage GImage; typedef struct _GimpBrush GimpBrush; typedef struct _GimpBrushList GimpBrushList; @@ -411,7 +102,7 @@ typedef struct _gradient_t gradient_t; typedef struct _Guide Guide; -typedef gpointer ImageMap; +typedef gpointer ImageMap; typedef struct _InfoDialog InfoDialog; @@ -437,7 +128,7 @@ typedef struct _PixelRegionHolder PixelRegionHolder; typedef struct _ProcArg ProcArg; typedef struct _ProcRecord ProcRecord; -typedef guint32 Tattoo; +typedef guint32 Tattoo; typedef struct _TempBuf TempBuf; typedef struct _TempBuf MaskBuf; @@ -467,7 +158,7 @@ typedef struct _layer_mask_undo LayerMaskUndo; typedef struct _fs_to_layer_undo FStoLayerUndo; -typedef GSList PathUndo; +typedef GSList PathUndo; /* functions */ @@ -482,9 +173,9 @@ typedef void (* GimpProgressFunc) (gint ymin, gint curr_y, gpointer progress_data); -typedef void (* ImageMapApplyFunc) (PixelRegion *, - PixelRegion *, - gpointer); +typedef void (* ImageMapApplyFunc) (PixelRegion *srcPR, + PixelRegion *destPR, + gpointer data); #endif /* __APPTYPES_H__ */ diff --git a/tools/pdbgen/Makefile.am b/tools/pdbgen/Makefile.am index f4059bcdde..d724037f0c 100644 --- a/tools/pdbgen/Makefile.am +++ b/tools/pdbgen/Makefile.am @@ -49,11 +49,11 @@ EXTRA_DIST = \ $(pdb_sources) enum_headers = \ + ../../app/appenums.h \ ../../app/appenv.h \ ../../app/apptypes.h \ ../../app/blend.h \ ../../app/bucket_fill.h \ - ../../app/channel.h \ ../../app/channel_ops.h \ ../../app/clone.h \ ../../app/color_balance.h \ @@ -61,8 +61,6 @@ enum_headers = \ ../../app/convolve.h \ ../../app/dodgeburn.h \ ../../app/errors.h \ - ../../app/eraser.h \ - ../../app/gimpdrawable.h \ ../../app/gimpimage.h \ ../../app/hue_saturation.h \ ../../app/layer.h \ @@ -70,8 +68,6 @@ enum_headers = \ ../../app/paint_core.h \ ../../app/paint_funcs.h \ ../../app/plug_in.h \ - ../../app/procedural_db.h \ - ../../app/shear_tool.h \ ../../app/text_tool.h pdb_scripts = \ diff --git a/tools/pdbgen/app.pl b/tools/pdbgen/app.pl index 6dac61ae7a..23090bc478 100644 --- a/tools/pdbgen/app.pl +++ b/tools/pdbgen/app.pl @@ -675,6 +675,7 @@ GPL foreach (@{$main::grp{$group}->{headers}}) { $out->{headers}->{$_}++ } delete $out->{headers}->{q/"procedural_db.h"/}; delete $out->{headers}->{q/"config.h"/}; + delete $out->{headers}->{q/"appenums.h"/}; delete $out->{headers}->{q/"apptypes.h"/}; my @headers = sort { diff --git a/tools/pdbgen/enums.pl b/tools/pdbgen/enums.pl index 3262808554..74806ef7aa 100644 --- a/tools/pdbgen/enums.pl +++ b/tools/pdbgen/enums.pl @@ -20,17 +20,9 @@ package Gimp::CodeGen::enums; %enums = ( - MessageHandlerType => - { contig => 1, - header => 'appenv.h', - symbols => [ qw(MESSAGE_BOX CONSOLE ERROR_CONSOLE) ], - mapping => { MESSAGE_BOX => '0', - CONSOLE => '1', - ERROR_CONSOLE => '2' } - }, GimpImageBaseType => { contig => 1, - header => 'apptypes.h', + header => 'appenums.h', symbols => [ qw(RGB GRAY INDEXED) ], mapping => { RGB => '0', GRAY => '1', @@ -38,7 +30,7 @@ package Gimp::CodeGen::enums; }, GimpImageType => { contig => 1, - header => 'apptypes.h', + header => 'appenums.h', symbols => [ qw(RGB_GIMAGE RGBA_GIMAGE GRAY_GIMAGE GRAYA_GIMAGE INDEXED_GIMAGE INDEXEDA_GIMAGE) ], mapping => { RGB_GIMAGE => '0', @@ -56,7 +48,7 @@ package Gimp::CodeGen::enums; }, GimpFillType => { contig => 1, - header => 'apptypes.h', + header => 'appenums.h', symbols => [ qw(FOREGROUND_FILL BACKGROUND_FILL WHITE_FILL TRANSPARENT_FILL NO_FILL) ], mapping => { FOREGROUND_FILL => '0', @@ -72,7 +64,7 @@ package Gimp::CodeGen::enums; }, LayerModeEffects => { contig => 1, - header => 'apptypes.h', + header => 'appenums.h', symbols => [ qw(NORMAL_MODE DISSOLVE_MODE BEHIND_MODE MULTIPLY_MODE SCREEN_MODE OVERLAY_MODE DIFFERENCE_MODE ADDITION_MODE SUBTRACT_MODE @@ -101,7 +93,7 @@ package Gimp::CodeGen::enums; }, ConvolutionType => { contig => 1, - header => 'apptypes.h', + header => 'appenums.h', symbols => [ qw(NORMAL_CONVOL ABSOLUTE_CONVOL NEGATIVE_CONVOL) ], mapping => { NORMAL_CONVOL => '0', ABSOLUTE_CONVOL => '1', @@ -109,7 +101,7 @@ package Gimp::CodeGen::enums; }, BrushApplicationMode => { contig => 1, - header => 'apptypes.h', + header => 'appenums.h', symbols => [ qw(HARD SOFT PRESSURE) ], mapping => { HARD => '0', SOFT => '1', @@ -117,7 +109,7 @@ package Gimp::CodeGen::enums; }, PaintApplicationMode => { contig => 1, - header => 'apptypes.h', + header => 'appenums.h', symbols => [ qw(CONSTANT INCREMENTAL) ], mapping => { CONSTANT => '0', INCREMENTAL => '1' }, @@ -125,14 +117,14 @@ package Gimp::CodeGen::enums; }, MaskApplyMode => { contig => 1, - header => 'apptypes.h', + header => 'appenums.h', symbols => [ qw(APPLY DISCARD) ], mapping => { APPLY => '0', DISCARD => '1' } }, AddMaskType => { contig => 1, - header => 'apptypes.h', + header => 'appenums.h', symbols => [ qw(ADD_WHITE_MASK ADD_BLACK_MASK ADD_ALPHA_MASK) ], mapping => { ADD_WHITE_MASK => '0', ADD_BLACK_MASK => '1', @@ -143,7 +135,7 @@ package Gimp::CodeGen::enums; }, GradientPaintMode => { contig => 1, - header => 'apptypes.h', + header => 'appenums.h', symbols => [ qw(ONCE_FORWARD ONCE_BACKWARDS LOOP_SAWTOOTH LOOP_TRIANGLE ONCE_END_COLOR) ], mapping => { ONCE_FORWARD => '0', @@ -154,7 +146,7 @@ package Gimp::CodeGen::enums; }, InterpolationType => { contig => 1, - header => 'apptypes.h', + header => 'appenums.h', symbols => [ qw(LINEAR_INTERPOLATION CUBIC_INTERPOLATION NEAREST_NEIGHBOR_INTERPOLATION) ], mapping => { LINEAR_INTERPOLATION => '0', @@ -163,7 +155,7 @@ package Gimp::CodeGen::enums; }, OrientationType => { contig => 1, - header => 'apptypes.h', + header => 'appenums.h', symbols => [ qw(HORIZONTAL VERTICAL UNKNOWN) ], mapping => { HORIZONTAL => '0', VERTICAL => '1', @@ -171,7 +163,7 @@ package Gimp::CodeGen::enums; }, PDBArgType => { contig => 1, - header => 'apptypes.h', + header => 'appenums.h', symbols => [ qw(PDB_INT32 PDB_INT16 PDB_INT8 PDB_FLOAT PDB_STRING PDB_INT32ARRAY PDB_INT16ARRAY PDB_INT8ARRAY PDB_FLOATARRAY PDB_STRINGARRAY PDB_COLOR @@ -205,7 +197,7 @@ package Gimp::CodeGen::enums; }, PDBStatusType => { contig => 1, - header => 'apptypes.h', + header => 'appenums.h', symbols => [ qw(PDB_EXECUTION_ERROR PDB_CALLING_ERROR PDB_PASS_THROUGH PDB_SUCCESS PDB_CANCEL) ], mapping => { PDB_EXECUTION_ERROR => '0', @@ -216,7 +208,7 @@ package Gimp::CodeGen::enums; }, PDBProcType => { contig => 1, - header => 'apptypes.h', + header => 'appenums.h', symbols => [ qw(PDB_INTERNAL PDB_PLUGIN PDB_EXTENSION PDB_TEMPORARY) ], mapping => { PDB_INTERNAL => '0', @@ -230,7 +222,7 @@ package Gimp::CodeGen::enums; }, ChannelOps => { contig => 1, - header => 'apptypes.h', + header => 'appenums.h', symbols => [ qw(CHANNEL_OP_ADD CHANNEL_OP_SUB CHANNEL_OP_REPLACE CHANNEL_OP_INTERSECT) ], mapping => { CHANNEL_OP_ADD => '0', @@ -242,6 +234,14 @@ package Gimp::CodeGen::enums; CHANNEL_OP_REPLACE => 'REPLACE', CHANNEL_OP_INTERSECT => 'INTERSECT' } }, + MessageHandlerType => + { contig => 1, + header => 'appenv.h', + symbols => [ qw(MESSAGE_BOX CONSOLE ERROR_CONSOLE) ], + mapping => { MESSAGE_BOX => '0', + CONSOLE => '1', + ERROR_CONSOLE => '2' } + }, GradientType => { contig => 1, header => 'blend.h',