dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libgimp: remove legacy support from gimpbrush,pattern,..select.c 

Their users have all been ported to GimpPlugIn.
This commit is contained in:
Michael Natterer 2019-08-14 19:03:48 +02:00
parent 30c3fd4de5
commit 5b076e990d
6 changed files with 371 additions and 1188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

324
libgimp/gimpbrushselect.c
View File

@ -43,23 +43,12 @@ typedef struct
/* local function prototypes */
static void gimp_brush_data_free (GimpBrushData *data);
static void gimp_brush_data_free (GimpBrushData *data);
static void gimp_temp_brush_run (const gchar *name,
gint nparams,
const GimpParam *param,
gint *nreturn_vals,
GimpParam **return_vals);
static GimpValueArray *
gimp_temp_brush_run_func (GimpProcedure *procedure,
const GimpValueArray *args,
gpointer run_data);
static gboolean gimp_temp_brush_run_idle (GimpBrushData *brush_data);
/* private variables */
static GHashTable *gimp_brush_select_ht = NULL;
static GimpValueArray * gimp_temp_brush_run (GimpProcedure *procedure,
const GimpValueArray *args,
gpointer run_data);
static gboolean gimp_temp_brush_idle (GimpBrushData *data);
/* public functions */
@ -75,13 +64,11 @@ gimp_brush_select_new (const gchar *title,
GDestroyNotify data_destroy)
{
GimpPlugIn *plug_in = gimp_get_plug_in ();
GimpProcedure *procedure;
gchar *brush_callback;
GimpBrushData *brush_data;
if (plug_in)
brush_callback = gimp_pdb_temp_procedure_name (gimp_get_pdb ());
else
brush_callback = gimp_pdb_temp_name ();
brush_callback = gimp_pdb_temp_procedure_name (gimp_get_pdb ());
brush_data = g_slice_new0 (GimpBrushData);
@ -90,145 +77,85 @@ gimp_brush_select_new (const gchar *title,
brush_data->data = data;
brush_data->data_destroy = data_destroy;
if (plug_in)
{
GimpProcedure *procedure = gimp_procedure_new (plug_in,
brush_callback,
GIMP_TEMPORARY,
gimp_temp_brush_run_func,
brush_data,
(GDestroyNotify)
gimp_brush_data_free);
procedure = gimp_procedure_new (plug_in,
brush_callback,
GIMP_TEMPORARY,
gimp_temp_brush_run,
brush_data,
(GDestroyNotify)
gimp_brush_data_free);
gimp_procedure_add_argument (procedure,
g_param_spec_string ("brush-name",
"Brush name",
"The brush name",
NULL,
G_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
g_param_spec_double ("opacity",
"Opacity",
NULL,
0.0, 1.0, 1.0,
G_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
g_param_spec_int ("spacing",
"Spacing",
NULL,
-1, 1000, 20,
G_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
g_param_spec_enum ("paint-mode",
"Paint mode",
NULL,
GIMP_TYPE_LAYER_MODE,
GIMP_LAYER_MODE_NORMAL,
gimp_procedure_add_argument (procedure,
g_param_spec_string ("brush-name",
"Brush name",
"The brush name",
NULL,
G_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
g_param_spec_double ("opacity",
"Opacity",
NULL,
0.0, 1.0, 1.0,
G_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
g_param_spec_int ("spacing",
"Spacing",
NULL,
-1, 1000, 20,
G_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
g_param_spec_enum ("paint-mode",
"Paint mode",
NULL,
GIMP_TYPE_LAYER_MODE,
GIMP_LAYER_MODE_NORMAL,
G_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
g_param_spec_int ("mask-width",
"Brush width",
NULL,
0, 10000, 0,
G_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
g_param_spec_int ("mask-height",
"Brush height",
NULL,
0, 10000, 0,
G_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
gimp_param_spec_int32 ("mask-len",
"Mask length",
"Length of brush "
"mask data",
0, G_MAXINT, 0,
G_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
g_param_spec_int ("mask-width",
"Brush width",
NULL,
0, 10000, 0,
gimp_procedure_add_argument (procedure,
gimp_param_spec_int8_array ("mask-data",
"Mask data",
"The brush mask "
"data",
G_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
g_param_spec_boolean ("closing",
"Closing",
"If the dialog was "
"cloaing",
FALSE,
G_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
g_param_spec_int ("mask-height",
"Brush height",
NULL,
0, 10000, 0,
G_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
gimp_param_spec_int32 ("mask-len",
"Mask length",
"Length of brush "
"mask data",
0, G_MAXINT, 0,
G_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
gimp_param_spec_int8_array ("mask-data",
"Mask data",
"The brush mask "
"data",
G_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
g_param_spec_boolean ("closing",
"Closing",
"If the dialog was "
"cloaing",
FALSE,
G_PARAM_READWRITE));
gimp_plug_in_add_temp_procedure (plug_in, procedure);
g_object_unref (procedure);
}
else
{
static const GimpParamDef args[] =
{
{ GIMP_PDB_STRING, "str", "String" },
{ GIMP_PDB_FLOAT, "opacity", "Opacity" },
{ GIMP_PDB_INT32, "spacing", "Spacing" },
{ GIMP_PDB_INT32, "paint mode", "Paint mode" },
{ GIMP_PDB_INT32, "mask width", "Brush width" },
{ GIMP_PDB_INT32, "mask height" "Brush height" },
{ GIMP_PDB_INT32, "mask len", "Length of brush mask data" },
{ GIMP_PDB_INT8ARRAY, "mask data", "The brush mask data" },
{ GIMP_PDB_INT32, "dialog status", "If the dialog was closing "
"[0 = No, 1 = Yes]" }
};
gimp_install_temp_proc (brush_callback,
"Temporary brush popup callback procedure",
"",
"",
"",
"",
NULL,
"",
GIMP_TEMPORARY,
G_N_ELEMENTS (args), 0,
args, NULL,
gimp_temp_brush_run);
}
gimp_plug_in_add_temp_procedure (plug_in, procedure);
g_object_unref (procedure);
if (gimp_brushes_popup (brush_callback, title, brush_name,
opacity, spacing, paint_mode))
{
/* Allow callbacks to be watched */
if (plug_in)
{
gimp_plug_in_extension_enable (plug_in);
}
else
{
gimp_extension_enable ();
/* Now add to hash table so we can find it again */
if (! gimp_brush_select_ht)
{
gimp_brush_select_ht =
g_hash_table_new_full (g_str_hash, g_str_equal,
g_free,
(GDestroyNotify) gimp_brush_data_free);
}
g_hash_table_insert (gimp_brush_select_ht,
g_strdup (brush_callback),
brush_data);
}
gimp_plug_in_extension_enable (plug_in);
return brush_callback;
}
if (plug_in)
{
gimp_plug_in_remove_temp_procedure (plug_in, brush_callback);
}
else
{
gimp_uninstall_temp_proc (brush_callback);
gimp_brush_data_free (brush_data);
}
gimp_plug_in_remove_temp_procedure (plug_in, brush_callback);
return NULL;
}
@ -240,28 +167,7 @@ gimp_brush_select_destroy (const gchar *brush_callback)
g_return_if_fail (brush_callback != NULL);
if (plug_in)
{
gimp_plug_in_remove_temp_procedure (plug_in, brush_callback);
}
else
{
GimpBrushData *brush_data;
g_return_if_fail (gimp_brush_select_ht != NULL);
brush_data = g_hash_table_lookup (gimp_brush_select_ht, brush_callback);
if (! brush_data)
{
g_warning ("Can't find internal brush data");
return;
}
g_hash_table_remove (gimp_brush_select_ht, brush_callback);
gimp_uninstall_temp_proc (brush_callback);
}
gimp_plug_in_remove_temp_procedure (plug_in, brush_callback);
}
@ -288,53 +194,10 @@ gimp_brush_data_free (GimpBrushData *data)
g_slice_free (GimpBrushData, data);
}
static void
gimp_temp_brush_run (const gchar *name,
gint nparams,
const GimpParam *param,
gint *nreturn_vals,
GimpParam **return_vals)
{
static GimpParam values[1];
GimpBrushData *brush_data;
brush_data = g_hash_table_lookup (gimp_brush_select_ht, name);
if (! brush_data)
{
g_warning ("Can't find internal brush data");
}
else
{
g_free (brush_data->brush_name);
g_free (brush_data->brush_mask_data);
brush_data->brush_name = g_strdup (param[0].data.d_string);
brush_data->opacity = param[1].data.d_float;
brush_data->spacing = param[2].data.d_int32;
brush_data->paint_mode = param[3].data.d_int32;
brush_data->width = param[4].data.d_int32;
brush_data->height = param[5].data.d_int32;
brush_data->brush_mask_data = g_memdup (param[7].data.d_int8array,
param[6].data.d_int32);
brush_data->closing = param[8].data.d_int32;
if (! brush_data->idle_id)
brush_data->idle_id = g_idle_add ((GSourceFunc) gimp_temp_brush_run_idle,
brush_data);
}
*nreturn_vals = 1;
*return_vals = values;
values[0].type = GIMP_PDB_STATUS;
values[0].data.d_status = GIMP_PDB_SUCCESS;
}
static GimpValueArray *
gimp_temp_brush_run_func (GimpProcedure *procedure,
const GimpValueArray *args,
gpointer run_data)
gimp_temp_brush_run (GimpProcedure *procedure,
const GimpValueArray *args,
gpointer run_data)
{
GimpBrushData *data = run_data;
@ -351,33 +214,32 @@ gimp_temp_brush_run_func (GimpProcedure *procedure,
data->closing = g_value_get_boolean (gimp_value_array_index (args, 8));
if (! data->idle_id)
data->idle_id = g_idle_add ((GSourceFunc) gimp_temp_brush_run_idle,
data);
data->idle_id = g_idle_add ((GSourceFunc) gimp_temp_brush_idle, data);
return gimp_procedure_new_return_values (procedure, GIMP_PDB_SUCCESS, NULL);
}
static gboolean
gimp_temp_brush_run_idle (GimpBrushData *brush_data)
gimp_temp_brush_idle (GimpBrushData *data)
{
brush_data->idle_id = 0;
data->idle_id = 0;
if (brush_data->callback)
brush_data->callback (brush_data->brush_name,
brush_data->opacity,
brush_data->spacing,
brush_data->paint_mode,
brush_data->width,
brush_data->height,
brush_data->brush_mask_data,
brush_data->closing,
brush_data->data);
if (data->callback)
data->callback (data->brush_name,
data->opacity,
data->spacing,
data->paint_mode,
data->width,
data->height,
data->brush_mask_data,
data->closing,
data->data);
if (brush_data->closing)
if (data->closing)
{
gchar *brush_callback = brush_data->brush_callback;
gchar *brush_callback = data->brush_callback;
brush_data->brush_callback = NULL;
data->brush_callback = NULL;
gimp_brush_select_destroy (brush_callback);
g_free (brush_callback);
}

218
libgimp/gimpfontselect.c
View File

@ -37,23 +37,12 @@ typedef struct
/* local function prototypes */
static void gimp_font_data_free (GimpFontData *data);
static void gimp_font_data_free (GimpFontData *data);
static void gimp_temp_font_run (const gchar *name,
gint nparams,
const GimpParam *param,
gint *nreturn_vals,
GimpParam **return_vals);
static GimpValueArray *
gimp_temp_font_run_func (GimpProcedure *procedure,
const GimpValueArray *args,
gpointer run_data);
static gboolean gimp_temp_font_run_idle (GimpFontData *font_data);
/* private variables */
static GHashTable *gimp_font_select_ht = NULL;
static GimpValueArray * gimp_temp_font_run (GimpProcedure *procedure,
const GimpValueArray *args,
gpointer run_data);
static gboolean gimp_temp_font_idle (GimpFontData *data);
/* public functions */
@ -65,14 +54,12 @@ gimp_font_select_new (const gchar *title,
gpointer data,
GDestroyNotify data_destroy)
{
GimpPlugIn *plug_in = gimp_get_plug_in ();
gchar *font_callback;
GimpFontData *font_data;
GimpPlugIn *plug_in = gimp_get_plug_in ();
GimpProcedure *procedure;
gchar *font_callback;
GimpFontData *font_data;
if (plug_in)
font_callback = gimp_pdb_temp_procedure_name (gimp_get_pdb ());
else
font_callback = gimp_pdb_temp_name ();
font_callback = gimp_pdb_temp_procedure_name (gimp_get_pdb ());
font_data = g_slice_new0 (GimpFontData);
@ -81,93 +68,40 @@ gimp_font_select_new (const gchar *title,
font_data->data = data;
font_data->data_destroy = data_destroy;
if (plug_in)
{
GimpProcedure *procedure = gimp_procedure_new (plug_in,
font_callback,
GIMP_TEMPORARY,
gimp_temp_font_run_func,
font_data,
(GDestroyNotify)
gimp_font_data_free);
procedure = gimp_procedure_new (plug_in,
font_callback,
GIMP_TEMPORARY,
gimp_temp_font_run,
font_data,
(GDestroyNotify)
gimp_font_data_free);
gimp_procedure_add_argument (procedure,
g_param_spec_string ("font-name",
"Font name",
"The font name",
NULL,
G_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
g_param_spec_boolean ("closing",
"Closing",
"If the dialog was "
"closing",
FALSE,
G_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
g_param_spec_string ("font-name",
"Font name",
"The font name",
NULL,
G_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
g_param_spec_boolean ("closing",
"Closing",
"If the dialog was "
"closing",
FALSE,
G_PARAM_READWRITE));
gimp_plug_in_add_temp_procedure (plug_in, procedure);
g_object_unref (procedure);
}
else
{
static const GimpParamDef args[] =
{
{ GIMP_PDB_STRING, "str", "String" },
{ GIMP_PDB_INT32, "dialog status", "If the dialog was closing "
"[0 = No, 1 = Yes]" }
};
gimp_install_temp_proc (font_callback,
"Temporary font popup callback procedure",
"",
"",
"",
"",
NULL,
"",
GIMP_TEMPORARY,
G_N_ELEMENTS (args), 0,
args, NULL,
gimp_temp_font_run);
}
gimp_plug_in_add_temp_procedure (plug_in, procedure);
g_object_unref (procedure);
if (gimp_fonts_popup (font_callback, title, font_name))
{
/* Allow callbacks to be watched */
if (plug_in)
{
gimp_plug_in_extension_enable (plug_in);
}
else
{
gimp_extension_enable ();
/* Now add to hash table so we can find it again */
if (! gimp_font_select_ht)
{
gimp_font_select_ht =
g_hash_table_new_full (g_str_hash, g_str_equal,
g_free,
(GDestroyNotify) gimp_font_data_free);
}
g_hash_table_insert (gimp_font_select_ht,
g_strdup (font_callback),
font_data);
}
gimp_plug_in_extension_enable (plug_in);
return font_callback;
}
if (plug_in)
{
gimp_plug_in_remove_temp_procedure (plug_in, font_callback);
}
else
{
gimp_uninstall_temp_proc (font_callback);
gimp_font_data_free (font_data);
}
gimp_plug_in_remove_temp_procedure (plug_in, font_callback);
return NULL;
}
@ -179,28 +113,7 @@ gimp_font_select_destroy (const gchar *font_callback)
g_return_if_fail (font_callback != NULL);
if (plug_in)
{
gimp_plug_in_remove_temp_procedure (plug_in, font_callback);
}
else
{
GimpFontData *font_data;
g_return_if_fail (gimp_font_select_ht != NULL);
font_data = g_hash_table_lookup (gimp_font_select_ht, font_callback);
if (! font_data)
{
g_warning ("Can't find internal font data");
return;
}
gimp_uninstall_temp_proc (font_callback);
g_hash_table_remove (gimp_font_select_ht, font_callback);
}
gimp_plug_in_remove_temp_procedure (plug_in, font_callback);
}
@ -226,45 +139,10 @@ gimp_font_data_free (GimpFontData *data)
g_slice_free (GimpFontData, data);
}
static void
gimp_temp_font_run (const gchar *name,
gint nparams,
const GimpParam *param,
gint *nreturn_vals,
GimpParam **return_vals)
{
static GimpParam values[1];
GimpFontData *font_data;
font_data = g_hash_table_lookup (gimp_font_select_ht, name);
if (! font_data)
{
g_warning ("Can't find internal font data");
}
else
{
g_free (font_data->font_name);
font_data->font_name = g_strdup (param[0].data.d_string);
font_data->closing = param[1].data.d_int32;
if (! font_data->idle_id)
font_data->idle_id = g_idle_add ((GSourceFunc) gimp_temp_font_run_idle,
font_data);
}
*nreturn_vals = 1;
*return_vals = values;
values[0].type = GIMP_PDB_STATUS;
values[0].data.d_status = GIMP_PDB_SUCCESS;
}
static GimpValueArray *
gimp_temp_font_run_func (GimpProcedure *procedure,
const GimpValueArray *args,
gpointer run_data)
gimp_temp_font_run (GimpProcedure *procedure,
const GimpValueArray *args,
gpointer run_data)
{
GimpFontData *data = run_data;
@ -274,27 +152,27 @@ gimp_temp_font_run_func (GimpProcedure *procedure,
data->closing = g_value_get_boolean (gimp_value_array_index (args, 1));
if (! data->idle_id)
data->idle_id = g_idle_add ((GSourceFunc) gimp_temp_font_run_idle,
data->idle_id = g_idle_add ((GSourceFunc) gimp_temp_font_idle,
data);
return gimp_procedure_new_return_values (procedure, GIMP_PDB_SUCCESS, NULL);
}
static gboolean
gimp_temp_font_run_idle (GimpFontData *font_data)
gimp_temp_font_idle (GimpFontData *data)
{
font_data->idle_id = 0;
data->idle_id = 0;
if (font_data->callback)
font_data->callback (font_data->font_name,
font_data->closing,
font_data->data);
if (data->callback)
data->callback (data->font_name,
data->closing,
data->data);
if (font_data->closing)
if (data->closing)
{
gchar *font_callback = font_data->font_callback;
gchar *font_callback = data->font_callback;
font_data->font_callback = NULL;
data->font_callback = NULL;
gimp_font_select_destroy (font_callback);
g_free (font_callback);
}

251
libgimp/gimpgradientselect.c
View File

@ -39,23 +39,12 @@ typedef struct
/* local function prototypes */
static void gimp_gradient_data_free (GimpGradientData *data);
static void gimp_gradient_data_free (GimpGradientData *data);
static void gimp_temp_gradient_run (const gchar *name,
gint nparams,
const GimpParam *param,
gint *nreturn_vals,
GimpParam **return_vals);
static GimpValueArray *
gimp_temp_gradient_run_func (GimpProcedure *procedure,
const GimpValueArray *args,
gpointer run_data);
static gboolean gimp_temp_gradient_run_idle (GimpGradientData *gradient_data);
/* private variables */
static GHashTable *gimp_gradient_select_ht = NULL;
static GimpValueArray * gimp_temp_gradient_run (GimpProcedure *procedure,
const GimpValueArray *args,
gpointer run_data);
static gboolean gimp_temp_gradient_idle (GimpGradientData *data);
/* public functions */
@ -69,13 +58,11 @@ gimp_gradient_select_new (const gchar *title,
GDestroyNotify data_destroy)
{
GimpPlugIn *plug_in = gimp_get_plug_in ();
GimpProcedure *procedure;
gchar *gradient_callback;
GimpGradientData *gradient_data;
if (plug_in)
gradient_callback = gimp_pdb_temp_procedure_name (gimp_get_pdb ());
else
gradient_callback = gimp_pdb_temp_name ();
gradient_callback = gimp_pdb_temp_procedure_name (gimp_get_pdb ());
gradient_data = g_slice_new0 (GimpGradientData);
@ -84,109 +71,53 @@ gimp_gradient_select_new (const gchar *title,
gradient_data->data = data;
gradient_data->data_destroy = data_destroy;
if (plug_in)
{
GimpProcedure *procedure = gimp_procedure_new (plug_in,
gradient_callback,
GIMP_TEMPORARY,
gimp_temp_gradient_run_func,
gradient_data,
(GDestroyNotify)
gimp_gradient_data_free);
procedure = gimp_procedure_new (plug_in,
gradient_callback,
GIMP_TEMPORARY,
gimp_temp_gradient_run,
gradient_data,
(GDestroyNotify)
gimp_gradient_data_free);
gimp_procedure_add_argument (procedure,
g_param_spec_string ("gradient-name",
"Gradient name",
"The gradient name",
NULL,
G_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
gimp_param_spec_int32 ("gradient-width",
"Gradient width",
"The gradient width",
0, G_MAXINT, 0,
G_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
gimp_param_spec_float_array ("gradient-data",
"Gradient data",
"The gradient "
"data",
G_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
g_param_spec_boolean ("closing",
"Closing",
"If the dialog was "
"closing",
FALSE,
G_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
g_param_spec_string ("gradient-name",
"Gradient name",
"The gradient name",
NULL,
G_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
gimp_param_spec_int32 ("gradient-width",
"Gradient width",
"The gradient width",
0, G_MAXINT, 0,
G_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
gimp_param_spec_float_array ("gradient-data",
"Gradient data",
"The gradient "
"data",
G_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
g_param_spec_boolean ("closing",
"Closing",
"If the dialog was "
"closing",
FALSE,
G_PARAM_READWRITE));
gimp_plug_in_add_temp_procedure (plug_in, procedure);
g_object_unref (procedure);
}
else
{
static const GimpParamDef args[] =
{
{ GIMP_PDB_STRING, "str", "String" },
{ GIMP_PDB_INT32, "gradient width", "Gradient width" },
{ GIMP_PDB_FLOATARRAY,"gradient data", "The gradient mask data" },
{ GIMP_PDB_INT32, "dialog status", "If the dialog was closing "
"[0 = No, 1 = Yes]" }
};
gimp_install_temp_proc (gradient_callback,
"Temporary gradient popup callback procedure",
"",
"",
"",
"",
NULL,
"",
GIMP_TEMPORARY,
G_N_ELEMENTS (args), 0,
args, NULL,
gimp_temp_gradient_run);
}
gimp_plug_in_add_temp_procedure (plug_in, procedure);
g_object_unref (procedure);
if (gimp_gradients_popup (gradient_callback, title, gradient_name,
sample_size))
{
/* Allow callbacks to be watched */
if (plug_in)
{
gimp_plug_in_extension_enable (plug_in);
}
else
{
gimp_extension_enable ();
/* Now add to hash table so we can find it again */
if (! gimp_gradient_select_ht)
{
gimp_gradient_select_ht =
g_hash_table_new_full (g_str_hash, g_str_equal,
g_free,
(GDestroyNotify) gimp_gradient_data_free);
}
g_hash_table_insert (gimp_gradient_select_ht,
g_strdup (gradient_callback),
gradient_data);
}
gimp_plug_in_extension_enable (plug_in);
return gradient_callback;
}
if (plug_in)
{
gimp_plug_in_remove_temp_procedure (plug_in, gradient_callback);
}
else
{
gimp_uninstall_temp_proc (gradient_callback);
gimp_gradient_data_free (gradient_data);
}
gimp_plug_in_remove_temp_procedure (plug_in, gradient_callback);
return NULL;
}
@ -198,29 +129,7 @@ gimp_gradient_select_destroy (const gchar *gradient_callback)
g_return_if_fail (gradient_callback != NULL);
if (plug_in)
{
gimp_plug_in_remove_temp_procedure (plug_in, gradient_callback);
}
else
{
GimpGradientData *gradient_data;
g_return_if_fail (gimp_gradient_select_ht != NULL);
gradient_data = g_hash_table_lookup (gimp_gradient_select_ht,
gradient_callback);
if (! gradient_data)
{
g_warning ("Can't find internal gradient data");
return;
}
g_hash_table_remove (gimp_gradient_select_ht, gradient_callback);
gimp_uninstall_temp_proc (gradient_callback);
}
gimp_plug_in_remove_temp_procedure (plug_in, gradient_callback);
}
@ -247,51 +156,10 @@ gimp_gradient_data_free (GimpGradientData *data)
g_slice_free (GimpGradientData, data);
}
static void
gimp_temp_gradient_run (const gchar *name,
gint nparams,
const GimpParam *param,
gint *nreturn_vals,
GimpParam **return_vals)
{
static GimpParam values[1];
GimpGradientData *gradient_data;
gradient_data = g_hash_table_lookup (gimp_gradient_select_ht, name);
if (! gradient_data)
{
g_warning ("Can't find internal gradient data");
}
else
{
g_free (gradient_data->gradient_name);
g_free (gradient_data->gradient_data);
gradient_data->gradient_name = g_strdup (param[0].data.d_string);
gradient_data->width = param[1].data.d_int32;
gradient_data->gradient_data = g_memdup (param[2].data.d_floatarray,
param[1].data.d_int32 *
sizeof (gdouble));
gradient_data->closing = param[3].data.d_int32;
if (! gradient_data->idle_id)
gradient_data->idle_id =
g_idle_add ((GSourceFunc) gimp_temp_gradient_run_idle,
gradient_data);
}
*nreturn_vals = 1;
*return_vals = values;
values[0].type = GIMP_PDB_STATUS;
values[0].data.d_status = GIMP_PDB_SUCCESS;
}
static GimpValueArray *
gimp_temp_gradient_run_func (GimpProcedure *procedure,
const GimpValueArray *args,
gpointer run_data)
gimp_temp_gradient_run (GimpProcedure *procedure,
const GimpValueArray *args,
gpointer run_data)
{
GimpGradientData *data = run_data;
@ -304,29 +172,28 @@ gimp_temp_gradient_run_func (GimpProcedure *procedure,
data->closing = g_value_get_boolean (gimp_value_array_index (args, 3));
if (! data->idle_id)
data->idle_id = g_idle_add ((GSourceFunc) gimp_temp_gradient_run_idle,
data);
data->idle_id = g_idle_add ((GSourceFunc) gimp_temp_gradient_idle, data);
return gimp_procedure_new_return_values (procedure, GIMP_PDB_SUCCESS, NULL);
}
static gboolean
gimp_temp_gradient_run_idle (GimpGradientData *gradient_data)
gimp_temp_gradient_idle (GimpGradientData *data)
{
gradient_data->idle_id = 0;
data->idle_id = 0;
if (gradient_data->callback)
gradient_data->callback (gradient_data->gradient_name,
gradient_data->width,
gradient_data->gradient_data,
gradient_data->closing,
gradient_data->data);
if (data->callback)
data->callback (data->gradient_name,
data->width,
data->gradient_data,
data->closing,
data->data);
if (gradient_data->closing)
if (data->closing)
{
gchar *gradient_callback = gradient_data->gradient_callback;
gchar *gradient_callback = data->gradient_callback;
gradient_data->gradient_callback = NULL;
data->gradient_callback = NULL;
gimp_gradient_select_destroy (gradient_callback);
g_free (gradient_callback);
}

225
libgimp/gimppaletteselect.c
View File

@ -38,23 +38,12 @@ typedef struct
/* local function prototypes */
static void gimp_palette_data_free (GimpPaletteData *data);
static void gimp_palette_data_free (GimpPaletteData *data);
static void gimp_temp_palette_run (const gchar *name,
gint nparams,
const GimpParam *param,
gint *nreturn_vals,
GimpParam **return_vals);
static GimpValueArray *
gimp_temp_palette_run_func (GimpProcedure *procedure,
const GimpValueArray *args,
gpointer run_data);
static gboolean gimp_temp_palette_run_idle (GimpPaletteData *palette_data);
/* private variables */
static GHashTable *gimp_palette_select_ht = NULL;
static GimpValueArray * gimp_temp_palette_run (GimpProcedure *procedure,
const GimpValueArray *args,
gpointer run_data);
static gboolean gimp_temp_palette_idle (GimpPaletteData *data);
/* public functions */
@ -67,13 +56,11 @@ gimp_palette_select_new (const gchar *title,
GDestroyNotify data_destroy)
{
GimpPlugIn *plug_in = gimp_get_plug_in ();
GimpProcedure *procedure;
gchar *palette_callback;
GimpPaletteData *palette_data;
if (plug_in)
palette_callback = gimp_pdb_temp_procedure_name (gimp_get_pdb ());
else
palette_callback = gimp_pdb_temp_name ();
palette_callback = gimp_pdb_temp_procedure_name (gimp_get_pdb ());
palette_data = g_slice_new0 (GimpPaletteData);
@ -82,100 +69,46 @@ gimp_palette_select_new (const gchar *title,
palette_data->data = data;
palette_data->data_destroy = data_destroy;
if (plug_in)
{
GimpProcedure *procedure = gimp_procedure_new (plug_in,
palette_callback,
GIMP_TEMPORARY,
gimp_temp_palette_run_func,
palette_data,
(GDestroyNotify)
gimp_palette_data_free);
procedure = gimp_procedure_new (plug_in,
palette_callback,
GIMP_TEMPORARY,
gimp_temp_palette_run,
palette_data,
(GDestroyNotify)
gimp_palette_data_free);
gimp_procedure_add_argument (procedure,
g_param_spec_string ("palette-name",
"Palette name",
"The palette name",
NULL,
G_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
g_param_spec_int ("num-colors",
"Num colors",
"Number of colors",
0, G_MAXINT, 0,
gimp_procedure_add_argument (procedure,
g_param_spec_string ("palette-name",
"Palette name",
"The palette name",
NULL,
G_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
g_param_spec_int ("num-colors",
"Num colors",
"Number of colors",
0, G_MAXINT, 0,
G_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
g_param_spec_boolean ("closing",
"Closing",
"If the dialog was "
"closing",
FALSE,
G_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
g_param_spec_boolean ("closing",
"Closing",
"If the dialog was "
"closing",
FALSE,
G_PARAM_READWRITE));
gimp_plug_in_add_temp_procedure (plug_in, procedure);
g_object_unref (procedure);
}
else
{
static const GimpParamDef args[] =
{
{ GIMP_PDB_STRING, "str", "String" },
{ GIMP_PDB_INT32, "num colors", "Number of colors" },
{ GIMP_PDB_INT32, "dialog status", "If the dialog was closing "
"[0 = No, 1 = Yes]" }
};
gimp_install_temp_proc (palette_callback,
"Temporary palette popup callback procedure",
"",
"",
"",
"",
NULL,
"",
GIMP_TEMPORARY,
G_N_ELEMENTS (args), 0,
args, NULL,
gimp_temp_palette_run);
}
gimp_plug_in_add_temp_procedure (plug_in, procedure);
g_object_unref (procedure);
if (gimp_palettes_popup (palette_callback, title, palette_name))
{
/* Allow callbacks to be watched */
if (plug_in)
{
gimp_plug_in_extension_enable (plug_in);
}
else
{
gimp_extension_enable ();
/* Now add to hash table so we can find it again */
if (! gimp_palette_select_ht)
{
gimp_palette_select_ht =
g_hash_table_new_full (g_str_hash, g_str_equal,
g_free,
(GDestroyNotify) gimp_palette_data_free);
}
g_hash_table_insert (gimp_palette_select_ht,
g_strdup (palette_callback),
palette_data);
}
gimp_plug_in_extension_enable (plug_in);
return palette_callback;
}
if (plug_in)
{
gimp_plug_in_remove_temp_procedure (plug_in, palette_callback);
}
else
{
gimp_uninstall_temp_proc (palette_callback);
gimp_palette_data_free (palette_data);
}
gimp_plug_in_remove_temp_procedure (plug_in, palette_callback);
return NULL;
}
@ -187,29 +120,7 @@ gimp_palette_select_destroy (const gchar *palette_callback)
g_return_if_fail (palette_callback != NULL);
if (plug_in)
{
gimp_plug_in_remove_temp_procedure (plug_in, palette_callback);
}
else
{
GimpPaletteData *palette_data;
g_return_if_fail (gimp_palette_select_ht != NULL);
palette_data = g_hash_table_lookup (gimp_palette_select_ht,
palette_callback);
if (! palette_data)
{
g_warning ("Can't find internal palette data");
return;
}
gimp_uninstall_temp_proc (palette_callback);
g_hash_table_remove (gimp_palette_select_ht, palette_callback);
}
gimp_plug_in_remove_temp_procedure (plug_in, palette_callback);
}
@ -235,46 +146,10 @@ gimp_palette_data_free (GimpPaletteData *data)
g_slice_free (GimpPaletteData, data);
}
static void
gimp_temp_palette_run (const gchar *name,
gint nparams,
const GimpParam *param,
gint *nreturn_vals,
GimpParam **return_vals)
{
static GimpParam values[1];
GimpPaletteData *palette_data;
palette_data = g_hash_table_lookup (gimp_palette_select_ht, name);
if (! palette_data)
{
g_warning ("Can't find internal palette data");
}
else
{
g_free (palette_data->palette_name);
palette_data->palette_name = g_strdup (param[0].data.d_string);
palette_data->num_colors = param[1].data.d_int32;
palette_data->closing = param[2].data.d_int32;
if (! palette_data->idle_id)
palette_data->idle_id = g_idle_add ((GSourceFunc) gimp_temp_palette_run_idle,
palette_data);
}
*nreturn_vals = 1;
*return_vals = values;
values[0].type = GIMP_PDB_STATUS;
values[0].data.d_status = GIMP_PDB_SUCCESS;
}
static GimpValueArray *
gimp_temp_palette_run_func (GimpProcedure *procedure,
const GimpValueArray *args,
gpointer run_data)
gimp_temp_palette_run (GimpProcedure *procedure,
const GimpValueArray *args,
gpointer run_data)
{
GimpPaletteData *data = run_data;
@ -285,27 +160,27 @@ gimp_temp_palette_run_func (GimpProcedure *procedure,
data->closing = g_value_get_boolean (gimp_value_array_index (args, 2));
if (! data->idle_id)
data->idle_id = g_idle_add ((GSourceFunc) gimp_temp_palette_run_idle,
data->idle_id = g_idle_add ((GSourceFunc) gimp_temp_palette_idle,
data);
return gimp_procedure_new_return_values (procedure, GIMP_PDB_SUCCESS, NULL);
}
static gboolean
gimp_temp_palette_run_idle (GimpPaletteData *palette_data)
gimp_temp_palette_idle (GimpPaletteData *data)
{
palette_data->idle_id = 0;
data->idle_id = 0;
if (palette_data->callback)
palette_data->callback (palette_data->palette_name,
palette_data->closing,
palette_data->data);
if (data->callback)
data->callback (data->palette_name,
data->closing,
data->data);
if (palette_data->closing)
if (data->closing)
{
gchar *palette_callback = palette_data->palette_callback;
gchar *palette_callback = data->palette_callback;
palette_data->palette_callback = NULL;
data->palette_callback = NULL;
gimp_palette_select_destroy (palette_callback);
g_free (palette_callback);
}

294
libgimp/gimppatternselect.c
View File

@ -41,23 +41,12 @@ typedef struct
/* local function prototypes */
static void gimp_pattern_data_free (GimpPatternData *data);
static void gimp_pattern_data_free (GimpPatternData *data);
static void gimp_temp_pattern_run (const gchar *name,
gint nparams,
const GimpParam *param,
gint *nreturn_vals,
GimpParam **return_vals);
static GimpValueArray *
gimp_temp_pattern_run_func (GimpProcedure *procedure,
const GimpValueArray *args,
gpointer run_data);
static gboolean gimp_temp_pattern_run_idle (GimpPatternData *pattern_data);
/* private variables */
static GHashTable *gimp_pattern_select_ht = NULL;
static GimpValueArray * gimp_temp_pattern_run (GimpProcedure *procedure,
const GimpValueArray *args,
gpointer run_data);
static gboolean gimp_temp_pattern_idle (GimpPatternData *data);
/* public functions */
@ -70,13 +59,11 @@ gimp_pattern_select_new (const gchar *title,
GDestroyNotify data_destroy)
{
GimpPlugIn *plug_in = gimp_get_plug_in ();
GimpProcedure *procedure;
gchar *pattern_callback;
GimpPatternData *pattern_data;
if (plug_in)
pattern_callback = gimp_pdb_temp_procedure_name (gimp_get_pdb ());
else
pattern_callback = gimp_pdb_temp_name ();
pattern_callback = gimp_pdb_temp_procedure_name (gimp_get_pdb ());
pattern_data = g_slice_new0 (GimpPatternData);
@ -85,130 +72,71 @@ gimp_pattern_select_new (const gchar *title,
pattern_data->data = data;
pattern_data->data_destroy = data_destroy;
procedure = gimp_procedure_new (plug_in,
pattern_callback,
GIMP_TEMPORARY,
gimp_temp_pattern_run,
pattern_data,
(GDestroyNotify)
gimp_pattern_data_free);
if (plug_in)
{
GimpProcedure *procedure = gimp_procedure_new (plug_in,
pattern_callback,
GIMP_TEMPORARY,
gimp_temp_pattern_run_func,
pattern_data,
(GDestroyNotify)
gimp_pattern_data_free);
gimp_procedure_add_argument (procedure,
g_param_spec_string ("pattern-name",
"Pattern name",
"The pattern name",
NULL,
G_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
g_param_spec_int ("mask-width",
"Mask width",
"Pattern width",
0, 10000, 0,
gimp_procedure_add_argument (procedure,
g_param_spec_string ("pattern-name",
"Pattern name",
"The pattern name",
NULL,
G_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
g_param_spec_int ("mask-width",
"Mask width",
"Pattern width",
0, 10000, 0,
G_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
g_param_spec_int ("mask-height",
"Mask height",
"Pattern height",
0, 10000, 0,
G_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
g_param_spec_int ("mask-bpp",
"Mask bpp",
"Pattern bytes per pixel",
0, 10000, 0,
G_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
gimp_param_spec_int32 ("mask-len",
"Mask length",
"Length of pattern "
"mask data",
0, G_MAXINT, 0,
G_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
gimp_param_spec_int8_array ("mask-data",
"Mask data",
"The pattern mask "
"data",
G_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
g_param_spec_boolean ("closing",
"Closing",
"If the dialog was "
"cloaing",
FALSE,
G_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
g_param_spec_int ("mask-height",
"Mask height",
"Pattern height",
0, 10000, 0,
G_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
g_param_spec_int ("mask-bpp",
"Mask bpp",
"Pattern bytes per pixel",
0, 10000, 0,
G_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
gimp_param_spec_int32 ("mask-len",
"Mask length",
"Length of pattern "
"mask data",
0, G_MAXINT, 0,
G_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
gimp_param_spec_int8_array ("mask-data",
"Mask data",
"The pattern mask "
"data",
G_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
g_param_spec_boolean ("closing",
"Closing",
"If the dialog was "
"cloaing",
FALSE,
G_PARAM_READWRITE));
gimp_plug_in_add_temp_procedure (plug_in, procedure);
g_object_unref (procedure);
}
else
{
static const GimpParamDef args[] =
{
{ GIMP_PDB_STRING, "str", "String" },
{ GIMP_PDB_INT32, "mask width", "Pattern width" },
{ GIMP_PDB_INT32, "mask height", "Pattern height" },
{ GIMP_PDB_INT32, "mask bpp", "Pattern bytes per pixel" },
{ GIMP_PDB_INT32, "mask len", "Length of pattern mask data" },
{ GIMP_PDB_INT8ARRAY,"mask data", "The pattern mask data" },
{ GIMP_PDB_INT32, "dialog status", "If the dialog was closing "
"[0 = No, 1 = Yes]" }
};
gimp_install_temp_proc (pattern_callback,
"Temporary pattern popup callback procedure",
"",
"",
"",
"",
NULL,
"",
GIMP_TEMPORARY,
G_N_ELEMENTS (args), 0,
args, NULL,
gimp_temp_pattern_run);
}
gimp_plug_in_add_temp_procedure (plug_in, procedure);
g_object_unref (procedure);
if (gimp_patterns_popup (pattern_callback, title, pattern_name))
{
/* Allow callbacks to be watched */
if (plug_in)
{
gimp_plug_in_extension_enable (plug_in);
}
else
{
gimp_extension_enable ();
/* Now add to hash table so we can find it again */
if (! gimp_pattern_select_ht)
{
gimp_pattern_select_ht =
g_hash_table_new_full (g_str_hash, g_str_equal,
g_free,
(GDestroyNotify) gimp_pattern_data_free);
}
g_hash_table_insert (gimp_pattern_select_ht,
g_strdup (pattern_callback),
pattern_data);
}
gimp_plug_in_extension_enable (plug_in);
return pattern_callback;
}
if (plug_in)
{
gimp_plug_in_remove_temp_procedure (plug_in, pattern_callback);
}
else
{
gimp_uninstall_temp_proc (pattern_callback);
gimp_pattern_data_free (pattern_data);
}
gimp_plug_in_remove_temp_procedure (plug_in, pattern_callback);
return NULL;
}
@ -220,29 +148,7 @@ gimp_pattern_select_destroy (const gchar *pattern_callback)
g_return_if_fail (pattern_callback != NULL);
if (plug_in)
{
gimp_plug_in_remove_temp_procedure (plug_in, pattern_callback);
}
else
{
GimpPatternData *pattern_data;
g_return_if_fail (gimp_pattern_select_ht != NULL);
pattern_data = g_hash_table_lookup (gimp_pattern_select_ht,
pattern_callback);
if (! pattern_data)
{
g_warning ("Can't find internal pattern data");
return;
}
g_hash_table_remove (gimp_pattern_select_ht, pattern_callback);
gimp_uninstall_temp_proc (pattern_callback);
}
gimp_plug_in_remove_temp_procedure (plug_in, pattern_callback);
}
@ -269,51 +175,10 @@ gimp_pattern_data_free (GimpPatternData *data)
g_slice_free (GimpPatternData, data);
}
static void
gimp_temp_pattern_run (const gchar *name,
gint nparams,
const GimpParam *param,
gint *nreturn_vals,
GimpParam **return_vals)
{
static GimpParam values[1];
GimpPatternData *pattern_data;
pattern_data = g_hash_table_lookup (gimp_pattern_select_ht, name);
if (! pattern_data)
{
g_warning ("Can't find internal pattern data");
}
else
{
g_free (pattern_data->pattern_name);
g_free (pattern_data->pattern_mask_data);
pattern_data->pattern_name = g_strdup (param[0].data.d_string);
pattern_data->width = param[1].data.d_int32;
pattern_data->height = param[2].data.d_int32;
pattern_data->bytes = param[3].data.d_int32;
pattern_data->pattern_mask_data = g_memdup (param[5].data.d_int8array,
param[4].data.d_int32);
pattern_data->closing = param[6].data.d_int32;
if (! pattern_data->idle_id)
pattern_data->idle_id = g_idle_add ((GSourceFunc) gimp_temp_pattern_run_idle,
pattern_data);
}
*nreturn_vals = 1;
*return_vals = values;
values[0].type = GIMP_PDB_STATUS;
values[0].data.d_status = GIMP_PDB_SUCCESS;
}
static GimpValueArray *
gimp_temp_pattern_run_func (GimpProcedure *procedure,
const GimpValueArray *args,
gpointer run_data)
gimp_temp_pattern_run (GimpProcedure *procedure,
const GimpValueArray *args,
gpointer run_data)
{
GimpPatternData *data = run_data;
@ -328,31 +193,30 @@ gimp_temp_pattern_run_func (GimpProcedure *procedure,
data->closing = g_value_get_boolean (gimp_value_array_index (args, 6));
if (! data->idle_id)
data->idle_id = g_idle_add ((GSourceFunc) gimp_temp_pattern_run_idle,
data);
data->idle_id = g_idle_add ((GSourceFunc) gimp_temp_pattern_idle, data);
return gimp_procedure_new_return_values (procedure, GIMP_PDB_SUCCESS, NULL);
}
static gboolean
gimp_temp_pattern_run_idle (GimpPatternData *pattern_data)
gimp_temp_pattern_idle (GimpPatternData *data)
{
pattern_data->idle_id = 0;
data->idle_id = 0;
if (pattern_data->callback)
pattern_data->callback (pattern_data->pattern_name,
pattern_data->width,
pattern_data->height,
pattern_data->bytes,
pattern_data->pattern_mask_data,
pattern_data->closing,
pattern_data->data);
if (data->callback)
data->callback (data->pattern_name,
data->width,
data->height,
data->bytes,
data->pattern_mask_data,
data->closing,
data->data);
if (pattern_data->closing)
if (data->closing)
{
gchar *pattern_callback = pattern_data->pattern_callback;
gchar *pattern_callback = data->pattern_callback;
pattern_data->pattern_callback = NULL;
data->pattern_callback = NULL;
gimp_pattern_select_destroy (pattern_callback);
g_free (pattern_callback);
}

247
libgimp/gimpprogress.c
View File

@ -40,22 +40,15 @@ typedef struct
/* local function prototypes */
static void gimp_progress_data_free (GimpProgressData *data);
static void gimp_progress_data_free (GimpProgressData *data);
static void gimp_temp_progress_run (const gchar *name,
gint nparams,
const GimpParam *param,
gint *nreturn_vals,
GimpParam **return_vals);
static GimpValueArray *
gimp_temp_progress_run_func (GimpProcedure *procedure,
const GimpValueArray *args,
gpointer run_data);
static GimpValueArray * gimp_temp_progress_run (GimpProcedure *procedure,
const GimpValueArray *args,
gpointer run_data);
/* private variables */
static GHashTable * gimp_progress_ht = NULL;
static gdouble gimp_progress_current = 0.0;
static const gdouble gimp_progress_step = (1.0 / 256.0);
@ -79,6 +72,7 @@ gimp_progress_install_vtable (const GimpProgressVtable *vtable,
GDestroyNotify user_data_destroy)
{
GimpPlugIn *plug_in;
GimpProcedure *procedure;
gchar *progress_callback;
GimpProgressData *progress_data;
@ -90,10 +84,7 @@ gimp_progress_install_vtable (const GimpProgressVtable *vtable,
plug_in = gimp_get_plug_in ();
if (plug_in)
progress_callback = gimp_pdb_temp_procedure_name (gimp_get_pdb ());
else
progress_callback = gimp_pdb_temp_name ();
progress_callback = gimp_pdb_temp_procedure_name (gimp_get_pdb ());
progress_data = g_slice_new0 (GimpProgressData);
@ -107,111 +98,53 @@ gimp_progress_install_vtable (const GimpProgressVtable *vtable,
progress_data->data = user_data;
progress_data->data_destroy = user_data_destroy;
if (plug_in)
{
GimpProcedure *procedure = gimp_procedure_new (plug_in,
progress_callback,
GIMP_TEMPORARY,
gimp_temp_progress_run_func,
progress_data,
(GDestroyNotify)
gimp_progress_data_free);
procedure = gimp_procedure_new (plug_in,
progress_callback,
GIMP_TEMPORARY,
gimp_temp_progress_run,
progress_data,
(GDestroyNotify)
gimp_progress_data_free);
gimp_procedure_add_argument (procedure,
g_param_spec_enum ("command",
"Command",
"The progress command",
GIMP_TYPE_PROGRESS_COMMAND,
GIMP_PROGRESS_COMMAND_START,
G_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
g_param_spec_string ("text",
"Text",
"The progress text",
NULL,
G_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
gimp_procedure_add_argument (procedure,
g_param_spec_enum ("command",
"Command",
"The progress command",
GIMP_TYPE_PROGRESS_COMMAND,
GIMP_PROGRESS_COMMAND_START,
G_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
g_param_spec_string ("text",
"Text",
"The progress text",
NULL,
G_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
g_param_spec_double ("value",
"Vakue",
"The progress value",
0.0, 1.0, 0.0,
G_PARAM_READWRITE));
gimp_procedure_add_return_value (procedure,
g_param_spec_double ("value",
"Vakue",
"The progress value",
0.0, 1.0, 0.0,
G_PARAM_READWRITE));
gimp_procedure_add_return_value (procedure,
g_param_spec_double ("value",
"Vakue",
"The progress value",
0.0, 1.0, 0.0,
G_PARAM_READWRITE));
gimp_plug_in_add_temp_procedure (plug_in, procedure);
g_object_unref (procedure);
}
else
{
static const GimpParamDef args[] =
{
{ GIMP_PDB_INT32, "command", "" },
{ GIMP_PDB_STRING, "text", "" },
{ GIMP_PDB_FLOAT, "value", "" }
};
static const GimpParamDef values[] =
{
{ GIMP_PDB_FLOAT, "value", "" }
};
gimp_install_temp_proc (progress_callback,
"Temporary progress callback procedure",
"",
"",
"",
"",
NULL,
"",
GIMP_TEMPORARY,
G_N_ELEMENTS (args), G_N_ELEMENTS (values),
args, values,
gimp_temp_progress_run);
}
gimp_plug_in_add_temp_procedure (plug_in, procedure);
g_object_unref (procedure);
if (_gimp_progress_install (progress_callback))
{
/* Allow callbacks to be watched */
if (plug_in)
{
gimp_plug_in_extension_enable (plug_in);
}
else
{
gimp_extension_enable ();
/* Now add to hash table so we can find it again */
if (! gimp_progress_ht)
{
gimp_progress_ht =
g_hash_table_new_full (g_str_hash, g_str_equal,
g_free,
(GDestroyNotify) gimp_progress_data_free);
}
g_hash_table_insert (gimp_progress_ht,
g_strdup (progress_callback),
progress_data);
}
gimp_plug_in_extension_enable (plug_in);
return progress_callback;
}
if (plug_in)
{
gimp_plug_in_remove_temp_procedure (plug_in, progress_callback);
}
else
{
gimp_uninstall_temp_proc (progress_callback);
gimp_progress_data_free (progress_data);
}
gimp_plug_in_remove_temp_procedure (plug_in, progress_callback);
return NULL;
}
@ -232,28 +165,7 @@ gimp_progress_uninstall (const gchar *progress_callback)
g_return_if_fail (progress_callback != NULL);
if (plug_in)
{
gimp_plug_in_remove_temp_procedure (plug_in, progress_callback);
}
else
{
GimpProgressData *progress_data;
g_return_if_fail (gimp_progress_ht != NULL);
progress_data = g_hash_table_lookup (gimp_progress_ht, progress_callback);
if (! progress_data)
{
g_warning ("Can't find internal progress data");
return;
}
gimp_uninstall_temp_proc (progress_callback);
g_hash_table_remove (gimp_progress_ht, progress_callback);
}
gimp_plug_in_remove_temp_procedure (plug_in, progress_callback);
}
@ -418,85 +330,10 @@ gimp_progress_data_free (GimpProgressData *data)
g_slice_free (GimpProgressData, data);
}
static void
gimp_temp_progress_run (const gchar *name,
gint nparams,
const GimpParam *param,
gint *nreturn_vals,
GimpParam **return_vals)
{
static GimpParam values[2];
GimpProgressData *progress_data;
*nreturn_vals = 1;
*return_vals = values;
values[0].type = GIMP_PDB_STATUS;
values[0].data.d_status = GIMP_PDB_SUCCESS;
progress_data = g_hash_table_lookup (gimp_progress_ht, name);
if (! progress_data)
{
g_warning ("Can't find internal progress data");
values[0].data.d_status = GIMP_PDB_EXECUTION_ERROR;
}
else
{
GimpProgressCommand command = param[0].data.d_int32;
switch (command)
{
case GIMP_PROGRESS_COMMAND_START:
progress_data->vtable.start (param[1].data.d_string,
param[2].data.d_float != 0.0,
progress_data->data);
break;
case GIMP_PROGRESS_COMMAND_END:
progress_data->vtable.end (progress_data->data);
break;
case GIMP_PROGRESS_COMMAND_SET_TEXT:
progress_data->vtable.set_text (param[1].data.d_string,
progress_data->data);
break;
case GIMP_PROGRESS_COMMAND_SET_VALUE:
progress_data->vtable.set_value (param[2].data.d_float,
progress_data->data);
break;
case GIMP_PROGRESS_COMMAND_PULSE:
if (progress_data->vtable.pulse)
progress_data->vtable.pulse (progress_data->data);
else
progress_data->vtable.set_value (-1, progress_data->data);
break;
case GIMP_PROGRESS_COMMAND_GET_WINDOW:
*nreturn_vals = 2;
values[1].type = GIMP_PDB_FLOAT;
if (progress_data->vtable.get_window)
values[1].data.d_float =
(gdouble) progress_data->vtable.get_window (progress_data->data);
else
values[1].data.d_float = 0;
break;
default:
values[0].data.d_status = GIMP_PDB_CALLING_ERROR;
break;
}
}
}
static GimpValueArray *
gimp_temp_progress_run_func (GimpProcedure *procedure,
const GimpValueArray *args,
gpointer run_data)
gimp_temp_progress_run (GimpProcedure *procedure,
const GimpValueArray *args,
gpointer run_data)
{
GimpProgressData *progress_data = run_data;
GimpProgressCommand command;