2db2ef6185
2003-02-03 Michael Natterer <mitch@gimp.org> * app/core/gimp.[ch]: removed gimp_main_loop() and gimp_main_loop_quit() because they were a temp_hack until plug-ins have their own main loops. Added gimp_threads_enter() and gimp_threads_leave() instead. * app/gui/gui.c: ditto: removed the main loop stuff and added functions which call GDK_THREADS_ENTER() and GDK_THREADS_LEAVE() instead. * app/app_procs.c: create the main GMainLoop here and use gimp_threads_enter,leave(). * app/plug-in/plug-in.[ch]: added a ref_count per plug-in so the plug-in is not destroyed under our feet while running a recursive main loop. Added plug_in_ref(). Changed plug_in_destroy() to plug_in_unref(). Don't destroy the plug-in if plug_in_open() fails. Call gimp_threads_enter,leave() around g_main_loop_run(). Changed the way plug_in_push,pop() are used: "current_plug_in" is no longer the plug-in which currently uses the wire, but the plug-in which currently preforms a PDB call (the former meaning was needed when wire callbacks had no plug-in context but needed to get the plug-in from the global "current_plug_in" variable). Removed all calls to plug_in_push,pop() from this file. * app/plug-in/plug-in-message.c (plug_in_handle_proc_run): added plug_in_push,pop() around procedural_db_execute(). No need to construct an error return value if the procedure was not found because procedural_db_execute() already does this. Removed all other plug_in_push,pop(). Added more checks to plug-in message handlers and kill the plug-in if it misbehaves. Cleanup. * app/plug-in/plug-in-progress.c (plug_in_progress_cancel): if the plug-in runs synchronously, provide a GIMP_PDB_CANCEL return value so we don't see error messages about the "failed" procedure. * app/plug-in/plug-in-run.c: removed plug_in_push,pop() stuff. Set the new plug_in->starting_ext boolean while starting an extension so the extension_ack handler knows that it wasn't called from a buggy plug-in. Cleanup. * app/plug-in/plug-ins.c: Cleanup.
95 lines
3.5 KiB
C
95 lines
3.5 KiB
C
/* The GIMP -- an image manipulation program
|
|
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
*/
|
|
|
|
#ifndef __PLUG_IN_H__
|
|
#define __PLUG_IN_H__
|
|
|
|
|
|
#include <sys/types.h> /* pid_t */
|
|
|
|
|
|
#define WRITE_BUFFER_SIZE 512
|
|
|
|
|
|
struct _PlugIn
|
|
{
|
|
Gimp *gimp;
|
|
|
|
gint ref_count;
|
|
|
|
guint open : 1; /* Is the plug-in open? */
|
|
guint query : 1; /* Are we querying the plug-in? */
|
|
guint init : 1; /* Are we initialing the plug-in? */
|
|
guint synchronous : 1; /* Is the plug-in running synchronously? */
|
|
guint recurse : 1; /* Do we have an own GMainLoop? */
|
|
guint in_temp_proc : 1; /* Is the plug-in busy with a temp proc? */
|
|
guint starting_ext : 1; /* Does the plug-in wait for extension_ack?*/
|
|
pid_t pid; /* Plug-ins process id */
|
|
gchar *args[7]; /* Plug-ins command line arguments */
|
|
|
|
GIOChannel *my_read; /* App's read and write channels */
|
|
GIOChannel *my_write;
|
|
GIOChannel *his_read; /* Plug-in's read and write channels */
|
|
GIOChannel *his_write;
|
|
|
|
guint input_id; /* Id of input proc */
|
|
|
|
gchar write_buffer[WRITE_BUFFER_SIZE]; /* Buffer for writing */
|
|
gint write_buffer_index; /* Buffer index for writing */
|
|
|
|
GSList *temp_proc_defs; /* Temporary procedures */
|
|
|
|
GList *main_loops; /* Stack of recursive main loops */
|
|
Argument *return_vals; /* The return value we wait for */
|
|
gint n_return_vals;
|
|
|
|
GimpProgress *progress; /* Progress dialog */
|
|
|
|
PlugInDef *plug_in_def; /* Valid only during query() and init() */
|
|
};
|
|
|
|
|
|
void plug_in_init (Gimp *gimp);
|
|
void plug_in_exit (Gimp *gimp);
|
|
|
|
void plug_in_call_query (Gimp *gimp,
|
|
PlugInDef *plug_in_def);
|
|
void plug_in_call_init (Gimp *gimp,
|
|
PlugInDef *plug_in_def);
|
|
|
|
PlugIn * plug_in_new (Gimp *gimp,
|
|
gchar *name);
|
|
|
|
void plug_in_ref (PlugIn *plug_in);
|
|
void plug_in_unref (PlugIn *plug_in);
|
|
|
|
gboolean plug_in_open (PlugIn *plug_in);
|
|
void plug_in_close (PlugIn *plug_in,
|
|
gboolean kill_it);
|
|
|
|
void plug_in_push (PlugIn *plug_in);
|
|
void plug_in_pop (void);
|
|
|
|
void plug_in_main_loop (PlugIn *plug_in);
|
|
void plug_in_main_loop_quit (PlugIn *plug_in);
|
|
|
|
|
|
extern PlugIn *current_plug_in;
|
|
|
|
|
|
#endif /* __PLUG_IN_H__ */
|