axonomgrid: Bugfix

[inkscape.git] / src / node-context.cpp

diff --git a/src/node-context.cpp b/src/node-context.cpp
index f213b58aaa88869cc1c87d6bf4e7cce81ad88d6b..774e0813e5c4da5ceed8fe565a58ec7e10b7c739 100644 (file)
--- a/src/node-context.cpp
+++ b/src/node-context.cpp
@@ -26,11 +26,9 @@
 #include "desktop-handles.h"
 #include "selection.h"
 #include "pixmaps/cursor-node.xpm"
-#include "pixmaps/cursor-node.pixbuf"
 #include "message-context.h"
 #include "node-context.h"
 #include "pixmaps/cursor-node-d.xpm"
-#include "pixmaps/cursor-node-d.pixbuf"
 #include "prefs-utils.h"
 #include "xml/node-event-vector.h"
 #include "style.h"
@@ -100,11 +98,6 @@ sp_node_context_init(SPNodeContext *node_context)
     SPEventContext *event_context = SP_EVENT_CONTEXT(node_context);
 
     event_context->cursor_shape = cursor_node_xpm;
-    event_context->cursor_pixbuf = gdk_pixbuf_new_from_inline(
-            -1,
-            cursor_node_pixbuf,
-            FALSE,
-            NULL);  
     event_context->hot_x = 1;
     event_context->hot_y = 1;
 
@@ -378,6 +371,7 @@ sp_node_context_is_over_stroke (SPNodeContext *nc, SPItem *item, NR::Point event
     nc->curvepoint_doc *= sp_item_dt2i_affine(item);
     nc->curvepoint_doc *= sp_item_i2doc_affine(item);
 
+    sp_nodepath_ensure_livarot_path(nc->nodepath);
     NR::Maybe<Path::cut_position> position = get_nearest_position_on_Path(nc->nodepath->livarot_path, nc->curvepoint_doc);
     NR::Point nearest = get_point_on_Path(nc->nodepath->livarot_path, position.assume().piece, position.assume().t);
     NR::Point delta = nearest - nc->curvepoint_doc;
@@ -527,6 +521,11 @@ sp_node_context_root_handler(SPEventContext *event_context, GdkEvent *event)
     SPDesktop *desktop = event_context->desktop;
     Inkscape::Selection *selection = sp_desktop_selection (desktop);
 
+    // fixme:  nc->nodepath can potentially become NULL after retrieving nc.
+    // A general method for handling this possibility should be created.
+    // For now, the number of checks for a NULL nc->nodepath have been
+    // increased, both here and in the called sp_nodepath_* functions.
+
     SPNodeContext *nc = SP_NODE_CONTEXT(event_context);
     double const nudge = prefs_get_double_attribute_limited("options.nudgedistance", "value", 2, 0, 1000); // in px
     event_context->tolerance = prefs_get_int_attribute_limited("options.dragtolerance", "value", 0, 0, 100); // read every time, to make prefs changes really live
@@ -560,6 +559,13 @@ sp_node_context_root_handler(SPEventContext *event_context, GdkEvent *event)
                      && ( abs( (gint) event->motion.y - event_context->yp ) < event_context->tolerance ) ) {
                     break; // do not drag if we're within tolerance from origin
                 }
+                
+                // The path went away while dragging; throw away any further motion
+                // events until the mouse pointer is released.
+                if (nc->hit && (nc->nodepath == NULL)) {                  
+                  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)
@@ -574,10 +580,12 @@ sp_node_context_root_handler(SPEventContext *event_context, GdkEvent *event)
                     nc->curvepoint_event[NR::Y] = (gint) event->motion.y;
                     gobble_motion_events(GDK_BUTTON1_MASK);
                 } else {
-                    NR::Point const motion_w(event->motion.x,
-                                         event->motion.y);
-                    NR::Point const motion_dt(desktop->w2d(motion_w));
-                    Inkscape::Rubberband::get()->move(motion_dt);
+                    if (Inkscape::Rubberband::get()->is_started()) {
+                        NR::Point const motion_w(event->motion.x,
+                                            event->motion.y);
+                        NR::Point const motion_dt(desktop->w2d(motion_w));
+                        Inkscape::Rubberband::get()->move(motion_dt);
+                    }
                 }
                 nc->drag = TRUE;
                 ret = TRUE;
@@ -595,22 +603,12 @@ sp_node_context_root_handler(SPEventContext *event_context, GdkEvent *event)
 
                 if (nc->cursor_drag && !over_stroke) {
                     event_context->cursor_shape = cursor_node_xpm;
-                    event_context->cursor_pixbuf = gdk_pixbuf_new_from_inline(
-                            -1,
-                            cursor_node_pixbuf,
-                            FALSE,
-                            NULL);  
                     event_context->hot_x = 1;
                     event_context->hot_y = 1;
                     sp_event_context_update_cursor(event_context);
                     nc->cursor_drag = false;
                 } else if (!nc->cursor_drag && over_stroke) {
                     event_context->cursor_shape = cursor_node_d_xpm;
-                    event_context->cursor_pixbuf = gdk_pixbuf_new_from_inline(
-                            -1,
-                            cursor_node_d_pixbuf,
-                            FALSE,
-                            NULL);  
                     event_context->hot_x = 1;
                     event_context->hot_y = 1;
                     sp_event_context_update_cursor(event_context);
@@ -625,7 +623,9 @@ sp_node_context_root_handler(SPEventContext *event_context, GdkEvent *event)
                 NR::Maybe<NR::Rect> b = Inkscape::Rubberband::get()->getRectangle();
 
                 if (nc->hit && !event_context->within_tolerance) { //drag curve
-                    sp_nodepath_update_repr (nc->nodepath, _("Drag curve"));
+                    if (nc->nodepath) {
+                        sp_nodepath_update_repr (nc->nodepath, _("Drag curve"));
+                    }
                 } else if (b != NR::Nothing() && !event_context->within_tolerance) { // drag to select
                     if (nc->nodepath) {
                         sp_nodepath_select_rect(nc->nodepath, b.assume(), event->button.state & GDK_SHIFT_MASK);