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

removed the idle function from the splash screen, added code that services 

Sat Mar 27 01:13:42 EST 1999  Matt Wilson  <msw@gimp.org>

	* app/app_procs.c: removed the idle function from the
	splash screen, added code that services the event
	queue.  This reduces flicker in the splash screen.
	(backport from 1.1)

	* app/brushes.c: s/gpointer/gconstpointer for hash table
	functions (backport from 1.1)

	* app/fileops.c: added #include <stdlib.h> to get
	prototype for strtol()

	* app/gdisplay.c: added a check to see if we have a gdisplay
	hash table set up before we go looking for the gdisplay
	for this toplevel widget. (backport from 1.1)

	* app/interface.c: added a bound check for progress_update
	(backport from 1.1)

	* app/main.c: added a cast to make g_set-message_handler happy
	(backport from 1.1)

	* app/patterns.c: s/gpointer/gconstpointer for hash table
	functions (backport from 1.1)

	* app/plug_in.c: added bounds check for progress bar update

	* app/procedural_db.c: s/gpointer/gconstpointer for hash table
	functions, changed to using g_str_equal for comparison
	(backport from 1.1)

	* plug-ins/MapObject/mapobject_ui.c: now uses the right widget
	for adjustment callbacks (backport from 1.1 branch)

	* plug-ins/dbbrowser/dbbrowser_utils.c: fixed the clist of
	db functions so that the scrollbar shows, added viewports
	for non-scrollable description table

	* plug-ins/gfig/gfig.c: reverted to the gfig version from
	the 1.0 branch, ported to GTK+ 1.2

	* plug-ins/script-fu/script-fu-server.c: set up the clientname
	hash table to use g_direct_hash (backport from 1.1),
	added stdlib.h for malloc() prototype.
This commit is contained in:
EST 1999 Matt Wilson 1999-03-27 06:15:57 +00:00 committed by Matt Wilson
parent 8df1bfb712
commit c27f21f58b
43 changed files with 1020 additions and 926 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
ChangeLog
View File

@ -1,3 +1,49 @@
Sat Mar 27 01:13:42 EST 1999 Matt Wilson <msw@gimp.org>
* app/app_procs.c: removed the idle function from the
splash screen, added code that services the event
queue. This reduces flicker in the splash screen.
(backport from 1.1)
* app/brushes.c: s/gpointer/gconstpointer for hash table
functions (backport from 1.1)
* app/fileops.c: added #include <stdlib.h> to get
prototype for strtol()
* app/gdisplay.c: added a check to see if we have a gdisplay
hash table set up before we go looking for the gdisplay
for this toplevel widget. (backport from 1.1)
* app/interface.c: added a bound check for progress_update
(backport from 1.1)
* app/main.c: added a cast to make g_set-message_handler happy
(backport from 1.1)
* app/patterns.c: s/gpointer/gconstpointer for hash table
functions (backport from 1.1)
* app/plug_in.c: added bounds check for progress bar update
* app/procedural_db.c: s/gpointer/gconstpointer for hash table
functions, changed to using g_str_equal for comparison
(backport from 1.1)
* plug-ins/MapObject/mapobject_ui.c: now uses the right widget
for adjustment callbacks (backport from 1.1 branch)
* plug-ins/dbbrowser/dbbrowser_utils.c: fixed the clist of
db functions so that the scrollbar shows, added viewports
for non-scrollable description table
* plug-ins/gfig/gfig.c: reverted to the gfig version from
the 1.0 branch, ported to GTK+ 1.2
* plug-ins/script-fu/script-fu-server.c: set up the clientname
hash table to use g_direct_hash (backport from 1.1),
added stdlib.h for malloc() prototype.
Mon Mar 15 13:13:36 1999 Owen Taylor <otaylor@redhat.com>
* plug-ins/xd/xd.c plug-ins/film/film.c:

3
app/actions/plug-in-commands.c
View File

@ -3026,6 +3026,9 @@ plug_in_progress_update (PlugIn *plug_in,
double percentage)
{
#ifdef SEPARATE_PROGRESS_BAR
if (!(percentage >= 0.0 && percentage <= 1.0))
return;
if (!plug_in->progress)
plug_in_progress_init (plug_in, NULL);

9
app/app_procs.c
View File

@ -305,7 +305,6 @@ static GtkWidget *win_initstatus = NULL;
static GtkWidget *label1 = NULL;
static GtkWidget *label2 = NULL;
static GtkWidget *pbar = NULL;
static gint idle_tag = -1;
static void
destroy_initialization_status_window(void)
@ -317,7 +316,6 @@ destroy_initialization_status_window(void)
gdk_pixmap_unref(logo_pixmap);
win_initstatus = label1 = label2 = pbar = logo_area = NULL;
logo_pixmap = NULL;
gtk_idle_remove(idle_tag);
}
}
@ -431,9 +429,12 @@ app_init_update_status(char *label1val,
gtk_progress_bar_update(GTK_PROGRESS_BAR(pbar), pct_progress);
}
gtk_widget_draw(win_initstatus, &area);
idle_tag = gtk_idle_add((GtkFunction) gtk_true, NULL);
while (gtk_events_pending())
gtk_main_iteration();
gtk_idle_remove(idle_tag);
/* We sync here to make sure things get drawn before continuing,
* is the improved look worth the time? I'm not sure...
*/
gdk_flush();
}
}

4
app/brushes.c
View File

@ -58,7 +58,7 @@ static void create_default_brush (void);
static void load_brush (char *filename);
static void free_brush (GBrushP);
static void brushes_free_one (gpointer, gpointer);
static gint brush_compare_func (gpointer, gpointer);
static gint brush_compare_func (gconstpointer, gconstpointer);
/* function declarations */
void
@ -129,7 +129,7 @@ brushes_free_one (gpointer data, gpointer dummy)
static gint
brush_compare_func (gpointer first, gpointer second)
brush_compare_func (gconstpointer first, gconstpointer second)
{
return strcmp (((GBrushP)first)->name, ((GBrushP)second)->name);
}

4
app/core/gimpprojection.c
View File

@ -1114,7 +1114,7 @@ gdisplay_active ()
GtkWidget *event_widget;
GtkWidget *toplevel_widget;
GdkEvent *event;
GDisplay *gdisp;
GDisplay *gdisp = NULL;
/* If the popup shell is valid, then get the gdisplay associated with that shell */
event = gtk_get_current_event ();
@ -1125,6 +1125,8 @@ gdisplay_active ()
return NULL;
toplevel_widget = gtk_widget_get_toplevel (event_widget);
if (display_ht)
gdisp = g_hash_table_lookup (display_ht, toplevel_widget);
if (gdisp)

4
app/display/gimpdisplay.c
View File

@ -1114,7 +1114,7 @@ gdisplay_active ()
GtkWidget *event_widget;
GtkWidget *toplevel_widget;
GdkEvent *event;
GDisplay *gdisp;
GDisplay *gdisp = NULL;
/* If the popup shell is valid, then get the gdisplay associated with that shell */
event = gtk_get_current_event ();
@ -1125,6 +1125,8 @@ gdisplay_active ()
return NULL;
toplevel_widget = gtk_widget_get_toplevel (event_widget);
if (display_ht)
gdisp = g_hash_table_lookup (display_ht, toplevel_widget);
if (gdisp)

3
app/display/gimpdisplayshell-draw.c
View File

@ -1012,6 +1012,9 @@ progress_start ()
void
progress_update (float percentage)
{
if (!(percentage >= 0.0 && percentage <= 1.0))
return;
gtk_progress_bar_update (GTK_PROGRESS_BAR (progress_area), percentage);
if (GTK_WIDGET_VISIBLE (progress_area))

3
app/display/gimpdisplayshell.c
View File

@ -1012,6 +1012,9 @@ progress_start ()
void
progress_update (float percentage)
{
if (!(percentage >= 0.0 && percentage <= 1.0))
return;
gtk_progress_bar_update (GTK_PROGRESS_BAR (progress_area), percentage);
if (GTK_WIDGET_VISIBLE (progress_area))

1
app/fileops.c
View File

@ -24,6 +24,7 @@
#include <sys/stat.h>
#include <unistd.h>
#include <errno.h>
#include <stdlib.h>
#include "appenv.h"
#include "actionarea.h"

4
app/gdisplay.c
View File

@ -1114,7 +1114,7 @@ gdisplay_active ()
GtkWidget *event_widget;
GtkWidget *toplevel_widget;
GdkEvent *event;
GDisplay *gdisp;
GDisplay *gdisp = NULL;
/* If the popup shell is valid, then get the gdisplay associated with that shell */
event = gtk_get_current_event ();
@ -1125,6 +1125,8 @@ gdisplay_active ()
return NULL;
toplevel_widget = gtk_widget_get_toplevel (event_widget);
if (display_ht)
gdisp = g_hash_table_lookup (display_ht, toplevel_widget);
if (gdisp)

3
app/gui/plug-in-commands.c
View File

@ -3026,6 +3026,9 @@ plug_in_progress_update (PlugIn *plug_in,
double percentage)
{
#ifdef SEPARATE_PROGRESS_BAR
if (!(percentage >= 0.0 && percentage <= 1.0))
return;
if (!plug_in->progress)
plug_in_progress_init (plug_in, NULL);

3
app/gui/plug-in-menus.c
View File

@ -3026,6 +3026,9 @@ plug_in_progress_update (PlugIn *plug_in,
double percentage)
{
#ifdef SEPARATE_PROGRESS_BAR
if (!(percentage >= 0.0 && percentage <= 1.0))
return;
if (!plug_in->progress)
plug_in_progress_init (plug_in, NULL);

3
app/interface.c
View File

@ -1012,6 +1012,9 @@ progress_start ()
void
progress_update (float percentage)
{
if (!(percentage >= 0.0 && percentage <= 1.0))
return;
gtk_progress_bar_update (GTK_PROGRESS_BAR (progress_area), percentage);
if (GTK_WIDGET_VISIBLE (progress_area))

2
app/main.c
View File

@ -233,7 +233,7 @@ main (int argc, char **argv)
if (show_version || show_help)
exit (0);
g_set_message_handler (&message_func);
g_set_message_handler ((GPrintFunc) message_func);
/* Handle some signals */
signal (SIGHUP, on_signal);

3
app/menus/plug-in-menus.c
View File

@ -3026,6 +3026,9 @@ plug_in_progress_update (PlugIn *plug_in,
double percentage)
{
#ifdef SEPARATE_PROGRESS_BAR
if (!(percentage >= 0.0 && percentage <= 1.0))
return;
if (!plug_in->progress)
plug_in_progress_init (plug_in, NULL);

4
app/patterns.c
View File

@ -53,7 +53,7 @@ static GSList * insert_pattern_in_list (GSList *, GPatternP);
static void load_pattern (char *filename);
static void free_pattern (GPatternP);
static void pattern_free_one (gpointer, gpointer);
static gint pattern_compare_func (gpointer, gpointer);
static gint pattern_compare_func (gconstpointer, gconstpointer);
/* function declarations */
@ -92,7 +92,7 @@ pattern_free_one (gpointer data, gpointer dummy)
}
static gint
pattern_compare_func(gpointer first, gpointer second)
pattern_compare_func(gconstpointer first, gconstpointer second)
{
return strcmp (((GPatternP)first)->name, ((GPatternP)second)->name);
}

3
app/plug-in/gimpplugin-message.c
View File

@ -3026,6 +3026,9 @@ plug_in_progress_update (PlugIn *plug_in,
double percentage)
{
#ifdef SEPARATE_PROGRESS_BAR
if (!(percentage >= 0.0 && percentage <= 1.0))
return;
if (!plug_in->progress)
plug_in_progress_init (plug_in, NULL);

3
app/plug-in/gimpplugin-progress.c
View File

@ -3026,6 +3026,9 @@ plug_in_progress_update (PlugIn *plug_in,
double percentage)
{
#ifdef SEPARATE_PROGRESS_BAR
if (!(percentage >= 0.0 && percentage <= 1.0))
return;
if (!plug_in->progress)
plug_in_progress_init (plug_in, NULL);

3
app/plug-in/gimpplugin.c
View File

@ -3026,6 +3026,9 @@ plug_in_progress_update (PlugIn *plug_in,
double percentage)
{
#ifdef SEPARATE_PROGRESS_BAR
if (!(percentage >= 0.0 && percentage <= 1.0))
return;
if (!plug_in->progress)
plug_in_progress_init (plug_in, NULL);

3
app/plug-in/gimppluginmanager-call.c
View File

@ -3026,6 +3026,9 @@ plug_in_progress_update (PlugIn *plug_in,
double percentage)
{
#ifdef SEPARATE_PROGRESS_BAR
if (!(percentage >= 0.0 && percentage <= 1.0))
return;
if (!plug_in->progress)
plug_in_progress_init (plug_in, NULL);

3
app/plug-in/gimppluginmanager-run.c
View File

@ -3026,6 +3026,9 @@ plug_in_progress_update (PlugIn *plug_in,
double percentage)
{
#ifdef SEPARATE_PROGRESS_BAR
if (!(percentage >= 0.0 && percentage <= 1.0))
return;
if (!plug_in->progress)
plug_in_progress_init (plug_in, NULL);

3
app/plug-in/gimppluginmanager.c
View File

@ -3026,6 +3026,9 @@ plug_in_progress_update (PlugIn *plug_in,
double percentage)
{
#ifdef SEPARATE_PROGRESS_BAR
if (!(percentage >= 0.0 && percentage <= 1.0))
return;
if (!plug_in->progress)
plug_in_progress_init (plug_in, NULL);

3
app/plug-in/gimppluginshm.c
View File

@ -3026,6 +3026,9 @@ plug_in_progress_update (PlugIn *plug_in,
double percentage)
{
#ifdef SEPARATE_PROGRESS_BAR
if (!(percentage >= 0.0 && percentage <= 1.0))
return;
if (!plug_in->progress)
plug_in_progress_init (plug_in, NULL);

3
app/plug-in/plug-in-def.c
View File

@ -3026,6 +3026,9 @@ plug_in_progress_update (PlugIn *plug_in,
double percentage)
{
#ifdef SEPARATE_PROGRESS_BAR
if (!(percentage >= 0.0 && percentage <= 1.0))
return;
if (!plug_in->progress)
plug_in_progress_init (plug_in, NULL);

3
app/plug-in/plug-in-message.c
View File

@ -3026,6 +3026,9 @@ plug_in_progress_update (PlugIn *plug_in,
double percentage)
{
#ifdef SEPARATE_PROGRESS_BAR
if (!(percentage >= 0.0 && percentage <= 1.0))
return;
if (!plug_in->progress)
plug_in_progress_init (plug_in, NULL);

3
app/plug-in/plug-in-params.c
View File

@ -3026,6 +3026,9 @@ plug_in_progress_update (PlugIn *plug_in,
double percentage)
{
#ifdef SEPARATE_PROGRESS_BAR
if (!(percentage >= 0.0 && percentage <= 1.0))
return;
if (!plug_in->progress)
plug_in_progress_init (plug_in, NULL);

3
app/plug-in/plug-in-progress.c
View File

@ -3026,6 +3026,9 @@ plug_in_progress_update (PlugIn *plug_in,
double percentage)
{
#ifdef SEPARATE_PROGRESS_BAR
if (!(percentage >= 0.0 && percentage <= 1.0))
return;
if (!plug_in->progress)
plug_in_progress_init (plug_in, NULL);

3
app/plug-in/plug-in-run.c
View File

@ -3026,6 +3026,9 @@ plug_in_progress_update (PlugIn *plug_in,
double percentage)
{
#ifdef SEPARATE_PROGRESS_BAR
if (!(percentage >= 0.0 && percentage <= 1.0))
return;
if (!plug_in->progress)
plug_in_progress_init (plug_in, NULL);

3
app/plug-in/plug-in-shm.c
View File

@ -3026,6 +3026,9 @@ plug_in_progress_update (PlugIn *plug_in,
double percentage)
{
#ifdef SEPARATE_PROGRESS_BAR
if (!(percentage >= 0.0 && percentage <= 1.0))
return;
if (!plug_in->progress)
plug_in_progress_init (plug_in, NULL);

3
app/plug-in/plug-in.c
View File

@ -3026,6 +3026,9 @@ plug_in_progress_update (PlugIn *plug_in,
double percentage)
{
#ifdef SEPARATE_PROGRESS_BAR
if (!(percentage >= 0.0 && percentage <= 1.0))
return;
if (!plug_in->progress)
plug_in_progress_init (plug_in, NULL);

3
app/plug-in/plug-ins.c
View File

@ -3026,6 +3026,9 @@ plug_in_progress_update (PlugIn *plug_in,
double percentage)
{
#ifdef SEPARATE_PROGRESS_BAR
if (!(percentage >= 0.0 && percentage <= 1.0))
return;
if (!plug_in->progress)
plug_in_progress_init (plug_in, NULL);

3
app/plug_in.c
View File

@ -3026,6 +3026,9 @@ plug_in_progress_update (PlugIn *plug_in,
double percentage)
{
#ifdef SEPARATE_PROGRESS_BAR
if (!(percentage >= 0.0 && percentage <= 1.0))
return;
if (!plug_in->progress)
plug_in_progress_init (plug_in, NULL);

15
app/procedural_db.c
View File

@ -66,9 +66,7 @@ static Argument * procedural_db_set_data (Argument *);
static Argument * procedural_db_query (Argument *);
static void procedural_db_query_entry (gpointer, gpointer, gpointer);
static int match_strings (regex_t *, char *);
static guint procedural_db_hash_func (gpointer key);
static gint procedural_db_compare_func (gpointer a, gpointer b);
static guint procedural_db_hash_func (gconstpointer key);
/* Local data */
static GHashTable *procedural_ht = NULL;
@ -485,7 +483,7 @@ procedural_db_init ()
app_init_update_status("Procedural Database", NULL, -1);
if (!procedural_ht)
procedural_ht = g_hash_table_new (procedural_db_hash_func,
procedural_db_compare_func);
g_str_equal);
}
void
@ -1128,7 +1126,7 @@ match_strings (regex_t * preg,
}
static guint
procedural_db_hash_func (gpointer key)
procedural_db_hash_func (gconstpointer key)
{
gchar *string;
guint result;
@ -1172,9 +1170,4 @@ procedural_db_hash_func (gpointer key)
return result;
}
static gint
procedural_db_compare_func (gpointer a,
gpointer b)
{
return (strcmp ((char *) a, (char *) b) == 0);
}

4
config.h.in
View File

@ -82,3 +82,7 @@
/* Define if you have the <sys/ndir.h> header file. */
#undef HAVE_SYS_NDIR_H
/* define if compiled symbols have a leading underscore */
#undef WITH_SYMBOL_UNDERSCORE

2
libgimp/gimp.c
View File

@ -120,7 +120,7 @@ gimp_main (int argc,
return 0;
}
g_set_message_handler (&gimp_message_func);
g_set_message_handler ((GPrintFunc) gimp_message_func);
temp_proc_ht = g_hash_table_new (&g_str_hash, &g_str_equal);

8
libgimp/gimpprocbrowserdialog.c
View File

@ -22,6 +22,8 @@
0.08 26th sept 97 by Thomas NOEL <thomas@minet.net>
*/
#include <stdlib.h>
#include "dbbrowser_utils.h"
GList *proc_table;
@ -92,8 +94,7 @@ gimp_db_browser(void (* apply_callback) ( gchar *selected_proc_name,
gtk_signal_connect (GTK_OBJECT (dbbrowser->clist), "select_row",
(GtkSignalFunc) procedure_select_callback,
dbbrowser);
gtk_box_pack_start (GTK_BOX (vbox),
dbbrowser->clist, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (vbox), dbbrowser->scrolled_win, TRUE, TRUE, 0);
gtk_container_add (GTK_CONTAINER (dbbrowser->scrolled_win), dbbrowser->clist);
gtk_widget_show(dbbrowser->clist);
gtk_widget_show(dbbrowser->scrolled_win);
@ -452,8 +453,9 @@ dialog_select (dbbrowser_t *dbbrowser,
if (old_table) gtk_widget_destroy(old_table);
gtk_container_add (GTK_CONTAINER (dbbrowser->descr_scroll),
gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (dbbrowser->descr_scroll),
dbbrowser->descr_table);
gtk_widget_show(dbbrowser->descr_table);
}

8
libgimp/gimpprocview.c
View File

@ -22,6 +22,8 @@
0.08 26th sept 97 by Thomas NOEL <thomas@minet.net>
*/
#include <stdlib.h>
#include "dbbrowser_utils.h"
GList *proc_table;
@ -92,8 +94,7 @@ gimp_db_browser(void (* apply_callback) ( gchar *selected_proc_name,
gtk_signal_connect (GTK_OBJECT (dbbrowser->clist), "select_row",
(GtkSignalFunc) procedure_select_callback,
dbbrowser);
gtk_box_pack_start (GTK_BOX (vbox),
dbbrowser->clist, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (vbox), dbbrowser->scrolled_win, TRUE, TRUE, 0);
gtk_container_add (GTK_CONTAINER (dbbrowser->scrolled_win), dbbrowser->clist);
gtk_widget_show(dbbrowser->clist);
gtk_widget_show(dbbrowser->scrolled_win);
@ -452,8 +453,9 @@ dialog_select (dbbrowser_t *dbbrowser,
if (old_table) gtk_widget_destroy(old_table);
gtk_container_add (GTK_CONTAINER (dbbrowser->descr_scroll),
gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (dbbrowser->descr_scroll),
dbbrowser->descr_table);
gtk_widget_show(dbbrowser->descr_table);
}

4
plug-ins/MapObject/mapobject_ui.c
View File

@ -131,7 +131,7 @@ void angle_update(GtkWidget *widget, GtkScale *scale)
GtkAdjustment *adjustment;
valueptr=(gdouble *)gtk_object_get_data(GTK_OBJECT(widget),"ValuePtr");
adjustment=gtk_range_get_adjustment(GTK_RANGE(scale));
adjustment=gtk_range_get_adjustment(GTK_RANGE(widget));
*valueptr=(gdouble)adjustment->value;
@ -169,7 +169,7 @@ void scale_update(GtkWidget *widget,GtkScale *scale)
GtkAdjustment *adjustment;
valueptr=(gdouble *)gtk_object_get_data(GTK_OBJECT(widget),"ValuePtr");
adjustment=gtk_range_get_adjustment(GTK_RANGE(scale));
adjustment=gtk_range_get_adjustment(GTK_RANGE(widget));
*valueptr=(gdouble)adjustment->value;
}

8
plug-ins/dbbrowser/dbbrowser_utils.c
View File

@ -22,6 +22,8 @@
0.08 26th sept 97 by Thomas NOEL <thomas@minet.net>
*/
#include <stdlib.h>
#include "dbbrowser_utils.h"
GList *proc_table;
@ -92,8 +94,7 @@ gimp_db_browser(void (* apply_callback) ( gchar *selected_proc_name,
gtk_signal_connect (GTK_OBJECT (dbbrowser->clist), "select_row",
(GtkSignalFunc) procedure_select_callback,
dbbrowser);
gtk_box_pack_start (GTK_BOX (vbox),
dbbrowser->clist, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (vbox), dbbrowser->scrolled_win, TRUE, TRUE, 0);
gtk_container_add (GTK_CONTAINER (dbbrowser->scrolled_win), dbbrowser->clist);
gtk_widget_show(dbbrowser->clist);
gtk_widget_show(dbbrowser->scrolled_win);
@ -452,8 +453,9 @@ dialog_select (dbbrowser_t *dbbrowser,
if (old_table) gtk_widget_destroy(old_table);
gtk_container_add (GTK_CONTAINER (dbbrowser->descr_scroll),
gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (dbbrowser->descr_scroll),
dbbrowser->descr_table);
gtk_widget_show(dbbrowser->descr_table);
}

8
plug-ins/dbbrowser/gimpprocbrowser.c
View File

@ -22,6 +22,8 @@
0.08 26th sept 97 by Thomas NOEL <thomas@minet.net>
*/
#include <stdlib.h>
#include "dbbrowser_utils.h"
GList *proc_table;
@ -92,8 +94,7 @@ gimp_db_browser(void (* apply_callback) ( gchar *selected_proc_name,
gtk_signal_connect (GTK_OBJECT (dbbrowser->clist), "select_row",
(GtkSignalFunc) procedure_select_callback,
dbbrowser);
gtk_box_pack_start (GTK_BOX (vbox),
dbbrowser->clist, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (vbox), dbbrowser->scrolled_win, TRUE, TRUE, 0);
gtk_container_add (GTK_CONTAINER (dbbrowser->scrolled_win), dbbrowser->clist);
gtk_widget_show(dbbrowser->clist);
gtk_widget_show(dbbrowser->scrolled_win);
@ -452,8 +453,9 @@ dialog_select (dbbrowser_t *dbbrowser,
if (old_table) gtk_widget_destroy(old_table);
gtk_container_add (GTK_CONTAINER (dbbrowser->descr_scroll),
gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (dbbrowser->descr_scroll),
dbbrowser->descr_table);
gtk_widget_show(dbbrowser->descr_table);
}

8
plug-ins/dbbrowser/gimpprocview.c
View File

@ -22,6 +22,8 @@
0.08 26th sept 97 by Thomas NOEL <thomas@minet.net>
*/
#include <stdlib.h>
#include "dbbrowser_utils.h"
GList *proc_table;
@ -92,8 +94,7 @@ gimp_db_browser(void (* apply_callback) ( gchar *selected_proc_name,
gtk_signal_connect (GTK_OBJECT (dbbrowser->clist), "select_row",
(GtkSignalFunc) procedure_select_callback,
dbbrowser);
gtk_box_pack_start (GTK_BOX (vbox),
dbbrowser->clist, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (vbox), dbbrowser->scrolled_win, TRUE, TRUE, 0);
gtk_container_add (GTK_CONTAINER (dbbrowser->scrolled_win), dbbrowser->clist);
gtk_widget_show(dbbrowser->clist);
gtk_widget_show(dbbrowser->scrolled_win);
@ -452,8 +453,9 @@ dialog_select (dbbrowser_t *dbbrowser,
if (old_table) gtk_widget_destroy(old_table);
gtk_container_add (GTK_CONTAINER (dbbrowser->descr_scroll),
gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (dbbrowser->descr_scroll),
dbbrowser->descr_table);
gtk_widget_show(dbbrowser->descr_table);
}

149
plug-ins/gfig/gfig.c
View File

@ -54,10 +54,8 @@
#include <sys/types.h>
#include <dirent.h>
#include <ctype.h>
#include <math.h>
#include <gtk/gtk.h>
#include "gtk/gtk.h"
#include "libgimp/gimp.h"
#include "libgimp/gimpui.h"
#include "pix_data.h"
@ -126,7 +124,7 @@ GdkPixmap *gfig_pixmap;
gint32 gfig_image;
gint32 gfig_drawable;
GtkWidget *brush_page_pw;
GtkWidget *brush_sel_button;
static gint tile_width, tile_height;
static gint img_width, img_height,img_bpp,real_img_bpp;
@ -187,6 +185,9 @@ static void find_grid_pos(GdkPoint *p,GdkPoint *gp, guint state);
static gint brush_list_button_press(GtkWidget *widget,GdkEventButton *event,gpointer data);
static gint calculate_point_to_line_distance(GdkPoint *p, GdkPoint *A, GdkPoint *B, GdkPoint *I);
/* gtk private function forward declaration */
gchar * gdk_pixmap_extract_color (gchar *buffer);
GPlugInInfo PLUG_IN_INFO =
{
NULL, /* init_proc */
@ -1335,19 +1336,19 @@ update_options(GFIGOBJ *old_obj)
}
if(selvals.opts.drawgrid != current_obj->opts.drawgrid)
{
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gfig_opt_widget.drawgrid),current_obj->opts.drawgrid);
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (gfig_opt_widget.drawgrid),current_obj->opts.drawgrid);
}
if(selvals.opts.snap2grid != current_obj->opts.snap2grid)
{
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gfig_opt_widget.snap2grid),current_obj->opts.snap2grid);
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (gfig_opt_widget.snap2grid),current_obj->opts.snap2grid);
}
if(selvals.opts.lockongrid != current_obj->opts.lockongrid)
{
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gfig_opt_widget.lockongrid),current_obj->opts.lockongrid);
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (gfig_opt_widget.lockongrid),current_obj->opts.lockongrid);
}
if(selvals.opts.showcontrol != current_obj->opts.showcontrol)
{
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gfig_opt_widget.showcontrol),current_obj->opts.showcontrol);
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (gfig_opt_widget.showcontrol),current_obj->opts.showcontrol);
}
if(selvals.opts.gridtype != current_obj->opts.gridtype)
{
@ -1660,7 +1661,6 @@ typedef struct
gint transparent;
} _GdkPixmapColor;
static gchar*
my_gdk_pixmap_skip_whitespaces (gchar *buffer)
{
@ -2387,7 +2387,7 @@ bezier_dialog (void)
(GtkSignalFunc) gfig_toggle_update,
(gpointer)&bezier_closed);
gtk_tooltips_set_tip(gfig_tooltips,toggle,"Close curve on completion",NULL);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle),bezier_closed);
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (toggle),bezier_closed);
gtk_widget_show(toggle);
gtk_box_pack_start(GTK_BOX(vbox),toggle, TRUE, TRUE, 0);
@ -2396,7 +2396,7 @@ bezier_dialog (void)
(GtkSignalFunc) gfig_toggle_update,
(gpointer)&bezier_line_frame);
gtk_tooltips_set_tip(gfig_tooltips,toggle,"Draws lines between the control points. Only during curve creation",NULL);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle),bezier_line_frame);
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (toggle),bezier_line_frame);
gtk_widget_show(toggle);
gtk_box_pack_start(GTK_BOX(vbox),toggle, TRUE, TRUE, 0);
@ -2959,6 +2959,7 @@ gfig_gen_brush_preview(BRUSHDESC *bdesc)
{
case BRUSH_BRUSH_TYPE:
return_vals = gimp_run_procedure ("gimp_paintbrush", &nreturn_vals,
PARAM_IMAGE, brush_image_ID,
PARAM_DRAWABLE, layer_ID,
PARAM_FLOAT,0.0,
PARAM_INT32,2*GFIG_LCC,/* GIMP BUG should be 2!!!!*/
@ -2967,6 +2968,7 @@ gfig_gen_brush_preview(BRUSHDESC *bdesc)
break;
case BRUSH_PENCIL_TYPE:
return_vals = gimp_run_procedure ("gimp_pencil", &nreturn_vals,
PARAM_IMAGE, brush_image_ID,
PARAM_DRAWABLE, layer_ID,
PARAM_INT32,2,
PARAM_FLOATARRAY, &line_pnts[0],
@ -2974,6 +2976,7 @@ gfig_gen_brush_preview(BRUSHDESC *bdesc)
break;
case BRUSH_AIRBRUSH_TYPE:
return_vals = gimp_run_procedure ("gimp_airbrush", &nreturn_vals,
PARAM_IMAGE, brush_image_ID,
PARAM_DRAWABLE, layer_ID,
PARAM_FLOAT,(gdouble)selvals.airbrushpressure,
PARAM_INT32,2,
@ -2982,6 +2985,7 @@ gfig_gen_brush_preview(BRUSHDESC *bdesc)
break;
case BRUSH_PATTERN_TYPE:
return_vals = gimp_run_procedure ("gimp_clone", &nreturn_vals,
PARAM_IMAGE, brush_image_ID,
PARAM_DRAWABLE, layer_ID,
PARAM_DRAWABLE, layer_ID,
PARAM_INT32, 1,
@ -3291,7 +3295,7 @@ paint_page()
toggle = gtk_check_button_new_with_label ("Scale to image ");
gtk_table_attach(GTK_TABLE(table), toggle, 1, 2, 3, 4, GTK_FILL, GTK_FILL, 0, 0);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle),selvals.scaletoimage);
gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(toggle),selvals.scaletoimage);
gtk_signal_connect (GTK_OBJECT (toggle), "toggled",
(GtkSignalFunc) gfig_scale2img_update,
(gpointer)&selvals.scaletoimage);
@ -3326,8 +3330,6 @@ paint_page()
return(vbox);
}
#if 0 /* NOT USED */
static void
gfig_get_brushes(GtkWidget *list)
{
@ -3386,7 +3388,7 @@ gfig_get_brushes(GtkWidget *list)
gimp_destroy_params (return_vals, nreturn_vals);
gtk_list_select_item(GTK_LIST(list),list_item2sel);
}
#endif
#if 0 /* NOT USED */
static gint
@ -3432,54 +3434,12 @@ set_brush_press(GtkWidget *widget,
#endif /* NOT USED */
static void
gfig_brush_invoker(gchar *name,
gdouble opacity,
gint spacing,
gint paint_mode,
gint width,
gint height,
gchar * mask_data,
gint closing,
gpointer udata)
{
BRUSHDESC *bdesc = g_malloc0(sizeof(BRUSHDESC)); /* Mem leak */
bdesc->bpp = 3;
bdesc->width = width;
bdesc->height = height;
bdesc->bname = g_strdup(name);
brush_list_button_press(NULL,NULL,bdesc);
}
#if 0 /* GIMP 1.1.x */
static gint
select_brush_press(GtkWidget *widget,
GdkEventButton *event,
gpointer data)
{
BRUSHDESC *bdesc = g_malloc0(sizeof(BRUSHDESC));
gimp_interactive_selection_brush("Gfig brush selection",
mygimp_brush_get(),
1.0, /* Opacity */
-1, /* spacing (default)*/
1, /* Paint mode */
gfig_brush_invoker,
NULL);
bdesc->bpp = 3;
bdesc->bname = mygimp_brush_get();
brush_list_button_press(NULL,NULL,bdesc);
return(TRUE);
}
#endif
static GtkWidget *
brush_page()
{
GtkWidget *list_frame;
GtkWidget *list;
GtkWidget *scrolled_win;
GtkWidget *table;
GtkWidget *label;
GtkWidget *pw;
@ -3487,9 +3447,6 @@ brush_page()
GtkObject *fade_out_scale_data;
GtkObject *pressure_scale_data;
GtkWidget *vbox;
GtkWidget *button;
BRUSHDESC *bdesc = g_malloc0(sizeof(BRUSHDESC)); /* Initial brush settings */
vbox = gtk_vbox_new(FALSE, 0);
gtk_container_border_width(GTK_CONTAINER(vbox), 4);
@ -3558,7 +3515,6 @@ brush_page()
(GtkSignalFunc)gfig_brush_update_preview,
(gpointer)brush_page_pw);
#if 0
/* Brush list */
list_frame = gtk_frame_new(NULL);
gtk_frame_set_shadow_type (GTK_FRAME (list_frame), GTK_SHADOW_ETCHED_IN);
@ -3574,25 +3530,10 @@ brush_page()
gtk_list_set_selection_mode (GTK_LIST (list), GTK_SELECTION_SINGLE);
gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled_win),
list);
gtk_widget_show (list);
gtk_table_attach(GTK_TABLE(table), list_frame, 0, 4, 1, 5, GTK_FILL|GTK_EXPAND , GTK_FILL|GTK_EXPAND, 0, 0);
/* Get brush list and insert in table */
gfig_get_brushes(list);
#endif /* 0 */
#if 0 /* GIMP 1.1.x */
/* Start of new brush selection code */
brush_sel_button = button = gtk_button_new_with_label ("Set brush...");
gtk_table_attach(GTK_TABLE(table), button, 0,4,1,5, 0, 0, 0, 0);
gtk_signal_connect (GTK_OBJECT (button), "button_press_event",
(GtkSignalFunc) select_brush_press,
NULL);
gtk_widget_show(button);
#endif
/* Setup initial brush settings */
bdesc->bpp = 3;
bdesc->bname = mygimp_brush_get();
brush_list_button_press(NULL,NULL,bdesc);
return(vbox);
}
@ -4175,7 +4116,7 @@ options_page()
gtk_signal_connect (GTK_OBJECT (toggle), "toggled",
(GtkSignalFunc) toggle_tooltips,
(gpointer)&selvals.showtooltips);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle),selvals.showtooltips);
gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(toggle),selvals.showtooltips);
gtk_widget_show(toggle);
toggle = gtk_check_button_new_with_label ("Show pos");
@ -4467,7 +4408,7 @@ gfig_obj_size_update(gint sz)
static gchar buf[256];
sprintf(buf,"%6d",sz);
gtk_label_set_text(GTK_LABEL(obj_size_label),buf);
gtk_label_set(GTK_LABEL(obj_size_label),buf);
}
static GtkWidget *
@ -4492,7 +4433,7 @@ gfig_obj_size_label(void)
gtk_widget_show(hbox);
sprintf(buf,"%6d",0);
gtk_label_set_text(GTK_LABEL(obj_size_label),buf);
gtk_label_set(GTK_LABEL(obj_size_label),buf);
return(hbox);
}
@ -4530,9 +4471,9 @@ gfig_pos_labels(void)
gtk_widget_show(vbox);
sprintf(buf," X: %.3d ",0);
gtk_label_set_text(GTK_LABEL(x_pos_label),buf);
gtk_label_set(GTK_LABEL(x_pos_label),buf);
sprintf(buf," Y: %.3d ",0);
gtk_label_set_text(GTK_LABEL(y_pos_label),buf);
gtk_label_set(GTK_LABEL(y_pos_label),buf);
return(hbox);
}
@ -5315,7 +5256,7 @@ gfig_list_ok_callback (GtkWidget *w,
#endif /* DEBUG */
/* Need to reorder the list */
/* gtk_label_set_text (GTK_LABEL (options->layer_widget->label), layer->name);*/
/* gtk_label_set (GTK_LABEL (options->layer_widget->label), layer->name);*/
pos = gtk_list_child_position(GTK_LIST(gfig_gtk_list),list);
#ifdef DEBUG
@ -5544,8 +5485,7 @@ gfig_rescan_list (void)
list_widget = gtk_list_new ();
gtk_list_set_selection_mode (GTK_LIST (list_widget), GTK_SELECTION_BROWSE);
gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled_win),
list_widget);
gtk_container_add (GTK_CONTAINER (scrolled_win), list_widget);
gtk_widget_show (list_widget);
gtk_box_pack_start (GTK_BOX (vbox), list_frame, TRUE, TRUE, 0);
@ -5806,6 +5746,7 @@ paint_layer_fill()
return_vals = gimp_run_procedure ("gimp_bucket_fill",
&nreturn_vals,
PARAM_IMAGE, gfig_image,
PARAM_DRAWABLE, gfig_drawable,
PARAM_INT32, selopt.fill_type, /* Fill mode */
PARAM_INT32, 0, /* NORMAL */
@ -6225,7 +6166,7 @@ gfig_update_stat_labels()
else
sprintf(str,"<NONE>");
gtk_label_set_text(GTK_LABEL(status_label_dname),str);
gtk_label_set(GTK_LABEL(status_label_dname),str);
if(current_obj->filename)
{
@ -6253,7 +6194,7 @@ gfig_update_stat_labels()
else
sprintf(str,"<NONE>");
gtk_label_set_text(GTK_LABEL(status_label_fname),str);
gtk_label_set(GTK_LABEL(status_label_fname),str);
}
@ -8088,6 +8029,7 @@ d_paint_line(DOBJECT *obj)
{
case BRUSH_BRUSH_TYPE:
return_vals = gimp_run_procedure ("gimp_paintbrush", &nreturn_vals,
PARAM_IMAGE, gfig_image,
PARAM_DRAWABLE, gfig_drawable,
PARAM_FLOAT,(gdouble)selvals.brushfade,
PARAM_INT32,seg_count*2*GFIG_LCC,/* GIMP BUG should be 2!!!!*/
@ -8096,6 +8038,7 @@ d_paint_line(DOBJECT *obj)
break;
case BRUSH_PENCIL_TYPE:
return_vals = gimp_run_procedure ("gimp_pencil", &nreturn_vals,
PARAM_IMAGE, gfig_image,
PARAM_DRAWABLE, gfig_drawable,
PARAM_INT32,seg_count*2,
PARAM_FLOATARRAY, &line_pnts[0],
@ -8103,6 +8046,7 @@ d_paint_line(DOBJECT *obj)
break;
case BRUSH_AIRBRUSH_TYPE:
return_vals = gimp_run_procedure ("gimp_airbrush", &nreturn_vals,
PARAM_IMAGE, gfig_image,
PARAM_DRAWABLE, gfig_drawable,
PARAM_FLOAT,(gdouble)selvals.airbrushpressure,
PARAM_INT32,seg_count*2,
@ -8111,6 +8055,7 @@ d_paint_line(DOBJECT *obj)
break;
case BRUSH_PATTERN_TYPE:
return_vals = gimp_run_procedure ("gimp_clone", &nreturn_vals,
PARAM_IMAGE, gfig_image,
PARAM_DRAWABLE, gfig_drawable,
PARAM_DRAWABLE, gfig_drawable,
PARAM_INT32, 1,
@ -8557,6 +8502,7 @@ d_paint_circle(DOBJECT *obj)
return;
return_vals = gimp_run_procedure ("gimp_edit_stroke", &nreturn_vals,
PARAM_IMAGE, gfig_image,
PARAM_DRAWABLE, gfig_drawable,
PARAM_END);
@ -8946,6 +8892,7 @@ d_paint_approx_ellipse(DOBJECT *obj)
{
case BRUSH_BRUSH_TYPE:
return_vals = gimp_run_procedure ("gimp_paintbrush", &nreturn_vals,
PARAM_IMAGE, gfig_image,
PARAM_DRAWABLE, gfig_drawable,
PARAM_FLOAT,(gdouble)selvals.brushfade,
PARAM_INT32,(i/2)*2*GFIG_LCC,/* GIMP BUG should be 2!!!!*/
@ -8954,6 +8901,7 @@ d_paint_approx_ellipse(DOBJECT *obj)
break;
case BRUSH_PENCIL_TYPE:
return_vals = gimp_run_procedure ("gimp_pencil", &nreturn_vals,
PARAM_IMAGE, gfig_image,
PARAM_DRAWABLE, gfig_drawable,
PARAM_INT32,(i/2)*2,
PARAM_FLOATARRAY, &line_pnts[0],
@ -8961,6 +8909,7 @@ d_paint_approx_ellipse(DOBJECT *obj)
break;
case BRUSH_AIRBRUSH_TYPE:
return_vals = gimp_run_procedure ("gimp_airbrush", &nreturn_vals,
PARAM_IMAGE, gfig_image,
PARAM_DRAWABLE, gfig_drawable,
PARAM_FLOAT,(gdouble)selvals.airbrushpressure,
PARAM_INT32,(i/2)*2,
@ -8969,6 +8918,7 @@ d_paint_approx_ellipse(DOBJECT *obj)
break;
case BRUSH_PATTERN_TYPE:
return_vals = gimp_run_procedure ("gimp_clone", &nreturn_vals,
PARAM_IMAGE, gfig_image,
PARAM_DRAWABLE, gfig_drawable,
PARAM_DRAWABLE, gfig_drawable,
PARAM_INT32, 1,
@ -9089,6 +9039,7 @@ d_paint_ellipse(DOBJECT *obj)
return;
return_vals = gimp_run_procedure ("gimp_edit_stroke", &nreturn_vals,
PARAM_IMAGE, gfig_image,
PARAM_DRAWABLE, gfig_drawable,
PARAM_END);
@ -9579,6 +9530,7 @@ d_paint_poly(DOBJECT *obj)
{
case BRUSH_BRUSH_TYPE:
return_vals = gimp_run_procedure ("gimp_paintbrush", &nreturn_vals,
PARAM_IMAGE, gfig_image,
PARAM_DRAWABLE, gfig_drawable,
PARAM_FLOAT,(gdouble)selvals.brushfade,
PARAM_INT32,(i/2)*2*GFIG_LCC,/* GIMP BUG should be 2!!!!*/
@ -9587,6 +9539,7 @@ d_paint_poly(DOBJECT *obj)
break;
case BRUSH_PENCIL_TYPE:
return_vals = gimp_run_procedure ("gimp_pencil", &nreturn_vals,
PARAM_IMAGE, gfig_image,
PARAM_DRAWABLE, gfig_drawable,
PARAM_INT32,(i/2)*2,
PARAM_FLOATARRAY, &line_pnts[0],
@ -9594,6 +9547,7 @@ d_paint_poly(DOBJECT *obj)
break;
case BRUSH_AIRBRUSH_TYPE:
return_vals = gimp_run_procedure ("gimp_airbrush", &nreturn_vals,
PARAM_IMAGE, gfig_image,
PARAM_DRAWABLE, gfig_drawable,
PARAM_FLOAT,(gdouble)selvals.airbrushpressure,
PARAM_INT32,(i/2)*2,
@ -9602,6 +9556,7 @@ d_paint_poly(DOBJECT *obj)
break;
case BRUSH_PATTERN_TYPE:
return_vals = gimp_run_procedure ("gimp_clone", &nreturn_vals,
PARAM_IMAGE, gfig_image,
PARAM_DRAWABLE, gfig_drawable,
PARAM_DRAWABLE, gfig_drawable,
PARAM_INT32, 1,
@ -10548,6 +10503,7 @@ d_paint_arc(DOBJECT *obj)
{
case BRUSH_BRUSH_TYPE:
return_vals = gimp_run_procedure ("gimp_paintbrush", &nreturn_vals,
PARAM_IMAGE, gfig_image,
PARAM_DRAWABLE, gfig_drawable,
PARAM_FLOAT,(gdouble)selvals.brushfade,
PARAM_INT32,(i/2)*2*GFIG_LCC,/* GIMP BUG should be 2!!!!*/
@ -10556,6 +10512,7 @@ d_paint_arc(DOBJECT *obj)
break;
case BRUSH_PENCIL_TYPE:
return_vals = gimp_run_procedure ("gimp_pencil", &nreturn_vals,
PARAM_IMAGE, gfig_image,
PARAM_DRAWABLE, gfig_drawable,
PARAM_INT32,(i/2)*2,
PARAM_FLOATARRAY, &line_pnts[0],
@ -10563,6 +10520,7 @@ d_paint_arc(DOBJECT *obj)
break;
case BRUSH_AIRBRUSH_TYPE:
return_vals = gimp_run_procedure ("gimp_airbrush", &nreturn_vals,
PARAM_IMAGE, gfig_image,
PARAM_DRAWABLE, gfig_drawable,
PARAM_FLOAT,(gdouble)selvals.airbrushpressure,
PARAM_INT32,(i/2)*2,
@ -10571,6 +10529,7 @@ d_paint_arc(DOBJECT *obj)
break;
case BRUSH_PATTERN_TYPE:
return_vals = gimp_run_procedure ("gimp_clone", &nreturn_vals,
PARAM_IMAGE, gfig_image,
PARAM_DRAWABLE, gfig_drawable,
PARAM_DRAWABLE, gfig_drawable,
PARAM_INT32, 1,
@ -11120,6 +11079,7 @@ d_paint_star(DOBJECT *obj)
{
case BRUSH_BRUSH_TYPE:
return_vals = gimp_run_procedure ("gimp_paintbrush", &nreturn_vals,
PARAM_IMAGE, gfig_image,
PARAM_DRAWABLE, gfig_drawable,
PARAM_FLOAT,(gdouble)selvals.brushfade,
PARAM_INT32,(i/2)*2*GFIG_LCC,/* GIMP BUG should be 2!!!!*/
@ -11128,6 +11088,7 @@ d_paint_star(DOBJECT *obj)
break;
case BRUSH_PENCIL_TYPE:
return_vals = gimp_run_procedure ("gimp_pencil", &nreturn_vals,
PARAM_IMAGE, gfig_image,
PARAM_DRAWABLE, gfig_drawable,
PARAM_INT32,(i/2)*2,
PARAM_FLOATARRAY, &line_pnts[0],
@ -11135,6 +11096,7 @@ d_paint_star(DOBJECT *obj)
break;
case BRUSH_AIRBRUSH_TYPE:
return_vals = gimp_run_procedure ("gimp_airbrush", &nreturn_vals,
PARAM_IMAGE, gfig_image,
PARAM_DRAWABLE, gfig_drawable,
PARAM_FLOAT,(gdouble)selvals.airbrushpressure,
PARAM_INT32,(i/2)*2,
@ -11143,6 +11105,7 @@ d_paint_star(DOBJECT *obj)
break;
case BRUSH_PATTERN_TYPE:
return_vals = gimp_run_procedure ("gimp_clone", &nreturn_vals,
PARAM_IMAGE, gfig_image,
PARAM_DRAWABLE, gfig_drawable,
PARAM_DRAWABLE, gfig_drawable,
PARAM_INT32, 1,
@ -11623,6 +11586,7 @@ d_paint_spiral(DOBJECT *obj)
{
case BRUSH_BRUSH_TYPE:
return_vals = gimp_run_procedure ("gimp_paintbrush", &nreturn_vals,
PARAM_IMAGE, gfig_image,
PARAM_DRAWABLE, gfig_drawable,
PARAM_FLOAT,(gdouble)selvals.brushfade,
PARAM_INT32,(i/2)*2*GFIG_LCC,/* GIMP BUG should be 2!!!!*/
@ -11631,6 +11595,7 @@ d_paint_spiral(DOBJECT *obj)
break;
case BRUSH_PENCIL_TYPE:
return_vals = gimp_run_procedure ("gimp_pencil", &nreturn_vals,
PARAM_IMAGE, gfig_image,
PARAM_DRAWABLE, gfig_drawable,
PARAM_INT32,(i/2)*2,
PARAM_FLOATARRAY, &line_pnts[0],
@ -11638,6 +11603,7 @@ d_paint_spiral(DOBJECT *obj)
break;
case BRUSH_AIRBRUSH_TYPE:
return_vals = gimp_run_procedure ("gimp_airbrush", &nreturn_vals,
PARAM_IMAGE, gfig_image,
PARAM_DRAWABLE, gfig_drawable,
PARAM_FLOAT,(gdouble)selvals.airbrushpressure,
PARAM_INT32,(i/2)*2,
@ -11646,6 +11612,7 @@ d_paint_spiral(DOBJECT *obj)
break;
case BRUSH_PATTERN_TYPE:
return_vals = gimp_run_procedure ("gimp_clone", &nreturn_vals,
PARAM_IMAGE, gfig_image,
PARAM_DRAWABLE, gfig_drawable,
PARAM_DRAWABLE, gfig_drawable,
PARAM_INT32, 1,
@ -12152,6 +12119,7 @@ d_paint_bezier(DOBJECT *obj)
{
case BRUSH_BRUSH_TYPE:
return_vals = gimp_run_procedure ("gimp_paintbrush", &nreturn_vals,
PARAM_IMAGE, gfig_image,
PARAM_DRAWABLE, gfig_drawable,
PARAM_FLOAT,(gdouble)selvals.brushfade,
PARAM_INT32,(i/2)*2*GFIG_LCC,/* GIMP BUG should be 2!!!!*/
@ -12160,6 +12128,7 @@ d_paint_bezier(DOBJECT *obj)
break;
case BRUSH_PENCIL_TYPE:
return_vals = gimp_run_procedure ("gimp_pencil", &nreturn_vals,
PARAM_IMAGE, gfig_image,
PARAM_DRAWABLE, gfig_drawable,
PARAM_INT32,(i/2)*2,
PARAM_FLOATARRAY, &line_pnts[0],
@ -12167,6 +12136,7 @@ d_paint_bezier(DOBJECT *obj)
break;
case BRUSH_AIRBRUSH_TYPE:
return_vals = gimp_run_procedure ("gimp_airbrush", &nreturn_vals,
PARAM_IMAGE, gfig_image,
PARAM_DRAWABLE, gfig_drawable,
PARAM_FLOAT,(gdouble)selvals.airbrushpressure,
PARAM_INT32,(i/2)*2,
@ -12175,6 +12145,7 @@ d_paint_bezier(DOBJECT *obj)
break;
case BRUSH_PATTERN_TYPE:
return_vals = gimp_run_procedure ("gimp_clone", &nreturn_vals,
PARAM_IMAGE, gfig_image,
PARAM_DRAWABLE, gfig_drawable,
PARAM_DRAWABLE, gfig_drawable,
PARAM_INT32, 1,

9
plug-ins/script-fu/script-fu-server.c
View File

@ -115,7 +115,6 @@ static void server_start (gint port,
static gint execute_command (SFCommand *cmd);
static gint read_from_client (gint filedes);
static gint make_socket (guint port);
static guint clientname_hash (gpointer key);
static void server_log (gchar *format,
...);
static void server_quit (void);
@ -296,7 +295,7 @@ server_start (gint port,
SFCommand *cmd;
/* Set up the clientname hash table */
clientname_ht = g_hash_table_new (clientname_hash, NULL);
clientname_ht = g_hash_table_new (g_direct_hash, NULL);
/* Setup up the server log file */
if (logfile)
@ -502,12 +501,6 @@ make_socket (guint port)
return sock;
}
static guint
clientname_hash (gpointer key)
{
return (int) key;
}
static void
server_log (gchar *format, ...)
{