From b27e24793a44d98c5cc944324ccfa32a5e25c1ee Mon Sep 17 00:00:00 2001 From: Henrik Rydberg Date: Sun, 7 Apr 2013 20:52:22 -0700 Subject: [PATCH] --- yaml --- r: 368095 b: refs/heads/master c: a0ef6a348a47bdb3896c468608f9cd19c1c26949 h: refs/heads/master i: 368093: 400e7e3efbf9b36ad04c96c1340d731ef39f0779 368091: 4074d2ccd6fb4f121ace3cca82b376836036ad95 368087: 8da98e193d937ff3714ba8204d31a007e2e696d7 368079: 82a41471f07beb7782f60f53c5fdcca164c46d7a 368063: 68293364ae335c184661485d114008eff8174afe v: v3 --- [refs] | 2 +- trunk/drivers/input/input-mt.c | 8 +++++++- trunk/include/linux/input/mt.h | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9a801cd09267..9f7df818795b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7a246777a694563c490811f9d398318652a3ffb4 +refs/heads/master: a0ef6a348a47bdb3896c468608f9cd19c1c26949 diff --git a/trunk/drivers/input/input-mt.c b/trunk/drivers/input/input-mt.c index 71db1930573f..d398f1321f14 100644 --- a/trunk/drivers/input/input-mt.c +++ b/trunk/drivers/input/input-mt.c @@ -79,6 +79,8 @@ int input_mt_init_slots(struct input_dev *dev, unsigned int num_slots, } if (flags & INPUT_MT_DIRECT) __set_bit(INPUT_PROP_DIRECT, dev->propbit); + if (flags & INPUT_MT_SEMI_MT) + __set_bit(INPUT_PROP_SEMI_MT, dev->propbit); if (flags & INPUT_MT_TRACK) { unsigned int n2 = num_slots * num_slots; mt->red = kcalloc(n2, sizeof(*mt->red), GFP_KERNEL); @@ -246,6 +248,7 @@ void input_mt_sync_frame(struct input_dev *dev) { struct input_mt *mt = dev->mt; struct input_mt_slot *s; + bool use_count = false; if (!mt) return; @@ -259,7 +262,10 @@ void input_mt_sync_frame(struct input_dev *dev) } } - input_mt_report_pointer_emulation(dev, (mt->flags & INPUT_MT_POINTER)); + if ((mt->flags & INPUT_MT_POINTER) && !(mt->flags & INPUT_MT_SEMI_MT)) + use_count = true; + + input_mt_report_pointer_emulation(dev, use_count); mt->frame++; } diff --git a/trunk/include/linux/input/mt.h b/trunk/include/linux/input/mt.h index 2e86bd0bfba1..1b1dfa80d9ff 100644 --- a/trunk/include/linux/input/mt.h +++ b/trunk/include/linux/input/mt.h @@ -19,6 +19,7 @@ #define INPUT_MT_DIRECT 0x0002 /* direct device, e.g. touchscreen */ #define INPUT_MT_DROP_UNUSED 0x0004 /* drop contacts not seen in frame */ #define INPUT_MT_TRACK 0x0008 /* use in-kernel tracking */ +#define INPUT_MT_SEMI_MT 0x0010 /* semi-mt device, finger count handled manually */ /** * struct input_mt_slot - represents the state of an input MT slot