X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fevent-context.cpp;h=f482c99fb0dc6d0880591e0c37e4d19f6ee9fde8;hb=ce8f78ef72fa2e86ded278ea85edfc04c6395a9e;hp=54b683bf4094536ae6c62d7f3ea44bc236c0ff21;hpb=1391834bee278d740c12201a5f258cd1eda044c1;p=inkscape.git diff --git a/src/event-context.cpp b/src/event-context.cpp index 54b683bf4..f482c99fb 100644 --- a/src/event-context.cpp +++ b/src/event-context.cpp @@ -27,9 +27,13 @@ # include "config.h" #endif +#include #include #include #include +#include +#include +#include #include "display/sp-canvas.h" #include "xml/node-event-vector.h" @@ -68,6 +72,10 @@ static GObjectClass *parent_class; static bool selector_toggled = FALSE; static int switch_selector_to = 0; +// globals for temporary switching to dropper by 'D' +static bool dropper_toggled = FALSE; +static int switch_dropper_to = 0; + static gint xp = 0, yp = 0; // where drag started static gint tolerance = 0; static bool within_tolerance = false; @@ -130,6 +138,7 @@ sp_event_context_init(SPEventContext *event_context) event_context->_message_context = NULL; event_context->_selcue = NULL; event_context->_grdrag = NULL; + event_context->space_panning = false; } /** @@ -170,7 +179,7 @@ sp_event_context_dispose(GObject *object) void sp_event_context_update_cursor(SPEventContext *ec) { - GtkWidget *w = GTK_WIDGET(SP_DT_CANVAS(ec->desktop)); + GtkWidget *w = GTK_WIDGET(sp_desktop_canvas(ec->desktop)); if (w->window) { /* fixme: */ if (ec->cursor_shape) { @@ -181,7 +190,7 @@ sp_event_context_update_cursor(SPEventContext *ec) if (ec->cursor) gdk_cursor_unref (ec->cursor); ec->cursor = gdk_cursor_new_from_pixmap(bitmap, mask, - &w->style->black, + &w->style->black, &w->style->white, ec->hot_x, ec->hot_y); g_object_unref (bitmap); @@ -190,6 +199,7 @@ sp_event_context_update_cursor(SPEventContext *ec) } gdk_window_set_cursor(w->window, ec->cursor); } + ec->desktop->waiting_cursor = false; } /** @@ -212,14 +222,15 @@ gint gobble_key_events(guint keyval, gint mask) event_next = gdk_event_get(); // while the next event is also a key notify with the same keyval and mask, - while (event_next && event_next->type == GDK_KEY_PRESS - && event_next->key.keyval == keyval - && (event_next->key.state & mask)) { + while (event_next && (event_next->type == GDK_KEY_PRESS || event_next->type == GDK_KEY_RELEASE) + && event_next->key.keyval == keyval + && (!mask || (event_next->key.state & mask))) { + if (event_next->type == GDK_KEY_PRESS) + i ++; // kill it gdk_event_free(event_next); // get next event_next = gdk_event_get(); - i ++; } // otherwise, put it back onto the queue if (event_next) gdk_event_put(event_next); @@ -255,7 +266,7 @@ gint gobble_motion_events(gint mask) * Toggles current tool between active tool and selector tool. * Subroutine of sp_event_context_private_root_handler(). */ -static void +static void sp_toggle_selector(SPDesktop *dt) { if (!dt->event_context) return; @@ -272,19 +283,40 @@ sp_toggle_selector(SPDesktop *dt) } } +/** + * Toggles current tool between active tool and dropper tool. + * Subroutine of sp_event_context_private_root_handler(). + */ +static void +sp_toggle_dropper(SPDesktop *dt) +{ + if (!dt->event_context) return; + + if (tools_isactive(dt, TOOLS_DROPPER)) { + if (dropper_toggled) { + if (switch_dropper_to) tools_switch (dt, switch_dropper_to); + dropper_toggled = FALSE; + } else return; + } else { + dropper_toggled = TRUE; + switch_dropper_to = tools_active(dt); + tools_switch (dt, TOOLS_DROPPER); + } +} + /** * Calculates and keeps track of scroll acceleration. * Subroutine of sp_event_context_private_root_handler(). */ -static gdouble accelerate_scroll(GdkEvent *event, gdouble acceleration) +static gdouble accelerate_scroll(GdkEvent *event, gdouble acceleration, SPCanvas */*canvas*/) { guint32 time_diff = ((GdkEventKey *) event)->time - scroll_event_time; /* key pressed within 500ms ? (1/2 second) */ if (time_diff > 500 || event->key.keyval != scroll_keyval) { - scroll_multiply = 1; + scroll_multiply = 1; // abort acceleration } else { - scroll_multiply += acceleration; + scroll_multiply += acceleration; // continue acceleration } scroll_event_time = ((GdkEventKey *) event)->time; @@ -293,21 +325,6 @@ static gdouble accelerate_scroll(GdkEvent *event, gdouble acceleration) return scroll_multiply; } -// This is a hack that is necessary because when middle-clicking too fast, -// button_press events come for all clicks but there's button_release only -// for the first one. So after a release, we must prohibit the next grab for -// some time, or the grab will be stuck. Perhaps this is caused by some -// wrong handling of events among contexts and not by a GDK bug; -// if someone can fix this properly this would be great. -static gint dontgrab = 0; -static bool -grab_allow_again() -{ - dontgrab--; - if (dontgrab < 0) dontgrab = 0; - return FALSE; // so that it is only called once -} - /** * Main event dispatch, gets called from Gdk. */ @@ -336,7 +353,7 @@ static gint sp_event_context_private_root_handler(SPEventContext *event_context, case GDK_2BUTTON_PRESS: if (panning) { panning = 0; - sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), + sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), event->button.time); ret = TRUE; } else { @@ -350,38 +367,35 @@ static gint sp_event_context_private_root_handler(SPEventContext *event_context, yp = (gint) event->button.y; within_tolerance = true; - switch (event->button.button) { - case 2: + button_w = NR::Point(event->button.x, event->button.y); - if (dontgrab) - // double-click, still not permitted to grab; - // increase the counter to guard against triple click - { - dontgrab ++; - gtk_timeout_add(250, (GtkFunction) grab_allow_again, NULL); - break; + switch (event->button.button) { + case 1: + if (event_context->space_panning) { + panning = 1; + sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate), + GDK_KEY_RELEASE_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK, + NULL, event->button.time-1); + ret = TRUE; } - - button_w = NR::Point(event->button.x, - event->button.y); + break; + case 2: if (event->button.state == GDK_SHIFT_MASK) { zoom_rb = 2; } else { panning = 2; sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate), - GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK, + GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK, NULL, event->button.time-1); } ret = TRUE; break; case 3: - if (event->button.state & GDK_SHIFT_MASK + if (event->button.state & GDK_SHIFT_MASK || event->button.state & GDK_CONTROL_MASK) { - button_w = NR::Point(event->button.x, - event->button.y); panning = 3; sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate), - GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK, + GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK, NULL, event->button.time); ret = TRUE; } else { @@ -394,12 +408,13 @@ static gint sp_event_context_private_root_handler(SPEventContext *event_context, break; case GDK_MOTION_NOTIFY: if (panning) { - if ((panning == 2 && !(event->motion.state & GDK_BUTTON2_MASK)) - || (panning == 3 && !(event->motion.state & GDK_BUTTON3_MASK))) { + if ((panning == 2 && !(event->motion.state & GDK_BUTTON2_MASK)) + || (panning == 1 && !(event->motion.state & GDK_BUTTON1_MASK)) + || (panning == 3 && !(event->motion.state & GDK_BUTTON3_MASK)) + ) { /* Gdk seems to lose button release for us sometimes :-( */ panning = 0; - dontgrab = 0; - sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), + sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), event->button.time); ret = TRUE; } else { @@ -408,23 +423,23 @@ static gint sp_event_context_private_root_handler(SPEventContext *event_context, && ( abs( (gint) event->motion.y - yp ) < tolerance )) { // do not drag if we're within tolerance from origin - break; + break; } - // Once the user has moved farther than tolerance from - // the original location (indicating they intend to move - // the object, not click), then always process the motion + // Once the user has moved farther than tolerance from + // the original location (indicating they intend to move + // the object, not click), then always process the motion // notify coordinates as given (no snapping back to origin) - within_tolerance = false; + within_tolerance = false; - // gobble subsequent motion events to prevent "sticking" + // gobble subsequent motion events to prevent "sticking" // when scrolling is slow - gobble_motion_events(panning == 2 ? - GDK_BUTTON2_MASK : GDK_BUTTON3_MASK); + gobble_motion_events(panning == 2 ? + GDK_BUTTON2_MASK : + (panning == 1 ? GDK_BUTTON1_MASK : GDK_BUTTON3_MASK)); - NR::Point const motion_w(event->motion.x, - event->motion.y); + NR::Point const motion_w(event->motion.x, event->motion.y); NR::Point const moved_w( motion_w - button_w ); - event_context->desktop->scroll_world(moved_w); + event_context->desktop->scroll_world(moved_w, true); // we're still scrolling, do not redraw ret = TRUE; } } else if (zoom_rb) { @@ -436,74 +451,83 @@ static gint sp_event_context_private_root_handler(SPEventContext *event_context, && ( abs( (gint) event->motion.y - yp ) < tolerance ) ) { break; // do not drag if we're within tolerance from origin } + // Once the user has moved farther than tolerance from the original location + // (indicating they intend to move the object, not click), then always process the + // motion notify coordinates as given (no snapping back to origin) + within_tolerance = false; - if (within_tolerance) { - Inkscape::Rubberband::get()->start(desktop, motion_dt); - } else { + if (Inkscape::Rubberband::get()->is_started()) { Inkscape::Rubberband::get()->move(motion_dt); - } - - // Once the user has moved farther than tolerance from the original location - // (indicating they intend to move the object, not click), then always process the - // motion notify coordinates as given (no snapping back to origin) - within_tolerance = false; + } else { + Inkscape::Rubberband::get()->start(desktop, motion_dt); + } + if (zoom_rb == 2) + gobble_motion_events(GDK_BUTTON2_MASK); } break; case GDK_BUTTON_RELEASE: + xp = yp = 0; if (within_tolerance && (panning || zoom_rb)) { - dontgrab ++; + zoom_rb = 0; + if (panning) { + panning = 0; + sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), + event->button.time); + } NR::Point const event_w(event->button.x, event->button.y); NR::Point const event_dt(desktop->w2d(event_w)); - double const zoom_power = ( (event->button.state & GDK_SHIFT_MASK) - ? -dontgrab : dontgrab ); desktop->zoom_relative_keep_point(event_dt, - pow(zoom_inc, zoom_power)); - gtk_timeout_add(250, (GtkFunction) grab_allow_again, NULL); - } - if (panning == event->button.button) { + (event->button.state & GDK_SHIFT_MASK) ? 1/zoom_inc : zoom_inc); + desktop->updateNow(); + ret = TRUE; + } else if (panning == event->button.button) { panning = 0; - sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), + sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), event->button.time); + + // in slow complex drawings, some of the motion events are lost; + // to make up for this, we scroll it once again to the button-up event coordinates + // (i.e. canvas will always get scrolled all the way to the mouse release point, + // even if few intermediate steps were visible) + NR::Point const motion_w(event->button.x, event->button.y); + NR::Point const moved_w( motion_w - button_w ); + event_context->desktop->scroll_world(moved_w); + desktop->updateNow(); ret = TRUE; } else if (zoom_rb == event->button.button) { zoom_rb = 0; NR::Maybe const b = Inkscape::Rubberband::get()->getRectangle(); - if (b != NR::Nothing() && !within_tolerance) { - desktop->set_display_area(b.assume(), 10); - } Inkscape::Rubberband::get()->stop(); + if (b && !within_tolerance) { + desktop->set_display_area(*b, 10); + } + ret = TRUE; } - xp = yp = 0; break; case GDK_KEY_PRESS: switch (get_group0_keyval(&event->key)) { + // GDK insists on stealing these keys (F1 for no idea what, tab for cycling widgets + // in the editing window). So we resteal them back and run our regular shortcut + // invoker on them. unsigned int shortcut; + case GDK_Tab: + case GDK_ISO_Left_Tab: case GDK_F1: - /* Grab it away from Gtk */ shortcut = get_group0_keyval(&event->key); - if (event->key.state & GDK_SHIFT_MASK) + if (event->key.state & GDK_SHIFT_MASK) shortcut |= SP_SHORTCUT_SHIFT_MASK; - if (event->key.state & GDK_CONTROL_MASK) + if (event->key.state & GDK_CONTROL_MASK) shortcut |= SP_SHORTCUT_CONTROL_MASK; - if (event->key.state & GDK_MOD1_MASK) + if (event->key.state & GDK_MOD1_MASK) shortcut |= SP_SHORTCUT_ALT_MASK; ret = sp_shortcut_invoke(shortcut, desktop); break; - case GDK_Tab: // disable tab/shift-tab which cycle widget focus - case GDK_ISO_Left_Tab: // they will get different functions - if (!(MOD__CTRL_ONLY || (MOD__CTRL && MOD__SHIFT))) { + case GDK_D: + case GDK_d: + if (!MOD__SHIFT && !MOD__CTRL && !MOD__ALT) { + sp_toggle_dropper(desktop); ret = TRUE; - } else { - /* Grab it away from Gtk */ - shortcut = get_group0_keyval(&event->key); - if (event->key.state & GDK_SHIFT_MASK) - shortcut |= SP_SHORTCUT_SHIFT_MASK; - if (event->key.state & GDK_CONTROL_MASK) - shortcut |= SP_SHORTCUT_CONTROL_MASK; - if (event->key.state & GDK_MOD1_MASK) - shortcut |= SP_SHORTCUT_ALT_MASK; - ret = sp_shortcut_invoke(shortcut, desktop); } break; case GDK_W: @@ -515,19 +539,12 @@ static gint sp_event_context_private_root_handler(SPEventContext *event_context, ret = TRUE; } break; - // FIXME: make import a verb - case GDK_i: // Ctrl i - import file - if (MOD__CTRL_ONLY) { - sp_file_import(NULL); - ret = TRUE; - } - break; case GDK_Left: // Ctrl Left case GDK_KP_Left: case GDK_KP_4: if (MOD__CTRL_ONLY) { - int i = (int) floor(key_scroll * accelerate_scroll(event, acceleration)); - gobble_key_events(get_group0_keyval(&event->key), + int i = (int) floor(key_scroll * accelerate_scroll(event, acceleration, sp_desktop_canvas(desktop))); + gobble_key_events(get_group0_keyval(&event->key), GDK_CONTROL_MASK); event_context->desktop->scroll_world(i, 0); ret = TRUE; @@ -537,8 +554,8 @@ static gint sp_event_context_private_root_handler(SPEventContext *event_context, case GDK_KP_Up: case GDK_KP_8: if (MOD__CTRL_ONLY) { - int i = (int) floor(key_scroll * accelerate_scroll(event, acceleration)); - gobble_key_events(get_group0_keyval(&event->key), + int i = (int) floor(key_scroll * accelerate_scroll(event, acceleration, sp_desktop_canvas(desktop))); + gobble_key_events(get_group0_keyval(&event->key), GDK_CONTROL_MASK); event_context->desktop->scroll_world(0, i); ret = TRUE; @@ -548,8 +565,8 @@ static gint sp_event_context_private_root_handler(SPEventContext *event_context, case GDK_KP_Right: case GDK_KP_6: if (MOD__CTRL_ONLY) { - int i = (int) floor(key_scroll * accelerate_scroll(event, acceleration)); - gobble_key_events(get_group0_keyval(&event->key), + int i = (int) floor(key_scroll * accelerate_scroll(event, acceleration, sp_desktop_canvas(desktop))); + gobble_key_events(get_group0_keyval(&event->key), GDK_CONTROL_MASK); event_context->desktop->scroll_world(-i, 0); ret = TRUE; @@ -559,8 +576,8 @@ static gint sp_event_context_private_root_handler(SPEventContext *event_context, case GDK_KP_Down: case GDK_KP_2: if (MOD__CTRL_ONLY) { - int i = (int) floor(key_scroll * accelerate_scroll(event, acceleration)); - gobble_key_events(get_group0_keyval(&event->key), + int i = (int) floor(key_scroll * accelerate_scroll(event, acceleration, sp_desktop_canvas(desktop))); + gobble_key_events(get_group0_keyval(&event->key), GDK_CONTROL_MASK); event_context->desktop->scroll_world(0, -i); ret = TRUE; @@ -573,8 +590,14 @@ static gint sp_event_context_private_root_handler(SPEventContext *event_context, } break; case GDK_space: - sp_toggle_selector(desktop); - ret= TRUE; + if (prefs_get_int_attribute("options.spacepans","value", 0) == 1) { + event_context->space_panning = true; + event_context->_message_context->set(Inkscape::INFORMATION_MESSAGE, _("Space+mouse drag to pan canvas")); + ret= TRUE; + } else { + sp_toggle_selector(desktop); + ret= TRUE; + } break; case GDK_z: case GDK_Z: @@ -587,7 +610,29 @@ static gint sp_event_context_private_root_handler(SPEventContext *event_context, break; } break; + case GDK_KEY_RELEASE: + switch (get_group0_keyval(&event->key)) { + case GDK_space: + if (event_context->space_panning) { + event_context->space_panning = false; + event_context->_message_context->clear(); + if (panning == 1) { + panning = 0; + sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), + event->key.time); + desktop->updateNow(); + } + ret= TRUE; + } + break; + default: + break; + } + break; case GDK_SCROLL: + { + bool ctrl = (event->scroll.state & GDK_CONTROL_MASK); + bool wheelzooms = (prefs_get_int_attribute("options.wheelzooms","value", 0) == 1); /* shift + wheel, pan left--right */ if (event->scroll.state & GDK_SHIFT_MASK) { switch (event->scroll.direction) { @@ -602,7 +647,7 @@ static gint sp_event_context_private_root_handler(SPEventContext *event_context, } /* ctrl + wheel, zoom in--out */ - } else if (event->scroll.state & GDK_CONTROL_MASK) { + } else if ((ctrl && !wheelzooms) || (!ctrl && wheelzooms)) { double rel_zoom; switch (event->scroll.direction) { case GDK_SCROLL_UP: @@ -638,6 +683,7 @@ static gint sp_event_context_private_root_handler(SPEventContext *event_context, } } break; + } default: break; } @@ -646,7 +692,7 @@ static gint sp_event_context_private_root_handler(SPEventContext *event_context, } /** - * Handles item specific events. Gets called from Gdk. + * Handles item specific events. Gets called from Gdk. * * Only reacts to right mouse button at the moment. * \todo Fixme: do context sensitive popup menu on items. @@ -658,7 +704,7 @@ sp_event_context_private_item_handler(SPEventContext *ec, SPItem *item, GdkEvent switch (event->type) { case GDK_BUTTON_PRESS: - if ((event->button.button == 3) + if ((event->button.button == 3) && !(event->button.state & GDK_SHIFT_MASK || event->button.state & GDK_CONTROL_MASK)) { sp_event_root_menu_popup(ec->desktop, item, event); ret = TRUE; @@ -675,8 +721,8 @@ sp_event_context_private_item_handler(SPEventContext *ec, SPItem *item, GdkEvent * Gets called when attribute changes value. */ static void -sp_ec_repr_attr_changed(Inkscape::XML::Node *prefs_repr, gchar const *key, gchar const *oldval, gchar const *newval, - bool is_interactive, gpointer data) +sp_ec_repr_attr_changed(Inkscape::XML::Node */*prefs_repr*/, gchar const *key, gchar const */*oldval*/, gchar const *newval, + bool /*is_interactive*/, gpointer data) { SPEventContext *ec; @@ -811,8 +857,8 @@ sp_event_context_deactivate(SPEventContext *ec) g_return_if_fail(ec != NULL); g_return_if_fail(SP_IS_EVENT_CONTEXT(ec)); - if (((SPEventContextClass *) G_OBJECT_GET_CLASS(ec))->activate) - ((SPEventContextClass *) G_OBJECT_GET_CLASS(ec))->activate(ec); + if (((SPEventContextClass *) G_OBJECT_GET_CLASS(ec))->deactivate) + ((SPEventContextClass *) G_OBJECT_GET_CLASS(ec))->deactivate(ec); } /** @@ -875,7 +921,7 @@ sp_event_root_menu_popup(SPDesktop *desktop, SPItem *item, GdkEvent *event) /* fixme: This is not what I want but works for now (Lauris) */ if (event->type == GDK_KEY_PRESS) { - item = SP_DT_SELECTION(desktop)->singleItem(); + item = sp_desktop_selection(desktop)->singleItem(); } menu = sp_ui_context_menu(desktop, item); gtk_widget_show(menu); @@ -896,22 +942,22 @@ sp_event_root_menu_popup(SPDesktop *desktop, SPItem *item, GdkEvent *event) * Show tool context specific modifier tip. */ void -sp_event_show_modifier_tip(Inkscape::MessageContext *message_context, - GdkEvent *event, gchar const *ctrl_tip, gchar const *shift_tip, +sp_event_show_modifier_tip(Inkscape::MessageContext *message_context, + GdkEvent *event, gchar const *ctrl_tip, gchar const *shift_tip, gchar const *alt_tip) { guint keyval = get_group0_keyval(&event->key); - - bool ctrl = ctrl_tip && (MOD__CTRL - || (keyval == GDK_Control_L) + + bool ctrl = ctrl_tip && (MOD__CTRL + || (keyval == GDK_Control_L) || (keyval == GDK_Control_R)); - bool shift = shift_tip + bool shift = shift_tip && (MOD__SHIFT || (keyval == GDK_Shift_L) || (keyval == GDK_Shift_R)); - bool alt = alt_tip - && (MOD__ALT - || (keyval == GDK_Alt_L) - || (keyval == GDK_Alt_R) - || (keyval == GDK_Meta_L) + bool alt = alt_tip + && (MOD__ALT + || (keyval == GDK_Alt_L) + || (keyval == GDK_Alt_R) + || (keyval == GDK_Meta_L) || (keyval == GDK_Meta_R)); gchar *tip = g_strdup_printf("%s%s%s%s%s", @@ -929,10 +975,10 @@ sp_event_show_modifier_tip(Inkscape::MessageContext *message_context, } /** - * Return the keyval corresponding to the key event in group 0, i.e., - * in the main (English) layout. + * Return the keyval corresponding to the key event in group 0, i.e., + * in the main (English) layout. * - * Use this instead of simply event->keyval, so that your keyboard shortcuts + * Use this instead of simply event->keyval, so that your keyboard shortcuts * work regardless of layouts (e.g., in Cyrillic). */ guint @@ -941,8 +987,8 @@ get_group0_keyval(GdkEventKey *event) guint keyval = 0; gdk_keymap_translate_keyboard_state( gdk_keymap_get_for_display(gdk_display_get_default()), - event->hardware_keycode, - (GdkModifierType) event->state, + event->hardware_keycode, + (GdkModifierType) event->state, 0 /*event->key.group*/, &keyval, NULL, NULL, NULL); return keyval; @@ -951,23 +997,23 @@ get_group0_keyval(GdkEventKey *event) /** * Returns item at point p in desktop. * - * If state includes alt key mask, cyclically selects under; honors + * If state includes alt key mask, cyclically selects under; honors * into_groups. */ SPItem * -sp_event_context_find_item (SPDesktop *desktop, NR::Point const p, +sp_event_context_find_item (SPDesktop *desktop, NR::Point const p, bool select_under, bool into_groups) { SPItem *item; if (select_under) { - SPItem *selected_at_point = + SPItem *selected_at_point = desktop->item_from_list_at_point_bottom (desktop->selection->itemList(), p); item = desktop->item_at_point(p, into_groups, selected_at_point); if (item == NULL) { // we may have reached bottom, flip over to the top item = desktop->item_at_point(p, into_groups, NULL); } - } else + } else item = desktop->item_at_point(p, into_groups, NULL); return item; @@ -992,13 +1038,13 @@ sp_event_context_over_item (SPDesktop *desktop, SPItem *item, NR::Point const p) /** * Called when SPEventContext subclass node attribute changed. */ -void -ec_shape_event_attr_changed(Inkscape::XML::Node *shape_repr, gchar const *name, - gchar const *old_value, gchar const *new_value, - bool const is_interactive, gpointer const data) +void +ec_shape_event_attr_changed(Inkscape::XML::Node */*shape_repr*/, gchar const *name, + gchar const */*old_value*/, gchar const */*new_value*/, + bool const /*is_interactive*/, gpointer const data) { - if (!name - || !strcmp(name, "style") + if (!name + || !strcmp(name, "style") || SP_ATTRIBUTE_IS_CSS(sp_attribute_lookup(name))) { // no need to regenrate knotholder if only style changed return; @@ -1013,7 +1059,7 @@ ec_shape_event_attr_changed(Inkscape::XML::Node *shape_repr, gchar const *name, SPDesktop *desktop = ec->desktop; - SPItem *item = SP_DT_SELECTION(desktop)->singleItem(); + SPItem *item = sp_desktop_selection(desktop)->singleItem(); if (item) { ec->shape_knot_holder = sp_item_knot_holder(item, desktop);