From: Dirk Wallenstein <dirkwallenst...@t-online.de>
Use the (next - 1) specification scheme like in the source code
Signed-off-by: Dirk Wallenstein <dirkwallenst...@t-online.de>
---
One of the hunks relies on this patch from Tue, 2 Feb 2010 21:24:28 +0100.
"[PATCH libX11 3/4] man: Fix value of XkbAllComponentsMask in XkbGetKeyboard"
I think it's alright to keep that fix separate - then this patch only covers
the transition of the specification.
man/xkb/XkbAllocCompatMap.man | 2 +-
man/xkb/XkbAllocControls.man | 4 ++--
man/xkb/XkbAllocNames.man | 4 ++--
man/xkb/XkbChangeControls.man | 4 ++--
man/xkb/XkbChangeEnabledControls.man | 4 ++--
man/xkb/XkbChangeNames.man | 4 ++--
man/xkb/XkbFreeClientMap.man | 2 +-
man/xkb/XkbFreeCompatMap.man | 4 ++--
man/xkb/XkbFreeControls.man | 4 ++--
man/xkb/XkbFreeDeviceInfo.man | 2 +-
man/xkb/XkbFreeGeometry.man | 2 +-
man/xkb/XkbFreeNames.man | 4 ++--
man/xkb/XkbFreeServerMap.man | 2 +-
man/xkb/XkbGetBounceKeysDelay.man | 2 +-
man/xkb/XkbGetCompatMap.man | 2 +-
man/xkb/XkbGetControls.man | 4 ++--
man/xkb/XkbGetControlsChanges.man | 4 ++--
man/xkb/XkbGetDeviceInfo.man | 2 +-
man/xkb/XkbGetKeyboard.man | 2 +-
man/xkb/XkbGetKeyboardByName.man | 4 ++--
man/xkb/XkbGetMap.man | 2 +-
man/xkb/XkbGetNames.man | 4 ++--
man/xkb/XkbGetSlowKeysDelay.man | 2 +-
man/xkb/XkbGetUpdatedMap.man | 2 +-
man/xkb/XkbGetVirtualMods.man | 2 +-
man/xkb/XkbNoteControlsChanges.man | 4 ++--
man/xkb/XkbNoteDeviceChanges.man | 2 +-
man/xkb/XkbNoteNameChanges.man | 4 ++--
man/xkb/XkbSelectEvents.man | 2 +-
man/xkb/XkbSetAccessXTimeout.man | 2 +-
man/xkb/XkbSetBounceKeysDelay.man | 2 +-
man/xkb/XkbSetCompatMap.man | 4 ++--
man/xkb/XkbSetControls.man | 4 ++--
man/xkb/XkbSetDeviceInfo.man | 2 +-
man/xkb/XkbSetIgnoreLockMods.man | 2 +-
man/xkb/XkbSetMap.man | 2 +-
man/xkb/XkbSetNames.man | 4 ++--
man/xkb/XkbSetServerInternalMods.man | 2 +-
38 files changed, 55 insertions(+), 55 deletions(-)
diff --git a/man/xkb/XkbAllocCompatMap.man b/man/xkb/XkbAllocCompatMap.man
index f21d379..b24c1dc 100644
--- a/man/xkb/XkbAllocCompatMap.man
+++ b/man/xkb/XkbAllocCompatMap.man
@@ -62,7 +62,7 @@ Mask Value Affecting
_
XkbSymInterpMask (1<<0) Symbol interpretations
XkbGroupCompatMask (1<<1) Group maps
-XkbAllCompatMask (0x3) All compatibility map components
+XkbAllCompatMask ((1<<2)-1) All compatibility map components
.TE
.I num_si
diff --git a/man/xkb/XkbAllocControls.man b/man/xkb/XkbAllocControls.man
index 490a510..6df76ec 100644
--- a/man/xkb/XkbAllocControls.man
+++ b/man/xkb/XkbAllocControls.man
@@ -115,8 +115,8 @@ XkbPerKeyRepeatMask ok (1L<<30)
XkbControlsEnabledMask ok (1L<<31)
XkbAccessXOptionsMask ok ok (XkbStickyKeysMask |
XkbAccessXFeedbackMask)
-XkbAllBooleanCtrlsMask ok (0x00001FFF)
-XkbAllControlsMask ok (0xF8001FFF)
+XkbAllBooleanCtrlsMask ok ((1L<<13)-1)
+XkbAllControlsMask ok (0xF8000000|XkbAllBooleanCtrlsMask)
.TE
.nh
.SH "RETURN VALUES"
diff --git a/man/xkb/XkbAllocNames.man b/man/xkb/XkbAllocNames.man
index 9084713..4446d0d 100644
--- a/man/xkb/XkbAllocNames.man
+++ b/man/xkb/XkbAllocNames.man
@@ -85,13 +85,13 @@ XkbKeyAliasesMask (1<<10) Xkb->names key_aliases[*],
num_key_aliases
XkbVirtualModNamesMask (1<<11) Xkb->names vmods[*]
XkbGroupNamesMask (1<<12) Xkb->names groups[*]
XkbRGNamesMask (1<<13) Xkb->names radio_groups[*], num_rg
-XkbComponentNamesMask (0x3f) Xkb->names keycodes,
+XkbComponentNamesMask ((1<<6)-1) Xkb->names keycodes,
geometry,
symbols,
physical symbols,
types, and
compatibility map
-XkbAllNamesMask (0x3fff) Xkb->names all name components
+XkbAllNamesMask ((1<<14)-1) Xkb->names all name components
.TE
Do not free symbolic names structures directly using
diff --git a/man/xkb/XkbChangeControls.man b/man/xkb/XkbChangeControls.man
index 4f09107..b483350 100644
--- a/man/xkb/XkbChangeControls.man
+++ b/man/xkb/XkbChangeControls.man
@@ -283,8 +283,8 @@ XkbPerKeyRepeatMask ok (1L<<30)
XkbControlsEnabledMask ok (1L<<31)
XkbAccessXOptionsMask ok ok (XkbStickyKeysMask |
XkbAccessXFeedbackMask)
-XkbAllBooleanCtrlsMask ok (0x00001FFF)
-XkbAllControlsMask ok (0xF8001FFF)
+XkbAllBooleanCtrlsMask ok ((1L<<13)-1)
+XkbAllControlsMask ok (0xF8000000|XkbAllBooleanCtrlsMask)
.TE
diff --git a/man/xkb/XkbChangeEnabledControls.man
b/man/xkb/XkbChangeEnabledControls.man
index edda2bb..394a938 100644
--- a/man/xkb/XkbChangeEnabledControls.man
+++ b/man/xkb/XkbChangeEnabledControls.man
@@ -90,8 +90,8 @@ XkbPerKeyRepeatMask ok (1L<<30)
XkbControlsEnabledMask ok (1L<<31)
XkbAccessXOptionsMask ok ok (XkbStickyKeysMask |
XkbAccessXFeedbackMask)
-XkbAllBooleanCtrlsMask ok (0x00001FFF)
-XkbAllControlsMask ok (0xF8001FFF)
+XkbAllBooleanCtrlsMask ok ((1L<<13)-1)
+XkbAllControlsMask ok (0xF8000000|XkbAllBooleanCtrlsMask)
.TE
The
diff --git a/man/xkb/XkbChangeNames.man b/man/xkb/XkbChangeNames.man
index a52106e..595d5d1 100644
--- a/man/xkb/XkbChangeNames.man
+++ b/man/xkb/XkbChangeNames.man
@@ -136,13 +136,13 @@ XkbKeyAliasesMask (1<<10) Xkb->names key_aliases[*],
num_key_aliases
XkbVirtualModNamesMask (1<<11) Xkb->names vmods[*]
XkbGroupNamesMask (1<<12) Xkb->names groups[*]
XkbRGNamesMask (1<<13) Xkb->names radio_groups[*], num_rg
-XkbComponentNamesMask (0x3f) Xkb->names keycodes,
+XkbComponentNamesMask ((1<<6)-1) Xkb->names keycodes,
geometry,
symbols,
physical symbols,
types, and
compatibility map
-XkbAllNamesMask (0x3fff) Xkb->names all name components
+XkbAllNamesMask ((1<<14)-1) Xkb->names all name components
.TE
.TS
diff --git a/man/xkb/XkbFreeClientMap.man b/man/xkb/XkbFreeClientMap.man
index fa8fea4..bc691cc 100644
--- a/man/xkb/XkbFreeClientMap.man
+++ b/man/xkb/XkbFreeClientMap.man
@@ -171,7 +171,7 @@ XkbIndicatorMapMask indicators (1L<<3)
XkbNamesMask names (1L<<4)
XkbCompatMapMask compat (1L<<5)
XkbGeometryMask geom (1L<<6)
-XkbAllComponentsMask All Fields (0x7f)
+XkbAllComponentsMask All Fields ((1L<<7)-1)
.TE
The
diff --git a/man/xkb/XkbFreeCompatMap.man b/man/xkb/XkbFreeCompatMap.man
index c98554d..ea34ae3 100644
--- a/man/xkb/XkbFreeCompatMap.man
+++ b/man/xkb/XkbFreeCompatMap.man
@@ -57,7 +57,7 @@ Mask Value Affecting
_
XkbSymInterpMask (1<<0) Symbol interpretations
XkbGroupCompatMask (1<<1) Group maps
-XkbAllCompatMask (0x3) All compatibility map components
+XkbAllCompatMask ((1<<2)-1) All compatibility map components
.TE
.I free_map
@@ -158,7 +158,7 @@ XkbIndicatorMapMask indicators (1L<<3)
XkbNamesMask names (1L<<4)
XkbCompatMapMask compat (1L<<5)
XkbGeometryMask geom (1L<<6)
-XkbAllComponentsMask All Fields (0x7f)
+XkbAllComponentsMask All Fields ((1L<<7)-1)
.TE
.SH "SEE ALSO"
.BR XkbGetCompatMap (__libmansuffix__)
diff --git a/man/xkb/XkbFreeControls.man b/man/xkb/XkbFreeControls.man
index 4648a0b..4be3267 100644
--- a/man/xkb/XkbFreeControls.man
+++ b/man/xkb/XkbFreeControls.man
@@ -96,8 +96,8 @@ XkbPerKeyRepeatMask ok (1L<<30)
XkbControlsEnabledMask ok (1L<<31)
XkbAccessXOptionsMask ok ok (XkbStickyKeysMask |
XkbAccessXFeedbackMask)
-XkbAllBooleanCtrlsMask ok (0x00001FFF)
-XkbAllControlsMask ok (0xF8001FFF)
+XkbAllBooleanCtrlsMask ok ((1L<<13)-1)
+XkbAllControlsMask ok (0xF8000000|XkbAllBooleanCtrlsMask)
.TE
If
diff --git a/man/xkb/XkbFreeDeviceInfo.man b/man/xkb/XkbFreeDeviceInfo.man
index 06e8555..0f0ba2a 100644
--- a/man/xkb/XkbFreeDeviceInfo.man
+++ b/man/xkb/XkbFreeDeviceInfo.man
@@ -132,7 +132,7 @@ XkbXI_AllDeviceFeaturesMask Those selected (0x1e)
XkbXI_IndicatorsMask |
by Value Column XkbSI_ButtonActionsMask
masks
-XkbXI_AllFeaturesMask Those selected (0x1f)
XkbSI_AllDeviceFeaturesMask |
+XkbXI_AllFeaturesMask Those selected ((1<<5)-1)
XkbSI_AllDeviceFeaturesMask |
by Value Column XkbSI_KeyboardsMask
masks
diff --git a/man/xkb/XkbFreeGeometry.man b/man/xkb/XkbFreeGeometry.man
index 28e7560..6c0b28b 100644
--- a/man/xkb/XkbFreeGeometry.man
+++ b/man/xkb/XkbFreeGeometry.man
@@ -72,7 +72,7 @@ are:
#define XkbGeomSectionsMask (1<<3)
#define XkbGeomDoodadsMask (1<<4)
#define XkbGeomKeyAliasesMask (1<<5)
- #define XkbGeomAllMask (0x3f)
+ #define XkbGeomAllMask ((1<<6)-1)
.fi
If
diff --git a/man/xkb/XkbFreeNames.man b/man/xkb/XkbFreeNames.man
index 7fc3dcd..9991f55 100644
--- a/man/xkb/XkbFreeNames.man
+++ b/man/xkb/XkbFreeNames.man
@@ -83,11 +83,11 @@ XkbKeyAliasesMask (1<<10) Xkb->names key_aliases[*],
num_key_aliases
XkbVirtualModNamesMask (1<<11) Xkb->names vmods[*]
XkbGroupNamesMask (1<<12) Xkb->names groups[*]
XkbRGNamesMask (1<<13) Xkb->names radio_groups[*], num_rg
-XkbComponentNamesMask (0x3f) Xkb->names keycodes,
+XkbComponentNamesMask ((1<<6)-1) Xkb->names keycodes,
geometry,
symbols,
physical symbols,
types, and
compatibility map
-XkbAllNamesMask (0x3fff) Xkb->names all name components
+XkbAllNamesMask ((1<<14)-1) Xkb->names all name components
.TE
diff --git a/man/xkb/XkbFreeServerMap.man b/man/xkb/XkbFreeServerMap.man
index 8a50b06..f48f558 100644
--- a/man/xkb/XkbFreeServerMap.man
+++ b/man/xkb/XkbFreeServerMap.man
@@ -163,7 +163,7 @@ XkbIndicatorMapMask indicators (1L<<3)
XkbNamesMask names (1L<<4)
XkbCompatMapMask compat (1L<<5)
XkbGeometryMask geom (1L<<6)
-XkbAllComponentsMask All Fields (0x7f)
+XkbAllComponentsMask All Fields ((1L<<7)-1)
.TE
The Xkb server map contains the information the server needs to interpret key
diff --git a/man/xkb/XkbGetBounceKeysDelay.man
b/man/xkb/XkbGetBounceKeysDelay.man
index 46a1532..9897e75 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}
-XkbAllAccessXEventsMask (0x7f) T{
+XkbAllAccessXEventsMask ((1<<7)-1) T{
All AccessX features notifications wanted
T}
.TE
diff --git a/man/xkb/XkbGetCompatMap.man b/man/xkb/XkbGetCompatMap.man
index 63c77da..43f4c8d 100644
--- a/man/xkb/XkbGetCompatMap.man
+++ b/man/xkb/XkbGetCompatMap.man
@@ -76,7 +76,7 @@ Mask Value Affecting
_
XkbSymInterpMask (1<<0) Symbol interpretations
XkbGroupCompatMask (1<<1) Group maps
-XkbAllCompatMask (0x3) All compatibility map components
+XkbAllCompatMask ((1<<2)-1) All compatibility map components
.TE
If no compatibility map structure is allocated in
diff --git a/man/xkb/XkbGetControls.man b/man/xkb/XkbGetControls.man
index 540ebac..64e8b0d 100644
--- a/man/xkb/XkbGetControls.man
+++ b/man/xkb/XkbGetControls.man
@@ -99,8 +99,8 @@ XkbPerKeyRepeatMask ok (1L<<30)
XkbControlsEnabledMask ok (1L<<31)
XkbAccessXOptionsMask ok ok (XkbStickyKeysMask |
XkbAccessXFeedbackMask)
-XkbAllBooleanCtrlsMask ok (0x00001FFF)
-XkbAllControlsMask ok (0xF8001FFF)
+XkbAllBooleanCtrlsMask ok ((1L<<13)-1)
+XkbAllControlsMask ok (0xF8000000|XkbAllBooleanCtrlsMask)
.TE
diff --git a/man/xkb/XkbGetControlsChanges.man
b/man/xkb/XkbGetControlsChanges.man
index 20512a4..19c39c5 100644
--- a/man/xkb/XkbGetControlsChanges.man
+++ b/man/xkb/XkbGetControlsChanges.man
@@ -105,8 +105,8 @@ XkbPerKeyRepeatMask ok (1L<<30)
XkbControlsEnabledMask ok (1L<<31)
XkbAccessXOptionsMask ok ok (XkbStickyKeysMask |
XkbAccessXFeedbackMask)
-XkbAllBooleanCtrlsMask ok (0x00001FFF)
-XkbAllControlsMask ok (0xF8001FFF)
+XkbAllBooleanCtrlsMask ok ((1L<<13)-1)
+XkbAllControlsMask ok (0xF8000000|XkbAllBooleanCtrlsMask)
.TE
The
diff --git a/man/xkb/XkbGetDeviceInfo.man b/man/xkb/XkbGetDeviceInfo.man
index d1ae24d..74d0ad8 100644
--- a/man/xkb/XkbGetDeviceInfo.man
+++ b/man/xkb/XkbGetDeviceInfo.man
@@ -116,7 +116,7 @@ XkbXI_AllDeviceFeaturesMask Those selected (0x1e)
XkbXI_IndicatorsMask |
by Value Column XkbSI_ButtonActionsMask
masks
-XkbXI_AllFeaturesMask Those selected (0x1f)
XkbSI_AllDeviceFeaturesMask |
+XkbXI_AllFeaturesMask Those selected ((1<<5)-1)
XkbSI_AllDeviceFeaturesMask |
by Value Column XkbSI_KeyboardsMask
masks
diff --git a/man/xkb/XkbGetKeyboard.man b/man/xkb/XkbGetKeyboard.man
index 0ae0715..0a879ce 100644
--- a/man/xkb/XkbGetKeyboard.man
+++ b/man/xkb/XkbGetKeyboard.man
@@ -73,7 +73,7 @@ XkbIndicatorMapMask indicators (1L<<3)
XkbNamesMask names (1L<<4)
XkbCompatMapMask compat (1L<<5)
XkbGeometryMask geom (1L<<6)
-XkbAllComponentsMask All Fields (0x7f)
+XkbAllComponentsMask All Fields ((1L<<7)-1)
.TE
.I XkbGetKeyboard
diff --git a/man/xkb/XkbGetKeyboardByName.man b/man/xkb/XkbGetKeyboardByName.man
index 6c0eeee..7eeb002 100644
--- a/man/xkb/XkbGetKeyboardByName.man
+++ b/man/xkb/XkbGetKeyboardByName.man
@@ -201,7 +201,7 @@ XkbGBN_IndicatorMapMask Compat (1L<<4)
XkbGBN_KeyNamesMask Keycodes (1L<<5)
XkbGBN_GeometryMask Geometry (1L<<6)
XkbGBN_OtherNamesMask Types + Symbols + Keycodes + Compat + Geometry (1L<<7)
-XkbGBN_AllComponentsMask (0xff)
+XkbGBN_AllComponentsMask ((1L<<8)-1)
.TE
.I need
@@ -372,7 +372,7 @@ XkbIndicatorMapMask indicators (1L<<3)
XkbNamesMask names (1L<<4)
XkbCompatMapMask compat (1L<<5)
XkbGeometryMask geom (1L<<6)
-XkbAllComponentsMask All Fields (0x7f)
+XkbAllComponentsMask All Fields ((1L<<7)-1)
.TE
.SH DIAGNOSTICS
.TP 15
diff --git a/man/xkb/XkbGetMap.man b/man/xkb/XkbGetMap.man
index 753d44c..eba6c60 100644
--- a/man/xkb/XkbGetMap.man
+++ b/man/xkb/XkbGetMap.man
@@ -294,7 +294,7 @@ XkbIndicatorMapMask indicators (1L<<3)
XkbNamesMask names (1L<<4)
XkbCompatMapMask compat (1L<<5)
XkbGeometryMask geom (1L<<6)
-XkbAllComponentsMask All Fields (0x7f)
+XkbAllComponentsMask All Fields ((1L<<7)-1)
.TE
.SH "SEE ALSO"
.BR XkbChangeTypesOfKey (__libmansuffix__),
diff --git a/man/xkb/XkbGetNames.man b/man/xkb/XkbGetNames.man
index 186aab1..c0ab21f 100644
--- a/man/xkb/XkbGetNames.man
+++ b/man/xkb/XkbGetNames.man
@@ -73,13 +73,13 @@ XkbKeyAliasesMask (1<<10) Xkb->names key_aliases[*],
num_key_aliases
XkbVirtualModNamesMask (1<<11) Xkb->names vmods[*]
XkbGroupNamesMask (1<<12) Xkb->names groups[*]
XkbRGNamesMask (1<<13) Xkb->names radio_groups[*], num_rg
-XkbComponentNamesMask (0x3f) Xkb->names keycodes,
+XkbComponentNamesMask ((1<<6)-1) Xkb->names keycodes,
geometry,
symbols,
physical symbols,
types, and
compatibility map
-XkbAllNamesMask (0x3fff) Xkb->names all name components
+XkbAllNamesMask ((1<<14)-1) Xkb->names all name components
.TE
If the
diff --git a/man/xkb/XkbGetSlowKeysDelay.man b/man/xkb/XkbGetSlowKeysDelay.man
index f81a3c3..434e825 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}
-XkbAllAccessXEventsMask (0x7f) T{
+XkbAllAccessXEventsMask ((1<<7)-1) T{
All AccessX features notifications wanted
T}
.TE
diff --git a/man/xkb/XkbGetUpdatedMap.man b/man/xkb/XkbGetUpdatedMap.man
index ec49466..8e0938c 100644
--- a/man/xkb/XkbGetUpdatedMap.man
+++ b/man/xkb/XkbGetUpdatedMap.man
@@ -233,7 +233,7 @@ XkbIndicatorMapMask indicators (1L<<3)
XkbNamesMask names (1L<<4)
XkbCompatMapMask compat (1L<<5)
XkbGeometryMask geom (1L<<6)
-XkbAllComponentsMask All Fields (0x7f)
+XkbAllComponentsMask All Fields ((1L<<7)-1)
.TE
.SH DIAGNOSTICS
.TP 15
diff --git a/man/xkb/XkbGetVirtualMods.man b/man/xkb/XkbGetVirtualMods.man
index 169bd60..479f801 100644
--- a/man/xkb/XkbGetVirtualMods.man
+++ b/man/xkb/XkbGetVirtualMods.man
@@ -193,7 +193,7 @@ XkbIndicatorMapMask indicators (1L<<3)
XkbNamesMask names (1L<<4)
XkbCompatMapMask compat (1L<<5)
XkbGeometryMask geom (1L<<6)
-XkbAllComponentsMask All Fields (0x7f)
+XkbAllComponentsMask All Fields ((1L<<7)-1)
.TE
.SH DIAGNOSTICS
.TP 15
diff --git a/man/xkb/XkbNoteControlsChanges.man
b/man/xkb/XkbNoteControlsChanges.man
index 733f160..af726bf 100644
--- a/man/xkb/XkbNoteControlsChanges.man
+++ b/man/xkb/XkbNoteControlsChanges.man
@@ -105,8 +105,8 @@ XkbPerKeyRepeatMask ok (1L<<30)
XkbControlsEnabledMask ok (1L<<31)
XkbAccessXOptionsMask ok ok (XkbStickyKeysMask |
XkbAccessXFeedbackMask)
-XkbAllBooleanCtrlsMask ok (0x00001FFF)
-XkbAllControlsMask ok (0xF8001FFF)
+XkbAllBooleanCtrlsMask ok ((1L<<13)-1)
+XkbAllControlsMask ok (0xF8000000|XkbAllBooleanCtrlsMask)
.TE
The
diff --git a/man/xkb/XkbNoteDeviceChanges.man b/man/xkb/XkbNoteDeviceChanges.man
index 5d65035..edfdc36 100644
--- a/man/xkb/XkbNoteDeviceChanges.man
+++ b/man/xkb/XkbNoteDeviceChanges.man
@@ -103,7 +103,7 @@ XkbXI_AllDeviceFeaturesMask Those selected (0x1e)
XkbXI_IndicatorsMask |
by Value Column XkbSI_ButtonActionsMask
masks
-XkbXI_AllFeaturesMask Those selected (0x1f)
XkbSI_AllDeviceFeaturesMask |
+XkbXI_AllFeaturesMask Those selected ((1<<5)-1)
XkbSI_AllDeviceFeaturesMask |
by Value Column XkbSI_KeyboardsMask
masks
diff --git a/man/xkb/XkbNoteNameChanges.man b/man/xkb/XkbNoteNameChanges.man
index 8727e26..6b40562 100644
--- a/man/xkb/XkbNoteNameChanges.man
+++ b/man/xkb/XkbNoteNameChanges.man
@@ -81,12 +81,12 @@ XkbKeyAliasesMask (1<<10) Xkb->names key_aliases[*],
num_key_aliases
XkbVirtualModNamesMask (1<<11) Xkb->names vmods[*]
XkbGroupNamesMask (1<<12) Xkb->names groups[*]
XkbRGNamesMask (1<<13) Xkb->names radio_groups[*], num_rg
-XkbComponentNamesMask (0x3f) Xkb->names keycodes,
+XkbComponentNamesMask ((1<<6)-1) Xkb->names keycodes,
geometry,
symbols,
physical symbols,
types, and
compatibility map
-XkbAllNamesMask (0x3fff) Xkb->names all name components
+XkbAllNamesMask ((1<<14)-1) Xkb->names all name components
.TE
diff --git a/man/xkb/XkbSelectEvents.man b/man/xkb/XkbSelectEvents.man
index 4d605e8..aeae656 100644
--- a/man/xkb/XkbSelectEvents.man
+++ b/man/xkb/XkbSelectEvents.man
@@ -132,7 +132,7 @@ XkbBellNotifyMask (1L<<8) Bell
XkbActionMessageMask (1L<<9) Action message
XkbAccessXNotifyMask (1L<<10) AccessX features
XkbExtensionDeviceNotifyMask (1L<<11) Extension device
-XkbAllEventsMask (0xFFF) All Xkb events
+XkbAllEventsMask ((1L<<12)-1) All Xkb events
.TE
If a bit is not set in the
diff --git a/man/xkb/XkbSetAccessXTimeout.man b/man/xkb/XkbSetAccessXTimeout.man
index 74f28cc..48cdd6c 100644
--- a/man/xkb/XkbSetAccessXTimeout.man
+++ b/man/xkb/XkbSetAccessXTimeout.man
@@ -164,7 +164,7 @@ XkbIndicatorMapMask indicators (1L<<3)
XkbNamesMask names (1L<<4)
XkbCompatMapMask compat (1L<<5)
XkbGeometryMask geom (1L<<6)
-XkbAllComponentsMask All Fields (0x7f)
+XkbAllComponentsMask All Fields ((1L<<7)-1)
.TE
The structure for the XkbControlsNotify event is defined as follows:
diff --git a/man/xkb/XkbSetBounceKeysDelay.man
b/man/xkb/XkbSetBounceKeysDelay.man
index c899133..85b396f 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}
-XkbAllAccessXEventsMask (0x7f) T{
+XkbAllAccessXEventsMask ((1<<7)-1) T{
All AccessX features notifications wanted
T}
.TE
diff --git a/man/xkb/XkbSetCompatMap.man b/man/xkb/XkbSetCompatMap.man
index a16428f..e6157c1 100644
--- a/man/xkb/XkbSetCompatMap.man
+++ b/man/xkb/XkbSetCompatMap.man
@@ -86,7 +86,7 @@ Mask Value Affecting
_
XkbSymInterpMask (1<<0) Symbol interpretations
XkbGroupCompatMask (1<<1) Group maps
-XkbAllCompatMask (0x3) All compatibility map components
+XkbAllCompatMask ((1<<2)-1) All compatibility map components
.TE
After updating its compatibility map for the specified device, if
@@ -183,7 +183,7 @@ XkbIndicatorMapMask indicators (1L<<3)
XkbNamesMask names (1L<<4)
XkbCompatMapMask compat (1L<<5)
XkbGeometryMask geom (1L<<6)
-XkbAllComponentsMask All Fields (0x7f)
+XkbAllComponentsMask All Fields ((1L<<7)-1)
.TE
The XkbSymInterpretRec structure specifies a symbol interpretation:
diff --git a/man/xkb/XkbSetControls.man b/man/xkb/XkbSetControls.man
index cf927dd..a1cd7d8 100644
--- a/man/xkb/XkbSetControls.man
+++ b/man/xkb/XkbSetControls.man
@@ -98,8 +98,8 @@ XkbPerKeyRepeatMask ok (1L<<30)
XkbControlsEnabledMask ok (1L<<31)
XkbAccessXOptionsMask ok ok (XkbStickyKeysMask |
XkbAccessXFeedbackMask)
-XkbAllBooleanCtrlsMask ok (0x00001FFF)
-XkbAllControlsMask ok (0xF8001FFF)
+XkbAllBooleanCtrlsMask ok ((1L<<13)-1)
+XkbAllControlsMask ok (0xF8000000|XkbAllBooleanCtrlsMask)
.TE
If
diff --git a/man/xkb/XkbSetDeviceInfo.man b/man/xkb/XkbSetDeviceInfo.man
index a51e32d..50393d5 100644
--- a/man/xkb/XkbSetDeviceInfo.man
+++ b/man/xkb/XkbSetDeviceInfo.man
@@ -107,7 +107,7 @@ XkbXI_AllDeviceFeaturesMask Those selected (0x1e)
XkbXI_IndicatorsMask |
by Value Column XkbSI_ButtonActionsMask
masks
-XkbXI_AllFeaturesMask Those selected (0x1f)
XkbSI_AllDeviceFeaturesMask |
+XkbXI_AllFeaturesMask Those selected ((1<<5)-1)
XkbSI_AllDeviceFeaturesMask |
by Value Column XkbSI_KeyboardsMask
masks
diff --git a/man/xkb/XkbSetIgnoreLockMods.man b/man/xkb/XkbSetIgnoreLockMods.man
index 427ef49..0a38850 100644
--- a/man/xkb/XkbSetIgnoreLockMods.man
+++ b/man/xkb/XkbSetIgnoreLockMods.man
@@ -186,7 +186,7 @@ XkbIndicatorMapMask indicators (1L<<3)
XkbNamesMask names (1L<<4)
XkbCompatMapMask compat (1L<<5)
XkbGeometryMask geom (1L<<6)
-XkbAllComponentsMask All Fields (0x7f)
+XkbAllComponentsMask All Fields ((1L<<7)-1)
.SH "SEE ALSO"
.BR XkbGetControls (__libmansuffix__),
.BR XkbGetNames (__libmansuffix__),
diff --git a/man/xkb/XkbSetMap.man b/man/xkb/XkbSetMap.man
index 0d7c1b9..1c082b3 100644
--- a/man/xkb/XkbSetMap.man
+++ b/man/xkb/XkbSetMap.man
@@ -352,7 +352,7 @@ XkbIndicatorMapMask indicators (1L<<3)
XkbNamesMask names (1L<<4)
XkbCompatMapMask compat (1L<<5)
XkbGeometryMask geom (1L<<6)
-XkbAllComponentsMask All Fields (0x7f)
+XkbAllComponentsMask All Fields ((1L<<7)-1)
.TE
.SH DIAGNOSTICS
.TP 15
diff --git a/man/xkb/XkbSetNames.man b/man/xkb/XkbSetNames.man
index e609d8c..0320f8e 100644
--- a/man/xkb/XkbSetNames.man
+++ b/man/xkb/XkbSetNames.man
@@ -158,13 +158,13 @@ XkbKeyAliasesMask (1<<10) Xkb->names key_aliases[*],
num_key_aliases
XkbVirtualModNamesMask (1<<11) Xkb->names vmods[*]
XkbGroupNamesMask (1<<12) Xkb->names groups[*]
XkbRGNamesMask (1<<13) Xkb->names radio_groups[*], num_rg
-XkbComponentNamesMask (0x3f) Xkb->names keycodes,
+XkbComponentNamesMask ((1<<6)-1) Xkb->names keycodes,
geometry,
symbols,
physical symbols,
types, and
compatibility map
-XkbAllNamesMask (0x3fff) Xkb->names all name components
+XkbAllNamesMask ((1<<14)-1) Xkb->names all name components
.TE
.TS
diff --git a/man/xkb/XkbSetServerInternalMods.man
b/man/xkb/XkbSetServerInternalMods.man
index 6cc24bb..3ccc567 100644
--- a/man/xkb/XkbSetServerInternalMods.man
+++ b/man/xkb/XkbSetServerInternalMods.man
@@ -190,7 +190,7 @@ XkbIndicatorMapMask indicators (1L<<3)
XkbNamesMask names (1L<<4)
XkbCompatMapMask compat (1L<<5)
XkbGeometryMask geom (1L<<6)
-XkbAllComponentsMask All Fields (0x7f)
+XkbAllComponentsMask All Fields ((1L<<7)-1)
.SH "SEE ALSO"
.BR XkbGetControls (__libmansuffix__),
.BR XkbGetNames (__libmansuffix__),
--
1.6.5.3
_______________________________________________
xorg-devel mailing list
xorg-devel@lists.x.org
http://lists.x.org/mailman/listinfo/xorg-devel
