diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-06-17 21:33:52 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-06-19 09:44:05 +1000 |
| commit | fd939a37d7df320f76fc772eb1f18eb6ba1d54b9 (patch) | |
| tree | 3b380e612a660ce7699eda7326af2bb9fafbbeba | |
| parent | 659dd09893bf7648957aa2ae5898e32ed24d057a (diff) | |
Simplify xf86InitValuator calls a bit.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Christoph Brill <egore911@egore911.de>
| -rw-r--r-- | src/synaptics.c | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/src/synaptics.c b/src/synaptics.c index ff66517..6b902e9 100644 --- a/src/synaptics.c +++ b/src/synaptics.c @@ -795,6 +795,7 @@ DeviceInit(DeviceIntPtr dev) SynapticsPrivate *priv = (SynapticsPrivate *) (local->private); unsigned char map[SYN_MAX_BUTTONS + 1]; int i; + int min, max; DBG(3, ErrorF("Synaptics DeviceInit called\n")); @@ -819,15 +820,30 @@ DeviceInit(DeviceIntPtr dev) ); /* X valuator */ if (priv->minx < priv->maxx) - xf86InitValuatorAxisStruct(dev, 0, priv->minx, priv->maxx, 1, 0, 1); - else - xf86InitValuatorAxisStruct(dev, 0, 0, -1, 1, 0, 1); + { + min = priv->minx; + max = priv->maxx; + } else + { + min = 0; + max = -1; + } + + xf86InitValuatorAxisStruct(dev, 0, min, max, 1, 0, 1); xf86InitValuatorDefaults(dev, 0); + /* Y valuator */ if (priv->miny < priv->maxy) - xf86InitValuatorAxisStruct(dev, 1, priv->miny, priv->maxy, 1, 0, 1); - else - xf86InitValuatorAxisStruct(dev, 1, 0, -1, 1, 0, 1); + { + min = priv->miny; + max = priv->maxy; + } else + { + min = 0; + max = -1; + } + + xf86InitValuatorAxisStruct(dev, 1, min, max, 1, 0, 1); xf86InitValuatorDefaults(dev, 1); #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 |