diff options
| author | Michel Dänzer <daenzer@vmware.com> | 2010-04-01 18:35:38 +0200 |
|---|---|---|
| committer | Michel Dänzer <daenzer@vmware.com> | 2010-04-08 16:10:33 +0200 |
| commit | 80f671233e583ae085986bce12057fc45da444aa (patch) | |
| tree | 28cddb2b57583d8b59be126afd44a91ae54baede /tools | |
| parent | b9c3bc94ee86a72216e9738aaecede80cc1c043c (diff) | |
Add InputClass support.
The InputClass can match the tag "vmmouse". A sample xorg.conf.d snippet is
provided to try and make sure the driver will be loaded automatically in a
compatible VM also if the X server uses udev instead of HAL.
The configure script tries to determine if and where it makes sense to install
the udev rule and xorg.conf.d snippet but allows overriding both.
Thanks to Timo Aaltonen for the udev rules file and Dan Nicholson and Simon
Thum for review and suggestions for improvement.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/50-vmmouse.conf | 7 | ||||
| -rw-r--r-- | tools/69-xorg-vmmouse.rules.in | 1 | ||||
| -rw-r--r-- | tools/Makefile.am | 20 | ||||
| -rwxr-xr-x | tools/hal-probe-vmmouse.in | 1 |
4 files changed, 29 insertions, 0 deletions
diff --git a/tools/50-vmmouse.conf b/tools/50-vmmouse.conf new file mode 100644 index 0000000..35c438e --- /dev/null +++ b/tools/50-vmmouse.conf @@ -0,0 +1,7 @@ +Section "InputClass" + Identifier "vmmouse" + MatchIsPointer "on" + MatchTag "vmmouse" + Driver "vmmouse" +EndSection + diff --git a/tools/69-xorg-vmmouse.rules.in b/tools/69-xorg-vmmouse.rules.in new file mode 100644 index 0000000..0d7f028 --- /dev/null +++ b/tools/69-xorg-vmmouse.rules.in @@ -0,0 +1 @@ +ACTION=="add|change", ENV{ID_INPUT_MOUSE}=="?*", ATTRS{description}=="i8042 AUX port", PROGRAM="__BIN_PREFIX__/vmmouse_detect", ENV{ID_INPUT.tags}="vmmouse" diff --git a/tools/Makefile.am b/tools/Makefile.am index f5b8902..8c40369 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -36,3 +36,23 @@ hal-probe-vmmouse: hal-probe-vmmouse.in EXTRA_DIST = hal-probe-vmmouse.in CLEANFILES = hal-probe-vmmouse + +if HAS_XORG_CONF_DIR + +confdir=$(XORG_CONF_DIR) +dist_conf_DATA = 50-vmmouse.conf + +endif + +if HAS_UDEV_RULES_DIR + +udevdir=$(UDEV_RULES_DIR) +udev_DATA = 69-xorg-vmmouse.rules + +$(udev_DATA): $(udev_DATA).in + sed -e 's|__BIN_PREFIX__|$(bindir)|g' < $< > $@ + +EXTRA_DIST += $(udev_DATA).in +CLEANFILES += $(udev_DATA) + +endif # HAS_UDEV_RULES_DIR diff --git a/tools/hal-probe-vmmouse.in b/tools/hal-probe-vmmouse.in index 1f75e25..42c9da3 100755 --- a/tools/hal-probe-vmmouse.in +++ b/tools/hal-probe-vmmouse.in @@ -26,5 +26,6 @@ __BIN_PREFIX__/vmmouse_detect if [ $? -eq 0 ]; then __HAL_BIN_PREFIX__/hal-set-property --direct --udi "$UDI" --key input.x11_driver --string "vmmouse" + __HAL_BIN_PREFIX__/hal-set-property --direct --udi "$UDI" --key input.tags --string "vmmouse" fi |