From: Ping Cheng <[email protected]> Touch and TPCButton options are global. They should be checked for all USB devices.
[peter: remove superfluous log message, the server logs any detected option for us already] Signed-off-by: Ping Cheng <[email protected]> Signed-off-by: Peter Hutterer <[email protected]> --- I had this patch sitting in my tree ready-to-push and then Enrico's merge gave me a bit of a headache - there was a conflict. Ping, can you just glance over it to make sure I didn't change the intent of the patch? Enrico, can you please test this to make sure it doesn't bust the new bamboo stuff? Thanks. src/wcmUSB.c | 29 +++++++++-------------------- 1 files changed, 9 insertions(+), 20 deletions(-) diff --git a/src/wcmUSB.c b/src/wcmUSB.c index 72f3057..5e224ab 100644 --- a/src/wcmUSB.c +++ b/src/wcmUSB.c @@ -543,28 +543,17 @@ Bool usbWcmInit(LocalDevicePtr local, char* id, float *version) /* TouchDefault was off for all devices */ /* except when touch is supported */ common->wcmTouchDefault = 1; - - /* check if touch was turned off in xorg.conf */ - common->wcmTouch = xf86SetBoolOption(local->options, - "Touch", common->wcmTouchDefault); - if ( common->wcmTouch ) - xf86Msg(X_CONFIG, "%s: Touch is enabled \n", local->name); - } - - if (!is_bamboo_touch) - { - /* Tablet PC button applied to the whole tablet. Not just one tool */ - common->wcmTPCButtonDefault = 1; /* Tablet PC buttons on by default */ - if ( priv->flags & STYLUS_ID ) - { - common->wcmTPCButton = xf86SetBoolOption(local->options, - "TPCButton", common->wcmTPCButtonDefault); - if ( common->wcmTPCButton ) - xf86Msg(X_CONFIG, "%s: Tablet PC buttons are on \n", - local->name); - } } } + + /* check if touch was turned off in xorg.conf */ + common->wcmTouch = xf86SetBoolOption(local->options, + "Touch", common->wcmTouchDefault); + + /* check if TPCButton was set in xorg.conf */ + if (!is_bamboo_touch && (priv->flags & STYLUS_ID)) + common->wcmTPCButton = xf86SetBoolOption(local->options, + "TPCButton", common->wcmTPCButtonDefault); } if (!common->wcmModel) -- 1.6.5.2 ------------------------------------------------------------------------------ Return on Information: Google Enterprise Search pays you back Get the facts. http://p.sf.net/sfu/google-dev2dev _______________________________________________ Linuxwacom-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
