diff options
author | Henrik Rydberg <rydberg@euromail.se> | 2010-10-12 15:38:43 +0200 |
---|---|---|
committer | Henrik Rydberg <rydberg@euromail.se> | 2010-10-12 15:38:43 +0200 |
commit | acea9df3381825a634c000a574f58b4ca5293ee8 (patch) | |
tree | 3698bd55f137bc377f1b840e4fb5bf9e446e7250 /src/mtstate.c | |
parent | 7380af2c93dc83f4f09e293717d46eadf7799e89 (diff) | |
download | xorg-input-kobomultitouch-acea9df3381825a634c000a574f58b4ca5293ee8.tar.gz xorg-input-kobomultitouch-acea9df3381825a634c000a574f58b4ca5293ee8.tar.bz2 xorg-input-kobomultitouch-acea9df3381825a634c000a574f58b4ca5293ee8.zip |
Same version, but using the mtdev library.
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Diffstat (limited to 'src/mtstate.c')
-rw-r--r-- | src/mtstate.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/mtstate.c b/src/mtstate.c index 7a8ef19..4c893a2 100644 --- a/src/mtstate.c +++ b/src/mtstate.c @@ -22,7 +22,7 @@ #include "mtstate.h" #define TOUCH_WIDTH(hw) (0.05 * hw->width_major) -#define TOUCH_SCALE(caps) (0.05 * caps->abs[BIT_TOUCH_MAJOR].maximum) +#define TOUCH_SCALE(caps) (0.05 * caps->abs[MTDEV_TOUCH_MAJOR].maximum) #define THUMB_TOUCH(hw) (1.2 * hw->touch_minor) #define THUMB_WIDTH_TOUCH(hw) (3 * hw->touch_major) @@ -37,9 +37,9 @@ void init_mtstate(struct MTState *s) static int touching_finger(const struct FingerState *hw, const struct Capabilities *caps) { - if (caps->has_abs[BIT_TOUCH_MAJOR] && caps->has_abs[BIT_WIDTH_MAJOR]) + if (caps->has_abs[MTDEV_TOUCH_MAJOR] && caps->has_abs[MTDEV_WIDTH_MAJOR]) return hw->touch_major > TOUCH_WIDTH(hw); - if (caps->has_abs[BIT_TOUCH_MAJOR]) + if (caps->has_abs[MTDEV_TOUCH_MAJOR]) return hw->touch_major > TOUCH_SCALE(caps); return 1; } @@ -55,10 +55,10 @@ static int touching_finger(const struct FingerState *hw, static int is_thumb(const struct FingerState *hw, const struct Capabilities *caps) { - if (!caps->has_abs[BIT_TOUCH_MAJOR] || - !caps->has_abs[BIT_TOUCH_MINOR] || - !caps->has_abs[BIT_WIDTH_MAJOR] || - !caps->has_abs[BIT_WIDTH_MINOR]) + if (!caps->has_abs[MTDEV_TOUCH_MAJOR] || + !caps->has_abs[MTDEV_TOUCH_MINOR] || + !caps->has_abs[MTDEV_WIDTH_MAJOR] || + !caps->has_abs[MTDEV_WIDTH_MINOR]) return 0; return hw->touch_major > THUMB_TOUCH(hw) && hw->width_major > THUMB_WIDTH_TOUCH(hw) && |