libx11: Changes to 'debian-unstable'
Rebased ref, commits from common ancestor:
commit 471e41c668966bb72a8332e44f214577e33f9034
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 19 17:52:20 2010 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 538735d..b564e18 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libx11 (2:1.3.3-4) UNRELEASED; urgency=low
+libx11 (2:1.3.3-4) unstable; urgency=low
* Cherry-pick patches from upstream, 1.3-branch:
- man: Fix typo in Makefile
@@ -21,7 +21,7 @@ libx11 (2:1.3.3-4) UNRELEASED; urgency=low
- nls: Switch one of the interrobang sequences to gnaborretni
- Bug 29773: aliases for nb_NO.utf8 and nn_NO.utf8
- -- Cyril Brulebois <kibi@debian.org> Fri, 19 Nov 2010 17:31:50 +0100
+ -- Cyril Brulebois <kibi@debian.org> Fri, 19 Nov 2010 17:52:14 +0100
libx11 (2:1.3.3-3) unstable; urgency=low
commit 38d0c0ec64ee6ceeb36525187cb0979df84b0015
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 19 17:32:54 2010 +0100
Update changelog.
diff --git a/debian/changelog b/debian/changelog
index 789b2b7..538735d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,28 @@
+libx11 (2:1.3.3-4) UNRELEASED; urgency=low
+
+ * Cherry-pick patches from upstream, 1.3-branch:
+ - man: Fix typo in Makefile
+ - Bug 27465 - Rewritten fi_FI.UTF-8 Compose file
+ - Fix typo in new fi_FI.UTF-8 that was reported by "make check"
+ - man: Redirect users from XKeycodeToKeysym to XkbKeycodeToKeysym #25732
+ - man: Fix return value specification of XkbKeyActionEntry
+ - man: Return value of XkbGetState is Status and not Bool
+ - man: Add missing geometry component flag
+ - man: Correct the XkbAllAccessXEventsMask mask name
+ - Fix manual typos.
+ - Allow X11 users to compose anarchism
+ - Clarify requirements in XRestackWindows man page
+ - Fix typo that made configure always report "none" for man page suffix
+ - Define FILE_MAN_DIR_SUFFIX so XCompose shadow page has correct path
+ - Compose.man: default user compose file is .XCompose, not .Xcompose
+ - Make Compose-comma map to Ogonek for A and E in UTF-8 locales.
+ - Make Compose-comma map to ogonek for I and U in UTF-8 locales.
+ - NLS: Add \o/ Compose sequence
+ - nls: Switch one of the interrobang sequences to gnaborretni
+ - Bug 29773: aliases for nb_NO.utf8 and nn_NO.utf8
+
+ -- Cyril Brulebois <kibi@debian.org> Fri, 19 Nov 2010 17:31:50 +0100
+
libx11 (2:1.3.3-3) unstable; urgency=low
[ Julien Cristau ]
commit 585c80019dd67ccc5ad1300c642cf9d1d65e5a98
Author: Jens Petersen <petersen@redhat.com>
Date: Mon Aug 23 18:08:10 2010 -0700
Bug 29773: aliases for nb_NO.utf8 and nn_NO.utf8
<https://bugs.freedesktop.org/show_bug.cgi?id=29773>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
(cherry picked from commit 6838a5beeb6c6c614e371fe7df5fa7804065e55e)
diff --git a/nls/locale.alias.pre b/nls/locale.alias.pre
index 0e18868..3064827 100644
--- a/nls/locale.alias.pre
+++ b/nls/locale.alias.pre
@@ -821,6 +821,7 @@ nb_NO.iso88591: nb_NO.ISO8859-1
nb_NO.ISO-8859-1: nb_NO.ISO8859-1
nb_NO.iso885915: nb_NO.ISO8859-15
nb_NO.ISO-8859-15: nb_NO.ISO8859-15
+nb_NO.utf8: nb_NO.UTF-8
ne_NP.utf8: ne_NP.UTF-8
ne_NP.UTF-8: ne_NP.UTF-8
nl: nl_NL.ISO8859-1
@@ -856,6 +857,7 @@ nn_NO.ISO-8859-1: nn_NO.ISO8859-1
nn_NO.ISO_8859-1: nn_NO.ISO8859-1
nn_NO.iso885915: nn_NO.ISO8859-15
nn_NO.ISO-8859-15: nn_NO.ISO8859-15
+nn_NO.utf8: nn_NO.UTF-8
no: no_NO.ISO8859-1
no_NO: no_NO.ISO8859-1
no_NO.88591: no_NO.ISO8859-1
commit b03929cabd79de01d851b80f1d695f9054da9143
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 29 11:11:21 2010 -0400
nls: Switch one of the interrobang sequences to gnaborretni
Since gnaborretni is primarily used in LTR locales, the ? part of the
sequence reflects the position of the bulge in the ?. When scanning an
inverted interrobang left-to-right, you see the bulge first, so the
compose sequence ?! is used; upright interrobang shows the bulge
last, so it's !?.
This is a change in behaviour, but I was unable to come up with anything
better. ??!! or !!?? would match the patterns for ¿ and ¡, but they
would delay evaluation of them; "¿Qué?" wouldn't show the ¿ until you hit
Q. Likewise ?!?! and !?!? would delay showing the interrobang itself.
~!? and ~?! were considered but are arguably less intuitive.
Reviewed-by: James Cloos <cloos@jhcloos.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
(cherry picked from commit f70527f05677aaf6a493ba42d2d95f738aaebafa)
(cherry picked from commit 4b17b61421e81dd8acc0e410c37b76e674c2ddf7)
diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
index c4e0ab5..f38e15d 100644
--- a/nls/en_US.UTF-8/Compose.pre
+++ b/nls/en_US.UTF-8/Compose.pre
@@ -211,7 +211,7 @@ XCOMM Other symbols
<Multi_key> <Cyrillic_EN> <Cyrillic_o> : "№" numerosign # NUMERO SIGN
<Multi_key> <Cyrillic_EN> <Cyrillic_O> : "№" numerosign # NUMERO SIGN
-<Multi_key> <question> <exclam> : "‽" U203D # INTERROBANG
+<Multi_key> <question> <exclam> : "⸘" U2E18 # INVERTED INTERROBANG
<Multi_key> <exclam> <question> : "‽" U203D # INTERROBANG
<Multi_key> <C> <C> <C> <P> : "☭" U262D # HAMMER AND SICKLE
commit 3d9eed8c3e4bb0ce70abc51a3c3cd3692a4f2be8
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jul 20 12:34:48 2010 +0100
NLS: Add \o/ Compose sequence
Unicode is even more pointlessly awesome! Add a binding for Compose-\o/
to U+1F64C PERSON RAISING BOTH HANDS IN CELEBRATION.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
(cherry picked from commit 554da76ece85d0fc0cada45a86860e69c2107e9a)
(cherry picked from commit 0f70c845ad336a235e2f2f5d966b421d9a9d653d)
diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
index 18a4199..c4e0ab5 100644
--- a/nls/en_US.UTF-8/Compose.pre
+++ b/nls/en_US.UTF-8/Compose.pre
@@ -5378,3 +5378,4 @@ XCOMM
<dead_circumflex> <Cyrillic_ER> : "Р̂" # CYRILLIC CAPITAL LETTER ER WITH COMBINING CIRCUMFLEX ACCENT
<Multi_key> <asciicircum> <Cyrillic_ER> : "Р̂" # CYRILLIC CAPITAL LETTER ER WITH COMBINING CIRCUMFLEX ACCENT
+<Multi_key> <backslash> <o> <slash> : "🙌" # PERSON RAISING BOTH HANDS IN CELEBRATION
commit e082383a7b2dcbb66872aaca5760f10711a3c77e
Author: Juliusz Chroboczek <jch@pps.jussieu.fr>
Date: Tue Jun 29 18:32:42 2010 +0200
Make Compose-comma map to ogonek for I and U in UTF-8 locales.
With the preceding patch, it makes the UTF-8 compose map consistent with
the ISO 8859-4 and -13 maps.
(cherry picked from commit 241a990afcf9c967c587ad6fd245df21b68b1ad9)
(cherry picked from commit 5c99e5b7f26e209de3430397784db443051d6eff)
diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
index 1320d40..18a4199 100644
--- a/nls/en_US.UTF-8/Compose.pre
+++ b/nls/en_US.UTF-8/Compose.pre
@@ -746,8 +746,10 @@ XCOMM Part 3
<Multi_key> <b> <i> : "ĭ" U012D # LATIN SMALL LETTER I WITH BREVE
<dead_ogonek> <I> : "Į" U012E # LATIN CAPITAL LETTER I WITH OGONEK
<Multi_key> <semicolon> <I> : "Į" U012E # LATIN CAPITAL LETTER I WITH OGONEK
+<Multi_key> <comma> <I> : "Į" U012E # LATIN CAPITAL LETTER I WITH OGONEK
<dead_ogonek> <i> : "į" U012F # LATIN SMALL LETTER I WITH OGONEK
<Multi_key> <semicolon> <i> : "į" U012F # LATIN SMALL LETTER I WITH OGONEK
+<Multi_key> <comma> <i> : "į" U012F # LATIN SMALL LETTER I WITH OGONEK
<dead_abovedot> <I> : "İ" U0130 # LATIN CAPITAL LETTER I WITH DOT ABOVE
<Multi_key> <period> <I> : "İ" U0130 # LATIN CAPITAL LETTER I WITH DOT ABOVE
<dead_abovedot> <i> : "ı" U0131 # LATIN SMALL LETTER DOTLESS I
@@ -898,8 +900,10 @@ XCOMM Part 3
<Multi_key> <equal> <u> : "ű" U0171 # LATIN SMALL LETTER U WITH DOUBLE ACUTE
<dead_ogonek> <U> : "Ų" U0172 # LATIN CAPITAL LETTER U WITH OGONEK
<Multi_key> <semicolon> <U> : "Ų" U0172 # LATIN CAPITAL LETTER U WITH OGONEK
+<Multi_key> <comma> <U> : "Ų" U0172 # LATIN CAPITAL LETTER U WITH OGONEK
<dead_ogonek> <u> : "ų" U0173 # LATIN SMALL LETTER U WITH OGONEK
<Multi_key> <semicolon> <u> : "ų" U0173 # LATIN SMALL LETTER U WITH OGONEK
+<Multi_key> <comma> <u> : "ų" U0173 # LATIN SMALL LETTER U WITH OGONEK
<dead_circumflex> <W> : "Ŵ" U0174 # LATIN CAPITAL LETTER W WITH CIRCUMFLEX
<Multi_key> <asciicircum> <W> : "Ŵ" U0174 # LATIN CAPITAL LETTER W WITH CIRCUMFLEX
<dead_circumflex> <w> : "ŵ" U0175 # LATIN SMALL LETTER W WITH CIRCUMFLEX
commit 24b65801a17f461c70f0c2104ef32f601765b598
Author: Juliusz Chroboczek <jch@pps.jussieu.fr>
Date: Tue Jun 29 18:20:18 2010 +0200
Make Compose-comma map to Ogonek for A and E in UTF-8 locales.
This makes the UTF-8 compose file consistent with the ISO 8859-2 compose file
as far as Polish is concerned. We only sacrifice one pair of characters,
e-cedilla, which is not used in any language.
(cherry picked from commit af55e582f485a668c2bf43129be972bc65f03c60)
(cherry picked from commit ce7e5309bd227c14f6569fbccd8523e992c2bf07)
diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
index 8732861..1320d40 100644
--- a/nls/en_US.UTF-8/Compose.pre
+++ b/nls/en_US.UTF-8/Compose.pre
@@ -640,8 +640,10 @@ XCOMM Part 3
<Multi_key> <b> <a> : "ă" U0103 # LATIN SMALL LETTER A WITH BREVE
<dead_ogonek> <A> : "Ą" U0104 # LATIN CAPITAL LETTER A WITH OGONEK
<Multi_key> <semicolon> <A> : "Ą" U0104 # LATIN CAPITAL LETTER A WITH OGONEK
+<Multi_key> <comma> <A> : "Ą" U0104 # LATIN CAPITAL LETTER A WITH OGONEK
<dead_ogonek> <a> : "ą" U0105 # LATIN SMALL LETTER A WITH OGONEK
<Multi_key> <semicolon> <a> : "ą" U0105 # LATIN SMALL LETTER A WITH OGONEK
+<Multi_key> <comma> <a> : "ą" U0105 # LATIN SMALL LETTER A WITH OGONEK
<dead_acute> <C> : "Ć" U0106 # LATIN CAPITAL LETTER C WITH ACUTE
<Multi_key> <acute> <C> : "Ć" U0106 # LATIN CAPITAL LETTER C WITH ACUTE
<Multi_key> <apostrophe> <C> : "Ć" U0106 # LATIN CAPITAL LETTER C WITH ACUTE
@@ -688,8 +690,10 @@ XCOMM Part 3
<Multi_key> <period> <e> : "ė" U0117 # LATIN SMALL LETTER E WITH DOT ABOVE
<dead_ogonek> <E> : "Ę" U0118 # LATIN CAPITAL LETTER E WITH OGONEK
<Multi_key> <semicolon> <E> : "Ę" U0118 # LATIN CAPITAL LETTER E WITH OGONEK
+<Multi_key> <comma> <E> : "Ę" U0118 # LATIN CAPITAL LETTER E WITH OGONEK
<dead_ogonek> <e> : "ę" U0119 # LATIN SMALL LETTER E WITH OGONEK
<Multi_key> <semicolon> <e> : "ę" U0119 # LATIN SMALL LETTER E WITH OGONEK
+<Multi_key> <comma> <e> : "ę" U0119 # LATIN SMALL LETTER E WITH OGONEK
<dead_caron> <E> : "Ě" U011A # LATIN CAPITAL LETTER E WITH CARON
<Multi_key> <c> <E> : "Ě" U011A # LATIN CAPITAL LETTER E WITH CARON
<dead_caron> <e> : "ě" U011B # LATIN SMALL LETTER E WITH CARON
@@ -1187,10 +1191,8 @@ XCOMM Part 3
<dead_abovedot> <a> : "ȧ" U0227 # LATIN SMALL LETTER A WITH DOT ABOVE
<Multi_key> <period> <a> : "ȧ" U0227 # LATIN SMALL LETTER A WITH DOT ABOVE
<dead_cedilla> <E> : "Ȩ" U0228 # LATIN CAPITAL LETTER E WITH CEDILLA
-<Multi_key> <comma> <E> : "Ȩ" U0228 # LATIN CAPITAL LETTER E WITH CEDILLA
<Multi_key> <cedilla> <E> : "Ȩ" U0228 # LATIN CAPITAL LETTER E WITH CEDILLA
<dead_cedilla> <e> : "ȩ" U0229 # LATIN SMALL LETTER E WITH CEDILLA
-<Multi_key> <comma> <e> : "ȩ" U0229 # LATIN SMALL LETTER E WITH CEDILLA
<Multi_key> <cedilla> <e> : "ȩ" U0229 # LATIN SMALL LETTER E WITH CEDILLA
<dead_macron> <Odiaeresis> : "Ȫ" U022A # LATIN CAPITAL LETTER O WITH DIAERESIS AND MACRON
<Multi_key> <macron> <Odiaeresis> : "Ȫ" U022A # LATIN CAPITAL LETTER O WITH DIAERESIS AND MACRON
commit af7dca64c9d7fb622ca4b35a5af957797b131372
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jul 24 22:13:07 2010 +0200
Compose.man: default user compose file is .XCompose, not .Xcompose
The path was correct in the DESCRIPTION section, but not in FILES.
Signed-off-by: Julien Cristau <jcristau@debian.org>
(cherry picked from commit 8e603413586ff42b1351688f6f99318cbe243bca)
(cherry picked from commit 8da90e33865340fe954bcb6b99dfcb1b7617ab10)
diff --git a/man/Compose.man b/man/Compose.man
index db48cc4..8522051 100644
--- a/man/Compose.man
+++ b/man/Compose.man
@@ -133,7 +133,7 @@ File to use for compose sequences.
Directory to use for caching compiled compose files.
.SH FILES
.TP
-.I $HOME/.Xcompose
+.I $HOME/.XCompose
User default compose file if XCOMPOSEFILE is not set.
.TP
.I __xlocaledir__/compose.dir
commit 88fcbb8cb28de6f3cb105069e222f92bdfef6df4
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Jun 24 13:13:11 2010 -0700
Define FILE_MAN_DIR_SUFFIX so XCompose shadow page has correct path
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
(cherry picked from commit d6ba13009fc9ef876a104b907ffef73c6e405d4b)
(cherry picked from commit 2b82daa88538022cfb49d8ceab22650e8062cacc)
diff --git a/man/Makefile.am b/man/Makefile.am
index b7f7f3e..831067b 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -196,6 +196,7 @@ libman_PRE = \
filemandir = $(FILE_MAN_DIR)
fileman_PRE = Compose.man
+FILE_MAN_DIR_SUFFIX = $(FILE_MAN_DIR:@mandir@/man%=%)
# What we actually install
commit 1f1d7781508975e32abf5ee744e844353b79e2c6
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Jun 3 11:25:33 2010 -0700
Fix typo that made configure always report "none" for man page suffix
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
(cherry picked from commit bdb31a1fb707cebccc9efbbf68cb55c10fa4ea3e)
diff --git a/configure.ac b/configure.ac
index 0eea575..bc89adc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -547,7 +547,7 @@ AC_OUTPUT([Makefile
x11.pc
x11-xcb.pc])
-man_pages_suffix=$LIBMAN_SUFFIX
+man_pages_suffix=$LIB_MAN_SUFFIX
if test -z "$man_pages_suffix"; then
man_pages_suffix=none
fi
commit a0f84933600524fe4c3a04ae2ab42267dfb96f83
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Jun 1 18:55:48 2010 -0700
Clarify requirements in XRestackWindows man page
The required common parent window is not specified in the arguments,
just implied as the parent of the first window in the list.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
(cherry picked from commit 4378219ff8c1418418c70086085358b69d574e74)
diff --git a/man/XRaiseWindow.man b/man/XRaiseWindow.man
index 8d74466..3926b16 100644
--- a/man/XRaiseWindow.man
+++ b/man/XRaiseWindow.man
@@ -305,7 +305,7 @@ The stacking order of the first window in the windows array is unaffected,
but the other windows in the array are stacked underneath the first window,
in the order of the array.
The stacking order of the other windows is not affected.
-For each window in the window array that is not a child of the specified window,
+For each window in the window array that is not a sibling of the first window,
a
.ZN BadMatch
error results.
commit ea205bd1a5caaf360bb6a3c552616acfa9f0ec6a
Author: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Fri Apr 23 00:01:54 2010 +0200
Allow X11 users to compose anarchism
I can easily compose the hammer and sickle (the symbol representative
of communism) by pressing the key sequence:
<Compose> <C> <C> <C> <P> -> ☭
But i can't easily make the circled A (the symbol representative of
anarchism).
I'd like to be able to use <Compose> <O> <A> (this is a
currently unused key sequence) to generate the symbol: Ⓐ
Debian bug#555938 <http://bugs.debian.org/555938>
Signed-off-by: Julien Cristau <jcristau@debian.org>
(cherry picked from commit 3e11c73187acb2e2be9a812840bbbea947527ccb)
diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
index c6ea2da..8732861 100644
--- a/nls/en_US.UTF-8/Compose.pre
+++ b/nls/en_US.UTF-8/Compose.pre
@@ -215,6 +215,7 @@ XCOMM Other symbols
<Multi_key> <exclam> <question> : "‽" U203D # INTERROBANG
<Multi_key> <C> <C> <C> <P> : "☭" U262D # HAMMER AND SICKLE
+<Multi_key> <O> <A> : "Ⓐ" U24B6 # CIRCLED LATIN CAPITAL LETTER A
<Multi_key> <less> <3> : "♥" U2665 # BLACK HEART SUIT
<Multi_key> <colon> <parenright> : "☺" U263A # WHITE SMILING FACE
commit b53da3f69d11558799136c4714d390341af08ebc
Author: Kusanagi Kouichi <slash@ac.auone-net.jp>
Date: Fri Feb 12 17:16:10 2010 +0900
Fix manual typos.
Signed-off-by: Kusanagi Kouichi <slash@ac.auone-net.jp>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
(cherry picked from commit c3f3e4a9e531d010312c97e753d6e543e607094d)
diff --git a/man/xkb/Makefile.am b/man/xkb/Makefile.am
index a4eaa6b..d5186e7 100644
--- a/man/xkb/Makefile.am
+++ b/man/xkb/Makefile.am
@@ -96,7 +96,7 @@ libman_PRE = \
XkbGetCompatMap.man \
XkbGetControls.man \
XkbGetControlsChanges.man \
- XkbGetDetectableAutorepeat.man \
+ XkbGetDetectableAutoRepeat.man \
XkbGetDeviceButtonActions.man \
XkbGetDeviceInfo.man \
XkbGetDeviceInfoChanges.man \
@@ -189,7 +189,7 @@ libman_PRE = \
XkbSetCompatMap.man \
XkbSetControls.man \
XkbSetDebuggingFlags.man \
- XkbSetDetectableAutorepeat.man \
+ XkbSetDetectableAutoRepeat.man \
XkbSetDeviceButtonActions.man \
XkbSetDeviceInfo.man \
XkbSetIgnoreLockMods.man \
diff --git a/man/xkb/XkbGetDetectableAutoRepeat.man b/man/xkb/XkbGetDetectableAutoRepeat.man
new file mode 100644
index 0000000..d6ccd85
--- /dev/null
+++ b/man/xkb/XkbGetDetectableAutoRepeat.man
@@ -0,0 +1,92 @@
+.\" Copyright 1999 Sun Microsystems, Inc. All rights reserved.
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining a
+.\" copy of this software and associated documentation files (the "Software"),
+.\" to deal in the Software without restriction, including without limitation
+.\" the rights to use, copy, modify, merge, publish, distribute, sublicense,
+.\" and/or sell copies of the Software, and to permit persons to whom the
+.\" Software is furnished to do so, subject to the following conditions:
+.\"
+.\" The above copyright notice and this permission notice (including the next
+.\" paragraph) shall be included in all copies or substantial portions of the
+.\" Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+.\" THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+.\" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+.\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+.\" DEALINGS IN THE SOFTWARE.
+.\"
+.TH XkbGetDetectableAutoRepeat __libmansuffix__ __xorgversion__ "XKB FUNCTIONS"
+.SH NAME
+XkbGetDetectableAutoRepeat \- Determines whether or not the server supports
+DetectableAutoRepeat
+.SH SYNOPSIS
+.HP
+.B Bool XkbGetDetectableAutoRepeat
+.BI "(\^Display *" "display" "\^,"
+.BI "Bool *" "supported_rtrn" "\^);"
+.if n .ti +5n
+.if t .ti +.5i
+.SH ARGUMENTS
+.TP
+.I \- display
+connection to X server
+.TP
+.I \- supported_rtrn
+backfilled True if DetectableAutoRepeat supported
+.SH DESCRIPTION
+.LP
+Auto-repeat is the generation of multiple key events by a keyboard when the user
+presses a key and holds it down. Keyboard hardware and device-dependent X server
+software often implement auto-repeat by generating multiple KeyPress events with no
+intervening KeyRelease event. The standard behavior of the X server is to generate
+a KeyRelease event for every KeyPress event. If the keyboard hardware and
+device-dependent software of the X server implement auto-repeat by generating
+multiple KeyPress events, the device-independent part of the X server by default
+synthetically generates a KeyRelease event after each KeyPress event. This provides
+predictable behavior for X clients, but does not allow those clients to detect the
+fact that a key is auto-repeating.
+
+Xkb allows clients to request
+.I detectable auto-repeat.
+If a client requests and the server supports DetectableAutoRepeat, Xkb generates
+KeyRelease events only when the key is physically released. If DetectableAutoRepeat
+is not supported or has not been requested, the server synthesizes a KeyRelease
+event for each repeating KeyPress event it generates.
+
+DetectableAutoRepeat, unlike other controls, is not contained in the XkbControlsRec
+structure, nor can it be enabled or disabled via the EnabledControls control.
+Instead, query and set DetectableAutoRepeat using
+.I XkbGetDetectableAutoRepeat
+and
+.I XkbSetDetectableAutoRepeat.
+
+DetectableAutoRepeat is a condition that applies to all keyboard devices for a
+client's connection to a given X server; it cannot be selectively set for some
+devices and not for others. For this reason, none of the Xkb library functions
+involving DetectableAutoRepeat involve a device specifier.
+
+.I XkbGetDetectableAutoRepeat
+queries the server for the current state of DetectableAutoRepeat and waits for a
+reply. If
+.I supported_rtrn
+is not NULL, it backfills
+.I supported_rtrn
+with True if the server supports DetectableAutoRepeat, and False otherwise.
+.I XkbGetDetectableAutoRepeat
+returns the current state of DetectableAutoRepeat for the requesting client:
+True if DetectableAutoRepeat is set, and False otherwise.
+.SH "RETURN VALUES"
+.TP 15
+True
+The
+.I XkbGetDetectableAutoRepeat
+function returns True if the server supports DetectableAutoRepeat.
+.TP 15
+False
+The
+.I XkbGetDetectableAutoRepeat
+function returns False if the server does not support DetectableAutoRepeat.
diff --git a/man/xkb/XkbGetDetectableAutorepeat.man b/man/xkb/XkbGetDetectableAutorepeat.man
deleted file mode 100644
index 8e5e778..0000000
--- a/man/xkb/XkbGetDetectableAutorepeat.man
+++ /dev/null
@@ -1,92 +0,0 @@
-.\" Copyright 1999 Sun Microsystems, Inc. All rights reserved.
-.\"
-.\" Permission is hereby granted, free of charge, to any person obtaining a
-.\" copy of this software and associated documentation files (the "Software"),
-.\" to deal in the Software without restriction, including without limitation
-.\" the rights to use, copy, modify, merge, publish, distribute, sublicense,
-.\" and/or sell copies of the Software, and to permit persons to whom the
-.\" Software is furnished to do so, subject to the following conditions:
-.\"
-.\" The above copyright notice and this permission notice (including the next
-.\" paragraph) shall be included in all copies or substantial portions of the
-.\" Software.
-.\"
-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-.\" THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-.\" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-.\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-.\" DEALINGS IN THE SOFTWARE.
-.\"
-.TH XkbGetDetectableAutorepeat __libmansuffix__ __xorgversion__ "XKB FUNCTIONS"
-.SH NAME
-XkbGetDetectableAutorepeat \- Determines whether or not the server supports
-DetectableAutorepeat
-.SH SYNOPSIS
-.HP
-.B Bool XkbGetDetectableAutorepeat
-.BI "(\^Display *" "display" "\^,"
-.BI "Bool *" "supported_rtrn" "\^);"
-.if n .ti +5n
-.if t .ti +.5i
-.SH ARGUMENTS
-.TP
-.I \- display
-connection to X server
-.TP
-.I \- supported_rtrn
-backfilled True if DetectableAutorepeat supported
-.SH DESCRIPTION
-.LP
-Auto-repeat is the generation of multiple key events by a keyboard when the user
-presses a key and holds it down. Keyboard hardware and device-dependent X server
-software often implement auto-repeat by generating multiple KeyPress events with no
-intervening KeyRelease event. The standard behavior of the X server is to generate
-a KeyRelease event for every KeyPress event. If the keyboard hardware and
-device-dependent software of the X server implement auto-repeat by generating
-multiple KeyPress events, the device-independent part of the X server by default
-synthetically generates a KeyRelease event after each KeyPress event. This provides
-predictable behavior for X clients, but does not allow those clients to detect the
-fact that a key is auto-repeating.
-
-Xkb allows clients to request
-.I detectable auto-repeat.
-If a client requests and the server supports DetectableAutorepeat, Xkb generates
-KeyRelease events only when the key is physically released. If DetectableAutorepeat
-is not supported or has not been requested, the server synthesizes a KeyRelease
-event for each repeating KeyPress event it generates.
-
-DetectableAutorepeat, unlike other controls, is not contained in the XkbControlsRec
-structure, nor can it be enabled or disabled via the EnabledControls control.
-Instead, query and set DetectableAutorepeat using
-.I XkbGetDetectableAutorepeat
-and
-.I XkbSetDetectableAutorepeat.
-
-DetectableAutorepeat is a condition that applies to all keyboard devices for a
-client's connection to a given X server; it cannot be selectively set for some
-devices and not for others. For this reason, none of the Xkb library functions
-involving DetectableAutorepeat involve a device specifier.
-
-.I XkbGetDetectableAutorepeat
-queries the server for the current state of DetectableAutorepeat and waits for a
-reply. If
-.I supported_rtrn
-is not NULL, it backfills
-.I supported_rtrn
-with True if the server supports DetectableAutorepeat, and False otherwise.
-.I XkbGetDetectableAutorepeat
-returns the current state of DetectableAutorepeat for the requesting client:
-True if DetectableAutorepeat is set, and False otherwise.
-.SH "RETURN VALUES"
-.TP 15
-True
-The
-.I XkbGetDetectableAutorepeat
-function returns True if the server supports DetectableAutorepeat.
-.TP 15
-False
-The
-.I XkbGetDetectableAutorepeat
-function returns False if the server does not support DetectableAutorepeat.
diff --git a/man/xkb/XkbSetDetectableAutoRepeat.man b/man/xkb/XkbSetDetectableAutoRepeat.man
new file mode 100644
index 0000000..14c88aa
--- /dev/null
+++ b/man/xkb/XkbSetDetectableAutoRepeat.man
@@ -0,0 +1,105 @@
+.\" Copyright 1999 Sun Microsystems, Inc. All rights reserved.
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining a
+.\" copy of this software and associated documentation files (the "Software"),
+.\" to deal in the Software without restriction, including without limitation
+.\" the rights to use, copy, modify, merge, publish, distribute, sublicense,
+.\" and/or sell copies of the Software, and to permit persons to whom the
+.\" Software is furnished to do so, subject to the following conditions:
+.\"
+.\" The above copyright notice and this permission notice (including the next
+.\" paragraph) shall be included in all copies or substantial portions of the
+.\" Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+.\" THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+.\" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+.\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+.\" DEALINGS IN THE SOFTWARE.
+.\"
+.TH XkbSetDetectableAutoRepeat __libmansuffix__ __xorgversion__ "XKB FUNCTIONS"
+.SH NAME
+XkbSetDetectableAutoRepeat \- Sets DetectableAutoRepeat
+.SH SYNTAX
+.HP
+.B Bool XkbSetDetectableAutoRepeat
+.BI "(\^Display *" "display" "\^,"
+.BI "Bool " "detectable" "\^,"
+.BI "Bool *" "supported_rtrn" "\^);"
+.if n .ti +5n
+.if t .ti +.5i
+.SH ARGUMENTS
+.TP
+.I \- display
+connection to X server
+.TP
+.I \- detectable
+True => set DetectableAutoRepeat
+.TP
+.I \- supported_rtrn
+backfilled True if DetectableAutoRepeat supported
+.SH DESCRIPTION
+.LP
+Auto-repeat is the generation of multiple key events by a keyboard when the user
+presses a key and holds it down. Keyboard hardware and device-dependent X server
+software often implement auto-repeat by generating multiple KeyPress events with
+no intervening KeyRelease event. The standard behavior of the X server is to
+generate a KeyRelease event for every KeyPress event. If the keyboard hardware
+and device-dependent software of the X server implement auto-repeat by
+generating multiple KeyPress events, the device-independent part of the X server
+by default synthetically generates a KeyRelease event after each KeyPress event.
+This provides predictable behavior for X clients, but does not allow those
+clients to detect the fact that a key is auto-repeating.
+
+Xkb allows clients to request
+.I detectable auto-repeat.
+If a client requests and the server supports DetectableAutoRepeat, Xkb generates
+KeyRelease events only when the key is physically released. If
+DetectableAutoRepeat is not supported or has not been requested, the server
+synthesizes a KeyRelease event for each repeating KeyPress event it generates.
+
+DetectableAutoRepeat, unlike other controls, is not contained in the
+XkbControlsRec structure, nor can it be enabled or disabled via the
+EnabledControls control. Instead, query and set DetectableAutoRepeat using
+.I XkbGetDetectableAutoRepeat
+and
+.I XkbSetDetectableAutoRepeat.
+
+DetectableAutoRepeat is a condition that applies to all keyboard devices for a
+client's connection to a given X server; it cannot be selectively set for some
+devices and not for others. For this reason, none of the Xkb library functions
+involving DetectableAutoRepeat involve a device specifier.
+
+This request affects all keyboard activity for the requesting client only; other
+clients still see the expected nondetectable auto-repeat behavior, unless they
+have requested otherwise.
+
+.I XkbSetDetectableAutoRepeat
+sends a request to the server to set DetectableAutoRepeat on for the current
+client if
+.I detectable
+is True, and off if
+.I detectable
+is False; it then waits for a reply. If
+.I supported_rtrn
+is not NULL,
+.I XkbSetDetectableAutoRepeat
+backfills
+.I supported_rtrn
+with True if the server supports DetectableAutoRepeat, and False if it does not.
+.I XkbSetDetectableAutoRepeat
+returns the current state of DetectableAutoRepeat for the requesting client:
+True if DetectableAutoRepeat is set, and False otherwise.
+.SH "RETURN VALUES"
+.TP 15
+True
+The
+.I XkbSetDetectableAutoRepeat
+function returns True if DetectableAutoRepeat is set.
+.TP 15
+False
+The
+.I XkbSetDetectableAutoRepeat
+function returns False if DetectableAutoRepeat is not set.
diff --git a/man/xkb/XkbSetDetectableAutorepeat.man b/man/xkb/XkbSetDetectableAutorepeat.man
deleted file mode 100644
index 7666b2b..0000000
--- a/man/xkb/XkbSetDetectableAutorepeat.man
+++ /dev/null
@@ -1,105 +0,0 @@
-.\" Copyright 1999 Sun Microsystems, Inc. All rights reserved.
-.\"
-.\" Permission is hereby granted, free of charge, to any person obtaining a
-.\" copy of this software and associated documentation files (the "Software"),
-.\" to deal in the Software without restriction, including without limitation
-.\" the rights to use, copy, modify, merge, publish, distribute, sublicense,
-.\" and/or sell copies of the Software, and to permit persons to whom the
-.\" Software is furnished to do so, subject to the following conditions:
-.\"
-.\" The above copyright notice and this permission notice (including the next
-.\" paragraph) shall be included in all copies or substantial portions of the
-.\" Software.
-.\"
-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-.\" THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-.\" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-.\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-.\" DEALINGS IN THE SOFTWARE.
-.\"
-.TH XkbSetDetectableAutorepeat __libmansuffix__ __xorgversion__ "XKB FUNCTIONS"
-.SH NAME
-XkbSetDetectableAutorepeat \- Sets DetectableAutorepeat
-.SH SYNTAX
-.HP
-.B Bool XkbSetDetectableAutorepeat
-.BI "(\^Display *" "display" "\^,"
-.BI "Bool " "detectable" "\^,"
-.BI "Bool *" "supported_rtrn" "\^);"
-.if n .ti +5n
-.if t .ti +.5i
-.SH ARGUMENTS
-.TP
-.I \- display
-connection to X server
-.TP
-.I \- detectable
-True => set DetectableAutorepeat
-.TP
-.I \- supported_rtrn
-backfilled True if DetectableAutorepeat supported
-.SH DESCRIPTION
-.LP
-Auto-repeat is the generation of multiple key events by a keyboard when the user
-presses a key and holds it down. Keyboard hardware and device-dependent X server
-software often implement auto-repeat by generating multiple KeyPress events with
-no intervening KeyRelease event. The standard behavior of the X server is to
-generate a KeyRelease event for every KeyPress event. If the keyboard hardware
-and device-dependent software of the X server implement auto-repeat by
-generating multiple KeyPress events, the device-independent part of the X server
-by default synthetically generates a KeyRelease event after each KeyPress event.
-This provides predictable behavior for X clients, but does not allow those
-clients to detect the fact that a key is auto-repeating.
-
-Xkb allows clients to request
-.I detectable auto-repeat.
-If a client requests and the server supports DetectableAutorepeat, Xkb generates
-KeyRelease events only when the key is physically released. If
-DetectableAutorepeat is not supported or has not been requested, the server
-synthesizes a KeyRelease event for each repeating KeyPress event it generates.
-
-DetectableAutorepeat, unlike other controls, is not contained in the
-XkbControlsRec structure, nor can it be enabled or disabled via the
-EnabledControls control. Instead, query and set DetectableAutorepeat using
-.I XkbGetDetectableAutorepeat
-and
-.I XkbSetDetectableAutorepeat.
-
-DetectableAutorepeat is a condition that applies to all keyboard devices for a
-client's connection to a given X server; it cannot be selectively set for some
-devices and not for others. For this reason, none of the Xkb library functions
-involving DetectableAutorepeat involve a device specifier.
-
-This request affects all keyboard activity for the requesting client only; other
-clients still see the expected nondetectable auto-repeat behavior, unless they
-have requested otherwise.
-
-.I XkbSetDetectableAutorepeat
-sends a request to the server to set DetectableAutorepeat on for the current
-client if
-.I detectable
-is True, and off if
-.I detectable
-is False; it then waits for a reply. If
-.I supported_rtrn
-is not NULL,
-.I XkbSetDetectableAutorepeat
-backfills
-.I supported_rtrn
-with True if the server supports DetectableAutorepeat, and False if it does not.
-.I XkbSetDetectableAutorepeat
-returns the current state of DetectableAutorepeat for the requesting client:
-True if DetectableAutorepeat is set, and False otherwise.
-.SH "RETURN VALUES"
-.TP 15
-True
-The
-.I XkbSetDetectableAutorepeat
-function returns True if DetectableAutorepeat is set.
-.TP 15
-False
-The
-.I XkbSetDetectableAutorepeat
-function returns False if DetectableAutorepeat is not set.
commit c9d5abefeb0d95c60d47643661abc5d52629ce16
Author: Dirk Wallenstein <dirkwallenstein@t-online.de>
Date: Fri Feb 5 20:42:46 2010 +0100
man: Correct the XkbAllAccessXEventsMask mask name
This mask has probably been renamed but not been updated in the manuals.
Signed-off-by: Dirk Wallenstein <dirkwallenstein@t-online.de>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
(cherry picked from commit 75c6c5595408caba9ef8233839d77021d02f86f2)
diff --git a/man/xkb/XkbGetBounceKeysDelay.man b/man/xkb/XkbGetBounceKeysDelay.man
index be1b19d..46a1532 100644
--- a/man/xkb/XkbGetBounceKeysDelay.man
+++ b/man/xkb/XkbGetBounceKeysDelay.man
@@ -143,7 +143,7 @@ T}
XkbAXN_AXKWarningMask (1<<6) T{
AccessX warning notification wanted
T}
-XkbAXN_AllEventsMask (0x7f) T{
+XkbAllAccessXEventsMask (0x7f) T{
All AccessX features notifications wanted
T}
.TE
diff --git a/man/xkb/XkbGetSlowKeysDelay.man b/man/xkb/XkbGetSlowKeysDelay.man
index 74c52d1..f81a3c3 100644
--- a/man/xkb/XkbGetSlowKeysDelay.man
+++ b/man/xkb/XkbGetSlowKeysDelay.man
@@ -163,7 +163,7 @@ T}
XkbAXN_AXKWarningMask (1<<6) T{
AccessX warning notification wanted
T}
-XkbAXN_AllEventsMask (0x7f) T{
+XkbAllAccessXEventsMask (0x7f) T{
All AccessX features notifications wanted
T}
.TE
diff --git a/man/xkb/XkbSetBounceKeysDelay.man b/man/xkb/XkbSetBounceKeysDelay.man
index 98cd1d5..c899133 100644
--- a/man/xkb/XkbSetBounceKeysDelay.man
+++ b/man/xkb/XkbSetBounceKeysDelay.man
@@ -141,7 +141,7 @@ T}
XkbAXN_AXKWarningMask (1<<6) T{
AccessX warning notification wanted
T}
-XkbAXN_AllEventsMask (0x7f) T{
+XkbAllAccessXEventsMask (0x7f) T{
All AccessX features notifications wanted
T}
.TE
commit fda7f8da950f0d5938ebdbd557bc428cd3cf567c
Author: Dirk Wallenstein <dirkwallenstein@t-online.de>
Date: Fri Feb 5 20:42:45 2010 +0100
man: Add missing geometry component flag
Signed-off-by: Dirk Wallenstein <dirkwallenstein@t-online.de>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
(cherry picked from commit 9262aceaff24c954cab8c252690032bc2ec25e7d)
diff --git a/man/xkb/XkbFreeGeometry.man b/man/xkb/XkbFreeGeometry.man
index 6ce7986..28e7560 100644
--- a/man/xkb/XkbFreeGeometry.man
+++ b/man/xkb/XkbFreeGeometry.man
@@ -71,7 +71,8 @@ are:
#define XkbGeomShapesMask (1<<2)
#define XkbGeomSectionsMask (1<<3)
#define XkbGeomDoodadsMask (1<<4)
- #define XkbGeomAllMask (0x1f)
+ #define XkbGeomKeyAliasesMask (1<<5)
+ #define XkbGeomAllMask (0x3f)
.fi
If
commit ecd45f3471d65fe433a75b3d571d45d4139f4813
Author: Dirk Wallenstein <halsmit@t-online.de>
Date: Tue Feb 2 21:24:32 2010 +0100
man: Return value of XkbGetState is Status and not Bool
Signed-off-by: Dirk Wallenstein <halsmit@t-online.de>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
(cherry picked from commit 50cf134465f6fd263f37acecac94518468ef1c6d)
diff --git a/man/xkb/XkbGetState.man b/man/xkb/XkbGetState.man
index d591b1e..42222e0 100644
--- a/man/xkb/XkbGetState.man
+++ b/man/xkb/XkbGetState.man
@@ -24,7 +24,7 @@
XkbGetState \- Obtains the keyboard state
.SH SYNOPSIS
.HP
-.B Bool XkbGetState
+.B Status XkbGetState
.BI "(\^Display *" "display" "\^,"
.BI "unsigned int " "device_spec" "\^,"
.BI "XkbStatePtr " "state_return" "\^);"
commit ff7d9d4aaed0142aaaf3556aab0c757a508f4a0d
Author: Dirk Wallenstein <halsmit@t-online.de>
Date: Tue Feb 2 21:24:30 2010 +0100
man: Fix return value specification of XkbKeyActionEntry
The XkbKeyActionEntry macro expands to a pointer.
Signed-off-by: Dirk Wallenstein <halsmit@t-online.de>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
(cherry picked from commit 7a93ae2bb5292a97fdd27ed818bc81248b37f641)
diff --git a/man/xkb/XkbKeyActionEntry.man b/man/xkb/XkbKeyActionEntry.man
index 5acc7e8..c62cc2f 100644
--- a/man/xkb/XkbKeyActionEntry.man
+++ b/man/xkb/XkbKeyActionEntry.man
@@ -21,13 +21,13 @@
.\"
.TH XkbKeyActionEntry __libmansuffix__ __xorgversion__ "XKB FUNCTIONS"
.SH NAME
-XkbKeyActionEntry \- Returns the key action corresponding to group grp and shift
-level lvl from the
-two-dimensional table of key actions associated with the key corresponding to
+XkbKeyActionEntry \- Returns a pointer to the key action corresponding to
+group grp and shift level lvl from the two-dimensional table of key actions
+associated with the key corresponding to
keycode
.SH SYNOPSIS
.HP
-.B XkbAction XkbKeyActionEntry
+.B XkbAction * XkbKeyActionEntry
.BI "(\^XkbDescPtr " "xkb" "\^,"
.BI "KeyCode " "keycode" "\^,"
.BI "int " "shift" "\^,"
commit 39645604e973fea8bc294b6f9def3abde0c2d4be
Author: Dirk Wallenstein <halsmit@t-online.de>
Date: Tue Feb 2 21:24:29 2010 +0100
man: Redirect users from XKeycodeToKeysym to XkbKeycodeToKeysym #25732
XKeycodeToKeysym keeps compatibility with pre-XKB and thus only sees 2
groups with 2 levels each. It wraps the index into the next group.
This behavior confuses the unaware user, and therefore this will add a
reference to XkbKeycodeToKeysym in the corresponding man paragraph.
Another bug had that issue, too. #5349
Signed-off-by: Dirk Wallenstein <halsmit@t-online.de>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
(cherry picked from commit e9884d4a05a5661ec343ea8a2aa0562b6419e086)
diff --git a/man/XStringToKeysym.man b/man/XStringToKeysym.man
index 62212db..067765b 100644
--- a/man/XStringToKeysym.man
+++ b/man/XStringToKeysym.man
@@ -202,6 +202,10 @@ If no symbol is defined,
.ZN XKeycodeToKeysym
returns
.ZN NoSymbol .
+.ZN XKeycodeToKeysym
+predates the XKB extension. If you want to lookup a KeySym while
+using XKB you have to use
+.ZN XkbKeycodeToKeysym .
.LP
If the specified KeySym is not defined for any KeyCode,
Reply to: