Update to trunk

(bzr r11950.1.195)

1 files changed, 637 insertions, 0 deletions

diff --git a/src/ui/tools/box3d-tool.cpp b/src/ui/tools/box3d-tool.cpp
new file mode 100644
index 000000000..80cc75e79
--- /dev/null
+++ b/src/ui/tools/box3d-tool.cpp
@@ -0,0 +1,637 @@
+/*
+ * 3D box drawing context
+ *
+ * Author:
+ *   Lauris Kaplinski <lauris@kaplinski.com>
+ *   bulia byak <buliabyak@users.sf.net>
+ *   Jon A. Cruz <jon@joncruz.org>
+ *   Abhishek Sharma
+ *
+ * Copyright (C) 2007      Maximilian Albert <Anhalter42@gmx.de>
+ * Copyright (C) 2006      Johan Engelen <johan@shouraizou.nl>
+ * Copyright (C) 2000-2005 authors
+ * Copyright (C) 2000-2001 Ximian, Inc.
+ *
+ * Released under GNU GPL, read the file 'COPYING' for more information
+ */
+
+#include "config.h"
+
+#include <gdk/gdkkeysyms.h>
+
+#include "macros.h"
+#include "display/sp-canvas.h"
+#include "document.h"
+#include "document-undo.h"
+#include "sp-namedview.h"
+#include "selection.h"
+#include "selection-chemistry.h"
+#include "desktop-handles.h"
+#include "snap.h"
+#include "display/curve.h"
+#include "display/sp-canvas-item.h"
+#include "desktop.h"
+#include "message-context.h"
+#include "pixmaps/cursor-3dbox.xpm"
+#include "box3d.h"
+#include "ui/tools/box3d-tool.h"
+#include <glibmm/i18n.h>
+#include "xml/repr.h"
+#include "xml/node-event-vector.h"
+#include "preferences.h"
+#include "context-fns.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"
+#include "line-geometry.h"
+#include "shape-editor.h"
+#include "verbs.h"
+
+using Inkscape::DocumentUndo;
+
+#include "tool-factory.h"
+
+namespace Inkscape {
+namespace UI {
+namespace Tools {
+
+namespace {
+	ToolBase* createBox3dTool() {
+		return new Box3dTool();
+	}
+
+	bool Box3dToolRegistered = ToolFactory::instance().registerObject("/tools/shapes/3dbox", createBox3dTool);
+}
+
+const std::string& Box3dTool::getPrefsPath() {
+	return Box3dTool::prefsPath;
+}
+
+const std::string Box3dTool::prefsPath = "/tools/shapes/3dbox";
+
+Box3dTool::Box3dTool() : ToolBase() {
+    this->cursor_shape = cursor_3dbox_xpm;
+    this->hot_x = 4;
+    this->hot_y = 4;
+    this->xp = 0;
+    this->yp = 0;
+    this->tolerance = 0;
+    this->within_tolerance = false;
+    this->item_to_select = NULL;
+
+    this->box3d = NULL;
+
+    this->ctrl_dragged = false;
+    this->extruded = false;
+
+    this->_vpdrag = NULL;
+}
+
+void Box3dTool::finish() {
+    sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), GDK_CURRENT_TIME);
+    this->finishItem();
+    this->sel_changed_connection.disconnect();
+
+    ToolBase::finish();
+}
+
+
+Box3dTool::~Box3dTool() {
+    this->enableGrDrag(false);
+
+    delete (this->_vpdrag);
+    this->_vpdrag = NULL;
+
+    this->sel_changed_connection.disconnect();
+
+    delete this->shape_editor;
+    this->shape_editor = NULL;
+
+    /* fixme: This is necessary because we do not grab */
+    if (this->box3d) {
+        this->finishItem();
+    }
+}
+
+/**
+ * Callback that processes the "changed" signal on the selection;
+ * destroys old and creates new knotholder.
+ */
+void Box3dTool::selection_changed(Inkscape::Selection* selection) {
+    this->shape_editor->unset_item(SH_KNOTHOLDER);
+    this->shape_editor->set_item(selection->singleItem(), SH_KNOTHOLDER);
+
+    if (selection->perspList().size() == 1) {
+        // selecting a single box changes the current perspective
+        this->desktop->doc()->setCurrentPersp3D(selection->perspList().front());
+    }
+}
+
+/* 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 = document->getDefs();
+
+    bool has_persp = false;
+    for ( SPObject *child = defs->firstChild(); child; child = child->getNext() ) {
+        if (SP_IS_PERSP3D(child)) {
+            has_persp = true;
+            break;
+        }
+    }
+
+    if (!has_persp) {
+        document->setCurrentPersp3D(persp3d_create_xml_element (document));
+    }
+}
+
+void Box3dTool::setup() {
+    ToolBase::setup();
+
+    this->shape_editor = new ShapeEditor(this->desktop);
+
+    SPItem *item = sp_desktop_selection(this->desktop)->singleItem();
+    if (item) {
+        this->shape_editor->set_item(item, SH_KNOTHOLDER);
+    }
+
+    this->sel_changed_connection.disconnect();
+    this->sel_changed_connection = sp_desktop_selection(this->desktop)->connectChanged(
+    	sigc::mem_fun(this, &Box3dTool::selection_changed)
+    );
+
+    this->_vpdrag = new Box3D::VPDrag(sp_desktop_document(this->desktop));
+
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+
+    if (prefs->getBool("/tools/shapes/selcue")) {
+        this->enableSelectionCue();
+    }
+
+    if (prefs->getBool("/tools/shapes/gradientdrag")) {
+        this->enableGrDrag();
+    }
+}
+
+bool Box3dTool::item_handler(SPItem* item, GdkEvent* event) {
+    gint ret = FALSE;
+
+    switch (event->type) {
+    case GDK_BUTTON_PRESS:
+        if ( event->button.button == 1 && !this->space_panning) {
+            Inkscape::setup_for_drag_start(desktop, this, event);
+            ret = TRUE;
+        }
+        break;
+        // motion and release are always on root (why?)
+    default:
+        break;
+    }
+
+//    if (((ToolBaseClass *) sp_box3d_context_parent_class)->item_handler) {
+//        ret = ((ToolBaseClass *) sp_box3d_context_parent_class)->item_handler(event_context, item, event);
+//    }
+    // CPPIFY: ret is always overwritten...
+    ret = ToolBase::item_handler(item, event);
+
+    return ret;
+}
+
+bool Box3dTool::root_handler(GdkEvent* event) {
+    static bool dragging;
+
+    SPDocument *document = sp_desktop_document (desktop);
+    Inkscape::Selection *selection = sp_desktop_selection (desktop);
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+    int const snaps = prefs->getInt("/options/rotationsnapsperpi/value", 12);
+
+    Persp3D *cur_persp = document->getCurrentPersp3D();
+
+    this->tolerance = prefs->getIntLimited("/options/dragtolerance/value", 0, 0, 100);
+
+    gint ret = FALSE;
+    switch (event->type) {
+    case GDK_BUTTON_PRESS:
+        if ( event->button.button == 1  && !this->space_panning) {
+            Geom::Point const button_w(event->button.x, event->button.y);
+            Geom::Point button_dt(desktop->w2d(button_w));
+
+            // save drag origin
+            this->xp = (gint) button_w[Geom::X];
+            this->yp = (gint) button_w[Geom::Y];
+            this->within_tolerance = true;
+
+            // remember clicked box3d, *not* disregarding groups (since a 3D box is a group), honoring Alt
+            this->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;
+
+            SnapManager &m = desktop->namedview->snap_manager;
+            m.setup(desktop, true, this->box3d);
+            m.freeSnapReturnByRef(button_dt, Inkscape::SNAPSOURCE_NODE_HANDLE);
+            m.unSetup();
+            this->center = button_dt;
+
+            this->drag_origin = button_dt;
+            this->drag_ptB = button_dt;
+            this->drag_ptC = 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 */
+            this->drag_origin_proj = cur_persp->perspective_impl->tmat.preimage (button_dt, 0, Proj::Z);
+            this->drag_ptB_proj = this->drag_origin_proj;
+            this->drag_ptC_proj = this->drag_origin_proj;
+            this->drag_ptC_proj.normalize();
+            this->drag_ptC_proj[Proj::Z] = 0.25;
+
+            sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate),
+                                ( GDK_KEY_PRESS_MASK |
+                                  GDK_BUTTON_RELEASE_MASK       |
+                                  GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK       |
+                                  GDK_BUTTON_PRESS_MASK ),
+                                NULL, event->button.time);
+            ret = TRUE;
+        }
+        break;
+
+    case GDK_MOTION_NOTIFY:
+        if (dragging && ( event->motion.state & GDK_BUTTON1_MASK )  && !this->space_panning) {
+            if ( this->within_tolerance
+                 && ( abs( (gint) event->motion.x - this->xp ) < this->tolerance )
+                 && ( abs( (gint) event->motion.y - this->yp ) < this->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 draw, not click), then always process the
+            // motion notify coordinates as given (no snapping back to origin)
+            this->within_tolerance = false;
+
+            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, this->box3d);
+            m.freeSnapReturnByRef(motion_dt, Inkscape::SNAPSOURCE_NODE_HANDLE);
+            this->ctrl_dragged  = event->motion.state & GDK_CONTROL_MASK;
+
+            if ((event->motion.state & GDK_SHIFT_MASK) && !this->extruded && this->box3d) {
+                // once shift is pressed, set this->extruded
+                this->extruded = true;
+            }
+
+            if (!this->extruded) {
+                this->drag_ptB = motion_dt;
+                this->drag_ptC = motion_dt;
+
+                this->drag_ptB_proj = cur_persp->perspective_impl->tmat.preimage (motion_dt, 0, Proj::Z);
+                this->drag_ptC_proj = this->drag_ptB_proj;
+                this->drag_ptC_proj.normalize();
+                this->drag_ptC_proj[Proj::Z] = 0.25;
+            } else {
+                // Without Ctrl, motion of the extruded corner is constrained to the
+                // perspective line from drag_ptB to vanishing point Y.
+                if (!this->ctrl_dragged) {
+                    /* snapping */
+                    Box3D::PerspectiveLine pline (this->drag_ptB, Proj::Z, document->getCurrentPersp3D());
+                    this->drag_ptC = pline.closest_to (motion_dt);
+
+                    this->drag_ptB_proj.normalize();
+                    this->drag_ptC_proj = cur_persp->perspective_impl->tmat.preimage (this->drag_ptC, this->drag_ptB_proj[Proj::X], Proj::X);
+                } else {
+                    this->drag_ptC = motion_dt;
+
+                    this->drag_ptB_proj.normalize();
+                    this->drag_ptC_proj = cur_persp->perspective_impl->tmat.preimage (motion_dt, this->drag_ptB_proj[Proj::X], Proj::X);
+                }
+
+                m.freeSnapReturnByRef(this->drag_ptC, Inkscape::SNAPSOURCE_NODE_HANDLE);
+            }
+
+            m.unSetup();
+
+            this->drag(event->motion.state);
+
+            ret = TRUE;
+        } else if (!sp_event_context_knot_mouseover(this)) {
+            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:
+        this->xp = this->yp = 0;
+
+        if (event->button.button == 1 && !this->space_panning) {
+            dragging = false;
+            sp_event_context_discard_delayed_snap_event(this);
+
+            if (!this->within_tolerance) {
+                // we've been dragging, finish the box
+                this->finishItem();
+            } else if (this->item_to_select) {
+                // no dragging, select clicked box3d if any
+                if (event->button.state & GDK_SHIFT_MASK) {
+                    selection->toggle(this->item_to_select);
+                } else {
+                    selection->set(this->item_to_select);
+                }
+            } else {
+                // click in an empty space
+                selection->clear();
+            }
+
+            this->item_to_select = NULL;
+            ret = TRUE;
+            sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate),
+                                  event->button.time);
+        }
+        break;
+
+    case GDK_KEY_PRESS:
+        switch (get_group0_keyval (&event->key)) {
+        case GDK_KEY_Up:
+        case GDK_KEY_Down:
+        case GDK_KEY_KP_Up:
+        case GDK_KEY_KP_Down:
+            // prevent the zoom field from activation
+            if (!MOD__CTRL_ONLY(event))
+                ret = TRUE;
+            break;
+
+        case GDK_KEY_bracketright:
+            persp3d_rotate_VP (document->getCurrentPersp3D(), Proj::X, -180/snaps, MOD__ALT(event));
+            DocumentUndo::done(document, SP_VERB_CONTEXT_3DBOX,
+                             _("Change perspective (angle of PLs)"));
+            ret = true;
+            break;
+
+        case GDK_KEY_bracketleft:
+            persp3d_rotate_VP (document->getCurrentPersp3D(), Proj::X, 180/snaps, MOD__ALT(event));
+            DocumentUndo::done(document, SP_VERB_CONTEXT_3DBOX,
+                             _("Change perspective (angle of PLs)"));
+            ret = true;
+            break;
+
+        case GDK_KEY_parenright:
+            persp3d_rotate_VP (document->getCurrentPersp3D(), Proj::Y, -180/snaps, MOD__ALT(event));
+            DocumentUndo::done(document, SP_VERB_CONTEXT_3DBOX,
+                             _("Change perspective (angle of PLs)"));
+            ret = true;
+            break;
+
+        case GDK_KEY_parenleft:
+            persp3d_rotate_VP (document->getCurrentPersp3D(), Proj::Y, 180/snaps, MOD__ALT(event));
+            DocumentUndo::done(document, SP_VERB_CONTEXT_3DBOX,
+                             _("Change perspective (angle of PLs)"));
+            ret = true;
+            break;
+
+        case GDK_KEY_braceright:
+            persp3d_rotate_VP (document->getCurrentPersp3D(), Proj::Z, -180/snaps, MOD__ALT(event));
+            DocumentUndo::done(document, SP_VERB_CONTEXT_3DBOX,
+                             _("Change perspective (angle of PLs)"));
+            ret = true;
+            break;
+
+        case GDK_KEY_braceleft:
+            persp3d_rotate_VP (document->getCurrentPersp3D(), Proj::Z, 180/snaps, MOD__ALT(event));
+            DocumentUndo::done(document, SP_VERB_CONTEXT_3DBOX,
+                             _("Change perspective (angle of PLs)"));
+            ret = true;
+            break;
+
+        /* TODO: what is this???
+        case GDK_O:
+            if (MOD__CTRL(event) && MOD__SHIFT(event)) {
+                Box3D::create_canvas_point(persp3d_get_VP(document()->getCurrentPersp3D(), Proj::W).affine(),
+                                           6, 0xff00ff00);
+            }
+            ret = true;
+            break;
+        */
+
+        case GDK_KEY_g:
+        case GDK_KEY_G:
+            if (MOD__SHIFT_ONLY(event)) {
+                sp_selection_to_guides(desktop);
+                ret = true;
+            }
+            break;
+
+        case GDK_KEY_p:
+        case GDK_KEY_P:
+            if (MOD__SHIFT_ONLY(event)) {
+                if (document->getCurrentPersp3D()) {
+                    persp3d_print_debugging_info (document->getCurrentPersp3D());
+                }
+                ret = true;
+            }
+            break;
+
+        case GDK_KEY_x:
+        case GDK_KEY_X:
+            if (MOD__ALT_ONLY(event)) {
+                desktop->setToolboxFocusTo ("altx-box3d");
+                ret = TRUE;
+            }
+            if (MOD__SHIFT_ONLY(event)) {
+                persp3d_toggle_VPs(selection->perspList(), Proj::X);
+                this->_vpdrag->updateLines(); // FIXME: Shouldn't this be done automatically?
+                ret = true;
+            }
+            break;
+
+        case GDK_KEY_y:
+        case GDK_KEY_Y:
+            if (MOD__SHIFT_ONLY(event)) {
+                persp3d_toggle_VPs(selection->perspList(), Proj::Y);
+                this->_vpdrag->updateLines(); // FIXME: Shouldn't this be done automatically?
+                ret = true;
+            }
+            break;
+
+        case GDK_KEY_z:
+        case GDK_KEY_Z:
+            if (MOD__SHIFT_ONLY(event)) {
+                persp3d_toggle_VPs(selection->perspList(), Proj::Z);
+                this->_vpdrag->updateLines(); // FIXME: Shouldn't this be done automatically?
+                ret = true;
+            }
+            break;
+
+        case GDK_KEY_Escape:
+            sp_desktop_selection(desktop)->clear();
+            //TODO: make dragging escapable by Esc
+            break;
+
+        case GDK_KEY_space:
+            if (dragging) {
+                sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate),
+                                      event->button.time);
+                dragging = false;
+                sp_event_context_discard_delayed_snap_event(this);
+                if (!this->within_tolerance) {
+                    // we've been dragging, finish the box
+                    this->finishItem();
+                }
+                // do not return true, so that space would work switching to selector
+            }
+            break;
+
+        case GDK_KEY_Delete:
+        case GDK_KEY_KP_Delete:
+        case GDK_KEY_BackSpace:
+            ret = this->deleteSelectedDrag(MOD__CTRL_ONLY(event));
+            break;
+
+        default:
+            break;
+        }
+        break;
+
+    default:
+        break;
+    }
+
+    if (!ret) {
+    	ret = ToolBase::root_handler(event);
+    }
+
+    return ret;
+}
+
+void Box3dTool::drag(guint state) {
+    if (!this->box3d) {
+        if (Inkscape::have_viable_layer(desktop, this->message_context) == false) {
+            return;
+        }
+
+        // Create object
+        SPBox3D *box3d = SPBox3D::createBox3D((SPItem*)desktop->currentLayer());
+
+        // Set style
+        desktop->applyCurrentOrToolStyle(box3d, "/tools/shapes/3dbox", false);
+        
+        this->box3d = box3d;
+
+        // TODO: Incorporate this in box3d-side.cpp!
+        for (int i = 0; i < 6; ++i) {
+            Box3DSide *side = Box3DSide::createBox3DSide(box3d);
+            
+            guint desc = Box3D::int_to_face(i);
+
+            Box3D::Axis plane = (Box3D::Axis) (desc & 0x7);
+            plane = (Box3D::is_plane(plane) ? plane : Box3D::orth_plane_or_axis(plane));
+            side->dir1 = Box3D::extract_first_axis_direction(plane);
+            side->dir2 = Box3D::extract_second_axis_direction(plane);
+            side->front_or_rear = (Box3D::FrontOrRear) (desc & 0x8);
+
+            // Set style
+            Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+
+            Glib::ustring descr = "/desktop/";
+            descr += box3d_side_axes_string(side);
+            descr += "/style";
+
+            Glib::ustring cur_style = prefs->getString(descr);    
+    
+            bool use_current = prefs->getBool("/tools/shapes/3dbox/usecurrent", false);
+
+            if (use_current && !cur_style.empty()) {
+                // use last used style 
+                side->setAttribute("style", cur_style.data());
+            } else {
+                // use default style 
+                GString *pstring = g_string_new("");
+                g_string_printf (pstring, "/tools/shapes/3dbox/%s", box3d_side_axes_string(side));
+                desktop->applyCurrentOrToolStyle (side, pstring->str, false);
+            }
+
+            side->updateRepr(); // calls box3d_side_write() and updates, e.g., the axes string description
+        }
+
+        box3d_set_z_orders(this->box3d);
+        this->box3d->updateRepr();
+
+        // 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"
+        /* this._vpdrag->updateDraggers(); */
+
+        desktop->canvas->forceFullRedrawAfterInterruptions(5);
+    }
+
+    g_assert(this->box3d);
+
+    this->box3d->orig_corner0 = this->drag_origin_proj;
+    this->box3d->orig_corner7 = this->drag_ptC_proj;
+
+    box3d_check_for_swapped_coords(this->box3d);
+
+    /* 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 (this->box3d);
+
+    box3d_position_set(this->box3d);
+
+    // status text
+    this->message_context->setF(Inkscape::NORMAL_MESSAGE, "%s", _("<b>3D Box</b>; with <b>Shift</b> to extrude along the Z axis"));
+}
+
+void Box3dTool::finishItem() {
+    this->message_context->clear();
+    this->ctrl_dragged = false;
+    this->extruded = false;
+
+    if (this->box3d != NULL) {
+        SPDocument *doc = sp_desktop_document(this->desktop);
+
+        if (!doc || !doc->getCurrentPersp3D()) {
+            return;
+        }
+
+        this->box3d->orig_corner0 = this->drag_origin_proj;
+        this->box3d->orig_corner7 = this->drag_ptC_proj;
+
+        this->box3d->updateRepr();
+
+        box3d_relabel_corners(this->box3d);
+
+        desktop->canvas->endForcedFullRedraws();
+
+        sp_desktop_selection(desktop)->set(this->box3d);
+        DocumentUndo::done(sp_desktop_document(desktop), SP_VERB_CONTEXT_3DBOX,
+                         _("Create 3D box"));
+
+        this->box3d = NULL;
+    }
+}
+
+}
+}
+}
+
+/*
+  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 :