diff options
Diffstat (limited to 'xorg-server')
| -rw-r--r-- | xorg-server/config/Makefile.am | 2 | ||||
| -rw-r--r-- | xorg-server/config/non-seat0.conf.multi-seat | 18 | ||||
| -rwxr-xr-x | xorg-server/dix/events.c | 3 | ||||
| -rw-r--r-- | xorg-server/dix/ptrveloc.c | 5 | ||||
| -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 |
6 files changed, 25 insertions, 11 deletions
diff --git a/xorg-server/config/Makefile.am b/xorg-server/config/Makefile.am index da81d7712..327d07e7c 100644 --- a/xorg-server/config/Makefile.am +++ b/xorg-server/config/Makefile.am @@ -44,4 +44,4 @@ endif # CONFIG_NEED_DBUS endif # !CONFIG_UDEV -EXTRA_DIST = xorg-server.conf x11-input.fdi 10-evdev.conf fdi2iclass.py 10-quirks.conf +EXTRA_DIST = xorg-server.conf x11-input.fdi 10-evdev.conf non-seat0.conf.multi-seat fdi2iclass.py 10-quirks.conf diff --git a/xorg-server/config/non-seat0.conf.multi-seat b/xorg-server/config/non-seat0.conf.multi-seat new file mode 100644 index 000000000..34008ce50 --- /dev/null +++ b/xorg-server/config/non-seat0.conf.multi-seat @@ -0,0 +1,18 @@ +# This is the default configuration for servers on seat-1 and above. +# +# Start the server with -config non-seat0.conf.multi-seat, or alternatively +# rename the file to end in .conf and put it in the standard config +# directory (though it will apply to _all_ seats!). +# +# * Disable VT switching with Ctrl-Alt-F1 +# * Force a grab on all input devices to detach them from the VT subsystem +# to avoid event leakage. + +Section "ServerFlags" + Option "DontVTSwitch" "on" +EndSection + +Section "InputClass" + Identifier "Force input devices to seat" + Option "GrabDevice" "on" +EndSection diff --git a/xorg-server/dix/events.c b/xorg-server/dix/events.c index a77415377..b2b770d1c 100755 --- a/xorg-server/dix/events.c +++ b/xorg-server/dix/events.c @@ -1444,7 +1444,8 @@ UpdateTouchesForGrab(DeviceIntPtr mouse) listener->type = LISTENER_POINTER_GRAB; else listener->type = LISTENER_GRAB; - FreeGrab(listener->grab); + if (listener->grab) + FreeGrab(listener->grab); listener->grab = AllocGrab(grab); } } diff --git a/xorg-server/dix/ptrveloc.c b/xorg-server/dix/ptrveloc.c index 844e18538..6d349e089 100644 --- a/xorg-server/dix/ptrveloc.c +++ b/xorg-server/dix/ptrveloc.c @@ -254,11 +254,10 @@ AccelSetDecelProperty(DeviceIntPtr dev, Atom atom, if (checkOnly) { if (rc) return rc; - return (v >= 1.0f) ? Success : BadValue; + return (v > 0) ? Success : BadValue; } - if (v >= 1.0f) - vel->const_acceleration = 1 / v; + vel->const_acceleration = 1 / v; return Success; } 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 |