Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753574AbbD2O4I (ORCPT ); Wed, 29 Apr 2015 10:56:08 -0400 Received: from mail-lb0-f172.google.com ([209.85.217.172]:34693 "EHLO mail-lb0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753257AbbD2O4F (ORCPT ); Wed, 29 Apr 2015 10:56:05 -0400 Message-ID: <5540F102.5010809@gmail.com> Date: Wed, 29 Apr 2015 17:56:02 +0300 From: Dmitry Tunin User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0 MIME-Version: 1.0 To: Mathias Gottschlag , linux-input@vger.kernel.org CC: linux-kernel@vger.kernel.org Subject: Re: [PATCH v8] psmouse - focaltech pass finger width to userspace References: <1429830932-4501-1-git-send-email-hanipouspilot@gmail.com> <553A198D.8010103@gmail.com> In-Reply-To: <553A198D.8010103@gmail.com> Content-Type: text/plain; charset=iso-8859-15 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4335 Lines: 115 > > Hi, > > Some comments below. If it is not a problem that width values are > outdated as soon as there are two or more fingers on the touchpad, I > think the change is good. > > Regards, > Mathias > > Am 24.04.2015 um 01:15 schrieb Dmitry Tunin: >> Focaltech touchpads report finger width in packet[5] of absolute packet. >> Range for width in raw format is 0x10 - 0x70. Second half-byte is always 0. >> 0xff is reported, when a large contact area is detected. >> This can be handled in userspace. >> >> Signed-off-by: Dmitry Tunin >> --- >> drivers/input/mouse/focaltech.c | 16 ++++++++++++++-- >> 1 file changed, 14 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/input/mouse/focaltech.c b/drivers/input/mouse/focaltech.c >> index 23d2594..ea53f8b 100644 >> --- a/drivers/input/mouse/focaltech.c >> +++ b/drivers/input/mouse/focaltech.c >> @@ -90,6 +90,13 @@ struct focaltech_finger_state { >> */ >> unsigned int x; >> unsigned int y; >> + >> + /* >> + * Finger width 0-7 and 15 for 'latching' > You already describe below that 15 is latched - what you write above > should probably rather be something like "15 if a very large contact > area was detected" or something like that. >> + * 15 value stays until the finger is released >> + * Width is reported only in absolute packets >> + */ >> + unsigned int width; >> }; >> >> /* >> @@ -112,7 +119,7 @@ struct focaltech_data { >> struct focaltech_hw_state state; >> }; >> >> -static void focaltech_report_state(struct psmouse *psmouse) >> +static void focaltech_report_state(struct psmouse *psmouse, bool abs) >> { >> struct focaltech_data *priv = psmouse->private; >> struct focaltech_hw_state *state = &priv->state; >> @@ -137,6 +144,7 @@ static void focaltech_report_state(struct psmouse *psmouse) >> input_report_abs(dev, ABS_MT_POSITION_X, clamped_x); >> input_report_abs(dev, ABS_MT_POSITION_Y, >> priv->y_max - clamped_y); >> + if (abs) input_report_abs(dev, ABS_TOOL_WIDTH, state->width); > You are sending width here for *all* fingers, even though only one > finger has an up-to-date width value. Is that intentional? I fail to see > how that is different from always sending width no matter the packet > type, because in any case all but one fingers will have an outdated > width value. Thats first I tried to do. But this confuses xorg-synapics, e.g. when I send width with a touch packet. >> } >> } >> input_mt_report_pointer_emulation(dev, true); >> @@ -187,6 +195,7 @@ static void focaltech_process_abs_packet(struct psmouse *psmouse, >> >> state->fingers[finger].x = ((packet[1] & 0xf) << 8) | packet[2]; >> state->fingers[finger].y = (packet[3] << 8) | packet[4]; >> + state->fingers[finger].width = packet[5] >> 4; >> state->fingers[finger].valid = true; >> } >> >> @@ -228,14 +237,17 @@ static void focaltech_process_packet(struct psmouse *psmouse) >> switch (packet[0] & 0xf) { >> case FOC_TOUCH: >> focaltech_process_touch_packet(psmouse, packet); >> + focaltech_report_state(psmouse, false); >> break; >> >> case FOC_ABS: >> focaltech_process_abs_packet(psmouse, packet); >> + focaltech_report_state(psmouse, true); >> break; >> >> case FOC_REL: >> focaltech_process_rel_packet(psmouse, packet); >> + focaltech_report_state(psmouse, false); >> break; >> >> default: >> @@ -243,7 +255,6 @@ static void focaltech_process_packet(struct psmouse *psmouse) >> break; >> } >> > Remove that blank line as well? :) >> - focaltech_report_state(psmouse); >> } >> >> static psmouse_ret_t focaltech_process_byte(struct psmouse *psmouse) >> @@ -331,6 +342,7 @@ static void focaltech_set_input_params(struct psmouse *psmouse) >> __set_bit(EV_ABS, dev->evbit); >> input_set_abs_params(dev, ABS_MT_POSITION_X, 0, priv->x_max, 0, 0); >> input_set_abs_params(dev, ABS_MT_POSITION_Y, 0, priv->y_max, 0, 0); >> + input_set_abs_params(dev, ABS_TOOL_WIDTH, 0, 15, 0, 0); >> input_mt_init_slots(dev, 5, INPUT_MT_POINTER); >> __set_bit(INPUT_PROP_BUTTONPAD, dev->propbit); >> } > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/