aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/config
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-07-17 13:18:21 +0200
committermarha <marha@users.sourceforge.net>2013-07-17 13:18:21 +0200
commitf5e157731e6b51421ac89cfefb666b8bbf971b03 (patch)
treea39529411c67f07761f016803733d1819b2c8e5a /xorg-server/config
parent06f4de23ace4de1fd628c37891214f0a4ecb77db (diff)
downloadvcxsrv-f5e157731e6b51421ac89cfefb666b8bbf971b03.tar.gz
vcxsrv-f5e157731e6b51421ac89cfefb666b8bbf971b03.tar.bz2
vcxsrv-f5e157731e6b51421ac89cfefb666b8bbf971b03.zip
mesa mkfontscale xserver git update 17 Jul 2013
xserver commit 74469895e39fa38337f59edd64c4031ab9bb51d8 mkfontscale commit f48de13423c7300f4da9f61993b624426b38ddc0 mesa commit b20e0fb5204ea85904e9f72f583e65bf35b446cb
Diffstat (limited to 'xorg-server/config')
-rw-r--r--xorg-server/config/Makefile.am2
-rw-r--r--xorg-server/config/non-seat0.conf.multi-seat18
2 files changed, 19 insertions, 1 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