diff options
| author | Henrik Rydberg <rydberg@euromail.se> | 2010-06-15 20:24:14 +0200 |
|---|---|---|
| committer | Henrik Rydberg <rydberg@euromail.se> | 2010-06-16 02:28:08 +0200 |
| commit | 78085b21f2dc7b1d49a0c54ab56b567fc195d440 (patch) | |
| tree | 3ae649c25b380114ce2eaa5463350fb9b29ee78c /src/memory.c | |
| parent | 4583da1ad81b59b2a8cd2ae51c32b1bc8d32f1c4 (diff) | |
| download | xorg-input-kobomultitouch-78085b21f2dc7b1d49a0c54ab56b567fc195d440.tar.gz xorg-input-kobomultitouch-78085b21f2dc7b1d49a0c54ab56b567fc195d440.tar.bz2 xorg-input-kobomultitouch-78085b21f2dc7b1d49a0c54ab56b567fc195d440.zip | |
refactor: Simplify capabilities
Use the generated abs2mt mapping to simplify the MT device
capabilities.
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Diffstat (limited to 'src/memory.c')
| -rw-r--r-- | src/memory.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/memory.c b/src/memory.c index 9084502..39621da 100644 --- a/src/memory.c +++ b/src/memory.c @@ -21,6 +21,9 @@ #include "memory.h" +/* click area definition */ +#define CLICK_AREA(c) ((c->has_ibt ? 0.20 : 0.00) * get_cap_ysize(c)) + /* fraction of max movement threshold */ #define DELTA_CUT(x) (0.5 * (x)) @@ -88,11 +91,12 @@ static void update_pointers(struct Memory *m, const struct Capabilities *caps) { const struct MTFinger *f = state->finger; + int yclick = caps->abs[BIT_POSITION_Y].maximum - CLICK_AREA(caps); int i; if (state->nfinger < 2) { m->pointing = m->fingers; - m->ybar = caps->abs_position_y.maximum; + m->ybar = caps->abs[BIT_POSITION_Y].maximum; return; } @@ -107,9 +111,9 @@ static void update_pointers(struct Memory *m, } m->pointing = 0; - m->ybar = caps->yclick; + m->ybar = yclick; foreach_bit(i, m->fingers) { - if (f[i].hw.position_y > caps->yclick) + if (f[i].hw.position_y > yclick) continue; if (!m->pointing || f[i].hw.position_y > m->ybar) m->ybar = f[i].hw.position_y; |