X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fselect-context.cpp;h=e1649e34f164b07d8bba7fb44bf8512ee8ec3378;hb=5efc89d7a5830b387c1362a077c82980c5624174;hp=d5288117ca057b231fae1a3d322b95dbcdb6e29e;hpb=1391834bee278d740c12201a5f258cd1eda044c1;p=inkscape.git diff --git a/src/select-context.cpp b/src/select-context.cpp index d5288117c..e1649e34f 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 */ @@ -211,7 +212,7 @@ sp_select_context_abort(SPEventContext *event_context) 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 +220,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; @@ -228,12 +229,12 @@ sp_select_context_abort(SPEventContext *event_context) } } else { NR::Maybe const b = Inkscape::Rubberband::get()->getRectangle(); - if (b != NR::Nothing()) { + if (b) { Inkscape::Rubberband::get()->stop(); rb_escaped = 1; SP_EVENT_CONTEXT(sc)->desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Selection canceled.")); return true; - } + } } return false; } @@ -275,7 +276,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); } } } @@ -318,19 +319,27 @@ sp_select_context_item_handler(SPEventContext *event_context, SPItem *item, GdkE 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, + sc->item = sp_event_context_find_item (desktop, NR::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_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK, + GDK_POINTER_MOTION_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) { @@ -342,13 +351,13 @@ 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_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); + gdk_window_set_cursor(GTK_WIDGET(sp_desktop_canvas(desktop))->window, event_context->cursor); break; case GDK_KEY_PRESS: @@ -383,7 +392,7 @@ 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); + 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); @@ -401,8 +410,10 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) SPItem *clicked_item = (SPItem *) selection->itemList()->data; if (SP_IS_GROUP (clicked_item)) { // enter group desktop->setCurrentLayer(reinterpret_cast(clicked_item)); - SP_DT_SELECTION(desktop)->clear(); + sp_desktop_selection(desktop)->clear(); sc->dragging = false; + + sp_canvas_end_forced_full_redraws(desktop->canvas); } else { // switch tool tools_switch_by_item (desktop, clicked_item); } @@ -423,6 +434,10 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) 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); + 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, NULL, event->button.time); @@ -459,9 +474,13 @@ 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 + 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; + 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 @@ -470,7 +489,7 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) item_at_point = desktop->item_at_point(NR::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) { + 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); @@ -498,10 +517,14 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) ret = TRUE; } else { sc->dragging = FALSE; + + sp_canvas_end_forced_full_redraws(desktop->canvas); } } else { - Inkscape::Rubberband::get()->move(p); - gobble_motion_events(GDK_BUTTON1_MASK); + if (Inkscape::Rubberband::get()->is_started()) { + Inkscape::Rubberband::get()->move(p); + gobble_motion_events(GDK_BUTTON1_MASK); + } } } break; @@ -535,18 +558,21 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) } } sc->dragging = FALSE; + + 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) { + if (b && !within_tolerance) { // this was a rubberband drag Inkscape::Rubberband::get()->stop(); seltrans->resetState(); // find out affected items: - GSList *items = sp_document_items_in_box(SP_DT_DOCUMENT(desktop), desktop->dkey, b.assume()); + GSList *items = sp_document_items_in_box(sp_desktop_document(desktop), desktop->dkey, *b); if (event->button.state & GDK_SHIFT_MASK) { // with shift, add to selection selection->addList (items); @@ -564,12 +590,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, + 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; } else { // don't go into groups, honoring Alt - item = sp_event_context_find_item (desktop, + item = sp_event_context_find_item (desktop, NR::Point(event->button.x, event->button.y), event->button.state & GDK_MOD1_MASK, FALSE); } @@ -582,7 +608,7 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) sc->button_press_ctrl = FALSE; - item = sp_event_context_find_item (desktop, + item = sp_event_context_find_item (desktop, NR::Point(event->button.x, event->button.y), event->button.state & GDK_MOD1_MASK, TRUE); if (item) { @@ -610,6 +636,8 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) sp_canvas_item_ungrab(sc->grabbed, event->button.time); sc->grabbed = NULL; } + + desktop->updateNow(); } sc->button_press_shift = false; sc->button_press_ctrl = false; @@ -620,11 +648,28 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) if (!key_is_a_modifier (get_group0_keyval (&event->key))) { event_context->defaultMessageContext()->clear(); + } else if (sc->grabbed || seltrans->isGrabbed()) { + // 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")); + // if Alt then change cursor to moving cursor: + 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 (alt) { + GdkCursor *cursor = gdk_cursor_new(GDK_FLEUR); + gdk_window_set_cursor(GTK_WIDGET(sp_desktop_canvas(desktop))->window, cursor); + gdk_cursor_destroy(cursor); + } + //*/ break; } @@ -701,18 +746,6 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) 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(); - ret = TRUE; - } - break; case GDK_space: /* stamping mode: show outline mode moving */ /* FIXME: Is next condition ok? (lauris) */ @@ -776,7 +809,7 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) SPItem *clicked_item = selection->singleItem(); if (SP_IS_GROUP (clicked_item)) { // enter group 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.")); } @@ -797,6 +830,8 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) case GDK_KEY_RELEASE: if (key_is_a_modifier (get_group0_keyval (&event->key))) event_context->defaultMessageContext()->clear(); + // set cursor to default. + gdk_window_set_cursor(GTK_WIDGET(sp_desktop_canvas(desktop))->window, event_context->cursor); break; default: break;