From b0f7912512091ea58dfaf8dffb2a658a6afeb96d Mon Sep 17 00:00:00 2001 From: Matt Dew Date: Mon, 16 Jan 2012 15:38:49 -0700 Subject: informaltable cleanup On certain tables, add top and bottom borders to table header and a bottom border to the table. This matches what those tables in the old pdfs looked like. the prevents tables from splitting across pages. Useful for tiny tables. Converting the colwidth to a floating point, IE, 1* -> 1.0* cleans up these build errors: WARNING: table-layout="fixed" and column-width unspecified => falling back to proportional-column-width(1) Signed-off-by: Matt Dew --- specs/appA.xml | 281 +++++------ specs/appC.xml | 263 +++++----- specs/ch04.xml | 43 +- specs/ch06.xml | 70 +-- specs/ch07.xml | 79 +-- specs/ch09.xml | 82 ++-- specs/ch12.xml | 67 +-- specs/ch13.xml | 34 +- specs/ch15.xml | 19 +- specs/ch16.xml | 1501 +++++++++++++++++++++++++++++--------------------------- 10 files changed, 1260 insertions(+), 1179 deletions(-) diff --git a/specs/appA.xml b/specs/appA.xml index 18050eb..fd26bac 100644 --- a/specs/appA.xml +++ b/specs/appA.xml @@ -22,16 +22,17 @@ correspond to some keysyms for ASCII characters. Control characters for symbols not listed in this table are application-specific. - - - - - - - - - - + + + + + + + + + + + Keysyms @@ -45,7 +46,7 @@ not listed in this table are application-specific. - + atsign 0 h, H @@ -55,7 +56,7 @@ not listed in this table are application-specific. x, X 24 - + a, A 1 i, I @@ -65,7 +66,7 @@ not listed in this table are application-specific. y, Y 25 - + b, B 2 j, J @@ -75,7 +76,7 @@ not listed in this table are application-specific. z, Z 26 - + c, C 3 k, K @@ -85,7 +86,7 @@ not listed in this table are application-specific. left_bracket 27 - + d, D 4 l, L @@ -95,7 +96,7 @@ not listed in this table are application-specific. backslash 28 - + e, E 5 m, M @@ -105,7 +106,7 @@ not listed in this table are application-specific. right_bracket 29 - + f, F 6 n, N @@ -115,7 +116,7 @@ not listed in this table are application-specific. asciicircum 30 - + g, G 8 o, O @@ -187,16 +188,17 @@ This table lists the Latin-11 keysyms for which XKB defines upper and lower case: - - - - - - - - - - + + + + + + + + + + + Lower Case @@ -210,7 +212,7 @@ case: - + a A o @@ -220,7 +222,7 @@ case: eth ETH - + b B p @@ -230,7 +232,7 @@ case: ntilde Ntilde - + c C q @@ -240,7 +242,7 @@ case: ograve Ograve - + d D r @@ -250,7 +252,7 @@ case: oacute Oacute - + e E s @@ -260,7 +262,7 @@ case: ocircumflex Ocircumflex - + f F t @@ -270,7 +272,7 @@ case: otilde Otilde - + g G u @@ -280,7 +282,7 @@ case: odiaeresis Odiaeresis - + h H v @@ -290,7 +292,7 @@ case: oslash Ooblique - + i I w @@ -300,7 +302,7 @@ case: ugrave Ugrave - + j J x @@ -310,7 +312,7 @@ case: uacute Uacute - + k K y @@ -320,7 +322,7 @@ case: ucircumflex Ucircumflex - + l L z @@ -330,7 +332,7 @@ case: udiaeresis Udiaeresis - + m M agrave @@ -340,7 +342,7 @@ case: yacute Yacute - + n N aacute @@ -362,14 +364,15 @@ case: This table lists the Latin-2 keysyms for which XKB defines upper and lower case: - - - - - - - - + + + + + + + + + Lower Case @@ -381,7 +384,7 @@ This table lists the Latin-2 keysyms for which XKB defines upper and lower case: - + aogonek Aogonek zabovedot @@ -389,7 +392,7 @@ This table lists the Latin-2 keysyms for which XKB defines upper and lower case: dstroke Dstroke - + lstroke Lstroke racute @@ -397,7 +400,7 @@ This table lists the Latin-2 keysyms for which XKB defines upper and lower case: nacute Nacute - + lcaron Lcaron abreve @@ -405,7 +408,7 @@ This table lists the Latin-2 keysyms for which XKB defines upper and lower case: ncaron Ncaron - + sacute Sacute lacute @@ -413,7 +416,7 @@ This table lists the Latin-2 keysyms for which XKB defines upper and lower case: odoubleacute Odoubleacute - + scaron Scaron cacute @@ -421,7 +424,7 @@ This table lists the Latin-2 keysyms for which XKB defines upper and lower case: rcaron Rcaron - + scedilla Scedilla ccaron @@ -429,7 +432,7 @@ This table lists the Latin-2 keysyms for which XKB defines upper and lower case: uabovering Uabovering - + tcaron Tcaron eogonek @@ -437,7 +440,7 @@ This table lists the Latin-2 keysyms for which XKB defines upper and lower case: udoubleacute Udoubleacute - + zacute Zacute ecaron @@ -445,7 +448,7 @@ This table lists the Latin-2 keysyms for which XKB defines upper and lower case: tcedilla Tcedilla - + zcaron Zcaron dcaron @@ -465,14 +468,15 @@ This table lists the Latin-2 keysyms for which XKB defines upper and lower case: This table lists the Latin-3 keysyms for which XKB defines upper and lower case: - - - - - - - - + + + + + + + + + Lower Case @@ -484,7 +488,7 @@ This table lists the Latin-3 keysyms for which XKB defines upper and lower case: - + hstroke Hstroke jcircumflex @@ -492,7 +496,7 @@ This table lists the Latin-3 keysyms for which XKB defines upper and lower case: gcircumflex Gcircumflex - + hcircumflex Hcircumflex cabovedot @@ -500,7 +504,7 @@ This table lists the Latin-3 keysyms for which XKB defines upper and lower case: ubreve Ubreve - + idotless Iabovedot ccircumflex @@ -508,7 +512,7 @@ This table lists the Latin-3 keysyms for which XKB defines upper and lower case: scircumflex Scircumflex - + gbreve Gbreve gabovedot @@ -528,14 +532,15 @@ This table lists the Latin-3 keysyms for which XKB defines upper and lower case: This table lists the Latin-4 keysyms for which XKB defines upper and lower case: - - - - - - - - + + + + + + + + + Lower Case @@ -547,7 +552,7 @@ This table lists the Latin-4 keysyms for which XKB defines upper and lower case: - + rcedilla Rcedilla eng @@ -555,7 +560,7 @@ This table lists the Latin-4 keysyms for which XKB defines upper and lower case: omacron Omacron - + itilde Itilde amacron @@ -563,7 +568,7 @@ This table lists the Latin-4 keysyms for which XKB defines upper and lower case: kcedilla Kcedilla - + lcedilla Lcedilla iogonek @@ -571,7 +576,7 @@ This table lists the Latin-4 keysyms for which XKB defines upper and lower case: uogonek Uogonek - + emacron Emacron eabovedot @@ -579,7 +584,7 @@ This table lists the Latin-4 keysyms for which XKB defines upper and lower case: utilde Utilde - + gcedilla Gcedilla imacron @@ -587,7 +592,7 @@ This table lists the Latin-4 keysyms for which XKB defines upper and lower case: umacron Umacron - + tslash Tslash ncedilla @@ -608,12 +613,13 @@ This table lists the Cyrillic keysyms for which XKB defines upper and lower case: - - - - - - + + + + + + + Lower Case @@ -623,139 +629,139 @@ case: - + Serbian_dje Serbian_DJE Cyrillic_i Cyrillic_I - + Macedonia_gje Macedonia_GJE Cyrillic_shorti Cyrillic_SHORTI - + Cyrillic_io Cyrillic_IO Cyrillic_ka Cyrillic_KA - + Ukrainian_ie Ukrainian_IE Cyrillic_el Cyrillic_EL - + Macedonia_dse Macedonia_DSE Cyrillic_em Cyrillic_EM - + Ukrainian_i Ukrainian_I Cyrillic_en Cyrillic_EN - + Ukrainian_yi Ukrainian_YI Cyrillic_o Cyrillic_O - + Cyrillic_je Cyrillic_JE Cyrillic_pe Cyrillic_PE - + Cyrillic_lje Cyrillic_LJE Cyrillic_ya Cyrillic_YA - + Cyrillic_nje Cyrillic_NJE Cyrillic_er Cyrillic_ER - + Serbian_tshe Serbian_TSHE Cyrillic_es Cyrillic_ES - + Macedonia_kje Macedonia_KJE Cyrillic_te Cyrillic_TE - + Byelorussian_shortu Byelorussian_SHORTU Cyrillic_u Cyrillic_U - + Cyrillic_dzhe Cyrillic_DZHE Cyrillic_zhe Cyrillic_ZHE - + Cyrillic_yu Cyrillic_YU Cyrillic_ve Cyrillic_VE - + Cyrillic_a Cyrillic_A Cyrillic_softsign Cyrillic_SOFTSIGN - + Cyrillic_be Cyrillic_BE Cyrillic_yeru Cyrillic_YERU - + Cyrillic_tse Cyrillic_TSE Cyrillic_ze Cyrillic_ZE - + Cyrillic_de Cyrillic_DE Cyrillic_sha Cyrillic_SHA - + Cyrillic_ie Cyrillic_IE Cyrillic_e Cyrillic_E - + Cyrillic_ef Cyrillic_EF Cyrillic_shcha Cyrillic_SHCHA - + Cyrillic_ghe Cyrillic_GHE Cyrillic_che Cyrillic_CHE - + Cyrillic_ha Cyrillic_HA Cyrillic_hardsign @@ -773,12 +779,13 @@ case: This table lists the Greek keysyms for which XKB defines upper and lower case: - - - - - - + + + + + + + Lower Case @@ -788,103 +795,103 @@ This table lists the Greek keysyms for which XKB defines upper and lower case: - + Greek_omegaaccent Greek_OMEGAACCENT Greek_iota Greek_IOTA - + Greek_alphaaccent Greek_ALPHAACCENT Greek_kappa Greek_KAPPA - + Greek_epsilonaccent Greek_EPSILONACCENT Greek_lamda Greek_LAMDA - + Greek_etaaccent Greek_ETAACCENT Greek_lambda Greek_LAMBDA - + Greek_iotaaccent Greek_IOTAACCENT Greek_mu Greek_MU - + Greek_iotadieresis Greek_IOTADIERESIS Greek_nu Greek_NU - + Greek_omicronaccent Greek_OMICRONACCENT Greek_xi Greek_XI - + Greek_upsilonaccent Greek_UPSILONACCENT Greek_omicron Greek_OMICRON - + Greek_upsilondieresis Greek_UPSILONDIERESIS Greek_pi Greek_PI - + Greek_alpha Greek_ALPHA Greek_rho Greek_RHO - + Greek_beta Greek_BETA Greek_sigma Greek_SIGMA - + Greek_gamma Greek_GAMMA Greek_tau Greek_TAU - + Greek_delta Greek_DELTA Greek_upsilon Greek_UPSILON - + Greek_epsilon Greek_EPSILON Greek_phi Greek_PHI - + Greek_zeta Greek_ZETA Greek_chi Greek_CHI - + Greek_eta Greek_ETA Greek_psi Greek_PSI - + Greek_theta Greek_THETA Greek_omega diff --git a/specs/appC.xml b/specs/appC.xml index ec37d35..6e47cae 100644 --- a/specs/appC.xml +++ b/specs/appC.xml @@ -5,12 +5,13 @@ New KeySyms KeySyms Used by the ISO9995 Standard - - - - - - + + + + + + + Byte 3 @@ -20,217 +21,217 @@ - + 254 1 ISO LOCK - + 254 2 ISO LATCHING LEVEL TWO SHIFT - + 254 3 ISO LEVEL THREE SHIFT - + 254 4 ISO LATCHING LEVEL THREE SHIFT - + 254 5 ISO LEVEL THREE SHIFT LOCK - + 254 6 ISO LATCHING GROUP SHIFT - + 254 7 ISO GROUP SHIFT LOCK - + 254 8 ISO NEXT GROUP - + 254 9 ISO LOCK NEXT GROUP - + 254 10 ISO PREVIOUS GROUP - + 254 11 ISO LOCK PREVIOUS GROUP - + 254 12 ISO FIRST GROUP - + 254 13 ISO LOCK FIRST GROUP - + 254 14 ISO LAST GROUP - + 254 15 ISO LOCK LAST GROUP - + 254 32 LEFT TAB - + 254 33 MOVE LINE UP - + 254 34 MOVE LINE DOWN - + 254 35 PARTIAL LINE UP - + 254 36 PARTIAL LINE DOWN - + 254 37 PARTIAL SPACE LEFT - + 254 38 PARTIAL SPACE RIGHT - + 254 39 SET MARGIN LEFT - + 254 40 SET MARGIN RIGHT - + 254 41 RELEASE MARGIN LEFT - + 254 42 RELEASE MARGIN RIGHT - + 254 43 RELEASE MARGIN LEFT AND RIGHT - + 254 44 FAST CURSOR LEFT - + 254 45 FAST CURSOR RIGHT - + 254 46 FAST CURSOR UP - + 254 47 FAST CURSOR DOWN - + 254 48 CONTINUOUS UNDERLINE - + 254 49 DISCONTINUOUS UNDERLINE - + 254 50 EMPHASIZE - + 254 51 CENTER OBJECT - + 254 52 @@ -243,12 +244,13 @@ KeySyms Used to Control The Core Pointer - - - - - - + + + + + + + Byte 3 @@ -258,181 +260,181 @@ - + 254 224 POINTER LEFT - + 254 225 POINTER RIGHT - + 254 226 POINTER UP - + 254 227 POINTER DOWN - + 254 228 POINTER UP AND LEFT - + 254 229 POINTER UP AND RIGHT - + 254 230 POINTER DOWN AND LEFT - + 254 231 POINTER DOWN AND RIGHT - + 254 232 DEFAULT POINTER BUTTON - + 254 233 POINTER BUTTON ONE - + 254 234 POINTER BUTTON TWO - + 254 235 POINTER BUTTON THREE - + 254 236 POINTER BUTTON FOUR - + 254 237 POINTER BUTTON FIVE - + 254 238 DEFAULT POINTER BUTTON DOUBLE CLICK - + 254 239 POINTER BUTTON ONE DOUBLE CLICK - + 254 240 POINTER BUTTON TWO DOUBLE CLICK - + 254 241 POINTER BUTTON THREE DOUBLE CLICK - + 254 242 POINTER BUTTON FOUR DOUBLE CLICK - + 254 243 POINTER BUTTON FIVE DOUBLE CLICK - + 254 244 DRAG DEFAULT POINTER BUTTON - + 254 245 DRAG POINTER BUTTON ONE - + 254 246 DRAG POINTER BUTTON TWO - + 254 247 DRAG POINTER BUTTON THREE - + 254 248 DRAG POINTER BUTTON FOUR - + 254 249 ENABLE POINTER FROM KEYBOARD - + 254 250 ENABLE KEYBOARD POINTER ACCEL - + 254 251 SET DEFAULT POINTER BUTTON NEXT - + 254 252 SET DEFAULT POINTER BUTTON PREVIOUS - + 254 253 @@ -445,12 +447,13 @@ KeySyms Used to Change Keyboard Controls - - - - - - + + + + + + + Byte 3 @@ -460,67 +463,67 @@ - + 254 112 ENABLE ACCESSX KEYS - + 254 113 ENABLE ACCESSX FEEDBACK - + 254 114 TOGGLE REPEAT KEYS - + 254 115 TOGGLE SLOW KEYS - + 254 116 ENABLE BOUNCE KEYS - + 254 117 ENABLE STICKY KEYS - + 254 118 ENABLE MOUSE KEYS - + 254 119 ENABLE MOUSE KEYS ACCELERATION - + 254 120 ENABLE OVERLAY1 - + 254 121 ENABLE OVERLAY2 - + 254 122 @@ -533,12 +536,13 @@ KeySyms Used To Control The Server - - - - - - + + + + + + + Byte @@ -548,31 +552,31 @@ - + 254 208 FIRST SCREEN - + 254 209 PREVIOUS SCREEN - + 254 210 NEXT SCREEN - + 254 211 LAST SCREEN - + 254 212 @@ -585,12 +589,13 @@ KeySyms for Non-Spacing Diacritical Keys - - - - - - + + + + + + + Byte @@ -600,103 +605,103 @@ - + 254 80 DEAD GRAVE ACCENT - + 254 81 DEAD ACUTE ACCENT - + 254 82 DEAD CIRCUMFLEX - + 254 83 DEAD TILDE - + 254 84 DEAD MACRON - + 254 85 DEAD BREVE - + 254 86 DEAD DOT ABOVE - + 254 87 DEAD DIAERESIS - + 254 88 DEAD RING ABOVE - + 254 89 DEAD DOUBLE ACUTE ACCENT - + 254 90 DEAD CARON - + 254 91 DEAD CEDILLA - + 254 92 DEAD OGONEK - + 254 93 DEAD IOTA - + 254 94 DEAD VOICED SOUND - + 254 95 DEAD SEMI VOICED SOUND - + 254 96 diff --git a/specs/ch04.xml b/specs/ch04.xml index 4d804e2..d35e2b4 100644 --- a/specs/ch04.xml +++ b/specs/ch04.xml @@ -597,12 +597,13 @@ accessX timeout options mask . XKB defines the following feedback tones: - - - - - - + + + + + + + Feedback Name @@ -612,49 +613,49 @@ accessX timeout options mask - + FeatureFB AX_FeatureOn rising tone Keyboard control enabled - + AX_FeatureOff falling tone Keyboard control disabled - + AX_FeatureChange two tones Several controls changed state - + IndicatorFB AX_IndicatorOn high tone Indicator Lit - + AX_IndicatorOff low tone Indicator Extinguished - + AX_IndicatorChange two high tones Several indicators changed state - + SlowWarnFB AX_SlowKeysWarning three high tones Shift key held for four seconds - + SKPressFB AX_SlowKeyPress single tone @@ -662,7 +663,7 @@ accessX timeout options mask SlowKeys are on - + SKReleaseFB AX_SlowKeyRelease single tone @@ -670,7 +671,7 @@ SlowKeys SlowKeys are on - + SKAcceptFB AX_SlowKeyAccept single tone @@ -678,7 +679,7 @@ SlowKeys SlowKeys - + SKRejectFB AX_SlowKeyReject low tone @@ -686,7 +687,7 @@ SlowKeys SlowKeys - + StickyKeysFB AX_StickyLatch low tone then high tone @@ -694,7 +695,7 @@ SlowKeys StickyKeys - + AX_StickyLock high tone @@ -702,7 +703,7 @@ StickyKeys StickyKeys - + AX_StickyUnlock low tone @@ -710,7 +711,7 @@ StickyKeys StickyKeys - + BKRejectFB AX_BounceKeysReject low tone diff --git a/specs/ch06.xml b/specs/ch06.xml index 8a673a4..ec6a5f2 100644 --- a/specs/ch06.xml +++ b/specs/ch06.xml @@ -92,10 +92,11 @@ server checks the per-key behavior of the corresponding key. This extension currently defines the following key behaviors: - - - - + + + + + Behavior @@ -103,13 +104,13 @@ currently defines the following key behaviors: - + KB_Default Press and release events are processed normally. - + KB_Lock @@ -119,7 +120,7 @@ corresponding release is ignored. If the key is logically down when pressed, the key press is ignored but the corresponding release is processed normally. - + @@ -152,7 +153,7 @@ release is also ignored. All other key release events are ignored. - + @@ -170,7 +171,7 @@ key specified in key . Otherwise, press and release events are processed normally. - + @@ -319,10 +320,11 @@ mods The X Keyboard Extension supports the following actions: - - - - + + + + + Action @@ -330,7 +332,7 @@ The X Keyboard Extension supports the following actions: - + SA_NoAction @@ -343,7 +345,7 @@ No direct effect, though SA_NoAction - + SA_SetMods @@ -380,7 +382,7 @@ clearLocks - + @@ -434,7 +436,7 @@ latchToLock - + @@ -479,7 +481,7 @@ occurred, key release unlocks them. - + @@ -529,7 +531,7 @@ Group1 - + @@ -581,7 +583,7 @@ group. - + @@ -618,7 +620,7 @@ GroupsWrap - + @@ -692,7 +694,7 @@ generate an event of any type). - + @@ -770,7 +772,7 @@ ButtonRelease - + @@ -830,7 +832,7 @@ effect. - + @@ -887,7 +889,7 @@ case, illegal button choices are wrapped back into range. - + @@ -1041,7 +1043,7 @@ arguments. - + SA_TerminateServer @@ -1061,7 +1063,7 @@ SA_NoAction - + @@ -1116,7 +1118,7 @@ SA_NoAction - + SA_SetControls controls: KB_BOOLCTRLMASK @@ -1137,7 +1139,7 @@ XkbControlsNotify - + SA_LockControls @@ -1174,7 +1176,7 @@ controls - + @@ -1232,7 +1234,7 @@ XkbActionMessage - + @@ -1294,7 +1296,7 @@ keyboard device. - + @@ -1363,7 +1365,7 @@ DeviceButtonRelease - + @@ -1426,7 +1428,7 @@ key release is ignored and has no effect. - + diff --git a/specs/ch07.xml b/specs/ch07.xml index af87587..b5ffc68 100644 --- a/specs/ch07.xml +++ b/specs/ch07.xml @@ -409,10 +409,11 @@ Lock modifiers are active but were not used to determine the keysym to be used: - - - - + + + + + Modifier @@ -420,7 +421,7 @@ Lock - + Control @@ -433,7 +434,7 @@ Applications are free to associate control characters with any symbols that are not specified by this extension. - + Lock @@ -489,13 +490,14 @@ key and four columns (the widest key, key 10, determines the width of the entire array). - - - - - - - + + + + + + + + Key @@ -506,56 +508,56 @@ entire array). - + 8 Q NoSymbol at NoSymbol - + 9 odiaeresis egrave NoSymbol NoSymbol - + 10 A NoSymbol Æ NoSymbol - + 11 ssharp question backslash questiondown - + 12 KP_End KP_1 NoSymbol NoSymbol - + 13 Num_Lock NoSymbol NoSymbol NoSymbol - + 14 NoSymbol NoSymbol NoSymbol NoSymbol - + 15 Return NoSymbol @@ -587,12 +589,13 @@ which specifies the types and symbols associated with each keyboard group for one key: - - - - - - + + + + + + + Key @@ -602,64 +605,64 @@ one key: - + 8 G1: ALPHABETIC q Q - + G2: ONE_LEVEL @ NoSymbol - + 9 G1: TWO_LEVEL odiaeresis egrave - + 10 G1: ALPHABETIC a A - + G2: ALPHABETIC ae AE - + 11 G1: TWO_LEVEL ssharp question - + G2: ONE_LEVEL backslash questiondown - + 12 G1: KEYPAD KP_End KP_1 - + 13 G1: ONE_LEVEL Num_Lock - + 14 No Groups - + 15 G1: ONE_LEVEL Return diff --git a/specs/ch09.xml b/specs/ch09.xml index d3f8510..d5f587b 100644 --- a/specs/ch09.xml +++ b/specs/ch09.xml @@ -156,10 +156,11 @@ groups and may contain any one of the following values: - - - - + + + + + Value @@ -167,7 +168,7 @@ groups - + IM_UseNone @@ -175,7 +176,7 @@ IM_UseNone groups field and the current keyboard group state are ignored. - + IM_UseBase @@ -186,7 +187,7 @@ non-zero. If groups is zero, the indicator is lit whenever the base keyboard group is zero. - + IM_UseLatched @@ -198,7 +199,7 @@ groups is zero, the indicator is lit whenever the latched keyboard group is zero. - + IM_UseLocked @@ -209,7 +210,7 @@ keyboard group matches one of the bits that are set in groups . - + IM_UseEffective @@ -257,10 +258,11 @@ which_mods field may have any combination of the following values: - - - - + + + + + Value @@ -268,31 +270,31 @@ which_mods - + IM_UseBase Base modifier state - + IM_UseLatched Latched modifier state - + IM_UseLocked Locked modifier state - + IM_UseEffective Effective modifier state - + IM_UseCompat @@ -367,11 +369,12 @@ groups , as follows: - - - - - + + + + + + which_groups @@ -380,7 +383,7 @@ groups - + IM_UseNone , or @@ -389,7 +392,7 @@ IM_UseBase On or Off No Effect - + IM_UseLatched @@ -403,7 +406,7 @@ groups groups is empty, the keyboard group latch is changed to zero. - + IM_UseLatched Off The @@ -417,7 +420,7 @@ groups is zero, the keyboard group latch is set to the index of the highest legal keyboard group. - + IM_UseLocked , or @@ -431,7 +434,7 @@ changed to the lowest numbered group specified in groups . - + IM_UseLocked , or @@ -460,11 +463,12 @@ mods , as follows: - - - - - + + + + + + Set in which_mods @@ -473,14 +477,14 @@ mods - + IM_UseBase On or Off No Effect - + IM_UseLatched @@ -491,7 +495,7 @@ mask mods are added to the latched modifiers. - + IM_UseLatched @@ -502,7 +506,7 @@ mask mods are removed from the latched modifiers. - + IM_UseLocked , @@ -517,7 +521,7 @@ mask mods are added to the locked modifiers. - + IM_UseLocked @@ -528,7 +532,7 @@ mask mods are removed from the locked modifiers. - + IM_UseCompat , or diff --git a/specs/ch12.xml b/specs/ch12.xml index f37caf1..efc6d6a 100644 --- a/specs/ch12.xml +++ b/specs/ch12.xml @@ -74,14 +74,15 @@ active. Here are a few examples to illustrate the application of the group compatibility map: - - - - - - - - + + + + + + + + + Group @@ -93,7 +94,7 @@ compatibility map: - + 1 Group1=None Shift @@ -101,7 +102,7 @@ compatibility map: Shift xxxxxxxx00000001 - + 2 Group2=Mod3 None @@ -109,7 +110,7 @@ compatibility map: Mod3 xxxxxxxx00100000 - + 3 Group3=Mod2 Shift @@ -117,7 +118,7 @@ compatibility map: Shift+Mod2 xxxxxxxx00010001 - + 4 Group4=None Control @@ -228,10 +229,11 @@ key are not changed by the automatic keyboard mapping. The explicit components field for a key can contain any combination of the following values: - - - - + + + + + Bit in Explicit Mask @@ -239,47 +241,47 @@ field for a key can contain any combination of the following values: - + ExplicitKeyType1 Automatic determination of the key type associated with Group1 (see Assigning Types To Groups of Symbols for a Key) - + ExplicitKeyType2 Automatic determination of the key type associated with Group2 (see Assigning Types To Groups of Symbols for a Key) - + ExplicitKeyType3 Automatic determination of the key type associated with Group3 (see Assigning Types To Groups of Symbols for a Key). - + ExplicitKeyType4 Automatic determination of the key type associated with Group4 (see Assigning Types To Groups of Symbols for a Key). - + ExplicitInterpret Application of any of the fields of a symbol interpretation to the key in question (see Assigning Actions To Keys). - + ExplicitAutoRepeat Automatic determination of autorepeat status for the key, as specified in a symbol interpretation (see Assigning Actions To Keys). - + ExplicitBehavior Automatic assignment of the KB_Lock @@ -288,7 +290,7 @@ LockingKey flag is set in a symbol interpretation (see Assigning Actions To Keys). - + ExplicitVModMap Automatic determination of the virtual modifier map for the key based on the actions assigned to the key and the symbol interpretations which @@ -435,10 +437,11 @@ first four key types in any keyboard map are reserved for these standard key types: - - - - + + + + + Key Type Name @@ -446,7 +449,7 @@ types: - + ONE_LEVEL @@ -463,7 +466,7 @@ ONE_LEVEL ONE_LEVEL . - + TWO_LEVEL @@ -480,7 +483,7 @@ TWO_LEVEL TWO_LEVEL . - + ALPHABETIC @@ -493,7 +496,7 @@ ALPHABETIC ALPHABETIC . - + KEYPAD diff --git a/specs/ch13.xml b/specs/ch13.xml index 49a8c2e..25fa96d 100644 --- a/specs/ch13.xml +++ b/specs/ch13.xml @@ -173,10 +173,11 @@ the hints field has the same meaning for all five types of keyboard components, and can contain any combination of the following values: - - - - + + + + + Flag @@ -184,21 +185,21 @@ and can contain any combination of the following values: - + LC_Hidden Indicates a component that should not normally be presented to the user. - + LC_Default Indicates a component that is the default member of its class. - + LC_Partial @@ -337,10 +338,11 @@ real modifier bindings and symbolic names for some virtual modifiers. XKB defines the following additional hints for the symbols component: - - - - + + + + + Flag @@ -348,33 +350,33 @@ XKB defines the following additional hints for the symbols component: - + LC_AlphanumericKeys Indicates a symbol component that contains bindings primarily for an alphanumeric section of the keyboard. - + LC_ModifierKeys Indicates a symbol component that contains bindings primarily for modifier keys. - + LC_KeypadKeys Indicates a symbol component that contains bindings primarily for numeric keypad keys. - + LC_FunctionKeys Indicates a symbol component that contains bindings primarily for function keys. - + LC_AlternateGroup Indicates a symbol component that contains bindings for an alternate keyboard group. diff --git a/specs/ch15.xml b/specs/ch15.xml index ec0ce72..d3e47d0 100644 --- a/specs/ch15.xml +++ b/specs/ch15.xml @@ -15,10 +15,11 @@ capability for input extension devices. XKB recognizes the following interactions with the X Input Extension: - - - - + + + + + Name @@ -26,27 +27,27 @@ XKB recognizes the following interactions with the X Input Extension: - + XI_Keyboards If set, applications can use all XKB requests and events with extension keyboards. - + XI_ButtonActions If set, clients can assign key actions to buttons, even on input extension devices that are not keyboards. - + XI_IndicatorNames If set, clients can assign names to indicators on non-keyboard extension devices. - + XI_IndicatorMaps If set, clients can assign indicator maps to indicators on non-keyboard extension devices. - + XI_IndicatorState If set, clients can change the state of device indicators using the diff --git a/specs/ch16.xml b/specs/ch16.xml index 83cc8f8..6044843 100644 --- a/specs/ch16.xml +++ b/specs/ch16.xml @@ -46,12 +46,13 @@ resource_id least significant byte contains the device, class, or feedback id as indicated: - - - - - - + + + + + + + high-order byte @@ -61,19 +62,19 @@ least significant byte contains the device, class, or feedback id as indicated: - + XkbErr_BadDevice 0xff device not found device id - + XkbErr_BadClass 0xfe device found, but is the wrong class class id - + XkbErr_BadId 0xfd device found, class ok, but device does not have a feedback with the @@ -111,10 +112,11 @@ The following types are used in the request and event definitions in subsequent sections: - - - - + + + + + Name @@ -122,7 +124,7 @@ sections: - + LISTofITEMs The type LISTofITEMs is special. It is similar to the LISTofVALUE defined by the core protocol, but the elements of a LISTofITEMs are @@ -130,13 +132,13 @@ not necessarily all the same size. The use of a BITMASK to indicate which members are present is optional for a LISTofITEMs — it is possible for the set of elements to be derived from one or more fields of the request. - + KB_DEVICESPEC 8 bit unsigned integer, UseCoreKbd, or UseCorePtr - + KB_LEDCLASSSPEC { KbdFeedbackClass @@ -150,7 +152,7 @@ AllXIClasses XINone } - + KB_BELLCLASSSPEC { KbdFeedbackClass @@ -162,17 +164,17 @@ DfltXIClass AllXIClasses } - + KB_IDSPEC 8 bit unsigned integer or DfltXIId - + KB_VMODMASK CARD16, each bit corresponds to a virtual modifier - + KB_GROUPMASK { Group1 @@ -184,7 +186,7 @@ Group3 Group4 } - + KB_GROUPSWRAP { WrapIntoRange @@ -194,13 +196,13 @@ ClampIntoRange RedirectIntoRange } - + KB_GROUPINFO { groupsWrap: KB_GROUPSWRAP redirectGroup: 1…4, numGroups: 1…4 } - + KB_NKNDETAILSMASK { NKN_Keycodes @@ -208,11 +210,11 @@ NKN_Keycodes NKN_DeviceID } - + KB_STATEMASK KEYBUTMASK or KB_GROUPMASK - + KB_STATEPARTMASK { ModifierState @@ -244,7 +246,7 @@ CompatLookupMods PointerButtons } - + KB_BOOLCTRLMASK { RepeatKeys @@ -274,7 +276,7 @@ Overlay2 IgnoreGroupLock } - + KB_CONTROLSMASK { GroupsWrap, InternalMods @@ -286,7 +288,7 @@ PerKeyRepeat ControlsEnabled } or KB_BOOLCTRLMASK - + KB_MAPPARTMASK { KeyTypes @@ -306,7 +308,7 @@ VirtualMods VirtualModMap } - + KB_CMDETAILMASK { SymInterp @@ -314,7 +316,7 @@ SymInterp GroupCompat } - + KB_NAMEDETAILMASK { KeycodesName @@ -347,7 +349,7 @@ GroupNames RGNames } - + KB_AXNDETAILMASK { AXN_SKPress @@ -359,7 +361,7 @@ AXN_SKReject AXN_SKRelease, AXN_BKAccept, AXN_BKReject, AXN_AXKWarning } - + KB_AXSKOPTSMASK { AX_TwoKeys @@ -367,7 +369,7 @@ AX_TwoKeys AX_LatchToLock } - + KB_AXFBOPTSMASK { AX_SKPressFB @@ -391,11 +393,11 @@ AX_BKRejectFB AX_DumbBellFB } - + KB_AXOPTIONSMASK KB_AXFBOPTSMASK or KB_AXSKOPTSMASK - + KB_GBNDETAILMASK { GBN_Types @@ -415,19 +417,19 @@ GBN_Geometry GBN_OtherNames } - + KB_BELLDETAILMASK { XkbAllBellNotifyEvents } - + KB_MSGDETAILMASK { XkbAllActionMessages } - + KB_EVENTTYPE { XkbNewKeyboardNotify @@ -455,40 +457,40 @@ XkbAccessXNotify XkbExtensionDeviceNotify } - + KB_ACTION [ type: CARD8 data: LISTofCARD8 ] - + KB_BEHAVIOR [ type: CARD8, data: CARD 8 ] - + KB_MODDEF [ mask: KEYMASK, mods: KEYMASK, vmods: KB_VMODMASK ] - + KB_KTMAPENTRY [ active: BOOL, level: CARD8, mods: KB_MODDEF ] - + KB_KTSETMAPENTRY [ level: CARD8, mods: KB_MODDEF ] - + KB_KEYTYPE [ mods: KB_MODDEF, numLevels: CARD8, map: LISTofKB_KTMAPENTRY, preserve: LISTofKB_MODDEF ] - + KB_SETKEYTYPE [ realMods: KEYMASK, vmods: CARD16, @@ -496,7 +498,7 @@ numLevels: CARD8, map: LISTofKB_KTSETMAPENTRY, preserve: LISTofKB_MODDEF ] - + KB_KEYSYMMAP [ ktIndex: LISTofCARD8, width: CARD8 numGroups: 0…4, @@ -504,15 +506,15 @@ preserve: LISTofKB_MODDEF ] redirectGroup: 0…3, syms: LISTofKEYSYM ] - + KB_KEYVMODMAP [ key: KEYCODE, vmods: CARD16 ] - + KB_KEYMODMAP [ key: KEYCODE, mods: KEYMASK ] - + KB_EXPLICITMASK { ExplicitKeyType1 @@ -532,11 +534,11 @@ ExplicitBehavior ExplicitVModMap } - + KB_INDICATORMASK CARD32, each bit corresponds to an indicator - + KB_IMFLAGS { IM_NoExplicit @@ -546,7 +548,7 @@ IM_NoAutomatic IM_LEDDrivesKB } - + KB_IMMODSWHICH { IM_UseNone @@ -562,7 +564,7 @@ IM_UseEffective IM_UseCompat } - + KB_IMGROUPSWHICH { IM_UseNone @@ -576,7 +578,7 @@ IM_UseLocked IM_UseEffective } - + KB_INDICATORMAP [ flags: CARD8, mods: KB_MODDEF, @@ -585,7 +587,7 @@ groups: KB_GROUPMASK, whichGroups: ctrls: KB_BOOLCTRLMASK ] - + KB_SYMINTERPMATCH { SI_NoneOf @@ -599,7 +601,7 @@ SI_AllOf SI_Exactly } - + KB_SYMINTERP [ sym: KEYSYM, mods; KEYMASK, @@ -609,7 +611,7 @@ SI_Exactly autoRepeat: BOOL, lockingKey: BOOL ] - + KB_PCFMASK { PCF_DetectableAutorepeat @@ -623,7 +625,7 @@ PCF_LookupStateWhenGrabbed PCF_SendEventUsesXKBState } - + KB_LCFLAGSMASK { LC_Hidden @@ -633,7 +635,7 @@ LC_Default LC_Partial } - + KB_LCSYMFLAGSMASK { LC_AlphanumericKeys @@ -659,10 +661,11 @@ XkbSetGeometry requests: - - - - + + + + + Name @@ -670,84 +673,84 @@ XkbSetGeometry - + KB_PROPERTY [ name, value: STRING8 ] - + KB_POINT [ x, y: CARD16 ] - + KB_OUTLINE [ cornerRadius: CARD8, points: LISTofKB_POINT ] - + KB_SHAPE [ name: ATOM, outlines: LISTofKB_OUTLINE primaryNdx, approxNdx: CARD8 ] - + KB_KEYNAME [ name: LISTofCHAR ] - + KB_KEYALIAS [ real: LISTofCHAR, alias: LISTofCHAR ] - + KB_KEY [ name: KB_KEYNAME, gap: INT16, shapeNdx, colorNdx: CARD8 ] - + KB_ROW [ top, left: INT16, vertical: BOOL, keys LISTofKB_KEY ] - + KB_OVERLAYKEY [ over, under: KB_KEYNAME ] - + KB_OVERLAYROW [ rowUnder: CARD8, keys: LISTofKB_OVERLAYKEY ] - + KB_OVERLAY [ sectionUnder: CARD8, rows: LISTofKB_OVERLAYROW ] - + KB_SHAPEDOODAD [ name: ATOM, priority: CARD8, top, left: INT16, type: { SolidDoodad, OutlineDoodad }, angle: INT16, width, height: CARD16 colorNdx, shapeNdx: CARD8 ] - + KB_TEXTDOODAD [ name: ATOM, priority: CARD8, top, left: INT16, angle: INT16, width, height: CARD16, colorNdx: CARD8, text: STRING8, font: STRING8 ] - + KB_INDICATORDOODAD [ name: ATOM, priority: CARD8, top, left: INT16, angle: INT16, shapeNdx, onColorNdx, offColorNdx: CARD8 ] - + KB_LOGODOODAD [ name: ATOM, priority: CARD8, top, left: INT16, angle: INT16, colorNdx, shapeNdx: CARD8, logoName: STRING8 ] - + KB_DOODAD KB_SHAPEDOODAD, or KB_TEXTDOODAD, or KB_INDICATORDOODAD, or KB_LOGODOODAD - + KB_SECTION [ name: ATOM, top, left, angle: INT16, @@ -769,10 +772,11 @@ XkbSetDeviceInfo : - - - - + + + + + Name @@ -780,7 +784,7 @@ XkbSetDeviceInfo - + KB_XIDEVFEATUREMASK { XI_ButtonActions @@ -792,13 +796,13 @@ XI_IndicatorMaps XI_IndicatorState } - + KB_XIFEATUREMASK { KB_XIDEVFEATURES or XI_Keyboards - + KB_XIDETAILMASK { KB_XIFEATURES or XI_UnsupportedFeature @@ -806,7 +810,7 @@ XI_UnsupportedFeature } - + KB_DEVICELEDINFO [ ledClass: KB_LEDCLASSSPEC, ledID: KB_IDSPEC, @@ -834,23 +838,24 @@ separated into categories of related requests. - - + + + - + XkbUseExtension - + wantedMajor, wantedMinor: CARD16 - + supported: BOOL - + serverMajor, serverMinor: CARD16 @@ -902,31 +907,32 @@ XkbUseExtension - - + + + - + XkbSelectEvents - + deviceSpec: KB_DEVICESPEC - + affectWhich, clear, selectAll: KB_EVENTTYPE - + affectMap, map: KB_MAPPARTMASK - + details: LISTofITEMs - + Errors: Keyboard , @@ -1068,10 +1074,11 @@ details - - - - + + + + + Event Type @@ -1080,7 +1087,7 @@ details - + XkbNewKeyboardNotify @@ -1091,7 +1098,7 @@ KB_NKNDETAILSMASK CARD16 - + XkbStateNotify @@ -1102,7 +1109,7 @@ KB_STATEPARTMASK CARD16 - + XkbControlsNotify @@ -1113,7 +1120,7 @@ KB_CONTROLMASK CARD32 - + XkbIndicatorMapNotify @@ -1124,7 +1131,7 @@ KB_INDICATORMASK CARD32 - + XkbIndicatorStateNotify @@ -1135,7 +1142,7 @@ KB_INDICATORMASK CARD32 - + XkbNamesNotify @@ -1146,7 +1153,7 @@ KB_NAMEDETAILMASK CARD16 - + XkbCompatMapNotify @@ -1157,7 +1164,7 @@ KB_CMDETAILMASK CARD8 - + XkbBellNotify @@ -1168,7 +1175,7 @@ KB_BELLDETAILMASK CARD8 - + XkbActionMessage @@ -1179,7 +1186,7 @@ KB_MSGDETAILMASK CARD8 - + XkbAccessXNotify @@ -1190,7 +1197,7 @@ KB_AXNDETAILMASK CARD16 - + XkbExtensionDeviceNotify @@ -1226,51 +1233,52 @@ and the conditions under which the server generates them. - - + + + - + XkbBell - + deviceSpec: KB_DEVICESPEC - + bellClass: KB_BELLCLASSSPEC - + bellID: KB_IDSPEC - + percent: INT8 - + forceSound: BOOL - + eventOnly: BOOL - + pitch, duration: INT16 - + name: ATOM - + window: WINDOW - + Errors: Keyboard , @@ -1411,58 +1419,59 @@ honor them. - - + + + - + XkbGetState - + deviceSpec: KB_DEVICESPEC - + deviceID: CARD8 - + mods, baseMods, latchedMods, lockedMods: KEYMASK - + group, lockedGroup: KB_GROUP - + baseGroup, latchedGroup: INT16 - + compatState: KEYMASK - + grabMods, compatGrabMods: KB_GROUP - + lookupMods, compatLookupMods: KEYMASK - + ptrBtnState: BUTMASK - + Errors: Keyboard @@ -1563,43 +1572,44 @@ Group Compatibility Map. - - + + + - + XkbLatchLockState - + deviceSpec: KB_DEVICESPEC - + affectModLocks, modLocks: KEYMASK - + lockGroup: BOOL - + groupLock: KB_GROUP - + affectModLatches,modLatches: KEYMASK - + latchGroup: BOOL - + groupLatch: INT16 - + Errors: Keyboard , @@ -1699,99 +1709,100 @@ If any errors occur, this request has no effect. - - + + + - + XkbGetControls - + deviceSpec: KB_DEVICESPEC - + deviceID: CARD8 - + mouseKeysDfltBtn: CARD8 - + numGroups: CARD8 - + groupsWrap: KB_GROUPINFO - + internalMods,ignoreLockMods: KB_MODDEF - + repeatDelay,repeatInterval: CARD16 - + slowKeysDelay, debounceDelay: CARD16 - + mouseKeysDelay, mouseKeysInterval: CARD16 - + mouseKeysTimeToMax, mouseKeysMaxSpeed: CARD16 - + mouseKeysCurve: INT16 - + accessXOptions: KB_AXOPTIONMASK - + accessXTimeout: CARD16 - + accessXTimeoutOptionsMask, accessXTimeoutOptionValues: CARD16 - + accessXTimeoutMask,accessXTimeoutValues: CARD32 - + enabledControls: KB_BOOLCTRLMASK - + perKeyRepeat: LISTofCARD8 - + Errors: Keyboard @@ -1926,95 +1937,96 @@ perKeyRepeat - - + + + - + XkbSetControls - + deviceSpec: KB_DEVICESPEC - + affectInternalRealMods, internalRealMods: KEYMASK - + affectInternalVirtualMods,internalVirtualMods: KB_VMODMASK - + affectIgnoreLockRealMods,ignoreLockRealMods: KB_MODMASK - + affectIgnoreLockVirtualMods,ignoreLockVirtualMods: KB_VMODMASK - + mouseKeysDfltBtn: CARD8 - + groupsWrap: KB_GROUPINFO - + accessXOptions: CARD16 - + affectEnabledControls: KB_BOOLCTRLMASK - + enabledControls: KB_BOOLCTRLMASK - + changeControls: KB_CONTROLMASK - + repeatDelay,repeatInterval: CARD16 - + slowKeysDelay, debounceDelay: CARD16 - + mouseKeysDelay, mouseKeysInterval: CARD16 - + mouseKeysTimeToMax, mouseKeysMaxSpeed: CARD16 - + mouseKeysCurve: INT16 - + accessXTimeout: CARD16 - + accessXTimeoutMask, accessXTimeoutValues: KB_BOOLCTRLMASK - + accessXTimeoutOptionsMask,accessXTimeoutOptionsValues: CARD16 - + perKeyRepeat: LISTofCARD8 - + Errors: Keyboard , @@ -2037,10 +2049,11 @@ changeControls follows: - - - - + + + + + Bit in changeControls @@ -2048,7 +2061,7 @@ follows: - + XkbRepeatKeysMask @@ -2058,7 +2071,7 @@ repeatDelay repeatInterval - + XkbSlowKeysMask @@ -2066,7 +2079,7 @@ XkbSlowKeysMask slowKeysDelay - + XkbStickyKeysMask @@ -2080,7 +2093,7 @@ and the XkbAX_LatchToLock options are affected) - + XkbBounceKeysMask @@ -2088,7 +2101,7 @@ XkbBounceKeysMask debounceDelay - + XkbMouseKeysMask @@ -2096,7 +2109,7 @@ XkbMouseKeysMask mouseKeysDfltBtn - + XkbMouseKeysAccelMask @@ -2112,7 +2125,7 @@ mouseKeysTimeToMax mouseKeysMaxSpeed - + XkbAccessXKeysMask @@ -2120,7 +2133,7 @@ XkbAccessXKeysMask accessXOptions (all options) - + XkbAccessXTimeoutMask @@ -2136,7 +2149,7 @@ accessXTimeoutOptionsMask accessXTimeoutOptionsValues - + XkbAccessXFeedbackMask accessXOptions @@ -2144,7 +2157,7 @@ accessXOptions XkbStickyKeysMask bit) - + XkbGroupsWrapMask @@ -2152,7 +2165,7 @@ XkbGroupsWrapMask groupsWrap - + XkbInternalModsMask @@ -2166,7 +2179,7 @@ affectInternalVirtualMods internalVirtualMods - + XkbIgnoreLockModsMask @@ -2180,7 +2193,7 @@ affectIgnoreLockVirtualMods ignoreLockVirtualMods - + XkbPerKeyRepeatMask @@ -2188,7 +2201,7 @@ XkbPerKeyRepeatMask perKeyRepeat - + XkbControlsEnabledMask @@ -2476,165 +2489,166 @@ Value - - + + + - + XkbGetMap - + deviceSpec: KB_DEVICESPEC - + full, partial: KB_MAPPARTMASK - + firstType, nTypes: CARD8 - + firstKeySym, firstKeyAction: KEYCODE - + nKeySyms, nKeyActions: CARD8 - + firstKeyBehavior,firstKeyExplicit: KEYCODE - + nKeyBehaviors,nKeyExplicit: CARD8 - + firstModMapKey,firstVModMapKey: KEYCODE - + nModMapKeys, nVModMapKeys: CARD8 - + virtualMods: KB_VMODMASK - + deviceID: CARD8 - + minKeyCode, maxKeyCode: KEYCODE - + present: KB_MAPPARTMASK - + firstType, nTypes, nTotalTypes: CARD8 - + firstKeySym, firstKeyAction: KEYCODE - + nKeySyms, nKeyActions: CARD8 - + totalSyms, totalActions: CARD16 - + firstKeyBehavior, firstKeyExplicit: KEYCODE - + nKeyBehaviors, nKeyExplicit: CARD8 - + totalKeyBehaviors, totalKeyExplicit: CARD8 - + firstModMapKey, firstVModMapKey: KEYCODE - + nModMapKeys, nVModMapKeys: CARD8 - + totalModMapKeys, totalVModMapKeys: CARD8 - + virtualMods: KB_VMODMASK - + typesRtrn: LISTofKB_KEYTYPE - + symsRtrn: LISTofKB_KEYSYMMAP - + actsRtrn: { count: LISTofCARD8, acts: LISTofKB_ACTION } - + behaviorsRtrn: LISTofKB_SETBEHAVIOR - + vmodsRtrn: LISTofSETofKEYMASK - + explicitRtrn: LISTofKB_SETEXPLICIT - + modmapRtrn: LISTofKB_KEYMODMAP - + vmodMapRtrn: LISTofKB_KEYVMODMAP - + Errors: Keyboard @@ -2682,11 +2696,12 @@ partial as follows: - - - - - + + + + + + Bit in the Partial Mask @@ -2695,7 +2710,7 @@ as follows: - + XkbKeyTypesMask @@ -2706,7 +2721,7 @@ firstType nTypes - + XkbKeySymsMask @@ -2717,7 +2732,7 @@ firstKeySym nKeySyms - + XkbKeyActionsMask @@ -2728,7 +2743,7 @@ firstKeyAction nKeyActions - + XkbKeyBehaviorsMask @@ -2739,7 +2754,7 @@ firstKeyBehavior nKeyBehaviors - + XkbExplicitComponentsMask @@ -2750,7 +2765,7 @@ firstKeyExplicit nKeyExplicit - + XkbModifierMapMask @@ -2761,7 +2776,7 @@ firstModMapKey nModMapKeys - + XkbVirtualModMapMask @@ -2772,7 +2787,7 @@ firstVModMapKey nVModMapKeys - + XkbVirtualModsMask @@ -3159,109 +3174,110 @@ corresponding lists are all of length zero. - - + + + - + XkbSetMap - + deviceSpec: KB_DEVICESPEC - + flags: { SetMapResizeTypes, SetMapRecomputeActions } - + present: KB_MAPPARTMASK - + minKeyCode, maxKeyCode: KEYCODE - + firstType, nTypes: CARD8 - + firstKeySym, firstKeyAction: KEYCODE - + nKeySyms, nKeyActions: CARD8 - + totalSyms, totalActions: CARD16 - + firstKeyBehavior, firstKeyExplicit: KEYCODE - + nKeyBehaviors, nKeyExplicit: CARD8 - + totalKeyBehaviors, totalKeyExplicit: CARD8 - + firstModMapKey, firstVModMapKey: KEYCODE - + nModMapKeys, nVModMapKeys: CARD8 - + totalModMapKeys, totalVModMapKeys: CARD8 - + virtualMods: VMODMASK - + types: LISTofKB_KEYTYPE - + syms: LISTofKB_KEYSYMMAP - + actions: { count: LISTofCARD8, actions: LISTofKB_ACTION } - + behaviors: LISTofKB_BEHAVIOR - + vmods: LISTofKEYMASK - + explicit: LISTofKB_EXPLICIT - + modmap: LISTofKB_KEYMODMAP - + vmodmap: LISTofKB_KEYVMODMAP - + Errors: Keyboard , @@ -3823,55 +3839,56 @@ XkbIndicatorStateNotify - - + + + - + XkbGetCompatMap - + deviceSpec: KB_DEVICESPEC - + groups: KB_GROUPMASK - + getAllSI: BOOL - + firstSI, nSI: CARD16 - + deviceID: CARD8 - + groupsRtrn: KB_GROUPMASK - + firstSIRtrn, nSIRtrn, nTotalSI: CARD16 - + siRtrn: LISTofKB_SYMINTERP - + groupRtrn: LISTofKB_MODDEF - + Errors: Keyboard , @@ -3966,43 +3983,44 @@ groupsRtrn - - + + + - + XkbSetCompatMap - + deviceSpec: KB_DEVICESPEC - + recomputeActions: BOOL - + truncateSI: BOOL - + groups: KB_GROUPMASK - + firstSI, nSI: CARD16 - + si: LISTofKB_SYMINTERPRET - + groupMaps: LISTofKB_MODDEF - + Errors: Keyboard , @@ -4097,24 +4115,25 @@ Keys. - - + + + - + XkbGetIndicatorState - + deviceSpec: KB_DEVICESPEC - + deviceID: CARD8 state: KB_INDICATORMASK - + Errors: Keyboard @@ -4152,47 +4171,48 @@ indicator is lit. - - + + + - + XkbGetIndicatorMap - + deviceSpec: KB_DEVICESPEC - + which: KB_INDICATORMASK - + deviceID: CARD8 - + which: KB_INDICATORMASK - + realIndicators: KB_INDICATORMASK - + nIndicators: CARD8 - + maps: LISTofKB_INDICATORMAP - + Errors: Keyboard , @@ -4249,27 +4269,28 @@ described in Indicator Maps - - + + + - + XkbSetIndicatorMap - + deviceSpec: KB_DEVICESPEC - + which: KB_INDICATORMASK - + maps: LISTofKB_INDICATORMAP - + Errors: Keyboard , @@ -4313,71 +4334,72 @@ XkbIndicatorStateNotify - - + + + - + XkbGetNamedIndicator - + deviceSpec: KB_DEVICESPEC - + ledClass: KB_LEDCLASSSPEC - + ledID: KB_IDSPEC - + indicator: ATOM - + deviceID: CARD8 - + supported: BOOL - + indicator: ATOM - + found: BOOL - + on: BOOL - + realIndicator: BOOL - + ndx: CARD8 - + map: KB_INDICATORMAP - + Errors: Keyboard , @@ -4540,51 +4562,52 @@ map - - + + + - + XkbSetNamedIndicator - + deviceSpec: KB_DEVICESPEC - + ledClass: KB_LEDCLASSSPEC - + ledID: KB_IDSPEC - + indicator: ATOM - + setState: BOOL - + on: BOOL - + setMap: BOOL - + createMap: BOOL - + map: KB_SETINDICATORMAP - + Errors: Keyboard , @@ -4758,22 +4781,23 @@ map and the current state of the keyboard. - - + + + - + XkbGetNames - + deviceSpec: KB_DEVICESPEC - + which: KB_NAMEDETAILMASK - + deviceID: CARD8 which: KB_NAMESMASK @@ -4790,7 +4814,7 @@ present: KB_NAMEDETAILMASK valueList: LISTofITEMs - + Errors: Keyboard , @@ -4844,10 +4868,11 @@ valueList - - - - + + + + + Component @@ -4856,49 +4881,49 @@ valueList - + XkbKeycodesName 1 ATOM - + XkbGeometryName 1 ATOM - + XkbSymbolsName 1 ATOM - + XkbPhysSymbolsName 1 ATOM - + XkbTypesName 1 ATOM - + XkbCompatName 1 ATOM - + XkbKeyTypeNames @@ -4907,7 +4932,7 @@ nTypes LISTofATOM - + XkbKTLevelNames @@ -4920,7 +4945,7 @@ nKTLevels { count: LISTofCARD8, names: LISTofATOM } - + XkbIndicatorNames @@ -4929,7 +4954,7 @@ indicators LISTofATOM - + XkbVirtualModNames @@ -4938,7 +4963,7 @@ virtualMods LISTofATOM - + XkbGroupNames @@ -4947,7 +4972,7 @@ groupNames LISTofATOM - + XkbKeyNames @@ -4956,7 +4981,7 @@ nKeys LISTofKB_KEYNAME - + XkbKeyAliases @@ -4965,7 +4990,7 @@ nKeyAliases LISTofKB_KEYALIAS - + XkbRGNames @@ -5108,62 +5133,63 @@ nRadioGroups - - + + + - + XkbSetNames - + deviceSpec: KB_DEVICESPEC - + which: KB_NAMEDETAILMASK - + virtualMods: KB_VMODMASK - + firstType, nTypes: CARD8 - + firstKTLevel, nKTLevels: CARD8 - + totalKTLevelNames: CARD16 - + indicators: KB_INDICATORMASK - + groupNames: KB_GROUPMASK - + nRadioGroups: CARD8 - + firstKey: KEYCODE - + nKeys, nKeyAliases: CARD8 - + valueList: LISTofITEMs - + Errors: Keyboard , @@ -5431,77 +5457,78 @@ Atom - - + + + - + XkbGetGeometry - + deviceSpec: KB_DEVICESPEC - + name: ATOM - + deviceID: CARD8 - + name: ATOM - + found: BOOL - + widthMM, heightMM: CARD16 - + baseColorNdx, labelColorNdx: CARD8 - + properties: LISTofKB_PROPERTY - + colors: LISTofSTRING8 - + shapes: LISTofKB_SHAPE - + sections: LISTofKB_SECTION - + doodads: LISTofKB_DOODAD - + keyAliases: LISTofKB_KEYALIAS - + Errors: Keyboard @@ -5573,55 +5600,56 @@ Geometry - - + + + - + XkbSetGeometry - + deviceSpec: KB_DEVICESPEC - + name: ATOM - + widthMM, heightMM, CARD16 - + baseColorNdx, labelColorNdx: CARD8 - + shapes: LISTofKB_SHAPE - + sections: LISTofKB_SECTION - + properties: LISTofKB_PROPERTY - + colors: LISTofSTRING8 - + doodads: LISTofKB_DOODAD - + keyAliases: LISTofKB_KEYALIAS - + Errors: Keyboard , @@ -5767,38 +5795,39 @@ keyboard definition, but XKB does not check for or guarantee it. - - + + + - + XkbPerClientFlags - + deviceSpec: KB_DEVICESPEC - + change: KB_PCFMASK - + value: KB_PCFMASK - + ctrlsToChange: KB_BOOLCTRLMASK - + autoCtrls: KB_BOOLCTRLMASK - + autoCtrlValues: KB_BOOLCTRLMASK - + deviceID: CARD8 supported: KB_PCFMASK @@ -5808,7 +5837,7 @@ autoCtrlValues: KB_BOOLCTRLMASK where: KB_PCFMASK: - + Errors: Keyboard , @@ -5844,10 +5873,11 @@ value per-client-flags are: - - - - + + + + + Flag… @@ -5855,35 +5885,35 @@ per-client-flags are: - + XkbPCF_DetectableAutorepeat Detectable Autorepeat - + XkbPCF_GrabsUseXKBStateMask Setting a Passive Grab for an XKB State - + XkbPCF_AutoResetControlsMask Automatic Reset of Boolean Controls - + XkbPCF_LookupStateWhenGrabbed Effects of XKB on Core Protocol Events - + XkbPCF_SendEventUsesXKBState @@ -5992,73 +6022,74 @@ autoCtrlValues - - + + + - + XkbListComponents - + deviceSpec: KB_DEVICESPEC - + maxNames: CARD16 - + keymapsSpec: STRING8 - + keycodesSpec: STRING8 - + typesSpec: STRING8 - + compatMapSpec: STRING8 - + symbolsSpec: STRING8 - + geometrySpec: STRING8 - + deviceID: CARD8 - + extra: CARD16 - + keymaps,keycodes,types,compatMaps: LISTofKB_COMPONENTNAME - + symbols, geometries: LISTofKB_COMPONENTNAME - + Where: - + KB_COMPONENTNAME { hints: CARD8, name: STRING8 } - + Errors: Keyboard , @@ -6172,98 +6203,99 @@ more detail. - - + + + - + XkbGetKbdByName - + deviceSpec: KB_DEVICESPEC - + need, want: KB_GBNDETAILMASK - + load: BOOL - + keymapsSpec: STRING8 - + keycodesSpec, typesSpec: STRING8 - + compatMapSpec, symbolsSpec: STRING8 - + geometrySpec: STRING8 - + deviceID: CARD8 - + minKeyCode, maxKeyCode: KEYCODE - + loaded, newKeyboard: BOOL - + found, reported: KB_GBNDETAILMASK - + map: optional XkbGetMap reply - + compat: optional XkbGetCompatMap reply - + indicators: optional XkbGetIndicatorMap reply - + names: optional XkbGetNames reply - + geometry: optional XkbGetGeometry reply - + Errors: Keyboard , @@ -6334,11 +6366,12 @@ XkbGetMapByName (GBN) components: - - - - - + + + + + + XkbGetMapByName Keyboard Component… @@ -6347,28 +6380,28 @@ XkbGetMapByName - + XkbGBN_Types types key types - + XkbGBN_CompatMap compat symbol interpretations, group compatibility map - + XkbGBN_ClientSymbols symbols, types, keycodes key types, key symbol mappings, modifier mapping - + XkbGBN_ServerSymbols @@ -6376,28 +6409,28 @@ XkbGBN_ServerSymbols key behaviors, key actions, key explicit components, virtual modifiers, virtual modifier mapping - + XkbGBN_IndicatorMap compat indicator maps, indicator names - + XkbGBN_KeyNames keycodes key names, key aliases - + XkbGBN_Geometry geometry keyboard geometry - + XkbGBN_OtherNames @@ -6614,114 +6647,115 @@ description. - - + + + - + XkbGetDeviceInfo - + deviceSpec: KB_DEVICESPEC - + wanted: KB_XIDEVFEATUREMASK - + ledClass: KB_LEDCLASSSPEC - + ledID: KB_IDSPEC - + allButtons: BOOL - + firstButton, nButtons: CARD8 - + deviceID: CARD8 - + present: KB_XIDEVFEATUREMASK - + supported: KB_XIFEATUREMASK - + unsupported: KB_XIFEATUREMASK - + firstBtnWanted: CARD8 - + nBtnsWanted: CARD8 - + firstBtnRtrn: CARD8 - + nBtnsRtrn: CARD8 - + totalBtns: CARD8 - + hasOwnState: BOOL - + dfltKbdFB, dfltLedFB: KB_IDSPEC - + devType: ATOM - + name: STRING - + btnActions: LISTofKB_ACTION - + leds: LISTofKB_DEVICELEDINFO - + Errors: Device , @@ -7041,35 +7075,36 @@ for it and, if generated, is not sent to any other clients. - - + + + - + XkbSetDeviceInfo - + deviceSpec: KB_DEVICESPEC - + change: KB_XIDEVFEATUREMASK - + firstBtn, nBtns: CARD8 - + btnActions:LISTofKB_ACTION - + leds: LISTofKB_DEVICELEDINFO - + Errors: Device , @@ -7236,32 +7271,33 @@ for it and, if generated, is not sent to any other clients. - - + + + - + XkbSetDebuggingFlags - + affectFlags, flags: CARD32 - + affectCtrls, ctrls: CARD32 - + message: STRING - + currentFlags, supportedFlags: CARD32 - + currentCtrls, supportedCtrls: CARD32 @@ -7401,38 +7437,39 @@ distinguish XKB event type. - - + + + - + XkbNewKeyboardNotify - + time: TIMESTAMP - + deviceID: CARD8 - + changed: KB_NKNDETAILMASK - + minKeyCode, maxKeyCode: KEYCODE - + oldDeviceID: CARD8 - + oldMinKeyCode, oldMaxKeyCode: KEYCODE - + requestMajor, requestMinor: CARD8 @@ -7475,10 +7512,11 @@ changed can contain any combination of the event details for this event: - - - - + + + + + Bit in Changed @@ -7486,15 +7524,15 @@ can contain any combination of the event details for this event: - + NKN_Keycodes The new keyboard has a different minimum or maximum keycode. - + NKN_Geometry The new keyboard has a different keyboard geometry. - + NKN_DeviceID The new keyboard has a new X Input Extension device identifier @@ -7600,62 +7638,63 @@ both fields have the value - - + + + - + XkbMapNotify - + time: TIMESTAMP - + deviceID: CARD8 - + ptrBtnActions: CARD8 - + changed: KB_MAPPARTMASK - + minKeyCode, maxKeyCode: KEYCODE - + firstType, nTypes: CARD8 - + firstKeySym, firstKeyAction: KEYCODE - + nKeySyms, nKeyActions: CARD8 - + firstKeyBehavior, firstKeyExplicit: KEYCODE - + nKeyBehaviors, nKeyExplicit: CARD8 - + virtualMods: KB_VMODMASK - + firstModMapKey, firstVModMapKey: KEYCODE - + nModMapKeys, nVModMapKeys: CARD8 @@ -7840,62 +7879,63 @@ modifier mappings. Otherwise, both fields are - - + + + - + XkbStateNotify - + time: TIMESTAMP - + deviceID: CARD8 - + mods, baseMods, latchedMods, lockedMods: KEYMASK - + group, lockedGroup: CARD8 - + baseGroup, latchedGroup: INT16 - + compatState: KEYMASK - + grabMods, compatGrabMods: KEYMASK - + lookupMods, compatLookupMods: KEYMASK - + ptrBtnState: BUTMASK - + changed: KB_STATEPARTMASK - + keycode: KEYCODE - + eventType: CARD8 - + requestMajor, requestMinor: CARD8 @@ -7927,10 +7967,11 @@ and contain any combination of: - - - - + + + + + Bit in changed @@ -7939,7 +7980,7 @@ and contain any combination of: - + ModifierState @@ -7948,7 +7989,7 @@ mods The effective modifiers - + ModifierBase @@ -7957,7 +7998,7 @@ baseMods The base modifiers - + ModifierLatch @@ -7966,7 +8007,7 @@ latchedMods The latched modifiers - + ModifierLock @@ -7975,7 +8016,7 @@ lockedMods The locked modifiers - + GroupState @@ -7984,7 +8025,7 @@ group The effective keyboard group - + GroupBase @@ -7993,7 +8034,7 @@ baseGroup The base keyboard group - + GroupLatch @@ -8002,7 +8043,7 @@ latchedGroup The latched keyboard group - + GroupLock @@ -8011,7 +8052,7 @@ lockedGroup The locked keyboard group - + PointerButtons @@ -8020,7 +8061,7 @@ ptrBtnState The state of the core pointer buttons - + GrabMods @@ -8029,7 +8070,7 @@ grabMods The XKB state used to compute grabs - + LookupMods @@ -8038,7 +8079,7 @@ lookupMods The XKB state used to look up symbols - + CompatState @@ -8047,7 +8088,7 @@ compatState Default state for non-XKB clients - + CompatGrabMods @@ -8056,7 +8097,7 @@ compatGrabMods The core state used to compute grabs - + CompatLookupMods @@ -8119,46 +8160,47 @@ change in state and have the value - - + + + - + XkbControlsNotify - + time: TIMESTAMP - + deviceID: CARD8 - + numGroups: CARD8 - + changedControls: KB_CONTROLMASK - + enabledControls,enabledControlChanges: KB_BOOLCTRLMASK - + keycode: KEYCODE - + eventType: CARD8 - + requestMajor: CARD8 - + requestMinor: CARD8 @@ -8270,22 +8312,23 @@ change in state and have the value - - + + + - + XkbIndicatorStateNotify - + time: TIMESTAMP - + deviceID: CARD8 - + stateChanged, state: KB_INDICATORMASK @@ -8360,26 +8403,27 @@ client. - - + + + - + XkbIndicatorMapNotify - + time: TIMESTAMP - + deviceID: CARD8 - + state: KB_INDICATORMASK - + mapChanged: KB_INDICATORMASK @@ -8429,50 +8473,51 @@ state - - + + + - + XkbNamesNotify - + time: TIMESTAMP - + deviceID: CARD8 - + changed: KB_NAMEDETAILMASK - + firstType, nTypes: CARD8 - + firstLevelName, nLevelNames: CARD8 - + firstKey: KEYCODE - + nKeys, nKeyAliases, nRadioGroups: CARD8 - + changedGroupNames: KB_GROUPMASK - + changedVirtualMods: KB_VMODMASK - + changedIndicators: KB_INDICATORMASK @@ -8648,30 +8693,31 @@ changed - - + + + - + XkbCompatMapNotify - + time: TIMESTAMP - + deviceID: CARD8 - + changedGroups: KB_GROUPMASK - + firstSI, nSI: CARD16 - + nTotalSI: CARD16 @@ -8755,50 +8801,51 @@ XkbGroupCompatMask - - + + + - + XkbBellNotify - + time: TIMESTAMP - + deviceID: CARD8 - + bellClass: { KbdFeedbackClass, BellFeedbackClass } - + bellID: CARD8 - + percent: CARD8 - + pitch: CARD16 - + duration: CARD16 - + eventOnly: BOOL - + name: ATOM - + window: WINDOW @@ -8901,42 +8948,43 @@ XkbBell - - + + + - + XkbActionMessage - + time: TIMESTAMP - + deviceID: CARD8 - + keycode: KEYCODE - + press: BOOL - + mods: KEYMASK - + group: KB_GROUP - + keyEventFollows: BOOL - + message: LISTofCARD8 @@ -9017,34 +9065,35 @@ message - - + + + - + XkbAccessXNotify - + time: TIMESTAMP - + deviceID: CARD8 - + detail: KB_AXNDETAILMASK - + keycode: KEYCODE - + slowKeysDelay: CARD16 - + debounceDelay: CARD16 @@ -9078,9 +9127,12 @@ detail field describes the event that occurred and has one of the following values: - - - + + + + + + Detail @@ -9089,7 +9141,7 @@ detail - + AXN_SKPress @@ -9098,7 +9150,7 @@ SlowKeys Key pressed - + AXN_SKAccept @@ -9109,7 +9161,7 @@ SlowKeys K ey held until it was accepted. - + AXN_SKReject @@ -9118,7 +9170,7 @@ SlowKeys Key released before it was accepted. - + AXN_SKRelease @@ -9127,7 +9179,7 @@ SlowKeys Key released after it was accepted. - + AXN_BKAccept @@ -9136,7 +9188,7 @@ BounceKeys Key pressed while it was active. - + AXN_BKReject @@ -9145,7 +9197,7 @@ BounceKeys Key pressed while it was still disabled. - + AXN_AXKWarning @@ -9190,50 +9242,51 @@ Control) for the specified keyboard. - - + + + - + XkbExtensionDeviceNotify - + time: TIMESTAMP - + deviceID: CARD16 - + ledClass: { KbdFeedbackClass, LedFeedbackClass } - + ledID: CARD16 - + reason: KB_XIDETAILMASK - + supported: KB_XIFEATUREMASK - + unsupported: KB_XIFEATUREMASK - + ledsDefined: KB_INDICATORMASK - + ledState: KB_INDICATORMASK - + firstButton, nButtons: CARD8 -- cgit v1.2.1