X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fdesktop-events.cpp;h=4258d1980433540ef133373827f6f982f8681f22;hb=ea479a317d3fb2890308a1cc99ee730dd7b76de8;hp=d5158255abe473f0f700032445257229a59c8b2c;hpb=84e5676034b77e63dbc43746cec0a8b48fd06f7c;p=inkscape.git diff --git a/src/desktop-events.cpp b/src/desktop-events.cpp index d5158255a..4258d1980 100644 --- a/src/desktop-events.cpp +++ b/src/desktop-events.cpp @@ -14,7 +14,10 @@ #ifdef HAVE_CONFIG_H # include #endif +#include +#include #include "display/guideline.h" +#include "display/snap-indicator.h" #include "helper/unit-menu.h" #include "helper/units.h" #include "desktop.h" @@ -33,12 +36,34 @@ #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); } @@ -54,7 +79,7 @@ static gint sp_dt_ruler_event(GtkWidget *widget, GdkEvent *event, SPDesktopWidge 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*/); @@ -63,8 +88,8 @@ static gint sp_dt_ruler_event(GtkWidget *widget, GdkEvent *event, SPDesktopWidge 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); @@ -105,7 +130,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 ), @@ -115,25 +140,27 @@ 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 const &m = desktop->namedview->snap_manager; - event_dt = m.guideSnap(event_dt, normal).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: 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, normal).getPoint(); + SnapManager &m = desktop->namedview->snap_manager; + m.setup(desktop); + m.guideSnap(event_dt, normal); dragging = false; gtk_object_destroy(GTK_OBJECT(guide)); @@ -142,13 +169,13 @@ static gint sp_dt_ruler_event(GtkWidget *widget, GdkEvent *event, SPDesktopWidge 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, _("Create guide")); } - desktop->set_coordinate_status(event_dt); + desktop->set_coordinate_status(from_2geom(event_dt)); } default: break; @@ -189,11 +216,18 @@ gint sp_dt_guide_event(SPCanvasItem *item, GdkEvent *event, gpointer data) 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; @@ -201,34 +235,37 @@ gint sp_dt_guide_event(SPCanvasItem *item, GdkEvent *event, gpointer data) 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 { @@ -239,8 +276,8 @@ gint sp_dt_guide_event(SPCanvasItem *item, GdkEvent *event, gpointer data) _("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); @@ -251,7 +288,7 @@ gint sp_dt_guide_event(SPCanvasItem *item, GdkEvent *event, gpointer data) 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, _("Guideline: %s"), guide_description); g_free(guide_description); break; } @@ -266,6 +303,123 @@ gint sp_dt_guide_event(SPCanvasItem *item, GdkEvent *event, gpointer data) return ret; } +static std::map switchMap; +static std::map 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(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_ERASER; + 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(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(event); + if ( event2->device ) { + source = event2->device->source; + name = event2->device->name; + } + } + break; + + case GDK_SCROLL: + { + GdkEventScroll* event2 = reinterpret_cast(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(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::iterator it = switchMap.find(source); + if ( (it != switchMap.end()) && (name == it->second) ) { + std::map::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: