dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app/tools/gimppathtool.[ch] app/tools/path_tool.[ch] 

2001-04-11  Simon Budig  <simon@gimp.org>

        * app/tools/gimppathtool.[ch]
        * app/tools/path_tool.[ch]

        Some tweaks to make gcc and mitch more happy.
This commit is contained in:
Simon Budig 2001-04-11 15:25:49 +00:00 committed by Simon Budig
parent 5957eb4f4a
commit 4c2c3a2d0d
5 changed files with 63 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2001-04-11 Simon Budig <simon@gimp.org>
* app/tools/gimppathtool.[ch]
* app/tools/path_tool.[ch]
Some tweaks to make gcc and mitch more happy.
2001-04-11 Simon Budig <simon@gimp.org>
* app/path_curves.[ch]

43
app/tools/gimppathtool.c
View File

@ -56,12 +56,36 @@ static void gimp_path_tool_control (GimpTool *tool,
static void gimp_path_tool_button_press (GimpTool *tool,
GdkEventButton *bevent,
GDisplay *gdisp);
static gint gimp_path_tool_button_press_canvas (GimpPathTool *tool,
GdkEventButton *bevent,
GDisplay *gdisp);
static gint gimp_path_tool_button_press_anchor (GimpPathTool *tool,
GdkEventButton *bevent,
GDisplay *gdisp);
static gint gimp_path_tool_button_press_handle (GimpPathTool *tool,
GdkEventButton *bevent,
GDisplay *gdisp);
static gint gimp_path_tool_button_press_curve (GimpPathTool *tool,
GdkEventButton *bevent,
GDisplay *gdisp);
static void gimp_path_tool_button_release (GimpTool *tool,
GdkEventButton *bevent,
GDisplay *gdisp);
static void gimp_path_tool_motion (GimpTool *tool,
GdkEventMotion *mevent,
GDisplay *gdisp);
static void gimp_path_tool_motion_anchor (GimpPathTool *path_tool,
GdkEventMotion *mevent,
GDisplay *gdisp);
static void gimp_path_tool_motion_handle (GimpPathTool *path_tool,
GdkEventMotion *mevent,
GDisplay *gdisp);
static void gimp_path_tool_motion_curve (GimpPathTool *path_tool,
GdkEventMotion *mevent,
GDisplay *gdisp);
static void gimp_path_tool_cursor_update (GimpTool *tool,
GdkEventMotion *mevent,
GDisplay *gdisp);
@ -70,6 +94,7 @@ static void gimp_path_tool_draw (GimpDrawTool *draw_tool);
static GimpDrawToolClass *parent_class = NULL;
/* the move tool options */
@ -194,10 +219,10 @@ gimp_path_tool_destroy (GtkObject *object)
fprintf (stderr, "gimp_path_tool_free start\n");
#endif PATH_TOOL_DEBUG
path_free_path (path_tool->cur_path);
if (GTK_OBJECT_CLASS (parent_class)->destroy)
GTK_OBJECT_CLASS (parent_class)->destroy (object);
path_free_path (path_tool->cur_path);
}
static void
@ -310,7 +335,7 @@ gimp_path_tool_button_press (GimpTool *tool,
}
gint
static gint
gimp_path_tool_button_press_anchor (GimpPathTool *path_tool,
GdkEventButton *bevent,
GDisplay *gdisp)
@ -434,7 +459,7 @@ gimp_path_tool_button_press_anchor (GimpPathTool *path_tool,
}
gint
static gint
gimp_path_tool_button_press_handle (GimpPathTool *path_tool,
GdkEventButton *bevent,
GDisplay *gdisp)
@ -475,7 +500,7 @@ gimp_path_tool_button_press_handle (GimpPathTool *path_tool,
return grab_pointer;
}
gint
static gint
gimp_path_tool_button_press_canvas (GimpPathTool *path_tool,
GdkEventButton *bevent,
GDisplay *gdisp)
@ -530,7 +555,7 @@ gimp_path_tool_button_press_canvas (GimpPathTool *path_tool,
return 0;
}
gint
static gint
gimp_path_tool_button_press_curve (GimpPathTool *path_tool,
GdkEventButton *bevent,
GDisplay *gdisp)
@ -618,7 +643,7 @@ gimp_path_tool_motion (GimpTool *tool,
void
static void
gimp_path_tool_motion_anchor (GimpPathTool *path_tool,
GdkEventMotion *mevent,
GDisplay *gdisp)
@ -684,7 +709,7 @@ gimp_path_tool_motion_anchor (GimpPathTool *path_tool,
}
void
static void
gimp_path_tool_motion_handle (GimpPathTool *path_tool,
GdkEventMotion *mevent,
GDisplay *gdisp)
@ -730,7 +755,7 @@ gimp_path_tool_motion_handle (GimpPathTool *path_tool,
}
void
static void
gimp_path_tool_motion_curve (GimpPathTool *path_tool,
GdkEventMotion *mevent,
GDisplay *gdisp)

24
app/tools/gimppathtool.h
View File

@ -72,30 +72,6 @@ void gimp_path_tool_register (void);
GtkType gimp_path_tool_get_type (void);
void gimp_path_tool_button_press (GimpTool *, GdkEventButton *, GDisplay *);
void gimp_path_tool_button_release (GimpTool *, GdkEventButton *, GDisplay *);
void gimp_path_tool_motion (GimpTool *, GdkEventMotion *, GDisplay *);
void gimp_path_tool_cursor_update (GimpTool *, GdkEventMotion *, GDisplay *);
void gimp_path_tool_control (GimpTool *, ToolAction, GDisplay *);
void gimp_path_tool_draw (GimpDrawTool *);
void gimp_path_tool_draw_curve (GimpPathTool *, PathCurve *);
void gimp_path_tool_draw_segment (GimpPathTool *, PathSegment *);
gdouble gimp_path_tool_on_curve (GimpPathTool *, gint, gint, gint,
NPath**, PathCurve**, PathSegment**);
gboolean gimp_path_tool_on_anchors (GimpPathTool *, gint, gint, gint,
NPath**, PathCurve**, PathSegment**);
gint gimp_path_tool_on_handles (GimpPathTool *, gint, gint, gint,
NPath **, PathCurve **, PathSegment **);
gint gimp_path_tool_button_press_canvas (GimpPathTool *, GdkEventButton *, GDisplay *);
gint gimp_path_tool_button_press_anchor (GimpPathTool *, GdkEventButton *, GDisplay *);
gint gimp_path_tool_button_press_handle (GimpPathTool *, GdkEventButton *, GDisplay *);
gint gimp_path_tool_button_press_curve (GimpPathTool *, GdkEventButton *, GDisplay *);
void gimp_path_tool_motion_anchor (GimpPathTool *, GdkEventMotion *, GDisplay *);
void gimp_path_tool_motion_handle (GimpPathTool *, GdkEventMotion *, GDisplay *);
void gimp_path_tool_motion_curve (GimpPathTool *, GdkEventMotion *, GDisplay *);
#endif /* __GIMP_PATH_TOOL_H__ */

9
app/tools/path_tool.c
View File

@ -139,6 +139,11 @@ void path_to_selection (GimpPathTool *,
/* Functions necessary for the tool */
gboolean path_tool_on_anchors (NPath *, gdouble, gdouble, gint,
NPath**, PathCurve**, PathSegment**);
gint path_tool_on_handles (NPath *, gdouble, gdouble, gint,
NPath **, PathCurve **, PathSegment **);
#if 0
void path_tool_button_press (Tool *, GdkEventButton *, gpointer);
void path_tool_button_release (Tool *, GdkEventButton *, gpointer);
@ -151,10 +156,6 @@ void path_tool_draw_segment (Tool *, PathSegment *);
gdouble path_tool_on_curve (Tool *, gint, gint, gint,
NPath**, PathCurve**, PathSegment**);
gboolean path_tool_on_anchors (Tool *, gint, gint, gint,
NPath**, PathCurve**, PathSegment**);
gint path_tool_on_handles (Tool *, gint, gint, gint,
NPath **, PathCurve **, PathSegment **);
gint path_tool_button_press_canvas (Tool *, GdkEventButton *, GDisplay *);
gint path_tool_button_press_anchor (Tool *, GdkEventButton *, GDisplay *);

17
app/tools/path_tool.h
View File

@ -96,6 +96,23 @@ void path_set_flags (GimpPathTool *,
guint32,
guint32);
gdouble gimp_path_tool_on_curve (GimpPathTool *, gint, gint, gint,
NPath**, PathCurve**, PathSegment**);
gboolean gimp_path_tool_on_anchors (GimpPathTool *, gint, gint, gint,
NPath**, PathCurve**, PathSegment**);
gint gimp_path_tool_on_handles (GimpPathTool *, gint, gint, gint,
NPath **, PathCurve **, PathSegment **);
gint path_tool_cursor_position (NPath *path,
gdouble x,
gdouble y,
gint halfwidth,
NPath **pathP,
PathCurve **curveP,
PathSegment **segmentP,
gdouble *positionP,
gint *handle_idP);
/* High level image-manipulation functions */
void path_stroke (GimpPathTool *,