a3bb0b0dad
2002-05-08 Michael Natterer <mitch@gimp.org> Started to get rid of the gdisplays_foo() functions in app/display/gimpdisplay-foreach.[ch]. Work in progress... * app/core/gimp.[ch]: added the display list to the Gimp object (as a GimpList of GimpObjects). This way we get more independent from whether there is GUI or not, as gimp->displays will simply be an empty list for the --no-interface case. * app/display/gimpdisplay.[ch]: Removed the global "display_list" and "display_num" variables. Use gimp->displays instead. * app/display/gimpdisplay-foreach.[ch]: renamed most functions from gdisplays_foo() to gimp_displays_foo() and pass them a Gimp pointer. * app/core/gimpimage.[ch]: added a "flush" signal. * app/display/gimpdisplay-handlers.c: connect to "flush" and call gimp_display_flush() in the callback. * tools/pdbgen/pdb/display.pdb: use gimp_displays_flush(gimp) here and only here. * app/pdb/display_cmds.c: regenerated. * app/app_procs.c * app/gui/gui.c * app/gui/preferences-dialog.c: s/gdislays_foo()/gimp_displays_foo(gimp)/ * app/image_map.c * app/undo_history.c * app/display/gimpdisplayshell-callbacks.c * app/display/gimpdisplayshell-dnd.c * app/display/gimpdisplayshell-layer-select.c * app/display/gimpdisplayshell-scale.c * app/gui/channels-commands.c * app/gui/colormap-editor-commands.c * app/gui/convert-dialog.c * app/gui/drawable-commands.c * app/gui/edit-commands.c * app/gui/file-commands.c * app/gui/image-commands.c * app/gui/layers-commands.c * app/gui/offset-dialog.c * app/gui/qmask-commands.c * app/gui/select-commands.c * app/gui/vectors-commands.c * app/paint/gimpairbrush.c * app/tools/gimpbezierselecttool.c * app/tools/gimpblendtool.c * app/tools/gimpbrightnesscontrasttool.c * app/tools/gimpbucketfilltool.c * app/tools/gimpbycolorselecttool.c * app/tools/gimpcolorbalancetool.c * app/tools/gimpcurvestool.c * app/tools/gimpeditselectiontool.c * app/tools/gimpfreeselecttool.c * app/tools/gimpfuzzyselecttool.c * app/tools/gimphuesaturationtool.c * app/tools/gimpinktool.c * app/tools/gimpiscissorstool.c * app/tools/gimplevelstool.c * app/tools/gimpmeasuretool.c * app/tools/gimpmovetool.c * app/tools/gimppainttool.c * app/tools/gimpposterizetool.c * app/tools/gimprectselecttool.c * app/tools/gimptexttool.c * app/tools/gimpthresholdtool.c * app/tools/gimptransformtool.c * app/tools/gimpvectortool.c * app/widgets/gimpbufferview.c * app/widgets/gimpchannellistview.c * app/widgets/gimpcomponentlistitem.c * app/widgets/gimpdocumentview.c * app/widgets/gimpdrawablelistitem.c * app/widgets/gimpdrawablelistview.c * app/widgets/gimpimageview.c * app/widgets/gimpitemlistitem.c * app/widgets/gimpitemlistview.c * app/widgets/gimplayerlistitem.c * app/widgets/gimplayerlistview.c * app/widgets/gimpvectorslistview.c: replaced gdisplays_flush() with calls to gimp_image_flush(gimage). Removed inclusion of "display/gimpdisplay-foreach.h" from most files.
173 lines
6.2 KiB
C
173 lines
6.2 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 "config.h"
|
|
|
|
#include <gtk/gtk.h>
|
|
|
|
#include "display-types.h"
|
|
|
|
#include "core/gimpimage.h"
|
|
|
|
#include "gimpdisplay.h"
|
|
#include "gimpdisplay-handlers.h"
|
|
|
|
|
|
/* local function prototypes */
|
|
|
|
static void gimp_display_update_handler (GimpImage *gimage,
|
|
gint x,
|
|
gint y,
|
|
gint w,
|
|
gint h,
|
|
GimpDisplay *gdisp);
|
|
static void gimp_display_mode_changed_handler (GimpImage *gimage,
|
|
GimpDisplay *gdisp);
|
|
static void gimp_display_colormap_changed_handler (GimpImage *gimage,
|
|
gint ncol,
|
|
GimpDisplay *gdisp);
|
|
static void gimp_display_size_changed_handler (GimpImage *gimage,
|
|
GimpDisplay *gdisp);
|
|
static void gimp_display_flush_handler (GimpImage *gimage,
|
|
GimpDisplay *gdisp);
|
|
|
|
|
|
/* public functions */
|
|
|
|
void
|
|
gimp_display_connect (GimpDisplay *gdisp,
|
|
GimpImage *gimage)
|
|
{
|
|
g_return_if_fail (GIMP_IS_DISPLAY (gdisp));
|
|
g_return_if_fail (GIMP_IS_IMAGE (gimage));
|
|
g_return_if_fail (gdisp->gimage == NULL);
|
|
|
|
gdisp->gimage = gimage;
|
|
gdisp->instance = gimage->instance_count;
|
|
|
|
gimage->instance_count++; /* this is obsolete */
|
|
gimage->disp_count++;
|
|
|
|
g_print ("%s: gimage->ref_count before refing: %d\n",
|
|
G_GNUC_FUNCTION, G_OBJECT (gdisp->gimage)->ref_count);
|
|
|
|
g_object_ref (G_OBJECT (gimage));
|
|
|
|
g_signal_connect (G_OBJECT (gimage), "update",
|
|
G_CALLBACK (gimp_display_update_handler),
|
|
gdisp);
|
|
g_signal_connect (G_OBJECT (gimage), "mode_changed",
|
|
G_CALLBACK (gimp_display_mode_changed_handler),
|
|
gdisp);
|
|
g_signal_connect (G_OBJECT (gimage), "colormap_changed",
|
|
G_CALLBACK (gimp_display_colormap_changed_handler),
|
|
gdisp);
|
|
g_signal_connect (G_OBJECT (gimage), "size_changed",
|
|
G_CALLBACK (gimp_display_size_changed_handler),
|
|
gdisp);
|
|
g_signal_connect (G_OBJECT (gimage), "flush",
|
|
G_CALLBACK (gimp_display_flush_handler),
|
|
gdisp);
|
|
}
|
|
|
|
void
|
|
gimp_display_disconnect (GimpDisplay *gdisp)
|
|
{
|
|
g_return_if_fail (GIMP_IS_DISPLAY (gdisp));
|
|
g_return_if_fail (GIMP_IS_IMAGE (gdisp->gimage));
|
|
|
|
g_signal_handlers_disconnect_by_func (G_OBJECT (gdisp->gimage),
|
|
gimp_display_flush_handler,
|
|
gdisp);
|
|
g_signal_handlers_disconnect_by_func (G_OBJECT (gdisp->gimage),
|
|
gimp_display_size_changed_handler,
|
|
gdisp);
|
|
g_signal_handlers_disconnect_by_func (G_OBJECT (gdisp->gimage),
|
|
gimp_display_colormap_changed_handler,
|
|
gdisp);
|
|
g_signal_handlers_disconnect_by_func (G_OBJECT (gdisp->gimage),
|
|
gimp_display_mode_changed_handler,
|
|
gdisp);
|
|
g_signal_handlers_disconnect_by_func (G_OBJECT (gdisp->gimage),
|
|
gimp_display_update_handler,
|
|
gdisp);
|
|
|
|
gdisp->gimage->disp_count--;
|
|
|
|
g_print ("%s: gimage->ref_count before unrefing: %d\n",
|
|
G_GNUC_FUNCTION, G_OBJECT (gdisp->gimage)->ref_count);
|
|
|
|
g_object_unref (G_OBJECT (gdisp->gimage));
|
|
gdisp->gimage = NULL;
|
|
}
|
|
|
|
|
|
/* private functions */
|
|
|
|
static void
|
|
gimp_display_update_handler (GimpImage *gimage,
|
|
gint x,
|
|
gint y,
|
|
gint w,
|
|
gint h,
|
|
GimpDisplay *gdisp)
|
|
{
|
|
gimp_display_add_update_area (gdisp, x, y, w, h);
|
|
}
|
|
|
|
static void
|
|
gimp_display_mode_changed_handler (GimpImage *gimage,
|
|
GimpDisplay *gdisp)
|
|
{
|
|
gimp_display_add_update_area (gdisp,
|
|
0, 0,
|
|
gdisp->gimage->width,
|
|
gdisp->gimage->height);
|
|
}
|
|
|
|
static void
|
|
gimp_display_colormap_changed_handler (GimpImage *gimage,
|
|
gint ncol,
|
|
GimpDisplay *gdisp)
|
|
{
|
|
if (gimp_image_base_type (gdisp->gimage) == GIMP_INDEXED)
|
|
{
|
|
gimp_display_add_update_area (gdisp,
|
|
0, 0,
|
|
gdisp->gimage->width,
|
|
gdisp->gimage->height);
|
|
}
|
|
}
|
|
|
|
static void
|
|
gimp_display_size_changed_handler (GimpImage *gimage,
|
|
GimpDisplay *gdisp)
|
|
{
|
|
gimp_display_add_update_area (gdisp,
|
|
0, 0,
|
|
gdisp->gimage->width,
|
|
gdisp->gimage->height);
|
|
}
|
|
|
|
static void
|
|
gimp_display_flush_handler (GimpImage *gimage,
|
|
GimpDisplay *gdisp)
|
|
{
|
|
gimp_display_flush (gdisp);
|
|
}
|