Merge from Inkscape trunk.

(bzr r14668.1.3)

8 files changed, 164 insertions, 100 deletions

diff --git a/src/ui/tools/connector-tool.cpp b/src/ui/tools/connector-tool.cpp
index b84d16686..74f2664fe 100644
--- a/src/ui/tools/connector-tool.cpp
+++ b/src/ui/tools/connector-tool.cpp
@@ -247,7 +247,7 @@ void ConnectorTool::setup() {
 
     // Make sure we see all enter events for canvas items,
     // even if a mouse button is depressed.
-    this->desktop->canvas->gen_all_enter_events = true;
+    this->desktop->canvas->_gen_all_enter_events = true;
 }
 
 void ConnectorTool::set(const Inkscape::Preferences::Entry& val) {
@@ -276,7 +276,7 @@ void ConnectorTool::finish() {
     this->cc_clear_active_conn();
 
     // Restore the default event generating behaviour.
-    this->desktop->canvas->gen_all_enter_events = false;
+    this->desktop->canvas->_gen_all_enter_events = false;
 }
 
 //-----------------------------------------------------------------------------
diff --git a/src/ui/tools/eraser-tool.cpp b/src/ui/tools/eraser-tool.cpp
index 83ecf7a0a..6b32b5901 100644
--- a/src/ui/tools/eraser-tool.cpp
+++ b/src/ui/tools/eraser-tool.cpp
@@ -64,8 +64,11 @@
 #include "livarot/Shape.h"
 #include "document-undo.h"
 #include "verbs.h"
+#include "style.h"
+#include "style-enums.h"
 #include <2geom/math-utils.h>
 #include <2geom/pathvector.h>
+#include "path-chemistry.h"
 #include "display/curve.h"
 
 #include "ui/tools/eraser-tool.h"
@@ -96,6 +99,7 @@ const std::string EraserTool::prefsPath = "/tools/eraser";
 
 EraserTool::EraserTool()
     : DynamicBase(cursor_eraser_xpm, 4, 4)
+    , nowidth(false)
 {
 }
 
@@ -145,6 +149,7 @@ static ProfileFloatElement f_profile[PROFILE_FLOAT_SIZE] = {
     sp_event_context_read(this, "cap_rounding");
 
     this->is_drawing = false;
+    //TODO not sure why get 0.01 if slider width == 0, maybe a double/int problem
 
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     if (prefs->getBool("/tools/eraser/selcue", 0) != 0) {
@@ -339,7 +344,10 @@ void EraserTool::brush() {
 
     this->point1[this->npoints] = brush + del_left;
     this->point2[this->npoints] = brush - del_right;
-
+    
+    if (this->nowidth) {
+        this->point1[this->npoints] = Geom::middle_point(this->point1[this->npoints],this->point2[this->npoints]);
+    }
     this->del = 0.5*(del_left + del_right);
 
     this->npoints++;
@@ -371,7 +379,8 @@ void EraserTool::cancel() {
 
 bool EraserTool::root_handler(GdkEvent* event) {
     gint ret = FALSE;
-
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+    gint eraserMode = prefs->getBool("/tools/eraser/mode") ? 1 : 0;
     switch (event->type) {
         case GDK_BUTTON_PRESS:
             if (event->button.button == 1 && !this->space_panning) {
@@ -391,10 +400,10 @@ bool EraserTool::root_handler(GdkEvent* event) {
                 if (this->repr) {
                     this->repr = NULL;
                 }
-
-                Inkscape::Rubberband::get(desktop)->start(desktop, button_dt);
-                Inkscape::Rubberband::get(desktop)->setMode(RUBBERBAND_MODE_TOUCHPATH);
-
+                if ( ! eraserMode ) {
+                    Inkscape::Rubberband::get(desktop)->start(desktop, button_dt);
+                    Inkscape::Rubberband::get(desktop)->setMode(RUBBERBAND_MODE_TOUCHPATH);
+                }
                 /* initialize first point */
                 this->npoints = 0;
 
@@ -439,8 +448,10 @@ bool EraserTool::root_handler(GdkEvent* event) {
 
                 ret = TRUE;
             }
-
-            Inkscape::Rubberband::get(desktop)->move(motion_dt);
+            if ( !eraserMode ) {
+                this->accumulated->reset();
+                Inkscape::Rubberband::get(desktop)->move(motion_dt);
+            }
         }
         break;
 
@@ -480,7 +491,7 @@ bool EraserTool::root_handler(GdkEvent* event) {
             ret = TRUE;
         }
 
-        if (Inkscape::Rubberband::get(desktop)->is_started()) {
+        if (!eraserMode && Inkscape::Rubberband::get(desktop)->is_started()) {
             Inkscape::Rubberband::get(desktop)->stop();
         }
             
@@ -489,33 +500,32 @@ bool EraserTool::root_handler(GdkEvent* event) {
 
     case GDK_KEY_PRESS:
         switch (get_group0_keyval (&event->key)) {
-        case GDK_KEY_Up:
-        case GDK_KEY_KP_Up:
-            if (!MOD__CTRL_ONLY(event)) {
-                this->angle += 5.0;
-
-                if (this->angle > 90.0) {
-                    this->angle = 90.0;
-                }
-
-                sp_erc_update_toolbox (desktop, "eraser-angle", this->angle);
-                ret = TRUE;
-            }
-            break;
-
-        case GDK_KEY_Down:
-        case GDK_KEY_KP_Down:
-            if (!MOD__CTRL_ONLY(event)) {
-                this->angle -= 5.0;
-
-                if (this->angle < -90.0) {
-                    this->angle = -90.0;
-                }
-
-                sp_erc_update_toolbox (desktop, "eraser-angle", this->angle);
-                ret = TRUE;
-            }
-            break;
+//        case GDK_KEY_Up:
+//        case GDK_KEY_KP_Up:
+//            if (!MOD__CTRL_ONLY(event)) {
+//                this->angle += 5.0;
+
+//                if (this->angle > 90.0) {
+//                    this->angle = 90.0;
+//                }
+//                sp_erc_update_toolbox (desktop, "eraser-angle", this->angle);
+//                ret = TRUE;
+//            }
+//            break;
+
+//        case GDK_KEY_Down:
+//        case GDK_KEY_KP_Down:
+//            if (!MOD__CTRL_ONLY(event)) {
+//                this->angle -= 5.0;
+
+//                if (this->angle < -90.0) {
+//                    this->angle = -90.0;
+//                }
+
+//                sp_erc_update_toolbox (desktop, "eraser-angle", this->angle);
+//                ret = TRUE;
+//            }
+//            break;
 
         case GDK_KEY_Right:
         case GDK_KEY_KP_Right:
@@ -568,8 +578,9 @@ bool EraserTool::root_handler(GdkEvent* event) {
             break;
 
         case GDK_KEY_Escape:
-            Inkscape::Rubberband::get(desktop)->stop();
-
+            if ( !eraserMode ) {
+                Inkscape::Rubberband::get(desktop)->stop();
+            }
             if (this->is_drawing) {
                 // if drawing, cancel, otherwise pass it up for deselecting
                 this->cancel();
@@ -640,15 +651,12 @@ void EraserTool::set_to_accumulated() {
             sp_desktop_apply_style_tool (desktop, repr, "/tools/eraser", false);
 
             this->repr = repr;
-
-            SPItem *item=SP_ITEM(desktop->currentLayer()->appendChildRepr(this->repr));
-            Inkscape::GC::release(this->repr);
-
-            item->transform = SP_ITEM(desktop->currentLayer())->i2doc_affine().inverse();
-            item->updateRepr();
         }
-
+        SPItem *item = SP_ITEM(desktop->currentLayer()->appendChildRepr(this->repr));
+        Inkscape::GC::release(this->repr);
+        item->updateRepr();
         Geom::PathVector pathv = this->accumulated->get_pathvector() * desktop->dt2doc();
+        pathv *= item->i2doc_affine().inverse();
         gchar *str = sp_svg_write_path(pathv);
         g_assert( str != NULL );
         this->repr->setAttribute("d", str);
@@ -658,49 +666,86 @@ void EraserTool::set_to_accumulated() {
             bool wasSelection = false;
             Inkscape::Selection *selection = desktop->getSelection();
             Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-            
             gint eraserMode = prefs->getBool("/tools/eraser/mode") ? 1 : 0;
             Inkscape::XML::Document *xml_doc = desktop->doc()->getReprDoc();
 
             SPItem* acid = SP_ITEM(desktop->doc()->getObjectByRepr(this->repr));
-            Geom::OptRect eraserBbox = acid->visualBounds();
-            Geom::Rect bounds = (*eraserBbox) * desktop->doc2dt();
+            Geom::OptRect eraserBbox = acid->desktopVisualBounds();
             std::vector<SPItem*> remainingItems;
             std::vector<SPItem*> toWorkOn;
             if (selection->isEmpty()) {
                 if ( eraserMode ) {
-                    toWorkOn = desktop->getDocument()->getItemsPartiallyInBox(desktop->dkey, bounds);
+                    toWorkOn = desktop->getDocument()->getItemsPartiallyInBox(desktop->dkey, *eraserBbox);
                 } else {
                     Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop);
                     toWorkOn = desktop->getDocument()->getItemsAtPoints(desktop->dkey, r->getPoints());
                 }
                 toWorkOn.erase(std::remove(toWorkOn.begin(), toWorkOn.end(), acid), toWorkOn.end());
             } else {
-                toWorkOn= selection->itemList();
+                if ( !eraserMode ) {
+                    Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop);
+                    std::vector<SPItem*> touched;
+                    touched = desktop->getDocument()->getItemsAtPoints(desktop->dkey, r->getPoints());
+                    for (std::vector<SPItem*>::const_iterator i = touched.begin();i!=touched.end();++i) {
+                        if(selection->includes(*i)){
+                            toWorkOn.push_back((*i));
+                        }
+                    }
+                } else {
+                    toWorkOn = selection->itemList();
+                }
                 wasSelection = true;
             }
 
             if ( !toWorkOn.empty() ) {
                 if ( eraserMode ) {
                     for (std::vector<SPItem*>::const_iterator i = toWorkOn.begin(); i != toWorkOn.end(); ++i){
-                    SPItem *item = *i;
-
-                        if ( eraserMode ) {
-                            Geom::OptRect bbox = item->visualBounds();
-
+                        SPItem *item = *i;
+                        SPUse *use = dynamic_cast<SPUse *>(item);
+                        if (SP_IS_PATH(item) && SP_PATH(item)->nodesInPath () == 2){
+                            sp_object_ref( *i, 0 );
+                            SPItem *item = *i;
+                            item->deleteObject(true);
+                            sp_object_unref(item);
+                            workDone = true;
+                            workDone = true;
+                        } else if (SP_IS_GROUP(item) || use ) {
+                            /*Do nothing*/
+                        } else {
+                            Geom::OptRect bbox = item->desktopVisualBounds();
                             if (bbox && bbox->intersects(*eraserBbox)) {
                                 Inkscape::XML::Node* dup = this->repr->duplicate(xml_doc);
                                 this->repr->parent()->appendChild(dup);
                                 Inkscape::GC::release(dup); // parent takes over
-
-                                selection->set(item);
-                                selection->add(dup);
-                                sp_selected_path_diff_skip_undo(selection, desktop);
+                                selection->set(dup);
+                                if (!this->nowidth) {
+                                    sp_selected_path_union_skip_undo(selection, desktop);
+                                }
+                                selection->add(item);
+                                if(item->style->fill_rule.value == SP_WIND_RULE_EVENODD){
+                                    SPCSSAttr *css = sp_repr_css_attr_new();
+                                    sp_repr_css_set_property(css, "fill-rule", "evenodd");
+                                    sp_desktop_set_style(desktop, css);
+                                    sp_repr_css_attr_unref(css);
+                                    css = 0;
+                                }
+                                if (this->nowidth) {
+                                    sp_selected_path_cut_skip_undo(selection, desktop);
+                                } else {
+                                    sp_selected_path_diff_skip_undo(selection, desktop);
+                                }
                                 workDone = true; // TODO set this only if something was cut.
-
+                                bool break_apart = prefs->getBool("/tools/eraser/break_apart", false);
+                                if(!break_apart){
+                                    sp_selected_path_combine(desktop, true);
+                                } else {
+                                    if(!this->nowidth){
+                                        sp_selected_path_break_apart(desktop, true);
+                                    }
+                                }
                                 if ( !selection->isEmpty() ) {
                                     // If the item was not completely erased, track the new remainder.
-                                	std::vector<SPItem*> nowSel(selection->itemList());
+                                    std::vector<SPItem*> nowSel(selection->itemList());
                                     for (std::vector<SPItem*>::const_iterator i2 = nowSel.begin();i2!=nowSel.end();++i2) {
                                         remainingItems.push_back(*i2);
                                     }
@@ -736,7 +781,6 @@ void EraserTool::set_to_accumulated() {
                     }
                 }
             }
-
             // Remove the eraser stroke itself:
             sp_repr_unparent( this->repr );
             this->repr = 0;
@@ -811,24 +855,25 @@ void EraserTool::accumulate() {
         g_assert( rev_cal2_lastseg );
 
         this->accumulated->append(this->cal1, FALSE);
-
-        add_cap(this->accumulated,
-                dc_cal1_lastseg->finalPoint() - dc_cal1_lastseg->unitTangentAt(1),
-                dc_cal1_lastseg->finalPoint(),
-                rev_cal2_firstseg->initialPoint(),
-                rev_cal2_firstseg->initialPoint() + rev_cal2_firstseg->unitTangentAt(0),
-                this->cap_rounding);
-
-        this->accumulated->append(rev_cal2, TRUE);
-
-        add_cap(this->accumulated,
-                rev_cal2_lastseg->finalPoint() - rev_cal2_lastseg->unitTangentAt(1),
-                rev_cal2_lastseg->finalPoint(),
-                dc_cal1_firstseg->initialPoint(),
-                dc_cal1_firstseg->initialPoint() + dc_cal1_firstseg->unitTangentAt(0),
-                this->cap_rounding);
-
-        this->accumulated->closepath();
+        if(!this->nowidth) {
+            add_cap(this->accumulated,
+                    dc_cal1_lastseg->finalPoint() - dc_cal1_lastseg->unitTangentAt(1),
+                    dc_cal1_lastseg->finalPoint(),
+                    rev_cal2_firstseg->initialPoint(),
+                    rev_cal2_firstseg->initialPoint() + rev_cal2_firstseg->unitTangentAt(0),
+                    this->cap_rounding);
+
+            this->accumulated->append(rev_cal2, TRUE);
+
+            add_cap(this->accumulated,
+                    rev_cal2_lastseg->finalPoint() - rev_cal2_lastseg->unitTangentAt(1),
+                    rev_cal2_lastseg->finalPoint(),
+                    dc_cal1_firstseg->initialPoint(),
+                    dc_cal1_firstseg->initialPoint() + dc_cal1_firstseg->unitTangentAt(0),
+                    this->cap_rounding);
+
+            this->accumulated->closepath();
+        }
 
         rev_cal2->unref();
 
@@ -844,6 +889,8 @@ static double square(double const x)
 
 void EraserTool::fit_and_split(bool release) {
     double const tolerance_sq = square( desktop->w2d().descrim() * TOLERANCE_ERASER );
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+    this->nowidth = prefs->getDouble( "/tools/eraser/width", 1) == 0;
 
 #ifdef ERASER_VERBOSE
     g_print("[F&S:R=%c]", release?'T':'F');
@@ -940,7 +987,6 @@ void EraserTool::fit_and_split(bool release) {
         g_print("[%d]Yup\n", this->npoints);
 #endif
         if (!release) {
-            Inkscape::Preferences *prefs = Inkscape::Preferences::get();
             gint eraserMode = prefs->getBool("/tools/eraser/mode") ? 1 : 0;
             g_assert(!this->currentcurve->is_empty());
 
diff --git a/src/ui/tools/eraser-tool.h b/src/ui/tools/eraser-tool.h
index 110f57ba3..50ce6b6e3 100644
--- a/src/ui/tools/eraser-tool.h
+++ b/src/ui/tools/eraser-tool.h
@@ -58,6 +58,7 @@ private:
 	void accumulate();
 	void fit_and_split(bool release);
 	void draw_temporary_box();
+	bool nowidth;
 };
 
 }
diff --git a/src/ui/tools/freehand-base.cpp b/src/ui/tools/freehand-base.cpp
index 613857626..c98ecb686 100644
--- a/src/ui/tools/freehand-base.cpp
+++ b/src/ui/tools/freehand-base.cpp
@@ -43,6 +43,7 @@
 #include "snap.h"
 #include "sp-path.h"
 #include "sp-use.h"
+#include "sp-item-group.h"
 #include "sp-namedview.h"
 #include "live_effects/lpe-powerstroke.h"
 #include "style.h"
@@ -432,7 +433,7 @@ static void spdc_check_for_and_apply_waiting_LPE(FreehandBase *dc, SPItem *item,
                 if(cm->paste(SP_ACTIVE_DESKTOP,true) == true){
                     gchar const *svgd = item->getRepr()->attribute("d");
                     bend_item = dc->selection->singleItem();
-                    if(bend_item){
+                    if(bend_item && (SP_IS_SHAPE(bend_item) || SP_IS_GROUP(bend_item))){
                         bend_item->moveTo(item,false);
                         bend_item->transform.setTranslation(Geom::Point());
                         spdc_apply_bend_shape(svgd, dc, bend_item);
@@ -440,9 +441,11 @@ static void spdc_check_for_and_apply_waiting_LPE(FreehandBase *dc, SPItem *item,
 
                         shape = BEND_CLIPBOARD;
                     } else {
+                        bend_item = NULL;
                         shape = NONE;
                     }
                 } else {
+                    bend_item = NULL;
                     shape = NONE;
                 }
                 break;
diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp
index a2a440ef4..287828d32 100644
--- a/src/ui/tools/measure-tool.cpp
+++ b/src/ui/tools/measure-tool.cpp
@@ -1198,8 +1198,7 @@ void MeasureTool::showCanvasItems(bool to_guides, bool to_item, bool to_phantom,
                             curve->unref();
                             continue;
                         }
-
-                        curve->transform(item->i2doc_affine());
+                        curve->transform(item->transform);
 
                         calculate_intersections(desktop, item, lineseg, curve, intersection_times);
                         if (iter == te_get_layout(item)->end()) {
@@ -1288,9 +1287,9 @@ void MeasureTool::showCanvasItems(bool to_guides, bool to_item, bool to_phantom,
         if(to_guides) {
             gchar *cross_number;
             if (!prefs->getBool("/tools/measure/ignore_1st_and_last", true)) {
-                cross_number= g_strdup_printf(_("Crossing %u"), idx);
+                cross_number= g_strdup_printf(_("Crossing %lu"), static_cast<unsigned long>(idx));
             } else {
-                cross_number= g_strdup_printf(_("Crossing %u"), idx + 1);
+                cross_number= g_strdup_printf(_("Crossing %lu"), static_cast<unsigned long>(idx + 1));
             }
             if (!prefs->getBool("/tools/measure/ignore_1st_and_last", true) && idx == 0) {
                 setGuide(desktop->doc2dt(intersections[idx]), angle + Geom::rad_from_deg(90), "");
diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp
index 2ed366a7d..18af8e105 100644
--- a/src/ui/tools/pen-tool.cpp
+++ b/src/ui/tools/pen-tool.cpp
@@ -1220,7 +1220,18 @@ bool PenTool::_handleKeyPress(GdkEvent *event) {
         case GDK_KEY_KP_Enter:
             if (this->npoints != 0) {
                 this->ea = NULL; // unset end anchor if set (otherwise crashes)
-                this->_finish(false);
+                if(MOD__SHIFT_ONLY(event)) {
+                    // All this is needed to stop the last control
+                    // point dispeating and stop making an n-1 shape.
+                    Geom::Point const p(0, 0);
+                    if(this->red_curve->is_empty()) {
+                        this->red_curve->moveto(p);
+                    }
+                    this->_finishSegment(p, 0);
+                    this->_finish(true);
+                } else {
+                  this->_finish(false);
+                }
                 ret = true;
             }
             break;
@@ -1783,12 +1794,12 @@ void PenTool::_setSubsequentPoint(Geom::Point const p, bool statusbar, guint sta
 
     if (statusbar) {
         gchar *message = is_curve ?
-            _("<b>Curve segment</b>: angle %3.2f&#176;, distance %s; with <b>Ctrl</b> to snap angle, <b>Enter</b> to finish the path" ):
-            _("<b>Line segment</b>: angle %3.2f&#176;, distance %s; with <b>Ctrl</b> to snap angle, <b>Enter</b> to finish the path");
+            _("<b>Curve segment</b>: angle %3.2f&#176;, distance %s; with <b>Ctrl</b> to snap angle, <b>Enter</b> or <b>Shift+Enter</b> to finish the path" ):
+            _("<b>Line segment</b>: angle %3.2f&#176;, distance %s; with <b>Ctrl</b> to snap angle, <b>Enter</b> or <b>Shift+Enter</b> to finish the path");
         if(this->spiro || this->bspline){
             message = is_curve ?
-            _("<b>Curve segment</b>: angle %3.2f&#176;, distance %s; with <b>Shift+Click</b> make a cusp node, <b>Enter</b> to finish the path" ):
-            _("<b>Line segment</b>: angle %3.2f&#176;, distance %s; with <b>Shift+Click</b> make a cusp node, <b>Enter</b> to finish the path");        
+            _("<b>Curve segment</b>: angle %3.2f&#176;, distance %s; with <b>Shift+Click</b> make a cusp node, <b>Enter</b> or <b>Shift+Enter</b> to finish the path" ):
+            _("<b>Line segment</b>: angle %3.2f&#176;, distance %s; with <b>Shift+Click</b> make a cusp node, <b>Enter</b> or <b>Shift+Enter</b> to finish the path");        
         }
         this->_setAngleDistanceStatusMessage(p, 0, message);
     }
diff --git a/src/ui/tools/pencil-tool.cpp b/src/ui/tools/pencil-tool.cpp
index bfb1c67f0..b029ca613 100644
--- a/src/ui/tools/pencil-tool.cpp
+++ b/src/ui/tools/pencil-tool.cpp
@@ -634,12 +634,14 @@ void PencilTool::_interpolate() {
     using Geom::Y;
 
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-    double const tol = prefs->getDoubleLimited("/tools/freehand/pencil/tolerance", 10.0, 1.0, 100.0) * 0.4;
-    double tolerance_sq = 0.02 * square(this->desktop->w2d().descrim() * tol) * exp(0.2 * tol - 2);
+    double tol = prefs->getDoubleLimited("/tools/freehand/pencil/tolerance", 10.0, 1.0, 100.0) * 0.4;
     bool simplify = prefs->getInt("/tools/freehand/pencil/simplify", 0);
     if(simplify){
-        tolerance_sq = 0;
+        double tol2 = prefs->getDoubleLimited("/tools/freehand/pencil/base-simplify", 25.0, 1.0, 100.0) * 0.4;
+        tol = std::min(tol,tol2);
     }
+    double tolerance_sq = 0.02 * square(this->desktop->w2d().descrim() * tol) * exp(0.2 * tol - 2);
+
     g_assert(is_zero(this->req_tangent) || is_unit_vector(this->req_tangent));
 
     this->green_curve->reset();
@@ -705,12 +707,14 @@ void PencilTool::_sketchInterpolate() {
     }
 
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-    double const tol = prefs->getDoubleLimited("/tools/freehand/pencil/tolerance", 10.0, 1.0, 100.0) * 0.4;
-    double tolerance_sq = 0.02 * square(this->desktop->w2d().descrim() * tol) * exp(0.2 * tol - 2);
+    double tol = prefs->getDoubleLimited("/tools/freehand/pencil/tolerance", 10.0, 1.0, 100.0) * 0.4;
     bool simplify = prefs->getInt("/tools/freehand/pencil/simplify", 0);
     if(simplify){
-        tolerance_sq = 0;
+        double tol2 = prefs->getDoubleLimited("/tools/freehand/pencil/base-simplify", 25.0, 1.0, 100.0) * 0.4;
+        tol = std::min(tol,tol2);
     }
+    double tolerance_sq = 0.02 * square(this->desktop->w2d().descrim() * tol) * exp(0.2 * tol - 2);
+    
     bool average_all_sketches = prefs->getBool("/tools/freehand/pencil/average_all_sketches", true);
 
     g_assert(is_zero(this->req_tangent) || is_unit_vector(this->req_tangent));
diff --git a/src/ui/tools/zoom-tool.cpp b/src/ui/tools/zoom-tool.cpp
index 6a4d4dbbd..13e097c18 100644
--- a/src/ui/tools/zoom-tool.cpp
+++ b/src/ui/tools/zoom-tool.cpp
@@ -142,7 +142,7 @@ bool ZoomTool::root_handler(GdkEvent* event) {
             if ( event->button.button == 1  && !this->space_panning) {
                 Geom::OptRect const b = Inkscape::Rubberband::get(desktop)->getRectangle();
 
-                if (b && !within_tolerance) {
+                if (b && !within_tolerance && !(GDK_SHIFT_MASK & event->button.state) ) {
                     desktop->set_display_area(*b, 10);
                 } else if (!escaped) {
                     double const zoom_rel( (event->button.state & GDK_SHIFT_MASK)