X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fpencil-context.cpp;h=d86b83c01b72f0344c5b35dd32eec2049611ecac;hb=f9cb5a9e9d6ea60cd2e8e3dc63cb070fa10f9650;hp=ccb7c97e96b6eda7f8be23d979f1fbf771e9e5fd;hpb=6129af7cc5b723223e9617614c931936e5190421;p=inkscape.git

diff --git a/src/pencil-context.cpp b/src/pencil-context.cpp
index ccb7c97e9..d86b83c01 100644
--- a/src/pencil-context.cpp
+++ b/src/pencil-context.cpp
@@ -35,6 +35,7 @@
 #include "libnr/in-svg-plane.h"
 #include "libnr/n-art-bpath.h"
 #include "context-fns.h"
+#include "sp-namedview.h"
 
 static void sp_pencil_context_class_init(SPPencilContextClass *klass);
 static void sp_pencil_context_init(SPPencilContext *pc);
@@ -233,7 +234,7 @@ 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);
+                        SnapManager const &m = desktop->namedview->snap_manager;
                         p = m.freeSnap(Inkscape::Snapper::BBOX_POINT | Inkscape::Snapper::SNAP_POINT, p, NULL).getPoint();
                     } else if (selection->singleItem() && SP_IS_PATH(selection->singleItem())) {
                         desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Appending to selected path"));
@@ -302,7 +303,7 @@ 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);
+                    SnapManager const &m = dt->namedview->snap_manager;
                     p = m.freeSnap(Inkscape::Snapper::BBOX_POINT | Inkscape::Snapper::SNAP_POINT, p, NULL).getPoint();
                 }
                 if ( pc->npoints != 0 ) { // buttonpress may have happened before we entered draw context!
@@ -401,12 +402,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;
+
+    sp_curve_reset(pc->red_curve);
+    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);
+    }
+    sp_curve_reset(pc->green_curve);
+    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)
 {
@@ -421,6 +452,25 @@ 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;
         default:
             break;
     }