On 11/03/2010 12:37 AM, Ping Cheng wrote:
> It was suggested by app and X server developers that both MT and pen data
> should be reported to the userland if the data is valid. Bamboo series are
> among these devices that both data are valid from the hardware perspective.
>
> Signed-off-by: Ping Cheng <pingc@xxxxxxxxx>
>
> ---
> drivers/input/tablet/wacom_wac.c | 13 +++++++------
> 1 files changed, 7 insertions(+), 6 deletions(-)
>
> 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) {
This seems to be an exact revert of 33d5f713a, minus the comments. Perhaps a
revert with the comment in the commit message instead?
Thanks,
Henrik
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
