diff options
Diffstat (limited to 'src/wcmUSB.c')
| -rw-r--r-- | src/wcmUSB.c | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/src/wcmUSB.c b/src/wcmUSB.c index b5b69a3..ff5d875 100644 --- a/src/wcmUSB.c +++ b/src/wcmUSB.c @@ -535,28 +535,13 @@ Bool usbWcmInit(LocalDevicePtr local, char* id, float *version) common->wcmResolY = WacomModelDesc [i].yRes; } - /* a single touch device */ - if (ISBITSET (keys, BTN_TOOL_DOUBLETAP)) - { - /* TouchDefault was off for all devices - * except when touch is supported */ - common->wcmTouchDefault = 1; - } - else if (common->wcmModel && + if (common->wcmModel && strstr(common->wcmModel->name, "TabletPC")) { /* For penabled Tablet PCs, Tablet PC Button * are on by default */ common->wcmTPCButtonDefault = 1; } - - /* 2FG touch device */ - if (ISBITSET (keys, BTN_TOOL_TRIPLETAP)) - { - /* GestureDefault was off for all devices - * except when multi-touch is supported */ - common->wcmGestureDefault = 1; - } } if (!common->wcmModel) @@ -565,14 +550,6 @@ Bool usbWcmInit(LocalDevicePtr local, char* id, float *version) common->wcmResolX = common->wcmResolY = 1016; } - /* check if touch was turned off in xorg.conf */ - common->wcmTouch = xf86SetBoolOption(local->options, "Touch", - common->wcmTouchDefault); - - /* Touch gesture applies to the whole tablet */ - common->wcmGesture = xf86SetBoolOption(local->options, "Gesture", - common->wcmGestureDefault); - /* check if TPCButton was turned off in xorg.conf for pen */ if (priv->flags & STYLUS_ID) common->wcmTPCButton = xf86SetBoolOption(local->options, |