From patchwork Tue Nov 2 23:37:59 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ping Cheng X-Patchwork-Id: 298292 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 oA2Nbr3R027081 for ; Tue, 2 Nov 2010 23:37:55 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751679Ab0KBXhu (ORCPT ); Tue, 2 Nov 2010 19:37:50 -0400 Received: from mail-gx0-f174.google.com ([209.85.161.174]:56213 "EHLO mail-gx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751423Ab0KBXht (ORCPT ); Tue, 2 Nov 2010 19:37:49 -0400 Received: by gxk23 with SMTP id 23so16710gxk.19 for ; Tue, 02 Nov 2010 16:37:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=0MzOxG56sVrD+TmcB8l6XVJMGt31bo04gTD6QcLaHy4=; b=bve8ddklGVwdmIhsGM6LOVV/ffXL2OFaUAWVm9NN30/yAjZT0OrlxTeCB0sEBIBYBG nr1UiaeCB6Q8fLWFEEXET1SD77eFO8h5Qc7J59lobi4zIjahgn9jVNMtr47lCge2YyCu Wo5kJ8x+CtzXU/xvb3BJTQS2eAv93yH4Etcog= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=j8Vy8FEk7lsLJaKcl1hD29ey057gBRJeSsCYPW/rvIjdahdpCWal1exloIM22F3ZEa +t6hH8uvzkRMtdECuYwYrp92Oqe6x2kZD36IF/pA7EYpkGtUZPSgd6XLlP6MzRzhPMOP vR9OiQTEQRaKwvhhKd0VtpSirvCEk63efvOqU= Received: by 10.224.45.139 with SMTP id e11mr4071711qaf.87.1288741068800; Tue, 02 Nov 2010 16:37:48 -0700 (PDT) Received: from localhost.localdomain ([63.174.36.215]) by mx.google.com with ESMTPS id z23sm6638444yhc.32.2010.11.02.16.37.46 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 02 Nov 2010 16:37:47 -0700 (PDT) From: Ping Cheng To: linux-input@vger.kernel.org Cc: dmitry.torokhov@gmail.com, chris@cnpbagwell.com, Ping Cheng Subject: [PATCH 1/3] Input: wacom - allow both MT and pen data to be reported Date: Tue, 2 Nov 2010 16:37:59 -0700 Message-Id: <1288741079-4993-1-git-send-email-pingc@wacom.com> X-Mailer: git-send-email 1.7.2.3 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, 02 Nov 2010 23:37:55 +0000 (UTC) diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c index b3252ef..b9534a1 100644 --- a/drivers/input/tablet/wacom_wac.c +++ b/drivers/input/tablet/wacom_wac.c @@ -868,13 +868,14 @@ static int wacom_bpt_touch(struct wacom_wac *wacom) for (i = 0; i < 2; i++) { int p = data[9 * i + 2]; input_mt_slot(input, i); - /* - * Touch events need to be disabled while stylus is - * in proximity because user's hand is resting on touchpad - * and sending unwanted events. User expects tablet buttons - * to continue working though. + + /* We send touch events even a stylus is in proximity. Apps or + * userland clients have the opportunity to arbitrate these events + * when pen is in proximity. + * Wacom X server driver arbitrates the events for all apps that + * are based on X server. */ - if (p && !wacom->shared->stylus_in_proximity) { + if (p) { int x = get_unaligned_be16(&data[9 * i + 3]) & 0x7ff; int y = get_unaligned_be16(&data[9 * i + 5]) & 0x7ff; if (features->quirks & WACOM_QUIRK_BBTOUCH_LOWRES) {