callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

plug-ins/script-fu/tinyscheme/scheme.[ch] small changes to tinyscheme -

Browse Source 
2007-08-30  Simon Budig  <simon@gimp.org>

	* plug-ins/script-fu/tinyscheme/scheme.[ch]
	* plug-ins/script-fu/tinyscheme/scheme-private.h: small changes
	to tinyscheme - mostly removing workarounds for message output.

	* plug-ins/script-fu/scheme-wrapper.[ch]: try to channel the
	output through a central function, have various output functions
	to handle the messages. Remove some hacks.

	* plug-ins/script-fu/script-fu-text-console.c
	* plug-ins/script-fu/script-fu-scripts.[ch]
	* plug-ins/script-fu/script-fu-interface.c
	* plug-ins/script-fu/script-fu.c
	* plug-ins/script-fu/script-fu-server.c
	* plug-ins/script-fu/script-fu-console.[ch]: use the new
	infrastructure. Remove more hacks.

	* plug-ins/script-fu/servertest.py: small script to test the
	communication with the script-fu-server.


svn path=/trunk/; revision=23400
This commit is contained in:
Simon Budig
2007-08-30 00:21:20 +00:00
committed by Simon Budig
parent 570577089e
commit 0928a32a21
15 changed files with 218 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
plug-ins/script-fu/script-fu-scripts.c
View File

@ -41,7 +41,6 @@
#include "script-fu-intl.h"
typedef struct
{
SFScript *script;
@ -126,14 +125,12 @@ script_fu_find_scripts (const gchar *path)
script_menu_list = NULL;
}
#if 1 /* ~~~~~ */
static pointer
my_err(scheme *sc, char *msg)
my_err (scheme *sc, char *msg)
{
g_printerr (msg);
ts_output_string (TS_OUTPUT_ERROR, msg, -1);
return sc->F;
}
#endif
pointer
script_fu_add_script (scheme *sc, pointer a)
@ -663,10 +660,10 @@ script_fu_add_menu (scheme *sc, pointer a)
}
void
script_fu_error_msg (const gchar *command)
script_fu_error_msg (const gchar *command, const gchar *msg)
{
g_message (_("Error while executing\n%s\n\n%s"),
command, ts_get_error_msg ());
command, msg);
}
@ -680,12 +677,16 @@ script_fu_load_script (const GimpDatafileData *file_data,
{
gchar *command;
gchar *escaped = g_strescape (file_data->filename, NULL);
GString *output;
command = g_strdup_printf ("(load \"%s\")", escaped);
g_free (escaped);
output = g_string_new ("");
ts_register_output_func (ts_gstring_output_func, output);
if (ts_interpret_string (command))
script_fu_error_msg (command);
script_fu_error_msg (command, output->str);
g_string_free (output, TRUE);
#ifdef G_OS_WIN32
/* No, I don't know why, but this is
@ -844,6 +845,7 @@ script_fu_script_proc (const gchar *name,
GimpRunMode run_mode;
SFScript *script;
gint min_args = 0;
GString *output;
run_mode = params[0].data.d_int32;
@ -1001,8 +1003,11 @@ script_fu_script_proc (const gchar *name,
command = g_string_free (s, FALSE);
/* run the command through the interpreter */
output = g_string_new ("");
ts_register_output_func (ts_gstring_output_func, output);
if (ts_interpret_string (command))
script_fu_error_msg (command);
script_fu_error_msg (command, output->str);
g_string_free (output, TRUE);
g_free (command);
}