diff options
| author | marha <marha@users.sourceforge.net> | 2013-07-17 13:20:49 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-07-17 13:20:49 +0200 |
| commit | 1e8e0fecef85725718befab85015da4575f570dc (patch) | |
| tree | b0338b4e7c765f9011b1d38820e2aaf9cb19ef04 /xorg-server/hw/xfree86 | |
| parent | 8a339365f243adb27ac9d417796a4338b1f8ddf6 (diff) | |
| parent | f5e157731e6b51421ac89cfefb666b8bbf971b03 (diff) | |
| download | vcxsrv-1e8e0fecef85725718befab85015da4575f570dc.tar.gz vcxsrv-1e8e0fecef85725718befab85015da4575f570dc.tar.bz2 vcxsrv-1e8e0fecef85725718befab85015da4575f570dc.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa mkfontscale xserver git update 17 Jul 2013
Diffstat (limited to 'xorg-server/hw/xfree86')
| -rw-r--r-- | xorg-server/hw/xfree86/man/xorg.conf.man | 3 | ||||
| -rw-r--r-- | xorg-server/hw/xfree86/os-support/xf86_OSlib.h | 5 |
2 files changed, 2 insertions, 6 deletions
diff --git a/xorg-server/hw/xfree86/man/xorg.conf.man b/xorg-server/hw/xfree86/man/xorg.conf.man index 67d8594fb..fa5b5fe92 100644 --- a/xorg-server/hw/xfree86/man/xorg.conf.man +++ b/xorg-server/hw/xfree86/man/xorg.conf.man @@ -972,7 +972,8 @@ is constructed. This is mainly a matter of personal preference. .BI "Option \*qConstantDeceleration\*q \*q" real \*q Makes the pointer go .B deceleration -times slower than normal. Most useful for high-resolution devices. +times slower than normal. Most useful for high-resolution devices. A value +between 0 and 1 will speed up the pointer. .TP 7 .BI "Option \*qAdaptiveDeceleration\*q \*q" real \*q Allows to actually decelerate the pointer when going slow. At most, it will be diff --git a/xorg-server/hw/xfree86/os-support/xf86_OSlib.h b/xorg-server/hw/xfree86/os-support/xf86_OSlib.h index e931b09a1..eb0a338c9 100644 --- a/xorg-server/hw/xfree86/os-support/xf86_OSlib.h +++ b/xorg-server/hw/xfree86/os-support/xf86_OSlib.h @@ -277,12 +277,7 @@ struct pcvtid { #include <dev/wscons/wsdisplay_usl_io.h> #endif /* WSCONS_SUPPORT */ #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) -#if defined(__FreeBSD_kernel_version) && (__FreeBSD_kernel_version >= 500013) #include <sys/mouse.h> -#else -#undef MOUSE_GETINFO -#include <machine/mouse.h> -#endif #endif /* Include these definitions in case ioctl_pc.h didn't get included */ #ifndef CONSOLE_X_MODE_ON |