diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2012-03-09 13:43:04 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2012-03-14 08:46:38 +1000 |
| commit | bad1b75524f2fa882e9b6ac7160463fbd3b5cccf (patch) | |
| tree | 948aaeec6b20e913a5db6cef06b2f9a9a91460cc | |
| parent | f0381f48a9383313e65508ec710b5c690b16286a (diff) | |
Move resetting hw state to separate function.
No functional changes.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
| -rw-r--r-- | src/synaptics.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/src/synaptics.c b/src/synaptics.c index e7adc5b..e2153b9 100644 --- a/src/synaptics.c +++ b/src/synaptics.c @@ -2754,6 +2754,16 @@ filter_jitter(SynapticsPrivate *priv, int *x, int *y) *y = priv->hyst_center_y; } +static void +reset_hw_state(struct SynapticsHwState *hw) +{ + hw->x = 0; + hw->y = 0; + hw->z = 0; + hw->numFingers = 0; + hw->fingerWidth = 0; +} + /* * React on changes in the hardware state. This function is called every time * the hardware state changes. The return value is used to specify how many @@ -2770,8 +2780,8 @@ HandleState(InputInfoPtr pInfo, struct SynapticsHwState *hw, CARD32 now, { SynapticsPrivate *priv = (SynapticsPrivate *) (pInfo->private); SynapticsParameters *para = &priv->synpara; - enum FingerState finger; - int dx, dy, buttons, id; + enum FingerState finger = FS_UNTOUCHED; + int dx = 0, dy = 0, buttons, id; edge_type edge = NO_EDGE; int change; int double_click = FALSE; @@ -2801,18 +2811,10 @@ HandleState(InputInfoPtr pInfo, struct SynapticsHwState *hw, CARD32 now, */ if (!inside_active_area) { - hw->x = 0; - hw->y = 0; - hw->z = 0; - hw->numFingers = 0; - hw->fingerWidth = 0; + reset_hw_state(hw); /* FIXME: if finger accidentally moves into the area and doesn't * really release, the finger should remain down. */ - finger = FS_UNTOUCHED; - edge = NO_EDGE; - - dx = dy = 0; } /* these two just update hw->left, right, etc. */ |