xserver/hw/kdrive/src kaa.c,1.36,1.37 kinput.c,1.43,1.44

Committed by: keithp

Update of /cvs/xserver/xserver/hw/kdrive/src
In directory gabe:/tmp/cvs-serv25750/hw/kdrive/src

Modified Files:
	kaa.c kinput.c 
Log Message:
2005-08-07  Keith Packard  <[email protected]>

	* configure.ac:
	* dix/dispatch.c:
	* dix/events.c:
	* dix/glyphcurs.c:
	* dix/main.c:
	* dix/swaprep.c:
	* dix/xpstubs.c:
	* fb/fbglyph.c:
	* hw/kdrive/chips/chipsdraw.c:
	* hw/kdrive/ephyr/hostx.c: (hostx_screen_init):
	* hw/kdrive/epson/epson13806draw.c:
	* hw/kdrive/i810/i810draw.c:
	* hw/kdrive/mach64/mach64draw.c:
	* hw/kdrive/nvidia/nvidiadraw.c:
	* hw/kdrive/smi/smidraw.c:
	* hw/kdrive/src/kaa.c:
	* hw/kdrive/src/kinput.c: (KdMouseAccelerate):
	* include/dixfont.h:
	* include/dixfontstr.h:
	* mi/mi.h:
	* mi/mibstore.c:
	* mi/miglblt.c:
	* mi/mipolytext.c:
	* mi/misprite.c:
	* mi/miwideline.c:
	* miext/damage/damage.c:
	* miext/shadow/shadow.c:
	* miext/shadow/shalloc.c:
	* miext/shadow/shpacked.c:
	* miext/shadow/shplanar.c:
	* miext/shadow/shplanar8.c:
	* miext/shadow/shrotate.c:
	* miext/shadow/shrotpack.h:
	* miext/shadow/shrotpackYX.h:
	* os/xstrans.c:
	* os/xstrans.h:
	Build with modular X.org libraries and headers.

	* composite/compwindow.c
	Don't damage unmoved windows.
	Let border clip reset leave damage alone,
	pending actual damage for painting.


Index: kaa.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/src/kaa.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- kaa.c	9 Jun 2005 10:44:45 -0000	1.36
+++ kaa.c	8 Aug 2005 06:25:21 -0000	1.37
@@ -29,7 +29,6 @@
 #endif
 #include "kdrive.h"
 #include "kaa.h"
-#include "fontstruct.h"
 #include "dixfontstr.h"
 
 #define DEBUG_MIGRATE 0

Index: kinput.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/src/kinput.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- kinput.c	8 Feb 2005 22:43:54 -0000	1.43
+++ kinput.c	8 Aug 2005 06:25:21 -0000	1.44
@@ -1373,6 +1373,7 @@
     PtrCtrl *pCtrl = &device->ptrfeed->ctrl;
     double  speed = sqrt (*dx * *dx + *dy * *dy);
     double  accel;
+#ifdef QUADRATIC_ACCELERATION
     double  m;
 
     /*
@@ -1389,6 +1390,11 @@
     m = (((double) pCtrl->num / (double) pCtrl->den - 1.0) / 
 	 ((double) pCtrl->threshold * 2.0));
     accel = m * speed + 1;
+#else
+    accel = 1.0;
+    if (speed > pCtrl->threshold)
+	accel = (double) pCtrl->num / pCtrl->den;
+#endif
     *dx = accel * *dx;
     *dy = accel * *dy;
 }