aboutsummaryrefslogtreecommitdiff
path: root/libX11/man
diff options
context:
space:
mode:
Diffstat (limited to 'libX11/man')
-rw-r--r--libX11/man/Compose.man16
-rw-r--r--libX11/man/XErrorEvent.man2
-rw-r--r--libX11/man/xkb/XkbLookupKeySym.man2
-rw-r--r--libX11/man/xkb/XkbTranslateKeyCode.man2
4 files changed, 12 insertions, 10 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:
diff --git a/libX11/man/XErrorEvent.man b/libX11/man/XErrorEvent.man
index 66c07d0fb..136de6ec3 100644
--- a/libX11/man/XErrorEvent.man
+++ b/libX11/man/XErrorEvent.man
@@ -90,11 +90,11 @@ structure contains:
typedef struct {
int type;
Display *display; /\&* Display the event was read from */
+ XID resourceid; /\&* resource id */
unsigned long serial; /\&* serial number of failed request */
unsigned char error_code; /\&* error code of failed request */
unsigned char request_code; /\&* Major op-code of failed request */
unsigned char minor_code; /\&* Minor op-code of failed request */
- XID resourceid; /\&* resource id */
} XErrorEvent;
.De
.LP
diff --git a/libX11/man/xkb/XkbLookupKeySym.man b/libX11/man/xkb/XkbLookupKeySym.man
index fe9cb133d..8a8f0c108 100644
--- a/libX11/man/xkb/XkbLookupKeySym.man
+++ b/libX11/man/xkb/XkbLookupKeySym.man
@@ -44,7 +44,7 @@ key for which symbols are to be found
state for which symbol should be found
.TP
.I \- mods_rtrn
-backfilled with unconsumed modifiers
+backfilled with consumed modifiers
.TP
.I \- sym_rtrn
backfilled with symbol associated with key + state
diff --git a/libX11/man/xkb/XkbTranslateKeyCode.man b/libX11/man/xkb/XkbTranslateKeyCode.man
index 7f1afdd29..e234412f2 100644
--- a/libX11/man/xkb/XkbTranslateKeyCode.man
+++ b/libX11/man/xkb/XkbTranslateKeyCode.man
@@ -44,7 +44,7 @@ keycode to translate
modifiers to apply when translating key
.TP
.I \- mods_rtrn
-backfilled with unconsumed modifiers
+backfilled with consumed modifiers
.TP
.I \- keysym_rtrn
keysym resulting from translation