X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fselect-context.cpp;h=606934ca6f3d9f451fb9854e19a1db9b94ef177e;hb=07f872bd2a4fee3c346819cbaf5af6627e698499;hp=bda4012c7b832aa956b121898c206f1967d8870d;hpb=6b15695578f07a3f72c4c9475c1a261a3021472a;p=inkscape.git diff --git a/src/select-context.cpp b/src/select-context.cpp index bda4012c7..606934ca6 100644 --- a/src/select-context.cpp +++ b/src/select-context.cpp @@ -3,11 +3,12 @@ /* * Selection and transformation context * - * Author: + * Authors: * Lauris Kaplinski * bulia byak - * - * Copyright (C) 1999-2005 authors + * + * Copyright (C) 2006 Johan Engelen + * Copyright (C) 1999-2005 Authors * * Released under GNU GPL, read the file 'COPYING' for more information */ @@ -15,6 +16,8 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif +#include +#include #include #include "macros.h" #include "rubberband.h" @@ -32,18 +35,19 @@ #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" #include "seltrans.h" +#include "box3d.h" static void sp_select_context_class_init(SPSelectContextClass *klass); 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); @@ -175,23 +179,25 @@ 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); } - } + } } static bool @@ -206,12 +212,13 @@ 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) { // only undo if the item is still valid if (SP_OBJECT_DOCUMENT( SP_OBJECT(sc->item))) { - sp_document_undo(SP_DT_DOCUMENT(desktop)); + sp_document_undo(sp_desktop_document(desktop)); } sp_object_unref( SP_OBJECT(sc->item), NULL); @@ -219,7 +226,7 @@ sp_select_context_abort(SPEventContext *event_context) // NOTE: This is a workaround to a bug. // When the ctrl key is held, sc->item is not defined // so in this case (only), we skip the object doc check - sp_document_undo(SP_DT_DOCUMENT(desktop)); + sp_document_undo(sp_desktop_document(desktop)); } sc->item = NULL; @@ -227,18 +234,18 @@ sp_select_context_abort(SPEventContext *event_context) return true; } } else { - NR::Maybe const b = Inkscape::Rubberband::get()->getRectangle(); - if (b != NR::Nothing()) { - 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.")); return true; - } + } } return false; } -bool +bool key_is_a_modifier (guint key) { return (key == GDK_Alt_L || key == GDK_Alt_R || @@ -275,7 +282,7 @@ sp_select_context_up_one_layer(SPDesktop *desktop) { desktop->setCurrentLayer(parent); if (SP_IS_GROUP(current_layer) && SPGroup::LAYER != SP_GROUP(current_layer)->layerMode()) - SP_DT_SELECTION(desktop)->set(current_layer); + sp_desktop_selection(desktop)->set(current_layer); } } } @@ -289,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) { @@ -298,7 +306,7 @@ sp_select_context_item_handler(SPEventContext *event_context, SPItem *item, GdkE switch (event->type) { case GDK_BUTTON_PRESS: - if (event->button.button == 1) { + if (event->button.button == 1 && !event_context->space_panning) { /* Left mousebutton */ // save drag origin @@ -311,26 +319,38 @@ sp_select_context_item_handler(SPEventContext *event_context, SPItem *item, GdkE sc->button_press_ctrl = (event->button.state & GDK_CONTROL_MASK) ? true : false; sc->button_press_alt = (event->button.state & GDK_MOD1_MASK) ? true : false; - if (event->button.state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK)) { + if (event->button.state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK | GDK_MOD1_MASK)) { // if shift or ctrl was pressed, do not move objects; // pass the event to root handler which will perform rubberband, shift-click, ctrl-click, ctrl-drag } else { sc->dragging = TRUE; sc->moved = FALSE; + sp_canvas_force_full_redraw_after_interruptions(desktop->canvas, 5); + // remember the clicked item in sc->item: - sc->item = sp_event_context_find_item (desktop, - NR::Point(event->button.x, event->button.y), event->button.state & GDK_MOD1_MASK, FALSE); + if (sc->item) { + sp_object_unref(sc->item, NULL); + sc->item = NULL; + } + sc->item = sp_event_context_find_item (desktop, + 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; + if (sc->grabbed) { + sp_canvas_item_ungrab(sc->grabbed, event->button.time); + sc->grabbed = NULL; + } sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->drawing), - GDK_KEY_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_PRESS_MASK | + GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_PRESS_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK, NULL, event->button.time); sc->grabbed = SP_CANVAS_ITEM(desktop->drawing); + sp_canvas_force_full_redraw_after_interruptions(desktop->canvas, 5); + ret = TRUE; } } else if (event->button.button == 3) { @@ -341,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_DT_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_DT_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: @@ -383,11 +406,8 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) SPDesktop *desktop = event_context->desktop; SPSelectContext *sc = SP_SELECT_CONTEXT(event_context); Inkscape::SelTrans *seltrans = sc->_seltrans; - Inkscape::Selection *selection = SP_DT_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::Selection *selection = sp_desktop_selection(desktop); + 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) { @@ -399,12 +419,17 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) if (event->button.button == 1) { if (!selection->isEmpty()) { SPItem *clicked_item = (SPItem *) selection->itemList()->data; - if (SP_IS_GROUP (clicked_item)) { // enter group + if (SP_IS_GROUP(clicked_item) && !SP_IS_BOX3D(clicked_item)) { // enter group if it's not a 3D box desktop->setCurrentLayer(reinterpret_cast(clicked_item)); - SP_DT_SELECTION(desktop)->clear(); + 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); @@ -413,18 +438,24 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) } break; case GDK_BUTTON_PRESS: - if (event->button.button == 1) { + if (event->button.button == 1 && !event_context->space_panning) { // save drag origin xp = (gint) event->button.x; 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)); - Inkscape::Rubberband::get()->start(desktop, p); + 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(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; + } sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate), - GDK_KEY_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK, + GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK, NULL, event->button.time); sc->grabbed = SP_CANVAS_ITEM(desktop->acetate); @@ -445,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) { - 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 ) @@ -459,22 +491,38 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) // motion notify coordinates as given (no snapping back to origin) within_tolerance = false; - if (sc->button_press_ctrl || sc->button_press_alt) // if ctrl or alt was pressed and it's not click, we want to drag rather than rubberband - sc->dragging = TRUE; + 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; + + sp_canvas_force_full_redraw_after_interruptions(desktop->canvas, 5); + } if (sc->dragging) { /* 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(); - item_at_point = desktop->item_at_point(NR::Point(event->button.x, event->button.y), FALSE); + Inkscape::Rubberband::get(desktop)->stop(); + SP_EVENT_CONTEXT(sc)->defaultMessageContext()->clear(); + 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); - if (item_at_point || sc->moved || sc->button_press_alt) { + 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, + // not topmost group of all items 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; + // if neither a group nor an item (possibly in a group) at point are selected, set selection to the item at point if ((!item_in_group || !selection->includes(item_in_group)) && (!group_at_point || !selection->includes(group_at_point)) @@ -487,27 +535,35 @@ 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); - if (desktop->scroll_to_point(&p)) - // unfortunately in complex drawings, gobbling results in losing grab of the object, for some mysterious reason - ; //gobble_motion_events(GDK_BUTTON1_MASK); + 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 { - Inkscape::Rubberband::get()->move(p); - gobble_motion_events(GDK_BUTTON1_MASK); + 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")); + } + gobble_motion_events(GDK_BUTTON1_MASK); + } } } break; case GDK_BUTTON_RELEASE: xp = yp = 0; - if ((event->button.button == 1) && (sc->grabbed)) { + if ((event->button.button == 1) && (sc->grabbed) && !event_context->space_panning) { if (sc->dragging) { if (sc->moved) { // item has been moved @@ -521,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); @@ -535,18 +594,29 @@ 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) { sp_object_unref( SP_OBJECT(sc->item), NULL); } sc->item = NULL; } else { - NR::Maybe const b = Inkscape::Rubberband::get()->getRectangle(); - if (b != NR::Nothing() && !within_tolerance) { + Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get(desktop); + if (r->is_started() && !within_tolerance) { // this was a rubberband drag - Inkscape::Rubberband::get()->stop(); + GSList *items = NULL; + if (r->getMode() == RUBBERBAND_MODE_RECT) { + 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()); + } + seltrans->resetState(); - // find out affected items: - GSList *items = sp_document_items_in_box(SP_DT_DOCUMENT(desktop), desktop->dkey, b.assume()); + r->stop(); + SP_EVENT_CONTEXT(sc)->defaultMessageContext()->clear(); + if (event->button.state & GDK_SHIFT_MASK) { // with shift, add to selection selection->addList (items); @@ -556,21 +626,21 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) } g_slist_free (items); } else { // it was just a click, or a too small rubberband - Inkscape::Rubberband::get()->stop(); + r->stop(); if (sc->button_press_shift && !rb_escaped && !drag_escaped) { - // this was a shift-click, select what was clicked upon + // this was a shift+click or alt+shift+click, select what was clicked upon sc->button_press_shift = false; 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); + item = sp_event_context_find_item (desktop, + 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); + item = sp_event_context_find_item (desktop, + Geom::Point(event->button.x, event->button.y), event->button.state & GDK_MOD1_MASK, FALSE); } if (item) { @@ -578,12 +648,13 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) item = NULL; } - } else if (sc->button_press_ctrl && !rb_escaped && !drag_escaped) { // ctrl-click + } else if ((sc->button_press_ctrl || sc->button_press_alt) && !rb_escaped && !drag_escaped) { // ctrl+click, alt+click - sc->button_press_ctrl = FALSE; + item = sp_event_context_find_item (desktop, + Geom::Point(event->button.x, event->button.y), sc->button_press_alt, sc->button_press_ctrl); - item = sp_event_context_find_item (desktop, - NR::Point(event->button.x, event->button.y), event->button.state & GDK_MOD1_MASK, TRUE); + sc->button_press_ctrl = FALSE; + sc->button_press_alt = FALSE; if (item) { if (selection->includes(item)) { @@ -610,6 +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(desktop)->stop(); // might have been started in another tool! } sc->button_press_shift = false; sc->button_press_ctrl = false; @@ -618,28 +694,62 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) case GDK_KEY_PRESS: // keybindings for select context - if (!key_is_a_modifier (get_group0_keyval (&event->key))) { + { + { + guint keyval = get_group0_keyval(&event->key); + bool alt = ( MOD__ALT + || (keyval == GDK_Alt_L) + || (keyval == GDK_Alt_R) + || (keyval == GDK_Meta_L) + || (keyval == GDK_Meta_R)); + + if (!key_is_a_modifier (keyval)) { event_context->defaultMessageContext()->clear(); + } else if (sc->grabbed || seltrans->isGrabbed()) { + if (Inkscape::Rubberband::get(desktop)->is_started()) { + // if Alt then change cursor to moving cursor: + if (alt) { + 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, + // because the statusbar text is already updated somewhere else. + break; + } } else { sp_event_show_modifier_tip (event_context->defaultMessageContext(), event, - _("Ctrl: select in groups, move hor/vert"), - _("Shift: toggle select, force rubberband, disable snapping"), - _("Alt: select under, move selected")); + _("Ctrl: click to select in groups; drag to move hor/vert"), + _("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() && !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; } + } + + 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: if (!MOD__CTRL) { // not ctrl + 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(-10, 0); // shift - else sp_selection_move_screen(-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(-10*nudge, 0); // shift - else sp_selection_move(-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; } @@ -648,13 +758,15 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) case GDK_KP_Up: case GDK_KP_8: if (!MOD__CTRL) { // not ctrl + 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, 10); // shift - else sp_selection_move_screen(0, 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, 10*nudge); // shift - else sp_selection_move(0, 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; } @@ -663,13 +775,15 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) case GDK_KP_Right: case GDK_KP_6: if (!MOD__CTRL) { // not ctrl + 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(10, 0); // shift - else sp_selection_move_screen(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(10*nudge, 0); // shift - else sp_selection_move(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; } @@ -678,13 +792,15 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) case GDK_KP_Down: case GDK_KP_2: if (!MOD__CTRL) { // not ctrl + 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, -10); // shift - else sp_selection_move_screen(0, -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, -10*nudge); // shift - else sp_selection_move(0, -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; } @@ -697,19 +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(); - ret = TRUE; - } - break; - case GDK_Tab: // Tab - cycle selection forward - if (!(MOD__CTRL_ONLY || (MOD__CTRL && MOD__SHIFT))) { - sp_selection_item_next(); - ret = TRUE; - } - break; - case GDK_ISO_Left_Tab: // Shift Tab - cycle selection backward - if (!(MOD__CTRL_ONLY || (MOD__CTRL && MOD__SHIFT))) { - sp_selection_item_prev(); + sp_edit_select_all(desktop); ret = TRUE; } break; @@ -730,7 +834,9 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) break; case GDK_bracketleft: if (MOD__ALT) { - sp_selection_rotate_screen(selection, 1); + gint mul = 1 + gobble_key_events( + get_group0_keyval(&event->key), 0); // with any mask + sp_selection_rotate_screen(selection, mul*1); } else if (MOD__CTRL) { sp_selection_rotate(selection, 90); } else if (snaps) { @@ -740,7 +846,9 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) break; case GDK_bracketright: if (MOD__ALT) { - sp_selection_rotate_screen(selection, -1); + gint mul = 1 + gobble_key_events( + get_group0_keyval(&event->key), 0); // with any mask + sp_selection_rotate_screen(selection, -1*mul); } else if (MOD__CTRL) { sp_selection_rotate(selection, -90); } else if (snaps) { @@ -751,22 +859,30 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) case GDK_less: case GDK_comma: if (MOD__ALT) { - sp_selection_scale_screen(selection, -2); + gint mul = 1 + gobble_key_events( + get_group0_keyval(&event->key), 0); // with any mask + sp_selection_scale_screen(selection, -2*mul); } else if (MOD__CTRL) { sp_selection_scale_times(selection, 0.5); } else { - sp_selection_scale(selection, -offset); + gint mul = 1 + gobble_key_events( + get_group0_keyval(&event->key), 0); // with any mask + sp_selection_scale(selection, -offset*mul); } ret = TRUE; break; case GDK_greater: case GDK_period: if (MOD__ALT) { - sp_selection_scale_screen(selection, 2); + gint mul = 1 + gobble_key_events( + get_group0_keyval(&event->key), 0); // with any mask + sp_selection_scale_screen(selection, 2*mul); } else if (MOD__CTRL) { sp_selection_scale_times(selection, 2); } else { - sp_selection_scale(selection, offset); + gint mul = 1 + gobble_key_events( + get_group0_keyval(&event->key), 0); // with any mask + sp_selection_scale(selection, offset*mul); } ret = TRUE; break; @@ -774,9 +890,10 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) if (MOD__CTRL_ONLY) { if (selection->singleItem()) { SPItem *clicked_item = selection->singleItem(); - if (SP_IS_GROUP (clicked_item)) { // enter group + if ( SP_IS_GROUP(clicked_item) || + SP_IS_BOX3D(clicked_item)) { // enter group or a 3D box desktop->setCurrentLayer(reinterpret_cast(clicked_item)); - SP_DT_SELECTION(desktop)->clear(); + sp_desktop_selection(desktop)->clear(); } else { SP_EVENT_CONTEXT(sc)->desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Selected object is not a group. Cannot enter.")); } @@ -790,13 +907,50 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) ret = TRUE; } break; + case GDK_s: + case GDK_S: + if (MOD__SHIFT_ONLY) { + if (!selection->isEmpty()) { + seltrans->increaseState(); + } + ret = TRUE; + } + break; + case GDK_g: + case GDK_G: + if (MOD__SHIFT_ONLY) { + sp_selection_to_guides(desktop); + ret = true; + } + break; default: break; } break; + } case GDK_KEY_RELEASE: - if (key_is_a_modifier (get_group0_keyval (&event->key))) + { + guint keyval = get_group0_keyval(&event->key); + if (key_is_a_modifier (keyval)) event_context->defaultMessageContext()->clear(); + + bool alt = ( MOD__ALT + || (keyval == GDK_Alt_L) + || (keyval == GDK_Alt_R) + || (keyval == GDK_Meta_L) + || (keyval == GDK_Meta_R)); + + if (Inkscape::Rubberband::get(desktop)->is_started()) { + // if Alt then change cursor to moving cursor: + if (alt) { + Inkscape::Rubberband::get(desktop)->setMode(RUBBERBAND_MODE_RECT); + } + } + } + // set cursor to default. + if (!desktop->isWaitingCursor()) { + gdk_window_set_cursor(GTK_WIDGET(sp_desktop_canvas(desktop))->window, event_context->cursor); + } break; default: break;