
2003-09-01 Michael Natterer <mitch@gimp.org> * app/core/gimpitem.[ch]: added new virtual function GimpItem::stroke(). * app/core/gimpchannel.c * app/vectors/gimpvectors.c: implement GimpItem::stroke(). * app/core/gimpimage-mask.[ch] (gimp_image_mask_stroke): changed signature to match gimp_item_stroke() (the selection mask *really* should be a GimpChannel subclass). Removed global variable "gboolean gimp_image_mask_stroking"... * app/core/gimpimage.[ch]: ...and added "gboolean mask_stroking" to the GimpImage struct. * app/gui/vectors-commands.[ch]: removed vectors_stroke_vectors(). * app/widgets/widgets-types.h: removed GimpStrokeItemFunc typedef. * app/widgets/gimpvectorstreeview.[ch]: removed "stroke_item_func" member and use gimp_item_stroke() instead. * app/gui/dialogs-constructors.c (dialogs_vectors_list_view_new) * app/gui/edit-commands.c (edit_stroke_cmd_callback) * app/gui/vectors-commands. (vectors_stroke_cmd_callback) * app/widgets/gimpselectioneditor.c (gimp_selection_editor_stroke_clicked) * tools/pdbgen/pdb/edit.pdb (gimp_edit_stroke): changed accordingly. * app/pdb/edit_cmds.c: regenerated. Note that there is no GUI for "stroke channel", although it would be utterly cool to have one, since currently slelection stroking cannot be masked by a selection (because we stroke the selection). Anyway, if anyone has an idea how to trigger "stroke channel" with another drawable active (the one to stroke to), please let me know...
341 lines
7.8 KiB
C
341 lines
7.8 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/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/gimpimage-mask.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 "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,
|
|
gchar *name,
|
|
gpointer data);
|
|
static void copy_named_buffer_callback (GtkWidget *widget,
|
|
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"),
|
|
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)
|
|
{
|
|
GimpImage *gimage;
|
|
GtkWidget *qbox;
|
|
return_if_no_image (gimage, data);
|
|
|
|
qbox = gimp_query_string_box (_("Copy Named"),
|
|
gimp_standard_help_func,
|
|
GIMP_HELP_BUFFER_COPY,
|
|
_("Enter a name for this buffer"),
|
|
NULL,
|
|
G_OBJECT (gimage), "disconnect",
|
|
copy_named_buffer_callback, gimage);
|
|
gtk_widget_show (qbox);
|
|
}
|
|
|
|
void
|
|
edit_named_paste_cmd_callback (GtkWidget *widget,
|
|
gpointer data)
|
|
{
|
|
gimp_dialog_factory_dialog_raise (global_dock_factory, "gimp-buffer-list", -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;
|
|
GimpBucketFillMode fill_mode;
|
|
return_if_no_image (gimage, data);
|
|
|
|
fill_mode = (GimpBucketFillMode) action;
|
|
|
|
gimp_drawable_bucket_fill (gimp_image_active_drawable (gimage),
|
|
fill_mode,
|
|
GIMP_NORMAL_MODE, 1.0,
|
|
FALSE /* no seed fill */,
|
|
FALSE, 0.0, FALSE, 0.0, 0.0);
|
|
gimp_image_flush (gimage);
|
|
}
|
|
|
|
void
|
|
edit_stroke_cmd_callback (GtkWidget *widget,
|
|
gpointer data)
|
|
{
|
|
GimpImage *gimage;
|
|
GimpDrawable *active_drawable;
|
|
GimpToolInfo *tool_info;
|
|
return_if_no_image (gimage, data);
|
|
|
|
active_drawable = gimp_image_active_drawable (gimage);
|
|
|
|
if (! active_drawable)
|
|
{
|
|
g_message (_("There is no active layer or channel to stroke to."));
|
|
return;
|
|
}
|
|
|
|
tool_info = gimp_context_get_tool (gimp_get_current_context (gimage->gimp));
|
|
|
|
gimp_image_mask_stroke (gimage, active_drawable, tool_info->paint_info);
|
|
gimp_image_flush (gimage);
|
|
}
|
|
|
|
|
|
/* private functions */
|
|
|
|
static void
|
|
cut_named_buffer_callback (GtkWidget *widget,
|
|
gchar *name,
|
|
gpointer data)
|
|
{
|
|
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,
|
|
gchar *name,
|
|
gpointer data)
|
|
{
|
|
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));
|
|
}
|
|
}
|