diff options
Diffstat (limited to 'libX11')
| -rw-r--r-- | libX11/man/Compose.man | 16 | ||||
| -rw-r--r-- | libX11/man/XErrorEvent.man | 2 | ||||
| -rw-r--r-- | libX11/man/xkb/XkbGetKeyBehaviors.man | 6 | ||||
| -rw-r--r-- | libX11/man/xkb/XkbLookupKeySym.man | 2 | ||||
| -rw-r--r-- | libX11/man/xkb/XkbTranslateKeyCode.man | 2 | ||||
| -rw-r--r-- | libX11/modules/im/ximcp/imLcPrs.c | 5 | ||||
| -rw-r--r-- | libX11/specs/XKB/ch12.xml | 4 |
7 files changed, 20 insertions, 17 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/XkbGetKeyBehaviors.man b/libX11/man/xkb/XkbGetKeyBehaviors.man index 3d2ae10d7..02b638b7c 100644 --- a/libX11/man/xkb/XkbGetKeyBehaviors.man +++ b/libX11/man/xkb/XkbGetKeyBehaviors.man @@ -19,13 +19,13 @@ .\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER .\" DEALINGS IN THE SOFTWARE. .\" -.TH XkbChangeTypesOfKey __libmansuffix__ __xorgversion__ "XKB FUNCTIONS" +.TH XkbGetKeyBehaviors __libmansuffix__ __xorgversion__ "XKB FUNCTIONS" .SH NAME -XkbChangeTypesOfKey \- Obtain the behaviors (the behaviors array) for a subset of the keys in +XkbGetKeyBehaviors \- Obtain the behaviors (the behaviors array) for a subset of the keys in a keyboard description from the server .SH SYNOPSIS .HP -.B Status XkbChangeTypesOfKey +.B Status XkbGetKeyBehaviors .BI "(\^Display *" "dpy" "\^," .BI "unsigned int " "first" "\^," .BI "unsigned int " "num" "\^," 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 diff --git a/libX11/modules/im/ximcp/imLcPrs.c b/libX11/modules/im/ximcp/imLcPrs.c index e9d5f7b78..9bb45ff31 100644 --- a/libX11/modules/im/ximcp/imLcPrs.c +++ b/libX11/modules/im/ximcp/imLcPrs.c @@ -68,8 +68,9 @@ static void parsestringfile(FILE *fp, Xim im, int depth); * COMMENT ::= "#" {<any character except null or newline>} * LHS ::= EVENT { EVENT } * EVENT ::= [MODIFIER_LIST] "<" keysym ">" - * MODIFIER_LIST ::= ("!" {MODIFIER} ) | "None" - * MODIFIER ::= ["~"] modifier_name + * MODIFIER_LIST ::= (["!"] {MODIFIER} ) | "None" + * MODIFIER ::= ["~"] MODIFIER_NAME + * MODIFIER_NAME ::= ("Ctrl"|"Lock"|"Caps"|"Shift"|"Alt"|"Meta") * RHS ::= ( STRING | keysym | STRING keysym ) * STRING ::= '"' { CHAR } '"' * CHAR ::= GRAPHIC_CHAR | ESCAPED_CHAR diff --git a/libX11/specs/XKB/ch12.xml b/libX11/specs/XKB/ch12.xml index fcfa8f9f2..0e7369852 100644 --- a/libX11/specs/XKB/ch12.xml +++ b/libX11/specs/XKB/ch12.xml @@ -447,7 +447,7 @@ to find the symbol associated with a key for a particular state. </term> <listitem> <para> - backfilled with unconsumed modifiers + backfilled with consumed modifiers </para> </listitem> </varlistentry> @@ -840,7 +840,7 @@ To translate a keycode to a key symbol and modifiers, use </term> <listitem> <para> - backfilled with unconsumed modifiers + backfilled with consumed modifiers </para> </listitem> </varlistentry> |