aboutsummaryrefslogtreecommitdiff
path: root/en_US.ISO8859-1/books/handbook/x11
diff options
context:
space:
mode:
authorSergio Carlavilla Delgado <carlavilla@FreeBSD.org>2020-08-11 18:31:08 +0000
committerSergio Carlavilla Delgado <carlavilla@FreeBSD.org>2020-08-11 18:31:08 +0000
commitfa94d128426c06d68bfca2f1cb616d3b6bb07cf2 (patch)
treeeaadb896e373271f891a33122095189c3c414777 /en_US.ISO8859-1/books/handbook/x11
parent1783767fed675703cf036da9d26cbbdc24cb571d (diff)
downloaddoc-fa94d128426c06d68bfca2f1cb616d3b6bb07cf2.tar.gz
doc-fa94d128426c06d68bfca2f1cb616d3b6bb07cf2.zip
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
Notes
Notes: svn path=/head/; revision=54421
Diffstat (limited to 'en_US.ISO8859-1/books/handbook/x11')
-rw-r--r--en_US.ISO8859-1/books/handbook/x11/chapter.xml17
1 files changed, 11 insertions, 6 deletions
diff --git a/en_US.ISO8859-1/books/handbook/x11/chapter.xml b/en_US.ISO8859-1/books/handbook/x11/chapter.xml
index edcbd81b8a..56803d6529 100644
--- a/en_US.ISO8859-1/books/handbook/x11/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/x11/chapter.xml
@@ -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>