X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fknot.cpp;h=cf1a3e9444e8194d15a97b9c16a6b8973b5cbfaf;hb=891cc5c74e3c3c2f83a12cd730721d18dd931398;hp=40246ce01efc2a1accf544a7a06d8216dc445f46;hpb=888b8e8ab90b308dc1faf2539a33a293f6545d34;p=inkscape.git diff --git a/src/knot.cpp b/src/knot.cpp index 40246ce01..cf1a3e944 100644 --- a/src/knot.cpp +++ b/src/knot.cpp @@ -24,14 +24,15 @@ #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_POINTER_MOTION_MASK | \ + GDK_POINTER_MOTION_HINT_MASK | \ GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK) static bool nograb = false; @@ -188,13 +189,14 @@ 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; knot->tip = NULL; knot->_event_handler_id = 0; + knot->pressure = 0; knot->fill[SP_KNOT_STATE_NORMAL] = 0xffffff00; knot->fill[SP_KNOT_STATE_MOUSEOVER] = 0xff0000ff; @@ -259,7 +261,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; @@ -281,24 +283,25 @@ 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(SP_IS_KNOT(knot)); - g_object_ref(knot); - tolerance = prefs_get_int_attribute_limited("options.dragtolerance", "value", 0, 0, 100); + /* Run client universal event handler, if present */ gboolean consumed = FALSE; - /* Run client universal event handler, if present */ - g_signal_emit(knot, knot_signals[EVENT], 0, event, &consumed); if (consumed) { return TRUE; } + g_object_ref(knot); + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + tolerance = prefs->getIntLimited("/options/dragtolerance/value", 0, 0, 100); + switch (event->type) { case GDK_2BUTTON_PRESS: if (event->button.button == 1) { @@ -310,14 +313,15 @@ 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; } break; case GDK_BUTTON_RELEASE: - if (event->button.button == 1) { + if (event->button.button == 1 && !knot->desktop->event_context->space_panning) { + knot->pressure = 0; if (transform_escaped) { transform_escaped = false; consumed = TRUE; @@ -333,10 +337,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; @@ -345,7 +351,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 @@ -359,6 +365,11 @@ static int sp_knot_handler(SPCanvasItem *item, GdkEvent *event, SPKnot *knot) // motion notify coordinates as given (no snapping back to origin) within_tolerance = false; + if (gdk_event_get_axis (event, GDK_AXIS_PRESSURE, &knot->pressure)) + knot->pressure = CLAMP (knot->pressure, 0, 1); + else + knot->pressure = 0.5; + if (!moved) { g_signal_emit(knot, knot_signals[GRABBED], 0, @@ -367,11 +378,14 @@ 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); + 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); moved = TRUE; } break; @@ -493,7 +507,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)); @@ -502,7 +516,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); @@ -516,16 +530,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); @@ -535,42 +549,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. */ -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));