From patchwork Tue Dec 7 11:29:00 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henrik Rydberg X-Patchwork-Id: 382632 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oB7BTRTQ019416 for ; Tue, 7 Dec 2010 11:29:27 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752423Ab0LGL30 (ORCPT ); Tue, 7 Dec 2010 06:29:26 -0500 Received: from ch-smtp03.sth.basefarm.net ([80.76.149.214]:49528 "EHLO ch-smtp03.sth.basefarm.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752184Ab0LGL3Z (ORCPT ); Tue, 7 Dec 2010 06:29:25 -0500 Received: from c83-248-196-64.bredband.comhem.se ([83.248.196.64]:44414 helo=polaris) by ch-smtp03.sth.basefarm.net with smtp (Exim 4.68) (envelope-from ) id 1PPvjG-0002Ob-Ch; Tue, 07 Dec 2010 12:29:10 +0100 Received: by polaris (sSMTP sendmail emulation); Tue, 07 Dec 2010 12:29:04 +0100 From: "Henrik Rydberg" To: Dmitry Torokhov Cc: Jiri Kosina , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Henrik Rydberg Subject: [PATCH] input: mt: Add an envelope tool type Date: Tue, 7 Dec 2010 12:29:00 +0100 Message-Id: <1291721340-22652-1-git-send-email-rydberg@euromail.se> X-Mailer: git-send-email 1.7.1 X-Originating-IP: 83.248.196.64 X-Scan-Result: No virus found in message 1PPvjG-0002Ob-Ch. X-Scan-Signature: ch-smtp03.sth.basefarm.net 1PPvjG-0002Ob-Ch a53079a8c984bd697f611bb097e4be98 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Tue, 07 Dec 2010 11:29:27 +0000 (UTC) diff --git a/Documentation/input/multi-touch-protocol.txt b/Documentation/input/multi-touch-protocol.txt index bdcba15..690dd11 100644 --- a/Documentation/input/multi-touch-protocol.txt +++ b/Documentation/input/multi-touch-protocol.txt @@ -240,7 +240,7 @@ ABS_MT_TOOL_TYPE The type of approaching tool. A lot of kernel drivers cannot distinguish between different tool types, such as a finger or a pen. In such cases, the event should be omitted. The protocol currently supports MT_TOOL_FINGER and -MT_TOOL_PEN [2]. +MT_TOOL_PEN and MT_TOOL_ENVELOPE [2]. ABS_MT_BLOB_ID @@ -312,7 +312,8 @@ where examples can be found. [1] With the extension ABS_MT_APPROACH_X and ABS_MT_APPROACH_Y, the difference between the contact position and the approaching tool position could be used to derive tilt. -[2] The list can of course be extended. +[2] ABS_MT_ENVELOPE contacts represent an envelope of the contacts rather +than the actual contacts. Used with older, not fully MT capable, devices. [3] Multitouch X driver project: http://bitmath.org/code/multitouch/. [4] See the section on event computation. [5] See the section on finger tracking. diff --git a/include/linux/input.h b/include/linux/input.h index dd7c0fc..329dc0e 100644 --- a/include/linux/input.h +++ b/include/linux/input.h @@ -848,6 +848,8 @@ struct input_keymap_entry { */ #define MT_TOOL_FINGER 0 #define MT_TOOL_PEN 1 +#define MT_TOOL_ENVELOPE 2 +#define MT_TOOL_MAX 2 /* * Values describing the status of a force-feedback effect