aboutsummaryrefslogtreecommitdiff
path: root/libX11/man/Compose.man
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2015-02-22 14:31:16 +0100
committermarha <marha@users.sourceforge.net>2015-02-22 14:31:16 +0100
commitf1c2db43dcf35d2cf4715390bd2391c28e42a8c2 (patch)
tree46b537271afe0f6534231b1bd4cc4f91ae1fb446 /libX11/man/Compose.man
parent5e5a48ff8cd08f123601cd0625ca62a86675aac9 (diff)
downloadvcxsrv-f1c2db43dcf35d2cf4715390bd2391c28e42a8c2.tar.gz
vcxsrv-f1c2db43dcf35d2cf4715390bd2391c28e42a8c2.tar.bz2
vcxsrv-f1c2db43dcf35d2cf4715390bd2391c28e42a8c2.zip
xwininfo fontconfig libX11 libXdmcp libfontenc libxcb libxcb/xcb-proto mesalib xserver xkeyboard-config mkfontscale git update 22 Feb 2015
xserver commit 3a06faf3fcdb7451125a46181f9152e8e59e9770 libxcb commit e3ec1f74637237ce500dfd0ca59f2e422da4e019 libxcb/xcb-proto commit 4c550465934164aab2449a125f75f4ca07816233 xkeyboard-config commit 26f344c93f8c6141e9233eb68088ba4fd56bc9ef libX11 commit c8e19b393defd53f046ddc2da3a16881221b3c34 libXdmcp commit 9f4cac7656b221ce2a8f97e7bd31e5e23126d001 libfontenc commit de1843aaf76015c9d99416f3122d169fe331b849 mkfontscale commit 87d628f8eec170ec13bb9feefb1ce05aed07d1d6 xwininfo commit 0c49f8f2bd56b1e77721e81030ea948386dcdf4e fontconfig commit d6d5adeb7940c0d0beb86489c2a1c2ce59e5c044 mesa commit 4359954d842caa2a9f8d4b50d70ecc789884b68b
Diffstat (limited to 'libX11/man/Compose.man')
-rw-r--r--libX11/man/Compose.man16
1 files changed, 9 insertions, 7 deletions
diff --git a/libX11/man/Compose.man b/libX11/man/Compose.man
index 13ba705ff..6a8a9668e 100644
--- a/libX11/man/Compose.man
+++ b/libX11/man/Compose.man
@@ -88,16 +88,18 @@ comment at the end of the line:
.PP
Each event consists of a specified input keysym, and optional modifier states:
.RS
-[\fIMODIFIER_LIST\fP] \fB<\fP\fIkeysym\fP\fB>\fP
+[([\fB!\fP] ([\fB~\fP] \fIMODIFIER\fP)...) | \fBNone\fP] \fB<\fP\fIkeysym\fP\fB>\fP
.RE
.PP
-Each modifier consists of a specified modifier and a state:
-.RS
-(\fB!\fP \fIMODIFIER\fP ) | \fBNone\fP
-.RE
-Modifiers may be preceded by a
+If the modifier list is preceded by
+.RB \*q "!" \*q
+it must match exactly.
+MODIFIER may be one of Ctrl, Lock, Caps, Shift, Alt or Meta.
+Each modifier may be preceded by a
.RB \*q "~" \*q
-character to indicate that the modifier must not be present.
+character to indicate that the modifier must not be present. If
+.RB \*q "None" \*q
+is specified, no modifier may be present.
.PP
The result specifies a string, keysym, or both, that the X client receives
as input when the sequence of events is input: