X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Frect-context.cpp;h=bcb1bf7347e615586a761896448014d229fcdf6d;hb=c14a574322a392c0976221b4a24d38dbc379a588;hp=938b4496dca3a3186adfcd7399e7fc53bebf5759;hpb=32461c0cc717f51ba84908e1eea5b1ee150cf27e;p=inkscape.git diff --git a/src/rect-context.cpp b/src/rect-context.cpp index 938b4496d..bcb1bf734 100644 --- a/src/rect-context.cpp +++ b/src/rect-context.cpp @@ -1,11 +1,11 @@ -#define __SP_RECT_CONTEXT_C__ - /* * Rectangle drawing context * * Author: * Lauris Kaplinski * bulia byak + * Jon A. Cruz + * Abhishek Sharma * * Copyright (C) 2006 Johan Engelen * Copyright (C) 2000-2005 authors @@ -15,9 +15,10 @@ */ #include "config.h" -#include "inkscape.h" #include +#include +#include #include "macros.h" #include "display/sp-canvas.h" @@ -38,8 +39,11 @@ #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 "shape-editor.h" + +using Inkscape::DocumentUndo; //static const double goldenratio = 1.61803398874989484820; // golden ratio @@ -48,13 +52,15 @@ static void sp_rect_context_init(SPRectContext *rect_context); static void sp_rect_context_dispose(GObject *object); static void sp_rect_context_setup(SPEventContext *ec); -static void sp_rect_context_set(SPEventContext *ec, gchar const *key, gchar const *val); +static void sp_rect_context_finish(SPEventContext *ec); +static void sp_rect_context_set(SPEventContext *ec, Inkscape::Preferences::Entry *val); static gint sp_rect_context_root_handler(SPEventContext *event_context, GdkEvent *event); static gint sp_rect_context_item_handler(SPEventContext *event_context, SPItem *item, GdkEvent *event); -static void sp_rect_drag(SPRectContext &rc, NR::Point const pt, guint state); +static void sp_rect_drag(SPRectContext &rc, Geom::Point const pt, guint state); static void sp_rect_finish(SPRectContext *rc); +static void sp_rect_cancel(SPRectContext *rc); static SPEventContextClass *parent_class; @@ -88,6 +94,7 @@ static void sp_rect_context_class_init(SPRectContextClass *klass) object_class->dispose = sp_rect_context_dispose; event_context_class->setup = sp_rect_context_setup; + event_context_class->finish = sp_rect_context_finish; event_context_class->set = sp_rect_context_set; event_context_class->root_handler = sp_rect_context_root_handler; event_context_class->item_handler = sp_rect_context_item_handler; @@ -105,9 +112,7 @@ static void sp_rect_context_init(SPRectContext *rect_context) event_context->tolerance = 0; event_context->within_tolerance = false; event_context->item_to_select = NULL; - - event_context->shape_repr = NULL; - event_context->shape_knot_holder = NULL; + event_context->tool_url = "/tools/shapes/rect"; rect_context->item = NULL; @@ -117,6 +122,21 @@ static void sp_rect_context_init(SPRectContext *rect_context) new (&rect_context->sel_changed_connection) sigc::connection(); } +static void sp_rect_context_finish(SPEventContext *ec) +{ + SPRectContext *rc = SP_RECT_CONTEXT(ec); + SPDesktop *desktop = ec->desktop; + + sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), GDK_CURRENT_TIME); + sp_rect_finish(rc); + rc->sel_changed_connection.disconnect(); + + if (((SPEventContextClass *) parent_class)->finish) { + ((SPEventContextClass *) parent_class)->finish(ec); + } +} + + static void sp_rect_context_dispose(GObject *object) { SPRectContext *rc = SP_RECT_CONTEXT(object); @@ -127,22 +147,14 @@ static void sp_rect_context_dispose(GObject *object) rc->sel_changed_connection.disconnect(); rc->sel_changed_connection.~connection(); + delete ec->shape_editor; + ec->shape_editor = NULL; + /* fixme: This is necessary because we do not grab */ if (rc->item) { sp_rect_finish(rc); } - 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 (rc->_message_context) { delete rc->_message_context; } @@ -150,14 +162,6 @@ static void sp_rect_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 @@ -167,27 +171,9 @@ void sp_rect_context_selection_changed(Inkscape::Selection *selection, gpointer SPRectContext *rc = SP_RECT_CONTEXT(data); SPEventContext *ec = SP_EVENT_CONTEXT(rc); - if (ec->shape_knot_holder) { // destroy knotholder - 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; - } - + ec->shape_editor->unset_item(SH_KNOTHOLDER); 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); - } - } + ec->shape_editor->set_item(item, SH_KNOTHOLDER); } static void sp_rect_context_setup(SPEventContext *ec) @@ -198,15 +184,11 @@ static void sp_rect_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); } rc->sel_changed_connection.disconnect(); @@ -217,31 +199,29 @@ static void sp_rect_context_setup(SPEventContext *ec) sp_event_context_read(ec, "rx"); sp_event_context_read(ec, "ry"); - if (prefs_get_int_attribute("tools.shapes", "selcue", 0) != 0) { + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + 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(); } rc->_message_context = new Inkscape::MessageContext((ec->desktop)->messageStack()); } -static void sp_rect_context_set(SPEventContext *ec, gchar const *key, gchar const *val) +static void sp_rect_context_set(SPEventContext *ec, Inkscape::Preferences::Entry *val) { SPRectContext *rc = SP_RECT_CONTEXT(ec); /* fixme: Proper error handling for non-numeric data. Use a locale-independent function like * g_ascii_strtod (or a thin wrapper that does the right thing for invalid values inf/nan). */ - if ( strcmp(key, "rx") == 0 ) { - rc->rx = ( val - ? g_ascii_strtod (val, NULL) - : 0.0 ); - } else if ( strcmp(key, "ry") == 0 ) { - rc->ry = ( val - ? g_ascii_strtod (val, NULL) - : 0.0 ); + Glib::ustring name = val->getEntryName(); + if ( name == "rx" ) { + rc->rx = val->getDoubleLimited(); // prevents NaN and +/-Inf from messing up + } else if ( name == "ry" ) { + rc->ry = val->getDoubleLimited(); } } @@ -278,19 +258,20 @@ static gint sp_rect_context_root_handler(SPEventContext *event_context, GdkEvent Inkscape::Selection *selection = sp_desktop_selection (desktop); SPRectContext *rc = SP_RECT_CONTEXT(event_context); + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); - 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, + Geom::Point const button_w(event->button.x, event->button.y); // 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, disregarding groups, honoring Alt @@ -299,19 +280,24 @@ static gint sp_rect_context_root_handler(SPEventContext *event_context, GdkEvent dragging = true; /* Position center */ - NR::Point const button_dt(desktop->w2d(button_w)); + Geom::Point button_dt(desktop->w2d(button_w)); + rc->center = from_2geom(button_dt); /* Snap center */ - SnapManager const &m = desktop->namedview->snap_manager; - rc->center = m.freeSnap(Inkscape::Snapper::SNAPPOINT_NODE, - button_dt, rc->item).getPoint(); + SnapManager &m = desktop->namedview->snap_manager; + m.setup(desktop); + m.freeSnapReturnByRef(button_dt, Inkscape::SNAPSOURCE_NODE_HANDLE); + m.unSetup(); + rc->center = from_2geom(button_dt); 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; @@ -329,22 +315,28 @@ static gint sp_rect_context_root_handler(SPEventContext *event_context, GdkEvent // 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, rc->item).getPoint(); - - sp_rect_drag(*rc, motion_dt, event->motion.state); + Geom::Point const motion_w(event->motion.x, event->motion.y); + Geom::Point motion_dt(desktop->w2d(motion_w)); + + sp_rect_drag(*rc, motion_dt, event->motion.state); // this will also handle the snapping gobble_motion_events(GDK_BUTTON1_MASK); ret = TRUE; + } else if (!sp_event_context_knot_mouseover(rc)) { + 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 rect @@ -401,30 +393,22 @@ static gint sp_rect_context_root_handler(SPEventContext *event_context, GdkEvent } break; - case GDK_T: - { - Inkscape::Selection *selection = sp_desktop_selection (inkscape_active_desktop()); - SPItem *item = selection->singleItem(); - if (item && SP_IS_RECT (item)) { - g_print ("Scaling transformation matrix\n"); - SP_RECT (item)->transform = nr_matrix_set_scale(SP_RECT (item)->transform, 1.25, 1.5); - SP_OBJECT (item)->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); - } - ret = TRUE; - } - break; - case GDK_g: case GDK_G: if (MOD__SHIFT_ONLY) { - sp_selection_to_guides(); + sp_selection_to_guides(desktop); ret = true; } break; case GDK_Escape: - sp_desktop_selection(desktop)->clear(); - //TODO: make dragging escapable by Esc + if (dragging) { + dragging = false; + sp_event_context_discard_delayed_snap_event(event_context); + // if drawing, cancel, otherwise pass it up for deselecting + sp_rect_cancel(rc); + ret = TRUE; + } break; case GDK_space: @@ -432,6 +416,7 @@ static gint sp_rect_context_root_handler(SPEventContext *event_context, GdkEvent 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 rect sp_rect_finish(rc); @@ -473,7 +458,7 @@ static gint sp_rect_context_root_handler(SPEventContext *event_context, GdkEvent return ret; } -static void sp_rect_drag(SPRectContext &rc, NR::Point const pt, guint state) +static void sp_rect_drag(SPRectContext &rc, Geom::Point const pt, guint state) { SPDesktop *desktop = SP_EVENT_CONTEXT(&rc)->desktop; @@ -483,37 +468,37 @@ static void sp_rect_drag(SPRectContext &rc, NR::Point const pt, guint state) return; } - /* Create object */ - Inkscape::XML::Document *xml_doc = sp_document_repr_doc(SP_EVENT_CONTEXT_DOCUMENT(&rc)); + // Create object + Inkscape::XML::Document *xml_doc = SP_EVENT_CONTEXT_DOCUMENT(&rc)->getReprDoc(); Inkscape::XML::Node *repr = xml_doc->createElement("svg:rect"); - /* Set style */ - sp_desktop_apply_style_tool (desktop, repr, "tools.shapes.rect", false); + // Set style + sp_desktop_apply_style_tool (desktop, repr, "/tools/shapes/rect", false); rc.item = (SPItem *) desktop->currentLayer()->appendChildRepr(repr); Inkscape::GC::release(repr); - rc.item->transform = SP_ITEM(desktop->currentRoot())->getRelativeTransform(desktop->currentLayer()); + rc.item->transform = SP_ITEM(desktop->currentLayer())->i2doc_affine().inverse(); rc.item->updateRepr(); sp_canvas_force_full_redraw_after_interruptions(desktop->canvas, 5); } - NR::Rect const r = Inkscape::snap_rectangular_box(desktop, rc.item, pt, rc.center, state); + Geom::Rect const r = Inkscape::snap_rectangular_box(desktop, rc.item, pt, rc.center, state); - sp_rect_position_set(SP_RECT(rc.item), r.min()[NR::X], r.min()[NR::Y], r.dimensions()[NR::X], r.dimensions()[NR::Y]); + sp_rect_position_set(SP_RECT(rc.item), r.min()[Geom::X], r.min()[Geom::Y], r.dimensions()[Geom::X], r.dimensions()[Geom::Y]); if ( rc.rx != 0.0 ) { sp_rect_set_rx (SP_RECT(rc.item), TRUE, rc.rx); } if ( rc.ry != 0.0 ) { if (rc.rx == 0.0) - sp_rect_set_ry (SP_RECT(rc.item), TRUE, CLAMP(rc.ry, 0, MIN(r.dimensions()[NR::X], r.dimensions()[NR::Y])/2)); + sp_rect_set_ry (SP_RECT(rc.item), TRUE, CLAMP(rc.ry, 0, MIN(r.dimensions()[Geom::X], r.dimensions()[Geom::Y])/2)); else - sp_rect_set_ry (SP_RECT(rc.item), TRUE, CLAMP(rc.ry, 0, r.dimensions()[NR::Y])); + sp_rect_set_ry (SP_RECT(rc.item), TRUE, CLAMP(rc.ry, 0, r.dimensions()[Geom::Y])); } // status text - double rdimx = r.dimensions()[NR::X]; - double rdimy = r.dimensions()[NR::Y]; + double rdimx = r.dimensions()[Geom::X]; + double rdimy = r.dimensions()[Geom::Y]; GString *xs = SP_PX_TO_METRIC_STRING(rdimx, desktop->namedview->getDefaultMetric()); GString *ys = SP_PX_TO_METRIC_STRING(rdimy, desktop->namedview->getDefaultMetric()); if (state & GDK_CONTROL_MASK) { @@ -553,22 +538,49 @@ static void sp_rect_finish(SPRectContext *rc) rc->_message_context->clear(); if ( rc->item != NULL ) { - SPDesktop * desktop; + SPRect *rect = SP_RECT(rc->item); + if (rect->width.computed == 0 || rect->height.computed == 0) { + sp_rect_cancel(rc); // Don't allow the creating of zero sized rectangle, for example when the start and and point snap to the snap grid point + return; + } - desktop = SP_EVENT_CONTEXT_DESKTOP(rc); + SPDesktop *desktop = SP_EVENT_CONTEXT_DESKTOP(rc); SP_OBJECT(rc->item)->updateRepr(); sp_canvas_end_forced_full_redraws(desktop->canvas); sp_desktop_selection(desktop)->set(rc->item); - sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_RECT, - _("Create rectangle")); + DocumentUndo::done(sp_desktop_document(desktop), SP_VERB_CONTEXT_RECT, + _("Create rectangle")); rc->item = NULL; } } +static void sp_rect_cancel(SPRectContext *rc) +{ + SPDesktop *desktop = SP_EVENT_CONTEXT(rc)->desktop; + + sp_desktop_selection(desktop)->clear(); + sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), 0); + + if (rc->item != NULL) { + SP_OBJECT(rc->item)->deleteObject(); + rc->item = NULL; + } + + rc->within_tolerance = false; + rc->xp = 0; + rc->yp = 0; + rc->item_to_select = NULL; + + sp_canvas_end_forced_full_redraws(desktop->canvas); + + DocumentUndo::cancel(sp_desktop_document(desktop)); +} + + /* Local Variables: mode:c++ @@ -578,4 +590,4 @@ static void sp_rect_finish(SPRectContext *rc) 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 :