diff options
| author | Henrik Rydberg <rydberg@euromail.se> | 2010-04-15 19:44:39 +0200 |
|---|---|---|
| committer | Henrik Rydberg <rydberg@euromail.se> | 2010-04-15 21:41:15 +0200 |
| commit | c9648012e8d6533c8f0b8b937f562f57721f7574 (patch) | |
| tree | ec9f2aea88efc67eb48fbda1a87ab635b2762c84 /src | |
| parent | 409903fbaa794beba980a0d9c6b3151171576a6f (diff) | |
| download | xorg-input-kobomultitouch-c9648012e8d6533c8f0b8b937f562f57721f7574.tar.gz xorg-input-kobomultitouch-c9648012e8d6533c8f0b8b937f562f57721f7574.tar.bz2 xorg-input-kobomultitouch-c9648012e8d6533c8f0b8b937f562f57721f7574.zip | |
janitor: Use more common row/column names
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Diffstat (limited to 'src')
| -rw-r--r-- | src/hwstate.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/hwstate.c b/src/hwstate.c index 4af636c..1a68d28 100644 --- a/src/hwstate.c +++ b/src/hwstate.c @@ -83,25 +83,25 @@ void modify_hwstate(struct HWState *s, { int A[DIM2_FINGER], *row; int sid[DIM_FINGER], hw2s[DIM_FINGER]; - int id, sk, hwk; + int id, i, j; /* setup distance matrix for finger id matching */ - for (sk = 0; sk < s->nfinger; sk++) { - sid[sk] = s->finger[sk].id; - row = A + hw->nfinger * sk; - for (hwk = 0; hwk < hw->nfinger; hwk++) - row[hwk] = dist2(&hw->finger[hwk], &s->finger[sk].hw); + for (j = 0; j < s->nfinger; j++) { + sid[j] = s->finger[j].id; + row = A + hw->nfinger * j; + for (i = 0; i < hw->nfinger; i++) + row[i] = dist2(&hw->finger[i], &s->finger[j].hw); } match_fingers(hw2s, A, hw->nfinger, s->nfinger); /* update matched fingers and create new ones */ - for (hwk = 0; hwk < hw->nfinger; hwk++) { - sk = hw2s[hwk]; - id = sk >= 0 ? sid[sk] : 0; + for (i = 0; i < hw->nfinger; i++) { + j = hw2s[i]; + id = j >= 0 ? sid[j] : 0; while (!id) id = ++s->lastid; - set_finger(&s->finger[hwk], &hw->finger[hwk], id, caps); + set_finger(&s->finger[i], &hw->finger[i], id, caps); } s->button = hw->button; |