[Xcb] [PATCH proto 3/3] xkb: Remove incorrect Control enum comment

Daniel Martin consume.noise at gmail.com
Wed Aug 14 13:52:48 PDT 2013


On Mon, Aug 12, 2013 at 03:46:18PM +0300, Ran Benita wrote:
> The spec says:
> http://www.x.org/releases/current/doc/kbproto/xkbproto.html#appD::Common_Types
> 
>     SETofKB_CONTROL
>         Encodings are the same as for SETofKB_BOOLCTRL, with the addition of:
>         #x080000000                  XkbGroupsWrap
>         #x100000000                  XkbInternalMods
>         #x200000000                  XkbIgnoreLockMods
>         #x400000000                  XkbPerKeyRepeat
>         #x800000000                  XkbControlsEnabled
> 
> And Xlib:
> /usr/include/X11/extensions/XKB.h
> 
>     #define	XkbGroupsWrapMask	 (1L << 27)
>     #define	XkbInternalModsMask	 (1L << 28)
>     #define	XkbIgnoreLockModsMask	 (1L << 29)
>     #define	XkbPerKeyRepeatMask	 (1L << 30)
>     #define	XkbControlsEnabledMask	 (1L << 31)
> 
> Which is the same.
> 
> Signed-off-by: Ran Benita <ran234 at gmail.com>
> ---
>  src/xkb.xml | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/src/xkb.xml b/src/xkb.xml
> index b702cad..8bcb11a 100644
> --- a/src/xkb.xml
> +++ b/src/xkb.xml
> @@ -120,8 +120,6 @@ authorization from the authors.
>  		<item name="IgnoreGroupLockMask">  <bit>12</bit> </item>
>  	</enum>
>  
> -	<!-- XXX: one zero less than XKB specification says,
> -	          uses the same values as libX11 -->
>  	<enum name="Control" >
>  		<item name="GroupsWrap">      <bit>27</bit> </item>
>  		<item name="InternalMods">    <bit>28</bit> </item>
> -- 
> 1.8.3.4

NAK. The comment seems correct to me:
    echo "$((0x080000000)) vs. $((1<<27))"


More information about the Xcb mailing list