mirror of https://github.com/GNOME/gimp.git
Header file tweaks. Now changing tile.h doesn't force about_dialog to
recompile! :)
This commit is contained in:
parent
ae49b4f259
commit
fe6720432b
|
@ -1,3 +1,11 @@
|
|||
Sat Aug 15 19:30:42 1998 Scott Goehring <scott@poverty.bloomington.in.us>
|
||||
|
||||
* Makefile.am boundary.h boundaryF.h by_color_select.h
|
||||
file_new_dialog.c fileops.h floating_sel.h gdisplay.h
|
||||
gdisplayF.h ink.c interface.h layer.h layerF.h paint_core.h
|
||||
tools.h toolsF.h: header file tweaks. Now changing tile.h
|
||||
doesn't force about_dialog to recompile! :)
|
||||
|
||||
Sat Aug 15 16:53:45 CDT 1998 Larry Ewing <lewing@gimp.org>
|
||||
|
||||
* app/airbrush.c: added a debug warning to a case that previously
|
||||
|
|
|
@ -30,6 +30,7 @@ gimp_SOURCES = \
|
|||
blob.h \
|
||||
boundary.c \
|
||||
boundary.h \
|
||||
boundaryF.h \
|
||||
brightness_contrast.c \
|
||||
brightness_contrast.h \
|
||||
brush_edit.c \
|
||||
|
@ -134,6 +135,7 @@ gimp_SOURCES = \
|
|||
gdisplay.c \
|
||||
gdisplay.h \
|
||||
gdisplayP.h \
|
||||
gdisplayF.h \
|
||||
gdisplay_cmds.c \
|
||||
gdisplay_cmds.h \
|
||||
gdisplay_ops.c \
|
||||
|
@ -196,6 +198,7 @@ gimp_SOURCES = \
|
|||
iscissors.h \
|
||||
layer.c \
|
||||
layer.h \
|
||||
layerF.h \
|
||||
layer_pvt.h \
|
||||
layer_cmds.c \
|
||||
layer_cmds.h \
|
||||
|
@ -286,6 +289,7 @@ gimp_SOURCES = \
|
|||
tips_dialog.h \
|
||||
tools.c \
|
||||
tools.h \
|
||||
toolsF.h \
|
||||
transform_core.c \
|
||||
transform_core.h \
|
||||
transform_tool.c \
|
||||
|
|
|
@ -18,9 +18,9 @@
|
|||
#ifndef __BOUNDARY_H__
|
||||
#define __BOUNDARY_H__
|
||||
|
||||
#include "paint_funcs.h"
|
||||
#include "boundaryF.h"
|
||||
|
||||
typedef struct _BoundSeg BoundSeg;
|
||||
#include "paint_funcs.h"
|
||||
|
||||
struct _BoundSeg
|
||||
{
|
||||
|
@ -30,12 +30,6 @@ struct _BoundSeg
|
|||
int visited;
|
||||
};
|
||||
|
||||
typedef enum
|
||||
{
|
||||
WithinBounds,
|
||||
IgnoreBounds
|
||||
} BoundaryType;
|
||||
|
||||
|
||||
BoundSeg * find_mask_boundary (PixelRegion *, int *, BoundaryType, int, int, int, int);
|
||||
BoundSeg * sort_boundary (BoundSeg *, int, int *);
|
||||
|
|
|
@ -18,9 +18,9 @@
|
|||
#ifndef __BOUNDARY_H__
|
||||
#define __BOUNDARY_H__
|
||||
|
||||
#include "paint_funcs.h"
|
||||
#include "boundaryF.h"
|
||||
|
||||
typedef struct _BoundSeg BoundSeg;
|
||||
#include "paint_funcs.h"
|
||||
|
||||
struct _BoundSeg
|
||||
{
|
||||
|
@ -30,12 +30,6 @@ struct _BoundSeg
|
|||
int visited;
|
||||
};
|
||||
|
||||
typedef enum
|
||||
{
|
||||
WithinBounds,
|
||||
IgnoreBounds
|
||||
} BoundaryType;
|
||||
|
||||
|
||||
BoundSeg * find_mask_boundary (PixelRegion *, int *, BoundaryType, int, int, int, int);
|
||||
BoundSeg * sort_boundary (BoundSeg *, int, int *);
|
||||
|
|
|
@ -0,0 +1,12 @@
|
|||
#ifndef __BOUNDARY_F_H__
|
||||
#define __BOUNDARY_F_H__
|
||||
|
||||
typedef struct _BoundSeg BoundSeg;
|
||||
|
||||
typedef enum
|
||||
{
|
||||
WithinBounds,
|
||||
IgnoreBounds
|
||||
} BoundaryType;
|
||||
|
||||
#endif
|
|
@ -20,6 +20,8 @@
|
|||
|
||||
#include "tools.h"
|
||||
#include "procedural_db.h"
|
||||
#include "gdisplayF.h"
|
||||
#include "gimage.h"
|
||||
|
||||
/* by_color select functions */
|
||||
Tool * tools_new_by_color_select (void);
|
||||
|
|
|
@ -18,7 +18,9 @@
|
|||
#ifndef __FLOATING_SEL_H__
|
||||
#define __FLOATING_SEL_H__
|
||||
|
||||
#include "layer.h"
|
||||
#include "layerF.h"
|
||||
#include "boundaryF.h"
|
||||
#include "gimpdrawableF.h"
|
||||
|
||||
/* Functions */
|
||||
|
||||
|
|
|
@ -28,13 +28,7 @@
|
|||
#define APPLY 0
|
||||
#define DISCARD 1
|
||||
|
||||
typedef enum
|
||||
{
|
||||
WhiteMask,
|
||||
BlackMask,
|
||||
AlphaMask
|
||||
} AddMaskType;
|
||||
|
||||
#include "layerF.h"
|
||||
|
||||
/* structure declarations */
|
||||
|
||||
|
@ -50,21 +44,12 @@ typedef enum
|
|||
#define GIMP_IS_LAYER_MASK(obj) (GTK_CHECK_TYPE ((obj), GIMP_TYPE_LAYER_MASK))
|
||||
#define GIMP_IS_LAYER_MASK_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_LAYER_MASK))
|
||||
|
||||
typedef struct _GimpLayer GimpLayer;
|
||||
typedef struct _GimpLayerClass GimpLayerClass;
|
||||
typedef struct _GimpLayerMask GimpLayerMask;
|
||||
typedef struct _GimpLayerMaskClass GimpLayerMaskClass;
|
||||
|
||||
typedef GimpLayer Layer; /* convenience */
|
||||
typedef GimpLayerMask LayerMask; /* convenience */
|
||||
|
||||
GtkType gimp_layer_get_type (void);
|
||||
GtkType gimp_layer_mask_get_type (void);
|
||||
|
||||
/* Special undo types */
|
||||
|
||||
typedef struct _layer_undo LayerUndo;
|
||||
|
||||
struct _layer_undo
|
||||
{
|
||||
Layer * layer; /* the actual layer */
|
||||
|
@ -74,8 +59,6 @@ struct _layer_undo
|
|||
/* or a remove layer undo? */
|
||||
};
|
||||
|
||||
typedef struct _layer_mask_undo LayerMaskUndo;
|
||||
|
||||
struct _layer_mask_undo
|
||||
{
|
||||
Layer * layer; /* the layer */
|
||||
|
@ -88,8 +71,6 @@ struct _layer_mask_undo
|
|||
/* or a remove layer mask */
|
||||
};
|
||||
|
||||
typedef struct _fs_to_layer_undo FStoLayerUndo;
|
||||
|
||||
struct _fs_to_layer_undo
|
||||
{
|
||||
Layer * layer; /* the layer */
|
||||
|
|
|
@ -22,6 +22,8 @@
|
|||
#include "info_dialog.h"
|
||||
#include "selection.h"
|
||||
|
||||
#include "gdisplayF.h"
|
||||
|
||||
/*
|
||||
* Global variables
|
||||
*
|
||||
|
@ -38,16 +40,6 @@
|
|||
/* #define HIGHPASS(x,y) ((x>y) ? y : x) */ /* unused - == MIN */
|
||||
|
||||
|
||||
typedef enum
|
||||
{
|
||||
SelectionOff,
|
||||
SelectionLayerOff,
|
||||
SelectionOn,
|
||||
SelectionPause,
|
||||
SelectionResume
|
||||
} SelectionControl;
|
||||
|
||||
typedef struct _GDisplay GDisplay;
|
||||
struct _GDisplay
|
||||
{
|
||||
int ID; /* unique identifier for this gdisplay */
|
||||
|
|
|
@ -12,6 +12,7 @@
|
|||
#include "interface.h"
|
||||
#include "plug_in.h"
|
||||
#include "tile_manager_pvt.h"
|
||||
#include "gdisplay.h"
|
||||
|
||||
typedef struct {
|
||||
GtkWidget *dlg;
|
||||
|
|
|
@ -22,6 +22,8 @@
|
|||
#include "info_dialog.h"
|
||||
#include "selection.h"
|
||||
|
||||
#include "gdisplayF.h"
|
||||
|
||||
/*
|
||||
* Global variables
|
||||
*
|
||||
|
@ -38,16 +40,6 @@
|
|||
/* #define HIGHPASS(x,y) ((x>y) ? y : x) */ /* unused - == MIN */
|
||||
|
||||
|
||||
typedef enum
|
||||
{
|
||||
SelectionOff,
|
||||
SelectionLayerOff,
|
||||
SelectionOn,
|
||||
SelectionPause,
|
||||
SelectionResume
|
||||
} SelectionControl;
|
||||
|
||||
typedef struct _GDisplay GDisplay;
|
||||
struct _GDisplay
|
||||
{
|
||||
int ID; /* unique identifier for this gdisplay */
|
||||
|
|
|
@ -18,8 +18,8 @@
|
|||
#ifndef __INTERFACE_H__
|
||||
#define __INTERFACE_H__
|
||||
|
||||
#include "tools.h"
|
||||
#include "gdisplay.h"
|
||||
#include "toolsF.h"
|
||||
#include "gdisplayF.h"
|
||||
|
||||
/* typedefs */
|
||||
typedef void (*QueryFunc) (GtkWidget *, gpointer, gpointer);
|
||||
|
|
|
@ -18,8 +18,8 @@
|
|||
#ifndef __INTERFACE_H__
|
||||
#define __INTERFACE_H__
|
||||
|
||||
#include "tools.h"
|
||||
#include "gdisplay.h"
|
||||
#include "toolsF.h"
|
||||
#include "gdisplayF.h"
|
||||
|
||||
/* typedefs */
|
||||
typedef void (*QueryFunc) (GtkWidget *, gpointer, gpointer);
|
||||
|
|
|
@ -12,6 +12,7 @@
|
|||
#include "interface.h"
|
||||
#include "plug_in.h"
|
||||
#include "tile_manager_pvt.h"
|
||||
#include "gdisplay.h"
|
||||
|
||||
typedef struct {
|
||||
GtkWidget *dlg;
|
||||
|
|
|
@ -21,6 +21,8 @@
|
|||
|
||||
#include "gtk/gtk.h"
|
||||
|
||||
#include "gimpimageF.h"
|
||||
|
||||
|
||||
void file_ops_pre_init (void);
|
||||
void file_ops_post_init (void);
|
||||
|
|
|
@ -18,7 +18,9 @@
|
|||
#ifndef __FLOATING_SEL_H__
|
||||
#define __FLOATING_SEL_H__
|
||||
|
||||
#include "layer.h"
|
||||
#include "layerF.h"
|
||||
#include "boundaryF.h"
|
||||
#include "gimpdrawableF.h"
|
||||
|
||||
/* Functions */
|
||||
|
||||
|
|
|
@ -22,6 +22,8 @@
|
|||
#include "info_dialog.h"
|
||||
#include "selection.h"
|
||||
|
||||
#include "gdisplayF.h"
|
||||
|
||||
/*
|
||||
* Global variables
|
||||
*
|
||||
|
@ -38,16 +40,6 @@
|
|||
/* #define HIGHPASS(x,y) ((x>y) ? y : x) */ /* unused - == MIN */
|
||||
|
||||
|
||||
typedef enum
|
||||
{
|
||||
SelectionOff,
|
||||
SelectionLayerOff,
|
||||
SelectionOn,
|
||||
SelectionPause,
|
||||
SelectionResume
|
||||
} SelectionControl;
|
||||
|
||||
typedef struct _GDisplay GDisplay;
|
||||
struct _GDisplay
|
||||
{
|
||||
int ID; /* unique identifier for this gdisplay */
|
||||
|
|
|
@ -0,0 +1,15 @@
|
|||
#ifndef __GDISPLAY_F_H__
|
||||
#define __GDISPLAY_F_H__
|
||||
|
||||
typedef enum
|
||||
{
|
||||
SelectionOff,
|
||||
SelectionLayerOff,
|
||||
SelectionOn,
|
||||
SelectionPause,
|
||||
SelectionResume
|
||||
} SelectionControl;
|
||||
|
||||
typedef struct _GDisplay GDisplay;
|
||||
|
||||
#endif
|
|
@ -28,13 +28,7 @@
|
|||
#define APPLY 0
|
||||
#define DISCARD 1
|
||||
|
||||
typedef enum
|
||||
{
|
||||
WhiteMask,
|
||||
BlackMask,
|
||||
AlphaMask
|
||||
} AddMaskType;
|
||||
|
||||
#include "layerF.h"
|
||||
|
||||
/* structure declarations */
|
||||
|
||||
|
@ -50,21 +44,12 @@ typedef enum
|
|||
#define GIMP_IS_LAYER_MASK(obj) (GTK_CHECK_TYPE ((obj), GIMP_TYPE_LAYER_MASK))
|
||||
#define GIMP_IS_LAYER_MASK_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_LAYER_MASK))
|
||||
|
||||
typedef struct _GimpLayer GimpLayer;
|
||||
typedef struct _GimpLayerClass GimpLayerClass;
|
||||
typedef struct _GimpLayerMask GimpLayerMask;
|
||||
typedef struct _GimpLayerMaskClass GimpLayerMaskClass;
|
||||
|
||||
typedef GimpLayer Layer; /* convenience */
|
||||
typedef GimpLayerMask LayerMask; /* convenience */
|
||||
|
||||
GtkType gimp_layer_get_type (void);
|
||||
GtkType gimp_layer_mask_get_type (void);
|
||||
|
||||
/* Special undo types */
|
||||
|
||||
typedef struct _layer_undo LayerUndo;
|
||||
|
||||
struct _layer_undo
|
||||
{
|
||||
Layer * layer; /* the actual layer */
|
||||
|
@ -74,8 +59,6 @@ struct _layer_undo
|
|||
/* or a remove layer undo? */
|
||||
};
|
||||
|
||||
typedef struct _layer_mask_undo LayerMaskUndo;
|
||||
|
||||
struct _layer_mask_undo
|
||||
{
|
||||
Layer * layer; /* the layer */
|
||||
|
@ -88,8 +71,6 @@ struct _layer_mask_undo
|
|||
/* or a remove layer mask */
|
||||
};
|
||||
|
||||
typedef struct _fs_to_layer_undo FStoLayerUndo;
|
||||
|
||||
struct _fs_to_layer_undo
|
||||
{
|
||||
Layer * layer; /* the layer */
|
||||
|
|
|
@ -12,6 +12,7 @@
|
|||
#include "interface.h"
|
||||
#include "plug_in.h"
|
||||
#include "tile_manager_pvt.h"
|
||||
#include "gdisplay.h"
|
||||
|
||||
typedef struct {
|
||||
GtkWidget *dlg;
|
||||
|
|
|
@ -25,6 +25,7 @@
|
|||
#include "tools.h"
|
||||
#include "undo.h"
|
||||
#include "blob.h"
|
||||
#include "gdisplay.h"
|
||||
|
||||
#include "tile.h" /* ick. */
|
||||
|
||||
|
|
|
@ -18,8 +18,8 @@
|
|||
#ifndef __INTERFACE_H__
|
||||
#define __INTERFACE_H__
|
||||
|
||||
#include "tools.h"
|
||||
#include "gdisplay.h"
|
||||
#include "toolsF.h"
|
||||
#include "gdisplayF.h"
|
||||
|
||||
/* typedefs */
|
||||
typedef void (*QueryFunc) (GtkWidget *, gpointer, gpointer);
|
||||
|
|
21
app/layer.h
21
app/layer.h
|
@ -28,13 +28,7 @@
|
|||
#define APPLY 0
|
||||
#define DISCARD 1
|
||||
|
||||
typedef enum
|
||||
{
|
||||
WhiteMask,
|
||||
BlackMask,
|
||||
AlphaMask
|
||||
} AddMaskType;
|
||||
|
||||
#include "layerF.h"
|
||||
|
||||
/* structure declarations */
|
||||
|
||||
|
@ -50,21 +44,12 @@ typedef enum
|
|||
#define GIMP_IS_LAYER_MASK(obj) (GTK_CHECK_TYPE ((obj), GIMP_TYPE_LAYER_MASK))
|
||||
#define GIMP_IS_LAYER_MASK_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_LAYER_MASK))
|
||||
|
||||
typedef struct _GimpLayer GimpLayer;
|
||||
typedef struct _GimpLayerClass GimpLayerClass;
|
||||
typedef struct _GimpLayerMask GimpLayerMask;
|
||||
typedef struct _GimpLayerMaskClass GimpLayerMaskClass;
|
||||
|
||||
typedef GimpLayer Layer; /* convenience */
|
||||
typedef GimpLayerMask LayerMask; /* convenience */
|
||||
|
||||
GtkType gimp_layer_get_type (void);
|
||||
GtkType gimp_layer_mask_get_type (void);
|
||||
|
||||
/* Special undo types */
|
||||
|
||||
typedef struct _layer_undo LayerUndo;
|
||||
|
||||
struct _layer_undo
|
||||
{
|
||||
Layer * layer; /* the actual layer */
|
||||
|
@ -74,8 +59,6 @@ struct _layer_undo
|
|||
/* or a remove layer undo? */
|
||||
};
|
||||
|
||||
typedef struct _layer_mask_undo LayerMaskUndo;
|
||||
|
||||
struct _layer_mask_undo
|
||||
{
|
||||
Layer * layer; /* the layer */
|
||||
|
@ -88,8 +71,6 @@ struct _layer_mask_undo
|
|||
/* or a remove layer mask */
|
||||
};
|
||||
|
||||
typedef struct _fs_to_layer_undo FStoLayerUndo;
|
||||
|
||||
struct _fs_to_layer_undo
|
||||
{
|
||||
Layer * layer; /* the layer */
|
||||
|
|
|
@ -0,0 +1,25 @@
|
|||
#ifndef __LAYER_F_H__
|
||||
#define __LAYER_F_H__
|
||||
|
||||
typedef enum
|
||||
{
|
||||
WhiteMask,
|
||||
BlackMask,
|
||||
AlphaMask
|
||||
} AddMaskType;
|
||||
|
||||
typedef struct _GimpLayer GimpLayer;
|
||||
typedef struct _GimpLayerClass GimpLayerClass;
|
||||
typedef struct _GimpLayerMask GimpLayerMask;
|
||||
typedef struct _GimpLayerMaskClass GimpLayerMaskClass;
|
||||
|
||||
typedef GimpLayer Layer; /* convenience */
|
||||
typedef GimpLayerMask LayerMask; /* convenience */
|
||||
|
||||
typedef struct _layer_undo LayerUndo;
|
||||
|
||||
typedef struct _layer_mask_undo LayerMaskUndo;
|
||||
|
||||
typedef struct _fs_to_layer_undo FStoLayerUndo;
|
||||
|
||||
#endif
|
|
@ -25,6 +25,7 @@
|
|||
#include "tools.h"
|
||||
#include "undo.h"
|
||||
#include "blob.h"
|
||||
#include "gdisplay.h"
|
||||
|
||||
#include "tile.h" /* ick. */
|
||||
|
||||
|
|
|
@ -21,6 +21,7 @@
|
|||
#include "draw_core.h"
|
||||
#include "temp_buf.h"
|
||||
#include "gimpbrush.h"
|
||||
#include "gimpdrawableF.h"
|
||||
|
||||
/* the different states that the painting function can be called with */
|
||||
#define INIT_PAINT 0
|
||||
|
|
66
app/tools.h
66
app/tools.h
|
@ -18,8 +18,10 @@
|
|||
#ifndef __TOOLS_H__
|
||||
#define __TOOLS_H__
|
||||
|
||||
#include "layer.h"
|
||||
#include "gdisplay.h"
|
||||
#include "layerF.h"
|
||||
#include "gdisplayF.h"
|
||||
|
||||
#include "toolsF.h"
|
||||
|
||||
/* The possible states for tools */
|
||||
#define INACTIVE 0
|
||||
|
@ -41,67 +43,9 @@
|
|||
#define SELECTION (1 << 1)
|
||||
#define NON_ACTIVE_LAYER (1 << 2)
|
||||
|
||||
#include "toolsF.h"
|
||||
|
||||
/* The types of tools... */
|
||||
typedef enum
|
||||
{
|
||||
FIRST_TOOLBOX_TOOL,
|
||||
RECT_SELECT = FIRST_TOOLBOX_TOOL,
|
||||
ELLIPSE_SELECT,
|
||||
FREE_SELECT,
|
||||
FUZZY_SELECT,
|
||||
BEZIER_SELECT,
|
||||
ISCISSORS,
|
||||
MOVE,
|
||||
MAGNIFY,
|
||||
CROP,
|
||||
ROTATE,
|
||||
SCALE,
|
||||
SHEAR,
|
||||
PERSPECTIVE,
|
||||
FLIP_HORZ,
|
||||
FLIP_VERT,
|
||||
TEXT,
|
||||
COLOR_PICKER,
|
||||
BUCKET_FILL,
|
||||
BLEND,
|
||||
PENCIL,
|
||||
PAINTBRUSH,
|
||||
ERASER,
|
||||
AIRBRUSH,
|
||||
CLONE,
|
||||
CONVOLVE,
|
||||
INK,
|
||||
LAST_TOOLBOX_TOOL = INK,
|
||||
|
||||
/* Non-toolbox tools */
|
||||
BY_COLOR_SELECT,
|
||||
COLOR_BALANCE,
|
||||
BRIGHTNESS_CONTRAST,
|
||||
HUE_SATURATION,
|
||||
POSTERIZE,
|
||||
THRESHOLD,
|
||||
CURVES,
|
||||
LEVELS,
|
||||
HISTOGRAM
|
||||
} ToolType;
|
||||
|
||||
/* Structure definitions */
|
||||
|
||||
typedef struct _tool Tool;
|
||||
typedef struct _ToolInfo ToolInfo;
|
||||
typedef void (* ButtonPressFunc) (Tool *, GdkEventButton *, gpointer);
|
||||
typedef void (* ButtonReleaseFunc) (Tool *, GdkEventButton *, gpointer);
|
||||
typedef void (* MotionFunc) (Tool *, GdkEventMotion *, gpointer);
|
||||
typedef void (* ArrowKeysFunc) (Tool *, GdkEventKey *, gpointer);
|
||||
typedef void (* CursorUpdateFunc) (Tool *, GdkEventMotion *, gpointer);
|
||||
typedef void (* ToolCtlFunc) (Tool *, int, gpointer);
|
||||
|
||||
/* ToolInfo function declarations */
|
||||
typedef Tool *(* ToolInfoNewFunc) (void);
|
||||
typedef void (* ToolInfoFreeFunc) (Tool *);
|
||||
typedef void (* ToolInfoInitFunc) (GDisplay *);
|
||||
|
||||
struct _tool
|
||||
{
|
||||
/* Data */
|
||||
|
|
|
@ -20,6 +20,8 @@
|
|||
|
||||
#include "tools.h"
|
||||
#include "procedural_db.h"
|
||||
#include "gdisplayF.h"
|
||||
#include "gimage.h"
|
||||
|
||||
/* by_color select functions */
|
||||
Tool * tools_new_by_color_select (void);
|
||||
|
|
|
@ -20,6 +20,8 @@
|
|||
|
||||
#include "tools.h"
|
||||
#include "procedural_db.h"
|
||||
#include "gdisplayF.h"
|
||||
#include "gimage.h"
|
||||
|
||||
/* by_color select functions */
|
||||
Tool * tools_new_by_color_select (void);
|
||||
|
|
|
@ -25,6 +25,7 @@
|
|||
#include "tools.h"
|
||||
#include "undo.h"
|
||||
#include "blob.h"
|
||||
#include "gdisplay.h"
|
||||
|
||||
#include "tile.h" /* ick. */
|
||||
|
||||
|
|
|
@ -25,6 +25,7 @@
|
|||
#include "tools.h"
|
||||
#include "undo.h"
|
||||
#include "blob.h"
|
||||
#include "gdisplay.h"
|
||||
|
||||
#include "tile.h" /* ick. */
|
||||
|
||||
|
|
|
@ -21,6 +21,7 @@
|
|||
#include "draw_core.h"
|
||||
#include "temp_buf.h"
|
||||
#include "gimpbrush.h"
|
||||
#include "gimpdrawableF.h"
|
||||
|
||||
/* the different states that the painting function can be called with */
|
||||
#define INIT_PAINT 0
|
||||
|
|
|
@ -18,8 +18,10 @@
|
|||
#ifndef __TOOLS_H__
|
||||
#define __TOOLS_H__
|
||||
|
||||
#include "layer.h"
|
||||
#include "gdisplay.h"
|
||||
#include "layerF.h"
|
||||
#include "gdisplayF.h"
|
||||
|
||||
#include "toolsF.h"
|
||||
|
||||
/* The possible states for tools */
|
||||
#define INACTIVE 0
|
||||
|
@ -41,67 +43,9 @@
|
|||
#define SELECTION (1 << 1)
|
||||
#define NON_ACTIVE_LAYER (1 << 2)
|
||||
|
||||
#include "toolsF.h"
|
||||
|
||||
/* The types of tools... */
|
||||
typedef enum
|
||||
{
|
||||
FIRST_TOOLBOX_TOOL,
|
||||
RECT_SELECT = FIRST_TOOLBOX_TOOL,
|
||||
ELLIPSE_SELECT,
|
||||
FREE_SELECT,
|
||||
FUZZY_SELECT,
|
||||
BEZIER_SELECT,
|
||||
ISCISSORS,
|
||||
MOVE,
|
||||
MAGNIFY,
|
||||
CROP,
|
||||
ROTATE,
|
||||
SCALE,
|
||||
SHEAR,
|
||||
PERSPECTIVE,
|
||||
FLIP_HORZ,
|
||||
FLIP_VERT,
|
||||
TEXT,
|
||||
COLOR_PICKER,
|
||||
BUCKET_FILL,
|
||||
BLEND,
|
||||
PENCIL,
|
||||
PAINTBRUSH,
|
||||
ERASER,
|
||||
AIRBRUSH,
|
||||
CLONE,
|
||||
CONVOLVE,
|
||||
INK,
|
||||
LAST_TOOLBOX_TOOL = INK,
|
||||
|
||||
/* Non-toolbox tools */
|
||||
BY_COLOR_SELECT,
|
||||
COLOR_BALANCE,
|
||||
BRIGHTNESS_CONTRAST,
|
||||
HUE_SATURATION,
|
||||
POSTERIZE,
|
||||
THRESHOLD,
|
||||
CURVES,
|
||||
LEVELS,
|
||||
HISTOGRAM
|
||||
} ToolType;
|
||||
|
||||
/* Structure definitions */
|
||||
|
||||
typedef struct _tool Tool;
|
||||
typedef struct _ToolInfo ToolInfo;
|
||||
typedef void (* ButtonPressFunc) (Tool *, GdkEventButton *, gpointer);
|
||||
typedef void (* ButtonReleaseFunc) (Tool *, GdkEventButton *, gpointer);
|
||||
typedef void (* MotionFunc) (Tool *, GdkEventMotion *, gpointer);
|
||||
typedef void (* ArrowKeysFunc) (Tool *, GdkEventKey *, gpointer);
|
||||
typedef void (* CursorUpdateFunc) (Tool *, GdkEventMotion *, gpointer);
|
||||
typedef void (* ToolCtlFunc) (Tool *, int, gpointer);
|
||||
|
||||
/* ToolInfo function declarations */
|
||||
typedef Tool *(* ToolInfoNewFunc) (void);
|
||||
typedef void (* ToolInfoFreeFunc) (Tool *);
|
||||
typedef void (* ToolInfoInitFunc) (GDisplay *);
|
||||
|
||||
struct _tool
|
||||
{
|
||||
/* Data */
|
||||
|
|
|
@ -0,0 +1,67 @@
|
|||
#ifndef __TOOLS_F_H__
|
||||
#define __TOOLS_F_H__
|
||||
|
||||
#include "gdisplayF.h"
|
||||
|
||||
typedef enum
|
||||
{
|
||||
FIRST_TOOLBOX_TOOL,
|
||||
RECT_SELECT = FIRST_TOOLBOX_TOOL,
|
||||
ELLIPSE_SELECT,
|
||||
FREE_SELECT,
|
||||
FUZZY_SELECT,
|
||||
BEZIER_SELECT,
|
||||
ISCISSORS,
|
||||
MOVE,
|
||||
MAGNIFY,
|
||||
CROP,
|
||||
ROTATE,
|
||||
SCALE,
|
||||
SHEAR,
|
||||
PERSPECTIVE,
|
||||
FLIP_HORZ,
|
||||
FLIP_VERT,
|
||||
TEXT,
|
||||
COLOR_PICKER,
|
||||
BUCKET_FILL,
|
||||
BLEND,
|
||||
PENCIL,
|
||||
PAINTBRUSH,
|
||||
ERASER,
|
||||
AIRBRUSH,
|
||||
CLONE,
|
||||
CONVOLVE,
|
||||
INK,
|
||||
LAST_TOOLBOX_TOOL = INK,
|
||||
|
||||
/* Non-toolbox tools */
|
||||
BY_COLOR_SELECT,
|
||||
COLOR_BALANCE,
|
||||
BRIGHTNESS_CONTRAST,
|
||||
HUE_SATURATION,
|
||||
POSTERIZE,
|
||||
THRESHOLD,
|
||||
CURVES,
|
||||
LEVELS,
|
||||
HISTOGRAM
|
||||
} ToolType;
|
||||
|
||||
/* Structure definitions */
|
||||
|
||||
typedef struct _tool Tool;
|
||||
typedef struct _ToolInfo ToolInfo;
|
||||
typedef void (* ButtonPressFunc) (Tool *, GdkEventButton *, gpointer);
|
||||
typedef void (* ButtonReleaseFunc) (Tool *, GdkEventButton *, gpointer);
|
||||
typedef void (* MotionFunc) (Tool *, GdkEventMotion *, gpointer);
|
||||
typedef void (* ArrowKeysFunc) (Tool *, GdkEventKey *, gpointer);
|
||||
typedef void (* CursorUpdateFunc) (Tool *, GdkEventMotion *, gpointer);
|
||||
typedef void (* ToolCtlFunc) (Tool *, int, gpointer);
|
||||
|
||||
/* ToolInfo function declarations */
|
||||
typedef Tool *(* ToolInfoNewFunc) (void);
|
||||
typedef void (* ToolInfoFreeFunc) (Tool *);
|
||||
typedef void (* ToolInfoInitFunc) (GDisplay *);
|
||||
|
||||
|
||||
|
||||
#endif
|
|
@ -18,7 +18,7 @@
|
|||
#include "interface.h"
|
||||
#include "plug_in.h"
|
||||
#include "procedural_db.h"
|
||||
#include "tile_swap.h"
|
||||
/* #include "tile_swap.h"*/
|
||||
#include "xcf.h"
|
||||
#include "frac.h"
|
||||
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
#include "interface.h"
|
||||
#include "plug_in.h"
|
||||
#include "procedural_db.h"
|
||||
#include "tile_swap.h"
|
||||
/* #include "tile_swap.h"*/
|
||||
#include "xcf.h"
|
||||
#include "frac.h"
|
||||
|
||||
|
|
Loading…
Reference in New Issue