From a014bb4cc013b0d1b76524b7868e860c7e7ebc79 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Wed, 9 Jul 2014 23:30:54 -0700 Subject: [PATCH] specs/XKB: Markup symbol names in table entries too Signed-off-by: Alan Coopersmith --- specs/XKB/ch01.xml | 2 +- specs/XKB/ch05.xml | 38 +++++----- specs/XKB/ch06.xml | 14 ++-- specs/XKB/ch08.xml | 42 +++++------ specs/XKB/ch10.xml | 174 ++++++++++++++++++++++----------------------- specs/XKB/ch11.xml | 16 ++--- specs/XKB/ch14.xml | 14 ++-- specs/XKB/ch15.xml | 18 ++--- specs/XKB/ch18.xml | 48 ++++++------- specs/XKB/ch20.xml | 34 ++++----- specs/XKB/ch21.xml | 20 +++--- specs/XKB/ch22.xml | 2 +- 12 files changed, 211 insertions(+), 211 deletions(-) diff --git a/specs/XKB/ch01.xml b/specs/XKB/ch01.xml index 9fe5cf60..8a47f07c 100644 --- a/specs/XKB/ch01.xml +++ b/specs/XKB/ch01.xml @@ -383,7 +383,7 @@ generated. Bool - False + False Status diff --git a/specs/XKB/ch05.xml b/specs/XKB/ch05.xml index e7bd3c5f..e62c8664 100644 --- a/specs/XKB/ch05.xml +++ b/specs/XKB/ch05.xml @@ -525,19 +525,19 @@ Reference the keysym group indices with these symbolic constants: Value - XkbGroup1Index + XkbGroup1Index 0 - XkbGroup2Index + XkbGroup2Index 1 - XkbGroup3Index + XkbGroup3Index 2 - XkbGroup4Index + XkbGroup4Index 3 @@ -801,63 +801,63 @@ listed in Table 5.3. - XkbModifierStateMask + XkbModifierStateMask (1L << 0) - XkbModifierBaseMask + XkbModifierBaseMask (1L << 1) - XkbModifierLatchMask + XkbModifierLatchMask (1L << 2) - XkbModifierLockMask + XkbModifierLockMask (1L << 3) - XkbGroupStateMask + XkbGroupStateMask (1L << 4) - XkbGroupBaseMask + XkbGroupBaseMask (1L << 5) - XkbGroupLatchMask + XkbGroupLatchMask (1L << 6) - XkbGroupLockMask + XkbGroupLockMask (1L << 7) - XkbCompatStateMask + XkbCompatStateMask (1L << 8) - XkbGrabModsMask + XkbGrabModsMask (1L << 9) - XkbCompatGrabModsMask + XkbCompatGrabModsMask (1L << 10) - XkbLookupModsMask + XkbLookupModsMask (1L << 11) - XkbCompatLookupModsMask + XkbCompatLookupModsMask (1L << 12) - XkbPointerButtonMask + XkbPointerButtonMask (1L << 13) - XkbAllStateComponentsMask + XkbAllStateComponentsMask (0x3fff) diff --git a/specs/XKB/ch06.xml b/specs/XKB/ch06.xml index 2655bf8c..94929625 100644 --- a/specs/XKB/ch06.xml +++ b/specs/XKB/ch06.xml @@ -146,12 +146,12 @@ fields in the - XkbControlsMask + XkbControlsMask ctrls (1L<<0) - XkbServerMapMask + XkbServerMapMask server (1L<<1) @@ -161,27 +161,27 @@ fields in the (1L<<2) - XkbIndicatorMapMask + XkbIndicatorMapMask indicators (1L<<3) - XkbNamesMask + XkbNamesMask names (1L<<4) - XkbCompatMapMask + XkbCompatMapMask compat (1L<<5) - XkbGeometryMask + XkbGeometryMask geom (1L<<6) - XkbAllComponentsMask + XkbAllComponentsMask All Fields (0x7f) diff --git a/specs/XKB/ch08.xml b/specs/XKB/ch08.xml index a2b217b9..7e47f06a 100644 --- a/specs/XKB/ch08.xml +++ b/specs/XKB/ch08.xml @@ -219,19 +219,19 @@ the effects of changing the indicator. The valid values for - XkbIM_NoExplicit + XkbIM_NoExplicit (1L<<7) Client applications cannot change the state of the indicator. - XkbIM_NoAutomatic + XkbIM_NoAutomatic (1L<<6) Xkb does not automatically change the value of the indicator based upon a change in the keyboard state, regardless of the values for the other fields of the indicator map. - XkbIM_LEDDrivesKB + XkbIM_LEDDrivesKB (1L<<5) A client application changing the state of the indicator causes the state of the keyboard to change. @@ -372,7 +372,7 @@ Indicator - XkbIM_UseNone + XkbIM_UseNone The groups @@ -380,7 +380,7 @@ The - XkbIM_UseBase + XkbIM_UseBase If groups @@ -391,7 +391,7 @@ If - XkbIM_UseLatched + XkbIM_UseLatched If groups @@ -402,7 +402,7 @@ nonzero. If - XkbIM_UseLocked + XkbIM_UseLocked The groups @@ -412,7 +412,7 @@ keyboard group matches one of the bits that are set in - XkbIM_UseEffective + XkbIM_UseEffective The groups @@ -454,17 +454,17 @@ Keyboard - XkbIM_UseNone + XkbIM_UseNone On or Off No effect - XkbIM_UseBase + XkbIM_UseBase On or Off No effect - XkbIM_UseLatched + XkbIM_UseLatched On The @@ -478,7 +478,7 @@ lowest numbered group specified in - XkbIM_UseLatched + XkbIM_UseLatched Off The @@ -616,12 +616,12 @@ If - XkbIM_UseNone + XkbIM_UseNone The mods field and the current keyboard modifier state are ignored. - XkbIM_UseBase + XkbIM_UseBase The indicator is lit when any of the modifiers specified in the mask @@ -636,7 +636,7 @@ modifiers. - XkbIM_UseLatched + XkbIM_UseLatched The indicator is lit when any of the modifiers specified in the mask @@ -650,7 +650,7 @@ The indicator is lit when any of the modifiers specified in the - XkbIM_UseLocked + XkbIM_UseLocked The indicator is lit when any of the modifiers specified in the mask @@ -664,7 +664,7 @@ The indicator is lit when any of the modifiers specified in the - XkbIM_UseEffective + XkbIM_UseEffective The indicator is lit when any of the modifiers specified in the mask @@ -679,7 +679,7 @@ modifiers. - XkbIM_UseCompat + XkbIM_UseCompat The indicator is lit when any of the modifiers specified in the mask @@ -730,7 +730,7 @@ State" column refers to the new state to which you set the indicator. No Effect - XkbIM_UseLatched + XkbIM_UseLatched On Any modifiers specified in the @@ -741,7 +741,7 @@ Any modifiers specified in the - XkbIM_UseLatched + XkbIM_UseLatched Off Any modifiers specified in the @@ -763,7 +763,7 @@ Any modifiers specified in the - XkbIM_UseLocked + XkbIM_UseLocked Off Any modifiers specified in the diff --git a/specs/XKB/ch10.xml b/specs/XKB/ch10.xml index fd981acc..c451c4b5 100644 --- a/specs/XKB/ch10.xml +++ b/specs/XKB/ch10.xml @@ -1906,77 +1906,77 @@ on or off by modifying the following bits in the LED turned on High-pitched beep - XkbAX_IndicatorFBMask + XkbAX_IndicatorFBMask LED turned off Low-pitched beep - XkbAX_IndicatorFBMask + XkbAX_IndicatorFBMask More than one LED changed state Two high-pitched beeps - XkbAX_IndicatorFBMask + XkbAX_IndicatorFBMask Control turned on Rising tone - XkbAX_FeatureFBMask + XkbAX_FeatureFBMask Control turned off Falling tone - XkbAX_FeatureFBMask + XkbAX_FeatureFBMask More than one control changed state Two high-pitched beeps - XkbAX_FeatureFBMask + XkbAX_FeatureFBMask SlowKeys and BounceKeys about to be turned on or off Three high-pitched beeps - XkbAX_SlowWarnFBMask + XkbAX_SlowWarnFBMask SlowKeys key pressed Medium-pitched beep - XkbAX_SKPressFBMask + XkbAX_SKPressFBMask SlowKeys key accepted Medium-pitched beep - XkbAX_SKAcceptFBMask + XkbAX_SKAcceptFBMask SlowKeys key rejected Low-pitched beep - XkbAX_SKRejectFBMask + XkbAX_SKRejectFBMask Accepted SlowKeys key released Medium-pitched beep - XkbAX_SKReleaseFBMask + XkbAX_SKReleaseFBMask BounceKeys key rejected Low-pitched beep - XkbAX_BKRejectFBMask + XkbAX_BKRejectFBMask StickyKeys key latched Low-pitched beep followed by high-pitched beep - XkbAX_StickyKeysFBMask + XkbAX_StickyKeysFBMask StickyKeys key locked High-pitched beep - XkbAX_StickyKeysFBMask + XkbAX_StickyKeysFBMask StickyKeys key unlocked Low-pitched beep - XkbAX_StickyKeysFBMask + XkbAX_StickyKeysFBMask @@ -2051,33 +2051,33 @@ in Table 10.4. - XkbAXN_SKPress + XkbAXN_SKPress A key was pressed when SlowKeys was enabled. - XkbAXN_SKAccept + XkbAXN_SKAccept A key was accepted (held longer than the SlowKeys delay). - XkbAXN_SKRelease + XkbAXN_SKRelease An accepted SlowKeys key was released. - XkbAXN_SKReject + XkbAXN_SKReject A key was rejected (released before the SlowKeys delay expired). - XkbAXN_BKAccept + XkbAXN_BKAccept A key was accepted by BounceKeys. - XkbAXN_BKReject + XkbAXN_BKReject A key was rejected (pressed before the BounceKeys delay expired). - XkbAXN_AXKWarning + XkbAXN_AXKWarning AccessXKeys is about to turn on/off StickyKeys or BounceKeys. @@ -2152,37 +2152,37 @@ To receive - XkbAXN_SKPressMask + XkbAXN_SKPressMask (1<<0) Slow key press notification wanted - XkbAXN_SKAcceptMask + XkbAXN_SKAcceptMask (1<<1) Slow key accept notification wanted - XkbAXN_SKRejectMask + XkbAXN_SKRejectMask (1<<2) Slow key reject notification wanted - XkbAXN_SKReleaseMask + XkbAXN_SKReleaseMask (1<<3) Slow key release notification wanted - XkbAXN_BKAcceptMask + XkbAXN_BKAcceptMask (1<<4) Bounce key accept notification wanted - XkbAXN_BKRejectMask + XkbAXN_BKRejectMask (1<<5) Bounce key reject notification wanted - XkbAXN_AXKWarningMask + XkbAXN_AXKWarningMask (1<<6) AccessX warning notification wanted @@ -3512,7 +3512,7 @@ is described in more detail. AccessXFeedback - XkbAccessXFeedbackMask + XkbAccessXFeedbackMask ax_options: XkbAX_*FBMask XkbAccessXFeedback­Mask 10.6.3 @@ -3526,7 +3526,7 @@ is described in more detail. AccessXTimeout - XkbAccessXTimeoutMask + XkbAccessXTimeoutMask ax_timeout axt_opts_mask @@ -3541,7 +3541,7 @@ is described in more detail. AudibleBell - XkbAudibleBellMask + XkbAudibleBellMask 9.2 @@ -3553,9 +3553,9 @@ is described in more detail. BounceKeys - XkbBounceKeysMask + XkbBounceKeysMask debounce_delay - XkbBounceKeysMask + XkbBounceKeysMask 10.6.7 @@ -3567,14 +3567,14 @@ is described in more detail. EnabledControls - XkbControlsEnabledMask + XkbControlsEnabledMask enabled_ctrls Non-Boolean Control 10.1.1 GroupsWrap - XkbGroupsWrapMask + XkbGroupsWrapMask groups_wrap Non-Boolean Control 10.7.1 @@ -3588,28 +3588,28 @@ is described in more detail. IgnoreLockMods - XkbIgnoreLockModsMask + XkbIgnoreLockModsMask ignore_lock Non-Boolean Control 5.1 InternalMods - XkbInternalModsMask + XkbInternalModsMask internal Non-Boolean Control 5.1 MouseKeys - XkbMouseKeysMask + XkbMouseKeysMask mk_dflt_btn - XkbMouseKeysMask + XkbMouseKeysMask 10.5.1 MouseKeysAccel - XkbMouseKeysAccelMask + XkbMouseKeysAccelMask mk_delay mk_interval @@ -3624,49 +3624,49 @@ is described in more detail. Overlay1 - XkbOverlay1Mask + XkbOverlay1Mask 10.4 Overlay2 - XkbOverlay2Mask + XkbOverlay2Mask 10.4 PerKeyRepeat - XkbPerKeyRepeatMask + XkbPerKeyRepeatMask per_key_repeat Non-Boolean Control 10.3.1 RepeatKeys - XkbRepeatKeysMask + XkbRepeatKeysMask repeat_delay repeat_interval - XkbRepeatKeysMask + XkbRepeatKeysMask 10.3 SlowKeys - XkbSlowKeysMask + XkbSlowKeysMask slow_keys_delay - XkbSlowKeysMask + XkbSlowKeysMask 10.6.6 StickyKeys - XkbStickyKeysMask + XkbStickyKeysMask ax_options: XkbAX_Two­KeysMask XkbAX_Latch­ToLockMask - XkbStickyKeysMask + XkbStickyKeysMask 10.6.8 @@ -3705,127 +3705,127 @@ therefore cannot be enabled or disabled. - XkbRepeatKeysMask + XkbRepeatKeysMask ok ok (1L<<0) - XkbSlowKeysMask + XkbSlowKeysMask ok ok (1L<<1) - XkbBounceKeysMask + XkbBounceKeysMask ok ok (1L<<2) - XkbStickyKeysMask + XkbStickyKeysMask ok ok (1L<<3) - XkbMouseKeysMask + XkbMouseKeysMask ok ok (1L<<4) - XkbMouseKeysAccelMask + XkbMouseKeysAccelMask ok ok (1L<<5) - XkbAccessXKeysMask + XkbAccessXKeysMask ok ok (1L<<6) - XkbAccessXTimeoutMask + XkbAccessXTimeoutMask ok ok (1L<<7) - XkbAccessXFeedbackMask + XkbAccessXFeedbackMask ok ok (1L<<8) - XkbAudibleBellMask + XkbAudibleBellMask ok (1L<<9) - XkbOverlay1Mask + XkbOverlay1Mask ok (1L<<10) - XkbOverlay2Mask + XkbOverlay2Mask ok (1L<<11) - XkbIgnoreGroupLockMask + XkbIgnoreGroupLockMask ok (1L<<12) - XkbGroupsWrapMask + XkbGroupsWrapMask ok (1L<<27) - XkbInternalModsMask + XkbInternalModsMask ok (1L<<28) - XkbIgnoreLockModsMask + XkbIgnoreLockModsMask ok (1L<<29) - XkbPerKeyRepeatMask + XkbPerKeyRepeatMask ok (1L<<30) - XkbControlsEnabledMask + XkbControlsEnabledMask ok (1L<<31) - XkbAccessXOptionsMask + XkbAccessXOptionsMask ok ok (XkbStickyKeysMask | XkbAccessXFeedbackMask) - XkbAllBooleanCtrlsMask + XkbAllBooleanCtrlsMask ok (0x00001FFF) - XkbAllControlsMask + XkbAllControlsMask ok (0xF8001FFF) @@ -3900,15 +3900,15 @@ global basis. Valid values for - XkbWrapIntoRange + XkbWrapIntoRange (0x00) - XkbClampIntoRange + XkbClampIntoRange (0x40) - XkbRedirectIntoRange + XkbRedirectIntoRange (0x80) @@ -4082,67 +4082,67 @@ The AccessXFeedback - XkbAX_SKPressFBMask + XkbAX_SKPressFBMask (1L<<0) - XkbAX_SKAcceptFBMask + XkbAX_SKAcceptFBMask (1L << 1) - XkbAX_FeatureFBMask + XkbAX_FeatureFBMask (1L << 2) - XkbAX_SlowWarnFBMask + XkbAX_SlowWarnFBMask (1L << 3) - XkbAX_IndicatorFBMask + XkbAX_IndicatorFBMask (1L << 4) - XkbAX_StickyKeysFBMask + XkbAX_StickyKeysFBMask (1L << 5) - XkbAX_SKReleaseFBMask + XkbAX_SKReleaseFBMask (1L << 8) - XkbAX_SKRejectFBMask + XkbAX_SKRejectFBMask (1L << 9) - XkbAX_BKRejectFBMask + XkbAX_BKRejectFBMask (1L << 10) - XkbAX_DumbBellFBMask + XkbAX_DumbBellFBMask (1L << 11) StickyKeys - XkbAX_TwoKeysMask + XkbAX_TwoKeysMask (1L << 6) - XkbAX_LatchToLockMask + XkbAX_LatchToLockMask (1L << 7) - XkbAX_AllOptionsMask + XkbAX_AllOptionsMask (0xFFF) diff --git a/specs/XKB/ch11.xml b/specs/XKB/ch11.xml index be01a8fb..02940d37 100644 --- a/specs/XKB/ch11.xml +++ b/specs/XKB/ch11.xml @@ -379,35 +379,35 @@ defined in Table 11.1. - XkbLC_ForceLatin1Lookup + XkbLC_ForceLatin1Lookup (1 << 0) - XkbLC_ConsumeLookupMods + XkbLC_ConsumeLookupMods (1 << 1) - XkbLC_AlwaysConsumeShiftAndLock + XkbLC_AlwaysConsumeShiftAndLock (1 << 2) - XkbLC_IgnoreNewKeyboards + XkbLC_IgnoreNewKeyboards (1 << 3) - XkbLC_ConsumeKeysOnComposeFail + XkbLC_ConsumeKeysOnComposeFail (1 << 29) - XkbLC_ComposeLED + XkbLC_ComposeLED (1 << 30) - XkbLC_BeepOnComposeFail + XkbLC_BeepOnComposeFail (1 << 31) - XkbLC_AllControls + XkbLC_AllControls (0xc0000007) diff --git a/specs/XKB/ch14.xml b/specs/XKB/ch14.xml index f88a61f9..0660a28a 100644 --- a/specs/XKB/ch14.xml +++ b/specs/XKB/ch14.xml @@ -1186,7 +1186,7 @@ masks shown in Table 14.3. - XkbKeyTypesMask + XkbKeyTypesMask The type_count @@ -1201,7 +1201,7 @@ field is less than - XkbKeySymsMask + XkbKeySymsMask The min_key_code @@ -1222,7 +1222,7 @@ number of entries necessary for - XkbModifierMapMask + XkbModifierMapMask The min_key_code @@ -1477,7 +1477,7 @@ allocate, as specified in Table 14.4. - XkbExplicitComponentsMask + XkbExplicitComponentsMask The min_key_code @@ -1491,7 +1491,7 @@ field of the server map. - XkbKeyActionsMask + XkbKeyActionsMask The min_key_code @@ -1509,7 +1509,7 @@ field of the server map. The - XkbKeyBehaviorsMask + XkbKeyBehaviorsMask The min_key_code @@ -1523,7 +1523,7 @@ field of the server map. - XkbVirtualModMapMask + XkbVirtualModMapMask The min_key_code diff --git a/specs/XKB/ch15.xml b/specs/XKB/ch15.xml index 9158949d..74c87379 100644 --- a/specs/XKB/ch15.xml +++ b/specs/XKB/ch15.xml @@ -1490,16 +1490,16 @@ mapping used is controlled by the bits set in the - XkbRedirectIntoRange - XkbRedirectIntoRange + XkbRedirectIntoRange + XkbRedirectIntoRange - XkbClampIntoRange - XkbClampIntoRange + XkbClampIntoRange + XkbClampIntoRange none of the above - XkbWrapIntoRange + XkbWrapIntoRange @@ -2333,19 +2333,19 @@ groups: - XkbGroup1Index + XkbGroup1Index 0 - XkbGroup2Index + XkbGroup2Index 1 - XkbGroup3Index + XkbGroup3Index 2 - XkbGroup4Index + XkbGroup4Index 3 diff --git a/specs/XKB/ch18.xml b/specs/XKB/ch18.xml index d38bd921..1e4bd54d 100644 --- a/specs/XKB/ch18.xml +++ b/specs/XKB/ch18.xml @@ -252,91 +252,91 @@ description are shown in Table 18.1. - XkbKeycodesNameMask + XkbKeycodesNameMask (1<<0) Xkb->names keycodes - XkbGeometryNameMask + XkbGeometryNameMask (1<<1) Xkb->names geometry - XkbSymbolsNameMask + XkbSymbolsNameMask (1<<2) Xkb->names symbols - XkbPhysSymbolsNameMask + XkbPhysSymbolsNameMask (1<<3) Xkb->names phys_symbols - XkbTypesNameMask + XkbTypesNameMask (1<<4) Xkb->names type - XkbCompatNameMask + XkbCompatNameMask (1<<5) Xkb->names compat - XkbKeyTypeNamesMask + XkbKeyTypeNamesMask (1<<6) Xkb->map type[*].name - XkbKTLevelNamesMask + XkbKTLevelNamesMask (1<<7) Xkb->map type[*].lvl_names[*] - XkbIndicatorNamesMask + XkbIndicatorNamesMask (1<<8) Xkb->names indicators[*] - XkbKeyNamesMask + XkbKeyNamesMask (1<<9) Xkb->names keys[*], num_keys - XkbKeyAliasesMask + XkbKeyAliasesMask (1<<10) Xkb->names key_aliases[*], num_key_aliases - XkbVirtualModNamesMask + XkbVirtualModNamesMask (1<<11) Xkb->names vmods[*] - XkbGroupNamesMask + XkbGroupNamesMask (1<<12) Xkb->names groups[*] - XkbRGNamesMask + XkbRGNamesMask (1<<13) Xkb->names radio_groups[*], num_rg - XkbComponentNamesMask + XkbComponentNamesMask (0x3f) Xkb->names @@ -349,7 +349,7 @@ description are shown in Table 18.1. - XkbAllNamesMask + XkbAllNamesMask (0x3fff) Xkb->names all name components @@ -695,7 +695,7 @@ various kinds of symbolic names, as shown in - XkbKeyTypeNamesMask + XkbKeyTypeNamesMask first_type, num_types @@ -704,7 +704,7 @@ various kinds of symbolic names, as shown in type[*].name - XkbKTLevelNamesMask + XkbKTLevelNamesMask first_lvl, num_lvls @@ -713,19 +713,19 @@ various kinds of symbolic names, as shown in type[*].lvl_names[*] - XkbKeyAliasesMask + XkbKeyAliasesMask num_aliases Xkb->names key_aliases[*] - XkbRGNamesMask + XkbRGNamesMask num_rg Xkb->names radio_groups[*] - XkbKeyNamesMask + XkbKeyNamesMask first_key, num_keys @@ -734,19 +734,19 @@ various kinds of symbolic names, as shown in keys[*] - XkbVirtualModNamesMask + XkbVirtualModNamesMask changed_vmods Xkb->names vmods[*] - XkbIndicatorNamesMask + XkbIndicatorNamesMask changed_indicators Xkb->names indicators[*] - XkbGroupNamesMask + XkbGroupNamesMask changed_groups Xkb->names groups[*] diff --git a/specs/XKB/ch20.xml b/specs/XKB/ch20.xml index 0553942f..beb7be81 100644 --- a/specs/XKB/ch20.xml +++ b/specs/XKB/ch20.xml @@ -846,52 +846,52 @@ and - XkbGBN_TypesMask + XkbGBN_TypesMask Types (1L<<0) - XkbGBN_CompatMapMask + XkbGBN_CompatMapMask Compat (1L<<1) - XkbGBN_ClientSymbolsMask + XkbGBN_ClientSymbolsMask Types + Symbols + Keycodes (1L<<2) - XkbGBN_ServerSymbolsMask + XkbGBN_ServerSymbolsMask Types + Symbols + Keycodes (1L<<3) - XkbGBN_SymbolsMask + XkbGBN_SymbolsMask Symbols (1L<<1) - XkbGBN_IndicatorMapMask + XkbGBN_IndicatorMapMask Compat (1L<<4) - XkbGBN_KeyNamesMask + XkbGBN_KeyNamesMask Keycodes (1L<<5) - XkbGBN_GeometryMask + XkbGBN_GeometryMask Geometry (1L<<6) - XkbGBN_OtherNamesMask + XkbGBN_OtherNamesMask Types + Symbols + Keycodes + Compat + Geometry (1L<<7) - XkbGBN_AllComponentsMask + XkbGBN_AllComponentsMask (0xff) @@ -1001,17 +1001,17 @@ corresponding to each of the mask bits are summarized in - XkbGBN_TypesMask + XkbGBN_TypesMask map.types XkbGetUpdatedMap(dpy, XkbTypesMask, Xkb) - XkbGBN_ServerSymbolsMask + XkbGBN_ServerSymbolsMask server XkbGetUpdatedMap(dpy, XkbAllClientInfoMask, Xkb) - XkbGBN_ClientSymbolsMask + XkbGBN_ClientSymbolsMask map, including map.types XkbGetUpdatedMap(dpy, XkbAllServerInfoMask, Xkb) @@ -1021,17 +1021,17 @@ corresponding to each of the mask bits are summarized in XkbGetIndicatorMap(dpy, XkbAllIndicators, Xkb) - XkbGBN_CompatMapMask + XkbGBN_CompatMapMask compat XkbGetCompatMap(dpy, XkbAllCompatMask, Xkb) - XkbGBN_GeometryMask + XkbGBN_GeometryMask geom XkbGetGeometry(dpy, Xkb) - XkbGBN_KeyNamesMask + XkbGBN_KeyNamesMask names.keys names.key_aliases @@ -1041,7 +1041,7 @@ XkbGetNames(dpy, XkbKeyNamesMask | XkbKeyAliasesMask, Xkb) - XkbGBN_OtherNamesMask + XkbGBN_OtherNamesMask names.keycodes names.geometry diff --git a/specs/XKB/ch21.xml b/specs/XKB/ch21.xml index 902412a7..d81323a7 100644 --- a/specs/XKB/ch21.xml +++ b/specs/XKB/ch21.xml @@ -241,7 +241,7 @@ functions described subsequently in this section. - XkbXI_KeyboardsMask + XkbXI_KeyboardsMask (1L << 0) @@ -251,7 +251,7 @@ devices supported by the input device extension. - XkbXI_ButtonActionsMask + XkbXI_ButtonActionsMask num_btns btn_acts @@ -264,7 +264,7 @@ input extension devices. - XkbXI_IndicatorNamesMask + XkbXI_IndicatorNamesMask leds->names (1L <<2) @@ -274,7 +274,7 @@ Clients can assign names to indicators on non- - XkbXI_IndicatorMapsMask + XkbXI_IndicatorMapsMask leds->maps (1L <<3) @@ -284,7 +284,7 @@ Clients can assign indicator maps to indicators on non- - XkbXI_IndicatorStateMask + XkbXI_IndicatorStateMask leds->state (1L <<4) @@ -294,7 +294,7 @@ Clients can request the status of indicators on non- - XkbXI_IndicatorsMask + XkbXI_IndicatorsMask sz_leds num_leds @@ -308,13 +308,13 @@ Clients can request the status of indicators on non- - XkbXI_UnsupportedFeaturesMask + XkbXI_UnsupportedFeaturesMask unsupported (1L <<15) - XkbXI_AllDeviceFeaturesMask + XkbXI_AllDeviceFeaturesMask Those selected by Value column masks (0x1e) @@ -323,7 +323,7 @@ Clients can request the status of indicators on non- - XkbXI_AllFeaturesMask + XkbXI_AllFeaturesMask Those selected by Value column masks (0x1f) @@ -332,7 +332,7 @@ Clients can request the status of indicators on non- - XkbXI_AllDetailsMask + XkbXI_AllDetailsMask Those selected by Value column masks (0x801f) diff --git a/specs/XKB/ch22.xml b/specs/XKB/ch22.xml index 8fab203c..6bd46bac 100644 --- a/specs/XKB/ch22.xml +++ b/specs/XKB/ch22.xml @@ -199,7 +199,7 @@ Xkb modifies its behavior according to each controls bit. - XkbDF_DisableLocks + XkbDF_DisableLocks (1 << 0) Disable actions that lock modifiers