On Thu, Feb 11, 2010 at 07:19:05PM -0500, Rafi Rubin wrote:
> This cleans up the identification of multitouch groups. When two touch
> input devices are available, single and multi touch streams are
> partitioned to the appropriate device.
>
> Added triple and quad tap to the single touch device for the benefit of
> tools that recognize different tap types but do not have full
> multi touch support.
>
> Capture a full multitouch group before emitting events. This allows for
> additional processing, though takes little advantage of that capability.
>
> Signed-off-by: Rafi Rubin <rafi@xxxxxxxxxxxxxx>
> ---
> drivers/hid/hid-ntrig.c | 231 +++++++++++++++++++++++++++++++++++++++--------
> 1 files changed, 195 insertions(+), 36 deletions(-)
>
> diff --git a/drivers/hid/hid-ntrig.c b/drivers/hid/hid-ntrig.c
> index 6464d15..9f46a3d 100644
> --- a/drivers/hid/hid-ntrig.c
> +++ b/drivers/hid/hid-ntrig.c
> @@ -20,13 +20,56 @@
> #include "hid-ids.h"
>
> #define NTRIG_DUPLICATE_USAGES 0x001
> +#define NTRIG_MAX_CONTACTS 7
>
> #define nt_map_key_clear(c) hid_map_usage_clear(hi, usage, bit, max, \
> EV_KEY, (c))
>
> +/*
> + * The relavent data needed to store events from a contact to
> + * delay transmittion.
> + */
> +struct ntrig_contact {
> + char active;
Bool?
> + __s8 logical_id;
> + __u16 x, y;
> + __u8 confidence;
> +
> + /* height and width transformed */
> + char orientation;
Make an enum?
> + __u16 touch_major;
> + __u16 touch_minor;
> +};
> +
> +
> struct ntrig_data {
> - __s32 x, y, id, w, h;
> - char reading_a_point, found_contact_id;
> + /* Incoming raw values for a single contact */
> + __u16 x, y, w, h;
> + __u16 id;
> + __u8 confidence;
> +
> + int max_width;
> + int max_height;
> + int max_contacts;
> +
> + unsigned char reading_mt;
> +
> + /* Collected state for 2 full sets of contacts */
> + struct ntrig_contact contacts[NTRIG_MAX_CONTACTS];
> + __u8 contact_count;
> +
> + __u8 mt_footer[4];
> + __u8 mt_foot_count;
> +
> + /* options */
> + unsigned char emit_ghosts;
bool?
> +
> + /*
> + * Keep a pointer to the single touch input device to enable
> + * the multitouch handler to redirect the older style single
> + * touch events.
> + */
> + struct input_dev * st_input;
> };
>
> /*
> @@ -39,8 +82,8 @@ static int ntrig_input_mapping(struct hid_device *hdev, struct hid_input *hi,
> struct hid_field *field, struct hid_usage *usage,
> unsigned long **bit, int *max)
> {
> - /* No special mappings needed for the pen */
> - if(field->application == HID_DG_PEN)
> + /* No special mappings needed for the pen and single touch */
> + if(field->physical)
> return 0;
>
> switch (usage->hid & HID_USAGE_PAGE) {
> @@ -104,8 +147,8 @@ static int ntrig_input_mapped(struct hid_device *hdev, struct hid_input *hi,
> struct hid_field *field, struct hid_usage *usage,
> unsigned long **bit, int *max)
> {
> - /* No special mappings needed for the pen */
> - if(field->application == HID_DG_PEN)
> + /* No special mappings needed for the pen and single touch */
> + if(field->physical)
> return 0;
>
> if (usage->type == EV_KEY || usage->type == EV_REL
> @@ -115,6 +158,73 @@ static int ntrig_input_mapped(struct hid_device *hdev, struct hid_input *hi,
> return 0;
> }
>
> +static void ntrig_conclude_mt(struct input_dev *input, struct ntrig_data *nd)
> +{
> + int i;
> + struct ntrig_contact *contact = &nd->contacts[0];
> +
> + /* Emit single touch events */
> + if(contact->confidence) {
> + switch (nd->contact_count) {
> + case 0: /* for single touch devices */
> + case 1:
> + input_report_key(nd->st_input,
> + BTN_TOOL_DOUBLETAP, 1);
> + break;
> + case 2:
> + input_report_key(nd->st_input,
> + BTN_TOOL_TRIPLETAP, 1);
> + break;
> + case 3:
> + default:
> + input_report_key(nd->st_input,
> + BTN_TOOL_QUADTAP, 1);
Formatting: switch and case start in the same column.
> + }
> + input_report_key(nd->st_input, BTN_TOUCH, 1);
> + input_event(nd->st_input, EV_ABS, ABS_X, contact->x);
> + input_event(nd->st_input, EV_ABS, ABS_Y, contact->y);
> + input_sync(nd->st_input);
> + } else {
> + input_report_key(nd->st_input, BTN_TOUCH, 0);
> + input_report_key(nd->st_input, BTN_TOOL_DOUBLETAP, 0);
> + input_report_key(nd->st_input, BTN_TOOL_TRIPLETAP, 0);
> + input_report_key(nd->st_input, BTN_TOOL_QUADTAP, 0);
> + input_sync(nd->st_input);
> + }
> +
> + /* Multitouch doesn't need to send an end of activity notice. */
> + if(!(nd->contact_count && nd->contacts[0].confidence))
> + return;
> +
> + /* Emit multitouch events */
> + for (i = 0; i <= nd->max_contacts && i < NTRIG_MAX_CONTACTS; i++) {
> + if (nd->contacts[i].confidence) {
> + struct ntrig_contact *contact = &nd->contacts[i];
> + input_event(input, EV_ABS, ABS_MT_TRACKING_ID, i);
> + input_event(input, EV_ABS, ABS_MT_POSITION_X,
> + contact->x);
> + input_event(input, EV_ABS, ABS_MT_POSITION_Y,
> + contact->y);
> + input_event(input, EV_ABS, ABS_MT_ORIENTATION,
> + contact->orientation);
> + input_event(input, EV_ABS, ABS_MT_TOUCH_MAJOR,
> + contact->touch_major);
> + input_event(input, EV_ABS, ABS_MT_TOUCH_MINOR,
> + contact->touch_minor);
> + input_mt_sync(input);
> + } else if (nd->emit_ghosts) {
> + /* emit filler points if so desired */
> + input_event(input, EV_ABS, ABS_MT_TRACKING_ID, i);
> + input_event(input, EV_ABS, ABS_MT_POSITION_X, 0);
> + input_event(input, EV_ABS, ABS_MT_POSITION_Y, 0);
> + input_event(input, EV_ABS, ABS_MT_ORIENTATION, 0);
> + input_event(input, EV_ABS, ABS_MT_TOUCH_MAJOR, 0);
> + input_event(input, EV_ABS, ABS_MT_TOUCH_MINOR, 0);
> + input_mt_sync(input);
> + }
> + }
Where's the final input_sync()? And if hid does it for us (I think it does)
then syncs above are not needed.
> +}
> +
> /*
> * this function is called upon all reports
> * so that we can filter contact point information,
> @@ -133,17 +243,23 @@ static int ntrig_event (struct hid_device *hid, struct hid_field *field,
>
> if (hid->claimed & HID_CLAIMED_INPUT) {
> switch (usage->hid) {
> + case 0xff000001:
> + /* Tag indicating the start of a multitouch group */
> + nd->reading_mt = 1;
> + break;
> + case HID_DG_CONFIDENCE:
> + nd->confidence = value;
> + break;
> case HID_GD_X:
> nd->x = value;
> - nd->reading_a_point = 1;
> + /* Clear the contact footer */
> + nd->mt_foot_count = 0;
> break;
> case HID_GD_Y:
> nd->y = value;
> break;
> case HID_DG_CONTACTID:
> nd->id = value;
> - /* we receive this only when in multitouch mode */
> - nd->found_contact_id = 1;
> break;
> case HID_DG_WIDTH:
> nd->w = value;
> @@ -155,7 +271,7 @@ static int ntrig_event (struct hid_device *hid, struct hid_field *field,
> * report received in a finger event. We want
> * to emit a normal (X, Y) position
> */
> - if (!nd->found_contact_id) {
> + if (!nd->reading_mt) {
> input_event(input, EV_ABS, ABS_X, nd->x);
> input_event(input, EV_ABS, ABS_Y, nd->y);
> }
> @@ -167,33 +283,58 @@ static int ntrig_event (struct hid_device *hid, struct hid_field *field,
> * this usage tells if the contact point is real
> * or a placeholder
> */
> - if (!nd->reading_a_point || value != 1)
> +
> + /* Shouldn't get more than 4 footer packets, so skip */
> + if (nd->mt_foot_count >= 4)
> + break;
> +
> + nd->mt_footer[nd->mt_foot_count++] = value;
> +
> + /* if the footer isn't complete break */
> + if (nd->mt_foot_count != 4)
> + break;
> +
> + /* Pen activity signal, trigger end of touch. */
> + if (nd->mt_footer[2]) {
> + nd->contacts[nd->id].x = 0;
> + nd->contacts[nd->id].y = 0;
> + nd->contacts[nd->id].confidence = 0;
> break;
> - /* emit a normal (X, Y) for the first point only */
> - if (nd->id == 0) {
> - input_event(input, EV_ABS, ABS_X, nd->x);
> - input_event(input, EV_ABS, ABS_Y, nd->y);
> }
> - input_event(input, EV_ABS, ABS_MT_POSITION_X, nd->x);
> - input_event(input, EV_ABS, ABS_MT_POSITION_Y, nd->y);
> +
> + /* If the contact was invalid */
> + if (!(nd->confidence && nd->mt_footer[0])
> + || nd->w <= 250
> + || nd->h <= 190) {
> + nd->contacts[nd->id].x = 0;
> + nd->contacts[nd->id].y = 0;
> + nd->contacts[nd->id].confidence = 0;
> + break;
> + }
> +
> + nd->contacts[nd->id].logical_id = -1;
> + nd->contacts[nd->id].confidence = nd->confidence;
> + nd->contacts[nd->id].x = nd->x;
> + nd->contacts[nd->id].y = nd->y;
> +
> if (nd->w > nd->h) {
> - input_event(input, EV_ABS,
> - ABS_MT_ORIENTATION, 1);
> - input_event(input, EV_ABS,
> - ABS_MT_TOUCH_MAJOR, nd->w);
> - input_event(input, EV_ABS,
> - ABS_MT_TOUCH_MINOR, nd->h);
> + nd->contacts[nd->id].orientation = 1;
> + nd->contacts[nd->id].touch_major = nd->w;
> + nd->contacts[nd->id].touch_minor = nd->h;
> } else {
> - input_event(input, EV_ABS,
> - ABS_MT_ORIENTATION, 0);
> - input_event(input, EV_ABS,
> - ABS_MT_TOUCH_MAJOR, nd->h);
> - input_event(input, EV_ABS,
> - ABS_MT_TOUCH_MINOR, nd->w);
> + nd->contacts[nd->id].orientation = 0;
> + nd->contacts[nd->id].touch_major = nd->h;
> + nd->contacts[nd->id].touch_minor = nd->w;
> + }
> + break;
> +
> + case HID_DG_CONTACTCOUNT:
> + /* This marks the end of the multitouch group */
> + nd->contact_count = value;
> + if(nd->reading_mt) {
> + nd->reading_mt = 0;
> + ntrig_conclude_mt(input, nd);
> }
> - input_mt_sync(field->hidinput->input);
> - nd->reading_a_point = 0;
> - nd->found_contact_id = 0;
> break;
>
> default:
> @@ -203,8 +344,8 @@ static int ntrig_event (struct hid_device *hid, struct hid_field *field,
> }
>
> /* we have handled the hidinput part, now remains hiddev */
> - if (hid->claimed & HID_CLAIMED_HIDDEV && hid->hiddev_hid_event)
> - hid->hiddev_hid_event(hid, field, usage, value);
> + if (hid->claimed & HID_CLAIMED_HIDDEV && hid->hiddev_hid_event)
I prefer adding () around bitwise ops, just so I don't doubt which has
hgher perecdence.
> + hid->hiddev_hid_event(hid, field, usage, value);
>
> return 1;
> }
> @@ -224,8 +365,16 @@ static int ntrig_probe(struct hid_device *hdev, const struct hid_device_id *id)
> dev_err(&hdev->dev, "cannot allocate N-Trig data\n");
> return -ENOMEM;
> }
> - nd->reading_a_point = 0;
> - nd->found_contact_id = 0;
> +
> + /* Initialize the driver data to sane values */
> + nd->id = 0;
> + nd->reading_mt = 0;
> + nd->contact_count = 0;
> + nd->max_width = 0x500;
> + nd->max_height = 0x500;
> + nd->max_contacts = 5;
> + nd->emit_ghosts = 0;
> +
> hid_set_drvdata(hdev, nd);
>
> ret = hid_parse(hdev);
> @@ -251,6 +400,15 @@ static int ntrig_probe(struct hid_device *hdev, const struct hid_device_id *id)
> */
> if(hidinput->report->field[0]->physical) {
> input->name = "N-Trig Touchscreen";
> + nd->st_input = input;
> +
> + /*
> + * A little something special to enable
> + * two and three finger taps.
> + */
> + set_bit(BTN_TOOL_DOUBLETAP, input->keybit);
> + set_bit(BTN_TOOL_TRIPLETAP, input->keybit);
> + set_bit(BTN_TOOL_QUADTAP, input->keybit);
__set_bit() - no need to lock the bus.
> } else {
> input->name = "N-Trig MultiTouch";
> }
> @@ -271,6 +429,7 @@ static const struct hid_device_id ntrig_devices[] = {
> .driver_data = NTRIG_DUPLICATE_USAGES },
> { }
> };
> +
> MODULE_DEVICE_TABLE(hid, ntrig_devices);
>
> static const struct hid_usage_id ntrig_grabbed_usages[] = {
> --
> 1.6.6.1
>
--
Dmitry
--
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
