xserver: Branch 'master' - 3 commits

[Peter Hutterer]

 .gitignore     |    1 +
 dix/devices.c  |    2 +-
 dix/ptrveloc.c |   16 +++++-----------
 3 files changed, 7 insertions(+), 12 deletions(-)

New commits:
commit f4e725f248870a2de10449cc8f53de32e7840d45
Author: Peter Hutterer <peter.hutterer at redhat.com>
Date:   Thu Nov 20 13:51:15 2008 +1000

    dix: memset DeviceVelocityPtr to zero.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at redhat.com>
    Signed-off-by: Adam Jackson <ajax at redhat.com>

diff --git a/dix/ptrveloc.c b/dix/ptrveloc.c
index 5496ba3..e9d4e88 100644
--- a/dix/ptrveloc.c
+++ b/dix/ptrveloc.c
@@ -96,22 +96,15 @@ SimpleSmoothProfile(DeviceVelocityPtr pVel, float velocity,
 void
 InitVelocityData(DeviceVelocityPtr s)
 {
-    s->lrm_time = 0;
-    s->velocity  = 0;
-    s->last_velocity = 0;
+    memset(s, 0, sizeof(DeviceVelocityRec));
+
     s->corr_mul = 10.0;      /* dots per 10 milisecond should be usable */
     s->const_acceleration = 1.0;   /* no acceleration/deceleration  */
     s->reset_time = 300;
-    s->last_reset = FALSE;
-    s->last_dx = 0;
-    s->last_dy = 0;
     s->use_softening = 1;
     s->min_acceleration = 1.0; /* don't decelerate */
     s->coupling = 0.25;
     s->average_accel = TRUE;
-    s->profile_private = NULL;
-    memset(&s->statistics, 0, sizeof(s->statistics));
-    memset(&s->filters, 0, sizeof(s->filters));
     SetAccelerationProfile(s, AccelProfileClassic);
     InitFilterChain(s, (float)1.0/20.0, 1, 1, 40);
 }
commit 7f818776b7a19bd6100596d327ecaa69be317bc6
Author: Simon Thum <simon.thum at gmx.de>
Date:   Wed Nov 19 15:05:50 2008 +1000

    dix: fix typos in comments, one formatting fix.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at redhat.com>

diff --git a/dix/devices.c b/dix/devices.c
index 2ec9284..904c404 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -1278,7 +1278,7 @@ ValuatorAccelerationRec pointerAccelerationScheme[] = {
 };
 
 /**
- * install an acceleration scheme. retrns TRUE on success, and should not
+ * install an acceleration scheme. returns TRUE on success, and should not
  * change anything if unsuccessful.
  */
 _X_EXPORT Bool
diff --git a/dix/ptrveloc.c b/dix/ptrveloc.c
index 2406be8..5496ba3 100644
--- a/dix/ptrveloc.c
+++ b/dix/ptrveloc.c
@@ -33,7 +33,7 @@
 #include <os.h>
 
 /*****************************************************************************
- * Predictable pointer ballistics
+ * Predictable pointer acceleration
  *
  * 2006-2008 by Simon Thum (simon [dot] thum [at] gmx de)
  *
@@ -131,7 +131,8 @@ FreeVelocityData(DeviceVelocityPtr s){
  *  dix uninit helper, called through scheme
  */
 void
-AccelerationDefaultCleanup(DeviceIntPtr pDev){
+AccelerationDefaultCleanup(DeviceIntPtr pDev)
+{
     /*sanity check*/
     if( pDev->valuator->accelScheme.AccelSchemeProc == acceleratePointerPredictable
             && pDev->valuator->accelScheme.accelData != NULL){
commit 037ec5a3c496b07f885a128828ef804b3aa8eee2
Author: Peter Hutterer <peter.hutterer at redhat.com>
Date:   Wed Nov 19 15:12:04 2008 +1000

    gitignore: ignore .patch files

diff --git a/.gitignore b/.gitignore
index 2f70ef4..e1aa717 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@ Makefile.in
 .*sw?
 *.pbxuser
 *.mode1v3
+*.patch
 obj*
 build*
 cscope*