2001-11-09 03:14:51 +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
|
|
|
|
* 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 the new "paint-funcs/paint-funcs-types.h".
2001-11-28 Michael Natterer <mitch@gimp.org>
* app/base/base-types.h: include the new
"paint-funcs/paint-funcs-types.h".
* app/paint-funcs/Makefile.am
* app/paint-funcs/paint-funcs-types.h: new file. Includes
"base/base-types.h".
* app/paint-funcs/paint-funcs.[ch]: removed the enums here,
include "paint-funcs-types.h".
* app/widgets/widgets-types.h: include "display/display-types.h"
* app/display/display-types.h: include "widgets/widgets-types.h".
* app/tools/tools-types.h: include "display/display-types.h"
* app/gui/gui-types.h: include "tools/tools-types.h".
The order of namespaces/dependencies should be (but is not):
(base, paint-funcs) -> (core, file, xcf, pdb) ->
(widgets, display) -> tools -> gui
* app/path.c: include "tools/tools-types.h".
* app/core/Makefile.am
* app/core/gimpimage-guides.[ch]
* app/core/gimpimage-merge.[ch]
* app/core/gimpimage-resize.[ch]
* app/core/gimpimage-scale.[ch]: new files.
* app/core/gimpimage.[ch]: removed the stuff which is in the new
files. Reordered all functions in both the .h and .c files,
commented the groups of functions.
* app/core/gimpcontainer.c: create the handler_id using a counter,
not the address of a pointer, because the address *may* be the
same twice, added debugging output.
* app/core/gimpviewable.[ch]: added primitive support for getting
a preview GdkPixbuf.
* app/nav_window.c
* app/undo.c
* app/undo_history.c
* app/core/gimpimage-duplicate.c
* app/core/gimpimage-mask.[ch]
* app/display/gimpdisplay.c
* app/display/gimpdisplayshell-callbacks.c
* app/display/gimpdisplayshell-dnd.c
* app/display/gimpdisplayshell-render.c
* app/display/gimpdisplayshell-scale.c
* app/display/gimpdisplayshell-scroll.c
* app/gui/image-commands.c
* app/gui/info-window.c
* app/gui/layers-commands.c
* app/gui/palette-import-dialog.c
* app/tools/gimpbycolorselecttool.c
* app/tools/gimpeditselectiontool.c
* app/tools/gimpmeasuretool.c
* app/tools/gimpmovetool.c
* app/widgets/gimpcontainerview-utils.c
* app/xcf/xcf-load.c: changed accordingly, some cleanup.
* tools/pdbgen/pdb/guides.pdb
* tools/pdbgen/pdb/image.pdb: changed accordingly, reordered functions.
* app/plug_in.c: set the labels of the "Repeat" and "Re-Show" menu
items to the name of the last plug-in (Fixes #50986).
* app/display/gimpdisplayshell.[ch]: set the labels of "Undo" and
"Redo" to the resp. undo names. Much simplified the WM icon stuff
by removing most code and using gimp_viewable_get_new_preview_pixbuf().
* app/widgets/gimpbrushfactoryview.c: forgot to assign the GQuark
returned by gimp_container_add_handler().
* app/pdb/guides_cmds.c
* app/pdb/image_cmds.c
* libgimp/gimpimage_pdb.[ch]: regenerated.
2001-11-29 01:51:06 +08:00
|
|
|
#include "core/gimpcontainer.h"
|
2001-11-09 03:14:51 +08:00
|
|
|
#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 "gimpdisplay-foreach.h"
|
|
|
|
|
|
|
|
#include "undo.h"
|
|
|
|
|
|
|
|
#include "libgimp/gimpintl.h"
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
gimp_display_shell_drop_drawable (GtkWidget *widget,
|
|
|
|
GimpViewable *viewable,
|
|
|
|
gpointer data)
|
|
|
|
{
|
2001-12-13 07:48:18 +08:00
|
|
|
GimpDrawable *drawable;
|
|
|
|
GimpDisplay *gdisp;
|
|
|
|
GimpLayer *new_layer;
|
|
|
|
gint off_x, off_y;
|
2001-11-09 03:14:51 +08:00
|
|
|
|
|
|
|
gdisp = GIMP_DISPLAY_SHELL (data)->gdisp;
|
|
|
|
|
|
|
|
if (gdisp->gimage->gimp->busy)
|
|
|
|
return;
|
|
|
|
|
|
|
|
drawable = GIMP_DRAWABLE (viewable);
|
|
|
|
|
2002-02-24 01:29:19 +08:00
|
|
|
undo_push_group_start (gdisp->gimage, EDIT_PASTE_UNDO_GROUP);
|
2001-11-09 03:14:51 +08:00
|
|
|
|
2002-02-26 01:58:50 +08:00
|
|
|
new_layer = gimp_layer_new_from_drawable (drawable, gdisp->gimage);
|
2001-11-09 03:14:51 +08:00
|
|
|
|
2001-12-13 07:48:18 +08:00
|
|
|
off_x = (gdisp->gimage->width - gimp_drawable_width (drawable)) / 2;
|
|
|
|
off_y = (gdisp->gimage->height - gimp_drawable_height (drawable)) / 2;
|
2001-11-09 03:14:51 +08:00
|
|
|
|
2001-12-13 07:48:18 +08:00
|
|
|
gimp_layer_translate (new_layer, off_x, off_y);
|
2001-11-09 03:14:51 +08:00
|
|
|
|
2001-12-13 07:48:18 +08:00
|
|
|
gimp_image_add_layer (gdisp->gimage, new_layer, -1);
|
2001-11-09 03:14:51 +08:00
|
|
|
|
2001-12-13 07:48:18 +08:00
|
|
|
undo_push_group_end (gdisp->gimage);
|
2001-11-09 03:14:51 +08:00
|
|
|
|
2001-12-13 07:48:18 +08:00
|
|
|
gdisplays_flush ();
|
2001-11-09 03:14:51 +08:00
|
|
|
|
2001-12-13 07:48:18 +08:00
|
|
|
gimp_context_set_display (gimp_get_user_context (gdisp->gimage->gimp), gdisp);
|
2001-11-09 03:14:51 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2002-03-18 19:07:34 +08:00
|
|
|
gimp_display_shell_bucket_fill (GimpImage *gimage,
|
|
|
|
GimpBucketFillMode fill_mode,
|
|
|
|
const GimpRGB *color,
|
|
|
|
GimpPattern *pattern)
|
2001-11-09 03:14:51 +08:00
|
|
|
{
|
|
|
|
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 */
|
include the new "paint-funcs/paint-funcs-types.h".
2001-11-28 Michael Natterer <mitch@gimp.org>
* app/base/base-types.h: include the new
"paint-funcs/paint-funcs-types.h".
* app/paint-funcs/Makefile.am
* app/paint-funcs/paint-funcs-types.h: new file. Includes
"base/base-types.h".
* app/paint-funcs/paint-funcs.[ch]: removed the enums here,
include "paint-funcs-types.h".
* app/widgets/widgets-types.h: include "display/display-types.h"
* app/display/display-types.h: include "widgets/widgets-types.h".
* app/tools/tools-types.h: include "display/display-types.h"
* app/gui/gui-types.h: include "tools/tools-types.h".
The order of namespaces/dependencies should be (but is not):
(base, paint-funcs) -> (core, file, xcf, pdb) ->
(widgets, display) -> tools -> gui
* app/path.c: include "tools/tools-types.h".
* app/core/Makefile.am
* app/core/gimpimage-guides.[ch]
* app/core/gimpimage-merge.[ch]
* app/core/gimpimage-resize.[ch]
* app/core/gimpimage-scale.[ch]: new files.
* app/core/gimpimage.[ch]: removed the stuff which is in the new
files. Reordered all functions in both the .h and .c files,
commented the groups of functions.
* app/core/gimpcontainer.c: create the handler_id using a counter,
not the address of a pointer, because the address *may* be the
same twice, added debugging output.
* app/core/gimpviewable.[ch]: added primitive support for getting
a preview GdkPixbuf.
* app/nav_window.c
* app/undo.c
* app/undo_history.c
* app/core/gimpimage-duplicate.c
* app/core/gimpimage-mask.[ch]
* app/display/gimpdisplay.c
* app/display/gimpdisplayshell-callbacks.c
* app/display/gimpdisplayshell-dnd.c
* app/display/gimpdisplayshell-render.c
* app/display/gimpdisplayshell-scale.c
* app/display/gimpdisplayshell-scroll.c
* app/gui/image-commands.c
* app/gui/info-window.c
* app/gui/layers-commands.c
* app/gui/palette-import-dialog.c
* app/tools/gimpbycolorselecttool.c
* app/tools/gimpeditselectiontool.c
* app/tools/gimpmeasuretool.c
* app/tools/gimpmovetool.c
* app/widgets/gimpcontainerview-utils.c
* app/xcf/xcf-load.c: changed accordingly, some cleanup.
* tools/pdbgen/pdb/guides.pdb
* tools/pdbgen/pdb/image.pdb: changed accordingly, reordered functions.
* app/plug_in.c: set the labels of the "Repeat" and "Re-Show" menu
items to the name of the last plug-in (Fixes #50986).
* app/display/gimpdisplayshell.[ch]: set the labels of "Undo" and
"Redo" to the resp. undo names. Much simplified the WM icon stuff
by removing most code and using gimp_viewable_get_new_preview_pixbuf().
* app/widgets/gimpbrushfactoryview.c: forgot to assign the GQuark
returned by gimp_container_add_handler().
* app/pdb/guides_cmds.c
* app/pdb/image_cmds.c
* libgimp/gimpimage_pdb.[ch]: regenerated.
2001-11-29 01:51:06 +08:00
|
|
|
tool_info = (GimpToolInfo *)
|
|
|
|
gimp_container_get_child_by_name (gimage->gimp->tool_info_list,
|
|
|
|
"gimp:bucket_fill_tool");
|
2001-11-09 03:14:51 +08:00
|
|
|
|
|
|
|
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),
|
2001-11-16 07:15:52 +08:00
|
|
|
gimp_context_get_opacity (context),
|
2001-11-09 03:14:51 +08:00
|
|
|
FALSE /* no seed fill */,
|
2002-02-10 23:18:08 +08:00
|
|
|
FALSE, 0.0, FALSE, 0.0, 0.0 /* fill params */);
|
2001-11-09 03:14:51 +08:00
|
|
|
|
|
|
|
gdisplays_flush ();
|
|
|
|
}
|
|
|
|
|
|
|
|
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,
|
2002-03-18 19:07:34 +08:00
|
|
|
GIMP_PATTERN_BUCKET_FILL,
|
2001-11-09 03:14:51 +08:00
|
|
|
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,
|
2002-03-18 19:07:34 +08:00
|
|
|
GIMP_FG_BUCKET_FILL,
|
2001-11-09 03:14:51 +08:00
|
|
|
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),
|
2001-12-13 07:48:18 +08:00
|
|
|
buffer,
|
2001-11-09 03:14:51 +08:00
|
|
|
FALSE);
|
|
|
|
|
|
|
|
gdisplays_flush ();
|
|
|
|
}
|