From 95a7a222debe11414fb889a8929dfa89372a7174 Mon Sep 17 00:00:00 2001 From: kidproto Date: Mon, 6 Nov 2006 02:55:32 +0000 Subject: [PATCH] Applied patch to disable the pressure sensitivity for those people that have problems and added new author to our authors file: https://sourceforge.net/tracker/index.php?func=detail&aid=1511066&group_id=93438&atid=604308 Please test o this feature for those who have tablets, pressure sensitivity, etc...it is a workaround for gtk+ problems with some tablets, etc... --- AUTHORS | 1 + src/display/sp-canvas.cpp | 5 ++++- src/preferences-skeleton.h | 1 + src/ui/dialog/inkscape-preferences.cpp | 3 +++ src/ui/dialog/inkscape-preferences.h | 3 ++- 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/AUTHORS b/AUTHORS index c4358ef87..05b03b344 100644 --- a/AUTHORS +++ b/AUTHORS @@ -90,3 +90,4 @@ Andre Twupack Tim Mooney Boldewyn Marcus Brubaker +James Kilfiger 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 #include #include +#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[] = " \n" "\n" " \n" +" " " \n" " \n" " \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; -- 2.30.2