From 45e3694d529b052f4122262c9bdff5476219b2b4 Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 23 Jan 2012 08:33:10 +0100 Subject: git update libX11 mesa libxcb xkeyboard-config 23 jan 2012 --- libX11/specs/XKB/ch16.xml | 735 +++++++++++++++++++++++++--------------------- 1 file changed, 393 insertions(+), 342 deletions(-) (limited to 'libX11/specs/XKB/ch16.xml') diff --git a/libX11/specs/XKB/ch16.xml b/libX11/specs/XKB/ch16.xml index 2cfdd8e2d..2640ea2dd 100644 --- a/libX11/specs/XKB/ch16.xml +++ b/libX11/specs/XKB/ch16.xml @@ -164,10 +164,11 @@ to key actions: - - + + + - + Bool XkbKeyHasActions @@ -176,14 +177,14 @@ xkb, keycode ) /* macro */ - + XkbDescPtr xkb ; /* Xkb description of interest */ - + KeyCode keycode @@ -208,10 +209,11 @@ False - - + + + - + int XkbKeyNumActions @@ -220,14 +222,14 @@ xkb, keycode ) /* macro */ - + XkbDescPtr xkb ; /* Xkb description of interest */ - + KeyCode keycode @@ -251,10 +253,11 @@ XkbKeyNumSyms - - + + + - + XkbKeyActionPtr XkbKeyActionsPtr @@ -263,14 +266,14 @@ xkb, keycode ) /* macro */ - + XkbDescPtr xkb ; /* Xkb description of interest */ - + KeyCode keycode @@ -297,10 +300,11 @@ XkbKeyNumActions - - + + + - + XkbAction XkbKeyAction @@ -309,21 +313,21 @@ xkb, keycode, idx ) /* macro */ - + XkbDescPtr xkb ; /* Xkb description of interest */ - + KeyCode keycode ; /* keycode of interest */ - + int idx @@ -352,10 +356,11 @@ idx - - + + + - + XkbAction XkbKeyActionEntry @@ -364,28 +369,28 @@ xkb, keycode, shift, grp ) /* macro */ - + XkbDescPtr xkb ; /* Xkb description of interest */ - + KeyCode keycode ; /* keycode of interest */ - + int shift ; /* shift level within group */ - + int grp @@ -479,15 +484,16 @@ type field, and the data structures associated with them are shown in Table 16.1: - +
Action Types - - - - - + + + + + + - + Type Structure for Data XkbAction Union Member @@ -495,7 +501,7 @@ type - + XkbSA_NoAction XkbSA_NoAction @@ -505,7 +511,7 @@ have an associated data structure. any - + XkbSA_SetMods XkbSA_LatchMods @@ -515,7 +521,7 @@ have an associated data structure. mods 16.1.3 - + XkbSA_SetGroup XkbSA_LatchGroup @@ -525,13 +531,13 @@ have an associated data structure. group 16.1.4 - + XkbSA_MovePtr XkbPtrAction ptr 16.1.5 - + XKbSA_PtrBtn XkbSA_LockPtrBtn @@ -539,25 +545,25 @@ have an associated data structure. XkbPtrBtnActionbtn 16.1.6 - + XkbSA_SetPtrDflt XkbPtrDfltAction dflt 16.1.7 - + XkbSA_ISOLock XkbISOAction iso 16.1.8 - + XkbSA_SwitchScreen XkbSwitchScreenAction screen 16.1.9 - + XkbSA_SetControls XkbSA_LockControls @@ -566,19 +572,19 @@ have an associated data structure. ctrls 16.1.10 - + XkbSA_ActionMessage XkbMessgeAction msg 16.1.11 - + XkbSA_RedirectKey XkbRedirectKeyAction redirect 16.1.12 - + XkbSA_DeviceBtn XKbSA_LockDeviceBtn @@ -587,7 +593,7 @@ have an associated data structure. devbtn 16.1.13 - + XkbSA_DeviceValuator XkbDeviceValuatorAction devval @@ -646,18 +652,20 @@ type field can have any of the values shown in Table 16.2. -
+
Modifier Action Types - - + + + + - + Type Effect - + XkbSA_SetMods @@ -685,7 +693,7 @@ flags - + XkbSA_LatchMods @@ -726,7 +734,7 @@ XkbSA_LatchToLock - + XkbSA_LockMods @@ -765,19 +773,20 @@ flags the action type. -
+
Modifier Action Flags - - - + + + + - + Flag Meaning - + XkbSA_UseModMapMods If set, the action modifiers are determined by the modifiers bound by the @@ -793,14 +802,14 @@ vmod2 fields. - + XkbSA_ClearLocks If set and no keys are physically depressed when this key transition occurs, the server unlocks any action modifiers. - + XkbSA_LatchToLock If set, and the action type is @@ -808,7 +817,7 @@ XkbSA_LatchMods , the server locks the action modifiers if they are already latched. - + XkbSA_LockNoLock If set, and the action type is @@ -816,7 +825,7 @@ XkbSA_LockMods , the server only unlocks the action modifiers. - + XkbSA_LockNoUnlock If set, and the action is @@ -881,10 +890,11 @@ convert between the two formats: - - + + + - + unsigned short XkbModActionVMods @@ -893,7 +903,7 @@ act ) /* macro */ - + XkbAction act @@ -920,10 +930,11 @@ vmods - - + + + - + void XkbSetModActionVMods @@ -932,14 +943,14 @@ act, vmods ) /* macro */ - + XkbAction act ; /* action in which to set vmods */ - + unsigned short vmods @@ -997,19 +1008,20 @@ type field can have any of the following values: -
+
Group Action Types - - - + + + + - + Type Effect - + XkbSA_SetGroup @@ -1055,7 +1067,7 @@ Group1 - + XkbSA_LatchGroup @@ -1090,7 +1102,7 @@ Otherwise, the key press adds the key press delta to the latched keyboard group. - + XkbSA_LockGroup @@ -1134,19 +1146,20 @@ type . -
+
Group Action Flags - - - + + + + - + Flag Meaning - + XkbSA_ClearLocks If set and no keys are physically depressed when this key transition occurs, @@ -1155,7 +1168,7 @@ Group1 on a key release. - + XkbSA_LatchToLock If set, and the action type is @@ -1163,7 +1176,7 @@ SA_LatchGroup , the server locks the action group if it is already latched. - + XkbSA_GroupAbsolute If set, the @@ -1184,10 +1197,11 @@ convert between a signed integer value and a signed character: - - + + + - + int XkbSAGroup @@ -1196,7 +1210,7 @@ act ) /* macro */ - + XkbAction act @@ -1219,10 +1233,11 @@ act - - + + + - + void XkbSASetGroup @@ -1231,14 +1246,14 @@ act, grp ) /* macro */ - + XkbAction act ; /* action from which to set group */ - + int grp @@ -1338,19 +1353,20 @@ flags field is a bitwise inclusive OR of the masks shown in Table 16.6. -
+
Pointer Action Types - - - + + + + - + Action Type Meaning - + XkbSA_NoAcceleration If not set, and the @@ -1361,14 +1377,14 @@ KeyPress cursor moves. - + XkbSA_MoveAbsoluteX If set, the X portion of the structure specifies the new pointer X coordinate. Otherwise, the X portion is added to the current pointer X coordinate to determine the new pointer X coordinate. - + XkbSA_MoveAbsoluteY If set, the Y portion of the structure specifies the new @@ -1395,10 +1411,11 @@ XkbPtrAction - - + + + - + int XkbPtrActionX @@ -1407,7 +1424,7 @@ act ) /* macro */ - + XkbPtrAction act @@ -1432,10 +1449,11 @@ act - - + + + - + int XkbPtrActionY @@ -1444,7 +1462,7 @@ act ) /* macro */ - + XkbPtrAction act @@ -1469,10 +1487,11 @@ act - - + + + - + void XkbSetPtrActionX @@ -1483,14 +1502,14 @@ x ) /* macro */ - + XkbPtrAction act ; /* action in which to set X */ - + int x; @@ -1517,10 +1536,11 @@ x - - + + + - + void XkbSetPtrActionY @@ -1529,14 +1549,14 @@ act, y ) /* macro */ - + XkbPtrAction act ; /* action in which to set Y */ - + int y @@ -1601,19 +1621,20 @@ type field can have any one of the values shown in Table 16.7. -
+
Pointer Button Action Types - - - + + + + - + Type Effect - + XkbSA_PtrBtn @@ -1682,7 +1703,7 @@ KeyRelease - + XkbSA_LockPtrBtn @@ -1736,19 +1757,20 @@ type. : -
+
Pointer Button Action Flags - - - + + + + - + Flag Meaning - + XkbSA_UseDfltButton If set, the action uses the pointer button specified by the @@ -1761,7 +1783,7 @@ specified by the field. - + XkbSA_LockNoLock If set, and the action type is @@ -1769,7 +1791,7 @@ XkbSA_LockPtrBtn , the server only unlocks the pointer button. - + XkbSA_LockNoUnlock If set, and the action type is @@ -1839,19 +1861,20 @@ flags 16.9 (currently there is only one value defined). -
+
Pointer Default Flags - - - + + + + - + Flag Meaning - + XkbSA_DfltBtnAbsolute If set, the @@ -1899,10 +1922,11 @@ XkbPtrDfltAction - - + + + - + int XkbSAPtrDfltValue @@ -1911,7 +1935,7 @@ act ) /* macro */ - + XkbAction act @@ -1934,10 +1958,11 @@ act - - + + + - + void XkbSASetPtrDfltValue @@ -1946,7 +1971,7 @@ act, val ) /* macro */ - + XkbPtrDfltAction act @@ -1955,7 +1980,7 @@ valueXXX */ - + int val @@ -2076,19 +2101,20 @@ flags 16.10. -
+
ISO Action Flags when XkbSA_ISODfltIsGroup is Set - - - + + + + - + Flag Meaning - + XkbSA_ISODfltIsGroup @@ -2109,7 +2135,7 @@ set by the key press. - + XkbSA_GroupAbsolute If set, the @@ -2118,7 +2144,7 @@ group_XXX delta to be added to the current group to determine the new group number. - + XkbSA_ISONoAffectMods If not set, any @@ -2132,7 +2158,7 @@ XkbSA_LockMod actions instead. - + XkbSA_ISONoAffectGroup If not set, any @@ -2146,7 +2172,7 @@ XkbSA_LockGroup actions instead. - + XkbSA_ISONoAffectPtr If not set, any @@ -2158,7 +2184,7 @@ XkbSA_LockPtrBtn actions instead. - + XkbSA_ISONoAffectCtrls If not set, any @@ -2186,19 +2212,20 @@ flags 16.11. -
+
ISO Action Flags when XkbSA_ISODfltIsGroup is Not Set - - - + + + + - + Flag Meaning - + XkbSA_ISODfltIsGroup @@ -2223,7 +2250,7 @@ clears the base modifiers set by the key press. - + XkbSA_UseModMapMods If set, the action modifiers are determined by the modifiers bound by the @@ -2239,15 +2266,15 @@ vmod2 fields. - + XkbSA_LockNoLock If set, the server only unlocks the action modifiers. - + XkbSA_LockNoUnlock If set, the server only locks the action modifiers. - + XkbSA_ISONoAffectMods If not set, any @@ -2261,7 +2288,7 @@ XkbSA_LockMod actions instead. - + XkbSA_ISONoAffectGroup If not set, any @@ -2275,7 +2302,7 @@ XkbSA_LockGroup actions instead. - + XkbSA_ISONoAffectPtr If not set, any @@ -2287,7 +2314,7 @@ XkbSA_LockPtrBtn actions instead. - + XkbSA_ISONoAffectCtrls If not set, any @@ -2347,19 +2374,20 @@ affect 16.11. -
+
ISO Action Affect Field Values - - - + + + + - + Affect Meaning - + XkbSA_ISODNoAffectMods If @@ -2375,7 +2403,7 @@ SA_LockMods instead. - + XkbSA_ISONoAffectGroup If @@ -2391,7 +2419,7 @@ SA_LockGroup instead. - + XkbSA_ISONoAffectPtr If @@ -2405,7 +2433,7 @@ SA_LockPtrBtn instead. - + XkbSA_ISONoAffectCtrls If @@ -2465,19 +2493,20 @@ flags 16.13. -
+
Switch Screen Action Flags - - - + + + + - + Flag Meaning - + XkbSA_SwitchAbsolute If set, the @@ -2486,7 +2515,7 @@ screenXXX offset from the current screen to the new screen. - + XkbSA_SwitchApplication If not set, the action should switch to another screen on the same @@ -2513,10 +2542,11 @@ XkbSwitchScreenAction - - + + + - + int XkbSAScreen @@ -2525,7 +2555,7 @@ act ) /* macro */ - + XkbSwitchScreenAction act @@ -2548,10 +2578,11 @@ act - - + + + - + void XkbSASetScreen @@ -2560,7 +2591,7 @@ act, s ) /* macro */ - + XkbSwitchScreenAction act @@ -2569,7 +2600,7 @@ screenXXX */ - + int s @@ -2628,19 +2659,20 @@ type field can have any one of the values shown in Table 16.14. -
+
Controls Action Types - - - + + + + - + Type Effect - + XkbSA_SetControls @@ -2666,7 +2698,7 @@ XkbControlsNotify - + XkbSA_LockControls @@ -2713,19 +2745,20 @@ flags 16.15. -
+
Control Action Flags - - - + + + + - + Flag Meaning - + XkbSA_LockNoLock If set, and the action type is @@ -2733,7 +2766,7 @@ XkbSA_LockControls , the server only disables controls. - + XkbSA_LockNoUnlock If set, and the action type is @@ -2777,10 +2810,11 @@ macros, to convert between the two formats: - - + + + - + unsigned int XkbActionCtrls @@ -2789,7 +2823,7 @@ act ) /* macro */ - + XkbCtrlsAction act @@ -2812,10 +2846,11 @@ act - - + + + - + void XkbSAActionSetCtrls @@ -2824,14 +2859,14 @@ act, ctrls ) /* macro */ - + XkbCtrlsAction act ; /* action in which to set ctrls0-ctrls3 */ - + unsigned int ctrls @@ -2898,19 +2933,20 @@ flags 16.16. -
+
Message Action Flags - - - + + + + - + Flag Meaning - + XkbSA_MessageOnPress If set, key press events generate an @@ -2920,7 +2956,7 @@ message field. - + XkbSA_MessageOnRelease If set, key release events generate an @@ -2930,7 +2966,7 @@ message field. - + XkbSA_MessageGenKeyEvent If set, key press and key release events generate @@ -3191,10 +3227,11 @@ convert between the two formats: - - + + + - + unsigned int XkbSARedirectVModsMask @@ -3203,7 +3240,7 @@ act ) /* macro */ - + XkbRedirectKeyAction act @@ -3228,10 +3265,11 @@ act - - + + + - + void XkbSARedirectSetVModsMask @@ -3240,14 +3278,14 @@ act, vm ) /* macro */ - + XkbRedirectKeyAction act ; /* action in which to set vmods */ - + unsigned int vm @@ -3286,10 +3324,11 @@ provides the following convenience macros: - - + + + - + unsigned int XkbSARedirectVMods @@ -3298,7 +3337,7 @@ act ) /* macro */ - + XkbRedirectKeyAction act @@ -3316,10 +3355,11 @@ act - - + + + - + void XkbSARedirectSetVMods @@ -3328,14 +3368,14 @@ act, vm ) /* macro */ - + XkbRedirectKeyAction act ; /* action in which to set vmods */ - + unsigned int v @@ -3384,19 +3424,20 @@ type field can have any one of the values shown in Table 16.17. -
+
Device Button Action Types - - - + + + + - + Type Effect - + XkbSA_DeviceBtn @@ -3443,7 +3484,7 @@ KeyRelease - + XkbSA_LockDeviceBtn @@ -3498,19 +3539,20 @@ flags 16.18. -
+
Device Button Action Flags - - - + + + + - + Flag Meaning - + XkbSA_LockNoLock If set, and the action type is @@ -3518,7 +3560,7 @@ XkbSA_LockDeviceBtn , the server only unlocks the button. - + XkbSA_LockNoUnlock If set, and the action type is @@ -3590,41 +3632,42 @@ val<n>Scale is shown in that table also. -
+
Device Valuator v<n>_what High Bits Values - - - + + + + - + Value of high bits Effect - + XkbSA_IgnoreVal No action - + XkbSA_SetValMin v<n>_value is set to its minimum legal value. - + XkbSA_SetValCenter v<n>_valueis centered (to (max-min)/2). - + XkbSA_SetValMax v<n>_value is set to its maximum legal value. - + XkbSA_SetValRelative v<n>_value * (2 @@ -3632,7 +3675,7 @@ val<n>Scale v<n>_value. - + XkbSA_SetValAbsolute v<n>_value @@ -3695,10 +3738,11 @@ XkbGetKeyActions - - + + + - + Status XkbGetKeyActions @@ -3713,28 +3757,28 @@ num ) - + Display * dpy ; /* connection to X server */ - + unsigned int first ; /* keycode of first key of interest */ - + unsigned int num ; /* number of keys desired */ - + XkbDescPtr xkb @@ -3812,10 +3856,11 @@ XkbResizeKeyAction - - + + + - + XkbAction * XkbResizeKeyActions @@ -3828,21 +3873,21 @@ xkb ) - + XkbDescRec * xkb ; /* keyboard description to change */ - + int key ; /* keycode of key to change */ - + int needed @@ -4021,19 +4066,20 @@ type . Xkb supports the key behaviors shown in Table 16.20. -
+
Key Behaviors - - - + + + + - + Type Effect - + XkbKB_Default Press and release events are processed normally. The @@ -4041,7 +4087,7 @@ data field is unused. - + XkbKB_Lock If a key is logically up (that is, the corresponding bit of the core key map is @@ -4053,7 +4099,7 @@ data field is unused. - + XkbKB_RadioGroup @@ -4078,7 +4124,7 @@ All other key release events are ignored. - + XkbKB_Overlay1 If the @@ -4091,7 +4137,7 @@ data ’s keycode. Otherwise, press and release events are processed normally. - + XkbKB_Overlay2 If the @@ -4136,10 +4182,11 @@ XkbGetKeyBehaviors - - + + + - + Status XkbGetKeyBehaviors @@ -4154,28 +4201,28 @@ dpy ) - + Display * dpy ; /* connection to server */ - + unsigned int first ; /* keycode of first key to get */ - + unsigned int num ; /* number of keys for which behaviors are desired */ - + XkbDescPtr xkb @@ -4270,21 +4317,22 @@ this array is a mask that is a bitwise inclusive OR of the values shown in Table 16.21. -
+
Explicit Component Masks - - - - + + + + + - + Bit in Explicit Mask Value Protects Against - + ExplicitKeyType1 (1<<0) @@ -4292,7 +4340,7 @@ Automatic determination of the key type associated with Group1. - + ExplicitKeyType2 (1<<1) @@ -4300,7 +4348,7 @@ Automatic determination of the key type associated with Group2. - + ExplicitKeyType3 (1<<2) @@ -4308,7 +4356,7 @@ Automatic determination of the key type associated with Group3. - + ExplicitKeyType4 (1<<3) @@ -4316,7 +4364,7 @@ Automatic determination of the key type associated with Group4. - + ExplicitInterpret (1<<4) @@ -4324,13 +4372,13 @@ Application of any of the fields of a symbol interpretation to the key in question. - + ExplicitAutoRepeat (1<<5) Automatic determination of auto-repeat status for the key, as specified in a symbol interpretation. - + ExplicitBehavior (1<<6) @@ -4341,7 +4389,7 @@ XkbSI_LockingKey flag is set in a symbol interpretation. - + ExplicitVModMap (1<<7) @@ -4365,10 +4413,11 @@ XkbGetKeyExplicitComponents. - - + + + - + Status XkbGetKeyExplicitComponents @@ -4383,28 +4432,28 @@ dpy ) - + Display * dpy ; /* connection to server */ - + unsigned int first ; /* keycode of first key to fetch */ - + unsigned int num ; /* number of keys for which to get explicit info */ - + XkbDescPtr xkb @@ -4577,10 +4626,11 @@ XkbGetVirtualMods - - + + + - + Status XkbGetVirtualMods @@ -4593,21 +4643,21 @@ dpy ) - + Display * dpy ; /* connection to server */ - + unsigned int which ; /* mask indicating virtual modifier bindings to get */ - + XkbDescPtr xkb @@ -4682,10 +4732,11 @@ XkbGetKeyVirtualModMap - - + + + - + Status XkbGetKeyVirtualModMap @@ -4700,28 +4751,28 @@ dpy ) - + Display * dpy ; /* connection to server */ - + unsigned int first ; /* keycode of first key to fetch */ - + unsigned int num ; /* # keys for which virtual mod maps are desired */ - + XkbDescPtr xkb -- cgit v1.2.3