4 files changed, 10 insertions, 2 deletions
diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp
index f258d5370..71e4d955d 100644
--- a/src/display/sp-canvas.cpp
+++ b/src/display/sp-canvas.cpp
@@ -33,6 +33,7 @@
 #include <libnr/nr-matrix-fns.h>
 #include <libnr/nr-matrix-ops.h>
 #include <libnr/nr-convex-hull.h>
+#include "prefs-utils.h"
 
 enum {
 	RENDERMODE_NORMAL,
@@ -1086,7 +1087,9 @@ sp_canvas_realize (GtkWidget *widget)
 
     widget->window = gdk_window_new (gtk_widget_get_parent_window (widget), &attributes, attributes_mask);
     gdk_window_set_user_data (widget->window, widget);
-    gtk_widget_set_events(widget, attributes.event_mask);
+
+    if ( prefs_get_int_attribute ("options.useextinput", "value", 1) )
+        gtk_widget_set_events(widget, attributes.event_mask);
 
     GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
 
diff --git a/src/preferences-skeleton.h b/src/preferences-skeleton.h
index ee1fd14ca..49d8731e1 100644
--- a/src/preferences-skeleton.h
+++ b/src/preferences-skeleton.h
@@ -163,6 +163,7 @@ static char const preferences_skeleton[] =
 "  </group>\n"
 "\n"
 "  <group id=\"options\">\n"
+"    <group id=\"useextinput\" value=\"1\" />"
 "    <group id=\"nudgedistance\" value=\"2\"/>\n"
 "    <group id=\"rotationsnapsperpi\" value=\"12\"/>\n"
 "    <group id=\"cursortolerance\" value=\"8.0\"/>\n"
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index 86a0c4b72..f320860cb 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -570,6 +570,9 @@ void InkscapePreferences::initPageMisc()
     _misc_mask_remove.init ( _("Remove clipping path or mask after applying"), "options.maskobject", "remove", true);
     _page_misc.add_line(true, "", _misc_mask_remove, "", 
                         _("After applying, remove the object used as the clipping path or mask from the drawing"));
+    _misc_use_ext_input.init( _("Use a pressure sensitive tablet or other device (requires restart)"), "options.useextinput", "value", true);
+    _page_misc.add_line(true, "",_misc_use_ext_input, "",
+                        _("Use the capablities of a tablet or other pressure sensitive device. Disable this only if you have problems with the tablet."));
 
     this->AddPage(_page_misc, _("Misc"), PREFS_PAGE_MISC);
 }
diff --git a/src/ui/dialog/inkscape-preferences.h b/src/ui/dialog/inkscape-preferences.h
index e275d3d9c..4188268ec 100644
--- a/src/ui/dialog/inkscape-preferences.h
+++ b/src/ui/dialog/inkscape-preferences.h
@@ -1,5 +1,5 @@
 /**
- * \brief Inkscape Preferences dialog
+ * brief Inkscape Preferences dialog
  *
  * Authors:
  *   Carl Hetherington
@@ -139,6 +139,7 @@ protected:
     PrefCombo       _misc_overs_bitmap;
     PrefCheckButton _misc_mask_on_top;
     PrefCheckButton _misc_mask_remove;
+    PrefCheckButton _misc_use_ext_input;
 
     int _max_dialog_width;
     int _max_dialog_height;