![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/desktop-events.cpp b/src/desktop-events.cpp
index 6f63aa3ce54250c7ad1eef5cb23a78d7690711e4..46fb00cca773cf27eeaac5f3b4df20ceb32d5e98 100644 (file)
--- a/src/desktop-events.cpp
+++ b/src/desktop-events.cpp
#include "snap.h"
#include "display/canvas-grid.h"
#include "display/canvas-axonomgrid.h"
-#include "prefs-utils.h"
+#include "preferences.h"
#include "helper/action.h"
#include "tools-switch.h"
-#include <2geom/point.h>
+#include <2geom/line.h>
static void snoop_extended(GdkEvent* event, SPDesktop *desktop);
static void init_extended();
static bool first = true;
if ( first ) {
- if ( prefs_get_int_attribute("options.useextinput", "value", 1)
- && prefs_get_int_attribute("options.switchonextinput", "value", 0) ) {
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ if ( prefs->getBool("/options/useextinput/value", true)
+ && prefs->getBool("/options/switchonextinput/value") ) {
watch = true;
init_extended();
}
Inkscape::XML::Node *repr = SP_OBJECT_REPR(desktop->namedview);
gdk_window_get_pointer(GTK_WIDGET(dtw->canvas)->window, &wx, &wy, NULL);
- NR::Point const event_win(wx, wy);
+ Geom::Point const event_win(wx, wy);
gint width, height;
gdk_window_get_geometry(GTK_WIDGET(dtw->canvas)->window, NULL /*x*/, NULL /*y*/, &width, &height, NULL/*depth*/);
case GDK_BUTTON_PRESS:
if (event->button.button == 1) {
dragging = true;
- NR::Point const event_w(sp_canvas_window_to_world(dtw->canvas, event_win));
- NR::Point const event_dt(desktop->w2d(event_w));
+ sp_canvas_set_snap_delay_active(desktop->canvas, true);
+ Geom::Point const event_w(sp_canvas_window_to_world(dtw->canvas, event_win));
+ Geom::Point const event_dt(desktop->w2d(event_w));
// explicitly show guidelines; if I draw a guide, I want them on
sp_repr_set_boolean(repr, "showguides", TRUE);
@@ -129,7 +131,7 @@ static gint sp_dt_ruler_event(GtkWidget *widget, GdkEvent *event, SPDesktopWidge
}
}
- guide = sp_guideline_new(desktop->guides, event_dt.to_2geom(), normal);
+ guide = sp_guideline_new(desktop->guides, event_dt, normal);
sp_guideline_set_color(SP_GUIDELINE(guide), desktop->namedview->guidehicolor);
gdk_pointer_grab(widget->window, FALSE,
(GdkEventMask)(GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK ),
@@ -139,42 +141,43 @@ static gint sp_dt_ruler_event(GtkWidget *widget, GdkEvent *event, SPDesktopWidge
break;
case GDK_MOTION_NOTIFY:
if (dragging) {
- NR::Point const event_w(sp_canvas_window_to_world(dtw->canvas, event_win));
- NR::Point event_dt(desktop->w2d(event_w));
-
+ Geom::Point const event_w(sp_canvas_window_to_world(dtw->canvas, event_win));
+ Geom::Point event_dt(desktop->w2d(event_w));
+
SnapManager &m = desktop->namedview->snap_manager;
m.setup(desktop);
m.guideSnap(event_dt, normal);
-
- sp_guideline_set_position(SP_GUIDELINE(guide), event_dt.to_2geom());
- desktop->set_coordinate_status(event_dt);
- desktop->setPosition (event_dt);
+
+ sp_guideline_set_position(SP_GUIDELINE(guide), from_2geom(event_dt));
+ desktop->set_coordinate_status(to_2geom(event_dt));
+ desktop->setPosition(to_2geom(event_dt));
}
break;
case GDK_BUTTON_RELEASE:
if (dragging && event->button.button == 1) {
gdk_pointer_ungrab(event->button.time);
- NR::Point const event_w(sp_canvas_window_to_world(dtw->canvas, event_win));
- NR::Point event_dt(desktop->w2d(event_w));
-
+ Geom::Point const event_w(sp_canvas_window_to_world(dtw->canvas, event_win));
+ Geom::Point event_dt(desktop->w2d(event_w));
+
SnapManager &m = desktop->namedview->snap_manager;
m.setup(desktop);
m.guideSnap(event_dt, normal);
-
+
dragging = false;
+ sp_canvas_set_snap_delay_active(desktop->canvas, false);
gtk_object_destroy(GTK_OBJECT(guide));
guide = NULL;
if ((horiz ? wy : wx) >= 0) {
Inkscape::XML::Document *xml_doc = sp_document_repr_doc(desktop->doc());
Inkscape::XML::Node *repr = xml_doc->createElement("sodipodi:guide");
sp_repr_set_point(repr, "orientation", normal);
- sp_repr_set_point(repr, "position", event_dt.to_2geom());
+ sp_repr_set_point(repr, "position", from_2geom(event_dt));
SP_OBJECT_REPR(desktop->namedview)->appendChild(repr);
Inkscape::GC::release(repr);
- sp_document_done(sp_desktop_document(desktop), SP_VERB_NONE,
+ sp_document_done(sp_desktop_document(desktop), SP_VERB_NONE,
_("Create guide"));
}
- desktop->set_coordinate_status(event_dt);
+ desktop->set_coordinate_status(from_2geom(event_dt));
}
default:
break;
@@ -195,19 +198,31 @@ int sp_dt_vruler_event(GtkWidget *widget, GdkEvent *event, SPDesktopWidget *dtw)
/* Guides */
+static Geom::Point drag_origin;
+
+enum SPGuideDragType {
+ SP_DRAG_TRANSLATE,
+ SP_DRAG_TRANSLATE_CONSTRAINED,
+ SP_DRAG_ROTATE,
+ SP_DRAG_MOVE_ORIGIN,
+ SP_DRAG_NONE
+};
+
+static SPGuideDragType drag_type = SP_DRAG_NONE;
+
gint sp_dt_guide_event(SPCanvasItem *item, GdkEvent *event, gpointer data)
{
- static bool dragging = false;
static bool moved = false;
gint ret = FALSE;
SPGuide *guide = SP_GUIDE(data);
SPDesktop *desktop = static_cast<SPDesktop*>(gtk_object_get_data(GTK_OBJECT(item->canvas), "SPDesktop"));
- switch (event->type) {
+ switch (event->type) {
case GDK_2BUTTON_PRESS:
if (event->button.button == 1) {
- dragging = false;
+ drag_type = SP_DRAG_NONE;
+ sp_canvas_set_snap_delay_active(desktop->canvas, false);
sp_canvas_item_ungrab(item, event->button.time);
Inkscape::UI::Dialogs::GuidelinePropertiesDialog::showDialog(guide, desktop);
ret = TRUE;
ret = TRUE;
break;
}
- dragging = true;
- sp_canvas_item_grab(item,
- ( GDK_BUTTON_RELEASE_MASK |
- GDK_BUTTON_PRESS_MASK |
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK ),
- NULL,
- event->button.time);
+
+ sp_canvas_set_snap_delay_active(desktop->canvas, true);
+ double tol = 40.0;
+ Geom::Point const event_w(event->button.x, event->button.y);
+ Geom::Point const event_dt(desktop->w2d(event_w));
+ drag_origin = event_dt;
+ if (Geom::L2(guide->point_on_line - event_dt) < tol) {
+ // the click was on the guide 'anchor'
+ drag_type = (event->button.state & GDK_SHIFT_MASK) ? SP_DRAG_MOVE_ORIGIN : SP_DRAG_TRANSLATE;
+ } else {
+ drag_type = (event->button.state & GDK_SHIFT_MASK) ? SP_DRAG_ROTATE : SP_DRAG_TRANSLATE;
+ sp_canvas_item_grab(item,
+ ( GDK_BUTTON_RELEASE_MASK |
+ GDK_BUTTON_PRESS_MASK |
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK ),
+ NULL,
+ event->button.time);
+ }
ret = TRUE;
}
break;
- case GDK_MOTION_NOTIFY:
- if (dragging) {
- NR::Point const motion_w(event->motion.x,
- event->motion.y);
- NR::Point motion_dt(desktop->w2d(motion_w));
-
+ case GDK_MOTION_NOTIFY:
+ if (drag_type != SP_DRAG_NONE) {
+ Geom::Point const motion_w(event->motion.x,
+ event->motion.y);
+ Geom::Point motion_dt(desktop->w2d(motion_w));
+
// 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 &m = desktop->namedview->snap_manager;
m.setup(desktop);
- m.guideSnap(motion_dt, guide->normal_to_line);
-
- sp_guide_moveto(*guide, motion_dt.to_2geom(), false);
+ m.guideSnap(motion_dt, to_2geom(guide->normal_to_line));
+
+ switch (drag_type) {
+ case SP_DRAG_TRANSLATE:
+ {
+ sp_guide_moveto(*guide, guide->point_on_line + motion_dt - drag_origin, false);
+ break;
+ }
+ case SP_DRAG_TRANSLATE_CONSTRAINED:
+ {
+ Geom::Point pt_constr = Geom::constrain_angle(guide->point_on_line, motion_dt);
+ sp_guide_moveto(*guide, pt_constr, false);
+ break;
+ }
+ case SP_DRAG_ROTATE:
+ {
+ double angle = angle_between(drag_origin - guide->point_on_line, motion_dt - guide->point_on_line);
+ sp_guide_set_normal(*guide, guide->normal_to_line * Geom::Rotate(angle), false);
+ break;
+ }
+ case SP_DRAG_MOVE_ORIGIN:
+ {
+ Geom::Line line(guide->point_on_line, guide->angle());
+ Geom::Coord t = line.nearestPoint(motion_dt);
+ sp_guide_moveto(*guide, line.pointAt(t), false);
+ break;
+ }
+ case SP_DRAG_NONE:
+ g_assert_not_reached();
+ break;
+ }
moved = true;
- desktop->set_coordinate_status(motion_dt);
- desktop->setPosition (motion_dt);
+ desktop->set_coordinate_status(from_2geom(motion_dt));
+ desktop->setPosition(from_2geom(motion_dt));
ret = TRUE;
}
break;
case GDK_BUTTON_RELEASE:
- if (dragging && event->button.button == 1) {
+ if (drag_type != SP_DRAG_NONE && event->button.button == 1) {
if (moved) {
- NR::Point const event_w(event->button.x,
- event->button.y);
- NR::Point event_dt(desktop->w2d(event_w));
+ Geom::Point const event_w(event->button.x,
+ event->button.y);
+ Geom::Point event_dt(desktop->w2d(event_w));
SnapManager &m = desktop->namedview->snap_manager;
m.setup(desktop);
m.guideSnap(event_dt, guide->normal_to_line);
if (sp_canvas_world_pt_inside_window(item->canvas, event_w)) {
- sp_guide_moveto(*guide, event_dt.to_2geom(), true);
+ switch (drag_type) {
+ case SP_DRAG_TRANSLATE:
+ {
+ sp_guide_moveto(*guide, guide->point_on_line + event_dt - drag_origin, true);
+ break;
+ }
+ case SP_DRAG_TRANSLATE_CONSTRAINED:
+ {
+ Geom::Point pt_constr = Geom::constrain_angle(guide->point_on_line, event_dt);
+ sp_guide_moveto(*guide, pt_constr, true);
+ break;
+ }
+ case SP_DRAG_ROTATE:
+ {
+ double angle = angle_between(drag_origin - guide->point_on_line, event_dt - guide->point_on_line);
+ sp_guide_set_normal(*guide, guide->normal_to_line * Geom::Rotate(angle), true);
+ break;
+ }
+ case SP_DRAG_MOVE_ORIGIN:
+ {
+ Geom::Line line(guide->point_on_line, guide->angle());
+ Geom::Coord t = line.nearestPoint(event_dt);
+ sp_guide_moveto(*guide, line.pointAt(t), true);
+ break;
+ }
+ case SP_DRAG_NONE:
+ g_assert_not_reached();
+ break;
+ }
sp_document_done(sp_desktop_document(desktop), SP_VERB_NONE,
- _("Move guide"));
+ _("Move guide"));
} else {
/* Undo movement of any attached shapes. */
sp_guide_moveto(*guide, guide->point_on_line, false);
+ sp_guide_set_normal(*guide, guide->normal_to_line, false);
sp_guide_remove(guide);
sp_document_done(sp_desktop_document(desktop), SP_VERB_NONE,
_("Delete guide"));
}
moved = false;
- desktop->set_coordinate_status(event_dt);
- desktop->setPosition (event_dt);
+ desktop->set_coordinate_status(from_2geom(event_dt));
+ desktop->setPosition (from_2geom(event_dt));
}
- dragging = false;
+ drag_type = SP_DRAG_NONE;
+ sp_canvas_set_snap_delay_active(desktop->canvas, false);
sp_canvas_item_ungrab(item, event->button.time);
ret=TRUE;
}
return ret;
}
-static std::map<GdkInputSource, std::string> switchMap;
-static std::map<GdkInputSource, int> toolToUse;
+//static std::map<GdkInputSource, std::string> switchMap;
+static std::map<std::string, int> toolToUse;
static std::string lastName;
static GdkInputSource lastType = GDK_SOURCE_MOUSE;
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;
+ toolToUse[dev->name] = TOOLS_CALLIGRAPHIC;
break;
case GDK_SOURCE_ERASER:
- toolToUse[GDK_SOURCE_ERASER] = TOOLS_ERASER;
+ toolToUse[dev->name] = TOOLS_ERASER;
break;
case GDK_SOURCE_CURSOR:
- toolToUse[GDK_SOURCE_CURSOR] = TOOLS_SELECT;
+ toolToUse[dev->name] = TOOLS_SELECT;
break;
default:
; // do not add
}
-// } else {
-// g_message("Skippn '%s' as [%s]", dev->name, namefor(dev->source));
+// } else if (dev->name) {
+// g_message("Skippn '%s' as [%s]", dev->name, dev->source);
}
}
}
}
if (!name.empty()) {
- if ( lastName != name || lastType != source ) {
+ if ( lastType != source || lastName != name ) {
// 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;
+ //g_message("Changed device %s -> %s", lastName.c_str(), name.c_str());
+ std::map<std::string, int>::iterator it = toolToUse.find(lastName);
+ if (it != toolToUse.end()) {
+ // Save the tool currently selected for next time the input
+ // device shows up.
+ it->second = tools_active(desktop);
+ }
+
+ it = toolToUse.find(name);
+ if (it != toolToUse.end() ) {
+ tools_switch(desktop, it->second);
}
+
+ lastName = name;
+ lastType = source;
}
}
}