summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Voß <thomas.voss@canonical.com>2012-03-22 14:59:19 -0400
committerChase Douglas <chase.douglas@canonical.com>2012-03-23 15:27:39 -0700
commitc77b5e188451c7ac9995ade5e3cf069ccc803e8e (patch)
treebbf59dc463d769b5240089c0b767f64b8caae85d
parentad440d9c228a44981f1e2364fb0678840b08be3c (diff)
Add an xorg configuration file snippet to disable grabbing of test devices.
When a test creates a test trackpad device, an already running X server will likely grab the event node. This causes the dummy X server to fail to instantiate the device, and ends in test failure. This will ensure that the normal X server does not attempt to grab the test device. Signed-off-by: Thomas Voß <thomas.voss@canonical.com> Reviewed-by: Chase Douglas <chase.douglas@canonical.com> Acked-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
-rw-r--r--data/Makefile.am4
-rw-r--r--data/X11/xorg.conf.d/99-virtual-test-devices.conf5
2 files changed, 8 insertions, 1 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index bf74a73..aea37a5 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -23,4 +23,6 @@
# SOFTWARE.
#
-nobase_data_DATA = xorg/gtest/dummy.conf
+nobase_data_DATA = \
+ xorg/gtest/dummy.conf \
+ X11/xorg.conf.d/99-virtual-test-devices.conf
diff --git a/data/X11/xorg.conf.d/99-virtual-test-devices.conf b/data/X11/xorg.conf.d/99-virtual-test-devices.conf
new file mode 100644
index 0000000..6086b5c
--- /dev/null
+++ b/data/X11/xorg.conf.d/99-virtual-test-devices.conf
@@ -0,0 +1,5 @@
+Section "InputClass"
+ MatchProduct "Virtual Test Device"
+ MatchDriver "synaptics"
+ Option "GrabEventDevice" "false"
+EndSection