![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/pencil-context.cpp b/src/pencil-context.cpp
index 3265d87bf23b1b9a95451ca2ccc990266e0a63c6..6af9f7956c768412f9ab31c705f6ba59712e0e17 100644 (file)
--- a/src/pencil-context.cpp
+++ b/src/pencil-context.cpp
#include "desktop.h"
#include "desktop-handles.h"
#include "selection.h"
+#include "selection-chemistry.h"
#include "draw-anchor.h"
#include "message-stack.h"
#include "message-context.h"
#include "libnr/n-art-bpath.h"
#include "context-fns.h"
#include "sp-namedview.h"
+#include "xml/repr.h"
+#include "document.h"
+#include "desktop-style.h"
+#include "macros.h"
+#include "display/curve.h"
static void sp_pencil_context_class_init(SPPencilContextClass *klass);
static void sp_pencil_context_init(SPPencilContext *pc);
pencil_handle_button_press(SPPencilContext *const pc, GdkEventButton const &bevent)
{
gint ret = FALSE;
- if ( bevent.button == 1 ) {
+ SPEventContext *event_context = SP_EVENT_CONTEXT(pc);
+ if ( bevent.button == 1 && !event_context->space_panning) {
SPDrawContext *dc = SP_DRAW_CONTEXT (pc);
SPDesktop *desktop = SP_EVENT_CONTEXT_DESKTOP(dc);
@@ -222,6 +229,11 @@ pencil_handle_button_press(SPPencilContext *const pc, GdkEventButton const &beve
break;
default:
/* Set first point of sequence */
+ if (bevent.state & GDK_CONTROL_MASK) {
+ freehand_create_single_dot(event_context, p, "tools.freehand.pencil", bevent.state);
+ ret = true;
+ break;
+ }
if (anchor) {
p = anchor->dp;
desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Continuing selected path"));
@@ -234,8 +246,9 @@ pencil_handle_button_press(SPPencilContext *const pc, GdkEventButton const &beve
// anchor, which is handled by the sibling branch above)
selection->clear();
desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Creating new path"));
- SnapManager const &m = desktop->namedview->snap_manager;
- p = m.freeSnap(Inkscape::Snapper::BBOX_POINT | Inkscape::Snapper::SNAP_POINT, p, NULL).getPoint();
+ SnapManager &m = desktop->namedview->snap_manager;
+ m.setup(desktop);
+ m.freeSnapReturnByRef(Inkscape::Snapper::SNAPPOINT_NODE, p);
} else if (selection->singleItem() && SP_IS_PATH(selection->singleItem())) {
desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Appending to selected path"));
}
@@ -254,11 +267,18 @@ pencil_handle_button_press(SPPencilContext *const pc, GdkEventButton const &beve
static gint
pencil_handle_motion_notify(SPPencilContext *const pc, GdkEventMotion const &mevent)
{
+ if ((mevent.state & GDK_CONTROL_MASK) && (mevent.state & GDK_BUTTON1_MASK)) {
+ // mouse was accidentally moved during Ctrl+click;
+ // ignore the motion and create a single point
+ pc->is_drawing = false;
+ return TRUE;
+ }
gint ret = FALSE;
SPDesktop *const dt = pc->desktop;
- if (mevent.state & GDK_BUTTON2_MASK || mevent.state & GDK_BUTTON3_MASK) {
- // allow middle-button scrolling
+ SPEventContext *event_context = SP_EVENT_CONTEXT(pc);
+ if (event_context->space_panning || mevent.state & GDK_BUTTON2_MASK || mevent.state & GDK_BUTTON3_MASK) {
+ // allow scrolling
return FALSE;
}
@@ -303,8 +323,9 @@ pencil_handle_motion_notify(SPPencilContext *const pc, GdkEventMotion const &mev
if (anchor) {
p = anchor->dp;
} else if ((mevent.state & GDK_SHIFT_MASK) == 0) {
- SnapManager const &m = dt->namedview->snap_manager;
- p = m.freeSnap(Inkscape::Snapper::BBOX_POINT | Inkscape::Snapper::SNAP_POINT, p, NULL).getPoint();
+ SnapManager &m = dt->namedview->snap_manager;
+ m.setup(dt, NULL);
+ m.freeSnapReturnByRef(Inkscape::Snapper::SNAPPOINT_NODE, p);
}
if ( pc->npoints != 0 ) { // buttonpress may have happened before we entered draw context!
spdc_add_freehand_point(pc, p, mevent.state);
@@ -340,7 +361,8 @@ pencil_handle_button_release(SPPencilContext *const pc, GdkEventButton const &re
{
gint ret = FALSE;
- if ( revent.button == 1 && pc->is_drawing) {
+ SPEventContext *event_context = SP_EVENT_CONTEXT(pc);
+ if ( revent.button == 1 && pc->is_drawing && !event_context->space_panning) {
SPDesktop *const dt = pc->desktop;
pc->is_drawing = false;
@@ -356,7 +378,10 @@ pencil_handle_button_release(SPPencilContext *const pc, GdkEventButton const &re
case SP_PENCIL_CONTEXT_IDLE:
/* Releasing button in idle mode means single click */
/* We have already set up start point/anchor in button_press */
- pc->state = SP_PENCIL_CONTEXT_ADDLINE;
+ if (!(revent.state & GDK_CONTROL_MASK)) {
+ // Ctrl+click creates a single point so only set context in ADDLINE mode when Ctrl isn't pressed
+ pc->state = SP_PENCIL_CONTEXT_ADDLINE;
+ }
ret = TRUE;
break;
case SP_PENCIL_CONTEXT_ADDLINE:
@@ -402,12 +427,42 @@ pencil_handle_button_release(SPPencilContext *const pc, GdkEventButton const &re
pc->grab = NULL;
}
- pc->grab = NULL;
ret = TRUE;
}
return ret;
}
+static void
+pencil_cancel (SPPencilContext *const pc)
+{
+ if (pc->grab) {
+ /* Release grab now */
+ sp_canvas_item_ungrab(pc->grab, 0);
+ pc->grab = NULL;
+ }
+
+ pc->is_drawing = false;
+
+ pc->state = SP_PENCIL_CONTEXT_IDLE;
+
+ pc->red_curve->reset();
+ sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(pc->red_bpath), NULL);
+ while (pc->green_bpaths) {
+ gtk_object_destroy(GTK_OBJECT(pc->green_bpaths->data));
+ pc->green_bpaths = g_slist_remove(pc->green_bpaths, pc->green_bpaths->data);
+ }
+ pc->green_curve->reset();
+ if (pc->green_anchor) {
+ pc->green_anchor = sp_draw_anchor_destroy(pc->green_anchor);
+ }
+
+ pc->_message_context->clear();
+ pc->_message_context->flash(Inkscape::NORMAL_MESSAGE, _("Drawing cancelled"));
+
+ sp_canvas_end_forced_full_redraws(pc->desktop->canvas);
+}
+
+
static gint
pencil_handle_key_press(SPPencilContext *const pc, guint const keyval, guint const state)
{
@@ -422,6 +477,32 @@ pencil_handle_key_press(SPPencilContext *const pc, guint const keyval, guint con
ret = TRUE;
}
break;
+ case GDK_Escape:
+ if (pc->npoints != 0) {
+ // if drawing, cancel, otherwise pass it up for deselecting
+ if (pc->is_drawing) {
+ pencil_cancel (pc);
+ ret = TRUE;
+ }
+ }
+ break;
+ case GDK_z:
+ case GDK_Z:
+ if (mod_ctrl_only(state) && pc->npoints != 0) {
+ // if drawing, cancel, otherwise pass it up for undo
+ if (pc->is_drawing) {
+ pencil_cancel (pc);
+ ret = TRUE;
+ }
+ }
+ break;
+ case GDK_g:
+ case GDK_G:
+ if (mod_shift_only(state)) {
+ sp_selection_to_guides();
+ ret = true;
+ }
+ break;
default:
break;
}
}
g_return_if_fail( pc->npoints > 0 );
- sp_curve_reset(pc->red_curve);
+ pc->red_curve->reset();
if ( ( p == pc->p[0] )
|| !in_svg_plane(p) )
{
pc->p[1] = p;
pc->npoints = 2;
- sp_curve_moveto(pc->red_curve, pc->p[0]);
- sp_curve_lineto(pc->red_curve, pc->p[1]);
+ pc->red_curve->moveto(pc->p[0]);
+ pc->red_curve->lineto(pc->p[1]);
pc->red_curve_is_valid = true;
sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(pc->red_bpath), pc->red_curve);
|| ( SP_CURVE_SEGMENT(pc->red_curve, 0)->c(3) ==
SP_CURVE_SEGMENT(pc->red_curve, 1)->c(3) ) )
{
- sp_curve_reset(pc->red_curve);
+ pc->red_curve->reset();
sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(pc->red_bpath), NULL);
} else {
/* Write curves to object. */
}
static void
-spdc_add_freehand_point(SPPencilContext *pc, NR::Point p, guint state)
+spdc_add_freehand_point(SPPencilContext *pc, NR::Point p, guint /*state*/)
{
g_assert( pc->npoints > 0 );
g_return_if_fail(unsigned(pc->npoints) < G_N_ELEMENTS(pc->p));
&& unsigned(pc->npoints) < G_N_ELEMENTS(pc->p) )
{
/* Fit and draw and reset state */
- sp_curve_reset(pc->red_curve);
- sp_curve_moveto(pc->red_curve, b[0]);
- sp_curve_curveto(pc->red_curve, b[1], b[2], b[3]);
+ pc->red_curve->reset();
+ pc->red_curve->moveto(b[0]);
+ pc->red_curve->curveto(b[1], b[2], b[3]);
sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(pc->red_bpath), pc->red_curve);
pc->red_curve_is_valid = true;
} else {
/* Fit and draw and copy last point */
- g_assert(!sp_curve_empty(pc->red_curve));
+ g_assert(!pc->red_curve->is_empty());
/* Set up direction of next curve. */
{
- NArtBpath const &last_seg = *sp_curve_last_bpath(pc->red_curve);
+ NArtBpath const &last_seg = *pc->red_curve->last_bpath();
pc->p[0] = last_seg.c(3);
pc->npoints = 1;
g_assert( last_seg.code == NR_CURVETO );
: NR::unit_vector(req_vec) );
}
- sp_curve_append_continuous(pc->green_curve, pc->red_curve, 0.0625);
- SPCurve *curve = sp_curve_copy(pc->red_curve);
+ pc->green_curve->append_continuous(pc->red_curve, 0.0625);
+ SPCurve *curve = pc->red_curve->copy();
/// \todo fixme:
SPCanvasItem *cshape = sp_canvas_bpath_new(sp_desktop_sketch(pc->desktop), curve);
- sp_curve_unref(curve);
+ curve->unref();
sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(cshape), pc->green_color, 1.0, SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT);
pc->green_bpaths = g_slist_prepend(pc->green_bpaths, cshape);