1998-03-09 09:45:26 +08:00
|
|
|
/* The GIMP -- an image manipulation program
|
1997-11-25 06:05:25 +08:00
|
|
|
* 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
|
|
|
*/
|
2000-02-22 23:14:54 +08:00
|
|
|
|
2000-12-17 05:37:03 +08:00
|
|
|
#include "config.h"
|
|
|
|
|
|
|
|
#include <gtk/gtk.h>
|
|
|
|
|
2002-06-08 20:15:11 +08:00
|
|
|
#include "libgimpwidgets/gimpwidgets.h"
|
2001-01-24 07:56:18 +08:00
|
|
|
|
2002-03-15 01:07:02 +08:00
|
|
|
#include "widgets-types.h"
|
2000-12-17 05:37:03 +08:00
|
|
|
|
2002-05-11 07:30:09 +08:00
|
|
|
#ifdef __GNUC__
|
2002-05-03 20:45:22 +08:00
|
|
|
#warning FIXME #include "gui/gui-types.h"
|
2002-05-11 07:30:09 +08:00
|
|
|
#endif
|
2002-05-03 20:45:22 +08:00
|
|
|
#include "gui/gui-types.h"
|
|
|
|
|
2001-07-07 20:17:23 +08:00
|
|
|
#include "core/gimp.h"
|
2001-05-09 10:32:03 +08:00
|
|
|
#include "core/gimpcontext.h"
|
|
|
|
|
2003-05-16 19:53:50 +08:00
|
|
|
#include "gimpdialogfactory.h"
|
2004-05-27 20:41:22 +08:00
|
|
|
#include "gimpfgbgeditor.h"
|
2002-03-15 01:07:02 +08:00
|
|
|
#include "gimptoolbox.h"
|
|
|
|
#include "gimptoolbox-color-area.h"
|
2001-05-09 03:29:15 +08:00
|
|
|
|
2002-03-15 01:07:02 +08:00
|
|
|
#include "gui/color-notebook.h"
|
2001-07-07 20:17:23 +08:00
|
|
|
|
2003-03-26 00:38:19 +08:00
|
|
|
#include "gimp-intl.h"
|
2001-01-21 21:41:07 +08:00
|
|
|
|
|
|
|
|
1999-08-22 19:45:31 +08:00
|
|
|
/* local function prototypes */
|
2001-10-29 19:47:11 +08:00
|
|
|
|
2004-05-27 20:41:22 +08:00
|
|
|
static void color_area_color_clicked (GimpFgBgEditor *editor,
|
|
|
|
GimpActiveColor active_color,
|
2003-10-13 20:42:52 +08:00
|
|
|
GimpContext *context);
|
2002-06-08 20:15:11 +08:00
|
|
|
static void color_area_select_callback (ColorNotebook *color_notebook,
|
2001-10-29 19:47:11 +08:00
|
|
|
const GimpRGB *color,
|
|
|
|
ColorNotebookState state,
|
|
|
|
gpointer data);
|
|
|
|
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2004-05-27 20:41:22 +08:00
|
|
|
/* local variables */
|
|
|
|
|
|
|
|
static GtkWidget *color_area = NULL;
|
|
|
|
static ColorNotebook *color_notebook = NULL;
|
|
|
|
static gboolean color_notebook_active = FALSE;
|
|
|
|
static GimpActiveColor edit_color;
|
|
|
|
static GimpRGB revert_fg;
|
|
|
|
static GimpRGB revert_bg;
|
1999-08-22 19:45:31 +08:00
|
|
|
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2001-10-29 19:47:11 +08:00
|
|
|
/* public functions */
|
|
|
|
|
|
|
|
GtkWidget *
|
2002-03-15 01:07:02 +08:00
|
|
|
gimp_toolbox_color_area_create (GimpToolbox *toolbox,
|
|
|
|
gint width,
|
2002-06-08 20:15:11 +08:00
|
|
|
gint height)
|
2001-10-29 19:47:11 +08:00
|
|
|
{
|
2002-03-15 01:07:02 +08:00
|
|
|
GimpContext *context;
|
|
|
|
|
|
|
|
g_return_val_if_fail (GIMP_IS_TOOLBOX (toolbox), NULL);
|
|
|
|
|
|
|
|
context = GIMP_DOCK (toolbox)->context;
|
2001-10-29 19:47:11 +08:00
|
|
|
|
2004-05-27 20:41:22 +08:00
|
|
|
color_area = gimp_fg_bg_editor_new (context);
|
2001-12-29 21:26:29 +08:00
|
|
|
gtk_widget_set_size_request (color_area, width, height);
|
2004-05-27 20:41:22 +08:00
|
|
|
gtk_widget_add_events (color_area,
|
2002-06-08 20:15:11 +08:00
|
|
|
GDK_ENTER_NOTIFY_MASK |
|
2001-10-29 19:47:11 +08:00
|
|
|
GDK_LEAVE_NOTIFY_MASK);
|
|
|
|
|
2004-05-27 20:41:22 +08:00
|
|
|
g_signal_connect (color_area, "color-clicked",
|
|
|
|
G_CALLBACK (color_area_color_clicked),
|
2003-10-13 20:42:52 +08:00
|
|
|
context);
|
2001-10-29 19:47:11 +08:00
|
|
|
|
|
|
|
return color_area;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* private functions */
|
|
|
|
|
1997-11-25 06:05:25 +08:00
|
|
|
static void
|
2001-01-21 21:41:07 +08:00
|
|
|
color_area_select_callback (ColorNotebook *color_notebook,
|
|
|
|
const GimpRGB *color,
|
1999-08-22 19:45:31 +08:00
|
|
|
ColorNotebookState state,
|
2001-10-29 19:47:11 +08:00
|
|
|
gpointer data)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
2003-10-13 20:42:52 +08:00
|
|
|
GimpContext *context = GIMP_CONTEXT (data);
|
2001-10-29 19:47:11 +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 (color_notebook)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
1999-08-22 19:45:31 +08:00
|
|
|
switch (state)
|
|
|
|
{
|
|
|
|
case COLOR_NOTEBOOK_OK:
|
|
|
|
color_notebook_hide (color_notebook);
|
|
|
|
color_notebook_active = FALSE;
|
|
|
|
/* Fallthrough */
|
2003-10-13 20:42:52 +08:00
|
|
|
|
1999-08-22 19:45:31 +08:00
|
|
|
case COLOR_NOTEBOOK_UPDATE:
|
2004-05-27 20:41:22 +08:00
|
|
|
if (edit_color == GIMP_ACTIVE_COLOR_FOREGROUND)
|
2001-10-29 19:47:11 +08:00
|
|
|
gimp_context_set_foreground (context, color);
|
1999-08-22 19:45:31 +08:00
|
|
|
else
|
2001-10-29 19:47:11 +08:00
|
|
|
gimp_context_set_background (context, color);
|
1999-08-22 19:45:31 +08:00
|
|
|
break;
|
2003-10-13 20:42:52 +08:00
|
|
|
|
1999-08-22 19:45:31 +08:00
|
|
|
case COLOR_NOTEBOOK_CANCEL:
|
|
|
|
color_notebook_hide (color_notebook);
|
|
|
|
color_notebook_active = FALSE;
|
2001-10-29 19:47:11 +08:00
|
|
|
gimp_context_set_foreground (context, &revert_fg);
|
|
|
|
gimp_context_set_background (context, &revert_bg);
|
2003-10-13 20:42:52 +08:00
|
|
|
break;
|
1999-08-22 19:45:31 +08:00
|
|
|
}
|
1997-11-25 06:05:25 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2004-05-27 20:41:22 +08:00
|
|
|
color_area_color_clicked (GimpFgBgEditor *editor,
|
|
|
|
GimpActiveColor active_color,
|
|
|
|
GimpContext *context)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
2003-05-16 19:53:50 +08:00
|
|
|
GimpRGB color;
|
|
|
|
const gchar *title;
|
1999-10-27 02:27:27 +08:00
|
|
|
|
2001-01-15 09:48:53 +08:00
|
|
|
if (! color_notebook_active)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
2001-10-29 19:47:11 +08:00
|
|
|
gimp_context_get_foreground (context, &revert_fg);
|
|
|
|
gimp_context_get_background (context, &revert_bg);
|
1997-11-25 06:05:25 +08:00
|
|
|
}
|
1999-08-23 22:19:26 +08:00
|
|
|
|
2004-05-27 20:41:22 +08:00
|
|
|
if (active_color == GIMP_ACTIVE_COLOR_FOREGROUND)
|
|
|
|
{
|
|
|
|
gimp_context_get_foreground (context, &color);
|
|
|
|
title = _("Change Foreground Color");
|
|
|
|
}
|
1997-11-25 06:05:25 +08:00
|
|
|
else
|
2004-05-27 20:41:22 +08:00
|
|
|
{
|
|
|
|
gimp_context_get_background (context, &color);
|
|
|
|
title = _("Change Background Color");
|
|
|
|
}
|
1999-10-27 02:27:27 +08:00
|
|
|
|
1999-08-23 22:19:26 +08:00
|
|
|
edit_color = active_color;
|
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 (! color_notebook)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
2003-05-29 01:23:54 +08:00
|
|
|
GimpDialogFactory *toplevel_factory;
|
|
|
|
|
|
|
|
toplevel_factory = gimp_dialog_factory_from_name ("toplevel");
|
|
|
|
|
2003-11-11 01:55:44 +08:00
|
|
|
color_notebook = color_notebook_new (NULL, title, NULL, NULL,
|
2004-05-27 20:41:22 +08:00
|
|
|
GTK_WIDGET (editor),
|
2003-05-29 01:23:54 +08:00
|
|
|
toplevel_factory,
|
2003-05-16 19:53:50 +08:00
|
|
|
"gimp-toolbox-color-dialog",
|
2001-01-21 21:41:07 +08:00
|
|
|
(const GimpRGB *) &color,
|
2001-01-08 05:07:14 +08:00
|
|
|
color_area_select_callback,
|
2001-10-29 19:47:11 +08:00
|
|
|
context, TRUE, FALSE);
|
1999-08-22 19:45:31 +08:00
|
|
|
color_notebook_active = TRUE;
|
1997-11-25 06:05:25 +08:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2003-05-16 19:53:50 +08:00
|
|
|
color_notebook_set_title (color_notebook, title);
|
2002-09-08 17:26:45 +08:00
|
|
|
color_notebook_set_color (color_notebook, &color);
|
|
|
|
|
2003-10-13 20:42:52 +08:00
|
|
|
color_notebook_show (color_notebook);
|
|
|
|
color_notebook_active = TRUE;
|
1997-11-25 06:05:25 +08:00
|
|
|
}
|
|
|
|
}
|