1997-11-25 06:05:25 +08:00
|
|
|
/* 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
|
1998-04-13 13:44:11 +08:00
|
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
1997-11-25 06:05:25 +08:00
|
|
|
*/
|
|
|
|
#include "appenv.h"
|
|
|
|
#include "color_panel.h"
|
Bit of a large checkin this - it's basically three things: 1 - GimpModules
Sun Jan 11 00:24:21 GMT 1999 Austin Donnelly <austin@greenend.org.uk>
Bit of a large checkin this - it's basically three things:
1 - GimpModules using gmodules to dynamically load and
initialise modules at gimp start of day.
2 - Color selectors now register themselves with a color
notebook.
3 - progress bars have been cleaned up a bit, so now have
progress indictations on all transform tool and gradient
fill operations. Not done bucket fill, but that seems to
be the next candidate.
New directories:
* modules/: new directory for dynamically loadable modules.
New files:
* modules/.cvsignore
* modules/Makefile.am
* modules/colorsel_gtk.c: GTK color selector wrapped up as a
color selector the gimp can use.
* app/gimpprogress.[ch]: progress bars within gimp core, either as
popups, or in the status bar. This is mainly code moved out
of plug-in.c
* app/color_notebook.[ch]: color selector notebook, implementing
very similar interface to color_select.h so it can be used as
a drop-in replacement for it.
* libgimp/color_selector.h: API color selectors need to implement
to become a page in the color_notebook.
* libgimp/gimpmodule.h: API gimp modules need to implement to be
initialised by gimp at start of day.
Modified files:
* Makefile.am: add modules/ to SUBDIRS
* libgimp/Makefile.am: install gimpmodule.h and color_selector.h
* app/gimprc.[ch]: recognise module-path variable.
* gimprc.in: set module-path variable to something sensible
(currently "${gimp_dir}/modules:${gimp_plugin_dir}/modules").
* app/Makefile.am: build color notebook and gimpprogress
* app/app_procs.c: register internal GIMP color selector with
color notebook.
* app/asupsample.c: call progress function less frequently for
better performance.
* app/asupsample.h: progress_func_t typedef moved to gimpprogress.h
* app/blend.c: make callbacks to a progress function
* app/color_area.c: use a color notebook rather than a color selector
* app/color_panel.c: ditto
* app/color_select.c: export color selector interface for notebook
* app/color_select.h: color_select_init() prototype
* app/flip_tool.c: flip the image every time, rather than every
second click.
* app/interface.c: move progress bar stuff out to
gimpprogress.c. Make the code actually work while we're at it.
* app/interface.h: move prototypes for progress functions out to
gimpprogress.h
* app/plug_in.c: load and initialise modules (if possible). Move
progress bar handling code out to gimpprogress.c
* app/plug_in.h: keep only a gimp_progress * for each plugin, not
a whole bunch of GtkWidgets.
* app/scale_tool.c
* app/rotate_tool.c
* app/shear_tool.c
* app/perspective_tool.c: progress bar during operation.
De-sensitise the dialog to discourage the user from running
two transforms in parallel.
* app/transform_core.c: recalculate grid coords when bounding box
changes. Only initialise the action area of the dialog once,
to avoid multiple "ok" / "reset" buttons appearing. Undraw
transform tool with correct matrix to get rid of handle
remains on screen. Call a progress function as we apply the
transform matrix. A few new i18n markups. Invalidate
floating selection marching ants after applying matrix.
* app/transform_core.h: transform_core_do() takes an optional
progress callback argument (and data).
* plug-ins/oilify/oilify.c: send progress bar updates after every
pixel region, not only if they processed a multiple of 5
pixels (which was quite unlikely, and therefore gave a jerky
progress indication).
1999-01-11 08:57:33 +08:00
|
|
|
#include "color_notebook.h"
|
1997-11-25 06:05:25 +08:00
|
|
|
#include "colormaps.h"
|
1999-08-22 19:45:31 +08:00
|
|
|
#include "gimpdnd.h"
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2000-04-28 01:27:28 +08:00
|
|
|
|
1999-08-22 19:45:31 +08:00
|
|
|
#define EVENT_MASK GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | \
|
|
|
|
GDK_BUTTON_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | \
|
|
|
|
GDK_LEAVE_NOTIFY_MASK
|
1997-11-25 06:05:25 +08:00
|
|
|
|
|
|
|
typedef struct _ColorPanelPrivate ColorPanelPrivate;
|
|
|
|
|
|
|
|
struct _ColorPanelPrivate
|
|
|
|
{
|
|
|
|
GtkWidget *drawing_area;
|
1999-08-22 19:45:31 +08:00
|
|
|
GdkGC *gc;
|
1997-11-25 06:05:25 +08:00
|
|
|
|
1999-08-22 19:45:31 +08:00
|
|
|
gboolean button_down;
|
|
|
|
|
2000-02-14 07:42:19 +08:00
|
|
|
ColorNotebook *color_notebook;
|
|
|
|
gboolean color_notebook_active;
|
1997-11-25 06:05:25 +08:00
|
|
|
};
|
|
|
|
|
1999-08-22 19:45:31 +08:00
|
|
|
/* local function prototypes */
|
2000-04-03 23:40:30 +08:00
|
|
|
static void color_panel_free (ColorPanel *color_panel);
|
|
|
|
static void color_panel_draw (ColorPanel *color_panel);
|
|
|
|
static gint color_panel_events (GtkWidget *widget,
|
|
|
|
GdkEvent *event,
|
|
|
|
gpointer data);
|
|
|
|
static void color_panel_select_callback (gint r,
|
|
|
|
gint g,
|
|
|
|
gint b,
|
|
|
|
ColorNotebookState state,
|
|
|
|
gpointer data);
|
|
|
|
|
|
|
|
static void color_panel_drag_color (GtkWidget *widget,
|
|
|
|
guchar *r,
|
|
|
|
guchar *g,
|
|
|
|
guchar *b,
|
|
|
|
gpointer data);
|
|
|
|
static void color_panel_drop_color (GtkWidget *widget,
|
|
|
|
guchar r,
|
|
|
|
guchar g,
|
|
|
|
guchar b,
|
|
|
|
gpointer data);
|
1999-08-23 22:19:26 +08:00
|
|
|
|
|
|
|
/* dnd stuff */
|
1999-08-22 19:45:31 +08:00
|
|
|
static GtkTargetEntry color_panel_target_table[] =
|
|
|
|
{
|
|
|
|
GIMP_TARGET_COLOR
|
|
|
|
};
|
|
|
|
static guint n_color_panel_targets = (sizeof (color_panel_target_table) /
|
|
|
|
sizeof (color_panel_target_table[0]));
|
1997-11-25 06:05:25 +08:00
|
|
|
|
1999-08-23 22:19:26 +08:00
|
|
|
/* public functions */
|
|
|
|
|
1997-11-25 06:05:25 +08:00
|
|
|
ColorPanel *
|
1999-08-22 19:45:31 +08:00
|
|
|
color_panel_new (guchar *initial,
|
|
|
|
gint width,
|
|
|
|
gint height)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
|
|
|
ColorPanel *color_panel;
|
|
|
|
ColorPanelPrivate *private;
|
1999-08-22 19:45:31 +08:00
|
|
|
gint i;
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2000-06-23 08:14:07 +08:00
|
|
|
private = g_new0 (ColorPanelPrivate, 1);
|
1999-08-22 19:45:31 +08:00
|
|
|
private->color_notebook = NULL;
|
|
|
|
private->color_notebook_active = FALSE;
|
|
|
|
private->gc = NULL;
|
|
|
|
private->button_down = FALSE;
|
|
|
|
|
|
|
|
color_panel = g_new (ColorPanel, 1);
|
1997-11-25 06:05:25 +08:00
|
|
|
color_panel->private_part = private;
|
|
|
|
|
|
|
|
/* set the initial color */
|
|
|
|
for (i = 0; i < 3; i++)
|
|
|
|
color_panel->color[i] = (initial) ? initial[i] : 0;
|
|
|
|
|
|
|
|
color_panel->color_panel_widget = gtk_frame_new (NULL);
|
1999-08-22 19:45:31 +08:00
|
|
|
gtk_frame_set_shadow_type (GTK_FRAME (color_panel->color_panel_widget),
|
|
|
|
GTK_SHADOW_IN);
|
1997-11-25 06:05:25 +08:00
|
|
|
|
|
|
|
/* drawing area */
|
|
|
|
private->drawing_area = gtk_drawing_area_new ();
|
1999-08-22 19:45:31 +08:00
|
|
|
gtk_drawing_area_size (GTK_DRAWING_AREA (private->drawing_area),
|
|
|
|
width, height);
|
1997-11-25 06:05:25 +08:00
|
|
|
gtk_widget_set_events (private->drawing_area, EVENT_MASK);
|
|
|
|
gtk_signal_connect (GTK_OBJECT (private->drawing_area), "event",
|
|
|
|
(GtkSignalFunc) color_panel_events,
|
|
|
|
color_panel);
|
1999-08-22 19:45:31 +08:00
|
|
|
gtk_container_add (GTK_CONTAINER (color_panel->color_panel_widget),
|
|
|
|
private->drawing_area);
|
1997-11-25 06:05:25 +08:00
|
|
|
gtk_widget_show (private->drawing_area);
|
|
|
|
|
1999-08-22 19:45:31 +08:00
|
|
|
/* dnd stuff */
|
1999-08-23 22:19:26 +08:00
|
|
|
gtk_drag_source_set (private->drawing_area,
|
1999-11-03 17:58:46 +08:00
|
|
|
GDK_BUTTON1_MASK | GDK_BUTTON2_MASK,
|
1999-08-23 22:19:26 +08:00
|
|
|
color_panel_target_table, n_color_panel_targets,
|
|
|
|
GDK_ACTION_COPY | GDK_ACTION_MOVE);
|
|
|
|
gimp_dnd_color_source_set (private->drawing_area,
|
1999-08-24 08:36:57 +08:00
|
|
|
color_panel_drag_color, color_panel);
|
1999-08-23 22:19:26 +08:00
|
|
|
|
1999-08-22 19:45:31 +08:00
|
|
|
gtk_drag_dest_set (private->drawing_area,
|
|
|
|
GTK_DEST_DEFAULT_HIGHLIGHT |
|
|
|
|
GTK_DEST_DEFAULT_MOTION |
|
|
|
|
GTK_DEST_DEFAULT_DROP,
|
|
|
|
color_panel_target_table, n_color_panel_targets,
|
|
|
|
GDK_ACTION_COPY);
|
1999-08-23 22:19:26 +08:00
|
|
|
gimp_dnd_color_dest_set (private->drawing_area,
|
1999-08-24 08:36:57 +08:00
|
|
|
color_panel_drop_color, color_panel);
|
1999-08-22 19:45:31 +08:00
|
|
|
|
2000-04-03 23:40:30 +08:00
|
|
|
gtk_signal_connect_object (GTK_OBJECT (color_panel->color_panel_widget),
|
|
|
|
"destroy",
|
|
|
|
GTK_SIGNAL_FUNC (color_panel_free),
|
|
|
|
(GtkObject *) color_panel);
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2000-04-03 23:40:30 +08:00
|
|
|
return color_panel;
|
1997-11-25 06:05:25 +08:00
|
|
|
}
|
|
|
|
|
1999-08-24 10:52:40 +08:00
|
|
|
void
|
|
|
|
color_panel_set_color (ColorPanel *color_panel,
|
|
|
|
guchar *col)
|
|
|
|
{
|
|
|
|
ColorPanelPrivate *private = color_panel->private_part;
|
|
|
|
|
|
|
|
color_panel->color[0] = col[0];
|
|
|
|
color_panel->color[1] = col[1];
|
|
|
|
color_panel->color[2] = col[2];
|
|
|
|
|
|
|
|
if (private->color_notebook_active)
|
|
|
|
color_notebook_set_color (private->color_notebook,
|
|
|
|
col[0], col[1], col[2], TRUE);
|
|
|
|
|
|
|
|
if (private->gc)
|
|
|
|
color_panel_draw (color_panel);
|
|
|
|
}
|
|
|
|
|
1999-08-23 22:19:26 +08:00
|
|
|
/* private functions */
|
|
|
|
|
2000-04-03 23:40:30 +08:00
|
|
|
static void
|
|
|
|
color_panel_free (ColorPanel *color_panel)
|
|
|
|
{
|
|
|
|
ColorPanelPrivate *private;
|
|
|
|
|
|
|
|
private = (ColorPanelPrivate *) color_panel->private_part;
|
|
|
|
|
|
|
|
/* make sure we hide and free color_notebook */
|
|
|
|
if (private->color_notebook)
|
|
|
|
{
|
|
|
|
color_notebook_hide (private->color_notebook);
|
|
|
|
color_notebook_free (private->color_notebook);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (private->gc)
|
|
|
|
gdk_gc_destroy (private->gc);
|
|
|
|
|
|
|
|
g_free (color_panel->private_part);
|
|
|
|
g_free (color_panel);
|
|
|
|
}
|
|
|
|
|
1997-11-25 06:05:25 +08:00
|
|
|
static void
|
|
|
|
color_panel_draw (ColorPanel *color_panel)
|
|
|
|
{
|
|
|
|
GtkWidget *widget;
|
|
|
|
ColorPanelPrivate *private;
|
|
|
|
GdkColor fg;
|
|
|
|
|
|
|
|
private = (ColorPanelPrivate *) color_panel->private_part;
|
|
|
|
widget = private->drawing_area;
|
|
|
|
|
1999-08-28 05:06:00 +08:00
|
|
|
fg.pixel = get_color (color_panel->color[0],
|
|
|
|
color_panel->color[1],
|
|
|
|
color_panel->color[2]);
|
1997-11-25 06:05:25 +08:00
|
|
|
|
|
|
|
gdk_gc_set_foreground (private->gc, &fg);
|
|
|
|
gdk_draw_rectangle (widget->window, private->gc, 1, 0, 0,
|
|
|
|
widget->allocation.width, widget->allocation.height);
|
|
|
|
}
|
|
|
|
|
|
|
|
static gint
|
|
|
|
color_panel_events (GtkWidget *widget,
|
2000-04-03 23:40:30 +08:00
|
|
|
GdkEvent *event,
|
|
|
|
gpointer data)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
|
|
|
GdkEventButton *bevent;
|
|
|
|
ColorPanel *color_panel;
|
|
|
|
ColorPanelPrivate *private;
|
|
|
|
|
2000-04-03 23:40:30 +08:00
|
|
|
color_panel = (ColorPanel *) data;
|
1997-11-25 06:05:25 +08:00
|
|
|
private = (ColorPanelPrivate *) color_panel->private_part;
|
|
|
|
|
|
|
|
switch (event->type)
|
|
|
|
{
|
|
|
|
case GDK_EXPOSE:
|
|
|
|
if (!private->gc)
|
|
|
|
private->gc = gdk_gc_new (widget->window);
|
|
|
|
|
|
|
|
color_panel_draw (color_panel);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case GDK_BUTTON_PRESS:
|
|
|
|
bevent = (GdkEventButton *) event;
|
|
|
|
|
|
|
|
if (bevent->button == 1)
|
1999-08-22 19:45:31 +08:00
|
|
|
private->button_down = TRUE;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case GDK_BUTTON_RELEASE:
|
|
|
|
bevent = (GdkEventButton *) event;
|
|
|
|
|
|
|
|
if (bevent->button == 1 &&
|
|
|
|
private->button_down)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
Bit of a large checkin this - it's basically three things: 1 - GimpModules
Sun Jan 11 00:24:21 GMT 1999 Austin Donnelly <austin@greenend.org.uk>
Bit of a large checkin this - it's basically three things:
1 - GimpModules using gmodules to dynamically load and
initialise modules at gimp start of day.
2 - Color selectors now register themselves with a color
notebook.
3 - progress bars have been cleaned up a bit, so now have
progress indictations on all transform tool and gradient
fill operations. Not done bucket fill, but that seems to
be the next candidate.
New directories:
* modules/: new directory for dynamically loadable modules.
New files:
* modules/.cvsignore
* modules/Makefile.am
* modules/colorsel_gtk.c: GTK color selector wrapped up as a
color selector the gimp can use.
* app/gimpprogress.[ch]: progress bars within gimp core, either as
popups, or in the status bar. This is mainly code moved out
of plug-in.c
* app/color_notebook.[ch]: color selector notebook, implementing
very similar interface to color_select.h so it can be used as
a drop-in replacement for it.
* libgimp/color_selector.h: API color selectors need to implement
to become a page in the color_notebook.
* libgimp/gimpmodule.h: API gimp modules need to implement to be
initialised by gimp at start of day.
Modified files:
* Makefile.am: add modules/ to SUBDIRS
* libgimp/Makefile.am: install gimpmodule.h and color_selector.h
* app/gimprc.[ch]: recognise module-path variable.
* gimprc.in: set module-path variable to something sensible
(currently "${gimp_dir}/modules:${gimp_plugin_dir}/modules").
* app/Makefile.am: build color notebook and gimpprogress
* app/app_procs.c: register internal GIMP color selector with
color notebook.
* app/asupsample.c: call progress function less frequently for
better performance.
* app/asupsample.h: progress_func_t typedef moved to gimpprogress.h
* app/blend.c: make callbacks to a progress function
* app/color_area.c: use a color notebook rather than a color selector
* app/color_panel.c: ditto
* app/color_select.c: export color selector interface for notebook
* app/color_select.h: color_select_init() prototype
* app/flip_tool.c: flip the image every time, rather than every
second click.
* app/interface.c: move progress bar stuff out to
gimpprogress.c. Make the code actually work while we're at it.
* app/interface.h: move prototypes for progress functions out to
gimpprogress.h
* app/plug_in.c: load and initialise modules (if possible). Move
progress bar handling code out to gimpprogress.c
* app/plug_in.h: keep only a gimp_progress * for each plugin, not
a whole bunch of GtkWidgets.
* app/scale_tool.c
* app/rotate_tool.c
* app/shear_tool.c
* app/perspective_tool.c: progress bar during operation.
De-sensitise the dialog to discourage the user from running
two transforms in parallel.
* app/transform_core.c: recalculate grid coords when bounding box
changes. Only initialise the action area of the dialog once,
to avoid multiple "ok" / "reset" buttons appearing. Undraw
transform tool with correct matrix to get rid of handle
remains on screen. Call a progress function as we apply the
transform matrix. A few new i18n markups. Invalidate
floating selection marching ants after applying matrix.
* app/transform_core.h: transform_core_do() takes an optional
progress callback argument (and data).
* plug-ins/oilify/oilify.c: send progress bar updates after every
pixel region, not only if they processed a multiple of 5
pixels (which was quite unlikely, and therefore gave a jerky
progress indication).
1999-01-11 08:57:33 +08:00
|
|
|
if (! private->color_notebook)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
1999-08-22 19:45:31 +08:00
|
|
|
private->color_notebook =
|
|
|
|
color_notebook_new (color_panel->color[0],
|
|
|
|
color_panel->color[1],
|
|
|
|
color_panel->color[2],
|
|
|
|
color_panel_select_callback,
|
|
|
|
color_panel,
|
|
|
|
FALSE);
|
|
|
|
private->color_notebook_active = TRUE;
|
1997-11-25 06:05:25 +08:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
Bit of a large checkin this - it's basically three things: 1 - GimpModules
Sun Jan 11 00:24:21 GMT 1999 Austin Donnelly <austin@greenend.org.uk>
Bit of a large checkin this - it's basically three things:
1 - GimpModules using gmodules to dynamically load and
initialise modules at gimp start of day.
2 - Color selectors now register themselves with a color
notebook.
3 - progress bars have been cleaned up a bit, so now have
progress indictations on all transform tool and gradient
fill operations. Not done bucket fill, but that seems to
be the next candidate.
New directories:
* modules/: new directory for dynamically loadable modules.
New files:
* modules/.cvsignore
* modules/Makefile.am
* modules/colorsel_gtk.c: GTK color selector wrapped up as a
color selector the gimp can use.
* app/gimpprogress.[ch]: progress bars within gimp core, either as
popups, or in the status bar. This is mainly code moved out
of plug-in.c
* app/color_notebook.[ch]: color selector notebook, implementing
very similar interface to color_select.h so it can be used as
a drop-in replacement for it.
* libgimp/color_selector.h: API color selectors need to implement
to become a page in the color_notebook.
* libgimp/gimpmodule.h: API gimp modules need to implement to be
initialised by gimp at start of day.
Modified files:
* Makefile.am: add modules/ to SUBDIRS
* libgimp/Makefile.am: install gimpmodule.h and color_selector.h
* app/gimprc.[ch]: recognise module-path variable.
* gimprc.in: set module-path variable to something sensible
(currently "${gimp_dir}/modules:${gimp_plugin_dir}/modules").
* app/Makefile.am: build color notebook and gimpprogress
* app/app_procs.c: register internal GIMP color selector with
color notebook.
* app/asupsample.c: call progress function less frequently for
better performance.
* app/asupsample.h: progress_func_t typedef moved to gimpprogress.h
* app/blend.c: make callbacks to a progress function
* app/color_area.c: use a color notebook rather than a color selector
* app/color_panel.c: ditto
* app/color_select.c: export color selector interface for notebook
* app/color_select.h: color_select_init() prototype
* app/flip_tool.c: flip the image every time, rather than every
second click.
* app/interface.c: move progress bar stuff out to
gimpprogress.c. Make the code actually work while we're at it.
* app/interface.h: move prototypes for progress functions out to
gimpprogress.h
* app/plug_in.c: load and initialise modules (if possible). Move
progress bar handling code out to gimpprogress.c
* app/plug_in.h: keep only a gimp_progress * for each plugin, not
a whole bunch of GtkWidgets.
* app/scale_tool.c
* app/rotate_tool.c
* app/shear_tool.c
* app/perspective_tool.c: progress bar during operation.
De-sensitise the dialog to discourage the user from running
two transforms in parallel.
* app/transform_core.c: recalculate grid coords when bounding box
changes. Only initialise the action area of the dialog once,
to avoid multiple "ok" / "reset" buttons appearing. Undraw
transform tool with correct matrix to get rid of handle
remains on screen. Call a progress function as we apply the
transform matrix. A few new i18n markups. Invalidate
floating selection marching ants after applying matrix.
* app/transform_core.h: transform_core_do() takes an optional
progress callback argument (and data).
* plug-ins/oilify/oilify.c: send progress bar updates after every
pixel region, not only if they processed a multiple of 5
pixels (which was quite unlikely, and therefore gave a jerky
progress indication).
1999-01-11 08:57:33 +08:00
|
|
|
if (! private->color_notebook_active)
|
1999-08-22 19:45:31 +08:00
|
|
|
{
|
|
|
|
color_notebook_show (private->color_notebook);
|
|
|
|
private->color_notebook_active = TRUE;
|
|
|
|
}
|
Bit of a large checkin this - it's basically three things: 1 - GimpModules
Sun Jan 11 00:24:21 GMT 1999 Austin Donnelly <austin@greenend.org.uk>
Bit of a large checkin this - it's basically three things:
1 - GimpModules using gmodules to dynamically load and
initialise modules at gimp start of day.
2 - Color selectors now register themselves with a color
notebook.
3 - progress bars have been cleaned up a bit, so now have
progress indictations on all transform tool and gradient
fill operations. Not done bucket fill, but that seems to
be the next candidate.
New directories:
* modules/: new directory for dynamically loadable modules.
New files:
* modules/.cvsignore
* modules/Makefile.am
* modules/colorsel_gtk.c: GTK color selector wrapped up as a
color selector the gimp can use.
* app/gimpprogress.[ch]: progress bars within gimp core, either as
popups, or in the status bar. This is mainly code moved out
of plug-in.c
* app/color_notebook.[ch]: color selector notebook, implementing
very similar interface to color_select.h so it can be used as
a drop-in replacement for it.
* libgimp/color_selector.h: API color selectors need to implement
to become a page in the color_notebook.
* libgimp/gimpmodule.h: API gimp modules need to implement to be
initialised by gimp at start of day.
Modified files:
* Makefile.am: add modules/ to SUBDIRS
* libgimp/Makefile.am: install gimpmodule.h and color_selector.h
* app/gimprc.[ch]: recognise module-path variable.
* gimprc.in: set module-path variable to something sensible
(currently "${gimp_dir}/modules:${gimp_plugin_dir}/modules").
* app/Makefile.am: build color notebook and gimpprogress
* app/app_procs.c: register internal GIMP color selector with
color notebook.
* app/asupsample.c: call progress function less frequently for
better performance.
* app/asupsample.h: progress_func_t typedef moved to gimpprogress.h
* app/blend.c: make callbacks to a progress function
* app/color_area.c: use a color notebook rather than a color selector
* app/color_panel.c: ditto
* app/color_select.c: export color selector interface for notebook
* app/color_select.h: color_select_init() prototype
* app/flip_tool.c: flip the image every time, rather than every
second click.
* app/interface.c: move progress bar stuff out to
gimpprogress.c. Make the code actually work while we're at it.
* app/interface.h: move prototypes for progress functions out to
gimpprogress.h
* app/plug_in.c: load and initialise modules (if possible). Move
progress bar handling code out to gimpprogress.c
* app/plug_in.h: keep only a gimp_progress * for each plugin, not
a whole bunch of GtkWidgets.
* app/scale_tool.c
* app/rotate_tool.c
* app/shear_tool.c
* app/perspective_tool.c: progress bar during operation.
De-sensitise the dialog to discourage the user from running
two transforms in parallel.
* app/transform_core.c: recalculate grid coords when bounding box
changes. Only initialise the action area of the dialog once,
to avoid multiple "ok" / "reset" buttons appearing. Undraw
transform tool with correct matrix to get rid of handle
remains on screen. Call a progress function as we apply the
transform matrix. A few new i18n markups. Invalidate
floating selection marching ants after applying matrix.
* app/transform_core.h: transform_core_do() takes an optional
progress callback argument (and data).
* plug-ins/oilify/oilify.c: send progress bar updates after every
pixel region, not only if they processed a multiple of 5
pixels (which was quite unlikely, and therefore gave a jerky
progress indication).
1999-01-11 08:57:33 +08:00
|
|
|
color_notebook_set_color (private->color_notebook,
|
|
|
|
color_panel->color[0],
|
|
|
|
color_panel->color[1],
|
|
|
|
color_panel->color[2], 1);
|
1997-11-25 06:05:25 +08:00
|
|
|
}
|
1999-08-22 19:45:31 +08:00
|
|
|
private->button_down = FALSE;
|
1997-11-25 06:05:25 +08:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
1999-08-22 19:45:31 +08:00
|
|
|
case GDK_LEAVE_NOTIFY:
|
|
|
|
private->button_down = FALSE;
|
|
|
|
break;
|
|
|
|
|
1997-11-25 06:05:25 +08:00
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2000-04-03 23:40:30 +08:00
|
|
|
color_panel_select_callback (gint r,
|
|
|
|
gint g,
|
|
|
|
gint b,
|
|
|
|
ColorNotebookState state,
|
|
|
|
gpointer data)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
|
|
|
ColorPanel *color_panel;
|
|
|
|
ColorPanelPrivate *private;
|
|
|
|
|
2000-04-03 23:40:30 +08:00
|
|
|
color_panel = (ColorPanel *) data;
|
1997-11-25 06:05:25 +08:00
|
|
|
private = (ColorPanelPrivate *) color_panel->private_part;
|
|
|
|
|
Bit of a large checkin this - it's basically three things: 1 - GimpModules
Sun Jan 11 00:24:21 GMT 1999 Austin Donnelly <austin@greenend.org.uk>
Bit of a large checkin this - it's basically three things:
1 - GimpModules using gmodules to dynamically load and
initialise modules at gimp start of day.
2 - Color selectors now register themselves with a color
notebook.
3 - progress bars have been cleaned up a bit, so now have
progress indictations on all transform tool and gradient
fill operations. Not done bucket fill, but that seems to
be the next candidate.
New directories:
* modules/: new directory for dynamically loadable modules.
New files:
* modules/.cvsignore
* modules/Makefile.am
* modules/colorsel_gtk.c: GTK color selector wrapped up as a
color selector the gimp can use.
* app/gimpprogress.[ch]: progress bars within gimp core, either as
popups, or in the status bar. This is mainly code moved out
of plug-in.c
* app/color_notebook.[ch]: color selector notebook, implementing
very similar interface to color_select.h so it can be used as
a drop-in replacement for it.
* libgimp/color_selector.h: API color selectors need to implement
to become a page in the color_notebook.
* libgimp/gimpmodule.h: API gimp modules need to implement to be
initialised by gimp at start of day.
Modified files:
* Makefile.am: add modules/ to SUBDIRS
* libgimp/Makefile.am: install gimpmodule.h and color_selector.h
* app/gimprc.[ch]: recognise module-path variable.
* gimprc.in: set module-path variable to something sensible
(currently "${gimp_dir}/modules:${gimp_plugin_dir}/modules").
* app/Makefile.am: build color notebook and gimpprogress
* app/app_procs.c: register internal GIMP color selector with
color notebook.
* app/asupsample.c: call progress function less frequently for
better performance.
* app/asupsample.h: progress_func_t typedef moved to gimpprogress.h
* app/blend.c: make callbacks to a progress function
* app/color_area.c: use a color notebook rather than a color selector
* app/color_panel.c: ditto
* app/color_select.c: export color selector interface for notebook
* app/color_select.h: color_select_init() prototype
* app/flip_tool.c: flip the image every time, rather than every
second click.
* app/interface.c: move progress bar stuff out to
gimpprogress.c. Make the code actually work while we're at it.
* app/interface.h: move prototypes for progress functions out to
gimpprogress.h
* app/plug_in.c: load and initialise modules (if possible). Move
progress bar handling code out to gimpprogress.c
* app/plug_in.h: keep only a gimp_progress * for each plugin, not
a whole bunch of GtkWidgets.
* app/scale_tool.c
* app/rotate_tool.c
* app/shear_tool.c
* app/perspective_tool.c: progress bar during operation.
De-sensitise the dialog to discourage the user from running
two transforms in parallel.
* app/transform_core.c: recalculate grid coords when bounding box
changes. Only initialise the action area of the dialog once,
to avoid multiple "ok" / "reset" buttons appearing. Undraw
transform tool with correct matrix to get rid of handle
remains on screen. Call a progress function as we apply the
transform matrix. A few new i18n markups. Invalidate
floating selection marching ants after applying matrix.
* app/transform_core.h: transform_core_do() takes an optional
progress callback argument (and data).
* plug-ins/oilify/oilify.c: send progress bar updates after every
pixel region, not only if they processed a multiple of 5
pixels (which was quite unlikely, and therefore gave a jerky
progress indication).
1999-01-11 08:57:33 +08:00
|
|
|
if (private->color_notebook)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
1999-08-22 19:45:31 +08:00
|
|
|
switch (state)
|
|
|
|
{
|
|
|
|
case COLOR_NOTEBOOK_UPDATE:
|
|
|
|
break;
|
|
|
|
case COLOR_NOTEBOOK_OK:
|
|
|
|
color_panel->color[0] = r;
|
|
|
|
color_panel->color[1] = g;
|
|
|
|
color_panel->color[2] = b;
|
1997-11-25 06:05:25 +08:00
|
|
|
|
1999-08-22 19:45:31 +08:00
|
|
|
color_panel_draw (color_panel);
|
|
|
|
/* Fallthrough */
|
|
|
|
case COLOR_NOTEBOOK_CANCEL:
|
|
|
|
color_notebook_hide (private->color_notebook);
|
|
|
|
private->color_notebook_active = FALSE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
1999-08-24 08:36:57 +08:00
|
|
|
color_panel_drag_color (GtkWidget *widget,
|
|
|
|
guchar *r,
|
|
|
|
guchar *g,
|
|
|
|
guchar *b,
|
|
|
|
gpointer data)
|
1999-08-22 19:45:31 +08:00
|
|
|
{
|
2000-04-03 23:40:30 +08:00
|
|
|
ColorPanel *color_panel;
|
|
|
|
|
|
|
|
color_panel = (ColorPanel *) data;
|
1999-08-22 19:45:31 +08:00
|
|
|
|
1999-08-23 22:19:26 +08:00
|
|
|
*r = color_panel->color[0];
|
|
|
|
*g = color_panel->color[1];
|
|
|
|
*b = color_panel->color[2];
|
1999-08-22 19:45:31 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
1999-08-24 08:36:57 +08:00
|
|
|
color_panel_drop_color (GtkWidget *widget,
|
|
|
|
guchar r,
|
|
|
|
guchar g,
|
|
|
|
guchar b,
|
|
|
|
gpointer data)
|
1999-08-22 19:45:31 +08:00
|
|
|
{
|
2000-04-03 23:40:30 +08:00
|
|
|
ColorPanel *color_panel;
|
|
|
|
ColorPanelPrivate *private;
|
|
|
|
|
|
|
|
color_panel = (ColorPanel *) data;
|
|
|
|
private = (ColorPanelPrivate *) color_panel->private_part;
|
1999-08-22 19:45:31 +08:00
|
|
|
|
1999-08-23 22:19:26 +08:00
|
|
|
color_panel->color[0] = r;
|
|
|
|
color_panel->color[1] = g;
|
|
|
|
color_panel->color[2] = b;
|
1999-08-22 19:45:31 +08:00
|
|
|
|
|
|
|
if (private->color_notebook_active)
|
1999-08-23 22:19:26 +08:00
|
|
|
color_notebook_set_color (private->color_notebook, r, g, b, TRUE);
|
1999-08-22 19:45:31 +08:00
|
|
|
|
|
|
|
color_panel_draw (color_panel);
|
|
|
|
}
|