procyberian/gimp
2
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp.git synced 2025-07-04 01:43:24 +00:00
Code Issues 1 Projects 1 Releases Packages Wiki Activity Actions

added app/display/ and app/plug-in/. Empty for now except for the types

Browse source 
2001-08-17  Michael Natterer  <mitch@gimp.org>

	* configure.in: added app/display/ and app/plug-in/. Empty for
	now except for the types files.

	* app/Makefile.am
	* app/appenums.h
	* app/apptypes.h: removed.

	* app/display/Makefile.am
	* app/display/display-types.h
	* app/plug-in/Makefile.am
	* app/plug-in/plug-in-types.h
	* app/gui/Makefile.am
	* app/gui/gui-types.h
	* app/pdb/Makefile.am
	* app/pdb/pdb-types.h: new files for typedefs.

	* app/appenv.h: added MessageHandlerType and StackTraceMode here.

	* app/undo_types.h: moved undo struct typedefs here.

	* app/tools/tools-types.h
	* app/core/core-types.h: added some enums and Tattoo here
	(renamed to GimpTattoo).

	* app/gdisplay.h: temp_hack: #include "display/display-types.h"

	* app/gimphelp.c: s/gtk_idle_add/g_idle_add/

	* app/gimprc.c: don't use "gimprc" in token handlers but the
	passed "val1p" and "val2p".

	* app/image_map.[ch]: cleanup in preparation of making a GObject
	out of it.

	* app/base/pixel-region.[ch]: no need to pass the
	PixelRegionIterator around as void pointer.

	* app/core/gimp.[ch]
	* app/core/gimpcontext.[ch]
	* app/core/gimptoolinfo.[ch]
	* app/tools/tool_manager.c
	* app/widgets/gimpdnd.c: added the standard_tool_info to the Gimp
	object.

	* app/batch.c
	* app/file-open.c
	* app/file-save.c
	* app/file-utils.c
	* app/interface.c
	* app/main.c
	* app/path.[ch]
	* app/pathP.h
	* app/plug_in.h
	* app/core/gimpdrawable.[ch]
	* app/core/gimpimage-mask.c
	* app/core/gimpimage.[ch]
	* app/core/gimplayer.c
	* app/gui/color-area.c
	* app/gui/color-notebook.c
	* app/gui/colormap-dialog.c
	* app/gui/dialogs-commands.c
	* app/gui/dialogs-constructors.c
	* app/gui/error-console-dialog.c
	* app/gui/gradient-editor.c
	* app/gui/gradient-select.c
	* app/gui/indicator-area.c
	* app/gui/info-dialog.c
	* app/gui/palette-editor.c
	* app/gui/palette-select.c
	* app/gui/pattern-select.c
	* app/gui/session.c
	* app/gui/splash.c
	* app/gui/view-commands.c
	* app/tools/gimpinktool-blob.c
	* app/widgets/gimpcolorpanel.c
	* app/widgets/gimpdockbook.c
	* app/widgets/gimppreview.c
	* app/xcf/xcf-load.c
	* app/xcf/xcf-save.c
	* app/xcf/xcf.c: changed accordingly: s/Tattoo/GimpTattoo/, include
	the new types files, include <glib-object.h> instead of >gtk/gtk.h>.
	Bad hacks to get rid of SELECTION_OFF and friends in core/ (will
	be replaced ba a signal soon).

	* tools/pdbgen/Makefile.am: changed list of headers scanned for
	enums accordingly.

	* app/pdb/procedural_db.c
	* tools/pdbgen/app.pl
	* tools/pdbgen/pdb/channel.pdb
	* tools/pdbgen/pdb/display.pdb
	* tools/pdbgen/pdb/gradient_select.pdb
	* tools/pdbgen/pdb/image.pdb
	* tools/pdbgen/pdb/layer.pdb
	* tools/pdbgen/pdb/pattern_select.pdb: same fixes as above, added
	hacks to ensure that all foo-types.h files are included before all
	other gimp internal includes, include "pdb-types.h" unconditionally.

	* tools/pdbgen/enums.pl
	* app/pdb/*_cmds.c: regenerated.
This commit is contained in:
Michael Natterer 2001-08-17 14:27:31 +00:00 • committed by Michael Natterer
parent 667d8626eb
commit 01b780d682
163 changed files with 1613 additions and 1198 deletions
Download patch file Download diff file Expand all files Collapse all files

103
ChangeLog
View file

@ -1,3 +1,106 @@
2001-08-17 Michael Natterer <mitch@gimp.org>
* configure.in: added app/display/ and app/plug-in/. Empty for
now except for the types files.
* app/Makefile.am
* app/appenums.h
* app/apptypes.h: removed.
* app/display/Makefile.am
* app/display/display-types.h
* app/plug-in/Makefile.am
* app/plug-in/plug-in-types.h
* app/gui/Makefile.am
* app/gui/gui-types.h
* app/pdb/Makefile.am
* app/pdb/pdb-types.h: new files for typedefs.
* app/appenv.h: added MessageHandlerType and StackTraceMode here.
* app/undo_types.h: moved undo struct typedefs here.
* app/tools/tools-types.h
* app/core/core-types.h: added some enums and Tattoo here
(renamed to GimpTattoo).
* app/gdisplay.h: temp_hack: #include "display/display-types.h"
* app/gimphelp.c: s/gtk_idle_add/g_idle_add/
* app/gimprc.c: don't use "gimprc" in token handlers but the
passed "val1p" and "val2p".
* app/image_map.[ch]: cleanup in preparation of making a GObject
out of it.
* app/base/pixel-region.[ch]: no need to pass the
PixelRegionIterator around as void pointer.
* app/core/gimp.[ch]
* app/core/gimpcontext.[ch]
* app/core/gimptoolinfo.[ch]
* app/tools/tool_manager.c
* app/widgets/gimpdnd.c: added the standard_tool_info to the Gimp
object.
* app/batch.c
* app/file-open.c
* app/file-save.c
* app/file-utils.c
* app/interface.c
* app/main.c
* app/path.[ch]
* app/pathP.h
* app/plug_in.h
* app/core/gimpdrawable.[ch]
* app/core/gimpimage-mask.c
* app/core/gimpimage.[ch]
* app/core/gimplayer.c
* app/gui/color-area.c
* app/gui/color-notebook.c
* app/gui/colormap-dialog.c
* app/gui/dialogs-commands.c
* app/gui/dialogs-constructors.c
* app/gui/error-console-dialog.c
* app/gui/gradient-editor.c
* app/gui/gradient-select.c
* app/gui/indicator-area.c
* app/gui/info-dialog.c
* app/gui/palette-editor.c
* app/gui/palette-select.c
* app/gui/pattern-select.c
* app/gui/session.c
* app/gui/splash.c
* app/gui/view-commands.c
* app/tools/gimpinktool-blob.c
* app/widgets/gimpcolorpanel.c
* app/widgets/gimpdockbook.c
* app/widgets/gimppreview.c
* app/xcf/xcf-load.c
* app/xcf/xcf-save.c
* app/xcf/xcf.c: changed accordingly: s/Tattoo/GimpTattoo/, include
the new types files, include <glib-object.h> instead of >gtk/gtk.h>.
Bad hacks to get rid of SELECTION_OFF and friends in core/ (will
be replaced ba a signal soon).
* tools/pdbgen/Makefile.am: changed list of headers scanned for
enums accordingly.
* app/pdb/procedural_db.c
* tools/pdbgen/app.pl
* tools/pdbgen/pdb/channel.pdb
* tools/pdbgen/pdb/display.pdb
* tools/pdbgen/pdb/gradient_select.pdb
* tools/pdbgen/pdb/image.pdb
* tools/pdbgen/pdb/layer.pdb
* tools/pdbgen/pdb/pattern_select.pdb: same fixes as above, added
hacks to ensure that all foo-types.h files are included before all
other gimp internal includes, include "pdb-types.h" unconditionally.
* tools/pdbgen/enums.pl
* app/pdb/*_cmds.c: regenerated.
2001-08-15 Michael Natterer <mitch@gimp.org> 2001-08-15 Michael Natterer <mitch@gimp.org>
* app/tools/gimptool.[ch] * app/tools/gimptool.[ch]

6
app/Makefile.am
View file

@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
SUBDIRS = paint-funcs base core pdb xcf tools widgets gui SUBDIRS = paint-funcs base core pdb plug-in xcf tools display widgets gui
scriptdata = scriptdata =
@ -103,8 +103,6 @@ gimp_SOURCES = @STRIP_BEGIN@ \
## ##
app_procs.c \ app_procs.c \
app_procs.h \ app_procs.h \
appenums.h \
apptypes.h \
main.c \ main.c \
\ \
batch.c \ batch.c \
@ -153,8 +151,10 @@ INCLUDES = @STRIP_BEGIN@ \
gimp_LDADD = @STRIP_BEGIN@ \ gimp_LDADD = @STRIP_BEGIN@ \
gui/libappgui.a \ gui/libappgui.a \
tools/libapptools.a \ tools/libapptools.a \
display/libappdisplay.a \
widgets/libappwidgets.a \ widgets/libappwidgets.a \
xcf/libappxcf.a \ xcf/libappxcf.a \
plug-in/libappplug-in.a \
pdb/libapppdb.a \ pdb/libapppdb.a \
core/libappcore.a \ core/libappcore.a \
paint-funcs/libapppaint-funcs.a \ paint-funcs/libapppaint-funcs.a \

3
app/actions/dialogs-commands.c
View file

@ -20,8 +20,7 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "apptypes.h" #include "gui-types.h"
#include "widgets/widgets-types.h"
#include "widgets/gimpdialogfactory.h" #include "widgets/gimpdialogfactory.h"
#include "widgets/gimpdockable.h" #include "widgets/gimpdockable.h"

2
app/actions/view-commands.c
View file

@ -22,7 +22,7 @@
#include "libgimpwidgets/gimpwidgets.h" #include "libgimpwidgets/gimpwidgets.h"
#include "core/core-types.h" #include "gui-types.h"
#include "core/gimpimage.h" #include "core/gimpimage.h"

121
app/appenums.h
View file

@ -1,121 +0,0 @@
/* 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.
*/
#ifndef __APPENUMS_H__
#define __APPENUMS_H__
typedef enum
{
MESSAGE_BOX,
CONSOLE,
ERROR_CONSOLE
} MessageHandlerType;
typedef enum
{
STACK_TRACE_NEVER,
STACK_TRACE_QUERY,
STACK_TRACE_ALWAYS
} StackTraceMode;
/* Brush application types */
typedef enum
{
HARD, /* pencil */
SOFT, /* paintbrush */
PRESSURE /* paintbrush with variable pressure */
} BrushApplicationMode;
/* Paint application modes */
typedef enum
{
CONSTANT, /*< nick=CONTINUOUS >*/ /* pencil, paintbrush, airbrush, clone */
INCREMENTAL /* convolve, smudge */
} PaintApplicationMode;
typedef enum /*< chop=ADD_ >*/
{
ADD_WHITE_MASK,
ADD_BLACK_MASK,
ADD_ALPHA_MASK,
ADD_SELECTION_MASK,
ADD_INV_SELECTION_MASK
} AddMaskType;
/* gradient paint modes */
typedef enum
{
ONCE_FORWARD, /* paint through once, then stop */
ONCE_BACKWARDS, /* paint once, then stop, but run the gradient the other way */
LOOP_SAWTOOTH, /* keep painting, looping through the grad start->end,start->end /|/|/| */
LOOP_TRIANGLE, /* keep paiting, looping though the grad start->end,end->start /\/\/\/ */
ONCE_END_COLOR /* paint once, but keep painting with the end color */
} GradientPaintMode;
typedef enum /*< skip >*/
{
ORIENTATION_UNKNOWN,
ORIENTATION_HORIZONTAL,
ORIENTATION_VERTICAL
} InternalOrientationType;
typedef enum
{
HORIZONTAL,
VERTICAL,
UNKNOWN
} OrientationType;
/* Selection Boolean operations */
typedef enum /*< chop=CHANNEL_OP_ >*/
{
CHANNEL_OP_ADD,
CHANNEL_OP_SUB,
CHANNEL_OP_REPLACE,
CHANNEL_OP_INTERSECT
} ChannelOps;
typedef enum /*< skip >*/
{
SELECTION_ADD = CHANNEL_OP_ADD,
SELECTION_SUB = CHANNEL_OP_SUB,
SELECTION_REPLACE = CHANNEL_OP_REPLACE,
SELECTION_INTERSECT = CHANNEL_OP_INTERSECT,
SELECTION_MOVE_MASK,
SELECTION_MOVE,
SELECTION_ANCHOR
} SelectOps;
/* Plug-In run modes */
typedef enum
{
RUN_INTERACTIVE = 0,
RUN_NONINTERACTIVE = 1,
RUN_WITH_LAST_VALS = 2
} RunModeType;
typedef enum /*< skip >*/
{
CURSOR_MODE_TOOL_ICON,
CURSOR_MODE_TOOL_CROSSHAIR,
CURSOR_MODE_CROSSHAIR
} CursorMode;
#endif /* __APPENUMS_H__ */

15
app/appenv.h
View file

@ -20,6 +20,21 @@
#define __APPENV_H__ #define __APPENV_H__
typedef enum
{
MESSAGE_BOX,
CONSOLE,
ERROR_CONSOLE
} MessageHandlerType;
typedef enum
{
STACK_TRACE_NEVER,
STACK_TRACE_QUERY,
STACK_TRACE_ALWAYS
} StackTraceMode;
/* command line options */ /* command line options */
extern gboolean no_interface; extern gboolean no_interface;
extern gboolean no_splash; extern gboolean no_splash;

84
app/apptypes.h
View file

@ -1,84 +0,0 @@
/* 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.
*/
#ifndef __APPTYPES_H__
#define __APPTYPES_H__
#include "libgimpcolor/gimpcolortypes.h"
#include "libgimpmath/gimpmathtypes.h"
#include "libgimpbase/gimpbasetypes.h"
#include "base/base-types.h"
#include "undo_types.h"
#include "appenums.h"
/* other stuff */
typedef struct _Argument Argument;
typedef struct _ColorNotebook ColorNotebook;
typedef struct _GDisplay GDisplay;
typedef struct _GimpProgress GimpProgress;
typedef struct _ImageMap ImageMap;
typedef struct _InfoDialog InfoDialog;
typedef struct _NavigationDialog NavigationDialog;
typedef struct _Path Path;
typedef struct _PathPoint PathPoint;
typedef struct _PathList PathList;
typedef struct _PlugIn PlugIn;
typedef struct _PlugInDef PlugInDef;
typedef struct _PlugInProcDef PlugInProcDef;
typedef struct _ProcArg ProcArg;
typedef struct _ProcRecord ProcRecord;
typedef guint32 Tattoo;
typedef struct _Selection Selection;
/* some undo stuff */
typedef struct _LayerUndo LayerUndo;
typedef struct _LayerMaskUndo LayerMaskUndo;
typedef struct _FStoLayerUndo FStoLayerUndo;
typedef GSList PathUndo;
/* functions */
typedef void (* ImageMapApplyFunc) (PixelRegion *srcPR,
PixelRegion *destPR,
gpointer data);
#endif /* __APPTYPES_H__ */

8
app/base/pixel-region.c
View file

@ -344,13 +344,11 @@ pixel_regions_register (gint num_regions,
gpointer gpointer
pixel_regions_process (gpointer PRI_ptr) pixel_regions_process (PixelRegionIterator *PRI)
{ {
GSList *list; GSList *list;
PixelRegionHolder *PRH; PixelRegionHolder *PRH;
PixelRegionIterator *PRI;
PRI = (PixelRegionIterator *) PRI_ptr;
PRI->process_count++; PRI->process_count++;
/* Unref all referenced tiles and increment the offsets */ /* Unref all referenced tiles and increment the offsets */
@ -390,13 +388,11 @@ pixel_regions_process (gpointer PRI_ptr)
} }
void void
pixel_regions_process_stop (gpointer PRI_ptr) pixel_regions_process_stop (PixelRegionIterator *PRI)
{ {
GSList *list; GSList *list;
PixelRegionHolder *PRH; PixelRegionHolder *PRH;
PixelRegionIterator *PRI;
PRI = (PixelRegionIterator *) PRI_ptr;
PRI->process_count++; PRI->process_count++;
/* Unref all referenced tiles and increment the offsets */ /* Unref all referenced tiles and increment the offsets */

87
app/base/pixel-region.h
View file

@ -60,50 +60,51 @@ struct _PixelRegionIterator
/* PixelRegion functions */ /* PixelRegion functions */
void pixel_region_init (PixelRegion *PR, void pixel_region_init (PixelRegion *PR,
TileManager *tiles, TileManager *tiles,
gint x, gint x,
gint y, gint y,
gint w, gint w,
gint h, gint h,
gboolean dirty); gboolean dirty);
void pixel_region_resize (PixelRegion *PR, void pixel_region_resize (PixelRegion *PR,
gint x, gint x,
gint y, gint y,
gint w, gint w,
gint h); gint h);
void pixel_region_get_async (PixelRegion *PR, void pixel_region_get_async (PixelRegion *PR,
gint ulx, gint ulx,
gint uly, gint uly,
gint lrx, gint lrx,
gint lry); gint lry);
void pixel_region_get_row (PixelRegion *PR, void pixel_region_get_row (PixelRegion *PR,
gint x, gint x,
gint y, gint y,
gint w, gint w,
guchar *data, guchar *data,
gint subsample); gint subsample);
void pixel_region_set_row (PixelRegion *PR, void pixel_region_set_row (PixelRegion *PR,
gint x, gint x,
gint y, gint y,
gint w, gint w,
guchar *data); guchar *data);
void pixel_region_get_col (PixelRegion *PR, void pixel_region_get_col (PixelRegion *PR,
gint x, gint x,
gint y, gint y,
gint h, gint h,
guchar *data, guchar *data,
gint subsample); gint subsample);
void pixel_region_set_col (PixelRegion *PR, void pixel_region_set_col (PixelRegion *PR,
gint x, gint x,
gint y, gint y,
gint h, gint h,
guchar *data); guchar *data);
gboolean pixel_region_has_alpha (PixelRegion *PR); gboolean pixel_region_has_alpha (PixelRegion *PR);
gpointer pixel_regions_register (gint num_regions,
gpointer pixel_regions_register (gint num_regions,
...); ...);
gpointer pixel_regions_process (gpointer PRI_ptr); gpointer pixel_regions_process (PixelRegionIterator *PRI);
void pixel_regions_process_stop (gpointer PRI_ptr); void pixel_regions_process_stop (PixelRegionIterator *PRI);
#endif /* __PIXEL_REGION_H__ */ #endif /* __PIXEL_REGION_H__ */

2
app/batch.c
View file

@ -27,7 +27,7 @@
#include <unistd.h> #include <unistd.h>
#endif #endif
#include <gtk/gtk.h> #include <glib-object.h>
#include "core/core-types.h" #include "core/core-types.h"

64
app/core/core-types.h
View file

@ -20,15 +20,19 @@
#define __CORE_TYPES_H__ #define __CORE_TYPES_H__
/* EEK */ #include <gdk-pixbuf/gdk-pixbuf.h> /* EEK */
#include <gdk-pixbuf/gdk-pixbuf.h>
#include "apptypes.h" #include "libgimpbase/gimpbasetypes.h"
#include "libgimpmath/gimpmath.h"
#include "base/base-types.h"
#include "plug-in/plug-in-types.h"
#include "undo_types.h" /* EEK */
/* enums */ /* enums */
/* Base image types */
typedef enum typedef enum
{ {
RGB, RGB,
@ -36,7 +40,6 @@ typedef enum
INDEXED INDEXED
} GimpImageBaseType; } GimpImageBaseType;
/* Image types */
typedef enum typedef enum
{ {
RGB_GIMAGE, /*< nick=RGB_IMAGE >*/ RGB_GIMAGE, /*< nick=RGB_IMAGE >*/
@ -47,7 +50,6 @@ typedef enum
INDEXEDA_GIMAGE /*< nick=INDEXEDA_IMAGE >*/ INDEXEDA_GIMAGE /*< nick=INDEXEDA_IMAGE >*/
} GimpImageType; } GimpImageType;
/* Channel types */
typedef enum typedef enum
{ {
RED_CHANNEL, RED_CHANNEL,
@ -58,13 +60,44 @@ typedef enum
ALPHA_CHANNEL ALPHA_CHANNEL
} ChannelType; } ChannelType;
typedef enum /*< chop=ADD_ >*/
{
ADD_WHITE_MASK,
ADD_BLACK_MASK,
ADD_ALPHA_MASK,
ADD_SELECTION_MASK,
ADD_INV_SELECTION_MASK
} AddMaskType;
typedef enum typedef enum
{ {
APPLY, APPLY,
DISCARD DISCARD
} MaskApplyMode; } MaskApplyMode;
/* Fill types */ typedef enum
{
HORIZONTAL,
VERTICAL,
UNKNOWN
} OrientationType;
typedef enum /*< skip >*/
{
ORIENTATION_UNKNOWN,
ORIENTATION_HORIZONTAL,
ORIENTATION_VERTICAL
} InternalOrientationType;
/* Selection Boolean operations */
typedef enum /*< chop=CHANNEL_OP_ >*/
{
CHANNEL_OP_ADD,
CHANNEL_OP_SUB,
CHANNEL_OP_REPLACE,
CHANNEL_OP_INTERSECT
} ChannelOps;
typedef enum typedef enum
{ {
FOREGROUND_FILL, /*< nick=FG_IMAGE_FILL >*/ FOREGROUND_FILL, /*< nick=FG_IMAGE_FILL >*/
@ -74,7 +107,6 @@ typedef enum
NO_FILL /*< nick=NO_IMAGE_FILL >*/ NO_FILL /*< nick=NO_IMAGE_FILL >*/
} GimpFillType; } GimpFillType;
/* Transfer modes */
typedef enum /*< chop=GIMP_ >*/ typedef enum /*< chop=GIMP_ >*/
{ {
GIMP_SHADOWS, GIMP_SHADOWS,
@ -140,6 +172,11 @@ typedef struct _GimpUndo GimpUndo;
typedef struct _GimpUndoStack GimpUndoStack; typedef struct _GimpUndoStack GimpUndoStack;
/* other objects */
typedef struct _ImageMap ImageMap; /* temp_hack, will be an object */
/* non-object types */ /* non-object types */
typedef struct _GimpCoreConfig GimpCoreConfig; typedef struct _GimpCoreConfig GimpCoreConfig;
@ -148,6 +185,17 @@ typedef struct _GimpGuide GimpGuide;
typedef struct _GimpImageNewValues GimpImageNewValues; typedef struct _GimpImageNewValues GimpImageNewValues;
typedef struct _GimpProgress GimpProgress;
typedef guint32 GimpTattoo;
/* EEK stuff */
typedef struct _Path Path;
typedef struct _PathPoint PathPoint;
typedef struct _PathList PathList;
/* stuff which is forward declared here so we don't need to cross-include it */ /* stuff which is forward declared here so we don't need to cross-include it */

4
app/core/gimp.c
View file

@ -25,6 +25,7 @@
#include "libgimpbase/gimpbase.h" #include "libgimpbase/gimpbase.h"
#include "core-types.h" #include "core-types.h"
#include "pdb/pdb-types.h"
#include "base/tile-manager.h" #include "base/tile-manager.h"
@ -146,6 +147,7 @@ gimp_init (Gimp *gimp)
gimp->tool_info_list = gimp_list_new (GIMP_TYPE_TOOL_INFO, gimp->tool_info_list = gimp_list_new (GIMP_TYPE_TOOL_INFO,
GIMP_CONTAINER_POLICY_STRONG); GIMP_CONTAINER_POLICY_STRONG);
gimp->standard_tool_info = NULL;
gimp_documents_init (gimp); gimp_documents_init (gimp);
@ -210,6 +212,8 @@ gimp_finalize (GObject *object)
if (gimp->documents) if (gimp->documents)
gimp_documents_exit (gimp); gimp_documents_exit (gimp);
gimp_tool_info_set_standard (gimp, NULL);
if (gimp->tool_info_list) if (gimp->tool_info_list)
{ {
g_object_unref (G_OBJECT (gimp->tool_info_list)); g_object_unref (G_OBJECT (gimp->tool_info_list));

1
app/core/gimp.h
View file

@ -75,6 +75,7 @@ struct _Gimp
GHashTable *procedural_ht; GHashTable *procedural_ht;
GimpContainer *tool_info_list; GimpContainer *tool_info_list;
GimpToolInfo *standard_tool_info;
/* the opened and saved images in MRU order */ /* the opened and saved images in MRU order */
GimpContainer *documents; GimpContainer *documents;

4
app/core/gimpcontext.c
View file

@ -1366,7 +1366,7 @@ gimp_context_tool_list_thaw (GimpContainer *container,
(context, (context,
GIMP_TOOL_INFO (gimp_container_get_child_by_index (container, 0))); GIMP_TOOL_INFO (gimp_container_get_child_by_index (container, 0)));
else else
gimp_context_real_set_tool (context, gimp_tool_info_get_standard ()); gimp_context_real_set_tool (context, gimp_tool_info_get_standard (context->gimp));
} }
/* the active tool disappeared */ /* the active tool disappeared */
@ -1394,7 +1394,7 @@ gimp_context_real_set_tool (GimpContext *context,
GimpToolInfo *tool_info) GimpToolInfo *tool_info)
{ {
if (! standard_tool_info) if (! standard_tool_info)
standard_tool_info = gimp_tool_info_get_standard (); standard_tool_info = gimp_tool_info_get_standard (context->gimp);
if (context->tool_info == tool_info) if (context->tool_info == tool_info)
return; return;

4
app/core/gimpcontext.h
View file

@ -96,7 +96,7 @@ struct _GimpContext
guint32 defined_props; guint32 defined_props;
GimpImage *image; GimpImage *image;
GDisplay *display; gpointer display;
GimpToolInfo *tool_info; GimpToolInfo *tool_info;
gchar *tool_name; gchar *tool_name;
@ -129,7 +129,7 @@ struct _GimpContextClass
void (* image_changed) (GimpContext *context, void (* image_changed) (GimpContext *context,
GimpImage *image); GimpImage *image);
void (* display_changed) (GimpContext *context, void (* display_changed) (GimpContext *context,
GDisplay *display); gpointer display);
void (* tool_changed) (GimpContext *context, void (* tool_changed) (GimpContext *context,
GimpToolInfo *tool_info); GimpToolInfo *tool_info);

6
app/core/gimpdrawable.c
View file

@ -883,7 +883,7 @@ gimp_drawable_parasite_detach (GimpDrawable *drawable,
gimp_parasite_list_remove (drawable->parasites, parasite); gimp_parasite_list_remove (drawable->parasites, parasite);
} }
Tattoo GimpTattoo
gimp_drawable_get_tattoo (const GimpDrawable *drawable) gimp_drawable_get_tattoo (const GimpDrawable *drawable)
{ {
g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), 0); g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), 0);
@ -893,11 +893,11 @@ gimp_drawable_get_tattoo (const GimpDrawable *drawable)
void void
gimp_drawable_set_tattoo (GimpDrawable *drawable, gimp_drawable_set_tattoo (GimpDrawable *drawable,
Tattoo val) GimpTattoo tattoo)
{ {
g_return_if_fail (GIMP_IS_DRAWABLE (drawable)); g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
drawable->tattoo = val; drawable->tattoo = tattoo;
} }
gboolean gboolean

4
app/core/gimpdrawable.h
View file

@ -148,9 +148,9 @@ GimpParasite * gimp_drawable_parasite_find (const GimpDrawable *drawable,
const gchar *name); const gchar *name);
gchar ** gimp_drawable_parasite_list (const GimpDrawable *drawable, gchar ** gimp_drawable_parasite_list (const GimpDrawable *drawable,
gint *count); gint *count);
Tattoo gimp_drawable_get_tattoo (const GimpDrawable *drawable); GimpTattoo gimp_drawable_get_tattoo (const GimpDrawable *drawable);
void gimp_drawable_set_tattoo (GimpDrawable *drawable, void gimp_drawable_set_tattoo (GimpDrawable *drawable,
Tattoo tattoo); GimpTattoo tattoo);
#endif /* __GIMP_DRAWABLE_H__ */ #endif /* __GIMP_DRAWABLE_H__ */

44
app/core/gimpimage-guides.c
View file

@ -1666,7 +1666,8 @@ gimp_image_parasite_detach (GimpImage *gimage,
{ {
GimpParasite *p; GimpParasite *p;
g_return_if_fail (GIMP_IS_IMAGE (gimage) && parasite != NULL); g_return_if_fail (GIMP_IS_IMAGE (gimage));
g_return_if_fail (parasite != NULL);
if (!(p = gimp_parasite_list_find (gimage->parasites, parasite))) if (!(p = gimp_parasite_list_find (gimage->parasites, parasite)))
return; return;
@ -1677,31 +1678,35 @@ gimp_image_parasite_detach (GimpImage *gimage,
gimp_parasite_list_remove (gimage->parasites, parasite); gimp_parasite_list_remove (gimage->parasites, parasite);
} }
Tattoo GimpTattoo
gimp_image_get_new_tattoo (GimpImage *image) gimp_image_get_new_tattoo (GimpImage *gimage)
{ {
image->tattoo_state++; g_return_val_if_fail (GIMP_IS_IMAGE (gimage), 0);
if (image->tattoo_state <= 0) gimage->tattoo_state++;
g_warning ("Tattoo state has become corrupt (2.1 billion operation limit exceded)");
return image->tattoo_state; if (gimage->tattoo_state <= 0)
g_warning ("gimp_image_get_new_tattoo(): Tattoo state has become corrupt (2.1 billion operation limit exceded)");
return gimage->tattoo_state;
} }
Tattoo GimpTattoo
gimp_image_get_tattoo_state (GimpImage *image) gimp_image_get_tattoo_state (GimpImage *gimage)
{ {
return (image->tattoo_state); g_return_val_if_fail (GIMP_IS_IMAGE (gimage), 0);
return gimage->tattoo_state;
} }
gboolean gboolean
gimp_image_set_tattoo_state (GimpImage *gimage, gimp_image_set_tattoo_state (GimpImage *gimage,
Tattoo val) GimpTattoo val)
{ {
GList *list; GList *list;
gboolean retval = TRUE; gboolean retval = TRUE;
GimpChannel *channel; GimpChannel *channel;
Tattoo maxval = 0; GimpTattoo maxval = 0;
Path *pptr = NULL; Path *pptr = NULL;
PathList *plist; PathList *plist;
@ -1711,7 +1716,7 @@ gimp_image_set_tattoo_state (GimpImage *gimage,
list; list;
list = g_list_next (list)) list = g_list_next (list))
{ {
Tattoo ltattoo; GimpTattoo ltattoo;
ltattoo = gimp_drawable_get_tattoo (GIMP_DRAWABLE (list->data)); ltattoo = gimp_drawable_get_tattoo (GIMP_DRAWABLE (list->data));
if (ltattoo > maxval) if (ltattoo > maxval)
@ -1733,7 +1738,8 @@ gimp_image_set_tattoo_state (GimpImage *gimage,
list; list;
list = g_list_next (list)) list = g_list_next (list))
{ {
Tattoo ctattoo; GimpTattoo ctattoo;
channel = (GimpChannel *) list->data; channel = (GimpChannel *) list->data;
ctattoo = gimp_drawable_get_tattoo (GIMP_DRAWABLE (channel)); ctattoo = gimp_drawable_get_tattoo (GIMP_DRAWABLE (channel));
@ -1751,8 +1757,8 @@ gimp_image_set_tattoo_state (GimpImage *gimage,
if (plist && plist->bz_paths) if (plist && plist->bz_paths)
{ {
Tattoo ptattoo; GimpTattoo ptattoo;
GSList *pl; GSList *pl;
for (pl = plist->bz_paths; pl; pl = g_slist_next (pl)) for (pl = plist->bz_paths; pl; pl = g_slist_next (pl))
{ {
@ -2520,7 +2526,7 @@ gimp_image_get_active_channel (const GimpImage *gimage)
GimpLayer * GimpLayer *
gimp_image_get_layer_by_tattoo (const GimpImage *gimage, gimp_image_get_layer_by_tattoo (const GimpImage *gimage,
Tattoo tattoo) GimpTattoo tattoo)
{ {
GimpLayer *layer; GimpLayer *layer;
GList *list; GList *list;
@ -2542,7 +2548,7 @@ gimp_image_get_layer_by_tattoo (const GimpImage *gimage,
GimpChannel * GimpChannel *
gimp_image_get_channel_by_tattoo (const GimpImage *gimage, gimp_image_get_channel_by_tattoo (const GimpImage *gimage,
Tattoo tattoo) GimpTattoo tattoo)
{ {
GimpChannel *channel; GimpChannel *channel;
GList *list; GList *list;

12
app/core/gimpimage-guides.h
View file

@ -81,7 +81,7 @@ struct _GimpImage
gint instance_count; /* number of instances */ gint instance_count; /* number of instances */
gint disp_count; /* number of displays */ gint disp_count; /* number of displays */
Tattoo tattoo_state; /* the next unique tattoo to use*/ GimpTattoo tattoo_state; /* the next unique tattoo to use*/
TileManager *shadow; /* shadow buffer tiles */ TileManager *shadow; /* shadow buffer tiles */
@ -262,10 +262,10 @@ void gimp_image_parasite_attach (GimpImage *gimage,
void gimp_image_parasite_detach (GimpImage *gimage, void gimp_image_parasite_detach (GimpImage *gimage,
const gchar *parasite); const gchar *parasite);
Tattoo gimp_image_get_new_tattoo (GimpImage *gimage); GimpTattoo gimp_image_get_new_tattoo (GimpImage *gimage);
gboolean gimp_image_set_tattoo_state (GimpImage *gimage, gboolean gimp_image_set_tattoo_state (GimpImage *gimage,
Tattoo val); GimpTattoo val);
Tattoo gimp_image_get_tattoo_state (GimpImage *gimage); GimpTattoo gimp_image_get_tattoo_state (GimpImage *gimage);
void gimp_image_set_paths (GimpImage *gimage, void gimp_image_set_paths (GimpImage *gimage,
PathList *paths); PathList *paths);
@ -303,9 +303,9 @@ gint gimp_image_get_channel_index (const GimpImage *gimage,
GimpLayer * gimp_image_get_active_layer (const GimpImage *gimage); GimpLayer * gimp_image_get_active_layer (const GimpImage *gimage);
GimpChannel * gimp_image_get_active_channel (const GimpImage *gimage); GimpChannel * gimp_image_get_active_channel (const GimpImage *gimage);
GimpLayer * gimp_image_get_layer_by_tattoo (const GimpImage *gimage, GimpLayer * gimp_image_get_layer_by_tattoo (const GimpImage *gimage,
Tattoo tatoo); GimpTattoo tatoo);
GimpChannel * gimp_image_get_channel_by_tattoo (const GimpImage *gimage, GimpChannel * gimp_image_get_channel_by_tattoo (const GimpImage *gimage,
Tattoo tatoo); GimpTattoo tatoo);
GimpChannel * gimp_image_get_channel_by_name (const GimpImage *gimage, GimpChannel * gimp_image_get_channel_by_name (const GimpImage *gimage,
const gchar *name); const gchar *name);
GimpChannel * gimp_image_get_mask (const GimpImage *gimage); GimpChannel * gimp_image_get_mask (const GimpImage *gimage);

6
app/core/gimpimage-mask.c
View file

@ -20,9 +20,10 @@
#include <glib-object.h> #include <glib-object.h>
#include <gtk/gtk.h> #include <glib-object.h>
#include "core-types.h" #include "core-types.h"
#include "pdb/pdb-types.h"
#include "base/boundary.h" #include "base/boundary.h"
#include "base/pixel-region.h" #include "base/pixel-region.h"
@ -39,7 +40,6 @@
#include "gimptoolinfo.h" #include "gimptoolinfo.h"
#include "floating_sel.h" #include "floating_sel.h"
#include "gdisplay.h" /* EEK */
#include "undo.h" #include "undo.h"
#include "pdb/procedural_db.h" #include "pdb/procedural_db.h"
@ -142,7 +142,7 @@ gimage_mask_invalidate (GimpImage *gimage)
GimpChannel *mask; GimpChannel *mask;
/* Turn the current selection off */ /* Turn the current selection off */
gdisplays_selection_visibility (gimage, SELECTION_OFF); gdisplays_selection_visibility (gimage, 0 /* SELECTION_OFF */);
mask = gimp_image_get_mask (gimage); mask = gimp_image_get_mask (gimage);
mask->boundary_known = FALSE; mask->boundary_known = FALSE;

44
app/core/gimpimage-merge.c
View file

@ -1666,7 +1666,8 @@ gimp_image_parasite_detach (GimpImage *gimage,
{ {
GimpParasite *p; GimpParasite *p;
g_return_if_fail (GIMP_IS_IMAGE (gimage) && parasite != NULL); g_return_if_fail (GIMP_IS_IMAGE (gimage));
g_return_if_fail (parasite != NULL);
if (!(p = gimp_parasite_list_find (gimage->parasites, parasite))) if (!(p = gimp_parasite_list_find (gimage->parasites, parasite)))
return; return;
@ -1677,31 +1678,35 @@ gimp_image_parasite_detach (GimpImage *gimage,
gimp_parasite_list_remove (gimage->parasites, parasite); gimp_parasite_list_remove (gimage->parasites, parasite);
} }
Tattoo GimpTattoo
gimp_image_get_new_tattoo (GimpImage *image) gimp_image_get_new_tattoo (GimpImage *gimage)
{ {
image->tattoo_state++; g_return_val_if_fail (GIMP_IS_IMAGE (gimage), 0);
if (image->tattoo_state <= 0) gimage->tattoo_state++;
g_warning ("Tattoo state has become corrupt (2.1 billion operation limit exceded)");
return image->tattoo_state; if (gimage->tattoo_state <= 0)
g_warning ("gimp_image_get_new_tattoo(): Tattoo state has become corrupt (2.1 billion operation limit exceded)");
return gimage->tattoo_state;
} }
Tattoo GimpTattoo
gimp_image_get_tattoo_state (GimpImage *image) gimp_image_get_tattoo_state (GimpImage *gimage)
{ {
return (image->tattoo_state); g_return_val_if_fail (GIMP_IS_IMAGE (gimage), 0);
return gimage->tattoo_state;
} }
gboolean gboolean
gimp_image_set_tattoo_state (GimpImage *gimage, gimp_image_set_tattoo_state (GimpImage *gimage,
Tattoo val) GimpTattoo val)
{ {
GList *list; GList *list;
gboolean retval = TRUE; gboolean retval = TRUE;
GimpChannel *channel; GimpChannel *channel;
Tattoo maxval = 0; GimpTattoo maxval = 0;
Path *pptr = NULL; Path *pptr = NULL;
PathList *plist; PathList *plist;
@ -1711,7 +1716,7 @@ gimp_image_set_tattoo_state (GimpImage *gimage,
list; list;
list = g_list_next (list)) list = g_list_next (list))
{ {
Tattoo ltattoo; GimpTattoo ltattoo;
ltattoo = gimp_drawable_get_tattoo (GIMP_DRAWABLE (list->data)); ltattoo = gimp_drawable_get_tattoo (GIMP_DRAWABLE (list->data));
if (ltattoo > maxval) if (ltattoo > maxval)
@ -1733,7 +1738,8 @@ gimp_image_set_tattoo_state (GimpImage *gimage,
list; list;
list = g_list_next (list)) list = g_list_next (list))
{ {
Tattoo ctattoo; GimpTattoo ctattoo;
channel = (GimpChannel *) list->data; channel = (GimpChannel *) list->data;
ctattoo = gimp_drawable_get_tattoo (GIMP_DRAWABLE (channel)); ctattoo = gimp_drawable_get_tattoo (GIMP_DRAWABLE (channel));
@ -1751,8 +1757,8 @@ gimp_image_set_tattoo_state (GimpImage *gimage,
if (plist && plist->bz_paths) if (plist && plist->bz_paths)
{ {
Tattoo ptattoo; GimpTattoo ptattoo;
GSList *pl; GSList *pl;
for (pl = plist->bz_paths; pl; pl = g_slist_next (pl)) for (pl = plist->bz_paths; pl; pl = g_slist_next (pl))
{ {
@ -2520,7 +2526,7 @@ gimp_image_get_active_channel (const GimpImage *gimage)
GimpLayer * GimpLayer *
gimp_image_get_layer_by_tattoo (const GimpImage *gimage, gimp_image_get_layer_by_tattoo (const GimpImage *gimage,
Tattoo tattoo) GimpTattoo tattoo)
{ {
GimpLayer *layer; GimpLayer *layer;
GList *list; GList *list;
@ -2542,7 +2548,7 @@ gimp_image_get_layer_by_tattoo (const GimpImage *gimage,
GimpChannel * GimpChannel *
gimp_image_get_channel_by_tattoo (const GimpImage *gimage, gimp_image_get_channel_by_tattoo (const GimpImage *gimage,
Tattoo tattoo) GimpTattoo tattoo)
{ {
GimpChannel *channel; GimpChannel *channel;
GList *list; GList *list;

12
app/core/gimpimage-merge.h
View file

@ -81,7 +81,7 @@ struct _GimpImage
gint instance_count; /* number of instances */ gint instance_count; /* number of instances */
gint disp_count; /* number of displays */ gint disp_count; /* number of displays */
Tattoo tattoo_state; /* the next unique tattoo to use*/ GimpTattoo tattoo_state; /* the next unique tattoo to use*/
TileManager *shadow; /* shadow buffer tiles */ TileManager *shadow; /* shadow buffer tiles */
@ -262,10 +262,10 @@ void gimp_image_parasite_attach (GimpImage *gimage,
void gimp_image_parasite_detach (GimpImage *gimage, void gimp_image_parasite_detach (GimpImage *gimage,
const gchar *parasite); const gchar *parasite);
Tattoo gimp_image_get_new_tattoo (GimpImage *gimage); GimpTattoo gimp_image_get_new_tattoo (GimpImage *gimage);
gboolean gimp_image_set_tattoo_state (GimpImage *gimage, gboolean gimp_image_set_tattoo_state (GimpImage *gimage,
Tattoo val); GimpTattoo val);
Tattoo gimp_image_get_tattoo_state (GimpImage *gimage); GimpTattoo gimp_image_get_tattoo_state (GimpImage *gimage);
void gimp_image_set_paths (GimpImage *gimage, void gimp_image_set_paths (GimpImage *gimage,
PathList *paths); PathList *paths);
@ -303,9 +303,9 @@ gint gimp_image_get_channel_index (const GimpImage *gimage,
GimpLayer * gimp_image_get_active_layer (const GimpImage *gimage); GimpLayer * gimp_image_get_active_layer (const GimpImage *gimage);
GimpChannel * gimp_image_get_active_channel (const GimpImage *gimage); GimpChannel * gimp_image_get_active_channel (const GimpImage *gimage);
GimpLayer * gimp_image_get_layer_by_tattoo (const GimpImage *gimage, GimpLayer * gimp_image_get_layer_by_tattoo (const GimpImage *gimage,
Tattoo tatoo); GimpTattoo tatoo);
GimpChannel * gimp_image_get_channel_by_tattoo (const GimpImage *gimage, GimpChannel * gimp_image_get_channel_by_tattoo (const GimpImage *gimage,
Tattoo tatoo); GimpTattoo tatoo);
GimpChannel * gimp_image_get_channel_by_name (const GimpImage *gimage, GimpChannel * gimp_image_get_channel_by_name (const GimpImage *gimage,
const gchar *name); const gchar *name);
GimpChannel * gimp_image_get_mask (const GimpImage *gimage); GimpChannel * gimp_image_get_mask (const GimpImage *gimage);

44
app/core/gimpimage-projection.c
View file

@ -1666,7 +1666,8 @@ gimp_image_parasite_detach (GimpImage *gimage,
{ {
GimpParasite *p; GimpParasite *p;
g_return_if_fail (GIMP_IS_IMAGE (gimage) && parasite != NULL); g_return_if_fail (GIMP_IS_IMAGE (gimage));
g_return_if_fail (parasite != NULL);
if (!(p = gimp_parasite_list_find (gimage->parasites, parasite))) if (!(p = gimp_parasite_list_find (gimage->parasites, parasite)))
return; return;
@ -1677,31 +1678,35 @@ gimp_image_parasite_detach (GimpImage *gimage,
gimp_parasite_list_remove (gimage->parasites, parasite); gimp_parasite_list_remove (gimage->parasites, parasite);
} }
Tattoo GimpTattoo
gimp_image_get_new_tattoo (GimpImage *image) gimp_image_get_new_tattoo (GimpImage *gimage)
{ {
image->tattoo_state++; g_return_val_if_fail (GIMP_IS_IMAGE (gimage), 0);
if (image->tattoo_state <= 0) gimage->tattoo_state++;
g_warning ("Tattoo state has become corrupt (2.1 billion operation limit exceded)");
return image->tattoo_state; if (gimage->tattoo_state <= 0)
g_warning ("gimp_image_get_new_tattoo(): Tattoo state has become corrupt (2.1 billion operation limit exceded)");
return gimage->tattoo_state;
} }
Tattoo GimpTattoo
gimp_image_get_tattoo_state (GimpImage *image) gimp_image_get_tattoo_state (GimpImage *gimage)
{ {
return (image->tattoo_state); g_return_val_if_fail (GIMP_IS_IMAGE (gimage), 0);
return gimage->tattoo_state;
} }
gboolean gboolean
gimp_image_set_tattoo_state (GimpImage *gimage, gimp_image_set_tattoo_state (GimpImage *gimage,
Tattoo val) GimpTattoo val)
{ {
GList *list; GList *list;
gboolean retval = TRUE; gboolean retval = TRUE;
GimpChannel *channel; GimpChannel *channel;
Tattoo maxval = 0; GimpTattoo maxval = 0;
Path *pptr = NULL; Path *pptr = NULL;
PathList *plist; PathList *plist;
@ -1711,7 +1716,7 @@ gimp_image_set_tattoo_state (GimpImage *gimage,
list; list;
list = g_list_next (list)) list = g_list_next (list))
{ {
Tattoo ltattoo; GimpTattoo ltattoo;
ltattoo = gimp_drawable_get_tattoo (GIMP_DRAWABLE (list->data)); ltattoo = gimp_drawable_get_tattoo (GIMP_DRAWABLE (list->data));
if (ltattoo > maxval) if (ltattoo > maxval)
@ -1733,7 +1738,8 @@ gimp_image_set_tattoo_state (GimpImage *gimage,
list; list;
list = g_list_next (list)) list = g_list_next (list))
{ {
Tattoo ctattoo; GimpTattoo ctattoo;
channel = (GimpChannel *) list->data; channel = (GimpChannel *) list->data;
ctattoo = gimp_drawable_get_tattoo (GIMP_DRAWABLE (channel)); ctattoo = gimp_drawable_get_tattoo (GIMP_DRAWABLE (channel));
@ -1751,8 +1757,8 @@ gimp_image_set_tattoo_state (GimpImage *gimage,
if (plist && plist->bz_paths) if (plist && plist->bz_paths)
{ {
Tattoo ptattoo; GimpTattoo ptattoo;
GSList *pl; GSList *pl;
for (pl = plist->bz_paths; pl; pl = g_slist_next (pl)) for (pl = plist->bz_paths; pl; pl = g_slist_next (pl))
{ {
@ -2520,7 +2526,7 @@ gimp_image_get_active_channel (const GimpImage *gimage)
GimpLayer * GimpLayer *
gimp_image_get_layer_by_tattoo (const GimpImage *gimage, gimp_image_get_layer_by_tattoo (const GimpImage *gimage,
Tattoo tattoo) GimpTattoo tattoo)
{ {
GimpLayer *layer; GimpLayer *layer;
GList *list; GList *list;
@ -2542,7 +2548,7 @@ gimp_image_get_layer_by_tattoo (const GimpImage *gimage,
GimpChannel * GimpChannel *
gimp_image_get_channel_by_tattoo (const GimpImage *gimage, gimp_image_get_channel_by_tattoo (const GimpImage *gimage,
Tattoo tattoo) GimpTattoo tattoo)
{ {
GimpChannel *channel; GimpChannel *channel;
GList *list; GList *list;

12
app/core/gimpimage-projection.h
View file

@ -81,7 +81,7 @@ struct _GimpImage
gint instance_count; /* number of instances */ gint instance_count; /* number of instances */
gint disp_count; /* number of displays */ gint disp_count; /* number of displays */
Tattoo tattoo_state; /* the next unique tattoo to use*/ GimpTattoo tattoo_state; /* the next unique tattoo to use*/
TileManager *shadow; /* shadow buffer tiles */ TileManager *shadow; /* shadow buffer tiles */
@ -262,10 +262,10 @@ void gimp_image_parasite_attach (GimpImage *gimage,
void gimp_image_parasite_detach (GimpImage *gimage, void gimp_image_parasite_detach (GimpImage *gimage,
const gchar *parasite); const gchar *parasite);
Tattoo gimp_image_get_new_tattoo (GimpImage *gimage); GimpTattoo gimp_image_get_new_tattoo (GimpImage *gimage);
gboolean gimp_image_set_tattoo_state (GimpImage *gimage, gboolean gimp_image_set_tattoo_state (GimpImage *gimage,
Tattoo val); GimpTattoo val);
Tattoo gimp_image_get_tattoo_state (GimpImage *gimage); GimpTattoo gimp_image_get_tattoo_state (GimpImage *gimage);
void gimp_image_set_paths (GimpImage *gimage, void gimp_image_set_paths (GimpImage *gimage,
PathList *paths); PathList *paths);
@ -303,9 +303,9 @@ gint gimp_image_get_channel_index (const GimpImage *gimage,
GimpLayer * gimp_image_get_active_layer (const GimpImage *gimage); GimpLayer * gimp_image_get_active_layer (const GimpImage *gimage);
GimpChannel * gimp_image_get_active_channel (const GimpImage *gimage); GimpChannel * gimp_image_get_active_channel (const GimpImage *gimage);
GimpLayer * gimp_image_get_layer_by_tattoo (const GimpImage *gimage, GimpLayer * gimp_image_get_layer_by_tattoo (const GimpImage *gimage,
Tattoo tatoo); GimpTattoo tatoo);
GimpChannel * gimp_image_get_channel_by_tattoo (const GimpImage *gimage, GimpChannel * gimp_image_get_channel_by_tattoo (const GimpImage *gimage,
Tattoo tatoo); GimpTattoo tatoo);
GimpChannel * gimp_image_get_channel_by_name (const GimpImage *gimage, GimpChannel * gimp_image_get_channel_by_name (const GimpImage *gimage,
const gchar *name); const gchar *name);
GimpChannel * gimp_image_get_mask (const GimpImage *gimage); GimpChannel * gimp_image_get_mask (const GimpImage *gimage);

44
app/core/gimpimage-resize.c
View file

@ -1666,7 +1666,8 @@ gimp_image_parasite_detach (GimpImage *gimage,
{ {
GimpParasite *p; GimpParasite *p;
g_return_if_fail (GIMP_IS_IMAGE (gimage) && parasite != NULL); g_return_if_fail (GIMP_IS_IMAGE (gimage));
g_return_if_fail (parasite != NULL);
if (!(p = gimp_parasite_list_find (gimage->parasites, parasite))) if (!(p = gimp_parasite_list_find (gimage->parasites, parasite)))
return; return;
@ -1677,31 +1678,35 @@ gimp_image_parasite_detach (GimpImage *gimage,
gimp_parasite_list_remove (gimage->parasites, parasite); gimp_parasite_list_remove (gimage->parasites, parasite);
} }
Tattoo GimpTattoo
gimp_image_get_new_tattoo (GimpImage *image) gimp_image_get_new_tattoo (GimpImage *gimage)
{ {
image->tattoo_state++; g_return_val_if_fail (GIMP_IS_IMAGE (gimage), 0);
if (image->tattoo_state <= 0) gimage->tattoo_state++;
g_warning ("Tattoo state has become corrupt (2.1 billion operation limit exceded)");
return image->tattoo_state; if (gimage->tattoo_state <= 0)
g_warning ("gimp_image_get_new_tattoo(): Tattoo state has become corrupt (2.1 billion operation limit exceded)");
return gimage->tattoo_state;
} }
Tattoo GimpTattoo
gimp_image_get_tattoo_state (GimpImage *image) gimp_image_get_tattoo_state (GimpImage *gimage)
{ {
return (image->tattoo_state); g_return_val_if_fail (GIMP_IS_IMAGE (gimage), 0);
return gimage->tattoo_state;
} }
gboolean gboolean
gimp_image_set_tattoo_state (GimpImage *gimage, gimp_image_set_tattoo_state (GimpImage *gimage,
Tattoo val) GimpTattoo val)
{ {
GList *list; GList *list;
gboolean retval = TRUE; gboolean retval = TRUE;
GimpChannel *channel; GimpChannel *channel;
Tattoo maxval = 0; GimpTattoo maxval = 0;
Path *pptr = NULL; Path *pptr = NULL;
PathList *plist; PathList *plist;
@ -1711,7 +1716,7 @@ gimp_image_set_tattoo_state (GimpImage *gimage,
list; list;
list = g_list_next (list)) list = g_list_next (list))
{ {
Tattoo ltattoo; GimpTattoo ltattoo;
ltattoo = gimp_drawable_get_tattoo (GIMP_DRAWABLE (list->data)); ltattoo = gimp_drawable_get_tattoo (GIMP_DRAWABLE (list->data));
if (ltattoo > maxval) if (ltattoo > maxval)
@ -1733,7 +1738,8 @@ gimp_image_set_tattoo_state (GimpImage *gimage,
list; list;
list = g_list_next (list)) list = g_list_next (list))
{ {
Tattoo ctattoo; GimpTattoo ctattoo;
channel = (GimpChannel *) list->data; channel = (GimpChannel *) list->data;
ctattoo = gimp_drawable_get_tattoo (GIMP_DRAWABLE (channel)); ctattoo = gimp_drawable_get_tattoo (GIMP_DRAWABLE (channel));
@ -1751,8 +1757,8 @@ gimp_image_set_tattoo_state (GimpImage *gimage,
if (plist && plist->bz_paths) if (plist && plist->bz_paths)
{ {
Tattoo ptattoo; GimpTattoo ptattoo;
GSList *pl; GSList *pl;
for (pl = plist->bz_paths; pl; pl = g_slist_next (pl)) for (pl = plist->bz_paths; pl; pl = g_slist_next (pl))
{ {
@ -2520,7 +2526,7 @@ gimp_image_get_active_channel (const GimpImage *gimage)
GimpLayer * GimpLayer *
gimp_image_get_layer_by_tattoo (const GimpImage *gimage, gimp_image_get_layer_by_tattoo (const GimpImage *gimage,
Tattoo tattoo) GimpTattoo tattoo)
{ {
GimpLayer *layer; GimpLayer *layer;
GList *list; GList *list;
@ -2542,7 +2548,7 @@ gimp_image_get_layer_by_tattoo (const GimpImage *gimage,
GimpChannel * GimpChannel *
gimp_image_get_channel_by_tattoo (const GimpImage *gimage, gimp_image_get_channel_by_tattoo (const GimpImage *gimage,
Tattoo tattoo) GimpTattoo tattoo)
{ {
GimpChannel *channel; GimpChannel *channel;
GList *list; GList *list;

12
app/core/gimpimage-resize.h
View file

@ -81,7 +81,7 @@ struct _GimpImage
gint instance_count; /* number of instances */ gint instance_count; /* number of instances */
gint disp_count; /* number of displays */ gint disp_count; /* number of displays */
Tattoo tattoo_state; /* the next unique tattoo to use*/ GimpTattoo tattoo_state; /* the next unique tattoo to use*/
TileManager *shadow; /* shadow buffer tiles */ TileManager *shadow; /* shadow buffer tiles */
@ -262,10 +262,10 @@ void gimp_image_parasite_attach (GimpImage *gimage,
void gimp_image_parasite_detach (GimpImage *gimage, void gimp_image_parasite_detach (GimpImage *gimage,
const gchar *parasite); const gchar *parasite);
Tattoo gimp_image_get_new_tattoo (GimpImage *gimage); GimpTattoo gimp_image_get_new_tattoo (GimpImage *gimage);
gboolean gimp_image_set_tattoo_state (GimpImage *gimage, gboolean gimp_image_set_tattoo_state (GimpImage *gimage,
Tattoo val); GimpTattoo val);
Tattoo gimp_image_get_tattoo_state (GimpImage *gimage); GimpTattoo gimp_image_get_tattoo_state (GimpImage *gimage);
void gimp_image_set_paths (GimpImage *gimage, void gimp_image_set_paths (GimpImage *gimage,
PathList *paths); PathList *paths);
@ -303,9 +303,9 @@ gint gimp_image_get_channel_index (const GimpImage *gimage,
GimpLayer * gimp_image_get_active_layer (const GimpImage *gimage); GimpLayer * gimp_image_get_active_layer (const GimpImage *gimage);
GimpChannel * gimp_image_get_active_channel (const GimpImage *gimage); GimpChannel * gimp_image_get_active_channel (const GimpImage *gimage);
GimpLayer * gimp_image_get_layer_by_tattoo (const GimpImage *gimage, GimpLayer * gimp_image_get_layer_by_tattoo (const GimpImage *gimage,
Tattoo tatoo); GimpTattoo tatoo);
GimpChannel * gimp_image_get_channel_by_tattoo (const GimpImage *gimage, GimpChannel * gimp_image_get_channel_by_tattoo (const GimpImage *gimage,
Tattoo tatoo); GimpTattoo tatoo);
GimpChannel * gimp_image_get_channel_by_name (const GimpImage *gimage, GimpChannel * gimp_image_get_channel_by_name (const GimpImage *gimage,
const gchar *name); const gchar *name);
GimpChannel * gimp_image_get_mask (const GimpImage *gimage); GimpChannel * gimp_image_get_mask (const GimpImage *gimage);

44
app/core/gimpimage-scale.c
View file

@ -1666,7 +1666,8 @@ gimp_image_parasite_detach (GimpImage *gimage,
{ {
GimpParasite *p; GimpParasite *p;
g_return_if_fail (GIMP_IS_IMAGE (gimage) && parasite != NULL); g_return_if_fail (GIMP_IS_IMAGE (gimage));
g_return_if_fail (parasite != NULL);
if (!(p = gimp_parasite_list_find (gimage->parasites, parasite))) if (!(p = gimp_parasite_list_find (gimage->parasites, parasite)))
return; return;
@ -1677,31 +1678,35 @@ gimp_image_parasite_detach (GimpImage *gimage,
gimp_parasite_list_remove (gimage->parasites, parasite); gimp_parasite_list_remove (gimage->parasites, parasite);
} }
Tattoo GimpTattoo
gimp_image_get_new_tattoo (GimpImage *image) gimp_image_get_new_tattoo (GimpImage *gimage)
{ {
image->tattoo_state++; g_return_val_if_fail (GIMP_IS_IMAGE (gimage), 0);
if (image->tattoo_state <= 0) gimage->tattoo_state++;
g_warning ("Tattoo state has become corrupt (2.1 billion operation limit exceded)");
return image->tattoo_state; if (gimage->tattoo_state <= 0)
g_warning ("gimp_image_get_new_tattoo(): Tattoo state has become corrupt (2.1 billion operation limit exceded)");
return gimage->tattoo_state;
} }
Tattoo GimpTattoo
gimp_image_get_tattoo_state (GimpImage *image) gimp_image_get_tattoo_state (GimpImage *gimage)
{ {
return (image->tattoo_state); g_return_val_if_fail (GIMP_IS_IMAGE (gimage), 0);
return gimage->tattoo_state;
} }
gboolean gboolean
gimp_image_set_tattoo_state (GimpImage *gimage, gimp_image_set_tattoo_state (GimpImage *gimage,
Tattoo val) GimpTattoo val)
{ {
GList *list; GList *list;
gboolean retval = TRUE; gboolean retval = TRUE;
GimpChannel *channel; GimpChannel *channel;
Tattoo maxval = 0; GimpTattoo maxval = 0;
Path *pptr = NULL; Path *pptr = NULL;
PathList *plist; PathList *plist;
@ -1711,7 +1716,7 @@ gimp_image_set_tattoo_state (GimpImage *gimage,
list; list;
list = g_list_next (list)) list = g_list_next (list))
{ {
Tattoo ltattoo; GimpTattoo ltattoo;
ltattoo = gimp_drawable_get_tattoo (GIMP_DRAWABLE (list->data)); ltattoo = gimp_drawable_get_tattoo (GIMP_DRAWABLE (list->data));
if (ltattoo > maxval) if (ltattoo > maxval)
@ -1733,7 +1738,8 @@ gimp_image_set_tattoo_state (GimpImage *gimage,
list; list;
list = g_list_next (list)) list = g_list_next (list))
{ {
Tattoo ctattoo; GimpTattoo ctattoo;
channel = (GimpChannel *) list->data; channel = (GimpChannel *) list->data;
ctattoo = gimp_drawable_get_tattoo (GIMP_DRAWABLE (channel)); ctattoo = gimp_drawable_get_tattoo (GIMP_DRAWABLE (channel));
@ -1751,8 +1757,8 @@ gimp_image_set_tattoo_state (GimpImage *gimage,
if (plist && plist->bz_paths) if (plist && plist->bz_paths)
{ {
Tattoo ptattoo; GimpTattoo ptattoo;
GSList *pl; GSList *pl;
for (pl = plist->bz_paths; pl; pl = g_slist_next (pl)) for (pl = plist->bz_paths; pl; pl = g_slist_next (pl))
{ {
@ -2520,7 +2526,7 @@ gimp_image_get_active_channel (const GimpImage *gimage)
GimpLayer * GimpLayer *
gimp_image_get_layer_by_tattoo (const GimpImage *gimage, gimp_image_get_layer_by_tattoo (const GimpImage *gimage,
Tattoo tattoo) GimpTattoo tattoo)
{ {
GimpLayer *layer; GimpLayer *layer;
GList *list; GList *list;
@ -2542,7 +2548,7 @@ gimp_image_get_layer_by_tattoo (const GimpImage *gimage,
GimpChannel * GimpChannel *
gimp_image_get_channel_by_tattoo (const GimpImage *gimage, gimp_image_get_channel_by_tattoo (const GimpImage *gimage,
Tattoo tattoo) GimpTattoo tattoo)
{ {
GimpChannel *channel; GimpChannel *channel;
GList *list; GList *list;

12
app/core/gimpimage-scale.h
View file

@ -81,7 +81,7 @@ struct _GimpImage
gint instance_count; /* number of instances */ gint instance_count; /* number of instances */
gint disp_count; /* number of displays */ gint disp_count; /* number of displays */
Tattoo tattoo_state; /* the next unique tattoo to use*/ GimpTattoo tattoo_state; /* the next unique tattoo to use*/
TileManager *shadow; /* shadow buffer tiles */ TileManager *shadow; /* shadow buffer tiles */
@ -262,10 +262,10 @@ void gimp_image_parasite_attach (GimpImage *gimage,
void gimp_image_parasite_detach (GimpImage *gimage, void gimp_image_parasite_detach (GimpImage *gimage,
const gchar *parasite); const gchar *parasite);
Tattoo gimp_image_get_new_tattoo (GimpImage *gimage); GimpTattoo gimp_image_get_new_tattoo (GimpImage *gimage);
gboolean gimp_image_set_tattoo_state (GimpImage *gimage, gboolean gimp_image_set_tattoo_state (GimpImage *gimage,
Tattoo val); GimpTattoo val);
Tattoo gimp_image_get_tattoo_state (GimpImage *gimage); GimpTattoo gimp_image_get_tattoo_state (GimpImage *gimage);
void gimp_image_set_paths (GimpImage *gimage, void gimp_image_set_paths (GimpImage *gimage,
PathList *paths); PathList *paths);
@ -303,9 +303,9 @@ gint gimp_image_get_channel_index (const GimpImage *gimage,
GimpLayer * gimp_image_get_active_layer (const GimpImage *gimage); GimpLayer * gimp_image_get_active_layer (const GimpImage *gimage);
GimpChannel * gimp_image_get_active_channel (const GimpImage *gimage); GimpChannel * gimp_image_get_active_channel (const GimpImage *gimage);
GimpLayer * gimp_image_get_layer_by_tattoo (const GimpImage *gimage, GimpLayer * gimp_image_get_layer_by_tattoo (const GimpImage *gimage,
Tattoo tatoo); GimpTattoo tatoo);
GimpChannel * gimp_image_get_channel_by_tattoo (const GimpImage *gimage, GimpChannel * gimp_image_get_channel_by_tattoo (const GimpImage *gimage,
Tattoo tatoo); GimpTattoo tatoo);
GimpChannel * gimp_image_get_channel_by_name (const GimpImage *gimage, GimpChannel * gimp_image_get_channel_by_name (const GimpImage *gimage,
const gchar *name); const gchar *name);
GimpChannel * gimp_image_get_mask (const GimpImage *gimage); GimpChannel * gimp_image_get_mask (const GimpImage *gimage);

44
app/core/gimpimage.c
View file

@ -1666,7 +1666,8 @@ gimp_image_parasite_detach (GimpImage *gimage,
{ {
GimpParasite *p; GimpParasite *p;
g_return_if_fail (GIMP_IS_IMAGE (gimage) && parasite != NULL); g_return_if_fail (GIMP_IS_IMAGE (gimage));
g_return_if_fail (parasite != NULL);
if (!(p = gimp_parasite_list_find (gimage->parasites, parasite))) if (!(p = gimp_parasite_list_find (gimage->parasites, parasite)))
return; return;
@ -1677,31 +1678,35 @@ gimp_image_parasite_detach (GimpImage *gimage,
gimp_parasite_list_remove (gimage->parasites, parasite); gimp_parasite_list_remove (gimage->parasites, parasite);
} }
Tattoo GimpTattoo
gimp_image_get_new_tattoo (GimpImage *image) gimp_image_get_new_tattoo (GimpImage *gimage)
{ {
image->tattoo_state++; g_return_val_if_fail (GIMP_IS_IMAGE (gimage), 0);
if (image->tattoo_state <= 0) gimage->tattoo_state++;
g_warning ("Tattoo state has become corrupt (2.1 billion operation limit exceded)");
return image->tattoo_state; if (gimage->tattoo_state <= 0)
g_warning ("gimp_image_get_new_tattoo(): Tattoo state has become corrupt (2.1 billion operation limit exceded)");
return gimage->tattoo_state;
} }
Tattoo GimpTattoo
gimp_image_get_tattoo_state (GimpImage *image) gimp_image_get_tattoo_state (GimpImage *gimage)
{ {
return (image->tattoo_state); g_return_val_if_fail (GIMP_IS_IMAGE (gimage), 0);
return gimage->tattoo_state;
} }
gboolean gboolean
gimp_image_set_tattoo_state (GimpImage *gimage, gimp_image_set_tattoo_state (GimpImage *gimage,
Tattoo val) GimpTattoo val)
{ {
GList *list; GList *list;
gboolean retval = TRUE; gboolean retval = TRUE;
GimpChannel *channel; GimpChannel *channel;
Tattoo maxval = 0; GimpTattoo maxval = 0;
Path *pptr = NULL; Path *pptr = NULL;
PathList *plist; PathList *plist;
@ -1711,7 +1716,7 @@ gimp_image_set_tattoo_state (GimpImage *gimage,
list; list;
list = g_list_next (list)) list = g_list_next (list))
{ {
Tattoo ltattoo; GimpTattoo ltattoo;
ltattoo = gimp_drawable_get_tattoo (GIMP_DRAWABLE (list->data)); ltattoo = gimp_drawable_get_tattoo (GIMP_DRAWABLE (list->data));
if (ltattoo > maxval) if (ltattoo > maxval)
@ -1733,7 +1738,8 @@ gimp_image_set_tattoo_state (GimpImage *gimage,
list; list;
list = g_list_next (list)) list = g_list_next (list))
{ {
Tattoo ctattoo; GimpTattoo ctattoo;
channel = (GimpChannel *) list->data; channel = (GimpChannel *) list->data;
ctattoo = gimp_drawable_get_tattoo (GIMP_DRAWABLE (channel)); ctattoo = gimp_drawable_get_tattoo (GIMP_DRAWABLE (channel));
@ -1751,8 +1757,8 @@ gimp_image_set_tattoo_state (GimpImage *gimage,
if (plist && plist->bz_paths) if (plist && plist->bz_paths)
{ {
Tattoo ptattoo; GimpTattoo ptattoo;
GSList *pl; GSList *pl;
for (pl = plist->bz_paths; pl; pl = g_slist_next (pl)) for (pl = plist->bz_paths; pl; pl = g_slist_next (pl))
{ {
@ -2520,7 +2526,7 @@ gimp_image_get_active_channel (const GimpImage *gimage)
GimpLayer * GimpLayer *
gimp_image_get_layer_by_tattoo (const GimpImage *gimage, gimp_image_get_layer_by_tattoo (const GimpImage *gimage,
Tattoo tattoo) GimpTattoo tattoo)
{ {
GimpLayer *layer; GimpLayer *layer;
GList *list; GList *list;
@ -2542,7 +2548,7 @@ gimp_image_get_layer_by_tattoo (const GimpImage *gimage,
GimpChannel * GimpChannel *
gimp_image_get_channel_by_tattoo (const GimpImage *gimage, gimp_image_get_channel_by_tattoo (const GimpImage *gimage,
Tattoo tattoo) GimpTattoo tattoo)
{ {
GimpChannel *channel; GimpChannel *channel;
GList *list; GList *list;

12
app/core/gimpimage.h
View file

@ -81,7 +81,7 @@ struct _GimpImage
gint instance_count; /* number of instances */ gint instance_count; /* number of instances */
gint disp_count; /* number of displays */ gint disp_count; /* number of displays */
Tattoo tattoo_state; /* the next unique tattoo to use*/ GimpTattoo tattoo_state; /* the next unique tattoo to use*/
TileManager *shadow; /* shadow buffer tiles */ TileManager *shadow; /* shadow buffer tiles */
@ -262,10 +262,10 @@ void gimp_image_parasite_attach (GimpImage *gimage,
void gimp_image_parasite_detach (GimpImage *gimage, void gimp_image_parasite_detach (GimpImage *gimage,
const gchar *parasite); const gchar *parasite);
Tattoo gimp_image_get_new_tattoo (GimpImage *gimage); GimpTattoo gimp_image_get_new_tattoo (GimpImage *gimage);
gboolean gimp_image_set_tattoo_state (GimpImage *gimage, gboolean gimp_image_set_tattoo_state (GimpImage *gimage,
Tattoo val); GimpTattoo val);
Tattoo gimp_image_get_tattoo_state (GimpImage *gimage); GimpTattoo gimp_image_get_tattoo_state (GimpImage *gimage);
void gimp_image_set_paths (GimpImage *gimage, void gimp_image_set_paths (GimpImage *gimage,
PathList *paths); PathList *paths);
@ -303,9 +303,9 @@ gint gimp_image_get_channel_index (const GimpImage *gimage,
GimpLayer * gimp_image_get_active_layer (const GimpImage *gimage); GimpLayer * gimp_image_get_active_layer (const GimpImage *gimage);
GimpChannel * gimp_image_get_active_channel (const GimpImage *gimage); GimpChannel * gimp_image_get_active_channel (const GimpImage *gimage);
GimpLayer * gimp_image_get_layer_by_tattoo (const GimpImage *gimage, GimpLayer * gimp_image_get_layer_by_tattoo (const GimpImage *gimage,
Tattoo tatoo); GimpTattoo tatoo);
GimpChannel * gimp_image_get_channel_by_tattoo (const GimpImage *gimage, GimpChannel * gimp_image_get_channel_by_tattoo (const GimpImage *gimage,
Tattoo tatoo); GimpTattoo tatoo);
GimpChannel * gimp_image_get_channel_by_name (const GimpImage *gimage, GimpChannel * gimp_image_get_channel_by_name (const GimpImage *gimage,
const gchar *name); const gchar *name);
GimpChannel * gimp_image_get_mask (const GimpImage *gimage); GimpChannel * gimp_image_get_mask (const GimpImage *gimage);

182
app/core/gimpimagemap.c
View file

@ -35,81 +35,34 @@
#include "image_map.h" #include "image_map.h"
#define WAITING 0 typedef enum
#define WORKING 1 {
IMAGE_MAP_WAITING,
IMAGE_MAP_WORKING
} ImageMapState;
#define WORK_DELAY 1
struct _ImageMap struct _ImageMap
{ {
GDisplay *gdisp; GDisplay *gdisp;
GimpDrawable *drawable; GimpDrawable *drawable;
TileManager *undo_tiles; TileManager *undo_tiles;
ImageMapApplyFunc apply_func; ImageMapApplyFunc apply_func;
gpointer user_data; gpointer user_data;
PixelRegion srcPR, destPR; PixelRegion srcPR;
void *pr; PixelRegion destPR;
gint state; PixelRegionIterator *PRI;
gint idle; ImageMapState state;
guint idle_id;
}; };
/**************************/ /* local function prototypes */
/* Function definitions */
static gint static gboolean image_map_do (gpointer data);
image_map_do (gpointer data)
{
ImageMap *image_map;
GimpImage *gimage;
PixelRegion shadowPR;
gint x, y, w, h;
image_map = (ImageMap *) data;
if (! (gimage = gimp_drawable_gimage (image_map->drawable))) /* public functions */
{
image_map->state = WAITING;
return FALSE;
}
/* Process the pixel regions and apply the image mapping */
(* image_map->apply_func) (&image_map->srcPR,
&image_map->destPR,
image_map->user_data);
x = image_map->destPR.x;
y = image_map->destPR.y;
w = image_map->destPR.w;
h = image_map->destPR.h;
/* apply the results */
pixel_region_init (&shadowPR, gimage->shadow, x, y, w, h, FALSE);
gimp_image_apply_image (gimage, image_map->drawable, &shadowPR,
FALSE, OPAQUE_OPACITY, REPLACE_MODE, NULL, x, y);
/* display the results */
if (image_map->gdisp)
{
gimp_drawable_update (image_map->drawable,
x, y,
w, h);
gdisplay_flush_now (image_map->gdisp);
}
image_map->pr = pixel_regions_process (image_map->pr);
if (image_map->pr == NULL)
{
image_map->state = WAITING;
gdisplays_flush ();
return FALSE;
}
return TRUE;
}
ImageMap * ImageMap *
image_map_create (GDisplay *gdisp, image_map_create (GDisplay *gdisp,
@ -118,7 +71,6 @@ image_map_create (GDisplay *gdisp,
ImageMap *image_map; ImageMap *image_map;
g_return_val_if_fail (gdisp != NULL, NULL); g_return_val_if_fail (gdisp != NULL, NULL);
g_return_val_if_fail (drawable != NULL, NULL);
g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL); g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
image_map = g_new0 (ImageMap, 1); image_map = g_new0 (ImageMap, 1);
@ -126,7 +78,10 @@ image_map_create (GDisplay *gdisp,
image_map->gdisp = gdisp; image_map->gdisp = gdisp;
image_map->drawable = drawable; image_map->drawable = drawable;
image_map->undo_tiles = NULL; image_map->undo_tiles = NULL;
image_map->state = WAITING; image_map->apply_func = NULL;
image_map->user_data = NULL;
image_map->state = IMAGE_MAP_WAITING;
image_map->idle_id = 0;
/* Interactive tools based on image_map disable the undo stack /* Interactive tools based on image_map disable the undo stack
* to avert any unintented undo interaction through the UI * to avert any unintented undo interaction through the UI
@ -154,12 +109,13 @@ image_map_apply (ImageMap *image_map,
image_map->user_data = apply_data; image_map->user_data = apply_data;
/* If we're still working, remove the timer */ /* If we're still working, remove the timer */
if (image_map->state == WORKING) if (image_map->state == IMAGE_MAP_WORKING)
{ {
gtk_idle_remove (image_map->idle); g_source_remove (image_map->idle_id);
pixel_regions_process_stop (image_map->pr); image_map->idle_id = 0;
image_map->pr = NULL; pixel_regions_process_stop (image_map->PRI);
image_map->PRI = NULL;
} }
/* Make sure the drawable is still valid */ /* Make sure the drawable is still valid */
@ -236,11 +192,13 @@ image_map_apply (ImageMap *image_map,
x1, y1, (x2 - x1), (y2 - y1), TRUE); x1, y1, (x2 - x1), (y2 - y1), TRUE);
/* Apply the image transformation to the pixels */ /* Apply the image transformation to the pixels */
image_map->pr = pixel_regions_register (2, &image_map->srcPR, &image_map->destPR); image_map->PRI = pixel_regions_register (2,
&image_map->srcPR,
&image_map->destPR);
/* Start the intermittant work procedure */ /* Start the intermittant work procedure */
image_map->state = WORKING; image_map->state = IMAGE_MAP_WORKING;
image_map->idle = gtk_idle_add (image_map_do, image_map); image_map->idle_id = g_idle_add (image_map_do, image_map);
} }
void void
@ -250,12 +208,13 @@ image_map_commit (ImageMap *image_map)
g_return_if_fail (image_map != NULL); g_return_if_fail (image_map != NULL);
if (image_map->state == WORKING) if (image_map->state == IMAGE_MAP_WORKING)
{ {
gtk_idle_remove (image_map->idle); g_source_remove (image_map->idle_id);
image_map->idle_id = 0;
/* Finish the changes */ /* Finish the changes */
while (image_map_do (image_map)) ; while (image_map_do (image_map));
} }
/* Make sure the drawable is still valid */ /* Make sure the drawable is still valid */
@ -287,14 +246,16 @@ image_map_clear (ImageMap *image_map)
g_return_if_fail (image_map != NULL); g_return_if_fail (image_map != NULL);
if (image_map->state == WORKING) if (image_map->state == IMAGE_MAP_WORKING)
{ {
gtk_idle_remove (image_map->idle); g_source_remove (image_map->idle_id);
pixel_regions_process_stop (image_map->pr); image_map->idle_id = 0;
image_map->pr = NULL;
pixel_regions_process_stop (image_map->PRI);
image_map->PRI = NULL;
} }
image_map->state = WAITING; image_map->state = IMAGE_MAP_WAITING;
/* Make sure the drawable is still valid */ /* Make sure the drawable is still valid */
if (! gimp_drawable_gimage (image_map->drawable)) if (! gimp_drawable_gimage (image_map->drawable))
@ -412,3 +373,60 @@ image_map_get_color_at (ImageMap *image_map,
return NULL; return NULL;
} }
} }
/* private functions */
static gboolean
image_map_do (gpointer data)
{
ImageMap *image_map;
GimpImage *gimage;
PixelRegion shadowPR;
gint x, y, w, h;
image_map = (ImageMap *) data;
if (! (gimage = gimp_drawable_gimage (image_map->drawable)))
{
image_map->state = IMAGE_MAP_WAITING;
return FALSE;
}
/* Process the pixel regions and apply the image mapping */
(* image_map->apply_func) (&image_map->srcPR,
&image_map->destPR,
image_map->user_data);
x = image_map->destPR.x;
y = image_map->destPR.y;
w = image_map->destPR.w;
h = image_map->destPR.h;
/* apply the results */
pixel_region_init (&shadowPR, gimage->shadow, x, y, w, h, FALSE);
gimp_image_apply_image (gimage, image_map->drawable, &shadowPR,
FALSE, OPAQUE_OPACITY, REPLACE_MODE, NULL, x, y);
/* display the results */
if (image_map->gdisp)
{
gimp_drawable_update (image_map->drawable,
x, y,
w, h);
gdisplay_flush_now (image_map->gdisp);
}
image_map->PRI = pixel_regions_process (image_map->PRI);
if (image_map->PRI == NULL)
{
image_map->state = IMAGE_MAP_WAITING;
gdisplays_flush ();
return FALSE;
}
return TRUE;
}

11
app/core/gimpimagemap.h
View file

@ -20,12 +20,19 @@
#define __IMAGE_MAP_H__ #define __IMAGE_MAP_H__
typedef void (* ImageMapApplyFunc) (PixelRegion *srcPR,
PixelRegion *destPR,
gpointer data);
/* Image Map functions */ /* Image Map functions */
/* Successive image map apply functions can be called, but eventually /* Successive image map apply functions can be called, but eventually
* MUST be followed with an image_map_commit or an image_map_abort call * MUST be followed with an image_map_commit or an image_map_abort call
* The image map is no longer valid after a call to commit or abort. * The image map is no longer valid after a call to commit or abort.
*/ */
ImageMap * image_map_create (GDisplay *gdisp, ImageMap * image_map_create (GDisplay *gdisp,
GimpDrawable *drawable); GimpDrawable *drawable);
void image_map_apply (ImageMap *image_map, void image_map_apply (ImageMap *image_map,

7
app/core/gimplayer.c
View file

@ -25,8 +25,6 @@
#include <glib-object.h> #include <glib-object.h>
#include <gtk/gtk.h> /* EEK */
#include "libgimpmath/gimpmath.h" #include "libgimpmath/gimpmath.h"
#include "core-types.h" #include "core-types.h"
@ -45,7 +43,6 @@
#include "gimpparasitelist.h" #include "gimpparasitelist.h"
#include "floating_sel.h" #include "floating_sel.h"
#include "gdisplay.h" /* EEK */
#include "undo.h" #include "undo.h"
#include "libgimp/gimpintl.h" #include "libgimp/gimpintl.h"
@ -1292,10 +1289,10 @@ gimp_layer_invalidate_boundary (GimpLayer *layer)
return; return;
/* Turn the current selection off */ /* Turn the current selection off */
gdisplays_selection_visibility (gimage, SELECTION_OFF); gdisplays_selection_visibility (gimage, 0 /* SELECTION_OFF */);
/* clear the affected region surrounding the layer */ /* clear the affected region surrounding the layer */
gdisplays_selection_visibility (gimage, SELECTION_LAYER_OFF); gdisplays_selection_visibility (gimage, 1 /* SELECTION_LAYER_OFF */);
/* get the selection mask channel */ /* get the selection mask channel */
mask = gimp_image_get_mask (gimage); mask = gimp_image_get_mask (gimage);

44
app/core/gimpprojection-construct.c
View file

@ -1666,7 +1666,8 @@ gimp_image_parasite_detach (GimpImage *gimage,
{ {
GimpParasite *p; GimpParasite *p;
g_return_if_fail (GIMP_IS_IMAGE (gimage) && parasite != NULL); g_return_if_fail (GIMP_IS_IMAGE (gimage));
g_return_if_fail (parasite != NULL);
if (!(p = gimp_parasite_list_find (gimage->parasites, parasite))) if (!(p = gimp_parasite_list_find (gimage->parasites, parasite)))
return; return;
@ -1677,31 +1678,35 @@ gimp_image_parasite_detach (GimpImage *gimage,
gimp_parasite_list_remove (gimage->parasites, parasite); gimp_parasite_list_remove (gimage->parasites, parasite);
} }
Tattoo GimpTattoo
gimp_image_get_new_tattoo (GimpImage *image) gimp_image_get_new_tattoo (GimpImage *gimage)
{ {
image->tattoo_state++; g_return_val_if_fail (GIMP_IS_IMAGE (gimage), 0);
if (image->tattoo_state <= 0) gimage->tattoo_state++;
g_warning ("Tattoo state has become corrupt (2.1 billion operation limit exceded)");
return image->tattoo_state; if (gimage->tattoo_state <= 0)
g_warning ("gimp_image_get_new_tattoo(): Tattoo state has become corrupt (2.1 billion operation limit exceded)");
return gimage->tattoo_state;
} }
Tattoo GimpTattoo
gimp_image_get_tattoo_state (GimpImage *image) gimp_image_get_tattoo_state (GimpImage *gimage)
{ {
return (image->tattoo_state); g_return_val_if_fail (GIMP_IS_IMAGE (gimage), 0);
return gimage->tattoo_state;
} }
gboolean gboolean
gimp_image_set_tattoo_state (GimpImage *gimage, gimp_image_set_tattoo_state (GimpImage *gimage,
Tattoo val) GimpTattoo val)
{ {
GList *list; GList *list;
gboolean retval = TRUE; gboolean retval = TRUE;
GimpChannel *channel; GimpChannel *channel;
Tattoo maxval = 0; GimpTattoo maxval = 0;
Path *pptr = NULL; Path *pptr = NULL;
PathList *plist; PathList *plist;
@ -1711,7 +1716,7 @@ gimp_image_set_tattoo_state (GimpImage *gimage,
list; list;
list = g_list_next (list)) list = g_list_next (list))
{ {
Tattoo ltattoo; GimpTattoo ltattoo;
ltattoo = gimp_drawable_get_tattoo (GIMP_DRAWABLE (list->data)); ltattoo = gimp_drawable_get_tattoo (GIMP_DRAWABLE (list->data));
if (ltattoo > maxval) if (ltattoo > maxval)
@ -1733,7 +1738,8 @@ gimp_image_set_tattoo_state (GimpImage *gimage,
list; list;
list = g_list_next (list)) list = g_list_next (list))
{ {
Tattoo ctattoo; GimpTattoo ctattoo;
channel = (GimpChannel *) list->data; channel = (GimpChannel *) list->data;
ctattoo = gimp_drawable_get_tattoo (GIMP_DRAWABLE (channel)); ctattoo = gimp_drawable_get_tattoo (GIMP_DRAWABLE (channel));
@ -1751,8 +1757,8 @@ gimp_image_set_tattoo_state (GimpImage *gimage,
if (plist && plist->bz_paths) if (plist && plist->bz_paths)
{ {
Tattoo ptattoo; GimpTattoo ptattoo;
GSList *pl; GSList *pl;
for (pl = plist->bz_paths; pl; pl = g_slist_next (pl)) for (pl = plist->bz_paths; pl; pl = g_slist_next (pl))
{ {
@ -2520,7 +2526,7 @@ gimp_image_get_active_channel (const GimpImage *gimage)
GimpLayer * GimpLayer *
gimp_image_get_layer_by_tattoo (const GimpImage *gimage, gimp_image_get_layer_by_tattoo (const GimpImage *gimage,
Tattoo tattoo) GimpTattoo tattoo)
{ {
GimpLayer *layer; GimpLayer *layer;
GList *list; GList *list;
@ -2542,7 +2548,7 @@ gimp_image_get_layer_by_tattoo (const GimpImage *gimage,
GimpChannel * GimpChannel *
gimp_image_get_channel_by_tattoo (const GimpImage *gimage, gimp_image_get_channel_by_tattoo (const GimpImage *gimage,
Tattoo tattoo) GimpTattoo tattoo)
{ {
GimpChannel *channel; GimpChannel *channel;
GList *list; GList *list;

12
app/core/gimpprojection-construct.h
View file

@ -81,7 +81,7 @@ struct _GimpImage
gint instance_count; /* number of instances */ gint instance_count; /* number of instances */
gint disp_count; /* number of displays */ gint disp_count; /* number of displays */
Tattoo tattoo_state; /* the next unique tattoo to use*/ GimpTattoo tattoo_state; /* the next unique tattoo to use*/
TileManager *shadow; /* shadow buffer tiles */ TileManager *shadow; /* shadow buffer tiles */
@ -262,10 +262,10 @@ void gimp_image_parasite_attach (GimpImage *gimage,
void gimp_image_parasite_detach (GimpImage *gimage, void gimp_image_parasite_detach (GimpImage *gimage,
const gchar *parasite); const gchar *parasite);
Tattoo gimp_image_get_new_tattoo (GimpImage *gimage); GimpTattoo gimp_image_get_new_tattoo (GimpImage *gimage);
gboolean gimp_image_set_tattoo_state (GimpImage *gimage, gboolean gimp_image_set_tattoo_state (GimpImage *gimage,
Tattoo val); GimpTattoo val);
Tattoo gimp_image_get_tattoo_state (GimpImage *gimage); GimpTattoo gimp_image_get_tattoo_state (GimpImage *gimage);
void gimp_image_set_paths (GimpImage *gimage, void gimp_image_set_paths (GimpImage *gimage,
PathList *paths); PathList *paths);
@ -303,9 +303,9 @@ gint gimp_image_get_channel_index (const GimpImage *gimage,
GimpLayer * gimp_image_get_active_layer (const GimpImage *gimage); GimpLayer * gimp_image_get_active_layer (const GimpImage *gimage);
GimpChannel * gimp_image_get_active_channel (const GimpImage *gimage); GimpChannel * gimp_image_get_active_channel (const GimpImage *gimage);
GimpLayer * gimp_image_get_layer_by_tattoo (const GimpImage *gimage, GimpLayer * gimp_image_get_layer_by_tattoo (const GimpImage *gimage,
Tattoo tatoo); GimpTattoo tatoo);
GimpChannel * gimp_image_get_channel_by_tattoo (const GimpImage *gimage, GimpChannel * gimp_image_get_channel_by_tattoo (const GimpImage *gimage,
Tattoo tatoo); GimpTattoo tatoo);
GimpChannel * gimp_image_get_channel_by_name (const GimpImage *gimage, GimpChannel * gimp_image_get_channel_by_name (const GimpImage *gimage,
const gchar *name); const gchar *name);
GimpChannel * gimp_image_get_mask (const GimpImage *gimage); GimpChannel * gimp_image_get_mask (const GimpImage *gimage);

5
app/core/gimpprojection.h
View file

@ -20,8 +20,9 @@
#define __GDISPLAY_H__ #define __GDISPLAY_H__
/* FIXME: don't include gdisplay.h from core/ */ /* FIXME: move the display stuff to display/ */
#include "widgets/widgets-types.h"
#include "display/display-types.h"
typedef enum typedef enum

55
app/core/gimptoolinfo.c
View file

@ -19,9 +19,6 @@
#include "config.h" #include "config.h"
#include <glib-object.h> #include <glib-object.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gtk/gtk.h>
#include "core-types.h" #include "core-types.h"
@ -31,10 +28,6 @@
#include "gimpcontext.h" #include "gimpcontext.h"
#include "gimptoolinfo.h" #include "gimptoolinfo.h"
/* GRMPF */
#include "tools/tools-types.h"
#include "tools/gimprectselecttool.h"
static void gimp_tool_info_class_init (GimpToolInfoClass *klass); static void gimp_tool_info_class_init (GimpToolInfoClass *klass);
static void gimp_tool_info_init (GimpToolInfo *tool_info); static void gimp_tool_info_init (GimpToolInfo *tool_info);
@ -296,36 +289,30 @@ gimp_tool_info_new (GimpContext *context,
return tool_info; return tool_info;
} }
GimpToolInfo * void
gimp_tool_info_get_standard (void) gimp_tool_info_set_standard (Gimp *gimp,
GimpToolInfo *tool_info)
{ {
static GimpToolInfo *standard_tool_info = NULL; g_return_if_fail (GIMP_IS_GIMP (gimp));
g_return_if_fail (! tool_info || GIMP_IS_TOOL_INFO (tool_info));
if (! standard_tool_info) if (gimp->standard_tool_info)
{ {
GdkPixbuf *pixbuf; g_object_unref (G_OBJECT (gimp->standard_tool_info));
pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
TRUE,
8,
22,
22);
standard_tool_info =
gimp_tool_info_new (NULL,
GIMP_TYPE_RECT_SELECT_TOOL,
FALSE,
"gimp:standard_tool",
"Standard Tool",
"Well something must be broken",
"<Image>/Tools/Default Tool", NULL,
NULL, NULL,
NULL,
GTK_STOCK_STOP,
pixbuf);
g_object_unref (G_OBJECT (pixbuf));
} }
return standard_tool_info; gimp->standard_tool_info = tool_info;
if (gimp->standard_tool_info)
{
g_object_ref (G_OBJECT (gimp->standard_tool_info));
}
}
GimpToolInfo *
gimp_tool_info_get_standard (Gimp *gimp)
{
g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
return gimp->standard_tool_info;
} }

4
app/core/gimptoolinfo.h
View file

@ -81,7 +81,9 @@ GimpToolInfo * gimp_tool_info_new (GimpContext *context,
const gchar *stock_id, const gchar *stock_id,
GdkPixbuf *stock_pixbuf); GdkPixbuf *stock_pixbuf);
GimpToolInfo * gimp_tool_info_get_standard (void); void gimp_tool_info_set_standard (Gimp *gimp,
GimpToolInfo *tool_info);
GimpToolInfo * gimp_tool_info_get_standard (Gimp *gimp);
#endif /* __GIMP_TOOL_INFO_H__ */ #endif /* __GIMP_TOOL_INFO_H__ */

2
app/dialogs/color-dialog.c
View file

@ -32,7 +32,7 @@
#include "libgimpwidgets/gimpwidgets.h" #include "libgimpwidgets/gimpwidgets.h"
#include "libgimp/gimpcolorselector.h" #include "libgimp/gimpcolorselector.h"
#include "apptypes.h" #include "gui-types.h"
#include "color-area.h" #include "color-area.h"
#include "color-notebook.h" #include "color-notebook.h"

10
app/dialogs/dialogs-constructors.c
View file

@ -23,7 +23,7 @@
#include "libgimpcolor/gimpcolor.h" #include "libgimpcolor/gimpcolor.h"
#include "libgimpwidgets/gimpwidgets.h" #include "libgimpwidgets/gimpwidgets.h"
#include "apptypes.h" #include "gui-types.h"
#include "tools/tools-types.h" #include "tools/tools-types.h"
#include "core/gimp.h" #include "core/gimp.h"
@ -78,7 +78,6 @@
#include "app_procs.h" #include "app_procs.h"
#include "devices.h" #include "devices.h"
#include "docindex.h" #include "docindex.h"
#include "gdisplay.h"
#include "gimprc.h" #include "gimprc.h"
#include "module_db.h" #include "module_db.h"
#include "undo_history.h" #include "undo_history.h"
@ -238,17 +237,14 @@ GtkWidget *
dialogs_undo_history_get (GimpDialogFactory *factory, dialogs_undo_history_get (GimpDialogFactory *factory,
GimpContext *context) GimpContext *context)
{ {
GDisplay *gdisp;
GimpImage *gimage; GimpImage *gimage;
GtkWidget *undo_history; GtkWidget *undo_history;
gdisp = gimp_context_get_display (context); gimage = gimp_context_get_image (context);
if (! gdisp) if (! gimage)
return NULL; return NULL;
gimage = gdisp->gimage;
undo_history = g_object_get_data (G_OBJECT (gimage), "undo-history"); undo_history = g_object_get_data (G_OBJECT (gimage), "undo-history");
if (! undo_history) if (! undo_history)

2
app/dialogs/info-dialog.c
View file

@ -24,7 +24,7 @@
#include "libgimpwidgets/gimpwidgets.h" #include "libgimpwidgets/gimpwidgets.h"
#include "core/core-types.h" #include "gui-types.h"
#include "info-dialog.h" #include "info-dialog.h"

6
app/display/.cvsignore Normal file
View file

@ -0,0 +1,6 @@
Makefile
Makefile.in
.deps
.libs
*.lo
libappdisplay.la

49
app/display/Makefile.am Normal file
View file

@ -0,0 +1,49 @@
## Process this file with automake to produce Makefile.in
noinst_LIBRARIES = libappdisplay.a
libappdisplay_a_SOURCES = @STRIP_BEGIN@ \
display-types.h \
## display.c \
## display.h \
## gimpdisplay.c \
## gimpdisplay.h \
## gimpdisplay-callbacks.c \
## gimpdisplay-callbacks.h \
## gimpdisplay-ops.c \
## gimpdisplay-ops.h \
## gimpdisplay-render.c \
## gimpdisplay-render.h \
## gimpdisplay-scale.c \
## gimpdisplay-scale.h \
## gimpdisplay-scroll.c \
## gimpdisplay-scroll.h \
## gimpdisplay-selection.c \
## gimpdisplay-selection.h \
## gimpdisplay-shell.c \
## gimpdisplay-shell.h \
## \
## gximage.c \
## gximage.h \
## marching_ants.h \
@STRIP_END@
AM_CPPFLAGS = @STRIP_BEGIN@ \
-DG_LOG_DOMAIN=\"Gimp-Display\" \
@GIMP_THREAD_FLAGS@ \
@GIMP_MP_FLAGS@ \
@STRIP_END@
INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
-I$(top_srcdir)/app \
$(GTK_CFLAGS) \
-I$(includedir) \
@STRIP_END@
.PHONY: files
files:
@files=`ls $(DISTFILES) 2> /dev/null`; for p in $$files; do \
echo $$p; \
done

38
app/display/display-types.h Normal file
View file

@ -0,0 +1,38 @@
/* 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.
*/
#ifndef __DISPLAY_TYPES_H__
#define __DISPLAY_TYPES_H__
#include "gui/gui-types.h"
typedef enum /*< skip >*/
{
CURSOR_MODE_TOOL_ICON,
CURSOR_MODE_TOOL_CROSSHAIR,
CURSOR_MODE_CROSSHAIR
} CursorMode;
typedef struct _GDisplay GDisplay;
typedef struct _Selection Selection;
#endif /* __DISPLAY_TYPES_H__ */

5
app/display/gimpdisplay.h
View file

@ -20,8 +20,9 @@
#define __GDISPLAY_H__ #define __GDISPLAY_H__
/* FIXME: don't include gdisplay.h from core/ */ /* FIXME: move the display stuff to display/ */
#include "widgets/widgets-types.h"
#include "display/display-types.h"
typedef enum typedef enum

8
app/display/gimpdisplayshell-draw.c
View file

@ -22,7 +22,7 @@
#include "libgimpwidgets/gimpwidgets.h" #include "libgimpwidgets/gimpwidgets.h"
#include "core/core-types.h" #include "display/display-types.h"
#include "core/gimpbuffer.h" #include "core/gimpbuffer.h"
#include "core/gimpimage.h" #include "core/gimpimage.h"
@ -56,6 +56,7 @@ static gint gdisplay_delete (GtkWidget *widget,
GdkEvent *event, GdkEvent *event,
GDisplay *display); GDisplay *display);
static GtkTargetEntry display_target_table[] = static GtkTargetEntry display_target_table[] =
{ {
GIMP_TARGET_LAYER, GIMP_TARGET_LAYER,
@ -65,8 +66,7 @@ static GtkTargetEntry display_target_table[] =
GIMP_TARGET_PATTERN, GIMP_TARGET_PATTERN,
GIMP_TARGET_BUFFER GIMP_TARGET_BUFFER
}; };
static guint display_n_targets = (sizeof (display_target_table) /
sizeof (display_target_table[0]));
static void static void
gdisplay_destroy (GtkWidget *widget, gdisplay_destroy (GtkWidget *widget,
@ -190,7 +190,7 @@ create_display_shell (GDisplay *gdisp,
/* dnd stuff */ /* dnd stuff */
gtk_drag_dest_set (gdisp->shell, gtk_drag_dest_set (gdisp->shell,
GTK_DEST_DEFAULT_ALL, GTK_DEST_DEFAULT_ALL,
display_target_table, display_n_targets, display_target_table, G_N_ELEMENTS (display_target_table),
GDK_ACTION_COPY); GDK_ACTION_COPY);
gimp_dnd_viewable_dest_set (gdisp->shell, GIMP_TYPE_LAYER, gimp_dnd_viewable_dest_set (gdisp->shell, GIMP_TYPE_LAYER,

8
app/display/gimpdisplayshell.c
View file

@ -22,7 +22,7 @@
#include "libgimpwidgets/gimpwidgets.h" #include "libgimpwidgets/gimpwidgets.h"
#include "core/core-types.h" #include "display/display-types.h"
#include "core/gimpbuffer.h" #include "core/gimpbuffer.h"
#include "core/gimpimage.h" #include "core/gimpimage.h"
@ -56,6 +56,7 @@ static gint gdisplay_delete (GtkWidget *widget,
GdkEvent *event, GdkEvent *event,
GDisplay *display); GDisplay *display);
static GtkTargetEntry display_target_table[] = static GtkTargetEntry display_target_table[] =
{ {
GIMP_TARGET_LAYER, GIMP_TARGET_LAYER,
@ -65,8 +66,7 @@ static GtkTargetEntry display_target_table[] =
GIMP_TARGET_PATTERN, GIMP_TARGET_PATTERN,
GIMP_TARGET_BUFFER GIMP_TARGET_BUFFER
}; };
static guint display_n_targets = (sizeof (display_target_table) /
sizeof (display_target_table[0]));
static void static void
gdisplay_destroy (GtkWidget *widget, gdisplay_destroy (GtkWidget *widget,
@ -190,7 +190,7 @@ create_display_shell (GDisplay *gdisp,
/* dnd stuff */ /* dnd stuff */
gtk_drag_dest_set (gdisp->shell, gtk_drag_dest_set (gdisp->shell,
GTK_DEST_DEFAULT_ALL, GTK_DEST_DEFAULT_ALL,
display_target_table, display_n_targets, display_target_table, G_N_ELEMENTS (display_target_table),
GDK_ACTION_COPY); GDK_ACTION_COPY);
gimp_dnd_viewable_dest_set (gdisp->shell, GIMP_TYPE_LAYER, gimp_dnd_viewable_dest_set (gdisp->shell, GIMP_TYPE_LAYER,

4
app/file-open.c
View file

@ -33,7 +33,7 @@
#include <unistd.h> #include <unistd.h>
#endif #endif
#include <gtk/gtk.h> #include <glib.h>
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
#include <io.h> #include <io.h>
@ -57,6 +57,8 @@
#define getegid() 0 #define getegid() 0
#endif #endif
#include <glib-object.h>
#include "core/core-types.h" #include "core/core-types.h"
#include "core/gimpimage.h" #include "core/gimpimage.h"

6
app/file-save.c
View file

@ -33,7 +33,7 @@
#include <unistd.h> #include <unistd.h>
#endif #endif
#include <gtk/gtk.h> #include <glib.h>
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
#include <io.h> #include <io.h>
@ -57,6 +57,10 @@
#define getegid() 0 #define getegid() 0
#endif #endif
#include <glib-object.h>
#include <gtk/gtk.h> /* EEK */
#include "core/core-types.h" #include "core/core-types.h"
#include "core/gimp.h" #include "core/gimp.h"

4
app/file-utils.c
View file

@ -33,13 +33,15 @@
#include <unistd.h> #include <unistd.h>
#endif #endif
#include <gtk/gtk.h> #include <glib.h>
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
#include <direct.h> /* For _mkdir() */ #include <direct.h> /* For _mkdir() */
#define mkdir(path,mode) _mkdir(path) #define mkdir(path,mode) _mkdir(path)
#endif #endif
#include <glib-object.h>
#include "libgimpmath/gimpmath.h" #include "libgimpmath/gimpmath.h"
#include "core/core-types.h" #include "core/core-types.h"

4
app/file/file-open.c
View file

@ -33,7 +33,7 @@
#include <unistd.h> #include <unistd.h>
#endif #endif
#include <gtk/gtk.h> #include <glib.h>
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
#include <io.h> #include <io.h>
@ -57,6 +57,8 @@
#define getegid() 0 #define getegid() 0
#endif #endif
#include <glib-object.h>
#include "core/core-types.h" #include "core/core-types.h"
#include "core/gimpimage.h" #include "core/gimpimage.h"

6
app/file/file-save.c
View file

@ -33,7 +33,7 @@
#include <unistd.h> #include <unistd.h>
#endif #endif
#include <gtk/gtk.h> #include <glib.h>
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
#include <io.h> #include <io.h>
@ -57,6 +57,10 @@
#define getegid() 0 #define getegid() 0
#endif #endif
#include <glib-object.h>
#include <gtk/gtk.h> /* EEK */
#include "core/core-types.h" #include "core/core-types.h"
#include "core/gimp.h" #include "core/gimp.h"

4
app/file/file-utils.c
View file

@ -33,13 +33,15 @@
#include <unistd.h> #include <unistd.h>
#endif #endif
#include <gtk/gtk.h> #include <glib.h>
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
#include <direct.h> /* For _mkdir() */ #include <direct.h> /* For _mkdir() */
#define mkdir(path,mode) _mkdir(path) #define mkdir(path,mode) _mkdir(path)
#endif #endif
#include <glib-object.h>
#include "libgimpmath/gimpmath.h" #include "libgimpmath/gimpmath.h"
#include "core/core-types.h" #include "core/core-types.h"

5
app/gdisplay.h
View file

@ -20,8 +20,9 @@
#define __GDISPLAY_H__ #define __GDISPLAY_H__
/* FIXME: don't include gdisplay.h from core/ */ /* FIXME: move the display stuff to display/ */
#include "widgets/widgets-types.h"
#include "display/display-types.h"
typedef enum typedef enum

4
app/gimphelp.c
View file

@ -91,7 +91,7 @@ gimp_help (const gchar *help_path,
if (help_data && strlen (help_data)) if (help_data && strlen (help_data))
idle_help->help_data = g_strdup (help_data); idle_help->help_data = g_strdup (help_data);
gtk_idle_add ((GtkFunction) gimp_idle_help, (gpointer) idle_help); g_idle_add (gimp_idle_help, idle_help);
} }
} }
@ -99,7 +99,7 @@ gimp_help (const gchar *help_path,
/* local functions */ /* local functions */
/*********************/ /*********************/
static gint static gboolean
gimp_idle_help (gpointer data) gimp_idle_help (gpointer data)
{ {
GimpIdleHelp *idle_help; GimpIdleHelp *idle_help;

253
app/gimprc.c
View file

@ -251,118 +251,64 @@ static GHashTable *parse_func_hash = NULL;
static ParseFunc funcs[] = static ParseFunc funcs[] =
{ {
{ "gamma-correction", TT_DOUBLE, { "gamma-correction", TT_DOUBLE, &gimprc.gamma_val, NULL },
&(gimprc.gamma_val), NULL }, { "marching-ants-speed", TT_INT, &gimprc.marching_speed, NULL },
{ "marching-ants-speed", TT_INT, { "last-opened-size", TT_INT, &gimprc.last_opened_size, NULL },
&(gimprc.marching_speed), NULL }, { "transparency-type", TT_INT, &gimprc.transparency_type, NULL },
{ "last-opened-size", TT_INT, { "perfect-mouse", TT_BOOLEAN, &gimprc.perfectmouse, NULL },
&(gimprc.last_opened_size), NULL }, { "transparency-size", TT_INT, &gimprc.transparency_size, NULL },
{ "transparency-type", TT_INT, { "min-colors", TT_INT, &gimprc.min_colors, NULL },
&(gimprc.transparency_type), NULL }, { "install-colormap", TT_BOOLEAN, &gimprc.install_cmap, NULL },
{ "perfect-mouse", TT_BOOLEAN, { "colormap-cycling", TT_BOOLEAN, &gimprc.cycled_marching_ants, NULL },
&(gimprc.perfectmouse), NULL }, { "default-threshold", TT_INT, &gimprc.default_threshold, NULL },
{ "transparency-size", TT_INT, { "allow-resize-windows", TT_BOOLEAN, &gimprc.allow_resize_windows, NULL },
&(gimprc.transparency_size), NULL }, { "dont-allow-resize-windows", TT_BOOLEAN, NULL, &gimprc.allow_resize_windows },
{ "min-colors", TT_INT, { "cursor-updating", TT_BOOLEAN, NULL, &gimprc.no_cursor_updating },
&(gimprc.min_colors), NULL }, { "no-cursor-updating", TT_BOOLEAN, &gimprc.no_cursor_updating, NULL },
{ "install-colormap", TT_BOOLEAN, { "preview-size", TT_XPREVSIZE, &gimprc.preview_size, NULL },
&(gimprc.install_cmap), NULL }, { "nav-preview-size", TT_XNAVPREVSIZE, &gimprc.nav_preview_size, NULL },
{ "colormap-cycling", TT_BOOLEAN, { "show-rulers", TT_BOOLEAN, &gimprc.show_rulers, NULL },
&(gimprc.cycled_marching_ants), NULL }, { "dont-show-rulers", TT_BOOLEAN, NULL, &gimprc.show_rulers },
{ "default-threshold", TT_INT, { "show-statusbar", TT_BOOLEAN, &gimprc.show_statusbar, NULL },
&(gimprc.default_threshold), NULL }, { "dont-show-statusbar", TT_BOOLEAN, NULL, &gimprc.show_statusbar },
{ "allow-resize-windows", TT_BOOLEAN, { "auto-save", TT_BOOLEAN, &gimprc.auto_save, NULL },
&(gimprc.allow_resize_windows), NULL }, { "dont-auto-save", TT_BOOLEAN, NULL, &gimprc.auto_save },
{ "dont-allow-resize-windows", TT_BOOLEAN, NULL, { "confirm-on-close", TT_BOOLEAN, &gimprc.confirm_on_close, NULL },
&(gimprc.allow_resize_windows) }, { "dont-confirm-on-close", TT_BOOLEAN, NULL, &gimprc.confirm_on_close },
{ "cursor-updating", TT_BOOLEAN, NULL, { "save-session-info", TT_BOOLEAN, &gimprc.save_session_info, NULL },
&(gimprc.no_cursor_updating) }, { "dont-save-session-info", TT_BOOLEAN, NULL, &gimprc.save_session_info },
{ "no-cursor-updating", TT_BOOLEAN, { "save-device-status", TT_BOOLEAN, &gimprc.save_device_status, NULL },
&(gimprc.no_cursor_updating), NULL }, { "dont-save-device-status", TT_BOOLEAN, NULL, &gimprc.save_device_status },
{ "preview-size", TT_XPREVSIZE, NULL, NULL }, { "always-restore-session", TT_BOOLEAN, &gimprc.always_restore_session , NULL },
{ "nav-preview-size", TT_XNAVPREVSIZE, NULL, NULL }, { "show-tips", TT_BOOLEAN, &gimprc.show_tips, NULL },
{ "show-rulers", TT_BOOLEAN, { "dont-show-tips", TT_BOOLEAN, NULL, &gimprc.show_tips },
&(gimprc.show_rulers), NULL }, { "last-tip-shown", TT_INT, &gimprc.last_tip, NULL },
{ "dont-show-rulers", TT_BOOLEAN, NULL, { "show-tool-tips", TT_BOOLEAN, &gimprc.show_tool_tips, NULL },
&(gimprc.show_rulers) }, { "dont-show-tool-tips", TT_BOOLEAN, NULL, &gimprc.show_tool_tips },
{ "show-statusbar", TT_BOOLEAN, { "default-dot-for-dot", TT_BOOLEAN, &gimprc.default_dot_for_dot, NULL },
&(gimprc.show_statusbar), NULL }, { "monitor-xresolution", TT_DOUBLE, &gimprc.monitor_xres, NULL },
{ "dont-show-statusbar", TT_BOOLEAN, NULL, { "monitor-yresolution", TT_DOUBLE, &gimprc.monitor_yres, NULL },
&(gimprc.show_statusbar) }, { "image-title-format", TT_STRING, &gimprc.image_title_format, NULL },
{ "auto-save", TT_BOOLEAN, { "global-paint-options", TT_BOOLEAN, &gimprc.global_paint_options, NULL },
&(gimprc.auto_save), NULL }, { "show-indicators", TT_BOOLEAN, &gimprc.show_indicators, NULL },
{ "dont-auto-save", TT_BOOLEAN, NULL, { "dont-show-indicators", TT_BOOLEAN, NULL, &gimprc.show_indicators },
&(gimprc.auto_save) }, { "no-global-paint-options", TT_BOOLEAN, NULL, &gimprc.global_paint_options },
{ "confirm-on-close", TT_BOOLEAN, { "max-new-image-size", TT_MEMSIZE, &gimprc.max_new_image_size, NULL },
&(gimprc.confirm_on_close), NULL }, { "trust-dirty-flag", TT_BOOLEAN, &gimprc.trust_dirty_flag, NULL },
{ "dont-confirm-on-close", TT_BOOLEAN, NULL, { "dont-trust-dirty-flag", TT_BOOLEAN, NULL, &gimprc.trust_dirty_flag },
&(gimprc.confirm_on_close) }, { "use-help", TT_BOOLEAN, &gimprc.use_help, NULL },
{ "save-session-info", TT_BOOLEAN, { "dont-use-help", TT_BOOLEAN, NULL, &gimprc.use_help },
&(gimprc.save_session_info), NULL }, { "nav-window-per-display", TT_BOOLEAN, &gimprc.nav_window_per_display, NULL },
{ "dont-save-session-info", TT_BOOLEAN, NULL, { "nav-window-follows-auto", TT_BOOLEAN, NULL, &gimprc.nav_window_per_display },
&(gimprc.save_session_info)}, { "info-window-follows-mouse", TT_BOOLEAN, &gimprc.info_window_follows_mouse, NULL },
{ "save-device-status", TT_BOOLEAN, { "info-window-per-display", TT_BOOLEAN, NULL, &gimprc.info_window_follows_mouse },
&(gimprc.save_device_status), NULL }, { "help-browser", TT_XHELPBROWSER, &gimprc.help_browser, NULL },
{ "dont-save-device-status", TT_BOOLEAN, NULL, { "cursor-mode", TT_XCURSORMODE, &gimprc.cursor_mode, NULL },
&(gimprc.save_device_status)}, { "disable-tearoff-menus", TT_BOOLEAN, &gimprc.disable_tearoff_menus, NULL },
{ "always-restore-session", TT_BOOLEAN, { "theme-path", TT_PATH, &gimprc.theme_path, NULL },
&(gimprc.always_restore_session), NULL }, { "theme", TT_STRING, &gimprc.theme, NULL },
{ "show-tips", TT_BOOLEAN,
&(gimprc.show_tips), NULL },
{ "dont-show-tips", TT_BOOLEAN, NULL,
&(gimprc.show_tips) },
{ "last-tip-shown", TT_INT,
&(gimprc.last_tip), NULL },
{ "show-tool-tips", TT_BOOLEAN,
&(gimprc.show_tool_tips), NULL },
{ "dont-show-tool-tips", TT_BOOLEAN, NULL,
&(gimprc.show_tool_tips) },
{ "default-dot-for-dot", TT_BOOLEAN,
&(gimprc.default_dot_for_dot), NULL },
{ "monitor-xresolution", TT_DOUBLE,
&(gimprc.monitor_xres), NULL },
{ "monitor-yresolution", TT_DOUBLE,
&(gimprc.monitor_yres), NULL },
{ "image-title-format", TT_STRING,
&(gimprc.image_title_format), NULL },
{ "parasite", TT_XPARASITE, NULL, NULL },
{ "global-paint-options", TT_BOOLEAN,
&(gimprc.global_paint_options), NULL },
{ "show-indicators", TT_BOOLEAN,
&(gimprc.show_indicators), NULL },
{ "dont-show-indicators", TT_BOOLEAN, NULL,
&(gimprc.show_indicators) },
{ "no-global-paint-options", TT_BOOLEAN, NULL,
&(gimprc.global_paint_options) },
{ "max-new-image-size", TT_MEMSIZE,
&(gimprc.max_new_image_size), NULL },
{ "trust-dirty-flag", TT_BOOLEAN,
&(gimprc.trust_dirty_flag), NULL },
{ "dont-trust-dirty-flag", TT_BOOLEAN, NULL,
&(gimprc.trust_dirty_flag) },
{ "use-help", TT_BOOLEAN,
&(gimprc.use_help), NULL },
{ "dont-use-help", TT_BOOLEAN, NULL,
&(gimprc.use_help) },
{ "nav-window-per-display", TT_BOOLEAN,
&(gimprc.nav_window_per_display), NULL },
{ "nav-window-follows-auto", TT_BOOLEAN, NULL,
&(gimprc.nav_window_per_display) },
{ "info-window-follows-mouse", TT_BOOLEAN,
&(gimprc.info_window_follows_mouse), NULL },
{ "info-window-per-display", TT_BOOLEAN, NULL,
&(gimprc.info_window_follows_mouse) },
{ "help-browser", TT_XHELPBROWSER,
&(gimprc.help_browser), NULL },
{ "cursor-mode", TT_XCURSORMODE,
&(gimprc.cursor_mode), NULL },
{ "disable-tearoff-menus", TT_BOOLEAN,
&(gimprc.disable_tearoff_menus), NULL },
{ "theme-path", TT_PATH,
&(gimprc.theme_path), NULL },
{ "theme", TT_STRING,
&(gimprc.theme), NULL },
{ "parasite", TT_XPARASITE, NULL, NULL },
{ "plug-in", TT_XPLUGIN, NULL, NULL }, { "plug-in", TT_XPLUGIN, NULL, NULL },
{ "plug-in-def", TT_XPLUGINDEF, NULL, NULL }, { "plug-in-def", TT_XPLUGINDEF, NULL, NULL },
{ "menu-path", TT_XMENUPATH, NULL, NULL }, { "menu-path", TT_XMENUPATH, NULL, NULL },
@ -1369,22 +1315,22 @@ parse_preview_size (gpointer val1p,
if (token == TOKEN_SYMBOL) if (token == TOKEN_SYMBOL)
{ {
if (strcmp (token_sym, "none") == 0) if (strcmp (token_sym, "none") == 0)
gimprc.preview_size = 0; *((gint *) val1p) = 0;
else if (strcmp (token_sym, "tiny") == 0) else if (strcmp (token_sym, "tiny") == 0)
gimprc.preview_size = 24; *((gint *) val1p) = 24;
else if (strcmp (token_sym, "small") == 0) else if (strcmp (token_sym, "small") == 0)
gimprc.preview_size = 32; *((gint *) val1p) = 32;
else if (strcmp (token_sym, "medium") == 0) else if (strcmp (token_sym, "medium") == 0)
gimprc.preview_size = 48; *((gint *) val1p) = 48;
else if (strcmp (token_sym, "large") == 0) else if (strcmp (token_sym, "large") == 0)
gimprc.preview_size = 64; *((gint *) val1p) = 64;
else if (strcmp (token_sym, "huge") == 0) else if (strcmp (token_sym, "huge") == 0)
gimprc.preview_size = 128; *((gint *) val1p) = 128;
else else
gimprc.preview_size = 0; *((gint *) val1p) = 0;
} }
else if (token == TOKEN_NUMBER) else if (token == TOKEN_NUMBER)
gimprc.preview_size = token_num; *((gint *) val1p) = token_num;
token = peek_next_token (); token = peek_next_token ();
if (!token || (token != TOKEN_RIGHT_PAREN)) if (!token || (token != TOKEN_RIGHT_PAREN))
@ -1407,20 +1353,19 @@ parse_nav_preview_size (gpointer val1p,
if (token == TOKEN_SYMBOL) if (token == TOKEN_SYMBOL)
{ {
/* if (strcmp (token_sym, "none") == 0) */ if (strcmp (token_sym, "none") == 0)
/* preview_size = 0; */ *((gint *) val1p) = 0;
/* else */ else if (strcmp (token_sym, "small") == 0)
if (strcmp (token_sym, "small") == 0) *((gint *) val1p) = 48;
gimprc.nav_preview_size = 48;
else if (strcmp (token_sym, "medium") == 0) else if (strcmp (token_sym, "medium") == 0)
gimprc.nav_preview_size = 80; *((gint *) val1p) = 80;
else if (strcmp (token_sym, "large") == 0) else if (strcmp (token_sym, "large") == 0)
gimprc.nav_preview_size = 112; *((gint *) val1p) = 112;
else else
gimprc.nav_preview_size = 112; *((gint *) val1p) = 0;
} }
else if (token == TOKEN_NUMBER) else if (token == TOKEN_NUMBER)
gimprc.nav_preview_size = token_num; *((gint *) val1p) = token_num;
token = peek_next_token (); token = peek_next_token ();
if (!token || (token != TOKEN_RIGHT_PAREN)) if (!token || (token != TOKEN_RIGHT_PAREN))
@ -2779,9 +2724,9 @@ parse_help_browser (gpointer val1p,
token = get_next_token (); token = get_next_token ();
if (strcmp (token_sym, "gimp") == 0) if (strcmp (token_sym, "gimp") == 0)
gimprc.help_browser = HELP_BROWSER_GIMP; *((gint *) val1p) = HELP_BROWSER_GIMP;
else if (strcmp (token_sym, "netscape") == 0) else if (strcmp (token_sym, "netscape") == 0)
gimprc.help_browser = HELP_BROWSER_NETSCAPE; *((gint *) val1p) = HELP_BROWSER_NETSCAPE;
token = peek_next_token (); token = peek_next_token ();
if (!token || (token != TOKEN_RIGHT_PAREN)) if (!token || (token != TOKEN_RIGHT_PAREN))
@ -2803,11 +2748,11 @@ parse_cursor_mode (gpointer val1p,
token = get_next_token (); token = get_next_token ();
if (strcmp (token_sym, "tool-icon") == 0) if (strcmp (token_sym, "tool-icon") == 0)
gimprc.cursor_mode = CURSOR_MODE_TOOL_ICON; *((CursorMode *) val1p) = CURSOR_MODE_TOOL_ICON;
else if (strcmp (token_sym, "tool-crosshair") == 0) else if (strcmp (token_sym, "tool-crosshair") == 0)
gimprc.cursor_mode = CURSOR_MODE_TOOL_CROSSHAIR; *((CursorMode *) val1p) = CURSOR_MODE_TOOL_CROSSHAIR;
else if (strcmp (token_sym, "crosshair") == 0) else if (strcmp (token_sym, "crosshair") == 0)
gimprc.cursor_mode = CURSOR_MODE_CROSSHAIR; *((CursorMode *) val1p) = CURSOR_MODE_CROSSHAIR;
token = peek_next_token (); token = peek_next_token ();
if (!token || (token != TOKEN_RIGHT_PAREN)) if (!token || (token != TOKEN_RIGHT_PAREN))
@ -3089,15 +3034,19 @@ static inline gchar *
preview_size_to_str (gpointer val1p, preview_size_to_str (gpointer val1p,
gpointer val2p) gpointer val2p)
{ {
if (gimprc.preview_size >= 128) gint size;
size = *((gint *) val1p);
if (size >= 128)
return g_strdup ("huge"); return g_strdup ("huge");
else if (gimprc.preview_size >= 64) else if (size >= 64)
return g_strdup ("large"); return g_strdup ("large");
else if (gimprc.preview_size >= 48) else if (size >= 48)
return g_strdup ("medium"); return g_strdup ("medium");
else if (gimprc.preview_size >= 32) else if (size >= 32)
return g_strdup ("small"); return g_strdup ("small");
else if (gimprc.preview_size >= 24) else if (size >= 24)
return g_strdup ("tiny"); return g_strdup ("tiny");
else else
return g_strdup ("none"); return g_strdup ("none");
@ -3107,14 +3056,18 @@ static inline gchar *
nav_preview_size_to_str (gpointer val1p, nav_preview_size_to_str (gpointer val1p,
gpointer val2p) gpointer val2p)
{ {
if (gimprc.nav_preview_size >= 112) gint size;
size = *((gint *) val1p);
if (size >= 112)
return g_strdup ("large"); return g_strdup ("large");
else if (gimprc.nav_preview_size >= 80) else if (size >= 80)
return g_strdup ("medium"); return g_strdup ("medium");
else if (gimprc.nav_preview_size >= 48) else if (size >= 48)
return g_strdup ("small"); return g_strdup ("small");
else else
return g_strdup ("large"); return g_strdup ("none");
} }
@ -3122,14 +3075,18 @@ static inline gchar *
units_to_str (gpointer val1p, units_to_str (gpointer val1p,
gpointer val2p) gpointer val2p)
{ {
return g_strdup (gimp_unit_get_identifier (*((GimpUnit*)val1p))); return g_strdup (gimp_unit_get_identifier (*((GimpUnit *) val1p)));
} }
static inline gchar * static inline gchar *
help_browser_to_str (gpointer val1p, help_browser_to_str (gpointer val1p,
gpointer val2p) gpointer val2p)
{ {
if (gimprc.help_browser == HELP_BROWSER_NETSCAPE) gint browser;
browser = *((gint *) val1p);
if (browser == HELP_BROWSER_NETSCAPE)
return g_strdup ("netscape"); return g_strdup ("netscape");
else else
return g_strdup ("gimp"); return g_strdup ("gimp");
@ -3139,9 +3096,13 @@ static inline gchar *
cursor_mode_to_str (gpointer val1p, cursor_mode_to_str (gpointer val1p,
gpointer val2p) gpointer val2p)
{ {
if (gimprc.cursor_mode == CURSOR_MODE_TOOL_ICON) CursorMode mode;
mode = *((CursorMode *) val1p);
if (mode == CURSOR_MODE_TOOL_ICON)
return g_strdup ("tool-icon"); return g_strdup ("tool-icon");
else if (gimprc.cursor_mode == CURSOR_MODE_TOOL_CROSSHAIR) else if (mode == CURSOR_MODE_TOOL_CROSSHAIR)
return g_strdup ("tool-crosshair"); return g_strdup ("tool-crosshair");
else else
return g_strdup ("crosshair"); return g_strdup ("crosshair");

1
app/gui/Makefile.am
View file

@ -56,6 +56,7 @@ libappgui_a_SOURCES = @STRIP_BEGIN@ \
gradients-commands.h \ gradients-commands.h \
gui.c \ gui.c \
gui.h \ gui.h \
gui-types.h \
image-commands.c \ image-commands.c \
image-commands.h \ image-commands.h \
indicator-area.c \ indicator-area.c \

2
app/gui/color-area.c
View file

@ -29,7 +29,7 @@
#include "libgimpcolor/gimpcolor.h" #include "libgimpcolor/gimpcolor.h"
#include "core/core-types.h" #include "gui-types.h"
#include "core/gimp.h" #include "core/gimp.h"
#include "core/gimpcontext.h" #include "core/gimpcontext.h"

2
app/gui/color-notebook.c
View file

@ -32,7 +32,7 @@
#include "libgimpwidgets/gimpwidgets.h" #include "libgimpwidgets/gimpwidgets.h"
#include "libgimp/gimpcolorselector.h" #include "libgimp/gimpcolorselector.h"
#include "apptypes.h" #include "gui-types.h"
#include "color-area.h" #include "color-area.h"
#include "color-notebook.h" #include "color-notebook.h"

3
app/gui/colormap-dialog.c
View file

@ -29,7 +29,7 @@
#include "libgimpmath/gimpmath.h" #include "libgimpmath/gimpmath.h"
#include "libgimpwidgets/gimpwidgets.h" #include "libgimpwidgets/gimpwidgets.h"
#include "core/core-types.h" #include "gui-types.h"
#include "core/gimpcontainer.h" #include "core/gimpcontainer.h"
#include "core/gimpimage.h" #include "core/gimpimage.h"
@ -42,7 +42,6 @@
#include "colormaps.h" #include "colormaps.h"
#include "image_render.h" #include "image_render.h"
#include "gdisplay.h"
#include "libgimp/gimpintl.h" #include "libgimp/gimpintl.h"

3
app/gui/dialogs-commands.c
View file

@ -20,8 +20,7 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "apptypes.h" #include "gui-types.h"
#include "widgets/widgets-types.h"
#include "widgets/gimpdialogfactory.h" #include "widgets/gimpdialogfactory.h"
#include "widgets/gimpdockable.h" #include "widgets/gimpdockable.h"

10
app/gui/dialogs-constructors.c
View file

@ -23,7 +23,7 @@
#include "libgimpcolor/gimpcolor.h" #include "libgimpcolor/gimpcolor.h"
#include "libgimpwidgets/gimpwidgets.h" #include "libgimpwidgets/gimpwidgets.h"
#include "apptypes.h" #include "gui-types.h"
#include "tools/tools-types.h" #include "tools/tools-types.h"
#include "core/gimp.h" #include "core/gimp.h"
@ -78,7 +78,6 @@
#include "app_procs.h" #include "app_procs.h"
#include "devices.h" #include "devices.h"
#include "docindex.h" #include "docindex.h"
#include "gdisplay.h"
#include "gimprc.h" #include "gimprc.h"
#include "module_db.h" #include "module_db.h"
#include "undo_history.h" #include "undo_history.h"
@ -238,17 +237,14 @@ GtkWidget *
dialogs_undo_history_get (GimpDialogFactory *factory, dialogs_undo_history_get (GimpDialogFactory *factory,
GimpContext *context) GimpContext *context)
{ {
GDisplay *gdisp;
GimpImage *gimage; GimpImage *gimage;
GtkWidget *undo_history; GtkWidget *undo_history;
gdisp = gimp_context_get_display (context); gimage = gimp_context_get_image (context);
if (! gdisp) if (! gimage)
return NULL; return NULL;
gimage = gdisp->gimage;
undo_history = g_object_get_data (G_OBJECT (gimage), "undo-history"); undo_history = g_object_get_data (G_OBJECT (gimage), "undo-history");
if (! undo_history) if (! undo_history)

5
app/gui/error-console-dialog.c
View file

@ -27,9 +27,6 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <sys/types.h> #include <sys/types.h>
#ifdef HAVE_DIRENT_H
#include <dirent.h>
#endif
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
#include <unistd.h> #include <unistd.h>
#endif #endif
@ -51,7 +48,7 @@
#include "libgimpwidgets/gimpwidgets.h" #include "libgimpwidgets/gimpwidgets.h"
#include "apptypes.h" #include "gui-types.h"
#include "appenv.h" #include "appenv.h"

2
app/gui/gradient-editor.c
View file

@ -62,7 +62,7 @@
#include "libgimpbase/gimpbase.h" #include "libgimpbase/gimpbase.h"
#include "libgimpwidgets/gimpwidgets.h" #include "libgimpwidgets/gimpwidgets.h"
#include "core/core-types.h" #include "gui-types.h"
#include "core/gimp.h" #include "core/gimp.h"
#include "core/gimpcontainer.h" #include "core/gimpcontainer.h"

3
app/gui/gradient-select.c
View file

@ -25,8 +25,7 @@
#include "libgimpwidgets/gimpwidgets.h" #include "libgimpwidgets/gimpwidgets.h"
#include "apptypes.h" #include "gui-types.h"
#include "widgets/widgets-types.h"
#include "core/gimp.h" #include "core/gimp.h"
#include "core/gimpcontainer.h" #include "core/gimpcontainer.h"

32
app/gui/gui-types.h Normal file
View file

@ -0,0 +1,32 @@
/* 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.
*/
#ifndef __GUI_TYPES_H__
#define __GUI_TYPES_H__
#include "widgets/widgets-types.h"
#include "display/display-types.h"
typedef struct _ColorNotebook ColorNotebook;
typedef struct _InfoDialog InfoDialog;
typedef struct _NavigationDialog NavigationDialog;
#endif /* __GUI_TYPES_H__ */

3
app/gui/indicator-area.c
View file

@ -25,8 +25,7 @@
#include "libgimpwidgets/gimpwidgets.h" #include "libgimpwidgets/gimpwidgets.h"
#include "apptypes.h" #include "gui-types.h"
#include "widgets/widgets-types.h"
#include "core/gimpbrush.h" #include "core/gimpbrush.h"
#include "core/gimpcontext.h" #include "core/gimpcontext.h"

2
app/gui/info-dialog.c
View file

@ -24,7 +24,7 @@
#include "libgimpwidgets/gimpwidgets.h" #include "libgimpwidgets/gimpwidgets.h"
#include "core/core-types.h" #include "gui-types.h"
#include "info-dialog.h" #include "info-dialog.h"

3
app/gui/palette-editor.c
View file

@ -24,8 +24,7 @@
#include "libgimpbase/gimpbase.h" #include "libgimpbase/gimpbase.h"
#include "libgimpwidgets/gimpwidgets.h" #include "libgimpwidgets/gimpwidgets.h"
#include "apptypes.h" #include "gui-types.h"
#include "widgets/widgets-types.h"
#include "core/gimp.h" #include "core/gimp.h"
#include "core/gimpcontainer.h" #include "core/gimpcontainer.h"

3
app/gui/palette-select.c
View file

@ -25,8 +25,7 @@
#include "libgimpwidgets/gimpwidgets.h" #include "libgimpwidgets/gimpwidgets.h"
#include "apptypes.h" #include "gui-types.h"
#include "widgets/widgets-types.h"
#include "core/gimp.h" #include "core/gimp.h"
#include "core/gimpcontainer.h" #include "core/gimpcontainer.h"

3
app/gui/pattern-select.c
View file

@ -24,8 +24,7 @@
#include "libgimpwidgets/gimpwidgets.h" #include "libgimpwidgets/gimpwidgets.h"
#include "apptypes.h" #include "gui-types.h"
#include "widgets/widgets-types.h"
#include "base/temp-buf.h" #include "base/temp-buf.h"

7
app/gui/session.c
View file

@ -39,18 +39,13 @@
#include "config.h" #include "config.h"
#include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "libgimpbase/gimpbase.h" #include "libgimpbase/gimpbase.h"
#include "apptypes.h" #include "gui-types.h"
#include "widgets/widgets-types.h"
#include "widgets/gimpdialogfactory.h" #include "widgets/gimpdialogfactory.h"

5
app/gui/splash.c
View file

@ -26,10 +26,11 @@
#include "libgimpbase/gimpbase.h" #include "libgimpbase/gimpbase.h"
#include "libgimpwidgets/gimpwidgets.h" #include "libgimpwidgets/gimpwidgets.h"
#include "apptypes.h" #include "gui-types.h"
#include "splash.h"
#include "appenv.h" #include "appenv.h"
#include "splash.h"
#include "libgimp/gimpintl.h" #include "libgimp/gimpintl.h"

2
app/gui/view-commands.c
View file

@ -22,7 +22,7 @@
#include "libgimpwidgets/gimpwidgets.h" #include "libgimpwidgets/gimpwidgets.h"
#include "core/core-types.h" #include "gui-types.h"
#include "core/gimpimage.h" #include "core/gimpimage.h"

182
app/image_map.c
View file

@ -35,81 +35,34 @@
#include "image_map.h" #include "image_map.h"
#define WAITING 0 typedef enum
#define WORKING 1 {
IMAGE_MAP_WAITING,
IMAGE_MAP_WORKING
} ImageMapState;
#define WORK_DELAY 1
struct _ImageMap struct _ImageMap
{ {
GDisplay *gdisp; GDisplay *gdisp;
GimpDrawable *drawable; GimpDrawable *drawable;
TileManager *undo_tiles; TileManager *undo_tiles;
ImageMapApplyFunc apply_func; ImageMapApplyFunc apply_func;
gpointer user_data; gpointer user_data;
PixelRegion srcPR, destPR; PixelRegion srcPR;
void *pr; PixelRegion destPR;
gint state; PixelRegionIterator *PRI;
gint idle; ImageMapState state;
guint idle_id;
}; };
/**************************/ /* local function prototypes */
/* Function definitions */
static gint static gboolean image_map_do (gpointer data);
image_map_do (gpointer data)
{
ImageMap *image_map;
GimpImage *gimage;
PixelRegion shadowPR;
gint x, y, w, h;
image_map = (ImageMap *) data;
if (! (gimage = gimp_drawable_gimage (image_map->drawable))) /* public functions */
{
image_map->state = WAITING;
return FALSE;
}
/* Process the pixel regions and apply the image mapping */
(* image_map->apply_func) (&image_map->srcPR,
&image_map->destPR,
image_map->user_data);
x = image_map->destPR.x;
y = image_map->destPR.y;
w = image_map->destPR.w;
h = image_map->destPR.h;
/* apply the results */
pixel_region_init (&shadowPR, gimage->shadow, x, y, w, h, FALSE);
gimp_image_apply_image (gimage, image_map->drawable, &shadowPR,
FALSE, OPAQUE_OPACITY, REPLACE_MODE, NULL, x, y);
/* display the results */
if (image_map->gdisp)
{
gimp_drawable_update (image_map->drawable,
x, y,
w, h);
gdisplay_flush_now (image_map->gdisp);
}
image_map->pr = pixel_regions_process (image_map->pr);
if (image_map->pr == NULL)
{
image_map->state = WAITING;
gdisplays_flush ();
return FALSE;
}
return TRUE;
}
ImageMap * ImageMap *
image_map_create (GDisplay *gdisp, image_map_create (GDisplay *gdisp,
@ -118,7 +71,6 @@ image_map_create (GDisplay *gdisp,
ImageMap *image_map; ImageMap *image_map;
g_return_val_if_fail (gdisp != NULL, NULL); g_return_val_if_fail (gdisp != NULL, NULL);
g_return_val_if_fail (drawable != NULL, NULL);
g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL); g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
image_map = g_new0 (ImageMap, 1); image_map = g_new0 (ImageMap, 1);
@ -126,7 +78,10 @@ image_map_create (GDisplay *gdisp,
image_map->gdisp = gdisp; image_map->gdisp = gdisp;
image_map->drawable = drawable; image_map->drawable = drawable;
image_map->undo_tiles = NULL; image_map->undo_tiles = NULL;
image_map->state = WAITING; image_map->apply_func = NULL;
image_map->user_data = NULL;
image_map->state = IMAGE_MAP_WAITING;
image_map->idle_id = 0;
/* Interactive tools based on image_map disable the undo stack /* Interactive tools based on image_map disable the undo stack
* to avert any unintented undo interaction through the UI * to avert any unintented undo interaction through the UI
@ -154,12 +109,13 @@ image_map_apply (ImageMap *image_map,
image_map->user_data = apply_data; image_map->user_data = apply_data;
/* If we're still working, remove the timer */ /* If we're still working, remove the timer */
if (image_map->state == WORKING) if (image_map->state == IMAGE_MAP_WORKING)
{ {
gtk_idle_remove (image_map->idle); g_source_remove (image_map->idle_id);
pixel_regions_process_stop (image_map->pr); image_map->idle_id = 0;
image_map->pr = NULL; pixel_regions_process_stop (image_map->PRI);
image_map->PRI = NULL;
} }
/* Make sure the drawable is still valid */ /* Make sure the drawable is still valid */
@ -236,11 +192,13 @@ image_map_apply (ImageMap *image_map,
x1, y1, (x2 - x1), (y2 - y1), TRUE); x1, y1, (x2 - x1), (y2 - y1), TRUE);
/* Apply the image transformation to the pixels */ /* Apply the image transformation to the pixels */
image_map->pr = pixel_regions_register (2, &image_map->srcPR, &image_map->destPR); image_map->PRI = pixel_regions_register (2,
&image_map->srcPR,
&image_map->destPR);
/* Start the intermittant work procedure */ /* Start the intermittant work procedure */
image_map->state = WORKING; image_map->state = IMAGE_MAP_WORKING;
image_map->idle = gtk_idle_add (image_map_do, image_map); image_map->idle_id = g_idle_add (image_map_do, image_map);
} }
void void
@ -250,12 +208,13 @@ image_map_commit (ImageMap *image_map)
g_return_if_fail (image_map != NULL); g_return_if_fail (image_map != NULL);
if (image_map->state == WORKING) if (image_map->state == IMAGE_MAP_WORKING)
{ {
gtk_idle_remove (image_map->idle); g_source_remove (image_map->idle_id);
image_map->idle_id = 0;
/* Finish the changes */ /* Finish the changes */
while (image_map_do (image_map)) ; while (image_map_do (image_map));
} }
/* Make sure the drawable is still valid */ /* Make sure the drawable is still valid */
@ -287,14 +246,16 @@ image_map_clear (ImageMap *image_map)
g_return_if_fail (image_map != NULL); g_return_if_fail (image_map != NULL);
if (image_map->state == WORKING) if (image_map->state == IMAGE_MAP_WORKING)
{ {
gtk_idle_remove (image_map->idle); g_source_remove (image_map->idle_id);
pixel_regions_process_stop (image_map->pr); image_map->idle_id = 0;
image_map->pr = NULL;
pixel_regions_process_stop (image_map->PRI);
image_map->PRI = NULL;
} }
image_map->state = WAITING; image_map->state = IMAGE_MAP_WAITING;
/* Make sure the drawable is still valid */ /* Make sure the drawable is still valid */
if (! gimp_drawable_gimage (image_map->drawable)) if (! gimp_drawable_gimage (image_map->drawable))
@ -412,3 +373,60 @@ image_map_get_color_at (ImageMap *image_map,
return NULL; return NULL;
} }
} }
/* private functions */
static gboolean
image_map_do (gpointer data)
{
ImageMap *image_map;
GimpImage *gimage;
PixelRegion shadowPR;
gint x, y, w, h;
image_map = (ImageMap *) data;
if (! (gimage = gimp_drawable_gimage (image_map->drawable)))
{
image_map->state = IMAGE_MAP_WAITING;
return FALSE;
}
/* Process the pixel regions and apply the image mapping */
(* image_map->apply_func) (&image_map->srcPR,
&image_map->destPR,
image_map->user_data);
x = image_map->destPR.x;
y = image_map->destPR.y;
w = image_map->destPR.w;
h = image_map->destPR.h;
/* apply the results */
pixel_region_init (&shadowPR, gimage->shadow, x, y, w, h, FALSE);
gimp_image_apply_image (gimage, image_map->drawable, &shadowPR,
FALSE, OPAQUE_OPACITY, REPLACE_MODE, NULL, x, y);
/* display the results */
if (image_map->gdisp)
{
gimp_drawable_update (image_map->drawable,
x, y,
w, h);
gdisplay_flush_now (image_map->gdisp);
}
image_map->PRI = pixel_regions_process (image_map->PRI);
if (image_map->PRI == NULL)
{
image_map->state = IMAGE_MAP_WAITING;
gdisplays_flush ();
return FALSE;
}
return TRUE;
}

11
app/image_map.h
View file

@ -20,12 +20,19 @@
#define __IMAGE_MAP_H__ #define __IMAGE_MAP_H__
typedef void (* ImageMapApplyFunc) (PixelRegion *srcPR,
PixelRegion *destPR,
gpointer data);
/* Image Map functions */ /* Image Map functions */
/* Successive image map apply functions can be called, but eventually /* Successive image map apply functions can be called, but eventually
* MUST be followed with an image_map_commit or an image_map_abort call * MUST be followed with an image_map_commit or an image_map_abort call
* The image map is no longer valid after a call to commit or abort. * The image map is no longer valid after a call to commit or abort.
*/ */
ImageMap * image_map_create (GDisplay *gdisp, ImageMap * image_map_create (GDisplay *gdisp,
GimpDrawable *drawable); GimpDrawable *drawable);
void image_map_apply (ImageMap *image_map, void image_map_apply (ImageMap *image_map,

8
app/interface.c
View file

@ -22,7 +22,7 @@
#include "libgimpwidgets/gimpwidgets.h" #include "libgimpwidgets/gimpwidgets.h"
#include "core/core-types.h" #include "display/display-types.h"
#include "core/gimpbuffer.h" #include "core/gimpbuffer.h"
#include "core/gimpimage.h" #include "core/gimpimage.h"
@ -56,6 +56,7 @@ static gint gdisplay_delete (GtkWidget *widget,
GdkEvent *event, GdkEvent *event,
GDisplay *display); GDisplay *display);
static GtkTargetEntry display_target_table[] = static GtkTargetEntry display_target_table[] =
{ {
GIMP_TARGET_LAYER, GIMP_TARGET_LAYER,
@ -65,8 +66,7 @@ static GtkTargetEntry display_target_table[] =
GIMP_TARGET_PATTERN, GIMP_TARGET_PATTERN,
GIMP_TARGET_BUFFER GIMP_TARGET_BUFFER
}; };
static guint display_n_targets = (sizeof (display_target_table) /
sizeof (display_target_table[0]));
static void static void
gdisplay_destroy (GtkWidget *widget, gdisplay_destroy (GtkWidget *widget,
@ -190,7 +190,7 @@ create_display_shell (GDisplay *gdisp,
/* dnd stuff */ /* dnd stuff */
gtk_drag_dest_set (gdisp->shell, gtk_drag_dest_set (gdisp->shell,
GTK_DEST_DEFAULT_ALL, GTK_DEST_DEFAULT_ALL,
display_target_table, display_n_targets, display_target_table, G_N_ELEMENTS (display_target_table),
GDK_ACTION_COPY); GDK_ACTION_COPY);
gimp_dnd_viewable_dest_set (gdisp->shell, GIMP_TYPE_LAYER, gimp_dnd_viewable_dest_set (gdisp->shell, GIMP_TYPE_LAYER,

4
app/main.c
View file

@ -52,8 +52,8 @@
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
#include <windows.h> #include <windows.h>
#else #else
static void gimp_sigfatal_handler (gint sig_num); static void gimp_sigfatal_handler (gint sig_num);
static void gimp_sigchld_handler (gint sig_num); static void gimp_sigchld_handler (gint sig_num);
#endif #endif

43
app/paint/gimpink-blob.c
View file

@ -31,35 +31,40 @@
#include "libgimpmath/gimpmath.h" #include "libgimpmath/gimpmath.h"
#include "apptypes.h" #include "tools-types.h"
#include "gimpinktool-blob.h" #include "gimpinktool-blob.h"
typedef enum
{
EDGE_NONE = 0,
EDGE_LEFT = 1 << 0,
EDGE_RIGHT = 1 << 1
} EdgeType;
static Blob * static Blob *
blob_new (int y, int height) blob_new (gint y,
gint height)
{ {
Blob *result; Blob *result;
result = g_malloc (sizeof (Blob) + sizeof(BlobSpan) * (height-1)); result = g_malloc (sizeof (Blob) + sizeof (BlobSpan) * (height - 1));
result->y = y;
result->y = y;
result->height = height; result->height = height;
return result; return result;
} }
typedef enum {
EDGE_NONE = 0,
EDGE_LEFT = 1 << 0,
EDGE_RIGHT = 1 << 1
} EdgeType;
static void static void
blob_fill (Blob *b, EdgeType *present) blob_fill (Blob *b,
EdgeType *present)
{ {
int start; gint start;
int x1, x2, i1, i2; gint x1, x2, i1, i2;
int i; gint i;
/* Mark empty lines at top and bottom as unused */ /* Mark empty lines at top and bottom as unused */
@ -109,11 +114,11 @@ blob_fill (Blob *b, EdgeType *present)
/* Find empty gaps */ /* Find empty gaps */
if (!(present[i1+1] & EDGE_LEFT)) if (!(present[i1+1] & EDGE_LEFT))
{ {
int increment; /* fractional part */ gint increment; /* fractional part */
int denom; /* denominator of fraction */ gint denom; /* denominator of fraction */
int step; /* integral step */ gint step; /* integral step */
int frac; /* fractional step */ gint frac; /* fractional step */
int reverse; gint reverse;
/* find bottom of gap */ /* find bottom of gap */
i2 = i1+2; i2 = i1+2;

6
app/path.c
View file

@ -166,7 +166,7 @@ path_distance (Path *bzp,
return ret; return ret;
} }
Tattoo GimpTattoo
path_get_tattoo (Path* p) path_get_tattoo (Path* p)
{ {
if (!p) if (!p)
@ -179,8 +179,8 @@ path_get_tattoo (Path* p)
} }
Path* Path*
path_get_path_by_tattoo (GimpImage *gimage, path_get_path_by_tattoo (GimpImage *gimage,
Tattoo tattoo) GimpTattoo tattoo)
{ {
GSList *tlist; GSList *tlist;
PathList *plp; PathList *plp;

46
app/path.h
View file

@ -23,7 +23,7 @@
struct _PathList struct _PathList
{ {
GimpImage *gimage; GimpImage *gimage;
GDisplay *gdisp; /* This is a hack.. Needed so we can get back to gpointer gdisp; /* This is a hack.. Needed so we can get back to
* the same display that these curves were added * the same display that these curves were added
* too. That way when an entry in the paths dialog * too. That way when an entry in the paths dialog
* is clicked the bezier tool can be targeted at * is clicked the bezier tool can be targeted at
@ -42,30 +42,30 @@ typedef enum
BEZIER = 1 BEZIER = 1
} PathType; } PathType;
Path* path_new (GimpImage *gimage, Path* path_new (GimpImage *gimage,
PathType ptype, PathType ptype,
GSList *path_details, GSList *path_details,
gint closed, gint closed,
gint state, gint state,
gint locked, gint locked,
gint tattoo, gint tattoo,
gchar *name); gchar *name);
Path* path_copy (GimpImage *gimage, Path* path_copy (GimpImage *gimage,
Path *path); Path *path);
void path_free (Path *path); void path_free (Path *path);
Tattoo path_get_tattoo (Path *path); GimpTattoo path_get_tattoo (Path *path);
Path* path_get_path_by_tattoo (GimpImage *gimage, Path* path_get_path_by_tattoo (GimpImage *gimage,
Tattoo tattoo); GimpTattoo tattoo);
void path_stroke (GimpImage *gimage, void path_stroke (GimpImage *gimage,
PathList *pl, PathList *pl,
Path *bzp); Path *bzp);
gint path_distance (Path *bzp, gint path_distance (Path *bzp,
gdouble dist, gdouble dist,
gint *x, gint *x,
gint *y, gint *y,
gdouble *grad); gdouble *grad);
PathPoint* path_point_new (guint type, PathPoint* path_point_new (guint type,
gdouble x, gdouble x,

14
app/pathP.h
View file

@ -28,13 +28,13 @@ struct _PathPoint
struct _Path struct _Path
{ {
GSList *path_details; GSList *path_details;
gint pathtype; /* Only beziers to start with */ gint pathtype; /* Only beziers to start with */
gboolean closed; gboolean closed;
guint32 state; guint32 state;
guint32 locked; /* Only bottom bit used */ guint32 locked; /* Only bottom bit used */
Tattoo tattoo; /* The tattoo for the path */ GimpTattoo tattoo; /* The tattoo for the path */
gchar *name; gchar *name;
}; };
gboolean path_set_path (GimpImage *gimage, gboolean path_set_path (GimpImage *gimage,

3
app/pdb/Makefile.am
View file

@ -3,7 +3,6 @@
noinst_LIBRARIES = libapppdb.a noinst_LIBRARIES = libapppdb.a
libapppdb_a_SOURCES = @STRIP_BEGIN@ \ libapppdb_a_SOURCES = @STRIP_BEGIN@ \
pdb_glue.h \
internal_procs.c \ internal_procs.c \
internal_procs.h \ internal_procs.h \
procedural_db.c \ procedural_db.c \
@ -32,6 +31,8 @@ libapppdb_a_SOURCES = @STRIP_BEGIN@ \
paths_cmds.c \ paths_cmds.c \
pattern_select_cmds.c \ pattern_select_cmds.c \
patterns_cmds.c \ patterns_cmds.c \
pdb_glue.h \
pdb-types.h \
plug_in_cmds.c \ plug_in_cmds.c \
procedural_db_cmds.c \ procedural_db_cmds.c \
selection_cmds.c \ selection_cmds.c \

2
app/pdb/brush_select_cmds.c
View file

@ -26,7 +26,7 @@
#include "libgimpbase/gimpbasetypes.h" #include "libgimpbase/gimpbasetypes.h"
#include "core/core-types.h" #include "pdb-types.h"
#include "widgets/widgets-types.h" #include "widgets/widgets-types.h"
#include "procedural_db.h" #include "procedural_db.h"

4
app/pdb/brushes_cmds.c
View file

@ -22,11 +22,11 @@
#include <string.h> #include <string.h>
#include <gtk/gtk.h> #include <glib-object.h>
#include "libgimpbase/gimpbasetypes.h" #include "libgimpbase/gimpbasetypes.h"
#include "core/core-types.h" #include "pdb-types.h"
#include "procedural_db.h" #include "procedural_db.h"
#include "base/base-types.h" #include "base/base-types.h"

15
app/pdb/channel_cmds.c
View file

@ -21,14 +21,14 @@
#include "config.h" #include "config.h"
#include <gtk/gtk.h> #include <glib-object.h>
#include "libgimpbase/gimpbasetypes.h" #include "libgimpbase/gimpbasetypes.h"
#include "core/core-types.h" #include "pdb-types.h"
#include "procedural_db.h" #include "procedural_db.h"
#include "appenums.h" #include "core/core-types.h"
#include "core/gimpchannel.h" #include "core/gimpchannel.h"
#include "core/gimpimage.h" #include "core/gimpimage.h"
#include "pdb_glue.h" #include "pdb_glue.h"
@ -255,7 +255,14 @@ channel_delete_invoker (Gimp *gimp,
success = FALSE; success = FALSE;
if (success) if (success)
gtk_object_sink (GTK_OBJECT (channel)); {
if (! gimp_drawable_gimage (GIMP_DRAWABLE (channel)))
{
g_object_unref (G_OBJECT (channel));
success = TRUE;
}
}
return procedural_db_return_args (&channel_delete_proc, success); return procedural_db_return_args (&channel_delete_proc, success);
} }

2
app/pdb/color_cmds.c
View file

@ -25,7 +25,7 @@
#include "libgimpbase/gimpbasetypes.h" #include "libgimpbase/gimpbasetypes.h"
#include "core/core-types.h" #include "pdb-types.h"
#include "tools/tools-types.h" #include "tools/tools-types.h"
#include "procedural_db.h" #include "procedural_db.h"

4
app/pdb/convert_cmds.c
View file

@ -21,11 +21,11 @@
#include "config.h" #include "config.h"
#include <gtk/gtk.h> #include <glib-object.h>
#include "libgimpbase/gimpbasetypes.h" #include "libgimpbase/gimpbasetypes.h"
#include "core/core-types.h" #include "pdb-types.h"
#include "procedural_db.h" #include "procedural_db.h"
#include "core/gimp.h" #include "core/gimp.h"

3
app/pdb/display_cmds.c
View file

@ -25,7 +25,8 @@
#include "libgimpbase/gimpbasetypes.h" #include "libgimpbase/gimpbasetypes.h"
#include "core/core-types.h" #include "pdb-types.h"
#include "display/display-types.h"
#include "procedural_db.h" #include "procedural_db.h"
#include "core/gimpimage.h" #include "core/gimpimage.h"

4
app/pdb/drawable_cmds.c
View file

@ -22,11 +22,11 @@
#include <string.h> #include <string.h>
#include <gtk/gtk.h> #include <glib-object.h>
#include "libgimpbase/gimpbasetypes.h" #include "libgimpbase/gimpbasetypes.h"
#include "core/core-types.h" #include "pdb-types.h"
#include "procedural_db.h" #include "procedural_db.h"
#include "base/temp-buf.h" #include "base/temp-buf.h"

4
app/pdb/edit_cmds.c
View file

@ -21,11 +21,11 @@
#include "config.h" #include "config.h"
#include <gtk/gtk.h> #include <glib-object.h>
#include "libgimpbase/gimpbasetypes.h" #include "libgimpbase/gimpbasetypes.h"
#include "core/core-types.h" #include "pdb-types.h"
#include "procedural_db.h" #include "procedural_db.h"
#include "core/core-types.h" #include "core/core-types.h"

4
app/pdb/fileops_cmds.c
View file

@ -34,11 +34,11 @@
#endif #endif
#include <gtk/gtk.h> #include <glib-object.h>
#include "libgimpbase/gimpbasetypes.h" #include "libgimpbase/gimpbasetypes.h"
#include "core/core-types.h" #include "pdb-types.h"
#include "procedural_db.h" #include "procedural_db.h"
#include "base/base-config.h" #include "base/base-config.h"

4
app/pdb/floating_sel_cmds.c
View file

@ -21,11 +21,11 @@
#include "config.h" #include "config.h"
#include <gtk/gtk.h> #include <glib-object.h>
#include "libgimpbase/gimpbasetypes.h" #include "libgimpbase/gimpbasetypes.h"
#include "core/core-types.h" #include "pdb-types.h"
#include "procedural_db.h" #include "procedural_db.h"
#include "core/gimpdrawable.h" #include "core/gimpdrawable.h"

2
app/pdb/gimp-pdb.c
View file

@ -24,7 +24,7 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "core/core-types.h" #include "pdb-types.h"
#include "core/gimp.h" #include "core/gimp.h"

2
app/pdb/gimppdb.c
View file

@ -24,7 +24,7 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "core/core-types.h" #include "pdb-types.h"
#include "core/gimp.h" #include "core/gimp.h"

2
app/pdb/gimpprocedure.c
View file

@ -24,7 +24,7 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "core/core-types.h" #include "pdb-types.h"
#include "core/gimp.h" #include "core/gimp.h"

4
app/pdb/gimprc_cmds.c
View file

@ -21,11 +21,11 @@
#include "config.h" #include "config.h"
#include <gtk/gtk.h> #include <glib-object.h>
#include "libgimpbase/gimpbasetypes.h" #include "libgimpbase/gimpbasetypes.h"
#include "core/core-types.h" #include "pdb-types.h"
#include "procedural_db.h" #include "procedural_db.h"
#include "gimprc.h" #include "gimprc.h"

3
app/pdb/gradient_select_cmds.c
View file

@ -26,7 +26,8 @@
#include "libgimpbase/gimpbasetypes.h" #include "libgimpbase/gimpbasetypes.h"
#include "core/core-types.h" #include "pdb-types.h"
#include "gui/gui-types.h"
#include "procedural_db.h" #include "procedural_db.h"
#include "core/gimp.h" #include "core/gimp.h"

4
app/pdb/gradients_cmds.c
View file

@ -21,11 +21,11 @@
#include "config.h" #include "config.h"
#include <gtk/gtk.h> #include <glib-object.h>
#include "libgimpbase/gimpbasetypes.h" #include "libgimpbase/gimpbasetypes.h"
#include "core/core-types.h" #include "pdb-types.h"
#include "procedural_db.h" #include "procedural_db.h"
#include "core/gimp.h" #include "core/gimp.h"

6
app/pdb/guides_cmds.c
View file

@ -21,14 +21,14 @@
#include "config.h" #include "config.h"
#include <gtk/gtk.h> #include <glib-object.h>
#include "libgimpbase/gimpbasetypes.h" #include "libgimpbase/gimpbasetypes.h"
#include "core/core-types.h" #include "pdb-types.h"
#include "procedural_db.h" #include "procedural_db.h"
#include "appenums.h" #include "core/core-types.h"
#include "core/gimpimage.h" #include "core/gimpimage.h"
#include "undo.h" #include "undo.h"

Some files were not shown because too many files have changed in this diff Show more