dec20d8214
2004-01-06 Michael Natterer <mitch@gimp.org> Enabled skipping enum values for either the PDB or GType registration (don't always skip both targets): * tools/gimp-mkenums: skip enum values only if there is a literal "skip" (don't match "pdb-skip"). * tools/pdbgen/enumgen.pl: skip only "pdb-skip" values, not "skip" ones. * app/base/base-enums.h * app/core/core-enums.h * app/paint/paint-enums.h * libgimpbase/gimpbaseenums.h: use the right "pdb-skip"/"skip" combination to skip enum values. Changed comments accordingly. Cleaned up the fill functions: * app/core/core-enums.[ch]: added GIMP_PATTERN_FILL enum value to the GimpFillType enum. Don't export GIMP_NO_FILL to the PDB because it's completely useless to export a NOP. * app/core/gimp-edit.c (gimp_edit_fill, gimp_edit_fill_internal): handle pattern fill requests. * app/core/gimpdrawable.[ch] (gimp_drawable_fill): added GimpPattern parameter and fill with it if it's non-NULL. (gimp_drawable_fill_by_type): handle pattern fill and pass the current pattern to gimp_drawable_fill(). * app/text/gimptextlayer.c: changed accordingly. * app/gui/edit-commands.c * app/gui/image-menu.c: use gimp_edit_fill() instead of gimp_drawable_bucket_fill() for FG, BG and pattern filling. * libgimp/gimpcompat.h * plug-ins/script-fu/siod-wrapper.c: removed NO_IMAGE_FILL compat enum value. It should have never been exported to the PDB. * app/pdb/drawable_cmds.c * app/pdb/edit_cmds.c * libgimp/gimpenums.h * plug-ins/pygimp/gimpenums.py * plug-ins/script-fu/script-fu-constants.c * tools/pdbgen/enums.pl: regenerated.
352 lines
8.1 KiB
C
352 lines
8.1 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 <string.h>
|
|
|
|
#include <gtk/gtk.h>
|
|
|
|
#include "libgimpwidgets/gimpwidgets.h"
|
|
|
|
#include "gui-types.h"
|
|
|
|
#include "core/gimp.h"
|
|
#include "core/gimp-edit.h"
|
|
#include "core/gimpbuffer.h"
|
|
#include "core/gimpcontainer.h"
|
|
#include "core/gimpcontext.h"
|
|
#include "core/gimpdrawable.h"
|
|
#include "core/gimpimage.h"
|
|
#include "core/gimpimage-undo.h"
|
|
#include "core/gimptoolinfo.h"
|
|
|
|
#include "display/gimpdisplay.h"
|
|
|
|
#include "widgets/gimphelp-ids.h"
|
|
#include "widgets/gimpdialogfactory.h"
|
|
|
|
#include "dialogs.h"
|
|
#include "edit-commands.h"
|
|
#include "stroke-dialog.h"
|
|
|
|
#include "gimp-intl.h"
|
|
|
|
|
|
#define return_if_no_display(gdisp,data) \
|
|
if (GIMP_IS_DISPLAY (data)) \
|
|
gdisp = data; \
|
|
else if (GIMP_IS_GIMP (data)) \
|
|
gdisp = gimp_context_get_display (gimp_get_user_context (GIMP (data))); \
|
|
else \
|
|
gdisp = NULL; \
|
|
if (! gdisp) \
|
|
return
|
|
|
|
#define return_if_no_image(gimage,data) \
|
|
if (GIMP_IS_DISPLAY (data)) \
|
|
gimage = ((GimpDisplay *) data)->gimage; \
|
|
else if (GIMP_IS_GIMP (data)) \
|
|
gimage = gimp_context_get_image (gimp_get_user_context (GIMP (data))); \
|
|
else \
|
|
gimage = NULL; \
|
|
if (! gimage) \
|
|
return
|
|
|
|
|
|
/* local function prototypes */
|
|
|
|
static void cut_named_buffer_callback (GtkWidget *widget,
|
|
const gchar *name,
|
|
gpointer data);
|
|
static void copy_named_buffer_callback (GtkWidget *widget,
|
|
const gchar *name,
|
|
gpointer data);
|
|
|
|
|
|
/* public functions */
|
|
|
|
void
|
|
edit_undo_cmd_callback (GtkWidget *widget,
|
|
gpointer data)
|
|
{
|
|
GimpImage *gimage;
|
|
return_if_no_image (gimage, data);
|
|
|
|
if (gimp_image_undo (gimage))
|
|
gimp_image_flush (gimage);
|
|
}
|
|
|
|
void
|
|
edit_redo_cmd_callback (GtkWidget *widget,
|
|
gpointer data)
|
|
{
|
|
GimpImage *gimage;
|
|
return_if_no_image (gimage, data);
|
|
|
|
if (gimp_image_redo (gimage))
|
|
gimp_image_flush (gimage);
|
|
}
|
|
|
|
void
|
|
edit_cut_cmd_callback (GtkWidget *widget,
|
|
gpointer data)
|
|
{
|
|
GimpDisplay *gdisp;
|
|
return_if_no_display (gdisp, data);
|
|
|
|
if (gimp_edit_cut (gdisp->gimage,
|
|
gimp_image_active_drawable (gdisp->gimage)))
|
|
{
|
|
gimp_image_flush (gdisp->gimage);
|
|
}
|
|
}
|
|
|
|
void
|
|
edit_copy_cmd_callback (GtkWidget *widget,
|
|
gpointer data)
|
|
{
|
|
GimpImage *gimage;
|
|
return_if_no_image (gimage, data);
|
|
|
|
if (gimp_edit_copy (gimage, gimp_image_active_drawable (gimage)))
|
|
{
|
|
gimp_image_flush (gimage);
|
|
}
|
|
}
|
|
|
|
void
|
|
edit_paste_cmd_callback (GtkWidget *widget,
|
|
gpointer data)
|
|
{
|
|
GimpDisplay *gdisp;
|
|
return_if_no_display (gdisp, data);
|
|
|
|
if (gdisp->gimage->gimp->global_buffer)
|
|
{
|
|
if (gimp_edit_paste (gdisp->gimage,
|
|
gimp_image_active_drawable (gdisp->gimage),
|
|
gdisp->gimage->gimp->global_buffer,
|
|
FALSE))
|
|
{
|
|
gimp_image_flush (gdisp->gimage);
|
|
}
|
|
}
|
|
}
|
|
|
|
void
|
|
edit_paste_into_cmd_callback (GtkWidget *widget,
|
|
gpointer data)
|
|
{
|
|
GimpDisplay *gdisp;
|
|
return_if_no_display (gdisp, data);
|
|
|
|
if (gdisp->gimage->gimp->global_buffer)
|
|
{
|
|
if (gimp_edit_paste (gdisp->gimage,
|
|
gimp_image_active_drawable (gdisp->gimage),
|
|
gdisp->gimage->gimp->global_buffer,
|
|
TRUE))
|
|
{
|
|
gimp_image_flush (gdisp->gimage);
|
|
}
|
|
}
|
|
}
|
|
|
|
void
|
|
edit_paste_as_new_cmd_callback (GtkWidget *widget,
|
|
gpointer data)
|
|
{
|
|
GimpDisplay *gdisp;
|
|
return_if_no_display (gdisp, data);
|
|
|
|
if (gdisp->gimage->gimp->global_buffer)
|
|
{
|
|
gimp_edit_paste_as_new (gdisp->gimage->gimp,
|
|
gdisp->gimage,
|
|
gdisp->gimage->gimp->global_buffer);
|
|
}
|
|
}
|
|
|
|
void
|
|
edit_named_cut_cmd_callback (GtkWidget *widget,
|
|
gpointer data)
|
|
{
|
|
GimpDisplay *gdisp;
|
|
GtkWidget *qbox;
|
|
return_if_no_display (gdisp, data);
|
|
|
|
qbox = gimp_query_string_box (_("Cut Named"),
|
|
gdisp->shell,
|
|
gimp_standard_help_func,
|
|
GIMP_HELP_BUFFER_CUT,
|
|
_("Enter a name for this buffer"),
|
|
NULL,
|
|
G_OBJECT (gdisp->gimage), "disconnect",
|
|
cut_named_buffer_callback, gdisp->gimage);
|
|
gtk_widget_show (qbox);
|
|
}
|
|
|
|
void
|
|
edit_named_copy_cmd_callback (GtkWidget *widget,
|
|
gpointer data)
|
|
{
|
|
GimpDisplay *gdisp;
|
|
GtkWidget *qbox;
|
|
return_if_no_display (gdisp, data);
|
|
|
|
qbox = gimp_query_string_box (_("Copy Named"),
|
|
gdisp->shell,
|
|
gimp_standard_help_func,
|
|
GIMP_HELP_BUFFER_COPY,
|
|
_("Enter a name for this buffer"),
|
|
NULL,
|
|
G_OBJECT (gdisp->gimage), "disconnect",
|
|
copy_named_buffer_callback, gdisp->gimage);
|
|
gtk_widget_show (qbox);
|
|
}
|
|
|
|
void
|
|
edit_named_paste_cmd_callback (GtkWidget *widget,
|
|
gpointer data)
|
|
{
|
|
gimp_dialog_factory_dialog_raise (global_dock_factory,
|
|
gtk_widget_get_screen (widget),
|
|
"gimp-buffer-list|gimp-buffer-grid", -1);
|
|
}
|
|
|
|
void
|
|
edit_clear_cmd_callback (GtkWidget *widget,
|
|
gpointer data)
|
|
{
|
|
GimpImage *gimage;
|
|
return_if_no_image (gimage, data);
|
|
|
|
gimp_edit_clear (gimage, gimp_image_active_drawable (gimage));
|
|
gimp_image_flush (gimage);
|
|
}
|
|
|
|
void
|
|
edit_fill_cmd_callback (GtkWidget *widget,
|
|
gpointer data,
|
|
guint action)
|
|
{
|
|
GimpImage *gimage;
|
|
GimpFillType fill_type;
|
|
return_if_no_image (gimage, data);
|
|
|
|
fill_type = (GimpFillType) action;
|
|
|
|
gimp_edit_fill (gimage, gimp_image_active_drawable (gimage), fill_type);
|
|
gimp_image_flush (gimage);
|
|
}
|
|
|
|
void
|
|
edit_stroke_cmd_callback (GtkWidget *widget,
|
|
gpointer data)
|
|
{
|
|
GimpImage *gimage;
|
|
return_if_no_image (gimage, data);
|
|
|
|
edit_stroke_selection (GIMP_ITEM (gimp_image_get_mask (gimage)), widget);
|
|
}
|
|
|
|
void
|
|
edit_stroke_selection (GimpItem *item,
|
|
GtkWidget *parent)
|
|
{
|
|
GimpImage *gimage;
|
|
GimpDrawable *active_drawable;
|
|
GtkWidget *dialog;
|
|
|
|
g_return_if_fail (GIMP_IS_ITEM (item));
|
|
|
|
gimage = gimp_item_get_image (item);
|
|
|
|
active_drawable = gimp_image_active_drawable (gimage);
|
|
|
|
if (! active_drawable)
|
|
{
|
|
g_message (_("There is no active layer or channel to stroke to."));
|
|
return;
|
|
}
|
|
|
|
dialog = stroke_dialog_new (item, GIMP_STOCK_SELECTION_STROKE,
|
|
GIMP_HELP_SELECTION_STROKE,
|
|
parent);
|
|
gtk_widget_show (dialog);
|
|
}
|
|
|
|
|
|
/* private functions */
|
|
|
|
static void
|
|
cut_named_buffer_callback (GtkWidget *widget,
|
|
const gchar *name,
|
|
gpointer data)
|
|
{
|
|
const GimpBuffer *cut_buffer;
|
|
GimpImage *gimage;
|
|
|
|
gimage = (GimpImage *) data;
|
|
|
|
cut_buffer = gimp_edit_cut (gimage,
|
|
gimp_image_active_drawable (gimage));
|
|
|
|
if (cut_buffer)
|
|
{
|
|
GimpBuffer *new_buffer;
|
|
|
|
if (! (name && strlen (name)))
|
|
name = _("(Unnamed Buffer)");
|
|
|
|
new_buffer = gimp_buffer_new (cut_buffer->tiles, name, TRUE);
|
|
|
|
gimp_container_add (gimage->gimp->named_buffers,
|
|
GIMP_OBJECT (new_buffer));
|
|
}
|
|
|
|
gimp_image_flush (gimage);
|
|
}
|
|
|
|
static void
|
|
copy_named_buffer_callback (GtkWidget *widget,
|
|
const gchar *name,
|
|
gpointer data)
|
|
{
|
|
const GimpBuffer *copy_buffer;
|
|
GimpImage *gimage;
|
|
|
|
gimage = (GimpImage *) data;
|
|
|
|
copy_buffer = gimp_edit_copy (gimage,
|
|
gimp_image_active_drawable (gimage));
|
|
|
|
if (copy_buffer)
|
|
{
|
|
GimpBuffer *new_buffer;
|
|
|
|
if (! (name && strlen (name)))
|
|
name = _("(Unnamed Buffer)");
|
|
|
|
new_buffer = gimp_buffer_new (copy_buffer->tiles, name, TRUE);
|
|
|
|
gimp_container_add (gimage->gimp->named_buffers,
|
|
GIMP_OBJECT (new_buffer));
|
|
}
|
|
}
|