Code

Use subdirectories with icon sizes.
[inkscape.git] / src / event-context.cpp
index 5b845388bce1c8bdd44fd7a226d237fdf5850463..828ce3d5b1d02ab950dc31ab76eb789603ca24d3 100644 (file)
@@ -1,5 +1,3 @@
-#define __SP_EVENT_CONTEXT_C__
-
 /** \file
  * Main event handling, and related helper functions.
  *
@@ -7,8 +5,9 @@
  *   Lauris Kaplinski <lauris@kaplinski.com>
  *   Frank Felfe <innerspace@iname.com>
  *   bulia byak <buliabyak@users.sf.net>
+ *   Jon A. Cruz <jon@joncruz.org>
  *
- * Copyright (C) 1999-2005 authors
+ * Copyright (C) 1999-2010 authors
  * Copyright (C) 2001-2002 Ximian, Inc.
  *
  * Released under GNU GPL, read the file 'COPYING' for more information
@@ -43,6 +42,9 @@
 #include "shortcuts.h"
 #include "desktop.h"
 #include "desktop-handles.h"
+#include "desktop-events.h"
+#include "desktop-style.h"
+#include "widgets/desktop-widget.h"
 #include "sp-namedview.h"
 #include "selection.h"
 #include "file.h"
 #include "attributes.h"
 #include "rubberband.h"
 #include "selcue.h"
-#include "node-context.h"
 #include "lpe-tool-context.h"
+#include "ui/tool/control-point.h"
+#include "shape-editor.h"
+#include "sp-guide.h"
+#include "color.h"
 
 static void sp_event_context_class_init(SPEventContextClass *klass);
 static void sp_event_context_init(SPEventContext *event_context);
 static void sp_event_context_dispose(GObject *object);
 
 static void sp_event_context_private_setup(SPEventContext *ec);
-static gint sp_event_context_private_root_handler(SPEventContext *event_context, GdkEvent *event);
-static gint sp_event_context_private_item_handler(SPEventContext *event_context, SPItem *item, GdkEvent *event);
+static gint sp_event_context_private_root_handler(
+        SPEventContext *event_context, GdkEvent *event);
+static gint sp_event_context_private_item_handler(
+        SPEventContext *event_context, SPItem *item, GdkEvent *event);
 
 static void set_event_location(SPDesktop * desktop, GdkEvent * event);
 
@@ -91,22 +98,16 @@ static guint scroll_keyval = 0;
 /**
  * Registers the SPEventContext class with Glib and returns its type number.
  */
-GType
-sp_event_context_get_type(void)
-{
+GType sp_event_context_get_type(void) {
     static GType type = 0;
     if (!type) {
-        GTypeInfo info = {
-            sizeof(SPEventContextClass),
-            NULL, NULL,
-            (GClassInitFunc) sp_event_context_class_init,
-            NULL, NULL,
-            sizeof(SPEventContext),
-            4,
-            (GInstanceInitFunc) sp_event_context_init,
-            NULL,    /* value_table */
+        GTypeInfo info = { sizeof(SPEventContextClass), NULL, NULL,
+                (GClassInitFunc) sp_event_context_class_init, NULL, NULL,
+                sizeof(SPEventContext), 4,
+                (GInstanceInitFunc) sp_event_context_init, NULL, /* value_table */
         };
-        type = g_type_register_static(G_TYPE_OBJECT, "SPEventContext", &info, (GTypeFlags)0);
+        type = g_type_register_static(G_TYPE_OBJECT, "SPEventContext", &info,
+                (GTypeFlags) 0);
     }
     return type;
 }
@@ -114,14 +115,12 @@ sp_event_context_get_type(void)
 /**
  * Callback to set up the SPEventContext vtable.
  */
-static void
-sp_event_context_class_init(SPEventContextClass *klass)
-{
+static void sp_event_context_class_init(SPEventContextClass *klass) {
     GObjectClass *object_class;
 
     object_class = (GObjectClass *) klass;
 
-    parent_class = (GObjectClass*)g_type_class_peek_parent(klass);
+    parent_class = (GObjectClass*) g_type_class_peek_parent(klass);
 
     object_class->dispose = sp_event_context_dispose;
 
@@ -133,9 +132,7 @@ sp_event_context_class_init(SPEventContextClass *klass)
 /**
  * Clears all SPEventContext object members.
  */
-static void
-sp_event_context_init(SPEventContext *event_context)
-{
+static void sp_event_context_init(SPEventContext *event_context) {
     event_context->desktop = NULL;
     event_context->cursor = NULL;
     event_context->_message_context = NULL;
@@ -144,14 +141,14 @@ sp_event_context_init(SPEventContext *event_context)
     event_context->space_panning = false;
     event_context->shape_editor = NULL;
     event_context->_delayed_snap_event = NULL;
+    event_context->_dse_callback_in_process = false;
+    event_context->tool_url = NULL;
 }
 
 /**
  * Callback to free and null member variables of SPEventContext object.
  */
-static void
-sp_event_context_dispose(GObject *object)
-{
+static void sp_event_context_dispose(GObject *object) {
     SPEventContext *ec;
 
     ec = SP_EVENT_CONTEXT(object);
@@ -173,31 +170,53 @@ sp_event_context_dispose(GObject *object)
         delete ec->pref_observer;
     }
 
+    if (ec->_delayed_snap_event) {
+        delete ec->_delayed_snap_event;
+    }
+
     G_OBJECT_CLASS(parent_class)->dispose(object);
 }
 
 /**
  * Recreates and draws cursor on desktop related to SPEventContext.
  */
-void
-sp_event_context_update_cursor(SPEventContext *ec)
-{
+void sp_event_context_update_cursor(SPEventContext *ec) {
     GtkWidget *w = GTK_WIDGET(sp_desktop_canvas(ec->desktop));
     if (w->window) {
         /* fixme: */
         if (ec->cursor_shape) {
-            GdkBitmap *bitmap = NULL;
-            GdkBitmap *mask = NULL;
-            sp_cursor_bitmap_and_mask_from_xpm(&bitmap, &mask, ec->cursor_shape);
-            if ((bitmap != NULL) && (mask != NULL)) {
-                if (ec->cursor)
-                    gdk_cursor_unref (ec->cursor);
-                ec->cursor = gdk_cursor_new_from_pixmap(bitmap, mask,
-                                                        &w->style->black,
-                                                        &w->style->white,
-                                                        ec->hot_x, ec->hot_y);
-                g_object_unref (bitmap);
-                g_object_unref (mask);
+            GdkDisplay *display = gdk_display_get_default();
+            if (ec->tool_url && gdk_display_supports_cursor_alpha(display) && gdk_display_supports_cursor_color(display)) {
+                bool fillHasColor=false, strokeHasColor=false;
+                guint32 fillColor = sp_desktop_get_color_tool(ec->desktop, ec->tool_url, true, &fillHasColor);
+                guint32 strokeColor = sp_desktop_get_color_tool(ec->desktop, ec->tool_url, false, &strokeHasColor);
+                double fillOpacity = fillHasColor ? sp_desktop_get_opacity_tool(ec->desktop, ec->tool_url, true) : 0;
+                double strokeOpacity = strokeHasColor ? sp_desktop_get_opacity_tool(ec->desktop, ec->tool_url, false) : 0;
+                GdkPixbuf *pixbuf = sp_cursor_pixbuf_from_xpm(
+                    ec->cursor_shape,
+                    w->style->black, w->style->white,
+                    SP_RGBA32_U_COMPOSE(SP_RGBA32_R_U(fillColor),SP_RGBA32_G_U(fillColor),SP_RGBA32_B_U(fillColor),SP_COLOR_F_TO_U(fillOpacity)),
+                    SP_RGBA32_U_COMPOSE(SP_RGBA32_R_U(strokeColor),SP_RGBA32_G_U(strokeColor),SP_RGBA32_B_U(strokeColor),SP_COLOR_F_TO_U(strokeOpacity))
+                    );
+                if (pixbuf != NULL) {
+                    if (ec->cursor)
+                        gdk_cursor_unref(ec->cursor);
+                    ec->cursor = gdk_cursor_new_from_pixbuf(display, pixbuf, ec->hot_x, ec->hot_y);
+                    g_object_unref(pixbuf);
+                }
+            } else {
+                GdkBitmap *bitmap = NULL;
+                GdkBitmap *mask = NULL;
+                sp_cursor_bitmap_and_mask_from_xpm(&bitmap, &mask, ec->cursor_shape);
+                if ((bitmap != NULL) && (mask != NULL)) {
+                    if (ec->cursor)
+                        gdk_cursor_unref(ec->cursor);
+                    ec->cursor = gdk_cursor_new_from_pixmap(bitmap, mask,
+                            &w->style->black, &w->style->white, ec->hot_x,
+                            ec->hot_y);
+                    g_object_unref(bitmap);
+                    g_object_unref(mask);
+                }
             }
         }
         gdk_window_set_cursor(w->window, ec->cursor);
@@ -210,58 +229,56 @@ sp_event_context_update_cursor(SPEventContext *ec)
  * Callback that gets called on initialization of SPEventContext object.
  * Redraws mouse cursor, at the moment.
  */
-static void
-sp_event_context_private_setup(SPEventContext *ec)
-{
+static void sp_event_context_private_setup(SPEventContext *ec) {
     sp_event_context_update_cursor(ec);
 }
 
 /**
  * \brief   Gobbles next key events on the queue with the same keyval and mask. Returns the number of events consumed.
  */
-gint gobble_key_events(guint keyval, gint mask)
-{
+gint gobble_key_events(guint keyval, gint mask) {
     GdkEvent *event_next;
     gint i = 0;
 
     event_next = gdk_event_get();
     // while the next event is also a key notify with the same keyval and mask,
-    while (event_next && (event_next->type == GDK_KEY_PRESS || event_next->type == GDK_KEY_RELEASE)
-           && event_next->key.keyval == keyval
-           && (!mask || (event_next->key.state & mask))) {
+    while (event_next && (event_next->type == GDK_KEY_PRESS || event_next->type
+            == GDK_KEY_RELEASE) && event_next->key.keyval == keyval && (!mask
+            || (event_next->key.state & mask))) {
         if (event_next->type == GDK_KEY_PRESS)
-            i ++;
+            i++;
         // kill it
         gdk_event_free(event_next);
         // get next
         event_next = gdk_event_get();
     }
     // otherwise, put it back onto the queue
-    if (event_next) gdk_event_put(event_next);
+    if (event_next)
+        gdk_event_put(event_next);
 
     return i;
 }
 
 /**
  * \brief   Gobbles next motion notify events on the queue with the same mask. Returns the number of events consumed.
-*/
-gint gobble_motion_events(gint mask)
-{
+ */
+gint gobble_motion_events(gint mask) {
     GdkEvent *event_next;
     gint i = 0;
 
     event_next = gdk_event_get();
     // while the next event is also a key notify with the same keyval and mask,
     while (event_next && event_next->type == GDK_MOTION_NOTIFY
-           && (event_next->motion.state & mask)) {
+            && (event_next->motion.state & mask)) {
         // kill it
         gdk_event_free(event_next);
         // get next
         event_next = gdk_event_get();
-        i ++;
+        i++;
     }
     // otherwise, put it back onto the queue
-    if (event_next) gdk_event_put(event_next);
+    if (event_next)
+        gdk_event_put(event_next);
 
     return i;
 }
@@ -270,20 +287,21 @@ gint gobble_motion_events(gint mask)
  * Toggles current tool between active tool and selector tool.
  * Subroutine of sp_event_context_private_root_handler().
  */
-static void
-sp_toggle_selector(SPDesktop *dt)
-{
-    if (!dt->event_context) return;
+static void sp_toggle_selector(SPDesktop *dt) {
+    if (!dt->event_context)
+        return;
 
     if (tools_isactive(dt, TOOLS_SELECT)) {
         if (selector_toggled) {
-            if (switch_selector_to) tools_switch (dt, switch_selector_to);
+            if (switch_selector_to)
+                tools_switch(dt, switch_selector_to);
             selector_toggled = FALSE;
-        } else return;
+        } else
+            return;
     } else {
         selector_toggled = TRUE;
         switch_selector_to = tools_active(dt);
-        tools_switch (dt, TOOLS_SELECT);
+        tools_switch(dt, TOOLS_SELECT);
     }
 }
 
@@ -291,20 +309,21 @@ sp_toggle_selector(SPDesktop *dt)
  * Toggles current tool between active tool and dropper tool.
  * Subroutine of sp_event_context_private_root_handler().
  */
-static void
-sp_toggle_dropper(SPDesktop *dt)
-{
-    if (!dt->event_context) return;
+static void sp_toggle_dropper(SPDesktop *dt) {
+    if (!dt->event_context)
+        return;
 
     if (tools_isactive(dt, TOOLS_DROPPER)) {
         if (dropper_toggled) {
-            if (switch_dropper_to) tools_switch (dt, switch_dropper_to);
+            if (switch_dropper_to)
+                tools_switch(dt, switch_dropper_to);
             dropper_toggled = FALSE;
-        } else return;
+        } else
+            return;
     } else {
         dropper_toggled = TRUE;
         switch_dropper_to = tools_active(dt);
-        tools_switch (dt, TOOLS_DROPPER);
+        tools_switch(dt, TOOLS_DROPPER);
     }
 }
 
@@ -312,8 +331,8 @@ sp_toggle_dropper(SPDesktop *dt)
  * Calculates and keeps track of scroll acceleration.
  * Subroutine of sp_event_context_private_root_handler().
  */
-static gdouble accelerate_scroll(GdkEvent *event, gdouble acceleration, SPCanvas */*canvas*/)
-{
+static gdouble accelerate_scroll(GdkEvent *event, gdouble acceleration,
+        SPCanvas */*canvas*/) {
     guint32 time_diff = ((GdkEventKey *) event)->time - scroll_event_time;
 
     /* key pressed within 500ms ? (1/2 second) */
@@ -332,8 +351,8 @@ static gdouble accelerate_scroll(GdkEvent *event, gdouble acceleration, SPCanvas
 /**
  * Main event dispatch, gets called from Gdk.
  */
-static gint sp_event_context_private_root_handler(SPEventContext *event_context, GdkEvent *event)
-{
+static gint sp_event_context_private_root_handler(
+        SPEventContext *event_context, GdkEvent *event) {
     static Geom::Point button_w;
     static unsigned int panning = 0;
     static unsigned int zoom_rb = 0;
@@ -342,373 +361,386 @@ static gint sp_event_context_private_root_handler(SPEventContext *event_context,
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
 
     /// @todo REmove redundant /value in preference keys
-    tolerance = prefs->getIntLimited(
-            "/options/dragtolerance/value", 0, 0, 100);
-    double const zoom_inc = prefs->getDoubleLimited(
-            "/options/zoomincrement/value", M_SQRT2, 1.01, 10);
-    double const acceleration = prefs->getDoubleLimited(
-            "/options/scrollingacceleration/value", 0, 0, 6);
-    int const key_scroll = prefs->getIntLimited(
-            "/options/keyscroll/value", 10, 0, 1000);
-    int const wheel_scroll = prefs->getIntLimited(
-            "/options/wheelscroll/value", 40, 0, 1000);
+    tolerance = prefs->getIntLimited("/options/dragtolerance/value", 0, 0, 100);
 
     gint ret = FALSE;
 
     switch (event->type) {
-        case GDK_2BUTTON_PRESS:
-            if (panning) {
-                panning = 0;
-                sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate),
-                        event->button.time);
+    case GDK_2BUTTON_PRESS:
+        if (panning) {
+            panning = 0;
+            sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate),
+                    event->button.time);
+            ret = TRUE;
+        } else {
+            /* sp_desktop_dialog(); */
+        }
+        break;
+    case GDK_BUTTON_PRESS:
+
+        // save drag origin
+        xp = (gint) event->button.x;
+        yp = (gint) event->button.y;
+        within_tolerance = true;
+
+        button_w = Geom::Point(event->button.x, event->button.y);
+
+        switch (event->button.button) {
+        case 1:
+            if (event_context->space_panning) {
+                // When starting panning, make sure there are no snap events pending because these might disable the panning again
+                sp_event_context_discard_delayed_snap_event(event_context);
+                panning = 1;
+                sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate),
+                        GDK_KEY_RELEASE_MASK | GDK_BUTTON_RELEASE_MASK
+                                | GDK_POINTER_MOTION_MASK
+                                | GDK_POINTER_MOTION_HINT_MASK, NULL,
+                        event->button.time - 1);
                 ret = TRUE;
+            }
+            break;
+        case 2:
+            if (event->button.state & GDK_SHIFT_MASK) {
+                zoom_rb = 2;
             } else {
-                /* sp_desktop_dialog(); */
+                // When starting panning, make sure there are no snap events pending because these might disable the panning again
+                sp_event_context_discard_delayed_snap_event(event_context);
+                panning = 2;
+                sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate),
+                        GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK
+                                | GDK_POINTER_MOTION_HINT_MASK, NULL,
+                        event->button.time - 1);
             }
+            ret = TRUE;
             break;
-        case GDK_BUTTON_PRESS:
-
-            // save drag origin
-            xp = (gint) event->button.x;
-            yp = (gint) event->button.y;
-            within_tolerance = true;
-
-            button_w = Geom::Point(event->button.x, event->button.y);
-
-            switch (event->button.button) {
-                case 1:
-                    if (event_context->space_panning) {
-                        panning = 1;
-                        sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate),
-                            GDK_KEY_RELEASE_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK,
-                            NULL, event->button.time-1);
-                        ret = TRUE;
-                    }
-                    break;
-                case 2:
-                    if (event->button.state == GDK_SHIFT_MASK) {
-                        zoom_rb = 2;
-                    } else {
-                        panning = 2;
-                        sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate),
-                            GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK,
-                            NULL, event->button.time-1);
-                    }
-                    ret = TRUE;
-                    break;
-                case 3:
-                    if (event->button.state & GDK_SHIFT_MASK
-                            || event->button.state & GDK_CONTROL_MASK) {
-                        panning = 3;
-                        sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate),
-                                GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK,
-                                NULL, event->button.time);
-                        ret = TRUE;
-                    } else {
-                        sp_event_root_menu_popup(desktop, NULL, event);
-                    }
-                    break;
-                default:
-                    break;
+        case 3:
+            if (event->button.state & GDK_SHIFT_MASK || event->button.state
+                    & GDK_CONTROL_MASK) {
+                // When starting panning, make sure there are no snap events pending because these might disable the panning again
+                sp_event_context_discard_delayed_snap_event(event_context);
+                panning = 3;
+                sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate),
+                        GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK
+                                | GDK_POINTER_MOTION_HINT_MASK, NULL,
+                        event->button.time);
+                ret = TRUE;
+            } else {
+                sp_event_root_menu_popup(desktop, NULL, event);
             }
             break;
-        case GDK_MOTION_NOTIFY:
-            if (panning) {
-                if ((panning == 2 && !(event->motion.state & GDK_BUTTON2_MASK))
-                        || (panning == 1 && !(event->motion.state & GDK_BUTTON1_MASK))
-                        || (panning == 3 && !(event->motion.state & GDK_BUTTON3_MASK))
-                   ) {
-                    /* Gdk seems to lose button release for us sometimes :-( */
-                    panning = 0;
-                    sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate),
-                            event->button.time);
-                    ret = TRUE;
-                } else {
-                    if ( within_tolerance
-                         && ( abs( (gint) event->motion.x - xp ) < tolerance )
-                         && ( abs( (gint) event->motion.y - yp ) < tolerance ))
-                    {
-                        // do not drag if we're within tolerance from origin
-                        break;
-                    }
-                    // Once the user has moved farther than tolerance from
-                    // the original location (indicating they intend to move
-                    // the object, not click), then always process the motion
-                    // notify coordinates as given (no snapping back to origin)
-                    within_tolerance = false;
-
-                    // gobble subsequent motion events to prevent "sticking"
-                    // when scrolling is slow
-                    gobble_motion_events(panning == 2 ?
-                                         GDK_BUTTON2_MASK :
-                                         (panning == 1 ? GDK_BUTTON1_MASK : GDK_BUTTON3_MASK));
-
-                    Geom::Point const motion_w(event->motion.x, event->motion.y);
-                    Geom::Point const moved_w( motion_w - button_w );
-                    event_context->desktop->scroll_world(moved_w, true); // we're still scrolling, do not redraw
-                    ret = TRUE;
-                }
-            } else if (zoom_rb) {
-                Geom::Point const motion_w(event->motion.x, event->motion.y);
-                Geom::Point const motion_dt(desktop->w2d(motion_w));
-
-                if ( within_tolerance
-                     && ( abs( (gint) event->motion.x - xp ) < tolerance )
-                     && ( abs( (gint) event->motion.y - yp ) < tolerance ) ) {
-                    break; // do not drag if we're within tolerance from origin
+        default:
+            break;
+        }
+        break;
+    case GDK_MOTION_NOTIFY:
+        if (panning) {
+            if ((panning == 2 && !(event->motion.state & GDK_BUTTON2_MASK))
+                    || (panning == 1 && !(event->motion.state
+                            & GDK_BUTTON1_MASK)) || (panning == 3
+                    && !(event->motion.state & GDK_BUTTON3_MASK))) {
+                /* Gdk seems to lose button release for us sometimes :-( */
+                panning = 0;
+                sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate),
+                        event->button.time);
+                ret = TRUE;
+            } else {
+                if (within_tolerance && (abs((gint) event->motion.x - xp)
+                        < tolerance) && (abs((gint) event->motion.y - yp)
+                        < tolerance)) {
+                    // do not drag if we're within tolerance from origin
+                    break;
                 }
-                // Once the user has moved farther than tolerance from the original location
-                // (indicating they intend to move the object, not click), then always process the
-                // motion notify coordinates as given (no snapping back to origin)
+                // Once the user has moved farther than tolerance from
+                // the original location (indicating they intend to move
+                // the object, not click), then always process the motion
+                // notify coordinates as given (no snapping back to origin)
                 within_tolerance = false;
 
-                if (Inkscape::Rubberband::get(desktop)->is_started()) {
-                    Inkscape::Rubberband::get(desktop)->move(motion_dt);
-                } else {
-                    Inkscape::Rubberband::get(desktop)->start(desktop, motion_dt);
-                }
-                if (zoom_rb == 2)
-                    gobble_motion_events(GDK_BUTTON2_MASK);
-            }
-            break;
-        case GDK_BUTTON_RELEASE:
-            xp = yp = 0;
-            if (within_tolerance && (panning || zoom_rb)) {
-                zoom_rb = 0;
-                if (panning) {
-                    panning = 0;
-                    sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate),
-                                      event->button.time);
-                }
-                Geom::Point const event_w(event->button.x, event->button.y);
-                Geom::Point const event_dt(desktop->w2d(event_w));
-                desktop->zoom_relative_keep_point(event_dt,
-                          (event->button.state & GDK_SHIFT_MASK) ? 1/zoom_inc : zoom_inc);
-                desktop->updateNow();
+                // gobble subsequent motion events to prevent "sticking"
+                // when scrolling is slow
+                gobble_motion_events(panning == 2 ? GDK_BUTTON2_MASK : (panning
+                        == 1 ? GDK_BUTTON1_MASK : GDK_BUTTON3_MASK));
+
+                Geom::Point const motion_w(event->motion.x, event->motion.y);
+                Geom::Point const moved_w(motion_w - button_w);
+                event_context->desktop->scroll_world(moved_w, true); // we're still scrolling, do not redraw
                 ret = TRUE;
-            } else if (panning == event->button.button) {
+            }
+        } else if (zoom_rb) {
+            Geom::Point const motion_w(event->motion.x, event->motion.y);
+            Geom::Point const motion_dt(desktop->w2d(motion_w));
+
+            if (within_tolerance && (abs((gint) event->motion.x - xp)
+                    < tolerance) && (abs((gint) event->motion.y - yp)
+                    < tolerance)) {
+                break; // do not drag if we're within tolerance from origin
+            }
+            // Once the user has moved farther than tolerance from the original location
+            // (indicating they intend to move the object, not click), then always process the
+            // motion notify coordinates as given (no snapping back to origin)
+            within_tolerance = false;
+
+            if (Inkscape::Rubberband::get(desktop)->is_started()) {
+                Inkscape::Rubberband::get(desktop)->move(motion_dt);
+            } else {
+                Inkscape::Rubberband::get(desktop)->start(desktop, motion_dt);
+            }
+            if (zoom_rb == 2)
+                gobble_motion_events(GDK_BUTTON2_MASK);
+        }
+        break;
+    case GDK_BUTTON_RELEASE:
+        xp = yp = 0;
+        if (within_tolerance && (panning || zoom_rb)) {
+            zoom_rb = 0;
+            if (panning) {
                 panning = 0;
                 sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate),
-                                      event->button.time);
-
-                // in slow complex drawings, some of the motion events are lost;
-                // to make up for this, we scroll it once again to the button-up event coordinates
-                // (i.e. canvas will always get scrolled all the way to the mouse release point,
-                // even if few intermediate steps were visible)
-                Geom::Point const motion_w(event->button.x, event->button.y);
-                Geom::Point const moved_w( motion_w - button_w );
-                event_context->desktop->scroll_world(moved_w);
-                desktop->updateNow();
-                ret = TRUE;
-            } else if (zoom_rb == event->button.button) {
-                zoom_rb = 0;
-                Geom::OptRect const b = Inkscape::Rubberband::get(desktop)->getRectangle();
-                Inkscape::Rubberband::get(desktop)->stop();
-                if (b && !within_tolerance) {
-                    desktop->set_display_area(*b, 10);
+                        event->button.time);
+            }
+            Geom::Point const event_w(event->button.x, event->button.y);
+            Geom::Point const event_dt(desktop->w2d(event_w));
+            double const zoom_inc = prefs->getDoubleLimited(
+                    "/options/zoomincrement/value", M_SQRT2, 1.01, 10);
+            desktop->zoom_relative_keep_point(event_dt, (event->button.state
+                    & GDK_SHIFT_MASK) ? 1 / zoom_inc : zoom_inc);
+            desktop->updateNow();
+            ret = TRUE;
+        } else if (panning == event->button.button) {
+            panning = 0;
+            sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate),
+                    event->button.time);
+
+            // in slow complex drawings, some of the motion events are lost;
+            // to make up for this, we scroll it once again to the button-up event coordinates
+            // (i.e. canvas will always get scrolled all the way to the mouse release point,
+            // even if few intermediate steps were visible)
+            Geom::Point const motion_w(event->button.x, event->button.y);
+            Geom::Point const moved_w(motion_w - button_w);
+            event_context->desktop->scroll_world(moved_w);
+            desktop->updateNow();
+            ret = TRUE;
+        } else if (zoom_rb == event->button.button) {
+            zoom_rb = 0;
+            Geom::OptRect const b =
+                    Inkscape::Rubberband::get(desktop)->getRectangle();
+            Inkscape::Rubberband::get(desktop)->stop();
+            if (b && !within_tolerance) {
+                desktop->set_display_area(*b, 10);
+            }
+            ret = TRUE;
+        }
+        break;
+    case GDK_KEY_PRESS: {
+        double const acceleration = prefs->getDoubleLimited(
+                "/options/scrollingacceleration/value", 0, 0, 6);
+        int const key_scroll = prefs->getIntLimited("/options/keyscroll/value",
+                10, 0, 1000);
+
+        switch (get_group0_keyval(&event->key)) {
+        // GDK insists on stealing these keys (F1 for no idea what, tab for cycling widgets
+        // in the editing window). So we resteal them back and run our regular shortcut
+        // invoker on them.
+        unsigned int shortcut;
+    case GDK_Tab:
+    case GDK_ISO_Left_Tab:
+    case GDK_F1:
+        shortcut = get_group0_keyval(&event->key);
+        if (event->key.state & GDK_SHIFT_MASK)
+            shortcut |= SP_SHORTCUT_SHIFT_MASK;
+        if (event->key.state & GDK_CONTROL_MASK)
+            shortcut |= SP_SHORTCUT_CONTROL_MASK;
+        if (event->key.state & GDK_MOD1_MASK)
+            shortcut |= SP_SHORTCUT_ALT_MASK;
+        ret = sp_shortcut_invoke(shortcut, desktop);
+        break;
+
+    case GDK_D:
+    case GDK_d:
+        if (!MOD__SHIFT && !MOD__CTRL && !MOD__ALT) {
+            sp_toggle_dropper(desktop);
+            ret = TRUE;
+        }
+        break;
+    case GDK_Q:
+    case GDK_q:
+        if (desktop->quick_zoomed()) {
+            ret = TRUE;
+        }
+        if (!MOD__SHIFT && !MOD__CTRL && !MOD__ALT) {
+            desktop->zoom_quick(true);
+            ret = TRUE;
+        }
+        break;
+    case GDK_W:
+    case GDK_w:
+    case GDK_F4:
+        /* Close view */
+        if (MOD__CTRL_ONLY) {
+            sp_ui_close_view(NULL);
+            ret = TRUE;
+        }
+        break;
+    case GDK_Left: // Ctrl Left
+    case GDK_KP_Left:
+    case GDK_KP_4:
+        if (MOD__CTRL_ONLY) {
+            int i = (int) floor(key_scroll * accelerate_scroll(event,
+                    acceleration, sp_desktop_canvas(desktop)));
+            gobble_key_events(get_group0_keyval(&event->key), GDK_CONTROL_MASK);
+            event_context->desktop->scroll_world(i, 0);
+            ret = TRUE;
+        }
+        break;
+    case GDK_Up: // Ctrl Up
+    case GDK_KP_Up:
+    case GDK_KP_8:
+        if (MOD__CTRL_ONLY) {
+            int i = (int) floor(key_scroll * accelerate_scroll(event,
+                    acceleration, sp_desktop_canvas(desktop)));
+            gobble_key_events(get_group0_keyval(&event->key), GDK_CONTROL_MASK);
+            event_context->desktop->scroll_world(0, i);
+            ret = TRUE;
+        }
+        break;
+    case GDK_Right: // Ctrl Right
+    case GDK_KP_Right:
+    case GDK_KP_6:
+        if (MOD__CTRL_ONLY) {
+            int i = (int) floor(key_scroll * accelerate_scroll(event,
+                    acceleration, sp_desktop_canvas(desktop)));
+            gobble_key_events(get_group0_keyval(&event->key), GDK_CONTROL_MASK);
+            event_context->desktop->scroll_world(-i, 0);
+            ret = TRUE;
+        }
+        break;
+    case GDK_Down: // Ctrl Down
+    case GDK_KP_Down:
+    case GDK_KP_2:
+        if (MOD__CTRL_ONLY) {
+            int i = (int) floor(key_scroll * accelerate_scroll(event,
+                    acceleration, sp_desktop_canvas(desktop)));
+            gobble_key_events(get_group0_keyval(&event->key), GDK_CONTROL_MASK);
+            event_context->desktop->scroll_world(0, -i);
+            ret = TRUE;
+        }
+        break;
+    case GDK_F10:
+        if (MOD__SHIFT_ONLY) {
+            sp_event_root_menu_popup(desktop, NULL, event);
+            ret = TRUE;
+        }
+        break;
+    case GDK_space:
+        if (prefs->getBool("/options/spacepans/value")) {
+            event_context->space_panning = true;
+            event_context->_message_context->set(Inkscape::INFORMATION_MESSAGE,
+                    _("<b>Space+mouse drag</b> to pan canvas"));
+            ret = TRUE;
+        } else {
+            sp_toggle_selector(desktop);
+            ret = TRUE;
+        }
+        break;
+    case GDK_z:
+    case GDK_Z:
+        if (MOD__ALT_ONLY) {
+            desktop->zoom_grab_focus();
+            ret = TRUE;
+        }
+        break;
+    default:
+        break;
+        }
+    }
+        break;
+    case GDK_KEY_RELEASE:
+        switch (get_group0_keyval(&event->key)) {
+        case GDK_space:
+            if (event_context->space_panning) {
+                event_context->space_panning = false;
+                event_context->_message_context->clear();
+                if (panning == 1) {
+                    panning = 0;
+                    sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate),
+                            event->key.time);
+                    desktop->updateNow();
                 }
                 ret = TRUE;
             }
             break;
-        case GDK_KEY_PRESS:
-            switch (get_group0_keyval(&event->key)) {
-                // GDK insists on stealing these keys (F1 for no idea what, tab for cycling widgets
-                // in the editing window). So we resteal them back and run our regular shortcut
-                // invoker on them.
-                unsigned int shortcut;
-                case GDK_Tab:
-                case GDK_ISO_Left_Tab:
-                case GDK_F1:
-                    shortcut = get_group0_keyval(&event->key);
-                    if (event->key.state & GDK_SHIFT_MASK)
-                        shortcut |= SP_SHORTCUT_SHIFT_MASK;
-                    if (event->key.state & GDK_CONTROL_MASK)
-                        shortcut |= SP_SHORTCUT_CONTROL_MASK;
-                    if (event->key.state & GDK_MOD1_MASK)
-                        shortcut |= SP_SHORTCUT_ALT_MASK;
-                    ret = sp_shortcut_invoke(shortcut, desktop);
-                    break;
-
-                case GDK_D:
-                case GDK_d:
-                    if (!MOD__SHIFT && !MOD__CTRL && !MOD__ALT) {
-                        sp_toggle_dropper(desktop);
-                        ret = TRUE;
-                    }
-                    break;
-                case GDK_Q:
-                case GDK_q:
-                                       if (desktop->quick_zoomed()) {
-                                               ret = TRUE;
-                                       }
-                    if (!MOD__SHIFT && !MOD__CTRL && !MOD__ALT) {
-                                               desktop->zoom_quick(true);
-                        ret = TRUE;
-                    }
-                    break;
-                case GDK_W:
-                case GDK_w:
-                case GDK_F4:
-                    /* Close view */
-                    if (MOD__CTRL_ONLY) {
-                        sp_ui_close_view(NULL);
-                        ret = TRUE;
-                    }
-                    break;
-                case GDK_Left: // Ctrl Left
-                case GDK_KP_Left:
-                case GDK_KP_4:
-                    if (MOD__CTRL_ONLY) {
-                        int i = (int) floor(key_scroll * accelerate_scroll(event, acceleration, sp_desktop_canvas(desktop)));
-                        gobble_key_events(get_group0_keyval(&event->key),
-                                GDK_CONTROL_MASK);
-                        event_context->desktop->scroll_world(i, 0);
-                        ret = TRUE;
-                    }
-                    break;
-                case GDK_Up: // Ctrl Up
-                case GDK_KP_Up:
-                case GDK_KP_8:
-                    if (MOD__CTRL_ONLY) {
-                        int i = (int) floor(key_scroll * accelerate_scroll(event, acceleration, sp_desktop_canvas(desktop)));
-                        gobble_key_events(get_group0_keyval(&event->key),
-                                GDK_CONTROL_MASK);
-                        event_context->desktop->scroll_world(0, i);
-                        ret = TRUE;
-                    }
-                    break;
-                case GDK_Right: // Ctrl Right
-                case GDK_KP_Right:
-                case GDK_KP_6:
-                    if (MOD__CTRL_ONLY) {
-                        int i = (int) floor(key_scroll * accelerate_scroll(event, acceleration, sp_desktop_canvas(desktop)));
-                        gobble_key_events(get_group0_keyval(&event->key),
-                                GDK_CONTROL_MASK);
-                        event_context->desktop->scroll_world(-i, 0);
-                        ret = TRUE;
-                    }
-                    break;
-                case GDK_Down: // Ctrl Down
-                case GDK_KP_Down:
-                case GDK_KP_2:
-                    if (MOD__CTRL_ONLY) {
-                        int i = (int) floor(key_scroll * accelerate_scroll(event, acceleration, sp_desktop_canvas(desktop)));
-                        gobble_key_events(get_group0_keyval(&event->key),
-                                GDK_CONTROL_MASK);
-                        event_context->desktop->scroll_world(0, -i);
-                        ret = TRUE;
-                    }
-                    break;
-                case GDK_F10:
-                    if (MOD__SHIFT_ONLY) {
-                        sp_event_root_menu_popup(desktop, NULL, event);
-                        ret= TRUE;
-                    }
-                    break;
-                case GDK_space:
-                    if (prefs->getBool("/options/spacepans/value")) {
-                        event_context->space_panning = true;
-                        event_context->_message_context->set(Inkscape::INFORMATION_MESSAGE, _("<b>Space+mouse drag</b> to pan canvas"));
-                        ret= TRUE;
-                    } else {
-                        sp_toggle_selector(desktop);
-                        ret= TRUE;
-                    }
-                    break;
-                case GDK_z:
-                case GDK_Z:
-                    if (MOD__ALT_ONLY) {
-                        desktop->zoom_grab_focus();
-                        ret = TRUE;
-                    }
-                    break;
-                default:
-                    break;
+        case GDK_Q:
+        case GDK_q:
+            if (desktop->quick_zoomed()) {
+                desktop->zoom_quick(false);
+                ret = TRUE;
             }
             break;
-        case GDK_KEY_RELEASE:
-            switch (get_group0_keyval(&event->key)) {
-                case GDK_space:
-                    if (event_context->space_panning) {
-                        event_context->space_panning = false;
-                        event_context->_message_context->clear();
-                        if (panning == 1) {
-                            panning = 0;
-                            sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate),
-                                  event->key.time);
-                            desktop->updateNow();
-                        }
-                        ret= TRUE;
-                    }
-                    break;
-                case GDK_Q:
-                case GDK_q:
-                                       if (desktop->quick_zoomed()) {
-                                               desktop->zoom_quick(false);
-                        ret = TRUE;
-                    }
-                    break;
-                default:
-                    break;
-            }
+        default:
             break;
-        case GDK_SCROLL:
-        {
-            bool ctrl = (event->scroll.state & GDK_CONTROL_MASK);
-            bool wheelzooms = prefs->getBool("/options/wheelzooms/value");
-            /* shift + wheel, pan left--right */
-            if (event->scroll.state & GDK_SHIFT_MASK) {
-                switch (event->scroll.direction) {
-                    case GDK_SCROLL_UP:
-                        desktop->scroll_world(wheel_scroll, 0);
-                        break;
-                    case GDK_SCROLL_DOWN:
-                        desktop->scroll_world(-wheel_scroll, 0);
-                        break;
-                    default:
-                        break;
-                }
+        }
+        break;
+    case GDK_SCROLL: {
+        bool ctrl = (event->scroll.state & GDK_CONTROL_MASK);
+        bool wheelzooms = prefs->getBool("/options/wheelzooms/value");
+        int const wheel_scroll = prefs->getIntLimited(
+                "/options/wheelscroll/value", 40, 0, 1000);
+
+        /* shift + wheel, pan left--right */
+        if (event->scroll.state & GDK_SHIFT_MASK) {
+            switch (event->scroll.direction) {
+            case GDK_SCROLL_UP:
+                desktop->scroll_world(wheel_scroll, 0);
+                break;
+            case GDK_SCROLL_DOWN:
+                desktop->scroll_world(-wheel_scroll, 0);
+                break;
+            default:
+                break;
+            }
 
-                /* ctrl + wheel, zoom in--out */
-            } else if ((ctrl && !wheelzooms) || (!ctrl && wheelzooms)) {
-                double rel_zoom;
-                switch (event->scroll.direction) {
-                    case GDK_SCROLL_UP:
-                        rel_zoom = zoom_inc;
-                        break;
-                    case GDK_SCROLL_DOWN:
-                        rel_zoom = 1 / zoom_inc;
-                        break;
-                    default:
-                        rel_zoom = 0.0;
-                        break;
-                }
-                if (rel_zoom != 0.0) {
-                    Geom::Point const scroll_dt = desktop->point();
-                    desktop->zoom_relative_keep_point(scroll_dt, rel_zoom);
-                }
+            /* ctrl + wheel, zoom in--out */
+        } else if ((ctrl && !wheelzooms) || (!ctrl && wheelzooms)) {
+            double rel_zoom;
+            double const zoom_inc = prefs->getDoubleLimited(
+                    "/options/zoomincrement/value", M_SQRT2, 1.01, 10);
+            switch (event->scroll.direction) {
+            case GDK_SCROLL_UP:
+                rel_zoom = zoom_inc;
+                break;
+            case GDK_SCROLL_DOWN:
+                rel_zoom = 1 / zoom_inc;
+                break;
+            default:
+                rel_zoom = 0.0;
+                break;
+            }
+            if (rel_zoom != 0.0) {
+                Geom::Point const scroll_dt = desktop->point();
+                desktop->zoom_relative_keep_point(scroll_dt, rel_zoom);
+            }
 
-                /* no modifier, pan up--down (left--right on multiwheel mice?) */
-            } else {
-                switch (event->scroll.direction) {
-                    case GDK_SCROLL_UP:
-                        desktop->scroll_world(0, wheel_scroll);
-                        break;
-                    case GDK_SCROLL_DOWN:
-                        desktop->scroll_world(0, -wheel_scroll);
-                        break;
-                    case GDK_SCROLL_LEFT:
-                        desktop->scroll_world(wheel_scroll, 0);
-                        break;
-                    case GDK_SCROLL_RIGHT:
-                        desktop->scroll_world(-wheel_scroll, 0);
-                        break;
-                }
+            /* no modifier, pan up--down (left--right on multiwheel mice?) */
+        } else {
+            switch (event->scroll.direction) {
+            case GDK_SCROLL_UP:
+                desktop->scroll_world(0, wheel_scroll);
+                break;
+            case GDK_SCROLL_DOWN:
+                desktop->scroll_world(0, -wheel_scroll);
+                break;
+            case GDK_SCROLL_LEFT:
+                desktop->scroll_world(wheel_scroll, 0);
+                break;
+            case GDK_SCROLL_RIGHT:
+                desktop->scroll_world(-wheel_scroll, 0);
+                break;
             }
-            break;
         }
-        default:
-            break;
+        break;
+    }
+    default:
+        break;
     }
 
     return ret;
@@ -720,39 +752,50 @@ static gint sp_event_context_private_root_handler(SPEventContext *event_context,
  * Only reacts to right mouse button at the moment.
  * \todo Fixme: do context sensitive popup menu on items.
  */
-gint
-sp_event_context_private_item_handler(SPEventContext *ec, SPItem *item, GdkEvent *event)
-{
+gint sp_event_context_private_item_handler(SPEventContext *ec, SPItem *item,
+        GdkEvent *event) {
     int ret = FALSE;
 
     switch (event->type) {
-        case GDK_BUTTON_PRESS:
-            if ((event->button.button == 3)
-                    && !(event->button.state & GDK_SHIFT_MASK || event->button.state & GDK_CONTROL_MASK)) {
-                sp_event_root_menu_popup(ec->desktop, item, event);
-                ret = TRUE;
-            }
-            break;
-        default:
-            break;
+    case GDK_BUTTON_PRESS:
+        if ((event->button.button == 3) && !(event->button.state
+                & GDK_SHIFT_MASK || event->button.state & GDK_CONTROL_MASK)) {
+            sp_event_root_menu_popup(ec->desktop, item, event);
+            ret = TRUE;
+        }
+        break;
+    default:
+        break;
     }
 
     return ret;
 }
 
+/**
+ * @brief: Returns true if we're hovering above a knot (needed because we don't want to pre-snap in that case)
+ */
+
+bool sp_event_context_knot_mouseover(SPEventContext *ec)
+{
+    if (ec->shape_editor) {
+        return ec->shape_editor->knot_mouseover();
+    }
+
+    return false;
+}
+
 /**
  * @brief An observer that relays pref changes to the derived classes
  */
-class ToolPrefObserver : public Inkscape::Preferences::Observer {
+class ToolPrefObserver: public Inkscape::Preferences::Observer {
 public:
     ToolPrefObserver(Glib::ustring const &path, SPEventContext *ec) :
-        Inkscape::Preferences::Observer(path),
-        _ec(ec) {}
-    virtual void notify(Inkscape::Preferences::Entry const &val)
-    {
+        Inkscape::Preferences::Observer(path), _ec(ec) {
+    }
+    virtual void notify(Inkscape::Preferences::Entry const &val) {
         if (((SPEventContextClass *) G_OBJECT_GET_CLASS(_ec))->set) {
             ((SPEventContextClass *) G_OBJECT_GET_CLASS(_ec))->set(_ec,
-                const_cast<Inkscape::Preferences::Entry*>(&val));
+                    const_cast<Inkscape::Preferences::Entry*> (&val));
         }
     }
 private:
@@ -764,15 +807,16 @@ private:
  * @todo This is bogus. pref_path should be a private property of the inheriting objects.
  */
 SPEventContext *
-sp_event_context_new(GType type, SPDesktop *desktop, gchar const *pref_path, unsigned int key)
-{
+sp_event_context_new(GType type, SPDesktop *desktop, gchar const *pref_path,
+        unsigned int key) {
     g_return_val_if_fail(g_type_is_a(type, SP_TYPE_EVENT_CONTEXT), NULL);
     g_return_val_if_fail(desktop != NULL, NULL);
 
-    SPEventContext *const ec = (SPEventContext*)g_object_new(type, NULL);
+    SPEventContext * const ec = (SPEventContext*) g_object_new(type, NULL);
 
     ec->desktop = desktop;
-    ec->_message_context = new Inkscape::MessageContext(desktop->messageStack());
+    ec->_message_context
+            = new Inkscape::MessageContext(desktop->messageStack());
     ec->key = key;
     ec->pref_observer = NULL;
 
@@ -792,9 +836,7 @@ sp_event_context_new(GType type, SPDesktop *desktop, gchar const *pref_path, uns
 /**
  * Finishes SPEventContext.
  */
-void
-sp_event_context_finish(SPEventContext *ec)
-{
+void sp_event_context_finish(SPEventContext *ec) {
     g_return_if_fail(ec != NULL);
     g_return_if_fail(SP_IS_EVENT_CONTEXT(ec));
 
@@ -843,9 +885,7 @@ void SPEventContext::enableGrDrag(bool enable) {
 /**
  * Calls virtual set() function of SPEventContext.
  */
-void
-sp_event_context_read(SPEventContext *ec, gchar const *key)
-{
+void sp_event_context_read(SPEventContext *ec, gchar const *key) {
     g_return_if_fail(ec != NULL);
     g_return_if_fail(SP_IS_EVENT_CONTEXT(ec));
     g_return_if_fail(key != NULL);
@@ -853,7 +893,7 @@ sp_event_context_read(SPEventContext *ec, gchar const *key)
     if (((SPEventContextClass *) G_OBJECT_GET_CLASS(ec))->set) {
         Inkscape::Preferences *prefs = Inkscape::Preferences::get();
         Inkscape::Preferences::Entry val = prefs->getEntry(
-            ec->pref_observer->observed_path + '/' + key );
+                ec->pref_observer->observed_path + '/' + key);
         ((SPEventContextClass *) G_OBJECT_GET_CLASS(ec))->set(ec, &val);
     }
 }
@@ -861,17 +901,14 @@ sp_event_context_read(SPEventContext *ec, gchar const *key)
 /**
  * Calls virtual activate() function of SPEventContext.
  */
-void
-sp_event_context_activate(SPEventContext *ec)
-{
+void sp_event_context_activate(SPEventContext *ec) {
     g_return_if_fail(ec != NULL);
     g_return_if_fail(SP_IS_EVENT_CONTEXT(ec));
 
     // Make sure no delayed snapping events are carried over after switching contexts
     // (this is only an additional safety measure against sloppy coding, because each
-    // context should take care of this by itself. It might be hard to get each and every
-    // context perfect though)
-    sp_event_context_snap_window_closed(ec, false);
+    // context should take care of this by itself.
+    sp_event_context_discard_delayed_snap_event(ec);
 
     if (((SPEventContextClass *) G_OBJECT_GET_CLASS(ec))->activate)
         ((SPEventContextClass *) G_OBJECT_GET_CLASS(ec))->activate(ec);
@@ -880,9 +917,7 @@ sp_event_context_activate(SPEventContext *ec)
 /**
  * Calls virtual deactivate() function of SPEventContext.
  */
-void
-sp_event_context_deactivate(SPEventContext *ec)
-{
+void sp_event_context_deactivate(SPEventContext *ec) {
     g_return_if_fail(ec != NULL);
     g_return_if_fail(SP_IS_EVENT_CONTEXT(ec));
 
@@ -893,89 +928,95 @@ sp_event_context_deactivate(SPEventContext *ec)
 /**
  * Calls virtual root_handler(), the main event handling function.
  */
-gint
-sp_event_context_root_handler(SPEventContext * event_context, GdkEvent * event)
+gint sp_event_context_root_handler(SPEventContext * event_context,
+        GdkEvent * event)
 {
-    //std::cout << "sp_event_context_root_handler" << std::endl;
-       switch (event->type) {
-               case GDK_MOTION_NOTIFY:
-                       sp_event_context_snap_delay_handler(event_context, NULL, NULL, (GdkEventMotion *)event, DelayedSnapEvent::EVENTCONTEXT_ROOT_HANDLER);
-                       break;
-               case GDK_BUTTON_RELEASE:
-                       sp_event_context_snap_watchdog_callback(event_context->_delayed_snap_event); // If we have any pending snapping action, then invoke it now
-                       break;
-               case GDK_BUTTON_PRESS:
-        case GDK_2BUTTON_PRESS:
-        case GDK_3BUTTON_PRESS:
-                       // Snapping will be on hold if we're moving the mouse at high speeds. When starting
-                       // drawing a new shape we really should snap though.
-                       event_context->desktop->namedview->snap_manager.snapprefs.setSnapPostponedGlobally(false);
-                       break;
-        default:
-               break;
+    switch (event->type) {
+    case GDK_MOTION_NOTIFY:
+        sp_event_context_snap_delay_handler(event_context, NULL, NULL,
+                (GdkEventMotion *) event,
+                DelayedSnapEvent::EVENTCONTEXT_ROOT_HANDLER);
+        break;
+    case GDK_BUTTON_RELEASE:
+        if (event_context->_delayed_snap_event) {
+            // If we have any pending snapping action, then invoke it now
+            sp_event_context_snap_watchdog_callback(
+                    event_context->_delayed_snap_event);
+        }
+        break;
+    case GDK_BUTTON_PRESS:
+    case GDK_2BUTTON_PRESS:
+    case GDK_3BUTTON_PRESS:
+        // Snapping will be on hold if we're moving the mouse at high speeds. When starting
+        // drawing a new shape we really should snap though.
+        event_context->desktop->namedview->snap_manager.snapprefs.setSnapPostponedGlobally(
+                false);
+        break;
+    default:
+        break;
     }
 
     return sp_event_context_virtual_root_handler(event_context, event);
 }
 
-gint
-sp_event_context_virtual_root_handler(SPEventContext * event_context, GdkEvent * event)
-{
-       //std::cout << "sp_event_context_virtual_root_handler -> postponed: " << event_context->desktop->namedview->snap_manager.snapprefs.getSnapPostponedGlobally() << std::endl;
-
-       gint ret = ((SPEventContextClass *) G_OBJECT_GET_CLASS(event_context))->root_handler(event_context, event);
-       set_event_location(event_context->desktop, event);
-       return ret;
+gint sp_event_context_virtual_root_handler(SPEventContext * event_context, GdkEvent * event) {
+    gint ret = false;
+    if (event_context) {    // If no event-context is available then do nothing, otherwise Inkscape would crash
+                            // (see the comment in SPDesktop::set_event_context, and bug LP #622350)
+        ret = ((SPEventContextClass *) G_OBJECT_GET_CLASS(event_context))->root_handler(event_context, event);
+        set_event_location(event_context->desktop, event);
+    }
+    return ret;
 }
 
 /**
  * Calls virtual item_handler(), the item event handling function.
  */
-gint
-sp_event_context_item_handler(SPEventContext * event_context, SPItem * item, GdkEvent * event)
-{
-       //std::cout << "sp_event_context_item_handler" << std::endl;
-       switch (event->type) {
-               case GDK_MOTION_NOTIFY:
-                       sp_event_context_snap_delay_handler(event_context, item, NULL, (GdkEventMotion *)event, DelayedSnapEvent::EVENTCONTEXT_ITEM_HANDLER);
-                       break;
-               case GDK_BUTTON_RELEASE:
-                       sp_event_context_snap_watchdog_callback(event_context->_delayed_snap_event); // If we have any pending snapping action, then invoke it now
-                       break;
-               /*case GDK_BUTTON_PRESS:
-               case GDK_2BUTTON_PRESS:
-               case GDK_3BUTTON_PRESS:
-                       // Snapping will be on hold if we're moving the mouse at high speeds. When starting
-                       // drawing a new shape we really should snap though.
-                       event_context->desktop->namedview->snap_manager.snapprefs.setSnapPostponedGlobally(false);
-                       break;
-               */
-               default:
-                       break;
-       }
+gint sp_event_context_item_handler(SPEventContext * event_context,
+        SPItem * item, GdkEvent * event) {
+    switch (event->type) {
+    case GDK_MOTION_NOTIFY:
+        sp_event_context_snap_delay_handler(event_context, (gpointer) item, NULL, (GdkEventMotion *) event, DelayedSnapEvent::EVENTCONTEXT_ITEM_HANDLER);
+        break;
+    case GDK_BUTTON_RELEASE:
+        if (event_context->_delayed_snap_event) {
+            // If we have any pending snapping action, then invoke it now
+            sp_event_context_snap_watchdog_callback(event_context->_delayed_snap_event);
+        }
+        break;
+    case GDK_BUTTON_PRESS:
+    case GDK_2BUTTON_PRESS:
+    case GDK_3BUTTON_PRESS:
+        // Snapping will be on hold if we're moving the mouse at high speeds. When starting
+        // drawing a new shape we really should snap though.
+        event_context->desktop->namedview->snap_manager.snapprefs.setSnapPostponedGlobally(false);
+        break;
+    default:
+        break;
+    }
 
     return sp_event_context_virtual_item_handler(event_context, item, event);
 }
 
-gint
-sp_event_context_virtual_item_handler(SPEventContext * event_context, SPItem * item, GdkEvent * event)
-{
-       gint ret = ((SPEventContextClass *) G_OBJECT_GET_CLASS(event_context))->item_handler(event_context, item, event);
-
-       if (! ret) {
-               ret = sp_event_context_virtual_root_handler(event_context, event);
-       } else {
-               set_event_location(event_context->desktop, event);
-       }
+gint sp_event_context_virtual_item_handler(SPEventContext * event_context, SPItem * item, GdkEvent * event) {
+    gint ret = false;
+    if (event_context) {    // If no event-context is available then do nothing, otherwise Inkscape would crash
+                            // (see the comment in SPDesktop::set_event_context, and bug LP #622350)
+        ret = ((SPEventContextClass *) G_OBJECT_GET_CLASS(event_context))->item_handler(event_context, item, event);
+        if (!ret) {
+            ret = sp_event_context_virtual_root_handler(event_context, event);
+        } else {
+            set_event_location(event_context->desktop, event);
+        }
+    }
 
-       return ret;
+    return ret;
 }
 
 /**
  * Emits 'position_set' signal on desktop and shows coordinates on status bar.
  */
-static void set_event_location(SPDesktop *desktop, GdkEvent *event)
-{
+static void set_event_location(SPDesktop *desktop, GdkEvent *event) {
     if (event->type != GDK_MOTION_NOTIFY) {
         return;
     }
@@ -990,9 +1031,7 @@ static void set_event_location(SPDesktop *desktop, GdkEvent *event)
 /**
  * Create popup menu and tell Gtk to show it.
  */
-void
-sp_event_root_menu_popup(SPDesktop *desktop, SPItem *item, GdkEvent *event)
-{
+void sp_event_root_menu_popup(SPDesktop *desktop, SPItem *item, GdkEvent *event) {
     GtkWidget *menu;
 
     /* fixme: This is not what I want but works for now (Lauris) */
@@ -1003,45 +1042,36 @@ sp_event_root_menu_popup(SPDesktop *desktop, SPItem *item, GdkEvent *event)
     gtk_widget_show(menu);
 
     switch (event->type) {
-        case GDK_BUTTON_PRESS:
-            gtk_menu_popup(GTK_MENU(menu), NULL, NULL, 0, NULL, event->button.button, event->button.time);
-            break;
-        case GDK_KEY_PRESS:
-            gtk_menu_popup(GTK_MENU(menu), NULL, NULL, 0, NULL, 0, event->key.time);
-            break;
-        default:
-            break;
+    case GDK_BUTTON_PRESS:
+        gtk_menu_popup(GTK_MENU(menu), NULL, NULL, 0, NULL,
+                event->button.button, event->button.time);
+        break;
+    case GDK_KEY_PRESS:
+        gtk_menu_popup(GTK_MENU(menu), NULL, NULL, 0, NULL, 0, event->key.time);
+        break;
+    default:
+        break;
     }
 }
 
 /**
  * Show tool context specific modifier tip.
  */
-void
-sp_event_show_modifier_tip(Inkscape::MessageContext *message_context,
+void sp_event_show_modifier_tip(Inkscape::MessageContext *message_context,
         GdkEvent *event, gchar const *ctrl_tip, gchar const *shift_tip,
-        gchar const *alt_tip)
-{
+        gchar const *alt_tip) {
     guint keyval = get_group0_keyval(&event->key);
 
-    bool ctrl = ctrl_tip && (MOD__CTRL
-            || (keyval == GDK_Control_L)
-            || (keyval == GDK_Control_R));
-    bool shift = shift_tip
-        && (MOD__SHIFT || (keyval == GDK_Shift_L) || (keyval == GDK_Shift_R));
-    bool alt = alt_tip
-        && (MOD__ALT
-                || (keyval == GDK_Alt_L)
-                || (keyval == GDK_Alt_R)
-                || (keyval == GDK_Meta_L)
-                || (keyval == GDK_Meta_R));
-
-    gchar *tip = g_strdup_printf("%s%s%s%s%s",
-                                 ( ctrl ? ctrl_tip : "" ),
-                                 ( ctrl && (shift || alt) ? "; " : "" ),
-                                 ( shift ? shift_tip : "" ),
-                                 ( (ctrl || shift) && alt ? "; " : "" ),
-                                 ( alt ? alt_tip : "" ));
+    bool ctrl = ctrl_tip && (MOD__CTRL || (keyval == GDK_Control_L) || (keyval
+            == GDK_Control_R));
+    bool shift = shift_tip && (MOD__SHIFT || (keyval == GDK_Shift_L) || (keyval
+            == GDK_Shift_R));
+    bool alt = alt_tip && (MOD__ALT || (keyval == GDK_Alt_L) || (keyval
+            == GDK_Alt_R) || (keyval == GDK_Meta_L) || (keyval == GDK_Meta_R));
+
+    gchar *tip = g_strdup_printf("%s%s%s%s%s", (ctrl ? ctrl_tip : ""), (ctrl
+            && (shift || alt) ? "; " : ""), (shift ? shift_tip : ""), ((ctrl
+            || shift) && alt ? "; " : ""), (alt ? alt_tip : ""));
 
     if (strlen(tip) > 0) {
         message_context->flash(Inkscape::INFORMATION_MESSAGE, tip);
@@ -1057,16 +1087,12 @@ sp_event_show_modifier_tip(Inkscape::MessageContext *message_context,
  * Use this instead of simply event->keyval, so that your keyboard shortcuts
  * work regardless of layouts (e.g., in Cyrillic).
  */
-guint
-get_group0_keyval(GdkEventKey *event)
-{
+guint get_group0_keyval(GdkEventKey *event) {
     guint keyval = 0;
-    gdk_keymap_translate_keyboard_state(
-            gdk_keymap_get_for_display(gdk_display_get_default()),
-            event->hardware_keycode,
-            (GdkModifierType) event->state,
-            0   /*event->key.group*/,
-            &keyval, NULL, NULL, NULL);
+    gdk_keymap_translate_keyboard_state(gdk_keymap_get_for_display(
+            gdk_display_get_default()), event->hardware_keycode,
+            (GdkModifierType) event->state, 0 /*event->key.group*/, &keyval,
+            NULL, NULL, NULL);
     return keyval;
 }
 
@@ -1076,21 +1102,21 @@ get_group0_keyval(GdkEventKey *event)
  * If state includes alt key mask, cyclically selects under; honors
  * into_groups.
  */
-SPItem *
-sp_event_context_find_item (SPDesktop *desktop, Geom::Point const &p,
-        bool select_under, bool into_groups)
+SPItem *sp_event_context_find_item(SPDesktop *desktop, Geom::Point const &p,
+                                   bool select_under, bool into_groups)
 {
-    SPItem *item;
+    SPItem *item = 0;
 
     if (select_under) {
-        SPItem *selected_at_point =
-            desktop->item_from_list_at_point_bottom (desktop->selection->itemList(), p);
-        item = desktop->item_at_point(p, into_groups, selected_at_point);
+        SPItem *selected_at_point = desktop->getItemFromListAtPointBottom(
+                desktop->selection->itemList(), p);
+        item = desktop->getItemAtPoint(p, into_groups, selected_at_point);
         if (item == NULL) { // we may have reached bottom, flip over to the top
-            item = desktop->item_at_point(p, into_groups, NULL);
+            item = desktop->getItemAtPoint(p, into_groups, NULL);
         }
-    } else
-        item = desktop->item_at_point(p, into_groups, NULL);
+    } else {
+        item = desktop->getItemAtPoint(p, into_groups, NULL);
+    }
 
     return item;
 }
@@ -1101,221 +1127,250 @@ sp_event_context_find_item (SPDesktop *desktop, Geom::Point const &p,
  * Honors into_groups.
  */
 SPItem *
-sp_event_context_over_item (SPDesktop *desktop, SPItem *item, Geom::Point const &p)
-{
+sp_event_context_over_item(SPDesktop *desktop, SPItem *item,
+        Geom::Point const &p) {
     GSList *temp = NULL;
-    temp = g_slist_prepend (temp, item);
-    SPItem *item_at_point = desktop->item_from_list_at_point_bottom (temp, p);
-    g_slist_free (temp);
+    temp = g_slist_prepend(temp, item);
+    SPItem *item_at_point = desktop->getItemFromListAtPointBottom(temp, p);
+    g_slist_free(temp);
 
     return item_at_point;
 }
 
 ShapeEditor *
-sp_event_context_get_shape_editor (SPEventContext *ec)
-{
+sp_event_context_get_shape_editor(SPEventContext *ec) {
     return ec->shape_editor;
 }
 
-void
-event_context_print_event_info(GdkEvent *event, bool print_return) {
+void event_context_print_event_info(GdkEvent *event, bool print_return) {
     switch (event->type) {
-        case GDK_BUTTON_PRESS:
-            g_print ("GDK_BUTTON_PRESS");
-            break;
-        case GDK_2BUTTON_PRESS:
-            g_print ("GDK_2BUTTON_PRESS");
-            break;
-        case GDK_3BUTTON_PRESS:
-            g_print ("GDK_3BUTTON_PRESS");
-            break;
-
-        case GDK_MOTION_NOTIFY:
-            g_print ("GDK_MOTION_NOTIFY");
-            break;
-        case GDK_ENTER_NOTIFY:
-            g_print ("GDK_ENTER_NOTIFY");
-            break;
-
-        case GDK_LEAVE_NOTIFY:
-            g_print ("GDK_LEAVE_NOTIFY");
-            break;
-        case GDK_BUTTON_RELEASE:
-            g_print ("GDK_BUTTON_RELEASE");
-            break;
-
-        case GDK_KEY_PRESS:
-            g_print ("GDK_KEY_PRESS: %d", get_group0_keyval(&event->key));
-            break;
-        case GDK_KEY_RELEASE:
-            g_print ("GDK_KEY_RELEASE: %d", get_group0_keyval(&event->key));
-            break;
-        default:
-            //g_print ("even type not recognized");
-            break;
+    case GDK_BUTTON_PRESS:
+        g_print("GDK_BUTTON_PRESS");
+        break;
+    case GDK_2BUTTON_PRESS:
+        g_print("GDK_2BUTTON_PRESS");
+        break;
+    case GDK_3BUTTON_PRESS:
+        g_print("GDK_3BUTTON_PRESS");
+        break;
+
+    case GDK_MOTION_NOTIFY:
+        g_print("GDK_MOTION_NOTIFY");
+        break;
+    case GDK_ENTER_NOTIFY:
+        g_print("GDK_ENTER_NOTIFY");
+        break;
+
+    case GDK_LEAVE_NOTIFY:
+        g_print("GDK_LEAVE_NOTIFY");
+        break;
+    case GDK_BUTTON_RELEASE:
+        g_print("GDK_BUTTON_RELEASE");
+        break;
+
+    case GDK_KEY_PRESS:
+        g_print("GDK_KEY_PRESS: %d", get_group0_keyval(&event->key));
+        break;
+    case GDK_KEY_RELEASE:
+        g_print("GDK_KEY_RELEASE: %d", get_group0_keyval(&event->key));
+        break;
+    default:
+        //g_print ("even type not recognized");
+        break;
     }
 
     if (print_return) {
-        g_print ("\n");
+        g_print("\n");
     }
 }
 
-void sp_event_context_snap_delay_handler(SPEventContext *ec, SPItem* const item, SPKnot* const knot, GdkEventMotion *event, DelayedSnapEvent::DelayedSnapEventOrigin origin)
+/**
+ * \brief Analyses the current event, calculates the mouse speed, turns snapping off (temporarily) if the
+ * mouse speed is above a threshold, and stores the current event such that it can be re-triggered when needed
+ * (re-triggering is controlled by a watchdog timer)
+ *
+ * \param ec Pointer to the event context
+ * \param dse_item Pointer that store a reference to a canvas or to an item
+ * \param dse_item2 Another pointer, storing a reference to a knot or controlpoint
+ * \param event Pointer to the motion event
+ * \param origin Identifier (enum) specifying where the delay (and the call to this method) were initiated
+ */
+void sp_event_context_snap_delay_handler(SPEventContext *ec,
+        gpointer const dse_item, gpointer const dse_item2, GdkEventMotion *event,
+        DelayedSnapEvent::DelayedSnapEventOrigin origin)
 {
-       static guint32 prev_time;
-       static boost::optional<Geom::Point> prev_pos;
+    static guint32 prev_time;
+    static boost::optional<Geom::Point> prev_pos;
 
-       // Snapping occurs when dragging with the left mouse button down, or when hovering e.g. in the pen tool with left mouse button up
+    if (ec->_dse_callback_in_process) {
+        return;
+    }
+
+    // Snapping occurs when dragging with the left mouse button down, or when hovering e.g. in the pen tool with left mouse button up
     bool const c1 = event->state & GDK_BUTTON2_MASK; // We shouldn't hold back any events when other mouse buttons have been
     bool const c2 = event->state & GDK_BUTTON3_MASK; // pressed, e.g. when scrolling with the middle mouse button; if we do then
-                                                                                                    // Inkscape will get stuck in an unresponsive state
-
-    if (ec->_snap_window_open && !c1 && !c2 && ec->desktop && ec->desktop->namedview->snap_manager.snapprefs.getSnapEnabledGlobally()) {
-       // Snap when speed drops below e.g. 0.02 px/msec, or when no motion events have occurred for some period.
-               // i.e. snap when we're at stand still. A speed threshold enforces snapping for tablets, which might never
-               // be fully at stand still and might keep spitting out motion events.
-       ec->desktop->namedview->snap_manager.snapprefs.setSnapPostponedGlobally(true); // put snapping on hold
-
-       Geom::Point event_pos(event->x, event->y);
-               guint32 event_t = gdk_event_get_time ( (GdkEvent *) event );
-
-               if (prev_pos) {
-                       Geom::Coord dist = Geom::L2(event_pos - *prev_pos);
-                       guint32 delta_t = event_t - prev_time;
-                       gdouble speed = delta_t > 0 ? dist/delta_t : 1000;
-                       //std::cout << "Mouse speed = " << speed << " px/msec " << std::endl;
-                       if (speed > 0.02) { // Jitter threshold, might be needed for tablets
-                               // We're moving fast, so postpone any snapping until the next GDK_MOTION_NOTIFY event. We
-                               // will keep on postponing the snapping as long as the speed is high.
-                               // We must snap at some point in time though, so set a watchdog timer at some time from
-                               // now, just in case there's no future motion event that drops under the speed limit (when
-                               // stopping abruptly)
-                               delete ec->_delayed_snap_event;
-                               ec->_delayed_snap_event = new DelayedSnapEvent(ec, item, knot, event, origin); // watchdog is reset, i.e. pushed forward in time
-                               // If the watchdog expires before a new motion event is received, we will snap (as explained
-                               // above). This means however that when the timer is too short, we will always snap and that the
-                               // speed threshold is ineffective. In the extreme case the delay is set to zero, and snapping will
-                               // be immediate, as it used to be in the old days ;-).
-                       } else { // Speed is very low, so we're virtually at stand still
-                               // But if we're really standing still, then we should snap now. We could use some low-pass filtering,
-                               // otherwise snapping occurs for each jitter movement. For this filtering we'll leave the watchdog to expire,
-                               // snap, and set a new watchdog again.
-                               if (ec->_delayed_snap_event == NULL) { // no watchdog has been set
-                                       // it might have already expired, so we'll set a new one; the snapping frequency will be limited by this
-                                       ec->_delayed_snap_event = new DelayedSnapEvent(ec, item, knot, event, origin);
-                               } // else: watchdog has been set before and we'll wait for it to expire
-                       }
-               } else {
-                       // This is the first GDK_MOTION_NOTIFY event, so postpone snapping and set the watchdog
-                       g_assert(ec->_delayed_snap_event == NULL);
-                       ec->_delayed_snap_event = new DelayedSnapEvent(ec, item, knot, event, origin);
-               }
-
-               prev_pos = event_pos;
-               prev_time = event_t;
-       }
-}
+    // Inkscape will get stuck in an unresponsive state
+    bool const c3 = tools_isactive(ec->desktop, TOOLS_CALLIGRAPHIC);
+    // The snap delay will repeat the last motion event, which will lead to
+    // erroneous points in the calligraphy context. And because we don't snap
+    // in this context, we might just as well disable the snap delay all together
+
+    if (c1 || c2 || c3) {
+        // Make sure that we don't send any pending snap events to a context if we know in advance
+        // that we're not going to snap any way (e.g. while scrolling with middle mouse button)
+        // Any motion event might affect the state of the context, leading to unexpected behavior
+        sp_event_context_discard_delayed_snap_event(ec);
+    } else if (ec->desktop
+            && ec->desktop->namedview->snap_manager.snapprefs.getSnapEnabledGlobally()) {
+        // Snap when speed drops below e.g. 0.02 px/msec, or when no motion events have occurred for some period.
+        // i.e. snap when we're at stand still. A speed threshold enforces snapping for tablets, which might never
+        // be fully at stand still and might keep spitting out motion events.
+        ec->desktop->namedview->snap_manager.snapprefs.setSnapPostponedGlobally(true); // put snapping on hold
+
+        Geom::Point event_pos(event->x, event->y);
+        guint32 event_t = gdk_event_get_time((GdkEvent *) event);
+
+        if (prev_pos) {
+            Geom::Coord dist = Geom::L2(event_pos - *prev_pos);
+            guint32 delta_t = event_t - prev_time;
+            gdouble speed = delta_t > 0 ? dist / delta_t : 1000;
+            //std::cout << "Mouse speed = " << speed << " px/msec " << std::endl;
+            if (speed > 0.02) { // Jitter threshold, might be needed for tablets
+                // We're moving fast, so postpone any snapping until the next GDK_MOTION_NOTIFY event. We
+                // will keep on postponing the snapping as long as the speed is high.
+                // We must snap at some point in time though, so set a watchdog timer at some time from
+                // now, just in case there's no future motion event that drops under the speed limit (when
+                // stopping abruptly)
+                delete ec->_delayed_snap_event;
+                ec->_delayed_snap_event = new DelayedSnapEvent(ec, dse_item, dse_item2,
+                        event, origin); // watchdog is reset, i.e. pushed forward in time
+                // If the watchdog expires before a new motion event is received, we will snap (as explained
+                // above). This means however that when the timer is too short, we will always snap and that the
+                // speed threshold is ineffective. In the extreme case the delay is set to zero, and snapping will
+                // be immediate, as it used to be in the old days ;-).
+            } else { // Speed is very low, so we're virtually at stand still
+                // But if we're really standing still, then we should snap now. We could use some low-pass filtering,
+                // otherwise snapping occurs for each jitter movement. For this filtering we'll leave the watchdog to expire,
+                // snap, and set a new watchdog again.
+                if (ec->_delayed_snap_event == NULL) { // no watchdog has been set
+                    // it might have already expired, so we'll set a new one; the snapping frequency will be limited this way
+                    ec->_delayed_snap_event = new DelayedSnapEvent(ec, dse_item,
+                            dse_item2, event, origin);
+                } // else: watchdog has been set before and we'll wait for it to expire
+            }
+        } else {
+            // This is the first GDK_MOTION_NOTIFY event, so postpone snapping and set the watchdog
+            g_assert(ec->_delayed_snap_event == NULL);
+            ec->_delayed_snap_event = new DelayedSnapEvent(ec, dse_item, dse_item2,
+                    event, origin);
+        }
 
-gboolean sp_event_context_snap_watchdog_callback(gpointer data)
-{
-       // Snap NOW! For this the "postponed" flag will be reset and the last motion event will be repeated
-       DelayedSnapEvent *dse = reinterpret_cast<DelayedSnapEvent*>(data);
-
-       if (dse == NULL) {
-               // This might occur when this method is called directly, i.e. not through the timer
-               // E.g. on GDK_BUTTON_RELEASE in sp_event_context_root_handler()
-               return FALSE;
-       }
-
-       SPEventContext *ec = dse->getEventContext();
-       if (ec == NULL || ec->desktop == NULL) {
-               return false;
-       }
-
-       SPDesktop *dt = ec->desktop;
-       dt->namedview->snap_manager.snapprefs.setSnapPostponedGlobally(false);
-
-       switch (dse->getOrigin()) {
-               case DelayedSnapEvent::EVENTCONTEXT_ROOT_HANDLER:
-                       sp_event_context_virtual_root_handler(ec, dse->getEvent());
-                       break;
-               case DelayedSnapEvent::EVENTCONTEXT_ITEM_HANDLER:
-                       g_assert(dse->getItem() != NULL);
-                       sp_event_context_virtual_item_handler(ec, dse->getItem(), dse->getEvent());
-                       break;
-               case DelayedSnapEvent::KNOT_HANDLER:
-                       g_assert(dse->getKnot() != NULL);
-                       sp_knot_handler_request_position(dse->getEvent(), dse->getKnot());
-                       break;
-               default:
-                       g_warning("Origin of snap-delay event has not been defined!;");
-                       break;
-       }
-
-       ec->_delayed_snap_event = NULL;
-       delete dse;
-
-       return FALSE; //Kills the timer and stops it from executing this callback over and over again.
+        prev_pos = event_pos;
+        prev_time = event_t;
+    }
 }
 
-void sp_event_context_snap_window_open(SPEventContext *ec, bool show_debug_warnings)
-{
-       // Only when ec->_snap_window_open has been set, Inkscape will know that snapping is active
-       // and will delay any snapping events (but only when asked to through the preferences)
-
-       // When snapping is being delayed, then that will also mean that at some point the last event
-       // might be re-triggered. This should only occur when Inkscape is still in the same tool or context,
-       // and even more specifically, the tool should even be in the same state. If for example snapping is being delayed while
-       // creating a rectangle, then the rect-context will be active and it will be in the "dragging" state
-       // (see the static boolean variable "dragging" in the sp_rect_context_root_handler). The procedure is
-       // as follows: call sp_event_context_snap_window_open(*, TRUE) when entering the "dragging" state, which will delay
-       // snapping from that moment on, and call sp_event_context_snap_window_open(*, FALSE) when leaving the "dragging"
-       // state. This last call will also make sure that any pending snap events will be canceled.
-
-       //std::cout << "sp_event_context_snap_window_open" << std::endl;
-       if (!ec) {
-               if (show_debug_warnings) {
-                       g_warning("sp_event_context_snap_window_open() has been called without providing an event context!");
-               }
-               return;
-       }
-
-       if (ec->_snap_window_open == true && show_debug_warnings) {
-               g_warning("Snap window was already open! This is a bug, please report it.");
-       }
-
-       ec->_snap_window_open = true;
-}
+/**
+ * \brief When the snap delay watchdog timer barks, this method will be called and will re-inject the last motion
+ * event in an appropriate place, with snapping being turned on again
+ */
+gboolean sp_event_context_snap_watchdog_callback(gpointer data) {
+    // Snap NOW! For this the "postponed" flag will be reset and the last motion event will be repeated
+    DelayedSnapEvent *dse = reinterpret_cast<DelayedSnapEvent*> (data);
+
+    if (dse == NULL) {
+        // This might occur when this method is called directly, i.e. not through the timer
+        // E.g. on GDK_BUTTON_RELEASE in sp_event_context_root_handler()
+        return FALSE;
+    }
 
-void sp_event_context_snap_window_closed(SPEventContext *ec, bool show_debug_warnings)
-{
-       //std::cout << "sp_event_context_snap_window_closed" << std::endl;
-       if (!ec) {
-               if (show_debug_warnings) {
-                       g_warning("sp_event_context_snap_window_closed() has been called without providing an event context!");
-               }
-               return;
-       }
-
-       if (ec->_snap_window_open == false && show_debug_warnings) {
-               g_warning("Snap window was already closed! This is a bug, please report it.");
-       }
-
-       ec->_snap_window_open = false;
-
-       delete ec->_delayed_snap_event;
-       ec->_delayed_snap_event = NULL;
-}
+    SPEventContext *ec = dse->getEventContext();
+    if (ec == NULL || ec->desktop == NULL) {
+        return false;
+    }
+    ec->_dse_callback_in_process = true;
+
+    SPDesktop *dt = ec->desktop;
+    dt->namedview->snap_manager.snapprefs.setSnapPostponedGlobally(false);
+
+    // Depending on where the delayed snap event originated from, we will inject it back at it's origin
+    // The switch below takes care of that and prepares the relevant parameters
+    switch (dse->getOrigin()) {
+    case DelayedSnapEvent::EVENTCONTEXT_ROOT_HANDLER:
+        sp_event_context_virtual_root_handler(ec, dse->getEvent());
+        break;
+    case DelayedSnapEvent::EVENTCONTEXT_ITEM_HANDLER: {
+        SPItem* item = NULL;
+        item = SP_ITEM(dse->getItem());
+        if (item && SP_IS_ITEM(item)) {
+            sp_event_context_virtual_item_handler(ec, item, dse->getEvent());
+        }
+    }
+        break;
+    case DelayedSnapEvent::KNOT_HANDLER: {
+        SPKnot* knot = SP_KNOT(dse->getItem2());
+        if (knot && SP_IS_KNOT(knot)) {
+            sp_knot_handler_request_position(dse->getEvent(), knot);
+        }
+    }
+        break;
+    case DelayedSnapEvent::CONTROL_POINT_HANDLER: {
+        using Inkscape::UI::ControlPoint;
+        ControlPoint *point = reinterpret_cast<ControlPoint*> (dse->getItem2());
+        point->_eventHandler(dse->getEvent());
+    }
+        break;
+    case DelayedSnapEvent::GUIDE_HANDLER: {
+        gpointer item = dse->getItem();
+        gpointer item2 = dse->getItem2();
+        if (item && item2) {
+            g_assert(SP_IS_CANVAS_ITEM(item));
+            g_assert(SP_IS_GUIDE(item2));
+            sp_dt_guide_event(SP_CANVAS_ITEM(item), dse->getEvent(), item2);
+        }
+    }
+        break;
+    case DelayedSnapEvent::GUIDE_HRULER:
+    case DelayedSnapEvent::GUIDE_VRULER: {
+        gpointer item = dse->getItem();
+        gpointer item2 = dse->getItem2();
+        if (item && item2) {
+            g_assert(GTK_IS_WIDGET(item));
+            g_assert(SP_IS_DESKTOP_WIDGET(item2));
+            if (dse->getOrigin() == DelayedSnapEvent::GUIDE_HRULER) {
+                sp_dt_hruler_event(GTK_WIDGET(item), dse->getEvent(), SP_DESKTOP_WIDGET(item2));
+            } else {
+                sp_dt_vruler_event(GTK_WIDGET(item), dse->getEvent(), SP_DESKTOP_WIDGET(item2));
+            }
+        }
+    }
+        break;
+    default:
+        g_warning("Origin of snap-delay event has not been defined!;");
+        break;
+    }
+
+    ec->_delayed_snap_event = NULL;
+    delete dse;
+
+    ec->_dse_callback_in_process = false;
 
+    return FALSE; //Kills the timer and stops it from executing this callback over and over again.
+}
 
+void sp_event_context_discard_delayed_snap_event(SPEventContext *ec) {
+    delete ec->_delayed_snap_event;
+    ec->_delayed_snap_event = NULL;
+    ec->desktop->namedview->snap_manager.snapprefs.setSnapPostponedGlobally(false);
+}
 
 /*
 Local Variables:
 mode:c++
 c-file-style:"stroustrup"
 c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
 indent-tabs-mode:nil
 fill-column:99
 End:
-*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+ Local Variables:
+ mode:c++
+ c-file-style:"stroustrup"
+ c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+ indent-tabs-mode:nil
+ fill-column:99
+ End:
+ */
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :