d6fd55064b
2007-04-25 Michael Natterer <mitch@gimp.org>
* app/core/gimpparamspecs.[ch] (struct GimpParamSpecString)
(gimp_param_spec_string): added "gboolean non_empty" to require
the string being non-empty. Changed validation accordingly.
Also fixed validation for static strings (we were happily
freeing and modifying them before).
* app/xcf/xcf.c: filenames should be non-empty.
* app/pdb/gimp-pdb-compat.c: compat strings shouldn't.
* tools/pdbgen/app.pl: add support for $arg->{non_empty} and
changed generation of calls to gimp_param_spec_string().
* tools/pdbgen/pdb/brush_select.pdb
* tools/pdbgen/pdb/edit.pdb
* tools/pdbgen/pdb/vectors.pdb
* tools/pdbgen/pdb/plug_in.pdb
* tools/pdbgen/pdb/gradient.pdb
* tools/pdbgen/pdb/palette_select.pdb
* tools/pdbgen/pdb/palette.pdb
* tools/pdbgen/pdb/fileops.pdb
* tools/pdbgen/pdb/progress.pdb
* tools/pdbgen/pdb/procedural_db.pdb
* tools/pdbgen/pdb/font_select.pdb
* tools/pdbgen/pdb/pattern_select.pdb
* tools/pdbgen/pdb/unit.pdb
* tools/pdbgen/pdb/brush.pdb
* tools/pdbgen/pdb/gradient_select.pdb
* tools/pdbgen/pdb/buffer.pdb: require non-empty strings for data
object names, procedure names, unit strings, PDB data identifiers
and buffer names. Removed some manual strlen() checks, all other
places just got better error reporting for free (proper validation
error instead of unspecific execution error).
* app/pdb/*_cmds.c: regenerated.
svn path=/trunk/; revision=22329
268 lines
12 KiB
C
268 lines
12 KiB
C
/* GIMP - The GNU Image Manipulation Program
|
|
* Copyright (C) 1995-2003 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.
|
|
*/
|
|
|
|
/* NOTE: This file is auto-generated by pdbgen.pl. */
|
|
|
|
#include "config.h"
|
|
|
|
|
|
#include <glib-object.h>
|
|
|
|
#include "pdb-types.h"
|
|
#include "gimppdb.h"
|
|
#include "gimpprocedure.h"
|
|
#include "core/gimpparamspecs.h"
|
|
|
|
#include "core/gimp.h"
|
|
#include "core/gimpdatafactory.h"
|
|
|
|
#include "internal_procs.h"
|
|
|
|
|
|
static GValueArray *
|
|
brushes_popup_invoker (GimpProcedure *procedure,
|
|
Gimp *gimp,
|
|
GimpContext *context,
|
|
GimpProgress *progress,
|
|
const GValueArray *args)
|
|
{
|
|
gboolean success = TRUE;
|
|
const gchar *brush_callback;
|
|
const gchar *popup_title;
|
|
const gchar *initial_brush;
|
|
gdouble opacity;
|
|
gint32 spacing;
|
|
gint32 paint_mode;
|
|
|
|
brush_callback = g_value_get_string (&args->values[0]);
|
|
popup_title = g_value_get_string (&args->values[1]);
|
|
initial_brush = g_value_get_string (&args->values[2]);
|
|
opacity = g_value_get_double (&args->values[3]);
|
|
spacing = g_value_get_int (&args->values[4]);
|
|
paint_mode = g_value_get_enum (&args->values[5]);
|
|
|
|
if (success)
|
|
{
|
|
if (gimp->no_interface ||
|
|
! gimp_pdb_lookup_procedure (gimp->pdb, brush_callback) ||
|
|
! gimp_pdb_dialog_new (gimp, context, progress,
|
|
gimp->brush_factory->container,
|
|
popup_title, brush_callback, initial_brush,
|
|
"opacity", opacity / 100.0,
|
|
"paint-mode", paint_mode,
|
|
"spacing", spacing,
|
|
NULL))
|
|
success = FALSE;
|
|
}
|
|
|
|
return gimp_procedure_get_return_values (procedure, success);
|
|
}
|
|
|
|
static GValueArray *
|
|
brushes_close_popup_invoker (GimpProcedure *procedure,
|
|
Gimp *gimp,
|
|
GimpContext *context,
|
|
GimpProgress *progress,
|
|
const GValueArray *args)
|
|
{
|
|
gboolean success = TRUE;
|
|
const gchar *brush_callback;
|
|
|
|
brush_callback = g_value_get_string (&args->values[0]);
|
|
|
|
if (success)
|
|
{
|
|
if (gimp->no_interface ||
|
|
! gimp_pdb_lookup_procedure (gimp->pdb, brush_callback) ||
|
|
! gimp_pdb_dialog_close (gimp, gimp->brush_factory->container,
|
|
brush_callback))
|
|
success = FALSE;
|
|
}
|
|
|
|
return gimp_procedure_get_return_values (procedure, success);
|
|
}
|
|
|
|
static GValueArray *
|
|
brushes_set_popup_invoker (GimpProcedure *procedure,
|
|
Gimp *gimp,
|
|
GimpContext *context,
|
|
GimpProgress *progress,
|
|
const GValueArray *args)
|
|
{
|
|
gboolean success = TRUE;
|
|
const gchar *brush_callback;
|
|
const gchar *brush_name;
|
|
gdouble opacity;
|
|
gint32 spacing;
|
|
gint32 paint_mode;
|
|
|
|
brush_callback = g_value_get_string (&args->values[0]);
|
|
brush_name = g_value_get_string (&args->values[1]);
|
|
opacity = g_value_get_double (&args->values[2]);
|
|
spacing = g_value_get_int (&args->values[3]);
|
|
paint_mode = g_value_get_enum (&args->values[4]);
|
|
|
|
if (success)
|
|
{
|
|
if (gimp->no_interface ||
|
|
! gimp_pdb_lookup_procedure (gimp->pdb, brush_callback) ||
|
|
! gimp_pdb_dialog_set (gimp, gimp->brush_factory->container,
|
|
brush_callback, brush_name,
|
|
"opacity", opacity / 100.0,
|
|
"paint-mode", paint_mode,
|
|
"spacing", spacing,
|
|
NULL))
|
|
success = FALSE;
|
|
}
|
|
|
|
return gimp_procedure_get_return_values (procedure, success);
|
|
}
|
|
|
|
void
|
|
register_brush_select_procs (GimpPDB *pdb)
|
|
{
|
|
GimpProcedure *procedure;
|
|
|
|
/*
|
|
* gimp-brushes-popup
|
|
*/
|
|
procedure = gimp_procedure_new (brushes_popup_invoker);
|
|
gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-brushes-popup");
|
|
gimp_procedure_set_static_strings (procedure,
|
|
"gimp-brushes-popup",
|
|
"Invokes the Gimp brush selection.",
|
|
"This procedure opens the brush selection dialog.",
|
|
"Andy Thomas",
|
|
"Andy Thomas",
|
|
"1998",
|
|
NULL);
|
|
gimp_procedure_add_argument (procedure,
|
|
gimp_param_spec_string ("brush-callback",
|
|
"brush callback",
|
|
"The callback PDB proc to call when brush selection is made",
|
|
FALSE, FALSE, TRUE,
|
|
NULL,
|
|
GIMP_PARAM_READWRITE));
|
|
gimp_procedure_add_argument (procedure,
|
|
gimp_param_spec_string ("popup-title",
|
|
"popup title",
|
|
"Title of the brush selection dialog",
|
|
FALSE, FALSE, FALSE,
|
|
NULL,
|
|
GIMP_PARAM_READWRITE));
|
|
gimp_procedure_add_argument (procedure,
|
|
gimp_param_spec_string ("initial-brush",
|
|
"initial brush",
|
|
"The name of the brush to set as the first selected",
|
|
FALSE, TRUE, FALSE,
|
|
NULL,
|
|
GIMP_PARAM_READWRITE));
|
|
gimp_procedure_add_argument (procedure,
|
|
g_param_spec_double ("opacity",
|
|
"opacity",
|
|
"The initial opacity of the brush",
|
|
0, 100, 0,
|
|
GIMP_PARAM_READWRITE));
|
|
gimp_procedure_add_argument (procedure,
|
|
gimp_param_spec_int32 ("spacing",
|
|
"spacing",
|
|
"The initial spacing of the brush (if < 0 then use brush default spacing)",
|
|
G_MININT32, 1000, 0,
|
|
GIMP_PARAM_READWRITE));
|
|
gimp_procedure_add_argument (procedure,
|
|
g_param_spec_enum ("paint-mode",
|
|
"paint mode",
|
|
"The initial paint mode",
|
|
GIMP_TYPE_LAYER_MODE_EFFECTS,
|
|
GIMP_NORMAL_MODE,
|
|
GIMP_PARAM_READWRITE));
|
|
gimp_pdb_register_procedure (pdb, procedure);
|
|
g_object_unref (procedure);
|
|
|
|
/*
|
|
* gimp-brushes-close-popup
|
|
*/
|
|
procedure = gimp_procedure_new (brushes_close_popup_invoker);
|
|
gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-brushes-close-popup");
|
|
gimp_procedure_set_static_strings (procedure,
|
|
"gimp-brushes-close-popup",
|
|
"Close the brush selection dialog.",
|
|
"This procedure closes an opened brush selection dialog.",
|
|
"Andy Thomas",
|
|
"Andy Thomas",
|
|
"1998",
|
|
NULL);
|
|
gimp_procedure_add_argument (procedure,
|
|
gimp_param_spec_string ("brush-callback",
|
|
"brush callback",
|
|
"The name of the callback registered for this pop-up",
|
|
FALSE, FALSE, TRUE,
|
|
NULL,
|
|
GIMP_PARAM_READWRITE));
|
|
gimp_pdb_register_procedure (pdb, procedure);
|
|
g_object_unref (procedure);
|
|
|
|
/*
|
|
* gimp-brushes-set-popup
|
|
*/
|
|
procedure = gimp_procedure_new (brushes_set_popup_invoker);
|
|
gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-brushes-set-popup");
|
|
gimp_procedure_set_static_strings (procedure,
|
|
"gimp-brushes-set-popup",
|
|
"Sets the current brush in a brush selection dialog.",
|
|
"Sets the current brush in a brush selection dialog.",
|
|
"Andy Thomas",
|
|
"Andy Thomas",
|
|
"1998",
|
|
NULL);
|
|
gimp_procedure_add_argument (procedure,
|
|
gimp_param_spec_string ("brush-callback",
|
|
"brush callback",
|
|
"The name of the callback registered for this pop-up",
|
|
FALSE, FALSE, TRUE,
|
|
NULL,
|
|
GIMP_PARAM_READWRITE));
|
|
gimp_procedure_add_argument (procedure,
|
|
gimp_param_spec_string ("brush-name",
|
|
"brush name",
|
|
"The name of the brush to set as selected",
|
|
FALSE, FALSE, FALSE,
|
|
NULL,
|
|
GIMP_PARAM_READWRITE));
|
|
gimp_procedure_add_argument (procedure,
|
|
g_param_spec_double ("opacity",
|
|
"opacity",
|
|
"The initial opacity of the brush",
|
|
0, 100, 0,
|
|
GIMP_PARAM_READWRITE));
|
|
gimp_procedure_add_argument (procedure,
|
|
gimp_param_spec_int32 ("spacing",
|
|
"spacing",
|
|
"The initial spacing of the brush (if < 0 then use brush default spacing)",
|
|
G_MININT32, 1000, 0,
|
|
GIMP_PARAM_READWRITE));
|
|
gimp_procedure_add_argument (procedure,
|
|
g_param_spec_enum ("paint-mode",
|
|
"paint mode",
|
|
"The initial paint mode",
|
|
GIMP_TYPE_LAYER_MODE_EFFECTS,
|
|
GIMP_NORMAL_MODE,
|
|
GIMP_PARAM_READWRITE));
|
|
gimp_pdb_register_procedure (pdb, procedure);
|
|
g_object_unref (procedure);
|
|
}
|