X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fselect-context.cpp;h=96758a9f13d76f528b352fc533cad02f202fc6cf;hb=14185113825510bc55f5816898cee659fd06befe;hp=7c966c9b9114f44adbf2a123da7d8c3de4761b80;hpb=ff2c8039c77b58341e28cf90953cdd1f0fe68a16;p=inkscape.git diff --git a/src/select-context.cpp b/src/select-context.cpp index 7c966c9b9..96758a9f1 100644 --- a/src/select-context.cpp +++ b/src/select-context.cpp @@ -1,11 +1,10 @@ -#define __SP_SELECT_CONTEXT_C__ - /* * Selection and transformation context * * Authors: * Lauris Kaplinski * bulia byak + * Abhishek Sharma * * Copyright (C) 2006 Johan Engelen * Copyright (C) 1999-2005 Authors @@ -35,19 +34,22 @@ #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" +#include "display/nr-arena-item.h" + +using Inkscape::DocumentUndo; 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); @@ -98,6 +100,22 @@ sp_select_context_class_init(SPSelectContextClass *klass) event_context_class->set = sp_select_context_set; event_context_class->root_handler = sp_select_context_root_handler; event_context_class->item_handler = sp_select_context_item_handler; +} + +static void +sp_select_context_init(SPSelectContext *sc) +{ + sc->dragging = FALSE; + sc->moved = FALSE; + sc->button_press_shift = false; + sc->button_press_ctrl = false; + sc->button_press_alt = false; + sc->is_cycling = false; + sc->cycling_items = NULL; + sc->cycling_items_selected_before = NULL; + sc->cycling_cur_item = NULL; + sc->_seltrans = NULL; + sc->_describer = NULL; // cursors in select context CursorSelectMouseover = sp_cursor_new_from_xpm(cursor_select_m_xpm , 1, 1); @@ -116,19 +134,6 @@ sp_select_context_class_init(SPSelectContextClass *klass) handles[10] = gdk_pixbuf_new_from_xpm_data((gchar const **)handle_rotate_sw_xpm); handles[11] = gdk_pixbuf_new_from_xpm_data((gchar const **)handle_rotate_w_xpm); handles[12] = gdk_pixbuf_new_from_xpm_data((gchar const **)handle_center_xpm); - -} - -static void -sp_select_context_init(SPSelectContext *sc) -{ - sc->dragging = FALSE; - sc->moved = FALSE; - sc->button_press_shift = false; - sc->button_press_ctrl = false; - sc->button_press_alt = false; - sc->_seltrans = NULL; - sc->_describer = NULL; } static void @@ -172,25 +177,32 @@ sp_select_context_setup(SPEventContext *ec) SPDesktop *desktop = ec->desktop; - select_context->_describer = new Inkscape::SelectionDescriber(desktop->selection, desktop->messageStack()); + select_context->_describer = new Inkscape::SelectionDescriber( + desktop->selection, + desktop->messageStack(), + _("Click selection to toggle scale/rotation handles"), + _("No objects selected. Click, Shift+click, Alt+scroll mouse on top of objects, or drag around objects to select.") + ); select_context->_seltrans = new Inkscape::SelTrans(desktop); 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,12 +222,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_desktop_document(desktop)); + DocumentUndo::undo(sp_desktop_document(desktop)); } sp_object_unref( SP_OBJECT(sc->item), NULL); @@ -223,7 +236,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_desktop_document(desktop)); + DocumentUndo::undo(sp_desktop_document(desktop)); } sc->item = NULL; @@ -293,7 +306,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) { @@ -322,15 +336,17 @@ sp_select_context_item_handler(SPEventContext *event_context, SPItem *item, GdkE sc->dragging = TRUE; sc->moved = FALSE; + gdk_window_set_cursor(GTK_WIDGET(sp_desktop_canvas(desktop))->window, CursorSelectDragging); + 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 +373,15 @@ 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() && !sc->dragging) { + gdk_window_set_cursor(GTK_WIDGET(sp_desktop_canvas(desktop))->window, CursorSelectMouseover); + } break; } case GDK_LEAVE_NOTIFY: - gdk_window_set_cursor(GTK_WIDGET(sp_desktop_canvas(desktop))->window, event_context->cursor); + if (!desktop->isWaitingCursor() && !sc->dragging) + gdk_window_set_cursor(GTK_WIDGET(sp_desktop_canvas(desktop))->window, event_context->cursor); break; case GDK_KEY_PRESS: @@ -389,6 +406,43 @@ sp_select_context_item_handler(SPEventContext *event_context, SPItem *item, GdkE return ret; } +static void +sp_select_context_cycle_through_items(SPSelectContext *sc, Inkscape::Selection *selection, GdkEventScroll *scroll_event, bool shift_pressed) { + if (!sc->cycling_cur_item) + return; + + NRArenaItem *arenaitem; + SPDesktop *desktop = SP_EVENT_CONTEXT(sc)->desktop; + SPItem *item = SP_ITEM(sc->cycling_cur_item->data); + + // Deactivate current item + if (!g_list_find(sc->cycling_items_selected_before, item) && selection->includes(item)) + selection->remove(item); + arenaitem = item->get_arenaitem(desktop->dkey); + nr_arena_item_set_opacity (arenaitem, 0.3); + + // Find next item and activate it + GList *next; + if (scroll_event->direction == GDK_SCROLL_UP) { + next = sc->cycling_cur_item->next; + if (next == NULL) + next = sc->cycling_items; + } else { + next = sc->cycling_cur_item->prev; + if (next == NULL) + next = g_list_last(sc->cycling_items); + } + sc->cycling_cur_item = next; + item = SP_ITEM(sc->cycling_cur_item->data); + arenaitem = item->get_arenaitem(desktop->dkey); + nr_arena_item_set_opacity (arenaitem, 1.0); + + if (shift_pressed) + selection->add(item); + else + selection->set(item); +} + static gint sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) { @@ -400,10 +454,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 +470,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,8 +492,8 @@ 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(desktop)->setMode(RUBBERBAND_MODE_TOUCHPATH); Inkscape::Rubberband::get(desktop)->start(desktop, p); @@ -469,9 +523,26 @@ 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)); + { + SPSelectContext *sc = SP_SELECT_CONTEXT(event_context); + if (sc->is_cycling) { + // Abort cycle-select + NRArenaItem *arenaitem; + for (GList *l = sc->cycling_items; l != NULL; l = g_list_next(l)) { + arenaitem = item->get_arenaitem(desktop->dkey); + nr_arena_item_set_opacity (arenaitem, 1.0); + } + g_list_free(sc->cycling_items); + g_list_free(sc->cycling_items_selected_before); + sc->cycling_items = NULL; + sc->cycling_cur_item = NULL; + sc->is_cycling = false; + } + + 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 +557,8 @@ 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; + gdk_window_set_cursor(GTK_WIDGET(sp_desktop_canvas(desktop))->window, CursorSelectDragging); sp_canvas_force_full_redraw_after_interruptions(desktop->canvas, 5); } @@ -497,19 +569,21 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) // and also when we started within tolerance, but trespassed tolerance outside of item 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->getItemAtPoint(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->getItemAtPoint(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->getItemAtPoint(Geom::Point(event->button.x, event->button.y), TRUE); + group_at_point = desktop->getGroupAtPoint(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,17 +599,17 @@ 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 { @@ -551,6 +625,7 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) } } break; + } case GDK_BUTTON_RELEASE: xp = yp = 0; if ((event->button.button == 1) && (sc->grabbed) && !event_context->space_panning) { @@ -567,9 +642,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 +659,8 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) } } sc->dragging = FALSE; - + gdk_window_set_cursor(GTK_WIDGET(sp_desktop_canvas(desktop))->window, CursorSelectMouseover); + sp_event_context_discard_delayed_snap_event(event_context); sp_canvas_end_forced_full_redraws(desktop->canvas); if (sc->item) { @@ -589,15 +668,15 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) } sc->item = NULL; } else { - Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get(desktop); + Inkscape::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) { - boost::optional const b = r->getRectangle(); - items = sp_document_items_in_box(sp_desktop_document(desktop), desktop->dkey, *b); + Geom::OptRect const b = r->getRectangle(); + items = sp_desktop_document(desktop)->getItemsInBox(desktop->dkey, *b); } else if (r->getMode() == RUBBERBAND_MODE_TOUCHPATH) { - items = sp_document_items_at_points(sp_desktop_document(desktop), desktop->dkey, r->getPoints()); + items = sp_desktop_document(desktop)->getItemsAtPoints(desktop->dkey, r->getPoints()); } seltrans->resetState(); @@ -622,12 +701,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 +717,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,7 +747,7 @@ 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) { @@ -679,10 +758,47 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) sc->button_press_alt = false; break; + case GDK_SCROLL: + { + SPSelectContext *sc = SP_SELECT_CONTEXT(event_context); + GdkEventScroll *scroll_event = (GdkEventScroll*) event; + + if (scroll_event->state & GDK_MOD1_MASK) { // alt modified pressed + bool shift_pressed = scroll_event->state & GDK_SHIFT_MASK; + + if(sc->is_cycling == false) { + // Build a list of items underneath the mouse pointer (for cycle-selection) and reduce their opacity + Geom::Point p = desktop->d2w(desktop->point()); + SPItem *item = desktop->getItemAtPoint(p, true, NULL); + while(item != NULL) { + sc->cycling_items = g_list_append(sc->cycling_items, item); + if (selection->includes(item)) { + // already selected items are stored separately, too + sc->cycling_items_selected_before = g_list_append(sc->cycling_items_selected_before, item); + } + NRArenaItem *arenaitem = item->get_arenaitem(desktop->dkey); + nr_arena_item_set_opacity (arenaitem, 0.3); + + item = desktop->getItemAtPoint(p, true, item); + } + // Here we set the current item to the bottommost one so that the cycling step below re-starts at the top + sc->cycling_cur_item = g_list_last(sc->cycling_items); + sc->is_cycling = true; + } + + // Cycle through the items underneath the mouse pointer, one-by-one + sp_select_context_cycle_through_items(sc, selection, scroll_event, shift_pressed); + + ret = TRUE; + } + break; + } + 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) @@ -706,19 +822,21 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) sp_event_show_modifier_tip (event_context->defaultMessageContext(), event, _("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")); + _("Alt: click to select under; scroll mouse-wheel to cycle-select; drag to move selected or select by touch")); // if Alt and nonempty selection, show moving cursor ("move selected"): - if (alt && !selection->isEmpty()) { - GdkCursor *cursor = gdk_cursor_new(GDK_FLEUR); - gdk_window_set_cursor(GTK_WIDGET(sp_desktop_canvas(desktop))->window, cursor); - gdk_cursor_destroy(cursor); + if (alt && !selection->isEmpty() && !desktop->isWaitingCursor()) { + gdk_window_set_cursor(GTK_WIDGET(sp_desktop_canvas(desktop))->window, CursorSelectDragging); } //*/ 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: @@ -792,6 +910,7 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) selection->clear(); ret = TRUE; break; + case GDK_a: case GDK_A: if (MOD__CTRL_ONLY) { @@ -897,7 +1016,7 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) } ret = TRUE; } - break; + break; case GDK_g: case GDK_G: if (MOD__SHIFT_ONLY) { @@ -909,7 +1028,7 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) break; } break; - + } case GDK_KEY_RELEASE: { guint keyval = get_group0_keyval(&event->key); @@ -927,10 +1046,29 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) if (alt) { Inkscape::Rubberband::get(desktop)->setMode(RUBBERBAND_MODE_RECT); } + } else { + if (alt && sc->is_cycling) { + // quit cycle-selection and reset opacities + SPSelectContext *sc = SP_SELECT_CONTEXT(event_context); + NRArenaItem *arenaitem; + for (GList *l = sc->cycling_items; l != NULL; l = g_list_next(l)) { + arenaitem = SP_ITEM(l->data)->get_arenaitem(desktop->dkey); + nr_arena_item_set_opacity (arenaitem, 1.0); + } + g_list_free(sc->cycling_items); + g_list_free(sc->cycling_items_selected_before); + sc->cycling_items = NULL; + sc->cycling_items_selected_before = NULL; + sc->cycling_cur_item = NULL; + sc->is_cycling = false; + } } + } // 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;