X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fselect-context.cpp;h=010382376e9f7b8e3d50c6256eaaf075e6659da4;hb=9e973c4fb2183b877bb600a7e9c75e93b3e7d6d1;hp=5d8babe57313862d82c2a7e96130a75abb10cb6f;hpb=2a69ca8c9657555d702f235b91632c58640e56f4;p=inkscape.git diff --git a/src/select-context.cpp b/src/select-context.cpp index 5d8babe57..010382376 100644 --- a/src/select-context.cpp +++ b/src/select-context.cpp @@ -16,6 +16,8 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif +#include +#include #include #include "macros.h" #include "rubberband.h" @@ -38,6 +40,7 @@ #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); @@ -228,10 +231,10 @@ sp_select_context_abort(SPEventContext *event_context) return true; } } else { - NR::Maybe const b = Inkscape::Rubberband::get()->getRectangle(); - if (b != NR::Nothing()) { + if (Inkscape::Rubberband::get()->is_started()) { Inkscape::Rubberband::get()->stop(); rb_escaped = 1; + SP_EVENT_CONTEXT(sc)->defaultMessageContext()->clear(); SP_EVENT_CONTEXT(sc)->desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Selection canceled.")); return true; } @@ -299,7 +302,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 @@ -312,7 +315,7 @@ 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 { @@ -322,6 +325,10 @@ sp_select_context_item_handler(SPEventContext *event_context, SPItem *item, GdkE 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); sp_object_ref(sc->item, NULL); @@ -333,8 +340,8 @@ sp_select_context_item_handler(SPEventContext *event_context, SPItem *item, GdkE 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_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); @@ -408,7 +415,7 @@ 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_desktop_selection(desktop)->clear(); sc->dragging = false; @@ -424,7 +431,7 @@ 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; @@ -433,13 +440,15 @@ 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)); + if (event->button.state & GDK_MOD1_MASK) + Inkscape::Rubberband::get()->setMode(RUBBERBAND_MODE_TOUCHPATH); 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, + 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); @@ -460,7 +469,7 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) break; case GDK_MOTION_NOTIFY: - if (event->motion.state & GDK_BUTTON1_MASK) { + 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)); @@ -474,8 +483,9 @@ 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 && !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); @@ -486,6 +496,7 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) // 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(); + SP_EVENT_CONTEXT(sc)->defaultMessageContext()->clear(); 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); @@ -494,6 +505,14 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) 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)); + + // 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)) @@ -511,9 +530,8 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) } 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; @@ -523,6 +541,11 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) } else { if (Inkscape::Rubberband::get()->is_started()) { Inkscape::Rubberband::get()->move(p); + if (Inkscape::Rubberband::get()->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); } } @@ -530,7 +553,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)) { + if ((event->button.button == 1) && (sc->grabbed) && !event_context->space_panning) { if (sc->dragging) { if (sc->moved) { // item has been moved @@ -566,13 +589,21 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) } 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(); + if (r->is_started() && !within_tolerance) { // this was a rubberband drag - Inkscape::Rubberband::get()->stop(); + GSList *items = NULL; + if (r->getMode() == RUBBERBAND_MODE_RECT) { + NR::Maybe 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_desktop_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); @@ -582,9 +613,9 @@ 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; @@ -604,12 +635,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 - - sc->button_press_ctrl = FALSE; + } 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), event->button.state & GDK_MOD1_MASK, TRUE); + NR::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; if (item) { if (selection->includes(item)) { @@ -639,6 +671,9 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) desktop->updateNow(); } + if (event->button.button == 1) { + Inkscape::Rubberband::get()->stop(); // might have been started in another tool! + } sc->button_press_shift = false; sc->button_press_ctrl = false; sc->button_press_alt = false; @@ -646,25 +681,34 @@ 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()->is_started()) { + // if Alt then change cursor to moving cursor: + if (alt) { + Inkscape::Rubberband::get()->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")); - // 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) { + _("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()) { GdkCursor *cursor = gdk_cursor_new(GDK_FLEUR); gdk_window_set_cursor(GTK_WIDGET(sp_desktop_canvas(desktop))->window, cursor); gdk_cursor_destroy(cursor); @@ -672,19 +716,22 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) //*/ break; } + } 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(mul*-10, 0); // shift + else sp_selection_move_screen(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(mul*-10*nudge, 0); // shift + else sp_selection_move(mul*-nudge, 0); // no shift } ret = TRUE; } @@ -693,13 +740,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(0, mul*10); // shift + else sp_selection_move_screen(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(0, mul*10*nudge); // shift + else sp_selection_move(0, mul*nudge); // no shift } ret = TRUE; } @@ -708,13 +757,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(mul*10, 0); // shift + else sp_selection_move_screen(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(mul*10*nudge, 0); // shift + else sp_selection_move(mul*nudge, 0); // no shift } ret = TRUE; } @@ -723,13 +774,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(0, mul*-10); // shift + else sp_selection_move_screen(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(0, mul*-10*nudge); // shift + else sp_selection_move(0, mul*-nudge); // no shift } ret = TRUE; } @@ -763,7 +816,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) { @@ -773,7 +828,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) { @@ -784,22 +841,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; @@ -807,7 +872,8 @@ 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_desktop_selection(desktop)->clear(); } else { @@ -823,15 +889,48 @@ 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(); + 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(); - // set cursor to default. - gdk_window_set_cursor(GTK_WIDGET(sp_desktop_canvas(desktop))->window, event_context->cursor); + + bool alt = ( MOD__ALT + || (keyval == GDK_Alt_L) + || (keyval == GDK_Alt_R) + || (keyval == GDK_Meta_L) + || (keyval == GDK_Meta_R)); + + if (Inkscape::Rubberband::get()->is_started()) { + // if Alt then change cursor to moving cursor: + if (alt) { + Inkscape::Rubberband::get()->setMode(RUBBERBAND_MODE_RECT); + } + } + } + // set cursor to default. + gdk_window_set_cursor(GTK_WIDGET(sp_desktop_canvas(desktop))->window, event_context->cursor); break; default: break;