X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fevent-context.cpp;h=76fe7263683df89dbb1d21efdd29d48363b912fb;hb=ad4b3133547bb79aa1362ab40512d31267868c82;hp=d67572e9c7cd5c07e0f3da94afe83684972b416f;hpb=6b15695578f07a3f72c4c9475c1a261a3021472a;p=inkscape.git diff --git a/src/event-context.cpp b/src/event-context.cpp index d67572e9c..76fe72636 100644 --- a/src/event-context.cpp +++ b/src/event-context.cpp @@ -170,7 +170,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 +181,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 +190,7 @@ sp_event_context_update_cursor(SPEventContext *ec) } gdk_window_set_cursor(w->window, ec->cursor); } + ec->desktop->waiting_cursor = false; } /** @@ -213,7 +214,7 @@ 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.keyval == keyval && (event_next->key.state & mask)) { // kill it gdk_event_free(event_next); @@ -255,7 +256,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; @@ -276,15 +277,23 @@ sp_toggle_selector(SPDesktop *dt) * 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; + glong slowest_buffer = canvas->slowest_buffer / 1000; // the buffer time is in usec, but event time is in msec + + // reduce time interval by the time it took to paint slowest buffer, + // so that acceleration does not hiccup on complex slow-rendering drawings + if ((guint32) slowest_buffer <= time_diff) + time_diff -= slowest_buffer; + else + time_diff = 0; /* 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 +302,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 +330,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 { @@ -346,22 +340,12 @@ static gint sp_event_context_private_root_handler(SPEventContext *event_context, case GDK_BUTTON_PRESS: // save drag origin - xp = (gint) event->button.x; + xp = (gint) event->button.x; yp = (gint) event->button.y; within_tolerance = true; switch (event->button.button) { case 2: - - 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; - } - button_w = NR::Point(event->button.x, event->button.y); if (event->button.state == GDK_SHIFT_MASK) { @@ -369,19 +353,19 @@ static gint sp_event_context_private_root_handler(SPEventContext *event_context, } 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 +378,11 @@ 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)) + if ((panning == 2 && !(event->motion.state & GDK_BUTTON2_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 +391,22 @@ 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 ? + gobble_motion_events(panning == 2 ? GDK_BUTTON2_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) { @@ -443,69 +425,70 @@ static gint sp_event_context_private_root_handler(SPEventContext *event_context, 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 + // 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; } 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))) { - 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: case GDK_w: case GDK_F4: @@ -515,19 +498,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_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 +513,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 +524,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 +535,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; @@ -570,7 +546,7 @@ static gint sp_event_context_private_root_handler(SPEventContext *event_context, if (MOD__SHIFT_ONLY) { sp_event_root_menu_popup(desktop, NULL, event); ret= TRUE; - } + } break; case GDK_space: sp_toggle_selector(desktop); @@ -605,13 +581,13 @@ static gint sp_event_context_private_root_handler(SPEventContext *event_context, } else if (event->scroll.state & GDK_CONTROL_MASK) { double rel_zoom; switch (event->scroll.direction) { - case GDK_SCROLL_UP: + case GDK_SCROLL_UP: rel_zoom = zoom_inc; break; - case GDK_SCROLL_DOWN: + case GDK_SCROLL_DOWN: rel_zoom = 1 / zoom_inc; break; - default: + default: rel_zoom = 0.0; break; } @@ -646,7 +622,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 +634,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; @@ -811,8 +787,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 +851,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,25 +872,25 @@ 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", + gchar *tip = g_strdup_printf("%s%s%s%s%s", ( ctrl ? ctrl_tip : "" ), ( ctrl && (shift || alt) ? "; " : "" ), ( shift ? shift_tip : "" ), @@ -929,20 +905,20 @@ 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 -get_group0_keyval(GdkEventKey *event) +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 +927,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 +968,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, +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 +989,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);