diff options
Diffstat (limited to 'src/mtstate.c')
| -rw-r--r-- | src/mtstate.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/mtstate.c b/src/mtstate.c index 313550b..771048d 100644 --- a/src/mtstate.c +++ b/src/mtstate.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #define TOUCH_SCALE(caps) (0.05 * caps->abs[MTDEV_TOUCH_MAJOR].maximum) | 25 | #define TOUCH_SCALE(caps) (0.05 * caps->abs[MTDEV_TOUCH_MAJOR].maximum) |
| 26 | 26 | ||
| 27 | #define THUMB_TOUCH(hw) (1.2 * hw->touch_minor) | 27 | #define THUMB_TOUCH(hw) (1.2 * hw->touch_minor) |
| 28 | #define THUMB_TOUCH_SIZE(hw, caps) (0.14 * get_cap_xsize(caps)) | ||
| 28 | #define THUMB_WIDTH_TOUCH(hw) (4 * hw->touch_major) | 29 | #define THUMB_WIDTH_TOUCH(hw) (4 * hw->touch_major) |
| 29 | #define THUMB_WIDTH_WIDTH(hw) (1.2 * hw->width_minor) | 30 | #define THUMB_WIDTH_WIDTH(hw) (1.2 * hw->width_minor) |
| 30 | #define THUMB_WIDTH_SIZE(hw, caps) (0.25 * get_cap_xsize(caps)) | 31 | #define THUMB_WIDTH_SIZE(hw, caps) (0.25 * get_cap_xsize(caps)) |
| @@ -56,10 +57,13 @@ static int is_thumb(const struct FingerState *hw, | |||
| 56 | const struct Capabilities *caps) | 57 | const struct Capabilities *caps) |
| 57 | { | 58 | { |
| 58 | if (!caps->has_abs[MTDEV_TOUCH_MAJOR] || | 59 | if (!caps->has_abs[MTDEV_TOUCH_MAJOR] || |
| 59 | !caps->has_abs[MTDEV_TOUCH_MINOR] || | 60 | !caps->has_abs[MTDEV_TOUCH_MINOR]) |
| 60 | !caps->has_abs[MTDEV_WIDTH_MAJOR] || | ||
| 61 | !caps->has_abs[MTDEV_WIDTH_MINOR]) | ||
| 62 | return 0; | 61 | return 0; |
| 62 | if (!caps->has_abs[MTDEV_WIDTH_MAJOR] || | ||
| 63 | !caps->has_abs[MTDEV_WIDTH_MINOR]) { | ||
| 64 | return hw->touch_major > THUMB_TOUCH(hw) && | ||
| 65 | hw->touch_major > THUMB_TOUCH_SIZE(hw, caps); | ||
| 66 | } | ||
| 63 | return hw->touch_major > THUMB_TOUCH(hw) && | 67 | return hw->touch_major > THUMB_TOUCH(hw) && |
| 64 | hw->width_major > THUMB_WIDTH_TOUCH(hw) && | 68 | hw->width_major > THUMB_WIDTH_TOUCH(hw) && |
| 65 | hw->width_major > THUMB_WIDTH_WIDTH(hw) && | 69 | hw->width_major > THUMB_WIDTH_WIDTH(hw) && |
