On Fri, Jan 15, 2010 at 7:23 AM, Chris Bagwell <ch...@cnpbagwell.com> wrote:
>> which commit is this supposed to go on? It doesn't seem to apply to any of
>> the last 15 commits in my tree.
>>
>> Cheers,
>> Peter
>
> Really? Its a fresh clone of sourceforge git from two days ago. My git log
Please try:
git clone
git://linuxwacom.git.sourceforge.net/gitroot/linuxwacom/xf86-input-wacom
Then "git apply" the attached patch to see if it works for you or not.
> I'm far from a git expert and could have done something wrong. Let me
> research and see how to proceed.
No problem. We are all learning something everyday. I made a patch
in your name. Please let me know if it is properly translating your
idea or not.
Thank you for your help.
Ping
From 39e8c901a70f19b8b806c44ea4d90920ff0befac Mon Sep 17 00:00:00 2001
From: Chris Bagwell <ch...@cnpbagwell.com>
Date: Fri, 15 Jan 2010 15:53:54 -0800
Subject: [PATCH] xf86-input-wacom - Default touch tool to Relative Mode for Bamboo P&T
Touch data for LCD and Bamboo P&T tablets are all defined as touch
tools. Making their Mode defaults match normal operating behavior, which
means changing Bamboo P&T touch tool default to relative.
Simplify Mode error case and rely on default values from initialization phase.
Signed-off-by: Chris Bagwell <ch...@cnpbagwell.com>
Tested-by: Ping Cheng <pingli...@gmail.com>
---
man/wacom.man | 2 +-
src/wcmValidateDevice.c | 23 ++++++++++++++---------
2 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/man/wacom.man b/man/wacom.man
index 4b893ec..54354d6 100644
--- a/man/wacom.man
+++ b/man/wacom.man
@@ -99,7 +99,7 @@ sets the mode of the device. The default value for stylus and
eraser is Absolute; cursor is Relative; pad mode is decided
according to its core option due to its nature of not moving
system cursor: Relative if it is a core device; Absolute, otherwise;
-touch is always in absolute mode.
+touch defaults to Relative for opaque tablets and Absolute for LCD tablets.
.TP 4
.B Option \fI"TopX"\fP \fI"number"\fP
X coordinate of the top corner of the active zone. Default to 0.
diff --git a/src/wcmValidateDevice.c b/src/wcmValidateDevice.c
index e8f4c2b..d91bf22 100644
--- a/src/wcmValidateDevice.c
+++ b/src/wcmValidateDevice.c
@@ -418,18 +418,23 @@ int wcmParseOptions(LocalDevicePtr local, unsigned long* keys)
priv->flags |= ABSOLUTE_FLAG;
else if (s && (xf86NameCmp(s, "relative") == 0))
priv->flags &= ~ABSOLUTE_FLAG;
- else if (s)
+ else
{
- xf86Msg(X_ERROR, "%s: invalid Mode (should be absolute or "
- "relative). Using default.\n", local->name);
-
- /* stylus/eraser defaults to absolute mode
- * cursor defaults to relative mode
+ if (s)
+ xf86Msg(X_ERROR, "%s: invalid Mode (should be absolute"
+ " or relative). Using default.\n", local->name);
+
+ /* If Mode is not specified or is invalid then rely on
+ * Type specific defaults from initialization.
+ *
+ * If Mode default is hardware specific then handle here:
+ *
+ * touch Types are initialized to Absolute.
+ * Bamboo P&T touch need to change default to Relative.
*/
- if (IsCursor(priv))
+ if (IsTouch(priv) &&
+ (common->tablet_id >= 0xd0) && (common->tablet_id <= 0xd3))
priv->flags &= ~ABSOLUTE_FLAG;
- else
- priv->flags |= ABSOLUTE_FLAG;
}
/* Pad is always in relative mode when it's a core device.
--
1.6.5.2
------------------------------------------------------------------------------
Throughout its 18-year history, RSA Conference consistently attracts the
world's best and brightest in the field, creating opportunities for Conference
attendees to learn about information security's most important issues through
interactions with peers, luminaries and emerging and established companies.
http://p.sf.net/sfu/rsaconf-dev2dev
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
