Commit 73e8a8e7 authored by Benjamin Tissoires's avatar Benjamin Tissoires Committed by Dmitry Torokhov

Input: MT - make slot assignment work for overcovered solutions

The recent inclusion of a deassignment cost in the slot assignment
algorithm did not properly account for the corner cases where the
solutions are overcovered. This change makes sure the resulting
assignment is unique, allocating new slots when necessary.
Signed-off-by: default avatarHenrik Rydberg <rydberg@bitmath.org>
Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Acked-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 61125591
...@@ -365,27 +365,35 @@ static void input_mt_set_slots(struct input_mt *mt, ...@@ -365,27 +365,35 @@ static void input_mt_set_slots(struct input_mt *mt,
int *slots, int num_pos) int *slots, int num_pos)
{ {
struct input_mt_slot *s; struct input_mt_slot *s;
int *w = mt->red, *p; int *w = mt->red, j;
for (p = slots; p != slots + num_pos; p++) for (j = 0; j != num_pos; j++)
*p = -1; slots[j] = -1;
for (s = mt->slots; s != mt->slots + mt->num_slots; s++) { for (s = mt->slots; s != mt->slots + mt->num_slots; s++) {
if (!input_mt_is_active(s)) if (!input_mt_is_active(s))
continue; continue;
for (p = slots; p != slots + num_pos; p++)
if (*w++ < 0) for (j = 0; j != num_pos; j++) {
*p = s - mt->slots; if (w[j] < 0) {
slots[j] = s - mt->slots;
break;
}
}
w += num_pos;
} }
for (s = mt->slots; s != mt->slots + mt->num_slots; s++) { for (s = mt->slots; s != mt->slots + mt->num_slots; s++) {
if (input_mt_is_active(s)) if (input_mt_is_active(s))
continue; continue;
for (p = slots; p != slots + num_pos; p++)
if (*p < 0) { for (j = 0; j != num_pos; j++) {
*p = s - mt->slots; if (slots[j] < 0) {
slots[j] = s - mt->slots;
break; break;
} }
}
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment