![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/desktop-events.cpp b/src/desktop-events.cpp
index faa735733c7a46f62cceeb49a93a07dd6f03482d..e2c3ba40eb4900d69c5084943a059370641be782 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 "xml/repr.h"
#include "dialogs/guidelinedialog.h"
#include "snap.h"
+#include "display/canvas-grid.h"
+#include "display/canvas-axonomgrid.h"
+#include "preferences.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 ) {
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ if ( prefs->getBool("/options/useextinput/value", true)
+ && prefs->getBool("/options/switchonextinput/value") ) {
+ watch = true;
+ init_extended();
+ }
+ first = false;
+ }
+ if ( watch ) {
+ snoop_extended(event, desktop);
+ }
+
return sp_event_context_root_handler(desktop->event_context, event);
}
@@ -44,26 +72,65 @@ static gint sp_dt_ruler_event(GtkWidget *widget, GdkEvent *event, SPDesktopWidge
{
static bool dragging = false;
static SPCanvasItem *guide = NULL;
+ static Geom::Point normal;
int wx, wy;
SPDesktop *desktop = dtw->desktop;
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*/);
switch (event->type) {
- case GDK_BUTTON_PRESS:
+ 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));
+ 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);
sp_repr_set_boolean(repr, "inkscape:guide-bbox", TRUE);
- guide = sp_guideline_new(desktop->guides, event_dt.to_2geom(), horiz ? Geom::Point(0.,1.) : Geom::Point(1.,0.));
+ // calculate the normal of the guidelines when dragged from the edges of rulers.
+ Geom::Point normal_bl_to_tr(-1.,1.); //bottomleft to topright
+ Geom::Point normal_tr_to_bl(1.,1.); //topright to bottomleft
+ normal_bl_to_tr.normalize();
+ normal_tr_to_bl.normalize();
+ Inkscape::CanvasGrid * grid = sp_namedview_get_first_enabled_grid(desktop->namedview);
+ if ( grid && grid->getGridType() == Inkscape::GRID_AXONOMETRIC ) {
+ Inkscape::CanvasAxonomGrid *axonomgrid = dynamic_cast<Inkscape::CanvasAxonomGrid *>(grid);
+ if (event->button.state & GDK_CONTROL_MASK) {
+ // guidelines normal to gridlines
+ normal_bl_to_tr = Geom::Point::polar(-axonomgrid->angle_rad[0], 1.0);
+ normal_tr_to_bl = Geom::Point::polar(axonomgrid->angle_rad[2], 1.0);
+ } else {
+ normal_bl_to_tr = rot90(Geom::Point::polar(axonomgrid->angle_rad[2], 1.0));
+ normal_tr_to_bl = rot90(Geom::Point::polar(-axonomgrid->angle_rad[0], 1.0));
+ }
+ }
+ if (horiz) {
+ if (wx < 50) {
+ normal = normal_bl_to_tr;
+ } else if (wx > width - 50) {
+ normal = normal_tr_to_bl;
+ } else {
+ normal = Geom::Point(0.,1.);
+ }
+ } else {
+ if (wy < 50) {
+ normal = normal_bl_to_tr;
+ } else if (wy > height - 50) {
+ normal = normal_tr_to_bl;
+ } else {
+ normal = Geom::Point(1.,0.);
+ }
+ }
+
+ 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 ),
@@ -71,27 +138,29 @@ static gint sp_dt_ruler_event(GtkWidget *widget, GdkEvent *event, SPDesktopWidge
event->button.time);
}
break;
- case GDK_MOTION_NOTIFY:
+ 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 const &m = desktop->namedview->snap_manager;
- event_dt = m.guideSnap(event_dt, component_vectors[horiz ? NR::Y : NR::X]).getPoint();
+ 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:
+ 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 const &m = desktop->namedview->snap_manager;
- event_dt = m.guideSnap(event_dt, component_vectors[horiz ? NR::Y : NR::X]).getPoint();
+ SnapManager &m = desktop->namedview->snap_manager;
+ m.setup(desktop);
+ m.guideSnap(event_dt, normal);
dragging = false;
gtk_object_destroy(GTK_OBJECT(guide));
@@ -99,14 +168,14 @@ static gint sp_dt_ruler_event(GtkWidget *widget, GdkEvent *event, SPDesktopWidge
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");
- repr->setAttribute("orientation", (horiz) ? "horizontal" : "vertical");
- sp_repr_set_svg_point(repr, "position", event_dt.to_2geom());
+ sp_repr_set_point(repr, "orientation", normal);
+ 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,
_("Create guide"));
}
- desktop->set_coordinate_status(event_dt);
+ desktop->set_coordinate_status(from_2geom(event_dt));
}
default:
break;
break;
case GDK_BUTTON_PRESS:
if (event->button.button == 1) {
+ if (event->button.state & GDK_CONTROL_MASK) {
+ SPDocument *doc = SP_OBJECT_DOCUMENT(guide);
+ sp_guide_remove(guide);
+ sp_document_done(doc, SP_VERB_NONE, _("Delete guide"));
+ 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_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,
+ Geom::Point const motion_w(event->motion.x,
event->motion.y);
- NR::Point motion_dt(desktop->w2d(motion_w));
+ Geom::Point motion_dt(to_2geom(desktop->w2d(from_2geom(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 const &m = desktop->namedview->snap_manager;
- motion_dt = m.guideSnap(motion_dt, guide->normal_to_line).getPoint();
+ SnapManager &m = desktop->namedview->snap_manager;
+ m.setup(desktop);
+ m.guideSnap(motion_dt, to_2geom(guide->normal_to_line));
- sp_guide_moveto(*guide, motion_dt.to_2geom(), false);
+ sp_guide_moveto(*guide, from_2geom(motion_dt), false);
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 (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 const &m = desktop->namedview->snap_manager;
- event_dt = m.guideSnap(event_dt, guide->normal_to_line).getPoint();
+ 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);
+ sp_guide_moveto(*guide, from_2geom(event_dt), true);
sp_document_done(sp_desktop_document(desktop), SP_VERB_NONE,
_("Move guide"));
} else {
_("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;
sp_canvas_item_ungrab(item, event->button.time);
sp_guideline_set_color(SP_GUIDELINE(item), guide->hicolor);
char *guide_description = sp_guide_description(guide);
- desktop->guidesMessageContext()->setF(Inkscape::NORMAL_MESSAGE, "%s", guide_description);
+ desktop->guidesMessageContext()->setF(Inkscape::NORMAL_MESSAGE, _("<b>Guideline</b>: %s"), guide_description);
g_free(guide_description);
break;
}
return ret;
}
+//static std::map<GdkInputSource, std::string> switchMap;
+static std::map<std::string, 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)
+ && (dev->source != GDK_SOURCE_MOUSE) ) {
+// 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[dev->name] = TOOLS_CALLIGRAPHIC;
+ break;
+ case GDK_SOURCE_ERASER:
+ toolToUse[dev->name] = TOOLS_ERASER;
+ break;
+ case GDK_SOURCE_CURSOR:
+ toolToUse[dev->name] = TOOLS_SELECT;
+ break;
+ default:
+ ; // do not add
+ }
+// } else if (dev->name) {
+// g_message("Skippn '%s' as [%s]", dev->name, 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 ( lastType != source || lastName != name ) {
+ // The device switched. See if it is one we 'count'
+ //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;
+ }
+ }
+}
+
+
/*
Local Variables: