From f1c2db43dcf35d2cf4715390bd2391c28e42a8c2 Mon Sep 17 00:00:00 2001 From: marha Date: Sun, 22 Feb 2015 14:31:16 +0100 Subject: 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 --- libX11/man/Compose.man | 16 +++++++++------- libX11/man/XErrorEvent.man | 2 +- libX11/man/xkb/XkbLookupKeySym.man | 2 +- libX11/man/xkb/XkbTranslateKeyCode.man | 2 +- libX11/modules/im/ximcp/imLcPrs.c | 5 +++-- libX11/specs/XKB/ch12.xml | 4 ++-- 6 files changed, 17 insertions(+), 14 deletions(-) (limited to 'libX11') 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 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 ::= "#" {} * 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. - backfilled with unconsumed modifiers + backfilled with consumed modifiers @@ -840,7 +840,7 @@ To translate a keycode to a key symbol and modifiers, use - backfilled with unconsumed modifiers + backfilled with consumed modifiers -- cgit v1.2.3