X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fselect-context.cpp;h=606934ca6f3d9f451fb9854e19a1db9b94ef177e;hb=d1150228ea8064478ea50cd32e99d399b16455e3;hp=010382376e9f7b8e3d50c6256eaaf075e6659da4;hpb=274f6d25a9facdc5bfbe8b4df42e6173e4328775;p=inkscape.git diff --git a/src/select-context.cpp b/src/select-context.cpp index 010382376..606934ca6 100644 --- a/src/select-context.cpp +++ b/src/select-context.cpp @@ -35,7 +35,7 @@ #include "desktop.h" #include "desktop-handles.h" #include "sp-root.h" -#include "prefs-utils.h" +#include "preferences.h" #include "tools-switch.h" #include "message-stack.h" #include "selection-describer.h" @@ -47,7 +47,7 @@ static void sp_select_context_init(SPSelectContext *select_context); static void sp_select_context_dispose(GObject *object); static void sp_select_context_setup(SPEventContext *ec); -static void sp_select_context_set(SPEventContext *ec, gchar const *key, gchar const *val); +static void sp_select_context_set(SPEventContext *ec, Inkscape::Preferences::Entry *val); static gint sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event); static gint sp_select_context_item_handler(SPEventContext *event_context, SPItem *item, GdkEvent *event); @@ -179,18 +179,20 @@ sp_select_context_setup(SPEventContext *ec) sp_event_context_read(ec, "show"); sp_event_context_read(ec, "transform"); - if (prefs_get_int_attribute("tools.select", "gradientdrag", 0) != 0) { + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + if (prefs->getBool("/tools/select/gradientdrag")) { ec->enableGrDrag(); } } static void -sp_select_context_set(SPEventContext *ec, gchar const *key, gchar const *val) +sp_select_context_set(SPEventContext *ec, Inkscape::Preferences::Entry *val) { SPSelectContext *sc = SP_SELECT_CONTEXT(ec); + Glib::ustring path = val->getEntryName(); - if (!strcmp(key, "show")) { - if (val && !strcmp(val, "outline")) { + if (path == "show") { + if (val->getString() == "outline") { sc->_seltrans->setShow(Inkscape::SelTrans::SHOW_OUTLINE); } else { sc->_seltrans->setShow(Inkscape::SelTrans::SHOW_CONTENT); @@ -210,6 +212,7 @@ sp_select_context_abort(SPEventContext *event_context) seltrans->ungrab(); sc->moved = FALSE; sc->dragging = FALSE; + sp_event_context_discard_delayed_snap_event(event_context); drag_escaped = 1; if (sc->item) { @@ -231,8 +234,8 @@ sp_select_context_abort(SPEventContext *event_context) return true; } } else { - if (Inkscape::Rubberband::get()->is_started()) { - Inkscape::Rubberband::get()->stop(); + if (Inkscape::Rubberband::get(desktop)->is_started()) { + Inkscape::Rubberband::get(desktop)->stop(); rb_escaped = 1; SP_EVENT_CONTEXT(sc)->defaultMessageContext()->clear(); SP_EVENT_CONTEXT(sc)->desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Selection canceled.")); @@ -293,7 +296,8 @@ sp_select_context_item_handler(SPEventContext *event_context, SPItem *item, GdkE SPSelectContext *sc = SP_SELECT_CONTEXT(event_context); Inkscape::SelTrans *seltrans = sc->_seltrans; - 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); // make sure we still have valid objects to move around if (sc->item && SP_OBJECT_DOCUMENT( SP_OBJECT(sc->item))==NULL) { @@ -323,14 +327,14 @@ sp_select_context_item_handler(SPEventContext *event_context, SPItem *item, GdkE sc->moved = FALSE; sp_canvas_force_full_redraw_after_interruptions(desktop->canvas, 5); - + // remember the clicked item in sc->item: if (sc->item) { sp_object_unref(sc->item, NULL); sc->item = NULL; } sc->item = sp_event_context_find_item (desktop, - NR::Point(event->button.x, event->button.y), event->button.state & GDK_MOD1_MASK, FALSE); + Geom::Point(event->button.x, event->button.y), event->button.state & GDK_MOD1_MASK, FALSE); sp_object_ref(sc->item, NULL); rb_escaped = drag_escaped = 0; @@ -357,14 +361,17 @@ sp_select_context_item_handler(SPEventContext *event_context, SPItem *item, GdkE case GDK_ENTER_NOTIFY: { - GdkCursor *cursor = gdk_cursor_new(GDK_FLEUR); - gdk_window_set_cursor(GTK_WIDGET(sp_desktop_canvas(desktop))->window, cursor); - gdk_cursor_destroy(cursor); + if (!desktop->isWaitingCursor()) { + GdkCursor *cursor = gdk_cursor_new(GDK_FLEUR); + gdk_window_set_cursor(GTK_WIDGET(sp_desktop_canvas(desktop))->window, cursor); + gdk_cursor_destroy(cursor); + } break; } case GDK_LEAVE_NOTIFY: - gdk_window_set_cursor(GTK_WIDGET(sp_desktop_canvas(desktop))->window, event_context->cursor); + if (!desktop->isWaitingCursor()) + gdk_window_set_cursor(GTK_WIDGET(sp_desktop_canvas(desktop))->window, event_context->cursor); break; case GDK_KEY_PRESS: @@ -400,10 +407,7 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) SPSelectContext *sc = SP_SELECT_CONTEXT(event_context); Inkscape::SelTrans *seltrans = sc->_seltrans; Inkscape::Selection *selection = sp_desktop_selection(desktop); - gdouble const nudge = prefs_get_double_attribute_limited("options.nudgedistance", "value", 2, 0, 1000); // in px - gdouble const offset = prefs_get_double_attribute_limited("options.defaultscale", "value", 2, 0, 1000); - tolerance = prefs_get_int_attribute_limited("options.dragtolerance", "value", 0, 0, 100); - int const snaps = prefs_get_int_attribute("options.rotationsnapsperpi", "value", 12); + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); // make sure we still have valid objects to move around if (sc->item && SP_OBJECT_DOCUMENT( SP_OBJECT(sc->item))==NULL) { @@ -419,10 +423,13 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) desktop->setCurrentLayer(reinterpret_cast(clicked_item)); sp_desktop_selection(desktop)->clear(); sc->dragging = false; + sp_event_context_discard_delayed_snap_event(event_context); sp_canvas_end_forced_full_redraws(desktop->canvas); } else { // switch tool - tools_switch_by_item (desktop, clicked_item); + Geom::Point const button_pt(event->button.x, event->button.y); + Geom::Point const p(desktop->w2d(button_pt)); + tools_switch_by_item (desktop, clicked_item, p); } } else { sp_select_context_up_one_layer(desktop); @@ -438,11 +445,11 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) yp = (gint) event->button.y; within_tolerance = true; - NR::Point const button_pt(event->button.x, event->button.y); - NR::Point const p(desktop->w2d(button_pt)); + Geom::Point const button_pt(event->button.x, event->button.y); + Geom::Point const p(desktop->w2d(button_pt)); if (event->button.state & GDK_MOD1_MASK) - Inkscape::Rubberband::get()->setMode(RUBBERBAND_MODE_TOUCHPATH); - Inkscape::Rubberband::get()->start(desktop, p); + Inkscape::Rubberband::get(desktop)->setMode(RUBBERBAND_MODE_TOUCHPATH); + Inkscape::Rubberband::get(desktop)->start(desktop, p); if (sc->grabbed) { sp_canvas_item_ungrab(sc->grabbed, event->button.time); sc->grabbed = NULL; @@ -469,9 +476,10 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) break; case GDK_MOTION_NOTIFY: - if (event->motion.state & GDK_BUTTON1_MASK && !event_context->space_panning) { - NR::Point const motion_pt(event->motion.x, event->motion.y); - NR::Point const p(desktop->w2d(motion_pt)); + tolerance = prefs->getIntLimited("/options/dragtolerance/value", 0, 0, 100); + if (event->motion.state & GDK_BUTTON1_MASK && !event_context->space_panning) { + Geom::Point const motion_pt(event->motion.x, event->motion.y); + Geom::Point const p(desktop->w2d(motion_pt)); if ( within_tolerance && ( abs( (gint) event->motion.x - xp ) < tolerance ) @@ -486,7 +494,7 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) if (sc->button_press_ctrl || (sc->button_press_alt && !sc->button_press_shift && !selection->isEmpty())) { // if it's not click and ctrl or alt was pressed (the latter with some selection // but not with shift) we want to drag rather than rubberband - sc->dragging = TRUE; + sc->dragging = TRUE; sp_canvas_force_full_redraw_after_interruptions(desktop->canvas, 5); } @@ -495,21 +503,23 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) /* User has dragged fast, so we get events on root (lauris)*/ // not only that; we will end up here when ctrl-dragging as well // and also when we started within tolerance, but trespassed tolerance outside of item - Inkscape::Rubberband::get()->stop(); + Inkscape::Rubberband::get(desktop)->stop(); SP_EVENT_CONTEXT(sc)->defaultMessageContext()->clear(); - item_at_point = desktop->item_at_point(NR::Point(event->button.x, event->button.y), FALSE); + item_at_point = desktop->item_at_point(Geom::Point(event->button.x, event->button.y), FALSE); if (!item_at_point) // if no item at this point, try at the click point (bug 1012200) - item_at_point = desktop->item_at_point(NR::Point(xp, yp), FALSE); + item_at_point = desktop->item_at_point(Geom::Point(xp, yp), FALSE); if (item_at_point || sc->moved || sc->button_press_alt) { // drag only if starting from an item, or if something is already grabbed, or if alt-dragging if (!sc->moved) { - item_in_group = desktop->item_at_point(NR::Point(event->button.x, event->button.y), TRUE); - group_at_point = desktop->group_at_point(NR::Point(event->button.x, event->button.y)); + item_in_group = desktop->item_at_point(Geom::Point(event->button.x, event->button.y), TRUE); + group_at_point = desktop->group_at_point(Geom::Point(event->button.x, event->button.y)); + if (SP_IS_LAYER(selection->single())) + group_at_point = SP_GROUP(selection->single()); - // group-at-point is meant to be topmost item if it's a group, + // group-at-point is meant to be topmost item if it's a group, // not topmost group of all items at point - if (group_at_point != item_in_group && - !(group_at_point && item_at_point && + if (group_at_point != item_in_group && + !(group_at_point && item_at_point && group_at_point->isAncestorOf(item_at_point))) group_at_point = NULL; @@ -525,23 +535,23 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) if (item_at_point && !selection->includes(item_at_point)) selection->set(item_at_point); } // otherwise, do not change selection so that dragging selected-within-group items, as well as alt-dragging, is possible - seltrans->grab(p, -1, -1, FALSE); + seltrans->grab(p, -1, -1, FALSE, TRUE); sc->moved = TRUE; } if (!seltrans->isEmpty()) seltrans->moveTo(p, event->button.state); - desktop->scroll_to_point(&p); + desktop->scroll_to_point(p); gobble_motion_events(GDK_BUTTON1_MASK); ret = TRUE; } else { sc->dragging = FALSE; - + sp_event_context_discard_delayed_snap_event(event_context); sp_canvas_end_forced_full_redraws(desktop->canvas); } } else { - if (Inkscape::Rubberband::get()->is_started()) { - Inkscape::Rubberband::get()->move(p); - if (Inkscape::Rubberband::get()->getMode() == RUBBERBAND_MODE_TOUCHPATH) { + if (Inkscape::Rubberband::get(desktop)->is_started()) { + Inkscape::Rubberband::get(desktop)->move(p); + if (Inkscape::Rubberband::get(desktop)->getMode() == RUBBERBAND_MODE_TOUCHPATH) { event_context->defaultMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("Draw over objects to select them; release Alt to switch to rubberband selection")); } else { event_context->defaultMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("Drag around objects to select them; press Alt to switch to touch selection")); @@ -567,9 +577,12 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) seltrans->resetState(); selection->toggle(sc->item); } else { + SPObject* single = selection->single(); // without shift, increase state (i.e. toggle scale/rotation handles) if (selection->includes(sc->item)) { seltrans->increaseState(); + } else if (SP_IS_LAYER(single) && single->isAncestorOf(sc->item)) { + seltrans->increaseState(); } else { seltrans->resetState(); selection->set(sc->item); @@ -581,7 +594,7 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) } } sc->dragging = FALSE; - + sp_event_context_discard_delayed_snap_event(event_context); sp_canvas_end_forced_full_redraws(desktop->canvas); if (sc->item) { @@ -589,12 +602,12 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) } sc->item = NULL; } else { - Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get(); + Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get(desktop); if (r->is_started() && !within_tolerance) { // this was a rubberband drag GSList *items = NULL; if (r->getMode() == RUBBERBAND_MODE_RECT) { - NR::Maybe const b = r->getRectangle(); + Geom::OptRect const b = r->getRectangle(); items = sp_document_items_in_box(sp_desktop_document(desktop), desktop->dkey, *b); } else if (r->getMode() == RUBBERBAND_MODE_TOUCHPATH) { items = sp_document_items_at_points(sp_desktop_document(desktop), desktop->dkey, r->getPoints()); @@ -622,12 +635,12 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) if (sc->button_press_ctrl) { // go into groups, honoring Alt item = sp_event_context_find_item (desktop, - NR::Point(event->button.x, event->button.y), event->button.state & GDK_MOD1_MASK, TRUE); + Geom::Point(event->button.x, event->button.y), event->button.state & GDK_MOD1_MASK, TRUE); sc->button_press_ctrl = FALSE; } else { // don't go into groups, honoring Alt item = sp_event_context_find_item (desktop, - NR::Point(event->button.x, event->button.y), event->button.state & GDK_MOD1_MASK, FALSE); + Geom::Point(event->button.x, event->button.y), event->button.state & GDK_MOD1_MASK, FALSE); } if (item) { @@ -638,7 +651,7 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) } else if ((sc->button_press_ctrl || sc->button_press_alt) && !rb_escaped && !drag_escaped) { // ctrl+click, alt+click item = sp_event_context_find_item (desktop, - NR::Point(event->button.x, event->button.y), sc->button_press_alt, sc->button_press_ctrl); + Geom::Point(event->button.x, event->button.y), sc->button_press_alt, sc->button_press_ctrl); sc->button_press_ctrl = FALSE; sc->button_press_alt = FALSE; @@ -668,11 +681,11 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) sp_canvas_item_ungrab(sc->grabbed, event->button.time); sc->grabbed = NULL; } - + desktop->updateNow(); } if (event->button.button == 1) { - Inkscape::Rubberband::get()->stop(); // might have been started in another tool! + Inkscape::Rubberband::get(desktop)->stop(); // might have been started in another tool! } sc->button_press_shift = false; sc->button_press_ctrl = false; @@ -681,8 +694,9 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) case GDK_KEY_PRESS: // keybindings for select context - { - guint keyval = get_group0_keyval(&event->key); + { + { + guint keyval = get_group0_keyval(&event->key); bool alt = ( MOD__ALT || (keyval == GDK_Alt_L) || (keyval == GDK_Alt_R) @@ -692,10 +706,10 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) if (!key_is_a_modifier (keyval)) { event_context->defaultMessageContext()->clear(); } else if (sc->grabbed || seltrans->isGrabbed()) { - if (Inkscape::Rubberband::get()->is_started()) { + if (Inkscape::Rubberband::get(desktop)->is_started()) { // if Alt then change cursor to moving cursor: if (alt) { - Inkscape::Rubberband::get()->setMode(RUBBERBAND_MODE_TOUCHPATH); + Inkscape::Rubberband::get(desktop)->setMode(RUBBERBAND_MODE_TOUCHPATH); } } else { // do not change the statusbar text when mousekey is down to move or transform the object, @@ -708,7 +722,7 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) _("Shift: click to toggle select; drag for rubberband selection"), _("Alt: click to select under; drag to move selected or select by touch")); // if Alt and nonempty selection, show moving cursor ("move selected"): - if (alt && !selection->isEmpty()) { + if (alt && !selection->isEmpty() && !desktop->isWaitingCursor()) { GdkCursor *cursor = gdk_cursor_new(GDK_FLEUR); gdk_window_set_cursor(GTK_WIDGET(sp_desktop_canvas(desktop))->window, cursor); gdk_cursor_destroy(cursor); @@ -716,9 +730,13 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) //*/ break; } - } + } + + gdouble const nudge = prefs->getDoubleLimited("/options/nudgedistance/value", 2, 0, 1000); // in px + gdouble const offset = prefs->getDoubleLimited("/options/defaultscale/value", 2, 0, 1000); + int const snaps = prefs->getInt("/options/rotationsnapsperpi/value", 12); - switch (get_group0_keyval (&event->key)) { + switch (get_group0_keyval (&event->key)) { case GDK_Left: // move selection left case GDK_KP_Left: case GDK_KP_4: @@ -726,12 +744,12 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) gint mul = 1 + gobble_key_events( get_group0_keyval(&event->key), 0); // with any mask if (MOD__ALT) { // alt - if (MOD__SHIFT) sp_selection_move_screen(mul*-10, 0); // shift - else sp_selection_move_screen(mul*-1, 0); // no shift + if (MOD__SHIFT) sp_selection_move_screen(desktop, mul*-10, 0); // shift + else sp_selection_move_screen(desktop, mul*-1, 0); // no shift } else { // no alt - if (MOD__SHIFT) sp_selection_move(mul*-10*nudge, 0); // shift - else sp_selection_move(mul*-nudge, 0); // no shift + if (MOD__SHIFT) sp_selection_move(desktop, mul*-10*nudge, 0); // shift + else sp_selection_move(desktop, mul*-nudge, 0); // no shift } ret = TRUE; } @@ -743,12 +761,12 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) gint mul = 1 + gobble_key_events( get_group0_keyval(&event->key), 0); // with any mask if (MOD__ALT) { // alt - if (MOD__SHIFT) sp_selection_move_screen(0, mul*10); // shift - else sp_selection_move_screen(0, mul*1); // no shift + if (MOD__SHIFT) sp_selection_move_screen(desktop, 0, mul*10); // shift + else sp_selection_move_screen(desktop, 0, mul*1); // no shift } else { // no alt - if (MOD__SHIFT) sp_selection_move(0, mul*10*nudge); // shift - else sp_selection_move(0, mul*nudge); // no shift + if (MOD__SHIFT) sp_selection_move(desktop, 0, mul*10*nudge); // shift + else sp_selection_move(desktop, 0, mul*nudge); // no shift } ret = TRUE; } @@ -760,12 +778,12 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) gint mul = 1 + gobble_key_events( get_group0_keyval(&event->key), 0); // with any mask if (MOD__ALT) { // alt - if (MOD__SHIFT) sp_selection_move_screen(mul*10, 0); // shift - else sp_selection_move_screen(mul*1, 0); // no shift + if (MOD__SHIFT) sp_selection_move_screen(desktop, mul*10, 0); // shift + else sp_selection_move_screen(desktop, mul*1, 0); // no shift } else { // no alt - if (MOD__SHIFT) sp_selection_move(mul*10*nudge, 0); // shift - else sp_selection_move(mul*nudge, 0); // no shift + if (MOD__SHIFT) sp_selection_move(desktop, mul*10*nudge, 0); // shift + else sp_selection_move(desktop, mul*nudge, 0); // no shift } ret = TRUE; } @@ -777,12 +795,12 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) gint mul = 1 + gobble_key_events( get_group0_keyval(&event->key), 0); // with any mask if (MOD__ALT) { // alt - if (MOD__SHIFT) sp_selection_move_screen(0, mul*-10); // shift - else sp_selection_move_screen(0, mul*-1); // no shift + if (MOD__SHIFT) sp_selection_move_screen(desktop, 0, mul*-10); // shift + else sp_selection_move_screen(desktop, 0, mul*-1); // no shift } else { // no alt - if (MOD__SHIFT) sp_selection_move(0, mul*-10*nudge); // shift - else sp_selection_move(0, mul*-nudge); // no shift + if (MOD__SHIFT) sp_selection_move(desktop, 0, mul*-10*nudge); // shift + else sp_selection_move(desktop, 0, mul*-nudge); // no shift } ret = TRUE; } @@ -795,7 +813,7 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) case GDK_a: case GDK_A: if (MOD__CTRL_ONLY) { - sp_edit_select_all(); + sp_edit_select_all(desktop); ret = TRUE; } break; @@ -897,11 +915,11 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) } ret = TRUE; } - break; + break; case GDK_g: case GDK_G: if (MOD__SHIFT_ONLY) { - sp_selection_to_guides(); + sp_selection_to_guides(desktop); ret = true; } break; @@ -909,7 +927,7 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) break; } break; - + } case GDK_KEY_RELEASE: { guint keyval = get_group0_keyval(&event->key); @@ -922,15 +940,17 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) || (keyval == GDK_Meta_L) || (keyval == GDK_Meta_R)); - if (Inkscape::Rubberband::get()->is_started()) { + if (Inkscape::Rubberband::get(desktop)->is_started()) { // if Alt then change cursor to moving cursor: if (alt) { - Inkscape::Rubberband::get()->setMode(RUBBERBAND_MODE_RECT); + Inkscape::Rubberband::get(desktop)->setMode(RUBBERBAND_MODE_RECT); } } } // set cursor to default. - gdk_window_set_cursor(GTK_WIDGET(sp_desktop_canvas(desktop))->window, event_context->cursor); + if (!desktop->isWaitingCursor()) { + gdk_window_set_cursor(GTK_WIDGET(sp_desktop_canvas(desktop))->window, event_context->cursor); + } break; default: break;