diff --git a/src/event-context.cpp b/src/event-context.cpp
index c6192c4c3b72dec1d3ce641d77b09f3cdc3d083f..22c91e4505c8f66f508b090406fd5fcc5ac8ce9f 100644 (file)
--- a/src/event-context.cpp
+++ b/src/event-context.cpp
# include "config.h"
#endif
+#include <string.h>
#include <gdk/gdkkeysyms.h>
#include <gtk/gtkmain.h>
#include <gtk/gtkmenu.h>
#include <glibmm/i18n.h>
+#include <cstring>
+#include <string>
#include "display/sp-canvas.h"
#include "xml/node-event-vector.h"
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;
}
}
gdk_window_set_cursor(w->window, ec->cursor);
+ gdk_flush();
}
ec->desktop->waiting_cursor = false;
}
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
+ while (event_next && (event_next->type == GDK_KEY_PRESS || event_next->type == GDK_KEY_RELEASE)
&& event_next->key.keyval == keyval
- && (event_next->key.state & mask)) {
+ && (!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);
}
}
+/**
+ * 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, SPCanvas *canvas)
+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) {
@@ -353,7 +375,7 @@ static gint sp_event_context_private_root_handler(SPEventContext *event_context,
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,
+ GDK_KEY_RELEASE_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK,
NULL, event->button.time-1);
ret = TRUE;
}
@@ -364,7 +386,7 @@ 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_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK,
NULL, event->button.time-1);
}
ret = TRUE;
@@ -374,7 +396,7 @@ static gint sp_event_context_private_root_handler(SPEventContext *event_context,
|| event->button.state & GDK_CONTROL_MASK) {
panning = 3;
sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate),
- GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK,
+ GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK,
NULL, event->button.time);
ret = TRUE;
} else {
@@ -440,6 +462,8 @@ static gint sp_event_context_private_root_handler(SPEventContext *event_context,
} else {
Inkscape::Rubberband::get()->start(desktop, motion_dt);
}
+ if (zoom_rb == 2)
+ gobble_motion_events(GDK_BUTTON2_MASK);
}
break;
case GDK_BUTTON_RELEASE:
@@ -473,7 +497,7 @@ static gint sp_event_context_private_root_handler(SPEventContext *event_context,
ret = TRUE;
} else if (zoom_rb == event->button.button) {
zoom_rb = 0;
- NR::Maybe<NR::Rect> const b = Inkscape::Rubberband::get()->getRectangle();
+ boost::optional<NR::Rect> const b = Inkscape::Rubberband::get()->getRectangle();
Inkscape::Rubberband::get()->stop();
if (b && !within_tolerance) {
desktop->set_display_area(*b, 10);
@@ -500,6 +524,13 @@ static gint sp_event_context_private_root_handler(SPEventContext *event_context,
ret = sp_shortcut_invoke(shortcut, desktop);
break;
+ case GDK_D:
+ case GDK_d:
+ if (!MOD__SHIFT && !MOD__CTRL && !MOD__ALT) {
+ sp_toggle_dropper(desktop);
+ ret = TRUE;
+ }
+ break;
case GDK_W:
case GDK_w:
case GDK_F4:
@@ -691,8 +722,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;
@@ -1009,9 +1040,9 @@ 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)
+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")
@@ -1023,7 +1054,7 @@ ec_shape_event_attr_changed(Inkscape::XML::Node *shape_repr, gchar const *name,
SPEventContext *ec = SP_EVENT_CONTEXT(data);
if (ec->shape_knot_holder) {
- sp_knot_holder_destroy(ec->shape_knot_holder);
+ delete ec->shape_knot_holder;
}
ec->shape_knot_holder = NULL;