diff options
| author | Keith Packard <keithp@keithp.com> | 2005-08-08 06:25:21 +0000 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2005-08-08 06:25:21 +0000 |
| commit | a11ce76b0625501a202fa34e18777b7bd42b2713 (patch) | |
| tree | 578e7cd9c7814db24075f9e627522d3361219ec6 /hw/kdrive/src | |
| parent | 129e812c339879b68bb162331ac9b7e0f86a7474 (diff) | |
Build with modular X.org libraries and headers.kdrive-initial-import
composite/compwindow.c Don't damage unmoved windows. Let border clip reset
leave damage alone, pending actual damage for painting.
Diffstat (limited to 'hw/kdrive/src')
| -rw-r--r-- | hw/kdrive/src/kaa.c | 1 | ||||
| -rw-r--r-- | hw/kdrive/src/kinput.c | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/hw/kdrive/src/kaa.c b/hw/kdrive/src/kaa.c index 559f4f5b4..36406f270 100644 --- a/hw/kdrive/src/kaa.c +++ b/hw/kdrive/src/kaa.c @@ -29,7 +29,6 @@ #endif #include "kdrive.h" #include "kaa.h" -#include "fontstruct.h" #include "dixfontstr.h" #define DEBUG_MIGRATE 0 diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c index 1fc6e71d1..a34350a6a 100644 --- a/hw/kdrive/src/kinput.c +++ b/hw/kdrive/src/kinput.c @@ -1373,6 +1373,7 @@ KdMouseAccelerate (DeviceIntPtr device, int *dx, int *dy) PtrCtrl *pCtrl = &device->ptrfeed->ctrl; double speed = sqrt (*dx * *dx + *dy * *dy); double accel; +#ifdef QUADRATIC_ACCELERATION double m; /* @@ -1389,6 +1390,11 @@ KdMouseAccelerate (DeviceIntPtr device, int *dx, int *dy) 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; } |