X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fknot.cpp;h=b17e41b243bf9b640365be12de1f755cd5f9b7f4;hb=9b77c800657e2ecaed32f6f6a95bc5e9eccc960f;hp=d65b64299ab4a34f7f9b0e3edb152d20796b1621;hpb=466404cca6fde4282857086e28a34b5cf7b012dc;p=inkscape.git diff --git a/src/knot.cpp b/src/knot.cpp index d65b64299..b17e41b24 100644 --- a/src/knot.cpp +++ b/src/knot.cpp @@ -24,14 +24,14 @@ #include "desktop-handles.h" #include "knot.h" #include "document.h" -#include "prefs-utils.h" +#include "preferences.h" #include "message-stack.h" #include "message-context.h" #include "event-context.h" - #define KNOT_EVENT_MASK (GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | \ GDK_POINTER_MOTION_MASK | \ + GDK_POINTER_MOTION_HINT_MASK | \ GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK) static bool nograb = false; @@ -188,8 +188,8 @@ static void sp_knot_init(SPKnot *knot) knot->flags = 0; knot->size = 8; - knot->pos = NR::Point(0, 0); - knot->grabbed_rel_pos = NR::Point(0, 0); + knot->pos = Geom::Point(0, 0); + knot->grabbed_rel_pos = Geom::Point(0, 0); knot->anchor = GTK_ANCHOR_CENTER; knot->shape = SP_KNOT_SHAPE_SQUARE; knot->mode = SP_KNOT_MODE_XOR; @@ -260,7 +260,7 @@ static void sp_knot_dispose(GObject *object) /** * Update knot for dragging and tell canvas an item was grabbed. */ -void sp_knot_start_dragging(SPKnot *knot, NR::Point p, gint x, gint y, guint32 etime) +void sp_knot_start_dragging(SPKnot *knot, Geom::Point const &p, gint x, gint y, guint32 etime) { // save drag origin xp = x; @@ -282,9 +282,9 @@ void sp_knot_start_dragging(SPKnot *knot, NR::Point p, gint x, gint y, guint32 e /** * Called to handle events on knots. */ -static int sp_knot_handler(SPCanvasItem *item, GdkEvent *event, SPKnot *knot) +static int sp_knot_handler(SPCanvasItem */*item*/, GdkEvent *event, SPKnot *knot) { - g_assert(knot != NULL); + g_assert(knot != NULL); g_assert(SP_IS_KNOT(knot)); /* Run client universal event handler, if present */ @@ -298,7 +298,8 @@ static int sp_knot_handler(SPCanvasItem *item, GdkEvent *event, SPKnot *knot) } g_object_ref(knot); - tolerance = prefs_get_int_attribute_limited("options.dragtolerance", "value", 0, 0, 100); + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + tolerance = prefs->getIntLimited("/options/dragtolerance/value", 0, 0, 100); switch (event->type) { case GDK_2BUTTON_PRESS: @@ -311,15 +312,22 @@ static int sp_knot_handler(SPCanvasItem *item, GdkEvent *event, SPKnot *knot) } break; case GDK_BUTTON_PRESS: - if (event->button.button == 1) { - NR::Point const p = knot->desktop->w2d(NR::Point(event->button.x, event->button.y)); + if (event->button.button == 1 && !knot->desktop->event_context->space_panning) { + Geom::Point const p = knot->desktop->w2d(Geom::Point(event->button.x, event->button.y)); sp_knot_start_dragging(knot, p, (gint) event->button.x, (gint) event->button.y, event->button.time); - consumed = TRUE; + consumed = TRUE; } break; case GDK_BUTTON_RELEASE: - if (event->button.button == 1) { - knot->pressure = 0; + if (event->button.button == 1 && !knot->desktop->event_context->space_panning) { + // If we have any pending snap event, then invoke it now + if (knot->desktop->event_context->_delayed_snap_event) { + sp_event_context_snap_watchdog_callback(knot->desktop->event_context->_delayed_snap_event); + } + + sp_event_context_discard_delayed_snap_event(knot->desktop->event_context); + + knot->pressure = 0; if (transform_escaped) { transform_escaped = false; consumed = TRUE; @@ -335,10 +343,12 @@ static int sp_knot_handler(SPCanvasItem *item, GdkEvent *event, SPKnot *knot) g_signal_emit(knot, knot_signals[UNGRABBED], 0, event->button.state); + knot->_ungrabbed_signal.emit(knot); } else { g_signal_emit(knot, knot_signals[CLICKED], 0, event->button.state); + knot->_click_signal.emit(knot, event->button.state); } grabbed = FALSE; moved = FALSE; @@ -347,7 +357,7 @@ static int sp_knot_handler(SPCanvasItem *item, GdkEvent *event, SPKnot *knot) } break; case GDK_MOTION_NOTIFY: - if (grabbed) { + if (grabbed && !knot->desktop->event_context->space_panning) { consumed = TRUE; if ( within_tolerance @@ -374,11 +384,8 @@ static int sp_knot_handler(SPCanvasItem *item, GdkEvent *event, SPKnot *knot) SP_KNOT_DRAGGING, TRUE); } - NR::Point const motion_w(event->motion.x, event->motion.y); - NR::Point const motion_dt = knot->desktop->w2d(motion_w); - NR::Point p = motion_dt - knot->grabbed_rel_pos; - sp_knot_request_position (knot, &p, event->motion.state); - knot->desktop->scroll_to_point (&motion_dt); + sp_event_context_snap_delay_handler(knot->desktop->event_context, NULL, knot, (GdkEventMotion *)event, DelayedSnapEvent::KNOT_HANDLER); + sp_knot_handler_request_position(event, knot); moved = TRUE; } break; @@ -404,36 +411,36 @@ static int sp_knot_handler(SPCanvasItem *item, GdkEvent *event, SPKnot *knot) grabbed = FALSE; moved = FALSE; - consumed = TRUE; break; case GDK_KEY_PRESS: // keybindings for knot switch (get_group0_keyval(&event->key)) { - case GDK_Escape: - sp_knot_set_flag(knot, SP_KNOT_GRABBED, FALSE); - if (!nograb) { - sp_canvas_item_ungrab(knot->item, event->button.time); - } - if (moved) { - sp_knot_set_flag(knot, - SP_KNOT_DRAGGING, - FALSE); - g_signal_emit(knot, - knot_signals[UNGRABBED], 0, - event->button.state); - sp_document_undo(sp_desktop_document(knot->desktop)); - knot->desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Node or handle drag canceled.")); - transform_escaped = true; - consumed = TRUE; - } - grabbed = FALSE; - moved = FALSE; - break; - default: - consumed = FALSE; - break; - } - break; + case GDK_Escape: + sp_knot_set_flag(knot, SP_KNOT_GRABBED, FALSE); + if (!nograb) { + sp_canvas_item_ungrab(knot->item, event->button.time); + } + if (moved) { + sp_knot_set_flag(knot, + SP_KNOT_DRAGGING, + FALSE); + g_signal_emit(knot, + knot_signals[UNGRABBED], 0, + event->button.state); + sp_document_undo(sp_desktop_document(knot->desktop)); + knot->desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Node or handle drag canceled.")); + transform_escaped = true; + consumed = TRUE; + } + grabbed = FALSE; + moved = FALSE; + sp_event_context_discard_delayed_snap_event(knot->desktop->event_context); + break; + default: + consumed = FALSE; + break; + } + break; default: break; } @@ -443,6 +450,18 @@ static int sp_knot_handler(SPCanvasItem *item, GdkEvent *event, SPKnot *knot) return consumed; } +void sp_knot_handler_request_position(GdkEvent *event, SPKnot *knot) +{ + Geom::Point const motion_w(event->motion.x, event->motion.y); + Geom::Point const motion_dt = knot->desktop->w2d(motion_w); + Geom::Point p = motion_dt - knot->grabbed_rel_pos; + sp_knot_request_position (knot, p, event->motion.state); + knot->desktop->scroll_to_point (motion_dt); + knot->desktop->set_coordinate_status(knot->pos); // display the coordinate of knot, not cursor - they may be different! + if (event->motion.state & GDK_BUTTON1_MASK) + gobble_motion_events(GDK_BUTTON1_MASK); +} + /** * Return new knot object. */ @@ -500,7 +519,7 @@ void sp_knot_hide(SPKnot *knot) /** * Request or set new position for knot. */ -void sp_knot_request_position(SPKnot *knot, NR::Point *p, guint state) +void sp_knot_request_position(SPKnot *knot, Geom::Point const &p, guint state) { g_return_if_fail(knot != NULL); g_return_if_fail(SP_IS_KNOT(knot)); @@ -509,7 +528,7 @@ void sp_knot_request_position(SPKnot *knot, NR::Point *p, guint state) g_signal_emit(knot, knot_signals[REQUEST], 0, - p, + &p, state, &done); @@ -523,16 +542,16 @@ void sp_knot_request_position(SPKnot *knot, NR::Point *p, guint state) /** * Return distance of point to knot's position; unused. */ -gdouble sp_knot_distance(SPKnot * knot, NR::Point *p, guint state) +gdouble sp_knot_distance(SPKnot * knot, Geom::Point const &p, guint state) { g_return_val_if_fail(knot != NULL, 1e18); g_return_val_if_fail(SP_IS_KNOT(knot), 1e18); - gdouble distance = NR::L2(*p - knot->pos); + gdouble distance = Geom::L2(p - knot->pos); g_signal_emit(knot, knot_signals[DISTANCE], 0, - p, + &p, state, &distance); @@ -542,42 +561,43 @@ gdouble sp_knot_distance(SPKnot * knot, NR::Point *p, guint state) /** * Move knot to new position. */ -void sp_knot_set_position(SPKnot *knot, NR::Point *p, guint state) +void sp_knot_set_position(SPKnot *knot, Geom::Point const &p, guint state) { g_return_if_fail(knot != NULL); g_return_if_fail(SP_IS_KNOT (knot)); - knot->pos = *p; + knot->pos = p; if (knot->item) { - SP_CTRL(knot->item)->moveto (*p); + SP_CTRL(knot->item)->moveto (p); } g_signal_emit(knot, knot_signals[MOVED], 0, - p, + &p, state); + knot->_moved_signal.emit(knot, p, state); } /** - * Move knot to new position, without emitting a MOVED signal. + * Move knot to new position, without emitting a MOVED signal. */ -void sp_knot_moveto(SPKnot *knot, NR::Point *p) +void sp_knot_moveto(SPKnot *knot, Geom::Point const &p) { g_return_if_fail(knot != NULL); g_return_if_fail(SP_IS_KNOT(knot)); - knot->pos = *p; + knot->pos = p; if (knot->item) { - SP_CTRL(knot->item)->moveto (*p); + SP_CTRL(knot->item)->moveto (p); } } /** * Returns position of knot. */ -NR::Point sp_knot_position(SPKnot const *knot) +Geom::Point sp_knot_position(SPKnot const *knot) { g_assert(knot != NULL); g_assert(SP_IS_KNOT (knot));