diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-09-06 19:44:39 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-09-06 19:44:39 +0000 |
| commit | 9401e5643e90e23287b785e5fc238bb7c7f2d896 (patch) | |
| tree | 759a23118c7bb4a1cddc87b3ad5c63f459a64bd2 /xserver/config/x11-input.fdi | |
| parent | 6d29d2deb77299e537a0daf2babf0e217ce51376 (diff) | |
update to xserver 1.6.4rc1. Tested by many, ok oga@.
Diffstat (limited to 'xserver/config/x11-input.fdi')
| -rw-r--r-- | xserver/config/x11-input.fdi | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/xserver/config/x11-input.fdi b/xserver/config/x11-input.fdi index 6c4a1e325..9e629cbd0 100644 --- a/xserver/config/x11-input.fdi +++ b/xserver/config/x11-input.fdi @@ -26,6 +26,9 @@ Do not specify "input.x11_options.Device" since "input.device" will be used automatically. + You MUST specify all options as strings, otherwise the server will + ignore them. + Legacy Keys "input.xkb.rules" "input.xkb.model" @@ -58,6 +61,13 @@ string="Linux"> <merge key="input.x11_driver" type="string">evdev</merge> </match> + <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" + string="SunOS"> + <match key="input.device" contains="usb"> + <merge key="input.x11_options.StreamsModule" type="string">usbms</merge> + <merge key="input.x11_options.Protocol" type="string">VUID</merge> + </match> + </match> </match> <match key="info.capabilities" contains="input.keys"> @@ -72,6 +82,13 @@ <merge key="input.x11_driver" type="string">evdev</merge> <merge key="input.x11_options.XkbModel" type="string">evdev</merge> </match> + <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" + string="SunOS"> + <match key="input.device" contains="usb"> + <merge key="input.x11_options.StreamsModule" type="string">usbkbm</merge> + <merge key="input.x11_options.Protocol" type="string">VUID</merge> + </match> + </match> <merge key="input.x11_options.XkbLayout" type="string">us</merge> |