libX11: Changes to 'master'
James Cloos
cloos at kemper.freedesktop.org
Thu Feb 5 14:39:23 PST 2015
man/Compose.man | 16 +++++++++-------
man/xkb/XkbLookupKeySym.man | 2 +-
man/xkb/XkbTranslateKeyCode.man | 2 +-
modules/im/ximcp/imLcPrs.c | 5 +++--
specs/XKB/ch12.xml | 4 ++--
5 files changed, 16 insertions(+), 13 deletions(-)
New commits:
commit ddf3b09bb262d01b56fbaade421ac85b0e60a69f
Author: Ran Benita <ran234 at gmail.com>
Date: Tue Feb 3 13:23:50 2015 -0500
compose: fix the description of modifiers in compose sequences
The Compose format has a feature which allows specifying certain
modifiers must (or must not) be present with a given keysym in the
sequence.
The grammar in imLcPrs.c and the Compose man page both do not match what
the code actually does (see the handling of the variables
`modifier_mask` and `modifier` in parseline() in imLcPrs.c, which are
eventually matched as `ev->state & modifier_mask == modifier`).
Also explicitly list the accepted modifier names, since they are
not standard (e.g. "Ctrl" instead of "Control").
Signed-off-by: Ran Benita <ran234 at gmail.com>
Signed-off-by: James Cloos <cloos at jhcloos.com>
commit 129f13f385c50e3d8b53ea7441b17386b0f36aeb
Author: Ran Benita <ran234 at gmail.com>
Date: Tue Feb 3 13:23:49 2015 -0500
xkb: fix misleading comment about consumed modifiers
In the spec and the man page the `mods_rtrn` argument is described as
"backfilled with unconsumed modifiers" but actually it is backfilled
with the *consumed* modifiers. This is also mentioned a few lines below
in each case.
Signed-off-by: Ran Benita <ran234 at gmail.com>
Signed-off-by: James Cloos <cloos at jhcloos.com>
More information about the xorg-commit
mailing list