Default all strings to validate UTF-8, use no_validate to disable. Also

2003-08-18  Manish Singh  <yosh@gimp.org>

        * tools/pdbgen/app.pl: Default all strings to validate UTF-8, use
        no_validate to disable. Also added a null_ok parameter which does
        validate UTF-8, but allows NULL.

        * tools/pdbgen/pdb/brush_select.pdb
        * tools/pdbgen/pdb/brushes.pdb
        * tools/pdbgen/pdb/channel.pdb
        * tools/pdbgen/pdb/convert.pdb
        * tools/pdbgen/pdb/fileops.pdb
        * tools/pdbgen/pdb/font_select.pdb
        * tools/pdbgen/pdb/gimprc.pdb
        * tools/pdbgen/pdb/gradient_select.pdb
        * tools/pdbgen/pdb/gradients.pdb
        * tools/pdbgen/pdb/help.pdb
        * tools/pdbgen/pdb/image.pdb
        * tools/pdbgen/pdb/layer.pdb
        * tools/pdbgen/pdb/message.pdb
        * tools/pdbgen/pdb/palette_select.pdb
        * tools/pdbgen/pdb/palettes.pdb
        * tools/pdbgen/pdb/parasite.pdb
        * tools/pdbgen/pdb/paths.pdb
        * tools/pdbgen/pdb/pattern_select.pdb
        * tools/pdbgen/pdb/patterns.pdb
        * tools/pdbgen/pdb/plug_in.pdb
        * tools/pdbgen/pdb/procedural_db.pdb
        * tools/pdbgen/pdb/text_tool.pdb
        * tools/pdbgen/pdb/unit.pdb: removed utf8, added no_validate and
        null_ok where appropriate.

        * app/pdb/brush_select_cmds.c
        * app/pdb/font_select_cmds.c
        * app/pdb/gradient_select_cmds.c
        * app/pdb/layer_cmds.c
        * app/pdb/palette_select_cmds.c
        * app/pdb/pattern_select_cmds.c
        * app/pdb/plug_in_cmds.c: regenerated.
This commit is contained in:
Manish Singh
2003-08-19 19:08:11 +00:00
committed by Manish Singh
parent 82ac2e384f
commit 780710188d
32 changed files with 169 additions and 137 deletions

View File

@ -1,3 +1,42 @@
2003-08-18 Manish Singh <yosh@gimp.org>
* tools/pdbgen/app.pl: Default all strings to validate UTF-8, use
no_validate to disable. Also added a null_ok parameter which does
validate UTF-8, but allows NULL.
* tools/pdbgen/pdb/brush_select.pdb
* tools/pdbgen/pdb/brushes.pdb
* tools/pdbgen/pdb/channel.pdb
* tools/pdbgen/pdb/convert.pdb
* tools/pdbgen/pdb/fileops.pdb
* tools/pdbgen/pdb/font_select.pdb
* tools/pdbgen/pdb/gimprc.pdb
* tools/pdbgen/pdb/gradient_select.pdb
* tools/pdbgen/pdb/gradients.pdb
* tools/pdbgen/pdb/help.pdb
* tools/pdbgen/pdb/image.pdb
* tools/pdbgen/pdb/layer.pdb
* tools/pdbgen/pdb/message.pdb
* tools/pdbgen/pdb/palette_select.pdb
* tools/pdbgen/pdb/palettes.pdb
* tools/pdbgen/pdb/parasite.pdb
* tools/pdbgen/pdb/paths.pdb
* tools/pdbgen/pdb/pattern_select.pdb
* tools/pdbgen/pdb/patterns.pdb
* tools/pdbgen/pdb/plug_in.pdb
* tools/pdbgen/pdb/procedural_db.pdb
* tools/pdbgen/pdb/text_tool.pdb
* tools/pdbgen/pdb/unit.pdb: removed utf8, added no_validate and
null_ok where appropriate.
* app/pdb/brush_select_cmds.c
* app/pdb/font_select_cmds.c
* app/pdb/gradient_select_cmds.c
* app/pdb/layer_cmds.c
* app/pdb/palette_select_cmds.c
* app/pdb/pattern_select_cmds.c
* app/pdb/plug_in_cmds.c: regenerated.
2003-08-19 Sven Neumann <sven@gimp.org> 2003-08-19 Sven Neumann <sven@gimp.org>
* app/gui/toolbox-menu.c: use the new icons here as well. * app/gui/toolbox-menu.c: use the new icons here as well.

View File

@ -70,6 +70,8 @@ brushes_popup_invoker (Gimp *gimp,
success = FALSE; success = FALSE;
initial_brush = (gchar *) args[2].value.pdb_pointer; initial_brush = (gchar *) args[2].value.pdb_pointer;
if (initial_brush && !g_utf8_validate (initial_brush, -1, NULL))
success = FALSE;
opacity = args[3].value.pdb_float; opacity = args[3].value.pdb_float;
if (opacity < 0.0 || opacity > 100.0) if (opacity < 0.0 || opacity > 100.0)

View File

@ -65,6 +65,8 @@ fonts_popup_invoker (Gimp *gimp,
success = FALSE; success = FALSE;
initial_font = (gchar *) args[2].value.pdb_pointer; initial_font = (gchar *) args[2].value.pdb_pointer;
if (initial_font && !g_utf8_validate (initial_font, -1, NULL))
success = FALSE;
if (success) if (success)
{ {

View File

@ -68,6 +68,8 @@ gradients_popup_invoker (Gimp *gimp,
success = FALSE; success = FALSE;
initial_gradient = (gchar *) args[2].value.pdb_pointer; initial_gradient = (gchar *) args[2].value.pdb_pointer;
if (initial_gradient && !g_utf8_validate (initial_gradient, -1, NULL))
success = FALSE;
sample_size = args[3].value.pdb_int; sample_size = args[3].value.pdb_int;
if (sample_size <= 0 || sample_size > 10000) if (sample_size <= 0 || sample_size > 10000)

View File

@ -142,6 +142,8 @@ layer_new_invoker (Gimp *gimp,
success = FALSE; success = FALSE;
name = (gchar *) args[4].value.pdb_pointer; name = (gchar *) args[4].value.pdb_pointer;
if (name && !g_utf8_validate (name, -1, NULL))
success = FALSE;
opacity = args[5].value.pdb_float; opacity = args[5].value.pdb_float;
if (opacity < 0.0 || opacity > 100.0) if (opacity < 0.0 || opacity > 100.0)

View File

@ -66,6 +66,8 @@ palettes_popup_invoker (Gimp *gimp,
success = FALSE; success = FALSE;
initial_palette = (gchar *) args[2].value.pdb_pointer; initial_palette = (gchar *) args[2].value.pdb_pointer;
if (initial_palette && !g_utf8_validate (initial_palette, -1, NULL))
success = FALSE;
if (success) if (success)
{ {

View File

@ -66,6 +66,8 @@ patterns_popup_invoker (Gimp *gimp,
success = FALSE; success = FALSE;
initial_pattern = (gchar *) args[2].value.pdb_pointer; initial_pattern = (gchar *) args[2].value.pdb_pointer;
if (initial_pattern && !g_utf8_validate (initial_pattern, -1, NULL))
success = FALSE;
if (success) if (success)
{ {

View File

@ -73,20 +73,25 @@ static Argument *
progress_init_invoker (Gimp *gimp, progress_init_invoker (Gimp *gimp,
Argument *args) Argument *args)
{ {
gboolean success = FALSE; gboolean success = TRUE;
gchar *message; gchar *message;
gint32 gdisplay; gint32 gdisplay;
message = (gchar *) args[0].value.pdb_pointer; message = (gchar *) args[0].value.pdb_pointer;
if (message && !g_utf8_validate (message, -1, NULL))
success = FALSE;
gdisplay = args[1].value.pdb_int; gdisplay = args[1].value.pdb_int;
if (gimp->current_plug_in && gimp->current_plug_in->open) if (success)
{ {
success = TRUE; if (gimp->current_plug_in && gimp->current_plug_in->open)
{
if (! gimp->no_interface) if (! gimp->no_interface)
plug_in_progress_start (gimp->current_plug_in, message, gdisplay); plug_in_progress_start (gimp->current_plug_in, message, gdisplay);
}
else
success = FALSE;
} }
return procedural_db_return_args (&progress_init_proc, success); return procedural_db_return_args (&progress_init_proc, success);
@ -440,12 +445,12 @@ static ProcArg plugin_domain_register_inargs[] =
{ {
GIMP_PDB_STRING, GIMP_PDB_STRING,
"domain_name", "domain_name",
"The name of the textdomain (must be unique)." "The name of the textdomain (must be unique)"
}, },
{ {
GIMP_PDB_STRING, GIMP_PDB_STRING,
"domain_path", "domain_path",
"The absolute path to the compiled message catalog (may be NULL)." "The absolute path to the compiled message catalog (may be NULL)"
} }
}; };

View File

@ -257,19 +257,22 @@ sub marshal_inargs {
my ($reverse, $test, $utf8, $utf8testvar); my ($reverse, $test, $utf8, $utf8testvar);
$test = "$var == NULL"; $test = "$var == NULL";
$utf8 = 1;
if ($pdbtype eq 'parasite') { if ($pdbtype eq 'parasite') {
$test .= " || $var->name == NULL"; $test .= " || $var->name == NULL";
$utf8 = 1;
$utf8testvar = "$var->name"; $utf8testvar = "$var->name";
} }
else { else {
$utf8 = exists $_->{utf8} && $_->{utf8}; $utf8 = !exists $_->{no_validate};
$utf8testvar = "$var"; $utf8testvar = "$var";
} }
if ($utf8) { if (exists $_->{null_ok}) {
$reverse = sub { ${$_[0]} =~ s/!//; };
$test = "$var && !g_utf8_validate ($var, -1, NULL)";
}
elsif ($utf8) {
$reverse = sub { ${$_[0]} =~ s/!//; $reverse = sub { ${$_[0]} =~ s/!//;
${$_[0]} =~ s/||/&&/g; ${$_[0]} =~ s/||/&&/g;
${$_[0]} =~ s/==/!=/g }; ${$_[0]} =~ s/==/!=/g };

View File

@ -43,13 +43,13 @@ sub brushes_popup {
@inargs = ( @inargs = (
{ name => 'brush_callback', type => 'string', { name => 'brush_callback', type => 'string',
desc => 'The callback PDB proc to call when brush selection is made', desc => 'The callback PDB proc to call when brush selection is
utf8 => 1 }, made' },
{ name => 'popup_title', type => 'string', { name => 'popup_title', type => 'string',
desc => 'Title to give the brush popup window', utf8 => 1 }, desc => 'Title to give the brush popup window' },
{ name => 'initial_brush', type => 'string', { name => 'initial_brush', type => 'string',
desc => 'The name of the brush to set as the first selected', desc => 'The name of the brush to set as the first selected',
no_success => 1, utf8 => 1 }, null_ok => 1 },
&brush_args &brush_args
); );
@ -85,8 +85,7 @@ sub brushes_close_popup {
@inargs = ( @inargs = (
{ name => 'brush_callback', type => 'string', { name => 'brush_callback', type => 'string',
desc => 'The name of the callback registered for this popup', desc => 'The name of the callback registered for this popup' }
utf8 => 1 }
); );
%invoke = ( %invoke = (
@ -117,10 +116,9 @@ sub brushes_set_popup {
@inargs = ( @inargs = (
{ name => 'brush_callback', type => 'string', { name => 'brush_callback', type => 'string',
desc => 'The name of the callback registered for this popup', desc => 'The name of the callback registered for this popup' },
utf8 => 1 },
{ name => 'brush_name', type => 'string', { name => 'brush_name', type => 'string',
desc => 'The name of the brush to set as selected', utf8 => 1 }, desc => 'The name of the brush to set as selected' },
&brush_args &brush_args
); );

View File

@ -20,8 +20,7 @@
sub brush_arg () {{ sub brush_arg () {{
name => 'name', name => 'name',
type => 'string', type => 'string',
desc => 'The brush name', desc => 'The brush name'
utf8 => 1
}} }}
sub dim_args () { sub dim_args () {

View File

@ -88,10 +88,6 @@ sub channel_set_prop_proc {
$inargs[1]->{desc} .= ' (%%desc%%)'; $inargs[1]->{desc} .= ' (%%desc%%)';
} }
if ($type =~ /string/) {
$inargs[1]->{utf8} = 1;
}
$invoke{code} = $undo ? "gimp_${core_type}_set_$prop ($core_var, $prop, TRUE);" $invoke{code} = $undo ? "gimp_${core_type}_set_$prop ($core_var, $prop, TRUE);"
: "gimp_${core_type}_set_$prop ($core_var, $prop);"; : "gimp_${core_type}_set_$prop ($core_var, $prop);";
@ -156,7 +152,7 @@ HELP
{ name => 'height', type => '0 < int32', { name => 'height', type => '0 < int32',
desc => 'The channel height: (%%desc%%)' }, desc => 'The channel height: (%%desc%%)' },
{ name => 'name', type => 'string', { name => 'name', type => 'string',
desc => 'The channel name', utf8 => 1 }, desc => 'The channel name' },
{ name => 'opacity', type => '0 <= float <= 100', { name => 'opacity', type => '0 <= float <= 100',
desc => 'The channel opacity: (%%desc%%)' }, desc => 'The channel opacity: (%%desc%%)' },
{ name => 'color', type => 'color', { name => 'color', type => 'color',

View File

@ -99,7 +99,7 @@ HELP
{ name => 'palette', type => 'string', { name => 'palette', type => 'string',
desc => 'The name of the custom palette to use, ignored unless desc => 'The name of the custom palette to use, ignored unless
(palette_type == GIMP_CUSTOM_PALETTE)', (palette_type == GIMP_CUSTOM_PALETTE)',
alias => 'palette_name', utf8 => 1 } alias => 'palette_name' }
); );
%invoke = ( %invoke = (

View File

@ -39,7 +39,7 @@ sub handler_args {
push @inargs, { name => 'procedure_name', type => 'string', push @inargs, { name => 'procedure_name', type => 'string',
desc => "The name of the procedure to be used for $action", desc => "The name of the procedure to be used for $action",
alias => 'name', utf8 => 1 }; alias => 'name' };
foreach ([ 'extensions', 'jpg,jpeg' ], [ 'prefixes', 'http:,ftp:' ]) { foreach ([ 'extensions', 'jpg,jpeg' ], [ 'prefixes', 'http:,ftp:' ]) {
&list_arg($type, $_->[0], @$_); &list_arg($type, $_->[0], @$_);
@ -66,9 +66,9 @@ HELP
{ name => 'run_mode', { name => 'run_mode',
type => 'enum GimpRunMode (no GIMP_RUN_WITH_LAST_VALS)', type => 'enum GimpRunMode (no GIMP_RUN_WITH_LAST_VALS)',
desc => 'The run mode: %%desc%%' }, desc => 'The run mode: %%desc%%' },
{ name => 'filename', type => 'string', { name => 'filename', type => 'string', no_validate => 1,
desc => 'The name of the file to load' }, desc => 'The name of the file to load' },
{ name => 'raw_filename', type => 'string', { name => 'raw_filename', type => 'string', no_validate => 1,
desc => 'The name as entered by the user' } desc => 'The name as entered by the user' }
); );
@ -123,9 +123,9 @@ HELP
desc => 'Input image' }, desc => 'Input image' },
{ name => 'drawable', type => 'drawable', { name => 'drawable', type => 'drawable',
desc => 'Drawable to save' }, desc => 'Drawable to save' },
{ name => 'filename', type => 'string', { name => 'filename', type => 'string', no_validate => 1,
desc => 'The name of the file to save the image in' }, desc => 'The name of the file to save the image in' },
{ name => 'raw_filename', type => 'string', { name => 'raw_filename', type => 'string', no_validate => 1,
desc => 'The name as entered by the user' } desc => 'The name as entered by the user' }
); );
@ -188,7 +188,7 @@ HELP
$date = '1999-2003'; $date = '1999-2003';
@inargs = ( @inargs = (
{ name => 'filename', type => 'string', { name => 'filename', type => 'string', no_validate => 1,
desc => 'The name of the file that owns the thumbnail to load' }, desc => 'The name of the file that owns the thumbnail to load' },
); );
@ -300,7 +300,7 @@ HELP
@inargs = ( @inargs = (
&std_image_arg, &std_image_arg,
{ name => 'filename', type => 'string', { name => 'filename', type => 'string', no_validate => 1,
desc => 'The name of the file the thumbnail belongs to' }, desc => 'The name of the file the thumbnail belongs to' },
); );
@ -349,7 +349,7 @@ HELP
&pdb_misc; &pdb_misc;
@inargs = ( @inargs = (
{ name => 'extension', type => 'string', { name => 'extension', type => 'string', no_validate => 1,
desc => 'The extension the file will have' } desc => 'The extension the file will have' }
); );

View File

@ -32,13 +32,13 @@ sub fonts_popup {
@inargs = ( @inargs = (
{ name => 'font_callback', type => 'string', { name => 'font_callback', type => 'string',
desc => 'The callback PDB proc to call when font selection is made', desc => 'The callback PDB proc to call when font selection is
utf8 => 1 }, made' },
{ name => 'popup_title', type => 'string', { name => 'popup_title', type => 'string',
desc => 'Title to give the font popup window', utf8 => 1 }, desc => 'Title to give the font popup window' },
{ name => 'initial_font', type => 'string', { name => 'initial_font', type => 'string',
desc => 'The name of the font to set as the first selected', desc => 'The name of the font to set as the first selected',
no_success => 1, utf8 => 1 } null_ok => 1 }
); );
%invoke = ( %invoke = (
@ -68,8 +68,7 @@ sub fonts_close_popup {
@inargs = ( @inargs = (
{ name => 'font_callback', type => 'string', { name => 'font_callback', type => 'string',
desc => 'The name of the callback registered for this popup', desc => 'The name of the callback registered for this popup' }
utf8 => 1 }
); );
%invoke = ( %invoke = (
@ -100,10 +99,9 @@ sub fonts_set_popup {
@inargs = ( @inargs = (
{ name => 'font_callback', type => 'string', { name => 'font_callback', type => 'string',
desc => 'The name of the callback registered for this popup', desc => 'The name of the callback registered for this popup' },
utf8 => 1 },
{ name => 'font_name', type => 'string', { name => 'font_name', type => 'string',
desc => 'The name of the font to set as selected', utf8 => 1 } desc => 'The name of the font to set as selected' }
); );
%invoke = ( %invoke = (

View File

@ -42,7 +42,7 @@ HELP
@inargs = ( @inargs = (
{ name => 'token', type => 'string', { name => 'token', type => 'string',
desc => 'The token to query for', utf8 => 1 } desc => 'The token to query for' }
); );
@outargs = ( @outargs = (
@ -82,8 +82,8 @@ HELP
@inargs = ( @inargs = (
{ name => 'token', type => 'string', { name => 'token', type => 'string',
desc => 'The token to modify', utf8 => 1 }, desc => 'The token to modify' },
{ name => 'value', type => 'string', { name => 'value', type => 'string', no_validate => 1,
desc => 'The value to set the token to' } desc => 'The value to set the token to' }
); );

View File

@ -40,13 +40,13 @@ sub gradients_popup {
@inargs = ( @inargs = (
{ name => 'gradient_callback', type => 'string', { name => 'gradient_callback', type => 'string',
desc => 'The callback PDB proc to call when gradient selection is desc => 'The callback PDB proc to call when gradient selection is
made', utf8 => 1 }, made' },
{ name => 'popup_title', type => 'string', { name => 'popup_title', type => 'string',
desc => 'Title to give the gradient popup window', utf8 => 1 }, desc => 'Title to give the gradient popup window' },
{ name => 'initial_gradient', type => 'string', { name => 'initial_gradient', type => 'string',
desc => 'The name of the pattern to set as the first selected', desc => 'The name of the pattern to set as the first selected',
no_success => 1, utf8 => 1 }, null_ok => 1 },
&sample_size_arg &sample_size_arg
); );
@ -80,8 +80,7 @@ sub gradients_close_popup {
@inargs = ( @inargs = (
{ name => 'gradient_callback', type => 'string', { name => 'gradient_callback', type => 'string',
desc => 'The name of the callback registered for this popup', desc => 'The name of the callback registered for this popup' }
utf8 => 1 }
); );
%invoke = ( %invoke = (
@ -112,10 +111,9 @@ sub gradients_set_popup {
@inargs = ( @inargs = (
{ name => 'gradient_callback', type => 'string', { name => 'gradient_callback', type => 'string',
desc => 'The name of the callback registered for this popup', desc => 'The name of the callback registered for this popup' },
utf8 => 1 },
{ name => 'gradient_name', type => 'string', { name => 'gradient_name', type => 'string',
desc => 'The name of the gradient to set as selected', utf8 => 1 } desc => 'The name of the gradient to set as selected' }
); );
%invoke = ( %invoke = (

View File

@ -118,7 +118,7 @@ HELP
@inargs = ( @inargs = (
{ name => 'name', type => 'string', { name => 'name', type => 'string',
desc => 'The name of the gradient to set', utf8 => 1 } desc => 'The name of the gradient to set' }
); );
%invoke = ( %invoke = (
@ -284,8 +284,7 @@ HELP
@inargs = ( @inargs = (
{ name => 'name', type => 'string', { name => 'name', type => 'string',
desc => 'The gradient name ("" means current active gradient)', desc => 'The gradient name ("" means current active gradient)' },
utf8 => 1 },
&sample_size_arg, &sample_size_arg,
&reverse_arg &reverse_arg
); );

View File

@ -38,9 +38,9 @@ HELP
&pdb_misc; &pdb_misc;
@inargs = ( @inargs = (
{ name => 'prog_name', type => 'string', { name => 'prog_name', type => 'string', no_validate => 1,
desc => 'The plug-in\'s executable name or an empty string' }, desc => "The plug-in's executable name or an empty string" },
{ name => 'help_page', type => 'string', { name => 'help_page', type => 'string', no_validate => 1,
desc => 'The location of the help page' } desc => 'The location of the help page' }
); );

View File

@ -1252,14 +1252,17 @@ CODE2
} }
&image_accessors('filename', 'string', 'filename', 1, &image_accessors('filename', 'string', 'filename', 1,
[ <<'CODE', undef ]); [ <<'CODE1', <<'CODE2' ]);
$help =~ s/\. $//; $help =~ s/\. $//;
$help .= <<'HELP'; $help .= <<'HELP';
-- if it was loaded or has since been saved. Otherwise, returns NULL. -- if it was loaded or has since been saved. Otherwise, returns NULL.
HELP HELP
$outargs[0]->{alias} =~ s/g_strdup \((.*)\)/$1/; $outargs[0]->{alias} =~ s/g_strdup \((.*)\)/$1/;
CODE CODE1
$inargs[1]->{no_validate} = 1;
CODE2
&image_accessors('name', 'string', 'name', 1, &image_accessors('name', 'string', 'name', 1,
[ <<'CODE1', undef ]); [ <<'CODE1', undef ]);

View File

@ -166,10 +166,6 @@ sub layer_set_prop_proc {
$inargs[1]->{desc} .= ' (%%desc%%)'; $inargs[1]->{desc} .= ' (%%desc%%)';
} }
if ($type =~ /string/) {
$inargs[1]->{utf8} = 1;
}
$invoke{code} = $undo ? "gimp_${core_type}_set_$prop ($core_var, $prop, TRUE);" $invoke{code} = $undo ? "gimp_${core_type}_set_$prop ($core_var, $prop, TRUE);"
: "gimp_${core_type}_set_$prop ($core_var, $prop);"; : "gimp_${core_type}_set_$prop ($core_var, $prop);";
@ -241,7 +237,7 @@ HELP
{ name => 'type', type => 'enum GimpImageType', { name => 'type', type => 'enum GimpImageType',
desc => 'The layer type: { %%desc%% }' }, desc => 'The layer type: { %%desc%% }' },
{ name => 'name', type => 'string', { name => 'name', type => 'string',
desc => 'The layer name', no_success => 1, utf8 => 1 }, desc => 'The layer name', null_ok => 1 },
{ name => 'opacity', type => '0 <= float <= 100', { name => 'opacity', type => '0 <= float <= 100',
desc => 'The layer opacity: (%%desc%%)' }, desc => 'The layer opacity: (%%desc%%)' },
{ name => 'mode', type => 'enum GimpLayerModeEffects', { name => 'mode', type => 'enum GimpLayerModeEffects',

View File

@ -34,7 +34,7 @@ HELP
@inargs = ( @inargs = (
{ name => 'message', type => 'string', const => 1, { name => 'message', type => 'string', const => 1,
desc => 'Message to display in the dialog', utf8 => 1 } desc => 'Message to display in the dialog' }
); );
%invoke = ( %invoke = (

View File

@ -32,13 +32,13 @@ sub palettes_popup {
@inargs = ( @inargs = (
{ name => 'palette_callback', type => 'string', { name => 'palette_callback', type => 'string',
desc => 'The callback PDB proc to call when palette selection is desc => 'The callback PDB proc to call when palette selection is
made', utf8 => 1 }, made' },
{ name => 'popup_title', type => 'string', { name => 'popup_title', type => 'string',
desc => 'Title to give the palette popup window', utf8 => 1 }, desc => 'Title to give the palette popup window' },
{ name => 'initial_palette', type => 'string', { name => 'initial_palette', type => 'string',
desc => 'The name of the palette to set as the first selected', desc => 'The name of the palette to set as the first selected',
no_success => 1, utf8 => 1 }, null_ok => 1 },
); );
%invoke = ( %invoke = (
@ -70,8 +70,7 @@ sub palettes_close_popup {
@inargs = ( @inargs = (
{ name => 'palette_callback', type => 'string', { name => 'palette_callback', type => 'string',
desc => 'The name of the callback registered for this popup', desc => 'The name of the callback registered for this popup' }
utf8 => 1 }
); );
%invoke = ( %invoke = (
@ -102,10 +101,9 @@ sub palettes_set_popup {
@inargs = ( @inargs = (
{ name => 'palette_callback', type => 'string', { name => 'palette_callback', type => 'string',
desc => 'The name of the callback registered for this popup', desc => 'The name of the callback registered for this popup' },
utf8 => 1 },
{ name => 'palette_name', type => 'string', { name => 'palette_name', type => 'string',
desc => 'The name of the palette to set as selected', utf8 => 1 }, desc => 'The name of the palette to set as selected' },
); );
%invoke = ( %invoke = (

View File

@ -32,8 +32,7 @@ sub adrian_pdb_misc {
sub palette_arg () {{ sub palette_arg () {{
name => 'name', name => 'name',
type => 'string', type => 'string',
desc => 'The palette name', desc => 'The palette name'
utf8 => 1
}} }}
sub dim_args () { sub dim_args () {

View File

@ -25,8 +25,7 @@ sub pdb_misc {
sub name_arg {{ sub name_arg {{
name => 'name', name => 'name',
type => 'string', type => 'string',
desc => "The name of the parasite to $_[0]", desc => "The name of the parasite to $_[0]"
utf8 => 1
}} }}
sub parasite_outarg {{ sub parasite_outarg {{

View File

@ -80,8 +80,7 @@ HELP
@inargs = ( @inargs = (
&std_image_arg, &std_image_arg,
{ name => 'name', type => 'string', { name => 'name', type => 'string',
desc => 'the name of the path whose points should be listed', desc => 'the name of the path whose points should be listed' }
utf8 => 1 }
); );
$inargs[0]->{desc} = 'The ID of the image to list the paths from'; $inargs[0]->{desc} = 'The ID of the image to list the paths from';
@ -194,8 +193,7 @@ HELP
@inargs = ( @inargs = (
&std_image_arg, &std_image_arg,
{ name => 'name', type => 'string', { name => 'name', type => 'string',
desc => 'The name of the path to set the current path to', desc => 'The name of the path to set the current path to' }
utf8 => 1 }
); );
$inargs[0]->{desc} = 'The ID of the image to list set the paths in'; $inargs[0]->{desc} = 'The ID of the image to list set the paths in';
@ -230,7 +228,7 @@ HELP
name will be created - query the list of paths if you want name will be created - query the list of paths if you want
to make sure that the name of the path you create is to make sure that the name of the path you create is
unique. This will be set as the current path.', unique. This will be set as the current path.',
init => 1, utf8 => 1 }, init => 1 },
{ name => 'ptype', type => 'int32', { name => 'ptype', type => 'int32',
desc => 'The type of the path. Currently only one type (1 = Bezier) desc => 'The type of the path. Currently only one type (1 = Bezier)
is supported' }, is supported' },
@ -413,8 +411,7 @@ HELP
@inargs = ( @inargs = (
&std_image_arg, &std_image_arg,
{ name => 'name', type => 'string', { name => 'name', type => 'string',
desc => 'the name of the path whose tattoo should be obtained', desc => 'the name of the path whose tattoo should be obtained' }
utf8 => 1 }
); );
@outargs = ( @outargs = (
@ -450,7 +447,7 @@ HELP
@inargs = ( @inargs = (
&std_image_arg, &std_image_arg,
{ name => 'name', type => 'string', { name => 'name', type => 'string',
desc => 'the name of the path whose tattoo should be set', utf8 => 1 }, desc => 'the name of the path whose tattoo should be set' },
{ name => 'tattovalue', type => 'int32', { name => 'tattovalue', type => 'int32',
desc => 'The tattoo associated with the name path. Only values returned from \'path_get_tattoo\' should be used here', init => 1 } desc => 'The tattoo associated with the name path. Only values returned from \'path_get_tattoo\' should be used here', init => 1 }
); );
@ -519,7 +516,7 @@ HELP
@inargs = ( @inargs = (
&std_image_arg, &std_image_arg,
{ name => 'name', type => 'string', { name => 'name', type => 'string',
desc => 'The name of the path to delete', utf8 => 1 } desc => 'The name of the path to delete' }
); );
$inargs[0]->{desc} = 'The ID of the image to list delete the paths from'; $inargs[0]->{desc} = 'The ID of the image to list delete the paths from';
@ -551,8 +548,8 @@ HELP
@inargs = ( @inargs = (
&std_image_arg, &std_image_arg,
{ name => 'name', type => 'string', { name => 'name', type => 'string',
desc => 'the name of the path whose locked status should be obtained', desc => 'the name of the path whose locked status should be
utf8 => 1 } obtained' }
); );
@outargs = ( @outargs = (
@ -588,10 +585,11 @@ HELP
@inargs = ( @inargs = (
&std_image_arg, &std_image_arg,
{ name => 'name', type => 'string', { name => 'name', type => 'string',
desc => 'the name of the path whose locked status should be set', desc => 'the name of the path whose locked status should be set' },
utf8 => 1 },
{ name => 'lockstatus', type => 'int32', { name => 'lockstatus', type => 'int32',
desc => 'The lock status associated with the name path. 0 if the path is not locked. 1 if the path is to be locked', init => 1 } desc => 'The lock status associated with the name path. 0 if the
path is not locked. 1 if the path is to be locked',
init => 1 }
); );
%invoke = ( %invoke = (
@ -624,8 +622,7 @@ HELP
@inargs = ( @inargs = (
&std_image_arg, &std_image_arg,
{ name => 'name', type => 'string', { name => 'name', type => 'string',
desc => 'The name of the path which should be made into selection', desc => 'The name of the path which should be made into selection' },
utf8 => 1 },
{ name => 'op', type => 'enum GimpChannelOps', { name => 'op', type => 'enum GimpChannelOps',
desc => 'The desired operation with current selection' }, desc => 'The desired operation with current selection' },
{ name => 'antialias', type => 'boolean', { name => 'antialias', type => 'boolean',

View File

@ -31,13 +31,13 @@ sub patterns_popup {
@inargs = ( @inargs = (
{ name => 'pattern_callback', type => 'string', { name => 'pattern_callback', type => 'string',
desc => 'The callback PDB proc to call when pattern selection is desc => 'The callback PDB proc to call when pattern selection is
made', utf8 => 1 }, made' },
{ name => 'popup_title', type => 'string', { name => 'popup_title', type => 'string',
desc => 'Title to give the pattern popup window', utf8 => 1 }, desc => 'Title to give the pattern popup window' },
{ name => 'initial_pattern', type => 'string', { name => 'initial_pattern', type => 'string',
desc => 'The name of the pattern to set as the first selected', desc => 'The name of the pattern to set as the first selected',
no_success => 1, utf8 => 1 }, null_ok => 1 }
); );
%invoke = ( %invoke = (
@ -69,8 +69,7 @@ sub patterns_close_popup {
@inargs = ( @inargs = (
{ name => 'pattern_callback', type => 'string', { name => 'pattern_callback', type => 'string',
desc => 'The name of the callback registered for this popup', desc => 'The name of the callback registered for this popup' }
utf8 => 1 }
); );
%invoke = ( %invoke = (
@ -101,10 +100,9 @@ sub patterns_set_popup {
@inargs = ( @inargs = (
{ name => 'pattern_callback', type => 'string', { name => 'pattern_callback', type => 'string',
desc => 'The name of the callback registered for this popup', desc => 'The name of the callback registered for this popup' },
utf8 => 1 },
{ name => 'pattern_name', type => 'string', { name => 'pattern_name', type => 'string',
desc => 'The name of the pattern to set as selected', utf8 => 1 }, desc => 'The name of the pattern to set as selected' }
); );
%invoke = ( %invoke = (

View File

@ -20,8 +20,7 @@
sub pattern_arg () {{ sub pattern_arg () {{
name => 'name', name => 'name',
type => 'string', type => 'string',
desc => 'The pattern name', desc => 'The pattern name'
utf8 => 1
}} }}
sub dim_args () { sub dim_args () {

View File

@ -45,8 +45,8 @@ HELP
&std_pdb_misc; &std_pdb_misc;
@inargs = ( @inargs = (
{ name => 'message', type => 'string', no_success => 1, { name => 'message', type => 'string', null_ok => 1,
desc => 'Message to use in the progress dialog', utf8 => 1 }, desc => 'Message to use in the progress dialog' },
{ name => 'gdisplay', type => 'int32', { name => 'gdisplay', type => 'int32',
desc => 'GimpDisplay to update progressbar in, or -1 for a seperate desc => 'GimpDisplay to update progressbar in, or -1 for a seperate
window', window',
@ -54,16 +54,15 @@ HELP
); );
%invoke = ( %invoke = (
success => 'FALSE',
code => <<'CODE' code => <<'CODE'
{ {
if (gimp->current_plug_in && gimp->current_plug_in->open) if (gimp->current_plug_in && gimp->current_plug_in->open)
{ {
success = TRUE;
if (! gimp->no_interface) if (! gimp->no_interface)
plug_in_progress_start (gimp->current_plug_in, message, gdisplay); plug_in_progress_start (gimp->current_plug_in, message, gdisplay);
} }
else
success = FALSE;
} }
CODE CODE
); );
@ -134,7 +133,7 @@ sub plugins_query {
@inargs = ( @inargs = (
{ name => 'search_string', type => 'string', { name => 'search_string', type => 'string',
desc => 'If not an empty string then use this as a search pattern', desc => 'If not an empty string then use this as a search pattern',
alias => 'search_str', no_success => 1, utf8 => 1 } alias => 'search_str', no_success => 1 }
); );
@outargs = ( @outargs = (
@ -266,9 +265,10 @@ HELP
@inargs = ( @inargs = (
{ name => 'domain_name', type => 'string', { name => 'domain_name', type => 'string',
desc => 'The name of the textdomain (must be unique).', utf8 => 1 }, desc => 'The name of the textdomain (must be unique)' },
{ name => 'domain_path', type => 'string', { name => 'domain_path', type => 'string',
desc => 'The absolute path to the compiled message catalog (may be NULL).', desc => 'The absolute path to the compiled message catalog (may be
NULL)',
no_success => 1 }, no_success => 1 },
); );
@ -301,7 +301,7 @@ HELP
&mitch_misc; &mitch_misc;
@inargs = ( @inargs = (
{ name => 'help_path', type => 'string', { name => 'help_path', type => 'string', no_validate => 1,
desc => 'The rootdir of the plug-in\'s help pages' } desc => 'The rootdir of the plug-in\'s help pages' }
); );

View File

@ -21,15 +21,13 @@ sub proc_name_arg () {{
name => 'procedure', name => 'procedure',
type => 'string', type => 'string',
desc => 'The procedure name', desc => 'The procedure name',
alias => 'proc_name', alias => 'proc_name'
utf8 => 1
}} }}
sub data_ident_arg () {{ sub data_ident_arg () {{
name => 'identifier', name => 'identifier',
type => 'string', type => 'string',
desc => 'The identifier associated with data', desc => 'The identifier associated with data'
utf8 => 1
}} }}
sub data_bytes_arg () {{ sub data_bytes_arg () {{
@ -110,7 +108,7 @@ HELP
$copyright = $author . ' & Peter Mattis'; $copyright = $author . ' & Peter Mattis';
@inargs = ( @inargs = (
{ name => 'filename', type => 'string', { name => 'filename', type => 'string', no_validate => 1,
desc => 'The dump filename' } desc => 'The dump filename' }
); );
@ -155,7 +153,7 @@ HELP
my $regcomp = ""; my $free = ""; $once = 0; my $regcomp = ""; my $free = ""; $once = 0;
foreach (qw(name blurb help author copyright date proc_type)) { foreach (qw(name blurb help author copyright date proc_type)) {
push @inargs, { name => $_, type => 'string', push @inargs, { name => $_, type => 'string', no_validate => 1,
desc => "The regex for procedure $_" }; desc => "The regex for procedure $_" };
$regcomp .= ' ' x 2 if $once; $regcomp .= ' ' x 2 if $once;

View File

@ -28,15 +28,13 @@ sub pdb_misc {
sub text_arg () {{ sub text_arg () {{
name => 'text', name => 'text',
type => 'string', type => 'string',
desc => 'The text to generate', desc => 'The text to generate'
utf8 => 1
}} }}
sub fontname_arg () {{ sub fontname_arg () {{
name => 'fontname', name => 'fontname',
type => 'string', type => 'string',
desc => 'The name of the font', desc => 'The name of the font'
utf8 => 1
}} }}
sub size_args () {( sub size_args () {(
@ -68,7 +66,7 @@ sub font_prop_args {
my @result; my @result;
foreach (@props) { foreach (@props) {
(my $desc = $_) =~ s/_/-/g; (my $desc = $_) =~ s/_/-/g;
push @result, { name => $_, type => 'string', push @result, { name => $_, type => 'string', no_validate => 1,
desc => qq/The font $desc/ } desc => qq/The font $desc/ }
} }
@result; @result;

View File

@ -96,19 +96,19 @@ HELP
@inargs = ( @inargs = (
{ name => 'identifier', type => 'string', wrap => 1, { name => 'identifier', type => 'string', wrap => 1,
desc => "The new unit's identifier", utf8 => 1 }, desc => "The new unit's identifier" },
{ name => 'factor', type => 'float', { name => 'factor', type => 'float',
desc => "The new unit's factor" }, desc => "The new unit's factor" },
{ name => 'digits', type => 'int32', { name => 'digits', type => 'int32',
desc => "The new unit's digits" }, desc => "The new unit's digits" },
{ name => 'symbol', type => 'string', { name => 'symbol', type => 'string',
desc => "The new unit's symbol", utf8 => 1 }, desc => "The new unit's symbol" },
{ name => 'abbreviation', type => 'string', { name => 'abbreviation', type => 'string',
desc => "The new unit's abbreviation", utf8 => 1 }, desc => "The new unit's abbreviation" },
{ name => 'singular', type => 'string', { name => 'singular', type => 'string',
desc => "The new unit's singular form", utf8 => 1 }, desc => "The new unit's singular form" },
{ name => 'plural', type => 'string', { name => 'plural', type => 'string',
desc => "The new unit's plural form", utf8 => 1 } desc => "The new unit's plural form" }
); );
@outargs = ( &unit_arg ); @outargs = ( &unit_arg );