xserver: Branch 'master' - 4 commits
Keith Packard
keithp at kemper.freedesktop.org
Tue Jul 16 21:45:55 PDT 2013
config/Makefile.am | 2 +-
config/non-seat0.conf.multi-seat | 18 ++++++++++++++++++
dix/events.c | 3 ++-
dix/ptrveloc.c | 5 ++---
hw/xfree86/man/xorg.conf.man | 3 ++-
hw/xfree86/os-support/xf86_OSlib.h | 5 -----
6 files changed, 25 insertions(+), 11 deletions(-)
New commits:
commit 74469895e39fa38337f59edd64c4031ab9bb51d8
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date: Mon Jul 15 13:06:28 2013 +1000
dix: allow a ConstantDeceleration between 0 and 1 (#66134)
A constant deceleration of x simply means (delta * 1/x). We limited that to
values >= 1.0f for obvious reasons, but can also allow values from 0-1.
That means that ConstantDeceleration is actually a ConstantAcceleration, but
hey, if someone needs it...
X.Org Bug 66134 <http://bugs.freedesktop.org/show_bug.cgi?id=66134>
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
Reviewed-by: Keith Packard <keithp at keithp.com>
diff --git a/dix/ptrveloc.c b/dix/ptrveloc.c
index d6fef9c..e75300a 100644
--- a/dix/ptrveloc.c
+++ b/dix/ptrveloc.c
@@ -245,11 +245,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/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man
index 67d8594..fa5b5fe 100644
--- a/hw/xfree86/man/xorg.conf.man
+++ b/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
commit 0e3be0b25fcfeff386bad132526352c2e45f1932
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date: Fri Jul 12 14:10:10 2013 +1000
dix: UpdateTouchesForGrab must only free the listener grab if it is non-NULL
If a client calls XIGrabDevice in response to a ButtonPress event (regular
event selection), the device will have a grab, but listener->grab is NULL.
Check for that, to avoid logspam.
[ 26293.863] (EE) BUG: triggered 'if (!pGrab)'
[ 26293.863] (EE) BUG: grabs.c:256 in FreeGrab()
[ 26293.863] (EE)
[ 26293.863] (EE) Backtrace:
[ 26293.864] (EE) 0: /usr/bin/Xorg (FreeGrab+0x54) [0x45d3fc]
[ 26293.864] (EE) 1: /usr/bin/Xorg (UpdateTouchesForGrab+0x135) [0x447d4e]
[ 26293.864] (EE) 2: /usr/bin/Xorg (ActivatePointerGrab+0x1ba) [0x447f3d]
[ 26293.864] (EE) 3: /usr/bin/Xorg (GrabDevice+0x3e6) [0x4503bc]
[ 26293.864] (EE) 4: /usr/bin/Xorg (ProcXIGrabDevice+0x1f9) [0x5981b1]
[ 26293.865] (EE) 5: /usr/bin/Xorg (ProcIDispatch+0x78) [0x58aa17]
[ 26293.865] (EE) 6: /usr/bin/Xorg (Dispatch+0x30d) [0x43347e]
[ 26293.865] (EE) 7: /usr/bin/Xorg (main+0x61d) [0x498175]
[ 26293.865] (EE) 8: /lib64/libc.so.6 (__libc_start_main+0xf5) [0x3df5621b75]
[ 26293.865] (EE) 9: /usr/bin/Xorg (_start+0x29) [0x423a19]
[ 26293.866] (EE) 10: ? (?+0x29) [0x29]
[ 26293.866] (EE)
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
Reviewed-by: Keith Packard <keithp at keithp.com>
diff --git a/dix/events.c b/dix/events.c
index 03b2d2e..ed3138d 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -1441,7 +1441,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);
}
}
commit 24cbb47ca80cd7a47749ece0ff3a98657ddf3ae3
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date: Fri Jul 12 12:17:47 2013 +1000
config: provide example configuration for multi-seat setups
Seats other than seat0 need custom configuration. Provide that with a
default configuration file so we can share it across distros.
This file intentionally does not end in .conf so it won't get picked up by
the server after a normal installation. gdm, or whatever starts up the
servers will have to explicitly specifiy this config file.
This file replaces the one currently written by systemd's multi-seat-x
binary:
http://cgit.freedesktop.org/systemd/systemd/tree/src/login/multi-seat-x.c
CC: Lennart Poettering <lennart at poettering.net>
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists at gmail.com>
diff --git a/config/Makefile.am b/config/Makefile.am
index da81d77..327d07e 100644
--- a/config/Makefile.am
+++ b/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/config/non-seat0.conf.multi-seat b/config/non-seat0.conf.multi-seat
new file mode 100644
index 0000000..34008ce
--- /dev/null
+++ b/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
commit 791121e00692e12cb4c38c8d018bd72eb5081eb7
Author: François Tigeot <ftigeot at wolfpond.org>
Date: Mon Jul 15 21:54:26 2013 +0200
Fix mouse header include on DragonFly and FreeBSD
* __FreeBSD_kernel_version doesn't exist anymore
* The removed check was for FreeBSD versions from before September 2000
which are no longer supported anyway
* Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=66045
Signed-off-by: François Tigeot <ftigeot at wolfpond.org>
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h
index e931b09..eb0a338 100644
--- a/hw/xfree86/os-support/xf86_OSlib.h
+++ b/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
More information about the xorg-commit
mailing list