![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/desktop-events.cpp b/src/desktop-events.cpp
index 503f24c43f4a23c6cd4bda632256d5c190cf3357..dc153e31d94826c6f3814b8e763745365e76cb24 100644 (file)
--- a/src/desktop-events.cpp
+++ b/src/desktop-events.cpp
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
+#include <map>
+#include <string>
#include "display/guideline.h"
+#include "display/snap-indicator.h"
#include "helper/unit-menu.h"
#include "helper/units.h"
#include "desktop.h"
#include "snap.h"
#include "display/canvas-grid.h"
#include "display/canvas-axonomgrid.h"
+#include "prefs-utils.h"
+#include "helper/action.h"
+#include "tools-switch.h"
#include <2geom/point.h>
+static void snoop_extended(GdkEvent* event, SPDesktop *desktop);
+static void init_extended();
+
/* Root item handler */
int sp_desktop_root_handler(SPCanvasItem */*item*/, GdkEvent *event, SPDesktop *desktop)
{
+ static bool watch = false;
+ static bool first = true;
+
+ if ( first ) {
+ if ( prefs_get_int_attribute("options.useextinput", "value", 1)
+ && prefs_get_int_attribute("options.switchonextinput", "value", 0) ) {
+ watch = true;
+ init_extended();
+ }
+ first = false;
+ }
+ if ( watch ) {
+ snoop_extended(event, desktop);
+ }
+
return sp_event_context_root_handler(desktop->event_context, event);
}
@@ -119,11 +143,18 @@ static gint sp_dt_ruler_event(GtkWidget *widget, GdkEvent *event, SPDesktopWidge
NR::Point event_dt(desktop->w2d(event_w));
SnapManager const &m = desktop->namedview->snap_manager;
- event_dt = m.guideSnap(event_dt, normal).getPoint();
-
+ Inkscape::SnappedPoint snappoint = m.guideSnap(event_dt, normal);
+ event_dt = snappoint.getPoint();
+
sp_guideline_set_position(SP_GUIDELINE(guide), event_dt.to_2geom());
desktop->set_coordinate_status(event_dt);
desktop->setPosition (event_dt);
+
+ if (snappoint.getDistance() < NR_HUGE) {
+ desktop->snapindicator->set_new_snappoint(snappoint.getPoint().to_2geom());
+ } else {
+ desktop->snapindicator->remove_snappoint();
+ }
}
break;
case GDK_BUTTON_RELEASE:
// This is for snapping while dragging existing guidelines. New guidelines,
// which are dragged off the ruler, are being snapped in sp_dt_ruler_event
SnapManager const &m = desktop->namedview->snap_manager;
- motion_dt = m.guideSnap(motion_dt, guide->normal_to_line).getPoint();
-
+ Inkscape::SnappedPoint snappoint = m.guideSnap(motion_dt, guide->normal_to_line);
+ motion_dt = snappoint.getPoint();
+
sp_guide_moveto(*guide, motion_dt.to_2geom(), false);
moved = true;
desktop->set_coordinate_status(motion_dt);
desktop->setPosition (motion_dt);
+
+ if (snappoint.getDistance() < NR_HUGE) {
+ desktop->snapindicator->set_new_snappoint(snappoint.getPoint().to_2geom());
+ } else {
+ desktop->snapindicator->remove_snappoint();
+ }
+
ret = TRUE;
}
break;
return ret;
}
+static std::map<GdkInputSource, std::string> switchMap;
+static std::map<GdkInputSource, int> toolToUse;
+static std::string lastName;
+static GdkInputSource lastType = GDK_SOURCE_MOUSE;
+
+static void init_extended()
+{
+ std::string avoidName = "pad";
+ GList* devices = gdk_devices_list();
+ if ( devices ) {
+ for ( GList* curr = devices; curr; curr = g_list_next(curr) ) {
+ GdkDevice* dev = reinterpret_cast<GdkDevice*>(curr->data);
+ if ( dev->name
+ && (avoidName != dev->name)
+ && (switchMap.find(dev->source) == switchMap.end())
+ && (dev->source != GDK_SOURCE_MOUSE) ) {
+ switchMap[dev->source] = dev->name;
+// g_message("Adding '%s' as [%d]", dev->name, dev->source);
+
+ // Set the initial tool for the device
+ switch ( dev->source ) {
+ case GDK_SOURCE_PEN:
+ toolToUse[GDK_SOURCE_PEN] = TOOLS_CALLIGRAPHIC;
+ break;
+ case GDK_SOURCE_ERASER:
+ toolToUse[GDK_SOURCE_ERASER] = TOOLS_TWEAK;
+ break;
+ case GDK_SOURCE_CURSOR:
+ toolToUse[GDK_SOURCE_CURSOR] = TOOLS_SELECT;
+ break;
+ default:
+ ; // do not add
+ }
+// } else {
+// g_message("Skippn '%s' as [%s]", dev->name, namefor(dev->source));
+ }
+ }
+ }
+}
+
+
+void snoop_extended(GdkEvent* event, SPDesktop *desktop)
+{
+ GdkInputSource source = GDK_SOURCE_MOUSE;
+ std::string name;
+
+ switch ( event->type ) {
+ case GDK_MOTION_NOTIFY:
+ {
+ GdkEventMotion* event2 = reinterpret_cast<GdkEventMotion*>(event);
+ if ( event2->device ) {
+ source = event2->device->source;
+ name = event2->device->name;
+ }
+ }
+ break;
+
+ case GDK_BUTTON_PRESS:
+ case GDK_2BUTTON_PRESS:
+ case GDK_3BUTTON_PRESS:
+ case GDK_BUTTON_RELEASE:
+ {
+ GdkEventButton* event2 = reinterpret_cast<GdkEventButton*>(event);
+ if ( event2->device ) {
+ source = event2->device->source;
+ name = event2->device->name;
+ }
+ }
+ break;
+
+ case GDK_SCROLL:
+ {
+ GdkEventScroll* event2 = reinterpret_cast<GdkEventScroll*>(event);
+ if ( event2->device ) {
+ source = event2->device->source;
+ name = event2->device->name;
+ }
+ }
+ break;
+
+ case GDK_PROXIMITY_IN:
+ case GDK_PROXIMITY_OUT:
+ {
+ GdkEventProximity* event2 = reinterpret_cast<GdkEventProximity*>(event);
+ if ( event2->device ) {
+ source = event2->device->source;
+ name = event2->device->name;
+ }
+ }
+ break;
+
+ default:
+ ;
+ }
+
+ if (!name.empty()) {
+ if ( lastName != name || lastType != source ) {
+ // The device switched. See if it is one we 'count'
+ std::map<GdkInputSource, std::string>::iterator it = switchMap.find(source);
+ if ( (it != switchMap.end()) && (name == it->second) ) {
+ std::map<GdkInputSource, int>::iterator it2 = toolToUse.find(source);
+ if (it2 != toolToUse.end() ) {
+ // Save the tool currently selected for next time the input device shows up.
+ if ( (switchMap.find(lastType) != switchMap.end())
+ && (lastName == switchMap.find(lastType)->second)) {
+ toolToUse[lastType] = tools_active(desktop);
+ }
+ tools_switch(desktop, it2->second);
+ }
+ lastName = name;
+ lastType = source;
+ }
+ }
+ }
+}
+
+
/*
Local Variables: