NR:: => Geom:: for much of src/ui and src/widgets

(bzr r6561)

7 files changed, 110 insertions, 105 deletions

diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index 8744a4be0..4be823391 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -233,12 +233,12 @@ SPDesktopWidget::setMessage (Inkscape::MessageType type, const gchar *message)
     gtk_tooltips_set_tip (this->tt, this->select_status_eventbox, gtk_label_get_text (sb) , NULL);
 }
 
-NR::Point
+Geom::Point
 SPDesktopWidget::window_get_pointer()
 {
     gint x,y;
     gdk_window_get_pointer (GTK_WIDGET (canvas)->window, &x, &y, NULL);
-    return NR::Point(x,y);
+    return Geom::Point(x,y);
 }
 
 /**
@@ -657,7 +657,7 @@ sp_desktop_widget_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
     }
 
     if (GTK_WIDGET_REALIZED (widget)) {
-        NR::Rect const area = dtw->desktop->get_display_area();
+        Geom::Rect const area = to_2geom(dtw->desktop->get_display_area());
         double zoom = dtw->desktop->current_zoom();
 
         if (GTK_WIDGET_CLASS(dtw_parent_class)->size_allocate) {
@@ -666,14 +666,14 @@ sp_desktop_widget_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
 
         if (SP_BUTTON_IS_DOWN(dtw->sticky_zoom)) {
             /* Calculate zoom per pixel */
-            double const zpsp = zoom / hypot (area.dimensions()[NR::X], area.dimensions()[NR::Y]);
+            double const zpsp = zoom / hypot (area.dimensions()[Geom::X], area.dimensions()[Geom::Y]);
             /* Find new visible area */
-            NR::Rect newarea = dtw->desktop->get_display_area();
+            Geom::Rect newarea = to_2geom(dtw->desktop->get_display_area());
             /* Calculate adjusted zoom */
-            zoom = zpsp * hypot(newarea.dimensions()[NR::X], newarea.dimensions()[NR::Y]);
-            dtw->desktop->zoom_absolute(newarea.midpoint()[NR::X], newarea.midpoint()[NR::Y], zoom);
+            zoom = zpsp * hypot(newarea.dimensions()[Geom::X], newarea.dimensions()[Geom::Y]);
+            dtw->desktop->zoom_absolute(newarea.midpoint()[Geom::X], newarea.midpoint()[Geom::Y], zoom);
         } else {
-            dtw->desktop->zoom_absolute(area.midpoint()[NR::X], area.midpoint()[NR::Y], zoom);
+            dtw->desktop->zoom_absolute(area.midpoint()[Geom::X], area.midpoint()[Geom::Y], zoom);
         }
 
     } else {
@@ -1010,14 +1010,14 @@ SPDesktopWidget::disableInteraction()
 }
 
 void
-SPDesktopWidget::setCoordinateStatus(NR::Point p)
+SPDesktopWidget::setCoordinateStatus(Geom::Point p)
 {
     gchar *cstr;
-    cstr = g_strdup_printf("<tt>%7.2f </tt>", dt2r * p[NR::X]);
+    cstr = g_strdup_printf("<tt>%7.2f </tt>", dt2r * p[Geom::X]);
     gtk_label_set_markup( GTK_LABEL(this->coord_status_x), cstr );
     g_free(cstr);
 
-    cstr = g_strdup_printf("<tt>%7.2f </tt>", dt2r * p[NR::Y]);
+    cstr = g_strdup_printf("<tt>%7.2f </tt>", dt2r * p[Geom::Y]);
     gtk_label_set_markup( GTK_LABEL(this->coord_status_y), cstr );
     g_free(cstr);
 }
@@ -1045,13 +1045,13 @@ SPDesktopWidget::getWindowGeometry (gint &x, gint &y, gint &w, gint &h)
 }
 
 void
-SPDesktopWidget::setWindowPosition (NR::Point p)
+SPDesktopWidget::setWindowPosition (Geom::Point p)
 {
     Gtk::Window *window = (Gtk::Window*)gtk_object_get_data (GTK_OBJECT(this), "window");
 
     if (window)
     {
-        window->move (gint(round(p[NR::X])), gint(round(p[NR::Y])));
+        window->move (gint(round(p[Geom::X])), gint(round(p[Geom::Y])));
     }
 }
 
@@ -1312,7 +1312,7 @@ sp_desktop_widget_new (SPNamedView *namedview)
 
     dtw->dt2r = 1.0 / namedview->doc_units->unittobase;
 
-    dtw->ruler_origin = NR::Point(0,0); //namedview->gridorigin;   Why was the grid origin used here?
+    dtw->ruler_origin = Geom::Point(0,0); //namedview->gridorigin;   Why was the grid origin used here?
 
     dtw->desktop = new SPDesktop();
     dtw->stub = new SPDesktopWidget::WidgetStub (dtw);
@@ -1350,14 +1350,14 @@ sp_desktop_widget_new (SPNamedView *namedview)
 }
 
 void
-SPDesktopWidget::viewSetPosition (NR::Point p)
+SPDesktopWidget::viewSetPosition (Geom::Point p)
 {
-    NR::Point const origin = ( p - ruler_origin );
+    Geom::Point const origin = ( p - ruler_origin );
 
     /// \todo fixme:
-    GTK_RULER(hruler)->position = origin[NR::X];
+    GTK_RULER(hruler)->position = origin[Geom::X];
     gtk_ruler_draw_pos (GTK_RULER (hruler));
-    GTK_RULER(vruler)->position = origin[NR::Y];
+    GTK_RULER(vruler)->position = origin[Geom::Y];
     gtk_ruler_draw_pos (GTK_RULER (vruler));
 }
 
@@ -1379,8 +1379,8 @@ sp_desktop_widget_update_hruler (SPDesktopWidget *dtw)
     NR::IRect viewbox = dtw->canvas->getViewboxIntegers();
 
     double const scale = dtw->desktop->current_zoom();
-    double s = viewbox.min()[NR::X] / scale - dtw->ruler_origin[NR::X];
-    double e = viewbox.max()[NR::X] / scale - dtw->ruler_origin[NR::X];
+    double s = viewbox.min()[Geom::X] / scale - dtw->ruler_origin[Geom::X];
+    double e = viewbox.max()[Geom::X] / scale - dtw->ruler_origin[Geom::X];
     gtk_ruler_set_range(GTK_RULER(dtw->hruler), s,  e, GTK_RULER(dtw->hruler)->position, (e - s));
 }
 
@@ -1395,8 +1395,8 @@ sp_desktop_widget_update_vruler (SPDesktopWidget *dtw)
     NR::IRect viewbox = dtw->canvas->getViewboxIntegers();
 
     double const scale = dtw->desktop->current_zoom();
-    double s = viewbox.min()[NR::Y] / -scale - dtw->ruler_origin[NR::Y];
-    double e = viewbox.max()[NR::Y] / -scale - dtw->ruler_origin[NR::Y];
+    double s = viewbox.min()[Geom::Y] / -scale - dtw->ruler_origin[Geom::Y];
+    double e = viewbox.max()[Geom::Y] / -scale - dtw->ruler_origin[Geom::Y];
     gtk_ruler_set_range(GTK_RULER(dtw->vruler), s, e, GTK_RULER(dtw->vruler)->position, (e - s));
 }
 
@@ -1407,7 +1407,7 @@ sp_desktop_widget_namedview_modified (SPObject *obj, guint flags, SPDesktopWidge
     SPNamedView *nv=SP_NAMEDVIEW(obj);
     if (flags & SP_OBJECT_MODIFIED_FLAG) {
         dtw->dt2r = 1.0 / nv->doc_units->unittobase;
-        dtw->ruler_origin = NR::Point(0,0); //nv->gridorigin;   Why was the grid origin used here?
+        dtw->ruler_origin = Geom::Point(0,0); //nv->gridorigin;   Why was the grid origin used here?
 
         sp_ruler_set_metric (GTK_RULER (dtw->vruler), nv->getDefaultMetric());
         sp_ruler_set_metric (GTK_RULER (dtw->hruler), nv->getDefaultMetric());
@@ -1503,9 +1503,9 @@ sp_dtw_zoom_value_changed (GtkSpinButton *spin, gpointer data)
     SPDesktopWidget *dtw = SP_DESKTOP_WIDGET (data);
     SPDesktop *desktop = dtw->desktop;
 
-    NR::Rect const d = desktop->get_display_area();
+    Geom::Rect const d = to_2geom(desktop->get_display_area());
     g_signal_handler_block (spin, dtw->zoom_update);
-    desktop->zoom_absolute (d.midpoint()[NR::X], d.midpoint()[NR::Y], zoom_factor);
+    desktop->zoom_absolute (d.midpoint()[Geom::X], d.midpoint()[Geom::Y], zoom_factor);
     g_signal_handler_unblock (spin, dtw->zoom_update);
 
     spinbutton_defocus (GTK_OBJECT (spin));
@@ -1558,8 +1558,8 @@ sp_dtw_zoom_populate_popup (GtkEntry */*entry*/, GtkMenu *menu, gpointer data)
 static void
 sp_dtw_zoom_menu_handler (SPDesktop *dt, gdouble factor)
 {
-    NR::Rect const d = dt->get_display_area();
-    dt->zoom_absolute(d.midpoint()[NR::X], d.midpoint()[NR::Y], factor);
+    Geom::Rect const d = to_2geom(dt->get_display_area());
+    dt->zoom_absolute(d.midpoint()[Geom::X], d.midpoint()[Geom::Y], factor);
 }
 
 static void
@@ -1693,32 +1693,32 @@ sp_desktop_widget_update_scrollbars (SPDesktopWidget *dtw, double scale)
 
     /* The desktop region we always show unconditionally */
     SPDocument *doc = dtw->desktop->doc();
-    NR::Rect darea(NR::Point(-sp_document_width(doc), -sp_document_height(doc)),
-                   NR::Point(2 * sp_document_width(doc), 2 * sp_document_height(doc)));
+    NR::Rect darea(Geom::Point(-sp_document_width(doc), -sp_document_height(doc)),
+                   Geom::Point(2 * sp_document_width(doc), 2 * sp_document_height(doc)));
     darea = NR::union_bounds(darea, sp_item_bbox_desktop(SP_ITEM(SP_DOCUMENT_ROOT(doc))));
 
     /* Canvas region we always show unconditionally */
-    NR::Rect carea(NR::Point(darea.min()[NR::X] * scale - 64,
-                             darea.max()[NR::Y] * -scale - 64),
-                   NR::Point(darea.max()[NR::X] * scale + 64,
-                             darea.min()[NR::Y] * -scale + 64));
+    NR::Rect carea(Geom::Point(darea.min()[Geom::X] * scale - 64,
+                             darea.max()[Geom::Y] * -scale - 64),
+                   Geom::Point(darea.max()[Geom::X] * scale + 64,
+                             darea.min()[Geom::Y] * -scale + 64));
 
     NR::Rect viewbox = dtw->canvas->getViewbox();
 
     /* Viewbox is always included into scrollable region */
     carea = NR::union_bounds(carea, viewbox);
 
-    set_adjustment(dtw->hadj, carea.min()[NR::X], carea.max()[NR::X],
-                   viewbox.dimensions()[NR::X],
-                   0.1 * viewbox.dimensions()[NR::X],
-                   viewbox.dimensions()[NR::X]);
-    gtk_adjustment_set_value(dtw->hadj, viewbox.min()[NR::X]);
-
-    set_adjustment(dtw->vadj, carea.min()[NR::Y], carea.max()[NR::Y],
-                   viewbox.dimensions()[NR::Y],
-                   0.1 * viewbox.dimensions()[NR::Y],
-                   viewbox.dimensions()[NR::Y]);
-    gtk_adjustment_set_value(dtw->vadj, viewbox.min()[NR::Y]);
+    set_adjustment(dtw->hadj, carea.min()[Geom::X], carea.max()[Geom::X],
+                   viewbox.dimensions()[Geom::X],
+                   0.1 * viewbox.dimensions()[Geom::X],
+                   viewbox.dimensions()[Geom::X]);
+    gtk_adjustment_set_value(dtw->hadj, viewbox.min()[Geom::X]);
+
+    set_adjustment(dtw->vadj, carea.min()[Geom::Y], carea.max()[Geom::Y],
+                   viewbox.dimensions()[Geom::Y],
+                   0.1 * viewbox.dimensions()[Geom::Y],
+                   viewbox.dimensions()[Geom::Y]);
+    gtk_adjustment_set_value(dtw->vadj, viewbox.min()[Geom::Y]);
 
     dtw->update = 0;
 }
diff --git a/src/widgets/desktop-widget.h b/src/widgets/desktop-widget.h
index aece4f75d..51c9141de 100644
--- a/src/widgets/desktop-widget.h
+++ b/src/widgets/desktop-widget.h
@@ -109,7 +109,7 @@ struct SPDesktopWidget {
     unsigned int _interaction_disabled_counter;
 
     SPCanvas *canvas;
-    NR::Point ruler_origin;
+    Geom::Point ruler_origin;
     double dt2r;
 
     GtkAdjustment *hadj, *vadj;
@@ -135,11 +135,11 @@ struct SPDesktopWidget {
             { _dtw->getWindowGeometry (x, y, w, h); }
         virtual void setSize (gint w, gint h)
             { _dtw->setWindowSize (w, h); }
-        virtual void setPosition (NR::Point p)
+        virtual void setPosition (Geom::Point p)
             { _dtw->setWindowPosition (p); }
         virtual void setTransient (void* p, int transient_policy)
             { _dtw->setWindowTransient (p, transient_policy); }
-        virtual NR::Point getPointer()
+        virtual Geom::Point getPointer()
             { return _dtw->window_get_pointer(); }
         virtual void setIconified()
             { sp_desktop_widget_iconify (_dtw); }
@@ -168,7 +168,7 @@ struct SPDesktopWidget {
             { sp_dtw_desktop_activate (_dtw); }
         virtual void deactivateDesktop()
             { sp_dtw_desktop_deactivate (_dtw); }
-        virtual void viewSetPosition (NR::Point p)
+        virtual void viewSetPosition (Geom::Point p)
             { _dtw->viewSetPosition (p); }
         virtual void updateRulers()
             { sp_desktop_widget_update_rulers (_dtw); }
@@ -192,7 +192,7 @@ struct SPDesktopWidget {
             { _dtw->setToolboxSelectOneValue (id, val); }
         virtual bool isToolboxButtonActive (gchar const* id)
             { return _dtw->isToolboxButtonActive (id); }
-        virtual void setCoordinateStatus (NR::Point p)
+        virtual void setCoordinateStatus (Geom::Point p)
             { _dtw->setCoordinateStatus (p); }
         virtual void setMessage (Inkscape::MessageType type, gchar const* msg)
             { _dtw->setMessage (type, msg); }
@@ -205,12 +205,12 @@ struct SPDesktopWidget {
     WidgetStub *stub;
 
     void setMessage(Inkscape::MessageType type, gchar const *message);
-    NR::Point window_get_pointer();
+    Geom::Point window_get_pointer();
     bool shutdown();
-    void viewSetPosition (NR::Point p);
+    void viewSetPosition (Geom::Point p);
     void letZoomGrabFocus();
     void getWindowGeometry (gint &x, gint &y, gint &w, gint &h);
-    void setWindowPosition (NR::Point p);
+    void setWindowPosition (Geom::Point p);
     void setWindowSize (gint w, gint h);
     void setWindowTransient (void *p, int transient_policy);
     void presentWindow();
@@ -219,7 +219,7 @@ struct SPDesktopWidget {
     void setToolboxAdjustmentValue (gchar const * id, double value);
     void setToolboxSelectOneValue (gchar const * id, gint value);
     bool isToolboxButtonActive (gchar const *id);
-    void setCoordinateStatus(NR::Point p);
+    void setCoordinateStatus(Geom::Point p);
     void requestCanvasUpdate();
     void requestCanvasUpdateAndWait();
     void enableInteraction();
diff --git a/src/widgets/font-selector.cpp b/src/widgets/font-selector.cpp
index d6326791b..1faf7005f 100644
--- a/src/widgets/font-selector.cpp
+++ b/src/widgets/font-selector.cpp
@@ -21,6 +21,7 @@
 #endif
 
 #include <libnr/nr-blit.h>
+#include <libnr/nr-convert2geom.h>
 #include <libnrtype/font-instance.h>
 #include <libnrtype/raster-glyph.h>
 #include <libnrtype/RasterFont.h>
@@ -28,6 +29,8 @@
 #include <libnrtype/one-glyph.h>
 #include <libnrtype/font-lister.h>
 
+#include <2geom/transforms.h>
+
 #include <gtk/gtk.h>
 #include <gtk/gtkframe.h>
 #include <gtk/gtkscrolledwindow.h>
@@ -661,7 +664,7 @@ static gint sp_font_preview_expose(GtkWidget *widget, GdkEventExpose *event)
                                 pango_font_description_free(pfd);
                             }
                         }
-                        NR::Point base_pt(str_text->glyph_text[i].x, str_text->glyph_text[i].y);
+                        Geom::Point base_pt(str_text->glyph_text[i].x, str_text->glyph_text[i].y);
                         base_pt *= theSize;
 
                         glyphs[len] = str_text->glyph_text[i].gl;
@@ -670,10 +673,10 @@ static gint sp_font_preview_expose(GtkWidget *widget, GdkEventExpose *event)
                         if ( curF ) {
                             NR::Maybe<NR::Rect> nbbox = curF->BBox(str_text->glyph_text[i].gl);
                             if (nbbox) {
-                                bbox.x0 = MIN(bbox.x0, base_pt[NR::X] + theSize * (nbbox->min())[0]);
-                                bbox.y0 = MIN(bbox.y0, base_pt[NR::Y] - theSize * (nbbox->max())[1]);
-                                bbox.x1 = MAX(bbox.x1, base_pt[NR::X] + theSize * (nbbox->max())[0]);
-                                bbox.y1 = MAX(bbox.y1, base_pt[NR::Y] - theSize * (nbbox->min())[1]);
+                                bbox.x0 = MIN(bbox.x0, base_pt[Geom::X] + theSize * (nbbox->min())[0]);
+                                bbox.y0 = MIN(bbox.y0, base_pt[Geom::Y] - theSize * (nbbox->max())[1]);
+                                bbox.x1 = MAX(bbox.x1, base_pt[Geom::X] + theSize * (nbbox->max())[0]);
+                                bbox.y1 = MAX(bbox.y1, base_pt[Geom::Y] - theSize * (nbbox->min())[1]);
                             }
                         }
                     }
@@ -690,13 +693,13 @@ static gint sp_font_preview_expose(GtkWidget *widget, GdkEventExpose *event)
                                 unival = g_utf8_get_char (p);
                                 glyphs[len] =  tface->MapUnicodeChar( unival);
                                 hpos[len] = (int)px;
-                                NR::Point adv = fprev->rfont->Advance(glyphs[len]);
+                                Geom::Point adv = fprev->rfont->Advance(glyphs[len]);
                                 fprev->rfont->BBox( glyphs[len], &gbox);
                                 bbox.x0 = MIN (px + gbox.x0, bbox.x0);
                                 bbox.y0 = MIN (py + gbox.y0, bbox.y0);
                                 bbox.x1 = MAX (px + gbox.x1, bbox.x1);
                                 bbox.y1 = MAX (py + gbox.y1, bbox.y1);
-                                px += adv[NR::X];
+                                px += adv[Geom::X];
                                 len += 1;
                                 p = g_utf8_next_char (p);
                                 }*/
@@ -741,7 +744,7 @@ static gint sp_font_preview_expose(GtkWidget *widget, GdkEventExpose *event)
                         }
                         raster_glyph *g = (curRF) ? curRF->GetGlyph(glyphs[i]) : NULL;
                         if ( g ) {
-                            g->Blit(NR::Point(hpos[i] + startx, starty), m);
+                            g->Blit(Geom::Point(hpos[i] + startx, starty), m);
                         }
                     }
                     if (curRF) {
@@ -802,8 +805,8 @@ void sp_font_preview_set_font(SPFontPreview *fprev, font_instance *font, SPFontS
 
         if (fprev->font)
         {
-            NR::Matrix flip(NR::scale(fsel->fontsize, -fsel->fontsize));
-            fprev->rfont = fprev->font->RasterFont(flip, 0);
+            Geom::Matrix flip(Geom::Scale(fsel->fontsize, -fsel->fontsize));
+            fprev->rfont = fprev->font->RasterFont(from_2geom(flip), 0);
         }
 
         if (GTK_WIDGET_DRAWABLE (fprev)) gtk_widget_queue_draw (GTK_WIDGET (fprev));
diff --git a/src/widgets/icon.cpp b/src/widgets/icon.cpp
index eb36d4c69..d89a85eaa 100644
--- a/src/widgets/icon.cpp
+++ b/src/widgets/icon.cpp
@@ -622,13 +622,13 @@ sp_icon_doc_icon( SPDocument *doc, NRArenaItem *root,
         SPObject *object = doc->getObjectById(name);
         if (object && SP_IS_ITEM(object)) {
             /* Find bbox in document */
-            NR::Matrix const i2doc(from_2geom(sp_item_i2doc_affine(SP_ITEM(object))));
-            NR::Maybe<NR::Rect> dbox = SP_ITEM(object)->getBounds(i2doc);
+            Geom::Matrix const i2doc(sp_item_i2doc_affine(SP_ITEM(object)));
+            NR::Maybe<Geom::Rect> dbox = SP_ITEM(object)->getBounds(i2doc);
 
             if ( SP_OBJECT_PARENT(object) == NULL )
             {
-                dbox = NR::Rect(NR::Point(0, 0),
-                                NR::Point(sp_document_width(doc), sp_document_height(doc)));
+                dbox = Geom::Rect(Geom::Point(0, 0),
+                                Geom::Point(sp_document_width(doc), sp_document_height(doc)));
             }
 
             /* This is in document coordinates, i.e. pixels */
@@ -636,17 +636,17 @@ sp_icon_doc_icon( SPDocument *doc, NRArenaItem *root,
                 NRGC gc(NULL);
                 /* Update to renderable state */
                 double sf = 1.0;
-                nr_arena_item_set_transform(root, NR::Matrix(NR::scale(sf, sf)));
+                nr_arena_item_set_transform(root, from_2geom(Geom::Scale(sf, sf)));
                 gc.transform.set_identity();
                 nr_arena_item_invoke_update( root, NULL, &gc,
                                              NR_ARENA_ITEM_STATE_ALL,
                                              NR_ARENA_ITEM_STATE_NONE );
                 /* Item integer bbox in points */
                 NRRectL ibox;
-                ibox.x0 = (int) floor(sf * dbox->min()[NR::X] + 0.5);
-                ibox.y0 = (int) floor(sf * dbox->min()[NR::Y] + 0.5);
-                ibox.x1 = (int) floor(sf * dbox->max()[NR::X] + 0.5);
-                ibox.y1 = (int) floor(sf * dbox->max()[NR::Y] + 0.5);
+                ibox.x0 = (int) floor(sf * dbox->min()[Geom::X] + 0.5);
+                ibox.y0 = (int) floor(sf * dbox->min()[Geom::Y] + 0.5);
+                ibox.x1 = (int) floor(sf * dbox->max()[Geom::X] + 0.5);
+                ibox.y1 = (int) floor(sf * dbox->max()[Geom::Y] + 0.5);
 
                 if ( dump ) {
                     g_message( "   box    --'%s'  (%f,%f)-(%f,%f)", name, (double)ibox.x0, (double)ibox.y0, (double)ibox.x1, (double)ibox.y1 );
@@ -668,16 +668,16 @@ sp_icon_doc_icon( SPDocument *doc, NRArenaItem *root,
                         }
                         sf = (double)psize / (double)block;
 
-                        nr_arena_item_set_transform(root, NR::Matrix(NR::scale(sf, sf)));
+                        nr_arena_item_set_transform(root, from_2geom(Geom::Scale(sf, sf)));
                         gc.transform.set_identity();
                         nr_arena_item_invoke_update( root, NULL, &gc,
                                                      NR_ARENA_ITEM_STATE_ALL,
                                                      NR_ARENA_ITEM_STATE_NONE );
                         /* Item integer bbox in points */
-                        ibox.x0 = (int) floor(sf * dbox->min()[NR::X] + 0.5);
-                        ibox.y0 = (int) floor(sf * dbox->min()[NR::Y] + 0.5);
-                        ibox.x1 = (int) floor(sf * dbox->max()[NR::X] + 0.5);
-                        ibox.y1 = (int) floor(sf * dbox->max()[NR::Y] + 0.5);
+                        ibox.x0 = (int) floor(sf * dbox->min()[Geom::X] + 0.5);
+                        ibox.y0 = (int) floor(sf * dbox->min()[Geom::Y] + 0.5);
+                        ibox.x1 = (int) floor(sf * dbox->max()[Geom::X] + 0.5);
+                        ibox.y1 = (int) floor(sf * dbox->max()[Geom::Y] + 0.5);
 
                         if ( dump ) {
                             g_message( "   box2   --'%s'  (%f,%f)-(%f,%f)", name, (double)ibox.x0, (double)ibox.y0, (double)ibox.x1, (double)ibox.y1 );
diff --git a/src/widgets/select-toolbar.cpp b/src/widgets/select-toolbar.cpp
index 30d52cbae..5a2adc8d2 100644
--- a/src/widgets/select-toolbar.cpp
+++ b/src/widgets/select-toolbar.cpp
@@ -49,6 +49,7 @@
 #include "ege-adjustment-action.h"
 #include "ege-output-action.h"
 #include "ink-action.h"
+#include <2geom/rect.h>
 
 using Inkscape::UnitTracker;
 
@@ -61,8 +62,8 @@ sp_selection_layout_widget_update(SPWidget *spw, Inkscape::Selection *sel)
 
     g_object_set_data(G_OBJECT(spw), "update", GINT_TO_POINTER(TRUE));
 
-    using NR::X;
-    using NR::Y;
+    using Geom::X;
+    using Geom::Y;
     if ( sel && !sel->isEmpty() ) {
         int prefs_bbox = prefs_get_int_attribute("tools", "bounding_box", 0);
         SPItem::BBoxType bbox_type = (prefs_bbox ==0)? 
@@ -181,35 +182,35 @@ sp_object_layout_any_value_changed(GtkAdjustment *adj, SPWidget *spw)
         x0 = sp_units_get_pixels (a_x->value, unit);
         y0 = sp_units_get_pixels (a_y->value, unit);
         x1 = x0 + sp_units_get_pixels (a_w->value, unit);
-        xrel = sp_units_get_pixels (a_w->value, unit) / bbox->extent(NR::X);
+        xrel = sp_units_get_pixels (a_w->value, unit) / bbox->extent(Geom::X);
         y1 = y0 + sp_units_get_pixels (a_h->value, unit);
-        yrel = sp_units_get_pixels (a_h->value, unit) / bbox->extent(NR::Y);
+        yrel = sp_units_get_pixels (a_h->value, unit) / bbox->extent(Geom::Y);
     } else {
         double const x0_propn = a_x->value * unit.unittobase;
-        x0 = bbox->min()[NR::X] * x0_propn;
+        x0 = bbox->min()[Geom::X] * x0_propn;
         double const y0_propn = a_y->value * unit.unittobase;
-        y0 = y0_propn * bbox->min()[NR::Y];
+        y0 = y0_propn * bbox->min()[Geom::Y];
         xrel = a_w->value * unit.unittobase;
-        x1 = x0 + xrel * bbox->extent(NR::X);
+        x1 = x0 + xrel * bbox->extent(Geom::X);
         yrel = a_h->value * unit.unittobase;
-        y1 = y0 + yrel * bbox->extent(NR::Y);
+        y1 = y0 + yrel * bbox->extent(Geom::Y);
     }
 
     // Keep proportions if lock is on
     GtkToggleAction *lock = GTK_TOGGLE_ACTION( g_object_get_data(G_OBJECT(spw), "lock") );
     if ( gtk_toggle_action_get_active(lock) ) {
         if (adj == a_h) {
-            x1 = x0 + yrel * bbox->extent(NR::X);
+            x1 = x0 + yrel * bbox->extent(Geom::X);
         } else if (adj == a_w) {
-            y1 = y0 + xrel * bbox->extent(NR::Y);
+            y1 = y0 + xrel * bbox->extent(Geom::Y);
         }
     }
 
     // scales and moves, in px
-    double mh = fabs(x0 - bbox->min()[NR::X]);
-    double sh = fabs(x1 - bbox->max()[NR::X]);
-    double mv = fabs(y0 - bbox->min()[NR::Y]);
-    double sv = fabs(y1 - bbox->max()[NR::Y]);
+    double mh = fabs(x0 - bbox->min()[Geom::X]);
+    double sh = fabs(x1 - bbox->max()[Geom::X]);
+    double mv = fabs(y0 - bbox->min()[Geom::Y]);
+    double sv = fabs(y1 - bbox->max()[Geom::Y]);
 
     // unless the unit is %, convert the scales and moves to the unit
     if (unit.base == SP_UNIT_ABSOLUTE || unit.base == SP_UNIT_DEVICE) {
diff --git a/src/widgets/sp-color-wheel.cpp b/src/widgets/sp-color-wheel.cpp
index a31857101..b565bd485 100644
--- a/src/widgets/sp-color-wheel.cpp
+++ b/src/widgets/sp-color-wheel.cpp
@@ -21,6 +21,7 @@
 #include "sp-color-wheel.h"
 
 #include "libnr/nr-rotate-ops.h"
+#include <2geom/transforms.h>
 
 #define WHEEL_SIZE 96
 
@@ -1131,17 +1132,17 @@ static void sp_color_wheel_process_in_triangle( SPColorWheel *wheel, gdouble x,
 {
 // njh: dot(rot90(B-C), x) = saturation
 // njh: dot(B-C, x) = value
-    NR::Point delta( x - (((gdouble)(wheel->_triPoints[1].x + wheel->_triPoints[2].x)) / 2.0),
+    Geom::Point delta( x - (((gdouble)(wheel->_triPoints[1].x + wheel->_triPoints[2].x)) / 2.0),
                      y - (((gdouble)(wheel->_triPoints[1].y + wheel->_triPoints[2].y)) / 2.0) );
 
     gdouble rot = (M_PI * 2 * wheel->_hue );
 
-    NR::Point result = delta * NR::rotate(rot);
+    Geom::Point result = delta * Geom::Rotate(rot);
 
-    gdouble sat = CLAMP( result[NR::X] / (wheel->_inner * 1.5), 0.0, 1.0 );
+    gdouble sat = CLAMP( result[Geom::X] / (wheel->_inner * 1.5), 0.0, 1.0 );
 
     gdouble halfHeight = (wheel->_inner * sin(M_PI/3.0)) * (1.0 - sat);
-    gdouble value = CLAMP( ((result[NR::Y]+ halfHeight) / (2.0*halfHeight)), 0.0, 1.0 );
+    gdouble value = CLAMP( ((result[Geom::Y]+ halfHeight) / (2.0*halfHeight)), 0.0, 1.0 );
 
     wheel->_triDirty = TRUE;
 
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 9fa886d08..9ca705189 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -1097,18 +1097,18 @@ sp_node_toolbox_coord_changed(gpointer /*shape_editor*/, GObject *tbl)
         } else {
             gtk_action_set_sensitive(xact, TRUE);
             gtk_action_set_sensitive(yact, TRUE);
-            NR::Coord oldx = sp_units_get_pixels(gtk_adjustment_get_value(xadj), *unit);
-            NR::Coord oldy = sp_units_get_pixels(gtk_adjustment_get_value(xadj), *unit);
+            Geom::Coord oldx = sp_units_get_pixels(gtk_adjustment_get_value(xadj), *unit);
+            Geom::Coord oldy = sp_units_get_pixels(gtk_adjustment_get_value(xadj), *unit);
 
             if (n_selected == 1) {
-                NR::Point sel_node = nodepath->singleSelectedCoords();
-                if (oldx != sel_node[NR::X] || oldy != sel_node[NR::Y]) {
-                    gtk_adjustment_set_value(xadj, sp_pixels_get_units(sel_node[NR::X], *unit));
-                    gtk_adjustment_set_value(yadj, sp_pixels_get_units(sel_node[NR::Y], *unit));
+                Geom::Point sel_node = nodepath->singleSelectedCoords();
+                if (oldx != sel_node[Geom::X] || oldy != sel_node[Geom::Y]) {
+                    gtk_adjustment_set_value(xadj, sp_pixels_get_units(sel_node[Geom::X], *unit));
+                    gtk_adjustment_set_value(yadj, sp_pixels_get_units(sel_node[Geom::Y], *unit));
                 }
             } else {
-                NR::Maybe<NR::Coord> x = sp_node_selected_common_coord(nodepath, NR::X);
-                NR::Maybe<NR::Coord> y = sp_node_selected_common_coord(nodepath, NR::Y);
+                NR::Maybe<Geom::Coord> x = sp_node_selected_common_coord(nodepath, Geom::X);
+                NR::Maybe<Geom::Coord> y = sp_node_selected_common_coord(nodepath, Geom::Y);
                 if ((x && ((*x) != oldx)) || (y && ((*y) != oldy))) {
                     /* Note: Currently x and y will always have a value, even if the coordinates of the
                        selected nodes don't coincide (in this case we use the coordinates of the center
@@ -1153,10 +1153,10 @@ sp_node_path_value_changed(GtkAdjustment *adj, GObject *tbl, gchar const *value_
     if (shape_editor && shape_editor->has_nodepath()) {
         double val = sp_units_get_pixels(gtk_adjustment_get_value(adj), *unit);
         if (!strcmp(value_name, "x")) {
-            sp_node_selected_move_absolute(shape_editor->get_nodepath(), val, NR::X);
+            sp_node_selected_move_absolute(shape_editor->get_nodepath(), val, Geom::X);
         }
         if (!strcmp(value_name, "y")) {
-            sp_node_selected_move_absolute(shape_editor->get_nodepath(), val, NR::Y);
+            sp_node_selected_move_absolute(shape_editor->get_nodepath(), val, Geom::Y);
         }
     }