X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fbox3d-context.cpp;h=14f4470bc1241b9fe240d565846c0fbac8235565;hb=a401603e1e2635fadeec3b7a3a48de442da93472;hp=f66647ef7cd5fea87fef58ee95d5d4adfbde056f;hpb=67f112a66b477fe7fb28c644a4deaf0793533838;p=inkscape.git

diff --git a/src/box3d-context.cpp b/src/box3d-context.cpp
index f66647ef7..14f4470bc 100644
--- a/src/box3d-context.cpp
+++ b/src/box3d-context.cpp
@@ -24,6 +24,7 @@
 #include "document.h"
 #include "sp-namedview.h"
 #include "selection.h"
+#include "selection-chemistry.h"
 #include "desktop-handles.h"
 #include "snap.h"
 #include "display/curve.h"
@@ -37,22 +38,23 @@
 #include "object-edit.h"
 #include "xml/repr.h"
 #include "xml/node-event-vector.h"
-#include "prefs-utils.h"
+#include "preferences.h"
 #include "context-fns.h"
-#include "inkscape.h"
 #include "desktop-style.h"
 #include "transf_mat_3x4.h"
 #include "perspective-line.h"
 #include "persp3d.h"
 #include "box3d-side.h"
-#include "document-private.h" // for debugging (see case GDK_P)
+#include "document-private.h"
 #include "line-geometry.h"
+#include "shape-editor.h"
 
 static void sp_box3d_context_class_init(Box3DContextClass *klass);
 static void sp_box3d_context_init(Box3DContext *box3d_context);
 static void sp_box3d_context_dispose(GObject *object);
 
 static void sp_box3d_context_setup(SPEventContext *ec);
+static void sp_box3d_context_finish(SPEventContext *ec);
 
 static gint sp_box3d_context_root_handler(SPEventContext *event_context, GdkEvent *event);
 static gint sp_box3d_context_item_handler(SPEventContext *event_context, SPItem *item, GdkEvent *event);
@@ -91,6 +93,7 @@ static void sp_box3d_context_class_init(Box3DContextClass *klass)
     object_class->dispose = sp_box3d_context_dispose;
 
     event_context_class->setup = sp_box3d_context_setup;
+    event_context_class->finish = sp_box3d_context_finish;
     event_context_class->root_handler  = sp_box3d_context_root_handler;
     event_context_class->item_handler  = sp_box3d_context_item_handler;
 }
@@ -108,19 +111,32 @@ static void sp_box3d_context_init(Box3DContext *box3d_context)
     event_context->within_tolerance = false;
     event_context->item_to_select = NULL;
 
-    event_context->shape_repr = NULL;
-    event_context->shape_knot_holder = NULL;
-
     box3d_context->item = NULL;
 
     box3d_context->ctrl_dragged = false;
     box3d_context->extruded = false;
-    
+
     box3d_context->_vpdrag = NULL;
 
     new (&box3d_context->sel_changed_connection) sigc::connection();
 }
 
+static void sp_box3d_context_finish(SPEventContext *ec)
+{
+    Box3DContext *bc = SP_BOX3D_CONTEXT(ec);
+    SPDesktop *desktop = ec->desktop;
+
+    sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), GDK_CURRENT_TIME);
+    sp_box3d_finish(bc);
+    bc->sel_changed_connection.disconnect();
+//    sp_repr_remove_listener_by_data(cc->active_shape_repr, cc);
+
+    if (((SPEventContextClass *) parent_class)->finish) {
+        ((SPEventContextClass *) parent_class)->finish(ec);
+    }
+}
+
+
 static void sp_box3d_context_dispose(GObject *object)
 {
     Box3DContext *bc = SP_BOX3D_CONTEXT(object);
@@ -134,22 +150,14 @@ static void sp_box3d_context_dispose(GObject *object)
     bc->sel_changed_connection.disconnect();
     bc->sel_changed_connection.~connection();
 
+    delete ec->shape_editor;
+    ec->shape_editor = NULL;
+
     /* fixme: This is necessary because we do not grab */
     if (bc->item) {
         sp_box3d_finish(bc);
     }
 
-    if (ec->shape_knot_holder) {
-        sp_knot_holder_destroy(ec->shape_knot_holder);
-        ec->shape_knot_holder = NULL;
-    }
-
-    if (ec->shape_repr) { // remove old listener
-        sp_repr_remove_listener_by_data(ec->shape_repr, ec);
-        Inkscape::GC::release(ec->shape_repr);
-        ec->shape_repr = 0;
-    }
-
     if (bc->_message_context) {
         delete bc->_message_context;
     }
@@ -157,14 +165,6 @@ static void sp_box3d_context_dispose(GObject *object)
     G_OBJECT_CLASS(parent_class)->dispose(object);
 }
 
-static Inkscape::XML::NodeEventVector ec_shape_repr_events = {
-    NULL, /* child_added */
-    NULL, /* child_removed */
-    ec_shape_event_attr_changed,
-    NULL, /* content_changed */
-    NULL  /* order_changed */
-};
-
 /**
 \brief  Callback that processes the "changed" signal on the selection;
 destroys old and creates new knotholder
@@ -174,35 +174,32 @@ static void sp_box3d_context_selection_changed(Inkscape::Selection *selection, g
     Box3DContext *bc = SP_BOX3D_CONTEXT(data);
     SPEventContext *ec = SP_EVENT_CONTEXT(bc);
 
-    if (ec->shape_knot_holder) { // destroy knotholder
-        sp_knot_holder_destroy(ec->shape_knot_holder);
-        ec->shape_knot_holder = NULL;
-    }
+    ec->shape_editor->unset_item(SH_KNOTHOLDER);
+    SPItem *item = selection->singleItem();
+    ec->shape_editor->set_item(item, SH_KNOTHOLDER);
 
-    if (ec->shape_repr) { // remove old listener
-        sp_repr_remove_listener_by_data(ec->shape_repr, ec);
-        Inkscape::GC::release(ec->shape_repr);
-        ec->shape_repr = 0;
+    if (selection->perspList().size() == 1) {
+        // selecting a single box changes the current perspective
+        ec->desktop->doc()->setCurrentPersp3D(selection->perspList().front());
     }
+}
 
-    SPDocument *doc = sp_desktop_document(bc->desktop);
-    doc->persps_sel.clear();
-    doc->persps_sel = persp3d_currently_selected_persps(ec);
+/* Create a default perspective in document defs if none is present (which can happen, among other
+ * circumstances, after 'vacuum defs' or when a pre-0.46 file is opened).
+ */
+static void sp_box3d_context_ensure_persp_in_defs(SPDocument *document) {
+    SPDefs *defs = (SPDefs *) SP_DOCUMENT_DEFS(document);
 
-    SPItem *item = selection->singleItem();
-    if (item) {
-        ec->shape_knot_holder = sp_item_knot_holder(item, ec->desktop);
-        Inkscape::XML::Node *shape_repr = SP_OBJECT_REPR(item);
-        if (shape_repr) {
-            ec->shape_repr = shape_repr;
-            Inkscape::GC::anchor(shape_repr);
-            sp_repr_add_listener(shape_repr, &ec_shape_repr_events, ec);
+    bool has_persp = false;
+    for (SPObject *child = sp_object_first_child(defs); child != NULL; child = SP_OBJECT_NEXT(child) ) {
+        if (SP_IS_PERSP3D(child)) {
+            has_persp = true;
+            break;
         }
     }
 
-    if (doc->persps_sel.size() == 1) {
-        // selecting a single box changes the current perspective
-        doc->current_persp3d = *(doc->persps_sel.begin());
+    if (!has_persp) {
+        document->setCurrentPersp3D(persp3d_create_xml_element (document));
     }
 }
 
@@ -214,15 +211,11 @@ static void sp_box3d_context_setup(SPEventContext *ec)
         ((SPEventContextClass *) parent_class)->setup(ec);
     }
 
+    ec->shape_editor = new ShapeEditor(ec->desktop);
+
     SPItem *item = sp_desktop_selection(ec->desktop)->singleItem();
     if (item) {
-        ec->shape_knot_holder = sp_item_knot_holder(item, ec->desktop);
-        Inkscape::XML::Node *shape_repr = SP_OBJECT_REPR(item);
-        if (shape_repr) {
-            ec->shape_repr = shape_repr;
-            Inkscape::GC::anchor(shape_repr);
-            sp_repr_add_listener(shape_repr, &ec_shape_repr_events, ec);
-        }
+        ec->shape_editor->set_item(item, SH_KNOTHOLDER);
     }
 
     bc->sel_changed_connection.disconnect();
@@ -231,12 +224,13 @@ static void sp_box3d_context_setup(SPEventContext *ec)
     );
 
     bc->_vpdrag = new Box3D::VPDrag(sp_desktop_document (ec->desktop));
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
 
-    if (prefs_get_int_attribute("tools.shapes", "selcue", 0) != 0) {
+    if (prefs->getBool("/tools/shapes/selcue")) {
         ec->enableSelectionCue();
     }
 
-    if (prefs_get_int_attribute("tools.shapes", "gradientdrag", 0) != 0) {
+    if (prefs->getBool("/tools/shapes/gradientdrag")) {
         ec->enableGrDrag();
     }
 
@@ -273,54 +267,61 @@ static gint sp_box3d_context_root_handler(SPEventContext *event_context, GdkEven
     static bool dragging;
 
     SPDesktop *desktop = event_context->desktop;
+    SPDocument *document = sp_desktop_document (desktop);
     Inkscape::Selection *selection = sp_desktop_selection (desktop);
-    int const snaps = prefs_get_int_attribute("options.rotationsnapsperpi", "value", 12);
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+    int const snaps = prefs->getInt("/options/rotationsnapsperpi/value", 12);
 
     Box3DContext *bc = SP_BOX3D_CONTEXT(event_context);
-    g_assert (SP_ACTIVE_DOCUMENT->current_persp3d);
-    Persp3D *cur_persp = SP_ACTIVE_DOCUMENT->current_persp3d;
+    Persp3D *cur_persp = document->getCurrentPersp3D();
 
-    event_context->tolerance = prefs_get_int_attribute_limited("options.dragtolerance", "value", 0, 0, 100);
+    event_context->tolerance = prefs->getIntLimited("/options/dragtolerance/value", 0, 0, 100);
 
     gint ret = FALSE;
     switch (event->type) {
     case GDK_BUTTON_PRESS:
         if ( event->button.button == 1  && !event_context->space_panning) {
-            NR::Point const button_w(event->button.x,
-                                     event->button.y);
+            Geom::Point const button_w(event->button.x,
+                                       event->button.y);
+            Geom::Point button_dt(desktop->w2d(button_w));
 
             // save drag origin
-            event_context->xp = (gint) button_w[NR::X];
-            event_context->yp = (gint) button_w[NR::Y];
+            event_context->xp = (gint) button_w[Geom::X];
+            event_context->yp = (gint) button_w[Geom::Y];
             event_context->within_tolerance = true;
-            
+
             // remember clicked item, *not* disregarding groups (since a 3D box is a group), honoring Alt
             event_context->item_to_select = sp_event_context_find_item (desktop, button_w, event->button.state & GDK_MOD1_MASK, event->button.state & GDK_CONTROL_MASK);
 
             dragging = true;
-            
-            /*  */
-            NR::Point const button_dt(desktop->w2d(button_w));
-            bc->drag_origin = button_dt;
-            bc->drag_ptB = button_dt;
-            bc->drag_ptC = button_dt;
+
+            SnapManager &m = desktop->namedview->snap_manager;
+            m.setup(desktop, true, bc->item);
+            m.freeSnapReturnByRef(button_dt, Inkscape::SNAPSOURCE_NODE_HANDLE);
+            m.unSetup();
+            bc->center = from_2geom(button_dt);
+
+            bc->drag_origin = from_2geom(button_dt);
+            bc->drag_ptB = from_2geom(button_dt);
+            bc->drag_ptC = from_2geom(button_dt);
+
+            // This can happen after saving when the last remaining perspective was purged and must be recreated.
+            if (!cur_persp) {
+                sp_box3d_context_ensure_persp_in_defs(document);
+                cur_persp = document->getCurrentPersp3D();
+            }
 
             /* Projective preimages of clicked point under current perspective */
-            bc->drag_origin_proj = cur_persp->tmat.preimage (button_dt, 0, Proj::Z);
+            bc->drag_origin_proj = cur_persp->perspective_impl->tmat.preimage (from_2geom(button_dt), 0, Proj::Z);
             bc->drag_ptB_proj = bc->drag_origin_proj;
             bc->drag_ptC_proj = bc->drag_origin_proj;
             bc->drag_ptC_proj.normalize();
             bc->drag_ptC_proj[Proj::Z] = 0.25;
 
-            /* Snap center */
-            SnapManager const &m = desktop->namedview->snap_manager;
-            bc->center = m.freeSnap(Inkscape::Snapper::SNAPPOINT_NODE,
-                                    button_dt, bc->item).getPoint();
-
             sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate),
                                 ( GDK_KEY_PRESS_MASK |
                                   GDK_BUTTON_RELEASE_MASK       |
-                                  GDK_POINTER_MOTION_MASK       |
+                                  GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK       |
                                   GDK_BUTTON_PRESS_MASK ),
                                 NULL, event->button.time);
             ret = TRUE;
@@ -340,13 +341,13 @@ static gint sp_box3d_context_root_handler(SPEventContext *event_context, GdkEven
             // motion notify coordinates as given (no snapping back to origin)
             event_context->within_tolerance = false;
 
-            NR::Point const motion_w(event->motion.x,
-                                     event->motion.y);
-            NR::Point motion_dt(desktop->w2d(motion_w));
-
-            SnapManager const &m = desktop->namedview->snap_manager;
-            motion_dt = m.freeSnap(Inkscape::Snapper::SNAPPOINT_NODE, motion_dt, bc->item).getPoint();
+            Geom::Point const motion_w(event->motion.x,
+                                       event->motion.y);
+            Geom::Point motion_dt(desktop->w2d(motion_w));
 
+            SnapManager &m = desktop->namedview->snap_manager;
+            m.setup(desktop, true, bc->item);
+            m.freeSnapReturnByRef(motion_dt, Inkscape::SNAPSOURCE_NODE_HANDLE);
             bc->ctrl_dragged  = event->motion.state & GDK_CONTROL_MASK;
 
             if (event->motion.state & GDK_SHIFT_MASK && !bc->extruded && bc->item) {
@@ -355,10 +356,10 @@ static gint sp_box3d_context_root_handler(SPEventContext *event_context, GdkEven
             }
 
             if (!bc->extruded) {
-            	bc->drag_ptB = motion_dt;
-            	bc->drag_ptC = motion_dt;
+                bc->drag_ptB = from_2geom(motion_dt);
+                bc->drag_ptC = from_2geom(motion_dt);
 
-                bc->drag_ptB_proj = cur_persp->tmat.preimage (motion_dt, 0, Proj::Z);
+                bc->drag_ptB_proj = cur_persp->perspective_impl->tmat.preimage (from_2geom(motion_dt), 0, Proj::Z);
                 bc->drag_ptC_proj = bc->drag_ptB_proj;
                 bc->drag_ptC_proj.normalize();
                 bc->drag_ptC_proj[Proj::Z] = 0.25;
@@ -367,42 +368,39 @@ static gint sp_box3d_context_root_handler(SPEventContext *event_context, GdkEven
                 // perspective line from drag_ptB to vanishing point Y.
                 if (!bc->ctrl_dragged) {
                     /* snapping */
-                    Box3D::PerspectiveLine pline (bc->drag_ptB, Proj::Z, SP_ACTIVE_DOCUMENT->current_persp3d);
-                    bc->drag_ptC = pline.closest_to (motion_dt);
+                    Box3D::PerspectiveLine pline (bc->drag_ptB, Proj::Z, document->getCurrentPersp3D());
+                    bc->drag_ptC = pline.closest_to (from_2geom(motion_dt));
 
                     bc->drag_ptB_proj.normalize();
-                    bc->drag_ptC_proj = cur_persp->tmat.preimage (bc->drag_ptC, bc->drag_ptB_proj[Proj::X], Proj::X);
+                    bc->drag_ptC_proj = cur_persp->perspective_impl->tmat.preimage (bc->drag_ptC, bc->drag_ptB_proj[Proj::X], Proj::X);
                 } else {
-                    bc->drag_ptC = motion_dt;
+                    bc->drag_ptC = from_2geom(motion_dt);
 
                     bc->drag_ptB_proj.normalize();
-                    bc->drag_ptC_proj = cur_persp->tmat.preimage (motion_dt, bc->drag_ptB_proj[Proj::X], Proj::X);
-                }
-                bc->drag_ptC = m.freeSnap(Inkscape::Snapper::SNAPPOINT_NODE, bc->drag_ptC, bc->item).getPoint();
-                if (bc->ctrl_dragged) {
-                    g_print ("TODO: What should happen here?\n");
-                    // Update bc->drag_ptB in case we are ctrl-dragging
-                    /***
-                    Box3D::PerspectiveLine pl1 (NR::Point (event_context->xp, event_context->yp), Box3D::Y, bc->_vpdrag->document->current_perspective);
-                    Box3D::PerspectiveLine pl2 (bc->drag_ptB, Box3D::X, bc->_vpdrag->document->current_perspective);
-                    NR::Point corner1 = pl1.meet(pl2);
-                	
-                    Box3D::PerspectiveLine pl3 (corner1, Box3D::X, bc->_vpdrag->document->current_perspective);
-                    Box3D::PerspectiveLine pl4 (bc->drag_ptC, Box3D::Z, bc->_vpdrag->document->current_perspective);
-                    bc->drag_ptB = pl3.meet(pl4);
-                    ***/
+                    bc->drag_ptC_proj = cur_persp->perspective_impl->tmat.preimage (from_2geom(motion_dt), bc->drag_ptB_proj[Proj::X], Proj::X);
                 }
+                m.freeSnapReturnByRef(bc->drag_ptC, Inkscape::SNAPSOURCE_NODE_HANDLE);
             }
+            m.unSetup();
 
             sp_box3d_drag(*bc, event->motion.state);
 
             ret = TRUE;
+        } else if (!sp_event_context_knot_mouseover(bc)) {
+            SnapManager &m = desktop->namedview->snap_manager;
+            m.setup(desktop);
+
+            Geom::Point const motion_w(event->motion.x, event->motion.y);
+            Geom::Point motion_dt(desktop->w2d(motion_w));
+            m.preSnap(Inkscape::SnapCandidatePoint(motion_dt, Inkscape::SNAPSOURCE_NODE_HANDLE));
+            m.unSetup();
         }
         break;
     case GDK_BUTTON_RELEASE:
         event_context->xp = event_context->yp = 0;
         if ( event->button.button == 1  && !event_context->space_panning) {
             dragging = false;
+            sp_event_context_discard_delayed_snap_event(event_context);
 
             if (!event_context->within_tolerance) {
                 // we've been dragging, finish the box
@@ -427,23 +425,6 @@ static gint sp_box3d_context_root_handler(SPEventContext *event_context, GdkEven
         break;
     case GDK_KEY_PRESS:
         switch (get_group0_keyval (&event->key)) {
-        case GDK_Alt_L:
-        case GDK_Alt_R:
-        case GDK_Control_L:
-        case GDK_Control_R:
-        case GDK_Shift_L:
-        case GDK_Shift_R:
-        case GDK_Meta_L:  // Meta is when you press Shift+Alt (at least on my machine)
-        case GDK_Meta_R:
-            /***
-            if (!dragging){
-                sp_event_show_modifier_tip (event_context->defaultMessageContext(), event,
-                                            _("<b>Ctrl</b>: make square or integer-ratio rect, lock a rounded corner circular"),
-                                            _("<b>Shift</b>: draw around the starting point"),
-                                            NULL);
-            }
-            ***/
-            break;
         case GDK_Up:
         case GDK_Down:
         case GDK_KP_Up:
@@ -454,112 +435,105 @@ static gint sp_box3d_context_root_handler(SPEventContext *event_context, GdkEven
             break;
 
         case GDK_bracketright:
-            persp3d_rotate_VP (inkscape_active_document()->current_persp3d, Proj::X, -180/snaps, MOD__ALT);
+            persp3d_rotate_VP (document->getCurrentPersp3D(), Proj::X, -180/snaps, MOD__ALT);
+            sp_document_done(document, SP_VERB_CONTEXT_3DBOX,
+                             _("Change perspective (angle of PLs)"));
             ret = true;
             break;
 
         case GDK_bracketleft:
-            persp3d_rotate_VP (inkscape_active_document()->current_persp3d, Proj::X, 180/snaps, MOD__ALT);
+            persp3d_rotate_VP (document->getCurrentPersp3D(), Proj::X, 180/snaps, MOD__ALT);
+            sp_document_done(document, SP_VERB_CONTEXT_3DBOX,
+                             _("Change perspective (angle of PLs)"));
             ret = true;
             break;
 
         case GDK_parenright:
-            persp3d_rotate_VP (inkscape_active_document()->current_persp3d, Proj::Y, -180/snaps, MOD__ALT);
+            persp3d_rotate_VP (document->getCurrentPersp3D(), Proj::Y, -180/snaps, MOD__ALT);
+            sp_document_done(document, SP_VERB_CONTEXT_3DBOX,
+                             _("Change perspective (angle of PLs)"));
             ret = true;
             break;
 
         case GDK_parenleft:
-            persp3d_rotate_VP (inkscape_active_document()->current_persp3d, Proj::Y, 180/snaps, MOD__ALT);
+            persp3d_rotate_VP (document->getCurrentPersp3D(), Proj::Y, 180/snaps, MOD__ALT);
+            sp_document_done(document, SP_VERB_CONTEXT_3DBOX,
+                             _("Change perspective (angle of PLs)"));
             ret = true;
             break;
 
         case GDK_braceright:
-            persp3d_rotate_VP (inkscape_active_document()->current_persp3d, Proj::Z, -180/snaps, MOD__ALT);
+            persp3d_rotate_VP (document->getCurrentPersp3D(), Proj::Z, -180/snaps, MOD__ALT);
+            sp_document_done(document, SP_VERB_CONTEXT_3DBOX,
+                             _("Change perspective (angle of PLs)"));
             ret = true;
             break;
 
         case GDK_braceleft:
-            persp3d_rotate_VP (inkscape_active_document()->current_persp3d, Proj::Z, 180/snaps, MOD__ALT);
+            persp3d_rotate_VP (document->getCurrentPersp3D(), Proj::Z, 180/snaps, MOD__ALT);
+            sp_document_done(document, SP_VERB_CONTEXT_3DBOX,
+                             _("Change perspective (angle of PLs)"));
             ret = true;
             break;
 
+        /* TODO: what is this???
         case GDK_O:
-            Box3D::create_canvas_point(persp3d_get_VP(inkscape_active_document()->current_persp3d, Proj::W).affine(),
-                                       6, 0xff00ff00);
+            if (MOD__CTRL && MOD__SHIFT) {
+                Box3D::create_canvas_point(persp3d_get_VP(document()->getCurrentPersp3D(), Proj::W).affine(),
+                                           6, 0xff00ff00);
+            }
             ret = true;
             break;
+        */
 
-        case GDK_I:
-            if (MOD__ALT) {
-                persp3d_print_debugging_info_all (inkscape_active_document());
-            } else {
-                persp3d_print_debugging_info (inkscape_active_document()->current_persp3d);
+        case GDK_g:
+        case GDK_G:
+            if (MOD__SHIFT_ONLY) {
+                sp_selection_to_guides(desktop);
+                ret = true;
             }
-            ret = true;
             break;
 
+        case GDK_p:
         case GDK_P:
-        {
-            if (MOD__SHIFT && MOD__CTRL) break; // Don't catch Shift+Ctrl+P (Preferences dialog)
-            SPDefs *defs = (SPDefs *) SP_DOCUMENT_DEFS(SP_ACTIVE_DOCUMENT);
-            g_print ("=== Persp3D Objects: ==============================\n");
-            for (SPObject *i = sp_object_first_child(SP_OBJECT(defs)); i != NULL; i = SP_OBJECT_NEXT(i) ) {
-                g_print ("Object encountered\n");
-                if (SP_IS_PERSP3D(i)) {
-                    //g_print ("Encountered a Persp3D in defs\n");
-                    SP_PERSP3D(i)->tmat.print();
-                    g_print ("\n");
-                    g_print ("Computing preimage of point (300, 400)\n");
-                    SP_PERSP3D(i)->tmat.preimage (NR::Point (300, 400), 0, Proj::Z);
-                    g_print ("Computing preimage of point (200, 500)\n");
-                    SP_PERSP3D(i)->tmat.preimage (NR::Point (200, 500), 0, Proj::Z);
+            if (MOD__SHIFT_ONLY) {
+                if (document->getCurrentPersp3D()) {
+                    persp3d_print_debugging_info (document->getCurrentPersp3D());
                 }
-            }
-            g_print ("===================================================\n");
-
-            ret = true;
-            break;
-        }
-
-        case GDK_V:
-            if (bc->_vpdrag) {
-                bc->_vpdrag->printDraggers();
                 ret = true;
-            } else {
-                g_print ("No VPDrag in Box3DContext.\n");
             }
             break;
 
         case GDK_x:
+        case GDK_X:
             if (MOD__ALT_ONLY) {
                 desktop->setToolboxFocusTo ("altx-box3d");
                 ret = TRUE;
             }
-            break;
-        case GDK_X:
-            if (MOD__CTRL) break; // Don't catch Ctrl+X ('cut') and Ctrl+Shift+X ('open XML editor')
-            persp3d_toggle_VPs(persp3d_currently_selected_persps(event_context), Proj::X);
-            bc->_vpdrag->updateLines(); // FIXME: Shouldn't this be done automatically?
-            ret = true;
+            if (MOD__SHIFT_ONLY) {
+                persp3d_toggle_VPs(selection->perspList(), Proj::X);
+                bc->_vpdrag->updateLines(); // FIXME: Shouldn't this be done automatically?
+                ret = true;
+            }
             break;
 
+        case GDK_y:
         case GDK_Y:
-        {
-            if (MOD__CTRL) break; // Don't catch Ctrl+Y ("redo")
-            persp3d_toggle_VPs(persp3d_currently_selected_persps(event_context), Proj::Y);
-            bc->_vpdrag->updateLines(); // FIXME: Shouldn't this be done automatically?
-            ret = true;
+            if (MOD__SHIFT_ONLY) {
+                persp3d_toggle_VPs(selection->perspList(), Proj::Y);
+                bc->_vpdrag->updateLines(); // FIXME: Shouldn't this be done automatically?
+                ret = true;
+            }
             break;
-        }
 
+        case GDK_z:
         case GDK_Z:
-        {
-            if (MOD__CTRL) break; // Don't catch Ctrl+Z ("undo")
-            persp3d_toggle_VPs(persp3d_currently_selected_persps(event_context), Proj::Z);
-            bc->_vpdrag->updateLines(); // FIXME: Shouldn't this be done automatically?
-            ret = true;
+            if (MOD__SHIFT_ONLY) {
+                persp3d_toggle_VPs(selection->perspList(), Proj::Z);
+                bc->_vpdrag->updateLines(); // FIXME: Shouldn't this be done automatically?
+                ret = true;
+            }
             break;
-        }
 
         case GDK_Escape:
             sp_desktop_selection(desktop)->clear();
@@ -571,6 +545,7 @@ static gint sp_box3d_context_root_handler(SPEventContext *event_context, GdkEven
                 sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate),
                                       event->button.time);
                 dragging = false;
+                sp_event_context_discard_delayed_snap_event(event_context);
                 if (!event_context->within_tolerance) {
                     // we've been dragging, finish the box
                     sp_box3d_finish(bc);
@@ -583,22 +558,6 @@ static gint sp_box3d_context_root_handler(SPEventContext *event_context, GdkEven
             break;
         }
         break;
-    case GDK_KEY_RELEASE:
-        switch (get_group0_keyval (&event->key)) {
-        case GDK_Alt_L:
-        case GDK_Alt_R:
-        case GDK_Control_L:
-        case GDK_Control_R:
-        case GDK_Shift_L:
-        case GDK_Shift_R:
-        case GDK_Meta_L:  // Meta is when you press Shift+Alt
-        case GDK_Meta_R:
-            event_context->defaultMessageContext()->clear();
-            break;
-        default:
-            break;
-        }
-        break;
     default:
         break;
     }
@@ -628,12 +587,12 @@ static void sp_box3d_drag(Box3DContext &bc, guint /*state*/)
         repr->setAttribute("sodipodi:type", "inkscape:box3d");
 
         /* Set style */
-        sp_desktop_apply_style_tool (desktop, repr, "tools.shapes.3dbox", false);
+        sp_desktop_apply_style_tool (desktop, repr, "/tools/shapes/3dbox", false);
 
         bc.item = (SPItem *) desktop->currentLayer()->appendChildRepr(repr);
         Inkscape::GC::release(repr);
-        /**** bc.item->transform = SP_ITEM(desktop->currentRoot())->getRelativeTransform(desktop->currentLayer()); ****/
         Inkscape::XML::Node *repr_side;
+        // TODO: Incorporate this in box3d-side.cpp!
         for (int i = 0; i < 6; ++i) {
             repr_side = xml_doc->createElement("svg:path");
             repr_side->setAttribute("sodipodi:type", "inkscape:box3dside");
@@ -649,6 +608,9 @@ static void sp_box3d_drag(Box3DContext &bc, guint /*state*/)
             side->dir2 = Box3D::extract_second_axis_direction(plane);
             side->front_or_rear = (Box3D::FrontOrRear) (desc & 0x8);
 
+            /* Set style */
+            box3d_side_apply_style(side);
+
             SP_OBJECT(side)->updateRepr(); // calls box3d_side_write() and updates, e.g., the axes string description
         }
 
@@ -657,7 +619,7 @@ static void sp_box3d_drag(Box3DContext &bc, guint /*state*/)
 
         // TODO: It would be nice to show the VPs during dragging, but since there is no selection
         //       at this point (only after finishing the box), we must do this "manually"
-        /**** bc._vpdrag->updateDraggers(); ****/
+        /* bc._vpdrag->updateDraggers(); */
 
         sp_canvas_force_full_redraw_after_interruptions(desktop->canvas, 5);
     }
@@ -669,28 +631,29 @@ static void sp_box3d_drag(Box3DContext &bc, guint /*state*/)
     box->orig_corner0 = bc.drag_origin_proj;
     box->orig_corner7 = bc.drag_ptC_proj;
 
+    box3d_check_for_swapped_coords(box);
+
     /* we need to call this from here (instead of from box3d_position_set(), for example)
        because z-order setting must not interfere with display updates during undo/redo */
     box3d_set_z_orders (box);
 
-    box3d_position_set(SP_BOX3D(bc.item));
+    box3d_position_set(box);
 
     // status text
-    //GString *Ax = SP_PX_TO_METRIC_STRING(origin[NR::X], desktop->namedview->getDefaultMetric());
-    //GString *Ay = SP_PX_TO_METRIC_STRING(origin[NR::Y], desktop->namedview->getDefaultMetric());
     bc._message_context->setF(Inkscape::NORMAL_MESSAGE, _("<b>3D Box</b>; with <b>Shift</b> to extrude along the Z axis"));
-    //g_string_free(Ax, FALSE);
-    //g_string_free(Ay, FALSE);
 }
 
 static void sp_box3d_finish(Box3DContext *bc)
 {
     bc->_message_context->clear();
-    g_assert (SP_ACTIVE_DOCUMENT->current_persp3d);
-    //Persp3D *cur_persp = SP_ACTIVE_DOCUMENT->current_persp3d;
+    bc->ctrl_dragged = false;
+    bc->extruded = false;
 
     if ( bc->item != NULL ) {
         SPDesktop * desktop = SP_EVENT_CONTEXT_DESKTOP(bc);
+        SPDocument *doc = sp_desktop_document(desktop);
+        if (!doc || !doc->getCurrentPersp3D())
+            return;
 
         SPBox3D *box = SP_BOX3D(bc->item);
 
@@ -709,9 +672,14 @@ static void sp_box3d_finish(Box3DContext *bc)
 
         bc->item = NULL;
     }
+}
 
-    bc->ctrl_dragged = false;
-    bc->extruded = false;
+void sp_box3d_context_update_lines(SPEventContext *ec) {
+    /*  update perspective lines if we are in the 3D box tool (so that infinite ones are shown correctly) */
+    if (SP_IS_BOX3D_CONTEXT (ec)) {
+        Box3DContext *bc = SP_BOX3D_CONTEXT (ec);
+        bc->_vpdrag->updateLines();
+    }
 }
 
 /*
@@ -723,4 +691,4 @@ static void sp_box3d_finish(Box3DContext *bc)
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :