Track switch to libinput in xorg-server 1.20.8

Remove the Driver line from examples 5.7 and 5.9, thus making them
valid for both variant configurations of X (with or without libinput).

For 12.1 and xorg-server 1.20.8, add "Set kern.evdev.rcpt_mask=6 in
/etc/sysctl.conf if not using moused" important paragraph to section
"5.4.7.2. Mice and Pointing Devices".

PR:		244820
Submitted by:	pauamma
Reviewed by:	zeising@
Approved by:	bcr@
Differential Revision:	https://reviews.freebsd.org/D25641
This commit is contained in:
Sergio Carlavilla Delgado 2020-08-11 18:31:08 +00:00
parent 1783767fed
commit fa94d12842
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/head/; revision=54421

View file

@ -805,20 +805,18 @@ EndSection</programlisting>
<literal>InputClass</literal>. This will be applied
to all input devices that match the class.</para>
<para>This example selects a French keyboard layout with
the <literal>oss</literal> variant.</para>
<para>This example selects a French keyboard
layout.</para>
<example>
<title>Setting a Keyboard Layout</title>
<para><filename>/usr/local/etc/X11/xorg.conf.d/keyboard-fr-oss.conf</filename></para>
<para><filename>/usr/local/etc/X11/xorg.conf.d/keyboard-fr.conf</filename></para>
<programlisting>Section "InputClass"
Identifier "KeyboardDefaults"
Driver "keyboard"
MatchIsKeyboard "on"
Option "XkbLayout" "fr"
Option "XkbVariant" "oss"
EndSection</programlisting>
</example>
@ -866,7 +864,6 @@ EndSection</programlisting>
<programlisting>Section "InputClass"
Identifier "KeyboardDefaults"
Driver "keyboard"
MatchIsKeyboard "on"
Option "XkbOptions" "terminate:ctrl_alt_bksp"
EndSection</programlisting>
@ -879,6 +876,14 @@ EndSection</programlisting>
<sect3 xml:id="x11-input-mice">
<title>Mice and Pointing Devices</title>
<important>
<para>If using <package>xorg-server</package>&nbsp;1.20.8 or
later under &os;&nbsp;&rel121.current; and not
using &man.moused.8;, add
<userinput>kern.evdev.rcpt_mask=12</userinput> to
<filename>/etc/sysctl.conf</filename>.</para>
</important>
<para>Many mouse parameters can be adjusted with configuration
options. See &man.mousedrv.4x; for a full list.</para>