2004-07-29 Michael Natterer <mitch@gimp.org> Replaced the concept of having a boolean indicating if an undo step dirties the image by a bitfield indicating which parts of the image are dirtied: * app/core/core-enums.[ch]: reordered two values in enum GimpUndoType, added GIMP_DIRTY_IMAGE_SIZE to enum GimpDirtyMask. The values of GimpDirtyMask are still questionable and will probably change... * app/core/gimpimage.[ch]: removed signal "undo_start" and added a GimpDirtyMask parameter to the "dirty" and "clean" signals. * app/core/gimpimage-undo.[ch] (gimp_image_undo_push): replaced "gboolean dirties_image" by "GimpDirtyMask dirty_mask" and pass it to gimp_image_dirty(). (gimp_image_undo_group_start): added *ugly* code which tries to figure GimpDirtyMask from the group's GimpUndoType and store it in the GimpUndoGroup. Call gimp_image_dirty() instead of the removed gimp_image_undo_start(). This means the undo group now dirties the image just like one of its undo steps, but that's no problem since undoing cleans it in the same way. * app/core/gimpundo.[ch]: s/dirties_image/dirty_mask/g (gimp_undo_pop): emit clean/dirty signals *before* performing the actual undo step so listeners can detach from the image before it is changed by undo. * app/core/gimpimage-undo-push.c (gimp_image_undo_push_*): pass a GimpDirtyMask instead of TRUE/FALSE to gimp_image_undo_push(). * app/core/gimpimagemap.[ch]: removed "gboolean interactive" because it makes no sense to use GimpImageMap noninteractively. Don't freeze()/thaw() undo while the image_map is active which fixes many ways of trashing the image's undo state but probably introduces new ways of doing evil things. * app/display/gimpdisplay-foreach.c * app/display/gimpdisplayshell-handlers.c: changed according to the GimpImage::clean()/dirty() signal changes. Small fixes in the quit dialog's dirty image container. * app/tools/gimptoolcontrol.[ch]: added member and API to set/get the dirty_mask. * app/tools/gimpcroptool.c * app/tools/gimpimagemaptool.c * app/tools/gimpiscissorstool.c * app/tools/gimptexttool.c * app/tools/gimptransformtool.c: whenever setting "preserve" to FALSE, also set a "dirty_mask" which specifies on which image changes the tool wants to be canceled. * app/tools/tool_manager.c: removed "undo_start" connection and connect to both "dirty" *and* "clean" to check if the active_tool needs to be canceled. Cancel the tool only if the dirty_mask passed in the signal has common bits with the tool's dirty_mask. Fixes bug #109561 and probably opens some new ones...
183 lines
4.6 KiB
C
183 lines
4.6 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/gimpimage.h"
|
|
#include "core/gimplist.h"
|
|
|
|
#include "gimpdisplay.h"
|
|
#include "gimpdisplay-foreach.h"
|
|
#include "gimpdisplayshell.h"
|
|
#include "gimpdisplayshell-cursor.h"
|
|
|
|
|
|
gboolean
|
|
gimp_displays_dirty (Gimp *gimp)
|
|
{
|
|
GList *list;
|
|
|
|
g_return_val_if_fail (GIMP_IS_GIMP (gimp), FALSE);
|
|
|
|
for (list = GIMP_LIST (gimp->displays)->list;
|
|
list;
|
|
list = g_list_next (list))
|
|
{
|
|
GimpDisplay *display = list->data;
|
|
|
|
if (display->gimage->dirty)
|
|
return TRUE;
|
|
}
|
|
|
|
return FALSE;
|
|
}
|
|
|
|
static void
|
|
gimp_displays_image_clean_callback (GimpImage *image,
|
|
GimpDirtyMask dirty_mask,
|
|
GimpContainer *container)
|
|
{
|
|
if (! image->dirty)
|
|
{
|
|
g_signal_handlers_disconnect_by_func (image,
|
|
gimp_displays_image_clean_callback,
|
|
container);
|
|
|
|
gimp_container_remove (container, GIMP_OBJECT (image));
|
|
}
|
|
}
|
|
|
|
GimpContainer *
|
|
gimp_displays_get_dirty_images (Gimp *gimp)
|
|
{
|
|
g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
|
|
|
|
if (gimp_displays_dirty (gimp))
|
|
{
|
|
GimpContainer *container = gimp_list_new_weak (GIMP_TYPE_IMAGE, FALSE);
|
|
GList *list;
|
|
|
|
gimp_container_add_handler (container, "clean",
|
|
G_CALLBACK (gimp_displays_image_clean_callback),
|
|
container);
|
|
gimp_container_add_handler (container, "dirty",
|
|
G_CALLBACK (gimp_displays_image_clean_callback),
|
|
container);
|
|
|
|
for (list = GIMP_LIST (gimp->displays)->list;
|
|
list;
|
|
list = g_list_next (list))
|
|
{
|
|
GimpDisplay *display = list->data;
|
|
GimpImage *image = display->gimage;
|
|
|
|
if (image->dirty &&
|
|
! gimp_container_have (container, GIMP_OBJECT (image)))
|
|
{
|
|
gimp_container_add (container, GIMP_OBJECT (image));
|
|
}
|
|
}
|
|
|
|
return container;
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
void
|
|
gimp_displays_delete (Gimp *gimp)
|
|
{
|
|
GimpDisplay *gdisp;
|
|
|
|
g_return_if_fail (GIMP_IS_GIMP (gimp));
|
|
|
|
/* this removes the GimpDisplay from the list, so do a while loop
|
|
* "around" the first element to get them all
|
|
*/
|
|
while (GIMP_LIST (gimp->displays)->list)
|
|
{
|
|
gdisp = (GimpDisplay *) GIMP_LIST (gimp->displays)->list->data;
|
|
|
|
gimp_display_delete (gdisp);
|
|
}
|
|
}
|
|
|
|
void
|
|
gimp_displays_reconnect (Gimp *gimp,
|
|
GimpImage *old,
|
|
GimpImage *new)
|
|
{
|
|
GList *list;
|
|
GimpDisplay *gdisp;
|
|
|
|
g_return_if_fail (GIMP_IS_GIMP (gimp));
|
|
g_return_if_fail (GIMP_IS_IMAGE (old));
|
|
g_return_if_fail (GIMP_IS_IMAGE (new));
|
|
|
|
for (list = GIMP_LIST (gimp->displays)->list;
|
|
list;
|
|
list = g_list_next (list))
|
|
{
|
|
gdisp = list->data;
|
|
|
|
if (gdisp->gimage == old)
|
|
gimp_display_reconnect (gdisp, new);
|
|
}
|
|
}
|
|
|
|
void
|
|
gimp_displays_set_busy (Gimp *gimp)
|
|
{
|
|
GList *list;
|
|
GimpDisplayShell *shell;
|
|
|
|
g_return_if_fail (GIMP_IS_GIMP (gimp));
|
|
|
|
for (list = GIMP_LIST (gimp->displays)->list;
|
|
list;
|
|
list = g_list_next (list))
|
|
{
|
|
shell = GIMP_DISPLAY_SHELL (GIMP_DISPLAY (list->data)->shell);
|
|
|
|
gimp_display_shell_set_override_cursor (shell, GDK_WATCH);
|
|
}
|
|
}
|
|
|
|
void
|
|
gimp_displays_unset_busy (Gimp *gimp)
|
|
{
|
|
GList *list;
|
|
GimpDisplayShell *shell;
|
|
|
|
g_return_if_fail (GIMP_IS_GIMP (gimp));
|
|
|
|
for (list = GIMP_LIST (gimp->displays)->list;
|
|
list;
|
|
list = g_list_next (list))
|
|
{
|
|
shell = GIMP_DISPLAY_SHELL (GIMP_DISPLAY (list->data)->shell);
|
|
|
|
gimp_display_shell_unset_override_cursor (shell);
|
|
}
|
|
}
|