Commit 6c01c0db authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer
Browse files

app/vectors/Makefile.am app/vectors/vectors-types.h new undo class for

2007-01-31  Michael Natterer  <mitch@gimp.org>

	* app/vectors/Makefile.am
	* app/vectors/vectors-types.h
	* app/vectors/gimpvectorsmodundo.[ch]: new undo class for
	GIMP_UNDO_VECTORS_MOD.

	* app/core/gimpimage-undo-push.c: use it here.

	* app/core/gimpdrawablemodundo.h: fix typo in include guard.


svn path=/trunk/; revision=21825
parent 336d7761
2007-01-31 Michael Natterer <mitch@gimp.org>
* app/vectors/Makefile.am
* app/vectors/vectors-types.h
* app/vectors/gimpvectorsmodundo.[ch]: new undo class for
GIMP_UNDO_VECTORS_MOD.
* app/core/gimpimage-undo-push.c: use it here.
* app/core/gimpdrawablemodundo.h: fix typo in include guard.
2007-01-31 Michael Natterer <mitch@gimp.org>
 
* app/core/Makefile.am
......@@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __GIMP_DRAWABLE_UNDO_H__
#ifndef __GIMP_DRAWABLE_MOD_UNDO_H__
#define __GIMP_DRAWABLE_MOD_UNDO_H__
......
......@@ -58,6 +58,7 @@
#include "text/gimptextundo.h"
#include "vectors/gimpvectors.h"
#include "vectors/gimpvectorsmodundo.h"
#include "vectors/gimpvectorspropundo.h"
#include "vectors/gimpvectorsundo.h"
......@@ -764,105 +765,22 @@ gimp_image_undo_push_vectors_remove (GimpImage *image,
/* Vectors Mod Undo */
/**********************/
typedef struct _VectorsModUndo VectorsModUndo;
struct _VectorsModUndo
{
GimpVectors *vectors;
};
static gboolean undo_pop_vectors_mod (GimpUndo *undo,
GimpUndoMode undo_mode,
GimpUndoAccumulator *accum);
static void undo_free_vectors_mod (GimpUndo *undo,
GimpUndoMode undo_mode);
GimpUndo *
gimp_image_undo_push_vectors_mod (GimpImage *image,
const gchar *undo_desc,
GimpVectors *vectors)
{
GimpVectors *copy;
GimpUndo *new;
gint64 size;
g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
g_return_val_if_fail (GIMP_IS_VECTORS (vectors), NULL);
g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (vectors)), NULL);
copy = GIMP_VECTORS (gimp_item_duplicate (GIMP_ITEM (vectors),
G_TYPE_FROM_INSTANCE (vectors),
FALSE));
size = (sizeof (VectorsModUndo) +
gimp_object_get_memsize (GIMP_OBJECT (copy), NULL));
if ((new = gimp_image_undo_push (image, GIMP_TYPE_ITEM_UNDO,
size, sizeof (VectorsModUndo),
GIMP_UNDO_VECTORS_MOD, undo_desc,
GIMP_DIRTY_ITEM | GIMP_DIRTY_VECTORS,
undo_pop_vectors_mod,
undo_free_vectors_mod,
"item", vectors,
NULL)))
{
VectorsModUndo *vmu = new->data;
vmu->vectors = copy;
return new;
}
if (copy)
g_object_unref (copy);
return NULL;
}
static gboolean
undo_pop_vectors_mod (GimpUndo *undo,
GimpUndoMode undo_mode,
GimpUndoAccumulator *accum)
{
VectorsModUndo *vmu = undo->data;
GimpVectors *vectors = GIMP_VECTORS (GIMP_ITEM_UNDO (undo)->item);
GimpVectors *temp;
undo->size -= gimp_object_get_memsize (GIMP_OBJECT (vmu->vectors), NULL);
temp = vmu->vectors;
vmu->vectors =
GIMP_VECTORS (gimp_item_duplicate (GIMP_ITEM (vectors),
G_TYPE_FROM_INSTANCE (vectors),
FALSE));
gimp_vectors_freeze (vectors);
gimp_vectors_copy_strokes (temp, vectors);
GIMP_ITEM (vectors)->width = GIMP_ITEM (temp)->width;
GIMP_ITEM (vectors)->height = GIMP_ITEM (temp)->height;
GIMP_ITEM (vectors)->offset_x = GIMP_ITEM (temp)->offset_x;
GIMP_ITEM (vectors)->offset_y = GIMP_ITEM (temp)->offset_y;
g_object_unref (temp);
gimp_vectors_thaw (vectors);
undo->size += gimp_object_get_memsize (GIMP_OBJECT (vmu->vectors), NULL);
return TRUE;
}
static void
undo_free_vectors_mod (GimpUndo *undo,
GimpUndoMode undo_mode)
{
VectorsModUndo *vmu = undo->data;
g_object_unref (vmu->vectors);
g_free (vmu);
return gimp_image_undo_push (image, GIMP_TYPE_VECTORS_MOD_UNDO,
0, 0,
GIMP_UNDO_VECTORS_MOD, undo_desc,
GIMP_DIRTY_ITEM | GIMP_DIRTY_VECTORS,
NULL, NULL,
"item", vectors,
NULL);
}
......
......@@ -38,6 +38,8 @@ libappvectors_a_SOURCES = \
gimpvectors-preview.h \
gimpvectors-warp.c \
gimpvectors-warp.h \
gimpvectorsmodundo.c \
gimpvectorsmodundo.h \
gimpvectorspropundo.c \
gimpvectorspropundo.h \
gimpvectorsundo.c \
......
/* GIMP - The GNU 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 <glib-object.h>
#include "vectors-types.h"
#include "gimpvectors.h"
#include "gimpvectorsmodundo.h"
static GObject * gimp_vectors_mod_undo_constructor (GType type,
guint n_params,
GObjectConstructParam *params);
static gint64 gimp_vectors_mod_undo_get_memsize (GimpObject *object,
gint64 *gui_size);
static void gimp_vectors_mod_undo_pop (GimpUndo *undo,
GimpUndoMode undo_mode,
GimpUndoAccumulator *accum);
static void gimp_vectors_mod_undo_free (GimpUndo *undo,
GimpUndoMode undo_mode);
G_DEFINE_TYPE (GimpVectorsModUndo, gimp_vectors_mod_undo, GIMP_TYPE_ITEM_UNDO)
#define parent_class gimp_vectors_mod_undo_parent_class
static void
gimp_vectors_mod_undo_class_init (GimpVectorsModUndoClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
GimpObjectClass *gimp_object_class = GIMP_OBJECT_CLASS (klass);
GimpUndoClass *undo_class = GIMP_UNDO_CLASS (klass);
object_class->constructor = gimp_vectors_mod_undo_constructor;
gimp_object_class->get_memsize = gimp_vectors_mod_undo_get_memsize;
undo_class->pop = gimp_vectors_mod_undo_pop;
undo_class->free = gimp_vectors_mod_undo_free;
}
static void
gimp_vectors_mod_undo_init (GimpVectorsModUndo *undo)
{
}
static GObject *
gimp_vectors_mod_undo_constructor (GType type,
guint n_params,
GObjectConstructParam *params)
{
GObject *object;
GimpVectorsModUndo *vectors_mod_undo;
GimpVectors *vectors;
object = G_OBJECT_CLASS (parent_class)->constructor (type, n_params, params);
vectors_mod_undo = GIMP_VECTORS_MOD_UNDO (object);
g_assert (GIMP_IS_VECTORS (GIMP_ITEM_UNDO (object)->item));
vectors = GIMP_VECTORS (GIMP_ITEM_UNDO (object)->item);
vectors_mod_undo->vectors =
GIMP_VECTORS (gimp_item_duplicate (GIMP_ITEM (vectors),
G_TYPE_FROM_INSTANCE (vectors),
FALSE));
return object;
}
static gint64
gimp_vectors_mod_undo_get_memsize (GimpObject *object,
gint64 *gui_size)
{
GimpVectorsModUndo *vectors_mod_undo = GIMP_VECTORS_MOD_UNDO (object);
gint64 memsize = 0;
if (vectors_mod_undo->vectors)
memsize += gimp_object_get_memsize (GIMP_OBJECT (vectors_mod_undo->vectors),
gui_size);
return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
gui_size);
}
static void
gimp_vectors_mod_undo_pop (GimpUndo *undo,
GimpUndoMode undo_mode,
GimpUndoAccumulator *accum)
{
GimpVectorsModUndo *vectors_mod_undo = GIMP_VECTORS_MOD_UNDO (undo);
GimpVectors *vectors = GIMP_VECTORS (GIMP_ITEM_UNDO (undo)->item);
GimpVectors *temp;
GIMP_UNDO_CLASS (parent_class)->pop (undo, undo_mode, accum);
temp = vectors_mod_undo->vectors;
vectors_mod_undo->vectors =
GIMP_VECTORS (gimp_item_duplicate (GIMP_ITEM (vectors),
G_TYPE_FROM_INSTANCE (vectors),
FALSE));
gimp_vectors_freeze (vectors);
gimp_vectors_copy_strokes (temp, vectors);
GIMP_ITEM (vectors)->width = GIMP_ITEM (temp)->width;
GIMP_ITEM (vectors)->height = GIMP_ITEM (temp)->height;
GIMP_ITEM (vectors)->offset_x = GIMP_ITEM (temp)->offset_x;
GIMP_ITEM (vectors)->offset_y = GIMP_ITEM (temp)->offset_y;
g_object_unref (temp);
gimp_vectors_thaw (vectors);
}
static void
gimp_vectors_mod_undo_free (GimpUndo *undo,
GimpUndoMode undo_mode)
{
GimpVectorsModUndo *vectors_mod_undo = GIMP_VECTORS_MOD_UNDO (undo);
if (vectors_mod_undo->vectors)
{
g_object_unref (vectors_mod_undo->vectors);
vectors_mod_undo->vectors = NULL;
}
GIMP_UNDO_CLASS (parent_class)->free (undo, undo_mode);
}
/* GIMP - The GNU 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.
*/
#ifndef __GIMP_VECTORS_MOD_UNDO_H__
#define __GIMP_VECTORS_MOD_UNDO_H__
#include "core/gimpitemundo.h"
#define GIMP_TYPE_VECTORS_MOD_UNDO (gimp_vectors_mod_undo_get_type ())
#define GIMP_VECTORS_MOD_UNDO(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_VECTORS_MOD_UNDO, GimpVectorsModUndo))
#define GIMP_VECTORS_MOD_UNDO_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_VECTORS_MOD_UNDO, GimpVectorsModUndoClass))
#define GIMP_IS_VECTORS_MOD_UNDO(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_VECTORS_MOD_UNDO))
#define GIMP_IS_VECTORS_MOD_UNDO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_VECTORS_MOD_UNDO))
#define GIMP_VECTORS_MOD_UNDO_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_VECTORS_MOD_UNDO, GimpVectorsModUndoClass))
typedef struct _GimpVectorsModUndoClass GimpVectorsModUndoClass;
struct _GimpVectorsModUndo
{
GimpItemUndo parent_instance;
GimpVectors *vectors;
};
struct _GimpVectorsModUndoClass
{
GimpItemUndoClass parent_class;
};
GType gimp_vectors_mod_undo_get_type (void) G_GNUC_CONST;
#endif /* __GIMP_VECTORS_MOD_UNDO_H__ */
......@@ -30,6 +30,7 @@ typedef struct _GimpAnchor GimpAnchor;
typedef struct _GimpVectors GimpVectors;
typedef struct _GimpVectorsUndo GimpVectorsUndo;
typedef struct _GimpVectorsModUndo GimpVectorsModUndo;
typedef struct _GimpVectorsPropUndo GimpVectorsPropUndo;
typedef struct _GimpStroke GimpStroke;
typedef struct _GimpBezierStroke GimpBezierStroke;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment