mirror of
https://gitlab.gnome.org/GNOME/gimp
synced 2024-10-20 19:43:01 +00:00
d8be79f036
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).
207 lines
5.5 KiB
C
207 lines
5.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.
|
|
*/
|
|
#include <math.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include "appenv.h"
|
|
#include "color_panel.h"
|
|
#include "color_notebook.h"
|
|
#include "colormaps.h"
|
|
|
|
#define EVENT_MASK GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK
|
|
|
|
typedef struct _ColorPanelPrivate ColorPanelPrivate;
|
|
|
|
struct _ColorPanelPrivate
|
|
{
|
|
GtkWidget *drawing_area;
|
|
GdkGC *gc;
|
|
|
|
ColorNotebookP color_notebook;
|
|
int color_notebook_active;
|
|
};
|
|
|
|
static void color_panel_draw (ColorPanel *);
|
|
static gint color_panel_events (GtkWidget *area, GdkEvent *event);
|
|
static void color_panel_select_callback (int, int, int, ColorNotebookState, void *);
|
|
|
|
|
|
ColorPanel *
|
|
color_panel_new (unsigned char *initial,
|
|
int width,
|
|
int height)
|
|
{
|
|
ColorPanel *color_panel;
|
|
ColorPanelPrivate *private;
|
|
int i;
|
|
|
|
color_panel = g_new (ColorPanel, 1);
|
|
private = g_new (ColorPanelPrivate, 1);
|
|
private->color_notebook = NULL;
|
|
private->color_notebook_active = 0;
|
|
private->gc = NULL;
|
|
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);
|
|
gtk_frame_set_shadow_type (GTK_FRAME (color_panel->color_panel_widget), GTK_SHADOW_IN);
|
|
|
|
/* drawing area */
|
|
private->drawing_area = gtk_drawing_area_new ();
|
|
gtk_drawing_area_size (GTK_DRAWING_AREA (private->drawing_area), width, height);
|
|
gtk_widget_set_events (private->drawing_area, EVENT_MASK);
|
|
gtk_signal_connect (GTK_OBJECT (private->drawing_area), "event",
|
|
(GtkSignalFunc) color_panel_events,
|
|
color_panel);
|
|
gtk_object_set_user_data (GTK_OBJECT (private->drawing_area), color_panel);
|
|
gtk_container_add (GTK_CONTAINER (color_panel->color_panel_widget), private->drawing_area);
|
|
gtk_widget_show (private->drawing_area);
|
|
|
|
return color_panel;
|
|
}
|
|
|
|
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);
|
|
}
|
|
|
|
static void
|
|
color_panel_draw (ColorPanel *color_panel)
|
|
{
|
|
GtkWidget *widget;
|
|
ColorPanelPrivate *private;
|
|
GdkColor fg;
|
|
|
|
private = (ColorPanelPrivate *) color_panel->private_part;
|
|
widget = private->drawing_area;
|
|
|
|
fg.pixel = old_color_pixel;
|
|
store_color (&fg.pixel,
|
|
color_panel->color[0],
|
|
color_panel->color[1],
|
|
color_panel->color[2]);
|
|
|
|
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,
|
|
GdkEvent *event)
|
|
{
|
|
GdkEventButton *bevent;
|
|
ColorPanel *color_panel;
|
|
ColorPanelPrivate *private;
|
|
|
|
color_panel = (ColorPanel *) gtk_object_get_user_data (GTK_OBJECT (widget));
|
|
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)
|
|
{
|
|
if (! private->color_notebook)
|
|
{
|
|
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 = 1;
|
|
}
|
|
else
|
|
{
|
|
if (! private->color_notebook_active)
|
|
color_notebook_show (private->color_notebook);
|
|
color_notebook_set_color (private->color_notebook,
|
|
color_panel->color[0],
|
|
color_panel->color[1],
|
|
color_panel->color[2], 1);
|
|
}
|
|
}
|
|
break;
|
|
|
|
default:
|
|
break;
|
|
}
|
|
|
|
return FALSE;
|
|
}
|
|
|
|
static void
|
|
color_panel_select_callback (int r,
|
|
int g,
|
|
int b,
|
|
ColorNotebookState state,
|
|
void *client_data)
|
|
{
|
|
ColorPanel *color_panel;
|
|
ColorPanelPrivate *private;
|
|
|
|
color_panel = (ColorPanel *) client_data;
|
|
private = (ColorPanelPrivate *) color_panel->private_part;
|
|
|
|
if (private->color_notebook)
|
|
{
|
|
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;
|
|
|
|
color_panel_draw (color_panel);
|
|
/* Fallthrough */
|
|
case COLOR_NOTEBOOK_CANCEL:
|
|
color_notebook_hide (private->color_notebook);
|
|
private->color_notebook_active = 0;
|
|
}
|
|
}
|
|
}
|