
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.
181 lines
5.0 KiB
C
181 lines
5.0 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/gimp.h"
|
|
#include "core/gimpbuffer.h"
|
|
#include "core/gimpcontainer.h"
|
|
#include "core/gimpcontext.h"
|
|
#include "core/gimpdrawable.h"
|
|
#include "core/gimpdrawable-bucket-fill.h"
|
|
#include "core/gimpedit.h"
|
|
#include "core/gimpimage.h"
|
|
#include "core/gimplayer.h"
|
|
#include "core/gimppattern.h"
|
|
#include "core/gimptoolinfo.h"
|
|
|
|
#include "gimpdisplay.h"
|
|
#include "gimpdisplayshell.h"
|
|
#include "gimpdisplayshell-dnd.h"
|
|
|
|
#include "undo.h"
|
|
|
|
#include "libgimp/gimpintl.h"
|
|
|
|
|
|
void
|
|
gimp_display_shell_drop_drawable (GtkWidget *widget,
|
|
GimpViewable *viewable,
|
|
gpointer data)
|
|
{
|
|
GimpDrawable *drawable;
|
|
GimpDisplay *gdisp;
|
|
GimpLayer *new_layer;
|
|
gint off_x, off_y;
|
|
|
|
gdisp = GIMP_DISPLAY_SHELL (data)->gdisp;
|
|
|
|
if (gdisp->gimage->gimp->busy)
|
|
return;
|
|
|
|
drawable = GIMP_DRAWABLE (viewable);
|
|
|
|
undo_push_group_start (gdisp->gimage, EDIT_PASTE_UNDO_GROUP);
|
|
|
|
new_layer = gimp_layer_new_from_drawable (drawable, gdisp->gimage);
|
|
|
|
off_x = (gdisp->gimage->width - gimp_drawable_width (drawable)) / 2;
|
|
off_y = (gdisp->gimage->height - gimp_drawable_height (drawable)) / 2;
|
|
|
|
gimp_layer_translate (new_layer, off_x, off_y);
|
|
|
|
gimp_image_add_layer (gdisp->gimage, new_layer, -1);
|
|
|
|
undo_push_group_end (gdisp->gimage);
|
|
|
|
gimp_image_flush (gdisp->gimage);
|
|
|
|
gimp_context_set_display (gimp_get_user_context (gdisp->gimage->gimp), gdisp);
|
|
}
|
|
|
|
static void
|
|
gimp_display_shell_bucket_fill (GimpImage *gimage,
|
|
GimpBucketFillMode fill_mode,
|
|
const GimpRGB *color,
|
|
GimpPattern *pattern)
|
|
{
|
|
GimpDrawable *drawable;
|
|
GimpToolInfo *tool_info;
|
|
GimpContext *context;
|
|
|
|
if (gimage->gimp->busy)
|
|
return;
|
|
|
|
drawable = gimp_image_active_drawable (gimage);
|
|
|
|
if (! drawable)
|
|
return;
|
|
|
|
/* Get the bucket fill context */
|
|
tool_info = (GimpToolInfo *)
|
|
gimp_container_get_child_by_name (gimage->gimp->tool_info_list,
|
|
"gimp-bucket-fill-tool");
|
|
|
|
if (tool_info && tool_info->context)
|
|
{
|
|
context = tool_info->context;
|
|
}
|
|
else
|
|
{
|
|
context = gimp_get_user_context (gimage->gimp);
|
|
}
|
|
|
|
gimp_drawable_bucket_fill_full (drawable,
|
|
fill_mode,
|
|
color, pattern,
|
|
gimp_context_get_paint_mode (context),
|
|
gimp_context_get_opacity (context),
|
|
FALSE /* no seed fill */,
|
|
FALSE, 0.0, FALSE, 0.0, 0.0 /* fill params */);
|
|
|
|
gimp_image_flush (gimage);
|
|
}
|
|
|
|
void
|
|
gimp_display_shell_drop_pattern (GtkWidget *widget,
|
|
GimpViewable *viewable,
|
|
gpointer data)
|
|
{
|
|
GimpDisplay *gdisp;
|
|
|
|
gdisp = GIMP_DISPLAY_SHELL (data)->gdisp;
|
|
|
|
if (GIMP_IS_PATTERN (viewable))
|
|
{
|
|
gimp_display_shell_bucket_fill (gdisp->gimage,
|
|
GIMP_PATTERN_BUCKET_FILL,
|
|
NULL,
|
|
GIMP_PATTERN (viewable));
|
|
}
|
|
}
|
|
|
|
void
|
|
gimp_display_shell_drop_color (GtkWidget *widget,
|
|
const GimpRGB *color,
|
|
gpointer data)
|
|
{
|
|
GimpDisplay *gdisp;
|
|
|
|
gdisp = GIMP_DISPLAY_SHELL (data)->gdisp;
|
|
|
|
gimp_display_shell_bucket_fill (gdisp->gimage,
|
|
GIMP_FG_BUCKET_FILL,
|
|
color,
|
|
NULL);
|
|
}
|
|
|
|
void
|
|
gimp_display_shell_drop_buffer (GtkWidget *widget,
|
|
GimpViewable *viewable,
|
|
gpointer data)
|
|
{
|
|
GimpBuffer *buffer;
|
|
GimpDisplay *gdisp;
|
|
|
|
gdisp = GIMP_DISPLAY_SHELL (data)->gdisp;
|
|
|
|
if (gdisp->gimage->gimp->busy)
|
|
return;
|
|
|
|
buffer = GIMP_BUFFER (viewable);
|
|
|
|
/* FIXME: popup a menu for selecting "Paste Into" */
|
|
|
|
gimp_edit_paste (gdisp->gimage,
|
|
gimp_image_active_drawable (gdisp->gimage),
|
|
buffer,
|
|
FALSE);
|
|
|
|
gimp_image_flush (gdisp->gimage);
|
|
}
|