Reviewed-by: Ping Cheng <[email protected]>
Ping
On Wed, Apr 6, 2011 at 5:49 PM, Peter Hutterer <[email protected]>wrote:
> No functional change, just moving initialisation to where it belongs.
>
> Signed-off-by: Peter Hutterer <[email protected]>
> ---
> src/wcmCommon.c | 29 +++++++++++++++++++++++++++++
> src/wcmConfig.c | 28 ----------------------------
> 2 files changed, 29 insertions(+), 28 deletions(-)
>
> diff --git a/src/wcmCommon.c b/src/wcmCommon.c
> index a1eb742..c822061 100644
> --- a/src/wcmCommon.c
> +++ b/src/wcmCommon.c
> @@ -1371,6 +1371,35 @@ WacomCommonPtr wcmNewCommon(void)
> if (common)
> common->refcnt = 1;
>
> + common->wcmFlags = 0; /* various flags */
> + common->wcmProtocolLevel = WCM_PROTOCOL_4; /* protocol level */
> + common->wcmTPCButton = 0; /* set Tablet PC button on/off
> */
> + common->wcmCapacity = -1; /* Capacity is disabled */
> + common->wcmCapacityDefault = -1; /* default to -1 when capacity
> isn't supported */
> + /* 3 when capacity is supported
> */
> + common->wcmGestureParameters.wcmZoomDistance = 50;
> + common->wcmGestureParameters.wcmZoomDistanceDefault = 50;
> + common->wcmGestureParameters.wcmScrollDirection = 0;
> + common->wcmGestureParameters.wcmScrollDistance = 20;
> + common->wcmGestureParameters.wcmScrollDistanceDefault = 20;
> + common->wcmGestureParameters.wcmTapTime = 250;
> + common->wcmGestureParameters.wcmTapTimeDefault = 250;
> + common->wcmRotate = ROTATE_NONE; /* default tablet rotation to
> off */
> + common->wcmMaxX = 0; /* max digitizer logical X value
> */
> + common->wcmMaxY = 0; /* max digitizer logical Y value
> */
> + common->wcmMaxTouchX = 1024; /* max touch X value */
> + common->wcmMaxTouchY = 1024; /* max touch Y value */
> + common->wcmMaxStripX = 4096; /* Max fingerstrip X */
> + common->wcmMaxStripY = 4096; /* Max fingerstrip Y */
> + common->wcmMaxtiltX = 128; /* Max tilt in X directory */
> + common->wcmMaxtiltY = 128; /* Max tilt in Y directory */
> + common->wcmCursorProxoutDistDefault = PROXOUT_INTUOS_DISTANCE;
> + /* default to Intuos */
> + common->wcmSuppress = DEFAULT_SUPPRESS;
> + /* transmit position if increment is superior */
> + common->wcmRawSample = DEFAULT_SAMPLES;
> + /* number of raw data to be used to for filtering
> */
> +
> return common;
> }
>
> diff --git a/src/wcmConfig.c b/src/wcmConfig.c
> index f989fb0..03a8a07 100644
> --- a/src/wcmConfig.c
> +++ b/src/wcmConfig.c
> @@ -89,35 +89,7 @@ static int wcmAllocate(InputInfoPtr pInfo)
> /* JEJ - throttle sampling code */
> priv->throttleLimit = -1;
>
> - common->wcmFlags = 0; /* various flags */
> common->wcmDevices = priv;
> - common->wcmProtocolLevel = WCM_PROTOCOL_4; /* protocol level */
> - common->wcmTPCButton = 0; /* set Tablet PC button on/off
> */
> - common->wcmCapacity = -1; /* Capacity is disabled */
> - common->wcmCapacityDefault = -1; /* default to -1 when capacity
> isn't supported */
> - /* 3 when capacity is supported
> */
> - common->wcmGestureParameters.wcmZoomDistance = 50;
> - common->wcmGestureParameters.wcmZoomDistanceDefault = 50;
> - common->wcmGestureParameters.wcmScrollDirection = 0;
> - common->wcmGestureParameters.wcmScrollDistance = 20;
> - common->wcmGestureParameters.wcmScrollDistanceDefault = 20;
> - common->wcmGestureParameters.wcmTapTime = 250;
> - common->wcmGestureParameters.wcmTapTimeDefault = 250;
> - common->wcmRotate = ROTATE_NONE; /* default tablet rotation to
> off */
> - common->wcmMaxX = 0; /* max digitizer logical X value
> */
> - common->wcmMaxY = 0; /* max digitizer logical Y value
> */
> - common->wcmMaxTouchX = 1024; /* max touch X value */
> - common->wcmMaxTouchY = 1024; /* max touch Y value */
> - common->wcmMaxStripX = 4096; /* Max fingerstrip X */
> - common->wcmMaxStripY = 4096; /* Max fingerstrip Y */
> - common->wcmMaxtiltX = 128; /* Max tilt in X directory */
> - common->wcmMaxtiltY = 128; /* Max tilt in Y directory */
> - common->wcmCursorProxoutDistDefault = PROXOUT_INTUOS_DISTANCE;
> - /* default to Intuos */
> - common->wcmSuppress = DEFAULT_SUPPRESS;
> - /* transmit position if increment is superior */
> - common->wcmRawSample = DEFAULT_SAMPLES;
> - /* number of raw data to be used to for filtering
> */
>
> /* tool */
> priv->tool = tool;
> --
> 1.7.4.2
>
>
> ------------------------------------------------------------------------------
> Xperia(TM) PLAY
> It's a major breakthrough. An authentic gaming
> smartphone on the nation's most reliable network.
> And it wants your games.
> http://p.sf.net/sfu/verizon-sfdev
> _______________________________________________
> Linuxwacom-devel mailing list
> [email protected]
> https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
>
------------------------------------------------------------------------------
Xperia(TM) PLAY
It's a major breakthrough. An authentic gaming
smartphone on the nation's most reliable network.
And it wants your games.
http://p.sf.net/sfu/verizon-sfdev
_______________________________________________
Linuxwacom-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
