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/XIM/xim.xml | 420 ++++++++--------- libX11/specs/XKB/ch01.xml | 17 +- libX11/specs/XKB/ch02.xml | 104 +++-- libX11/specs/XKB/ch04.xml | 110 ++--- libX11/specs/XKB/ch05.xml | 150 +++--- libX11/specs/XKB/ch06.xml | 87 ++-- libX11/specs/XKB/ch07.xml | 13 +- libX11/specs/XKB/ch08.xml | 255 ++++++----- libX11/specs/XKB/ch09.xml | 174 +++---- libX11/specs/XKB/ch10.xml | 727 +++++++++++++++-------------- libX11/specs/XKB/ch11.xml | 58 +-- libX11/specs/XKB/ch12.xml | 107 +++-- libX11/specs/XKB/ch13.xml | 625 +++++++++++++------------ libX11/specs/XKB/ch14.xml | 207 +++++---- libX11/specs/XKB/ch15.xml | 346 +++++++------- libX11/specs/XKB/ch16.xml | 735 ++++++++++++++++-------------- libX11/specs/XKB/ch17.xml | 194 ++++---- libX11/specs/XKB/ch18.xml | 175 +++---- libX11/specs/XKB/ch19.xml | 19 +- libX11/specs/XKB/ch20.xml | 184 ++++---- libX11/specs/XKB/ch21.xml | 232 +++++----- libX11/specs/XKB/ch22.xml | 38 +- libX11/specs/i18n/framework/framework.xml | 165 +++---- libX11/specs/i18n/localedb/localedb.xml | 155 ++++--- libX11/specs/i18n/trans/trans.xml | 403 ++++++++-------- libX11/specs/libX11/AppA.xml | 26 +- libX11/specs/libX11/CH03.xml | 40 +- libX11/specs/libX11/CH06.xml | 19 +- libX11/specs/libX11/CH07.xml | 63 +-- libX11/specs/libX11/CH10.xml | 83 ++-- libX11/specs/libX11/CH11.xml | 15 +- libX11/specs/libX11/CH12.xml | 7 +- libX11/specs/libX11/CH13.xml | 234 +++++----- libX11/specs/libX11/CH14.xml | 23 +- 34 files changed, 3294 insertions(+), 2916 deletions(-) (limited to 'libX11/specs') diff --git a/libX11/specs/XIM/xim.xml b/libX11/specs/XIM/xim.xml index fa4941153..131719704 100644 --- a/libX11/specs/XIM/xim.xml +++ b/libX11/specs/XIM/xim.xml @@ -619,16 +619,17 @@ XICATTR (*2) The value types are defined as follows: - - - - - - - + + + + + + + + - + values data format @@ -636,159 +637,159 @@ XICATTR - + #0 Separator of NestedList -----(*3) - + #1 byte data CARD8 - + #2 word data CARD16 - + #3 long data CARD32 - + #4 char data STRING8 - + #5 Window CARD32 - + #10 XIMStyles 2 n number of XIMStyle list - + 2 unused - + n CARD32 XIMStyle list - + #11 XRectangle 2 INT16 X - + 2 INT16 Y - + 2 CARD16 width - + 2 CARD16 height - + #12 XPoint 2 INT16 X - + 2 INT16 Y - + #13 XFontSet 2 n length of Base font name - + n STRING8 Base font name list - + p unused, p = Pad(2+n) - + #15 XIMHotKeyTriggers 4 n number of XIMTRIGGERKEY list (*4) - + n XIMTRIGGERKEY XIMHotkeyTrigger list - + n XIMHOTKEYSTATE HotKey processing state - + #17 XIMStringConversion XIMSTRCONVTEXT - + #18 XIMPreeditState XIMPREEDITSTATE - + #19 XIMResetState XIMRESETSTATE - + #x7fff NestedList ----- @@ -3039,66 +3040,67 @@ window of XIM_SERVER selection, which the IM Server has created. Refer to "The Input Method Protocol" for the XIM_SERVER atom. - -The ClientMessage sent to the IMS window. - - - - +
+ + The ClientMessage sent to the IMS window. + + + + - - Structure Member + + Structure Member Contents - + int type ClientMessage - + u_long serial Set by the X Window System - + Bool send_event Set by the X Window System - + Display *display The display to which connects - + Window window IMS Window ID - + Atom message_type XInternAtom(display, "_XIM_XCONNECT", False) - + int format 32 - + long data.l[0] client communication window ID - + long data.l[1] client-major-transport-version (*1) - + long data.l[2] client-major-transport-version (*1) @@ -3113,71 +3115,72 @@ window), the IM Server sends a ClientMessage in the following event's format to the client communication window. -
-The ClientMessage sent by the IM Server. - - - - +
+ + The ClientMessage sent by the IM Server. + + + + - - Structure Member + + Structure Member Contents - + int type ClientMessage - + u_long serial Set by the X Window System - + Bool send_event Set by the X Window System - + Display *display The display to which connects - + Window window client communication window ID - + Atom message_type XInternAtom(display, "_XIM_XCONNECT", False) - + int format 32 - + long data.l[0] IMS communication window ID - + long data.l[1] server-major-transport-version (*1) - + long data.l[2] server-minor-transport-version (*1) - + long data.l[3] dividing size between ClientMessage and Property (*2) @@ -3196,15 +3199,16 @@ major/minor-transport-version, as follows:
-The read/write method and the major/minor-transport-version - - - - + + The read/write method and the major/minor-transport-version + + + + - Transport-version + Transport-version read/write @@ -3214,12 +3218,12 @@ major/minor-transport-version, as follows: - + 0 0 only-CM & Property-with-CM - + 1 only-CM & multi-CM @@ -3232,7 +3236,7 @@ major/minor-transport-version, as follows: 0 PropertyNotify - + 2 0 only-CM & PropertyNotify @@ -3317,56 +3321,57 @@ If data is sent via ClientMessage event, the format is as follows: -
+
+ The ClientMessage event's format (first or middle) - - - - + + + + - - Structure Member + + Structure Member Contents - + int type ClientMessage - + u_long serial Set by the X Window System - + Bool send_event Set by the X Window System - + Display *display The display to which connects - + Window window IMS communication window ID - + Atom message_type XInternAtom(display, "_XIM_MOREDATA", False) - + int format 8 - + char data.b[20] (read/write DATA : 20 byte) @@ -3375,56 +3380,57 @@ If data is sent via ClientMessage event, the format is as follows:
- +
+ The ClientMessage event's format (only or last) - - - - + + + + - - Structure Member + + Structure Member Contents - + int type ClientMessage - + u_long serial Set by the X Window System - + Bool send_event Set by the X Window System - + Display *display The display to which connects - + Window window IMS communication window ID - + Atom message_type XInternAtom(display, "_XIM_PROTOCOL", False) - + int format 8 - + char data.b[20] (read/write DATA : MAX 20 byte) (*1) @@ -3469,56 +3475,57 @@ IM Server via PropertyNotify event. The arguments of the XChangeProperty are as follows: -
+
+ The XChangeProperty event's format - - - - + + + + - - Argument + + Argument Contents - + Display *display The display to which connects - + Window window IMS communication window ID - + Atom property read/write property Atom (*1) - + Atom type XA_STRING - + int format 8 - + int mode PropModeAppend - + u_char *data read/write DATA - + int nelements length of DATA @@ -3546,61 +3553,62 @@ If Atom is notified via ClientMessage event, the format of the ClientMessage is as follows: -
+
+ The ClientMessage event's format to send Atom of property - - - - + + + + - - Structure Members + + Structure Members Contents - + int type ClientMessage - + u_long serial Set by the X Window System - + Bool send_event Set by the X Window System - + Display *display The display to which connects - + Window window IMS communication window ID - + Atom message_type XInternAtom(display, "_XIM_PROTOCOL", False) - + int format 32 - + long data.l[0] length of read/write property Atom - + long data.l[1] read/write property Atom @@ -3626,56 +3634,57 @@ The format of the ClientMessage is as follows: -
+
+ The ClientMessage event's format (first or middle) - - - - + + + + - - Structure Members - Contents + + Structure Members + Contents - + int type ClientMessage - + u_long serial Set by the X Window System - + Bool send_event Set by the X Window System - + Display *display The display to which connects - + Window window client communication window ID - + Atom message_type XInternAtom(display, "_XIM_MOREDATA", False) - + int format 8 - + char data.b[20] (read/write DATA : 20 byte) @@ -3685,56 +3694,57 @@ The format of the ClientMessage is as follows:
- +
+ The ClientMessage event's format (only or last) - - - - + + + + - - Structure Members - Contents + + Structure Members + Contents - + int type ClientMessage - + u_long serial Set by the X Window System - + Bool send_event Set by the X Window System - + Display *display The display to which connects - + Window window client communication window ID - + Atom message_type XInternAtom(display, "_XIM_PROTOCOL", False) - + int format 8 - + char data.b[20] (read/write DATA : MAX 20 byte) (*1) @@ -3779,56 +3789,57 @@ PropertyNotify event. The arguments of the XChangeProperty are as follows: -
+
+ The XChangeProperty event's format - - - - + + + + - - Argument - Contents + + Argument + Contents - + Display *display The display which to connects - + Window window client communication window ID - + Atom property read/write property Atom (*1) - + Atom type XA_STRING - + int format 8 - + int mode PropModeAppend - + u_char *data read/write DATA - + int nelements length of DATA @@ -3853,61 +3864,62 @@ is as follows: -
+
+ The ClientMessage event's format to send Atom of property - - - + + + - - Structure Member - Contents + + Structure Member + Contents - + int type ClientMessage - + u_long serial Set by the X Window System - + Bool send_event Set by the X Window System - + Display *display The display to which connects - + Window window client communication window ID - + Atom message_type XInternAtom(display, "_XIM_PROTOCOL", False) - + int format 32 - + long data.l[0] length of read/write property ATOM - + long data.l[1] read/write property ATOM diff --git a/libX11/specs/XKB/ch01.xml b/libX11/specs/XKB/ch01.xml index e756d1a96..15cc97dad 100644 --- a/libX11/specs/XKB/ch01.xml +++ b/libX11/specs/XKB/ch01.xml @@ -361,28 +361,29 @@ BadMatch generated. -
+
Function Error Returns Due to Extension Problems - - - + + + + - + Functions return type Return value - + pointer to a structure NULL - + Bool False - + Status BadAccess diff --git a/libX11/specs/XKB/ch02.xml b/libX11/specs/XKB/ch02.xml index 57286a475..b626a4322 100644 --- a/libX11/specs/XKB/ch02.xml +++ b/libX11/specs/XKB/ch02.xml @@ -93,10 +93,11 @@ To determine the compatibility of a library at runtime, call XkbLibraryVersion. - - + + + - + Bool XkbLibraryVersion @@ -107,14 +108,14 @@ lib_minor_in_out ) - + int * lib_major_in_out; /* specifies and returns the major Xkb library version. */ - + int * lib_minor_in_out; @@ -201,10 +202,11 @@ and initializes the extension when it is present. - - + + + - + Bool XkbQueryExtension @@ -213,42 +215,42 @@ dpy, opcode_rtrn, event_rtrn, error_rtrn, major_in_out, minor_in_out ) - + Display * dpy; /* connection to the X server */ - + int * opcode_rtrn ; /* backfilled with the major extension opcode */ - + int * event_rtrn ; /* backfilled with the extension base event code */ - + int * error_rtrn ; /* backfilled with the extension base error code */ - + int * major_in_out ; /* compile time lib major version in, server major version out */ - + int * minor_in_out; @@ -303,10 +305,11 @@ server, and initialize the extension for use. - - + + + - + Display * XkbOpenDisplay @@ -315,7 +318,7 @@ display_name, event_rtrn, error_rtrn, major_in_out, minor_in_out, reason_rtrn) - + char * display_name @@ -323,35 +326,35 @@ display_name communications domain to be used */ - + int * event_rtrn ; /* backfilled with the extension base event code */ - + int * error_rtrn ; /* backfilled with the extension base error code */ - + int * major_in_out ; /* compile time lib major version in, server major version out */ - + int * minor_in_out ; /* compile time lib minor version in, server minor version out */ - + int * reason_rtrn @@ -491,10 +494,11 @@ disable use of the extension once a connection is established. - - + + + - + Bool XkbIgnoreExtension @@ -503,7 +507,7 @@ ignore ) - + Bool ignore @@ -557,11 +561,12 @@ requests in Xlib and the server. Table 2.1 lists the protocol errors that can be generated, and their causes. -
+
Xkb Protocol Errors - - - + + + + Error @@ -569,7 +574,7 @@ Table 2.1 lists the protocol errors that can be generated, and their causes. - + BadAccess @@ -577,7 +582,7 @@ The Xkb extension has not been properly initialized - + BadKeyboard @@ -585,7 +590,7 @@ The device specified was not a valid core or input extension device - + BadImplementation @@ -593,7 +598,7 @@ Invalid reply from server - + BadAlloc @@ -601,7 +606,7 @@ Unable to allocate storage - + BadMatch @@ -610,7 +615,7 @@ correct type and range, but is otherwise invalid - + BadValue @@ -618,7 +623,7 @@ An argument is out of range - + BadAtom @@ -627,7 +632,7 @@ None - + BadDevice @@ -660,15 +665,16 @@ significant byte will contain the device, class, or feedback ID as indicated in the table. -
+
BadKeyboard Protocol Error resource_id Values - - - - - + + + + + + - + high-order byte value meaning @@ -676,7 +682,7 @@ the table. - + XkbErr_BadDevice 0xff @@ -686,7 +692,7 @@ device not found device ID - + XkbErr_BadClass 0xfe @@ -696,7 +702,7 @@ device found, but it is of the wrong class class ID - + XkbErr_BadId 0xfd diff --git a/libX11/specs/XKB/ch04.xml b/libX11/specs/XKB/ch04.xml index f267ee512..223b44497 100644 --- a/libX11/specs/XKB/ch04.xml +++ b/libX11/specs/XKB/ch04.xml @@ -73,15 +73,16 @@ Xkb.h event. -
+
Xkb Event Types - - - - - + + + + + + - + Event Type Conditions Generating Event Section @@ -89,7 +90,7 @@ event. - + XkbNewKeyboardNotify @@ -103,7 +104,7 @@ event. 187 - + XkbMapNotify @@ -119,7 +120,7 @@ event. 122 - + XkbStateNotify @@ -133,7 +134,7 @@ event. 25 - + XkbControlsNotify @@ -147,7 +148,7 @@ event. 79 - + XkbIndicatorStateNotify @@ -161,7 +162,7 @@ event. 45 - + XkbIndicatorMapNotify @@ -175,7 +176,7 @@ event. 45 - + XkbNamesNotify @@ -189,7 +190,7 @@ event. 185 - + XkbCompatMapNotify @@ -203,7 +204,7 @@ event. 178 - + XkbBellNotify @@ -217,7 +218,7 @@ event. 52 - + XkbActionMessage @@ -231,7 +232,7 @@ event. 155 - + XkbAccessXNotify @@ -245,7 +246,7 @@ event. 65 - + XkbExtensionDeviceNotify @@ -387,10 +388,11 @@ XkbSelectEvents - - + + + - + Bool XkbSelectEvents @@ -399,14 +401,14 @@ display, device_spec, bits_to_change, values_for_bits ) - + Display * display ; /* connection to the X server */ - + unsigned int device_spec @@ -415,14 +417,14 @@ XkbUseCoreKbd */ - + unsigned long int bits_to_change; /* determines events to be selected / deselected */ - + unsigned long int values_for_bits @@ -516,10 +518,11 @@ XkbSelectEvents - - + + + - + Bool XkbSelectEventDetails @@ -530,14 +533,14 @@ values_for_bits ) - + Display * display ; /* connection to the X server */ - + unsigned int device_spec @@ -546,21 +549,21 @@ XkbUseCoreKbd */ - + unsigned int event_type ; /* Xkb event type of interest */ - + unsigned long int bits_to_change ; /* event selection details */ - + unsigned long int values_for_bits @@ -656,105 +659,106 @@ XkbSelectEvents request and the circumstances in which the mask should be specified. -
+
XkbSelectEvents Mask Constants - - - - + + + + + - + Event Mask Value Notification Wanted - + XkbNewKeyboardNotifyMask (1L<<0) Keyboard geometry change - + XkbMapNotifyMask (1L<<1) Keyboard mapping change - + XkbStateNotifyMask (1L<<2) Keyboard state change - + XkbControlsNotifyMask (1L<<3) Keyboard control change - + XkbIndicatorStateNotifyMask (1L<<4) Keyboard indicator state change - + XkbIndicatorMapNotifyMask (1L<<5) Keyboard indicator map change - + XkbNamesNotifyMask (1L<<6) Keyboard name change - + XkbCompatMapNotifyMask (1L<<7) Keyboard compat map change - + XkbBellNotifyMask (1L<<8) Bell - + XkbActionMessageMask (1L<<9) Action message - + XkbAccessXNotifyMask (1L<<10) AccessX features - + XkbExtensionDeviceNotifyMask (1L<<11) Extension device - + XkbAllEventsMask diff --git a/libX11/specs/XKB/ch05.xml b/libX11/specs/XKB/ch05.xml index 626a0c040..3a507aa3b 100644 --- a/libX11/specs/XKB/ch05.xml +++ b/libX11/specs/XKB/ch05.xml @@ -308,34 +308,35 @@ affect
Real Modifier Masks - - + + + - + Mask - + ShiftMask - + LockMask - + ControlMask - + Mod1Mask - + Mod2Mask - + Mod3Mask - + Mod4Mask - + Mod5Mask @@ -348,10 +349,11 @@ XkbLockModifiers: - - + + + - + Bool XkbLockModifiers ( @@ -359,14 +361,14 @@ display, device_spec, affect, values ) - + Display * display ; /* connection to the X server */ - + unsigned int device_spec @@ -375,14 +377,14 @@ XkbUseCoreKbd */ - + unsigned int affect ; /* mask of real modifiers whose lock state is to change */ - + unsigned int values @@ -423,10 +425,11 @@ XkbLatchModifiers: - - + + + - + Bool XkbLatchModifiers @@ -435,14 +438,14 @@ isplay, device_spec, affect, values ) - + Display * display ; /* connection to the X server */ - + unsigned int device_spec @@ -451,14 +454,14 @@ XkbUseCoreKbd */ - + unsigned int affect ; /* mask of modifiers whose latch state is to change */ - + unsigned int values; /* 1 => latch, 0 => unlatch; only for mods selected by @@ -499,28 +502,30 @@ False Reference the keysym group indices with these symbolic constants: -
+
Symbolic Group Names - - + + + + - + Symbolic Name Value - + XkbGroup1Index 0 - + XkbGroup2Index 1 - + XkbGroup3Index 2 - + XkbGroup4Index 3 @@ -534,10 +539,11 @@ XkbLockGroup. - - + + + - + Bool XkbLockGroup @@ -546,14 +552,14 @@ display, device_spec, group ) - + Display * display ; /* connection to the X server */ - + unsigned int device_spec @@ -562,7 +568,7 @@ XkbUseCoreKbd */ - + unsigned int group @@ -593,10 +599,11 @@ XkbLatchGroup. - - + + + - + Bool XkbLatchGroup @@ -605,14 +612,14 @@ display, device_spec, group ) - + Display * display ; /* connection to the X server */ - + unsigned int device_spec @@ -621,7 +628,7 @@ XkbUseCoreKbd */ - + unsigned int group @@ -681,10 +688,11 @@ XkbGetState. - - + + + - + Status XkbGetState @@ -697,14 +705,14 @@ state_return ) - + Display * display ; /* connection to the X server */ - + unsigned int device_spec @@ -713,7 +721,7 @@ XkbUseCoreKbd */ - + XkbStatePtr state_return @@ -755,74 +763,76 @@ XkbStateNotify There are many different types of Xkb state changes. Xkb defines an event detail mask corresponding to each type of change. The event detail masks are listed in Table 5.3. -
+
XkbStateNotify Event Detail Masks - - + + + + - + Mask Value - + XkbModifierStateMask (1L << 0) - + XkbModifierBaseMask (1L << 1) - + XkbModifierLatchMask (1L << 2) - + XkbModifierLockMask (1L << 3) - + XkbGroupStateMask (1L << 4) - + XkbGroupBaseMask (1L << 5) - + XkbGroupLatchMask (1L << 6) - + XkbGroupLockMask (1L << 7) - + XkbCompatStateMask (1L << 8) - + XkbGrabModsMask (1L << 9) - + XkbCompatGrabModsMask (1L << 10) - + XkbLookupModsMask (1L << 11) - + XkbCompatLookupModsMask (1L << 12) - + XkbPointerButtonMask (1L << 13) - + XkbAllStateComponentsMask (0x3fff) diff --git a/libX11/specs/XKB/ch06.xml b/libX11/specs/XKB/ch06.xml index f74137131..422e6d23b 100644 --- a/libX11/specs/XKB/ch06.xml +++ b/libX11/specs/XKB/ch06.xml @@ -77,43 +77,44 @@ XkbDescRec . -
+
XkbDescRec Component References - - - + + + + - + XkbDescRec Field For more info - + ctrls Chapter 10 - + server Chapter 16 - + map Chapter 15 - + indicators Chapter 8 - + names Chapter 18 - + compat Chapter 17 - + geom Chapter 13 @@ -130,56 +131,57 @@ XkbDescRec are shown in Table 6.2. -
+
Mask Bits for XkbDescRec - - - - + + + + + - + Mask Bit XkbDescRec Field Value - + XkbControlsMask ctrls (1L<<0) - + XkbServerMapMask server (1L<<1) - + XkbIClientMapMask map (1L<<2) - + XkbIndicatorMapMask indicators (1L<<3) - + XkbNamesMask names (1L<<4) - + XkbCompatMapMask compat (1L<<5) - + XkbGeometryMask geom (1L<<6) - + XkbAllComponentsMask All Fields (0x7f) @@ -202,10 +204,11 @@ XkbGetKeyboardbyName - - + + + - + XkbDescPtr XkbGetKeyboard @@ -214,21 +217,21 @@ display, which, device_spec ) - + Display * display ; /* connection to X server */ - + unsigned int which ; /* mask indicating components to return */ - + unsigned int device_spec @@ -306,10 +309,11 @@ Xmalloc - - + + + - + XkbDescRec * XkbAllocKeyboard @@ -344,10 +348,11 @@ XkbFreeKeyboard. - - + + + - + void XkbFreeKeyboard @@ -356,21 +361,21 @@ XkbFreeKeyboard ) - + XkbDescPtr xkb ; /* keyboard description with components to free */ - + unsigned int which ; /* mask selecting components to free */ - + Bool free_all diff --git a/libX11/specs/XKB/ch07.xml b/libX11/specs/XKB/ch07.xml index 93d61d8cc..35b45901f 100644 --- a/libX11/specs/XKB/ch07.xml +++ b/libX11/specs/XKB/ch07.xml @@ -252,10 +252,11 @@ XkbVirtualModsToReal - - + + + - + Bool XkbVirtualModsToReal @@ -264,21 +265,21 @@ xkb, virtual_mask, mask_rtrn ) - + XkbDescPtr xkb ; /* keyboard description for input device */ - + unsigned int virtual_mask ; /* virtual modifier mask to translate */ - + unsigned int * mask_rtrn diff --git a/libX11/specs/XKB/ch08.xml b/libX11/specs/XKB/ch08.xml index 87c0c08f8..2b91f00ff 100644 --- a/libX11/specs/XKB/ch08.xml +++ b/libX11/specs/XKB/ch08.xml @@ -203,33 +203,34 @@ flags and their effects are shown in Table 8.1. -
+
XkbIndicatorMapRec flags Field - - - - + + + + + - + Value Effect - + XkbIM_NoExplicit (1L<<7) Client applications cannot change the state of the indicator. - + 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 (1L<<5) A client application changing the state of the indicator causes the @@ -358,20 +359,21 @@ groups is shown in Table 8.2. -
+
XkbIndicatorMapRec which_groups and groups, Keyboard Drives Indicator - - - + + + + - + which_groups Effect - + XkbIM_UseNone The @@ -379,7 +381,7 @@ groups field and the current keyboard group state are ignored. - + XkbIM_UseBase If @@ -390,7 +392,7 @@ groups is zero, the indicator is lit whenever the base keyboard group is zero. - + XkbIM_UseLatched If @@ -401,7 +403,7 @@ groups is zero, the indicator is lit whenever the latched keyboard group is zero. - + XkbIM_UseLocked The @@ -411,7 +413,7 @@ keyboard group matches one of the bits that are set in groups. - + XkbIM_UseEffective The @@ -437,30 +439,33 @@ XkbIM_LEDDrivesKB State" column refers to the new state to which you set the indicator. -
+
XkbIndicatorMapRec which_groups and groups, Indicator Drives Keyboard - - + + + + + - + which_groups New State Effect on Keyboard Group State - + XkbIM_UseNone On or Off No effect - + XkbIM_UseBase On or Off No effect - + XkbIM_UseLatched On @@ -474,7 +479,7 @@ groups is empty, the keyboard group latch is changed to zero. - + XkbIM_UseLatched Off @@ -490,7 +495,7 @@ groups keyboard group. - + XkbIM_UseLocked or XkbIM_UseEffective On @@ -501,7 +506,7 @@ changed to the lowest numbered group specified in groups. - + XkbIM_UseLocked or XkbIM_UseEffective Off @@ -605,23 +610,25 @@ mods is shown in Table 8.4 -
+
XkbIndicatorMapRec which_mods and mods, Keyboard Drives Indicator - - + + + + - + which_mods Effect on Keyboard Modifiers - + XkbIM_UseNone The mods field and the current keyboard modifier state are ignored. - + XkbIM_UseBase The indicator is lit when any of the modifiers specified in the @@ -636,7 +643,7 @@ mods.vmods modifiers. - + XkbIM_UseLatched The indicator is lit when any of the modifiers specified in the @@ -650,7 +657,7 @@ mods.vmods are zero, the indicator is lit when none of the modifier keys are latched. - + XkbIM_UseLocked The indicator is lit when any of the modifiers specified in the @@ -664,7 +671,7 @@ mods.vmods are zero, the indicator is lit when none of the modifier keys are locked. - + XkbIM_UseEffective The indicator is lit when any of the modifiers specified in the @@ -679,7 +686,7 @@ mods.vmods modifiers. - + XkbIM_UseCompat The indicator is lit when any of the modifiers specified in the @@ -709,25 +716,27 @@ XkbIM_LEDDrivesKB State" column refers to the new state to which you set the indicator. -
+
XkbIndicatorMapRec which_mods and mods, Indicator Drives Keyboard - - - + + + + + - + which_mods New State Effect on Keyboard Modifiers - + XkbIM_UseNone or XkbIM_UseBase On or Off No Effect - + XkbIM_UseLatched On @@ -738,7 +747,7 @@ mods are added to the latched modifiers. - + XkbIM_UseLatched Off @@ -749,7 +758,7 @@ mods are removed from the latched modifiers. - + XkbIM_UseLocked, XkbIM_UseCompat, or XkbIM_UseEffective On @@ -760,7 +769,7 @@ mods are added to the locked modifiers. - + XkbIM_UseLocked Off @@ -771,7 +780,7 @@ mods are removed from the locked modifiers. - + XkbIM_UseCompat or XkbIM_UseEffective Off @@ -853,10 +862,11 @@ XkbGetIndicatorState. - - + + + - + Status XkbGetIndicatorState @@ -869,14 +879,14 @@ state_return ) - + Display * display ; /* connection to the X server */ - + unsigned int device_spec @@ -885,7 +895,7 @@ XkbUseCoreKbd */ - + unsigned int * state_return @@ -933,10 +943,11 @@ XkbGetIndicatorMap. - - + + + - + Status XkbGetIndicatorMap @@ -949,21 +960,21 @@ dpy ) - + Display * dpy ; /* connection to the X server */ - + unsigned int which ; /* mask of indicators for which maps should be returned */ - + XkbDescPtr desc @@ -1042,10 +1053,11 @@ XkbGetNamedIndicator - - + + + - + Bool XkbGetNamedIndicator @@ -1066,14 +1078,14 @@ real_rtrn ) - + Display * dpy ; /* connection to the X server */ - + unsigned int device_spec @@ -1082,35 +1094,35 @@ XkbUseCoreKbd */ - + Atom name ; /* name of the indicator to be retrieved */ - + int * ndx_rtrn ; /* backfilled with the index of the retrieved indicator */ - + Bool * state_rtrn ; /* backfilled with the current state of the retrieved indicator */ - + XkbIndicatorMapPtr map_rtrn ; /* backfilled with the mapping for the retrieved indicator */ - + Bool * real_rtrn @@ -1325,10 +1337,11 @@ XkbSetIndicatorMap - - + + + - + Bool XkbSetIndicatorMap @@ -1341,21 +1354,21 @@ dpy ) - + Display * dpy ; /* connection to the X server */ - + unsigned int which ; /* mask of indicators to change */ - + XkbDescPtr desc @@ -1413,10 +1426,11 @@ Set the indicator map for the indicator - - + + + - + Bool XkbSetNamedIndicator @@ -1435,14 +1449,14 @@ dpy ) - + Display * dpy ; /* connection to the X server */ - + unsigned int device_spec @@ -1451,28 +1465,28 @@ XkbUseCoreKbd */ - + Atom name ; /* name of the indicator to change */ - + Bool change_state ; /* whether to change the indicator state or not */ - + Bool state ; /* desired new state for the indicator */ - + Bool create_new @@ -1480,7 +1494,7 @@ create_new created when necessary */ - + XkbIndicatorMapPtr map @@ -1605,10 +1619,11 @@ XkbChangeIndicators - - + + + - + Bool XkbChangeIndicators @@ -1617,40 +1632,40 @@ dpy, xkb, changes, state ) - + Display * dpy ; /* connection to the X server */ - + XkbDescPtr xkb ; /* keyboard description from which names are to be - + taken. */ - + XkbIndicatorChangesPtr changes ; /* indicators to be updated on the server */ - + unsigned int state ; /* new state of indicators listed in - + changes @@ -1818,10 +1833,11 @@ XkbNoteIndicatorChanges. - - + + + - + void XkbNoteIndicatorChanges @@ -1834,21 +1850,21 @@ old ) - + XkbIndicatorChangesPtr old ; /* XkbIndicatorChanges structure to be updated */ - + XkbIndicatorNotifyEvent * new ; /* event from which changes are to be copied */ - + unsigned int wanted @@ -1887,10 +1903,11 @@ XkbGetIndicatorChanges: - - + + + - + Status XkbGetIndicatorChanges @@ -1905,28 +1922,28 @@ dpy ) - + Display * dpy ; /* connection to the X server */ - + XkbDescPtr xkb ; /* keyboard description to hold the new values */ - + XkbIndicatorChangesPtr changes ; /* indicator maps/state to be obtained from the server */ - + unsigned int * state @@ -1995,10 +2012,11 @@ XkbAllocIndicatorMaps. - - + + + - + Status XkbAllocIndicatorMaps @@ -2007,7 +2025,7 @@ xkb ) - + XkbDescPtr xkb @@ -2049,10 +2067,11 @@ XkbFreeIndicatorMaps. - - + + + - + void XkbFreeIndicatorMaps @@ -2061,7 +2080,7 @@ xkb ) - + XkbDescPtr xkb diff --git a/libX11/specs/XKB/ch09.xml b/libX11/specs/XKB/ch09.xml index 9a6bc9b73..3f14eed68 100644 --- a/libX11/specs/XKB/ch09.xml +++ b/libX11/specs/XKB/ch09.xml @@ -115,75 +115,76 @@ XkbBellNotify events. -
+
Predefined Bells - - - + + + + - + Action Named Bell - + Indicator turned on AX_IndicatorOn - + Indicator turned off AX_IndicatorOff - + More than one indicator changed state AX_IndicatorChange - + Control turned on AX_FeatureOn - + Control turned off AX_FeatureOff - + More than one control changed state AX_FeatureChange - + SlowKeys and BounceKeys about to be turned on or off AX_SlowKeysWarning - + SlowKeys key pressed AX_SlowKeyPress - + SlowKeys key accepted AX_SlowKeyAccept - + SlowKeys key rejected AX_SlowKeyReject - + Accepted SlowKeys key released AX_SlowKeyRelease - + BounceKeys key rejected AX_BounceKeyReject - + StickyKeys key latched AX_StickyLatch - + StickyKeys key locked AX_StickyLock - + StickyKeys key unlocked AX_StickyUnlock @@ -266,15 +267,16 @@ XkbBellNotifyEvent to be generated when a bell function is called. -
+
Bell Sounding and Bell Event Generating - - - - - + + + + + + - + Function called AudibleBell Server sounds a bell @@ -282,49 +284,49 @@ XkbBellNotifyEvent - + XkbDeviceBell On Yes Yes - + XkbDeviceBell Off No Yes - + XkbBell On Yes Yes - + XkbBell Off No Yes - + XkbDeviceBellEvent On or Off No Yes - + XkbBellEvent On or Off No Yes - + XkbDeviceForceBell On or Off Yes No - + XkbForceBell On or Off Yes @@ -344,10 +346,11 @@ XkbDeviceBell. - - + + + - + Bool XkbDeviceBell @@ -356,21 +359,21 @@ display, window, device_id, bell_class, bell_id, percent, name ) - + Display * display ; /* connection to the X server */ - + Window window ; /* window for which the bell is generated, or None */ - + unsigned int device_spec @@ -379,28 +382,28 @@ XkbUseCoreKbd */ - + unsigned int bell_class ; /* X input extension bell class of the bell to be rung */ - + unsigned int bell_id ; /* X input extension bell ID of the bell to be rung */ - + int percent ; /* bell volume, from -100 to 100 inclusive */ - + Atom name @@ -469,10 +472,11 @@ XkbBell. - - + + + - + Bool XkbBell @@ -481,28 +485,28 @@ display, window, percent, name ) - + Display * display ; /* connection to the X server */ - + Window window ; /* event window, or None*/ - + int percent ; /* relative volume, which can range from -100 to 100 inclusive */ - + Atom name @@ -589,10 +593,11 @@ XkbDeviceBellEvent. - - + + + - + Bool XkbDeviceBellEvent @@ -601,21 +606,21 @@ display, window, device_spec, bell_class, bell_id, percent, name ) - + Display * display ; /* connection to the X server */ - + Window window ; /* event window, or None*/ - + unsigned int device_spec @@ -624,28 +629,28 @@ XkbUseCoreKbd */ - + unsigned int bell_class; /* input extension bell class for the event */ - + unsigned int bell_id ; /* input extension bell ID for the event */ - + int percent ; /* volume for the bell, which can range from -100 to 100 inclusive */ - + Atom name @@ -697,10 +702,11 @@ XkbBellEvent. - - + + + - + Bool XkbBellEvent @@ -709,28 +715,28 @@ display, window, percent, name ) - + Display * display ; /* connection to the X server */ - + Window window ; /* the event window, or None */ - + int percent ; /* relative volume, which can range from -100 to 100 inclusive */ - + Atom name @@ -796,10 +802,11 @@ audible bells, use XkbForceDeviceBell. - - + + + - + Bool XkbForceDeviceBell @@ -808,21 +815,21 @@ display, window, device_spec, bell_class, bell_id, percent ) - + Display * display ; /* connection to the X server */ - + Window window ; /* event window, or None */ - + unsigned int device_spec @@ -831,21 +838,21 @@ XkbUseCoreKbd */ - + unsigned int bell_class ; /* input extension class of the bell to be rung */ - + unsigned int bell_id ; /* input extension ID of the bell to be rung */ - + int percent @@ -893,10 +900,11 @@ XkbForceBell. - - + + + - + Bool XkbForceBell @@ -904,14 +912,14 @@ XkbForceBell display, percent) - + Display * display ; /* connection to the X server */ - + int percent diff --git a/libX11/specs/XKB/ch10.xml b/libX11/specs/XKB/ch10.xml index 97ce484e1..b7f306938 100644 --- a/libX11/specs/XKB/ch10.xml +++ b/libX11/specs/XKB/ch10.xml @@ -56,131 +56,132 @@ XkbControlsRec The Xkb controls are grouped as shown in Table 10.1. -
+
Xkb Keyboard Controls - - - - + + + + + - + Type of Control Control Name Boolean Control? - + Controls for enabling and disabling other controls EnabledControls No - + AutoReset No - + Control for bell behavior AudibleBell Boolean - + Controls for repeat key behavior PerKeyRepeat No - + RepeatKeys Boolean - + DetectableAutorepeat Boolean - + Controls for keyboard overlays Overlay1 Boolean - + Overlay2 Boolean - + Controls for using the mouse from the keyboard MouseKeys Boolean - + MouseKeysAccel Boolean - + Controls for better keyboard access by AccessXFeedback Boolean - + physically impaired persons AccessXKeys Boolean - + AccessXTimeout Boolean - + BounceKeys Boolean - + SlowKeys Boolean - + StickyKeys Boolean - + Controls for general keyboard mapping GroupsWrap No - + IgnoreGroupLock Boolean - + IgnoreLockMods No - + InternalMods No - + Miscellaneous per-client controls GrabsUseXKBState Boolean - + LookupStateWhenGrabbed Boolean - + SendEventUsesXKBState Boolean @@ -237,10 +238,11 @@ EnabledControls - - + + + - + Bool XkbChangeEnabledControls @@ -255,28 +257,28 @@ mask ) - + Display * dpy ; /* connection to X server */ - + unsigned int device_spec ; /* keyboard device to modify */ - + unsigned int mask ; /* 1 bit -> controls to enable / disable */ - + unsigned int values @@ -378,10 +380,11 @@ XkbGetAutoResetControls - - + + + - + Bool XkbGetAutoResetControls @@ -394,14 +397,14 @@ auto_values ) - + Display * dpy ; /* connection to X server */ - + unsigned int * auto_ctrls @@ -410,7 +413,7 @@ auto_values are relevant */ - + unsigned int * auto_values @@ -447,10 +450,11 @@ XkbSetAutoResetControls. - - + + + - + Bool XkbSetAutoResetControls @@ -465,28 +469,28 @@ auto_values ) - + Display * dpy ; /* connection to X server */ - + unsigned int changes ; /* controls for which to change auto-reset values */ - + unsigned int * auto_ctrls ; /* controls from changes that should auto reset */ - + unsigned int * auto_values @@ -710,10 +714,11 @@ XkbGetAutoRepeatRate - - + + + - + Bool XkbGetAutoRepeatRate @@ -722,14 +727,14 @@ display, device_spec, timeout_rtrn, interval_rtrn ) - + Display * display ; /* connection to X server */ - + unsigned int device_spec @@ -738,14 +743,14 @@ XkbUseCoreKbd */ - + unsigned int * timeout_rtrn ; /* backfilled with initial repeat delay, ms */ - + unsigned int * interval_rtrn @@ -785,10 +790,11 @@ XkbSetAutoRepeatRate - - + + + - + Bool XkbSetAutoRepeatRate @@ -797,14 +803,14 @@ display, device_spec, timeout, interval ) - + Display * display ; /* connection to X server */ - + unsigned int device_spec @@ -813,14 +819,14 @@ XkbUseCoreKbd */ - + unsigned int timeout ; /* initial delay, ms */ - + unsigned int interval @@ -947,10 +953,11 @@ XkbGetDetectableAutorepeat - - + + + - + Bool XkbGetDetectableAutorepeat @@ -959,14 +966,14 @@ display, supported_rtrn ) - + Display * display ; /* connection to X server */ - + Bool * supported_rtrn @@ -1022,10 +1029,11 @@ they have requested otherwise. - - + + + - + Bool XkbSetDetectableAutorepeat @@ -1034,14 +1042,14 @@ display, detectable, supported_rtrn ) - + Display * display ; /* connection to X server */ - + Bool detectable @@ -1052,7 +1060,7 @@ DetectableAutorepeat */ - + Bool * supported_rtrn @@ -1244,37 +1252,38 @@ XkbControlsRec structure (see section 10.8). -
+
MouseKeysAccel Fields - - - + + + + - + Field Function - + mk_delay Time (ms) between the initial key press and the first repeated motion event - + mk_interval Time (ms) between repeated motion events - + mk_time_to_max Number of events (count) before the pointer reaches maximum speed - + mk_max_speed The maximum speed (in pixels per event) the pointer reaches - + mk_curve The ramp used to reach maximum pointer speed @@ -1602,10 +1611,11 @@ AccessXTimeout - - + + + - + Bool XkbGetAccessXTimeout @@ -1624,14 +1634,14 @@ display ) - + Display * display ; /* connection to X server */ - + unsigned int device_spec @@ -1640,28 +1650,28 @@ XkbUseCoreKbd */ - + unsigned short * timeout_rtrn ; /* delay until AccessXTimeout, seconds */ - + unsigned int * ctrls_mask_rtrn ; /* backfilled with controls to modify */ - + unsigned int * ctrls_values_rtrn ; /* backfilled with on/off status for controls */ - + unsigned short * opts_mask_rtrn @@ -1670,7 +1680,7 @@ ax_options to modify */ - + unsigned short * opts_values_rtrn @@ -1725,10 +1735,11 @@ XkbSetAccessXTimeout - - + + + - + Bool XkbSetAccessXTimeout @@ -1740,14 +1751,14 @@ opts_values ) - + Display * display ; /* connection to X server */ - + unsigned int device_spec @@ -1756,21 +1767,21 @@ XkbUseCoreKbd */ - + unsigned short timeout ; /* seconds idle until AccessXTimeout occurs */ - + unsigned int ctrls_mask ; /* boolean controls to modify */ - + unsigned int ctrls_values @@ -1779,7 +1790,7 @@ ctrls_mask */ - + unsigned short opts_mask @@ -1788,7 +1799,7 @@ ax_options to change */ - + unsigned short opts_values @@ -1875,91 +1886,92 @@ XkbSetControls (see section 10.10): -
+
AccessXFeedback Masks - - - - + + + + + - + Action Beep Code ax_options bit - + LED turned on High-pitched beep XkbAX_IndicatorFBMask - + LED turned off Low-pitched beep XkbAX_IndicatorFBMask - + More than one LED changed state Two high-pitched beeps XkbAX_IndicatorFBMask - + Control turned on Rising tone XkbAX_FeatureFBMask - + Control turned off Falling tone XkbAX_FeatureFBMask - + More than one control changed state Two high-pitched beeps XkbAX_FeatureFBMask - + SlowKeys and BounceKeys about to be turned on or off Three high-pitched beeps XkbAX_SlowWarnFBMask - + SlowKeys key pressed Medium-pitched beep XkbAX_SKPressFBMask - + SlowKeys key accepted Medium-pitched beep XkbAX_SKAcceptFBMask - + SlowKeys key rejected Low-pitched beep XkbAX_SKRejectFBMask - + Accepted SlowKeys key released Medium-pitched beep XkbAX_SKReleaseFBMask - + BounceKeys key rejected Low-pitched beep XkbAX_BKRejectFBMask - + StickyKeys key latched Low-pitched beep followed by high-pitched beep XkbAX_StickyKeysFBMask - + StickyKeys key locked High-pitched beep XkbAX_StickyKeysFBMask - + StickyKeys key unlocked Low-pitched beep XkbAX_StickyKeysFBMask @@ -2024,45 +2036,46 @@ detail in Table 10.4. -
+
AccessXNotify Events - - - + + + + - + detail Reason - + XkbAXN_SKPress A key was pressed when SlowKeys was enabled. - + XkbAXN_SKAccept A key was accepted (held longer than the SlowKeys delay). - + XkbAXN_SKRelease An accepted SlowKeys key was released. - + XkbAXN_SKReject A key was rejected (released before the SlowKeys delay expired). - + XkbAXN_BKAccept A key was accepted by BounceKeys. - + XkbAXN_BKReject A key was rejected (pressed before the BounceKeys delay expired). - + XkbAXN_AXKWarning AccessXKeys is about to turn on/off StickyKeys or BounceKeys. @@ -2123,56 +2136,57 @@ values_for_bits using mask bits from Table 10.5. -
+
AccessXNotify Event Details - - - - + + + + + - + XkbAccessXNotify Event Details Value Circumstances - + XkbAXN_SKPressMask (1<<0) Slow key press notification wanted - + XkbAXN_SKAcceptMask (1<<1) Slow key accept notification wanted - + XkbAXN_SKRejectMask (1<<2) Slow key reject notification wanted - + XkbAXN_SKReleaseMask (1<<3) Slow key release notification wanted - + XkbAXN_BKAcceptMask (1<<4) Bounce key accept notification wanted - + XkbAXN_BKRejectMask (1<<5) Bounce key reject notification wanted - + XkbAXN_AXKWarningMask (1<<6) AccessX warning notification wanted - + XkbAXN_AllEventsMask (0x7f) All AccessX features notifications wanted @@ -2250,10 +2264,11 @@ XkbGetSlowKeysDelay - - + + + - + Bool XkbGetSlowKeysDelay @@ -2266,14 +2281,14 @@ display ) - + Display * display ; /* connection to X server */ - + unsigned int device_spec @@ -2282,7 +2297,7 @@ XkbUseCoreKbd */ - + unsigned int * delay_rtrn @@ -2327,10 +2342,11 @@ XkbSetSlowKeysDelay - - + + + - + Bool XkbSetSlowKeysDelay @@ -2343,14 +2359,14 @@ display ) - + Display * display ; /* connection to X server */ - + unsigned int device_spec @@ -2359,7 +2375,7 @@ XkbUseCoreKbd */ - + unsigned int delay @@ -2435,10 +2451,11 @@ BounceKeys - - + + + - + Bool XkbGetBounceKeysDelay @@ -2451,14 +2468,14 @@ display ) - + Display * display ; /* connection to X server */ - + unsigned int device_spec @@ -2467,7 +2484,7 @@ XkbUseCoreKbd */ - + unsigned int * delay_rtrn @@ -2512,10 +2529,11 @@ XkbSetBounceKeysDelay - - + + + - + Bool XkbSetBounceKeysDelay @@ -2528,14 +2546,14 @@ display ) - + Display * display ; /* connection to X server */ - + unsigned int device_spec @@ -2544,7 +2562,7 @@ XkbUseCoreKbd */ - + unsigned int delay @@ -2735,10 +2753,11 @@ StickyKeys - - + + + - + Bool XkbGetStickyKeysOptions @@ -2751,14 +2770,14 @@ display ) - + Display * display ; /* connection to X server */ - + unsigned int device_spec @@ -2767,7 +2786,7 @@ XkbUseCoreKbd */ - + unsigned int * options_rtrn @@ -2823,10 +2842,11 @@ XkbSetStickyKeysOptions - - + + + - + Bool XkbSetStickyKeysOptions @@ -2837,28 +2857,28 @@ display ) - + Display * display ; /* connection to X server */ - + unsigned int device_spec ; /* device to configure, or XkbUseCoreKbd */ - + unsigned int mask ; /* selects StickyKeys attributes to modify */ - + unsigned int values; @@ -3067,10 +3087,11 @@ XkbSetIgnoreLockMods. - - + + + - + Bool XkbSetIgnoreLockMods @@ -3080,14 +3101,14 @@ virtual_values ) - + Display * display ; /* connection to the X server */ - + unsigned int device_spec @@ -3096,28 +3117,28 @@ XkbUseCoreKbd */ - + unsigned int affect_real ; /* mask of real modifiers affected by this call */ - + unsigned int real_values ; /* values for affected real modifiers (1=>set, 0=>unset) */ - + unsigned int affect_virtual ; /* mask of virtual modifiers affected by this call */ - + unsigned int virtual_values @@ -3268,10 +3289,11 @@ XkbSetServerInternalMods. - - + + + - + Bool XkbSetServerInternalMods @@ -3281,14 +3303,14 @@ virtual_values ) - + Display * display ; /* connection to the X server */ - + unsigned int device_spec @@ -3297,28 +3319,28 @@ XkbUseCoreKbd */ - + unsigned int affect_real ; /* mask of real modifiers affected by this call */ - + unsigned int real_values ; /* values for affected real modifiers (1=>set, 0=>unset) */ - + unsigned int affect_virtual ; /* mask of virtual modifiers affected by this call */ - + unsigned int virtual_values @@ -3470,12 +3492,17 @@ bit used to turn boolean controls on and off and the section where each control is described in more detail. -
+
Xkb Controls - - + + + + + + + - + Control Control Selection Mask (which parameter) Relevant XkbControlsRec Data Fields @@ -3484,21 +3511,21 @@ is described in more detail. - + AccessXFeedback XkbAccessXFeedbackMask ax_options: XkbAX_*FBMask - XkbAccessXFeedbackMask + XkbAccessXFeedback­Mask 10.6.3 - + AccessXKeys - XkbAccessXKeysMask + XkbAccessXKeys­Mask 10.6.1 - + AccessXTimeout XkbAccessXTimeoutMask @@ -3508,80 +3535,80 @@ is described in more detail. axt_ctrls_mask axt_ctrls_values - XkbAccessXTimeoutMask + XkbAccessXTimeout­Mask 10.6.2 - + AudibleBell XkbAudibleBellMask 9.2 - + AutoReset 10.1.2 - + BounceKeys XkbBounceKeysMask debounce_delay XkbBounceKeysMask 10.6.7 - + Detectable-Autorepeat 10.3.3 - + EnabledControls XkbControlsEnabledMask enabled_ctrls Non-Boolean Control 10.1.1 - + GroupsWrap XkbGroupsWrapMask groups_wrap Non-Boolean Control 10.7.1 - + IgnoreGroupLock - XkbIgnoreGroupLockMask + XkbIgnoreGroupLock­Mask 10.7.3 - + IgnoreLockMods XkbIgnoreLockModsMask ignore_lock Non-Boolean Control 5.1 - + InternalMods XkbInternalModsMask internal Non-Boolean Control 5.1 - + MouseKeys XkbMouseKeysMask mk_dflt_btn XkbMouseKeysMask 10.5.1 - + MouseKeysAccel XkbMouseKeysAccelMask @@ -3591,31 +3618,31 @@ is described in more detail. mk_max_speed mk_curve - XkbMouseKeysAccelMask + XkbMouseKeysAccel­Mask 10.5.2 - + Overlay1 XkbOverlay1Mask 10.4 - + Overlay2 XkbOverlay2Mask 10.4 - + PerKeyRepeat XkbPerKeyRepeatMask per_key_repeat Non-Boolean Control 10.3.1 - + RepeatKeys XkbRepeatKeysMask @@ -3625,20 +3652,20 @@ is described in more detail. XkbRepeatKeysMask 10.3 - + SlowKeys XkbSlowKeysMask slow_keys_delay XkbSlowKeysMask 10.6.6 - + StickyKeys XkbStickyKeysMask ax_options: - XkbAX_TwoKeysMask - XkbAX_LatchToLockMask + XkbAX_Two­KeysMask + XkbAX_Latch­ToLockMask XkbStickyKeysMask 10.6.8 @@ -3660,15 +3687,16 @@ configurable attributes; and for controls that are not boolean controls and therefore cannot be enabled or disabled. -
+
Controls Mask Bits - - - - - + + + + + + - + Mask Bit which or changed_ctrls enabled_ctrls @@ -3676,127 +3704,127 @@ therefore cannot be enabled or disabled. - + XkbRepeatKeysMask ok ok (1L<<0) - + XkbSlowKeysMask ok ok (1L<<1) - + XkbBounceKeysMask ok ok (1L<<2) - + XkbStickyKeysMask ok ok (1L<<3) - + XkbMouseKeysMask ok ok (1L<<4) - + XkbMouseKeysAccelMask ok ok (1L<<5) - + XkbAccessXKeysMask ok ok (1L<<6) - + XkbAccessXTimeoutMask ok ok (1L<<7) - + XkbAccessXFeedbackMask ok ok (1L<<8) - + XkbAudibleBellMask ok (1L<<9) - + XkbOverlay1Mask ok (1L<<10) - + XkbOverlay2Mask ok (1L<<11) - + XkbIgnoreGroupLockMask ok (1L<<12) - + XkbGroupsWrapMask ok (1L<<27) - + XkbInternalModsMask ok (1L<<28) - + XkbIgnoreLockModsMask ok (1L<<29) - + XkbPerKeyRepeatMask ok (1L<<30) - + XkbControlsEnabledMask ok (1L<<31) - + XkbAccessXOptionsMask ok ok (XkbStickyKeysMask | XkbAccessXFeedbackMask) - + XkbAllBooleanCtrlsMask ok (0x00001FFF) - + XkbAllControlsMask ok @@ -3865,27 +3893,28 @@ groups_wrap are shown in Table 10.8. -
+
GroupsWrap options (groups_wrap field) - - - + + + + - + groups_wrap symbolic name value - + XkbWrapIntoRange (0x00) - + XkbClampIntoRange (0x40) - + XkbRedirectIntoRange (0x80) @@ -4061,81 +4090,82 @@ ax_options Table 10.9. -
+
Access X Enable/Disable Bits (ax_options field) - - - - + + + + + - + Access X Control ax_options bit value - + AccessXFeedback XkbAX_SKPressFBMask (1L<<0) - + XkbAX_SKAcceptFBMask (1L << 1) - + XkbAX_FeatureFBMask (1L << 2) - + XkbAX_SlowWarnFBMask (1L << 3) - + XkbAX_IndicatorFBMask (1L << 4) - + XkbAX_StickyKeysFBMask (1L << 5) - + XkbAX_SKReleaseFBMask (1L << 8) - + XkbAX_SKRejectFBMask (1L << 9) - + XkbAX_BKRejectFBMask (1L << 10) - + XkbAX_DumbBellFBMask (1L << 11) - + StickyKeys XkbAX_TwoKeysMask (1L << 6) - + XkbAX_LatchToLockMask (1L << 7) - + XkbAX_AllOptionsMask (0xFFF) @@ -4313,10 +4343,11 @@ XkbGetControls - - + + + - + Status XkbGetControls @@ -4324,21 +4355,21 @@ XkbGetControls display, which, xkb) - + Display * display ; /* connection to X server */ - + unsigned long which ; /* mask of controls requested */ - + XkbDescPtr xkb @@ -4467,10 +4498,11 @@ XkbSetControls - - + + + - + Bool XkbSetControls @@ -4478,21 +4510,21 @@ XkbSetControls display, which, xkb) - + Display * display ; /* connection to X server */ - + unsigned long which ; /* mask of controls to change */ - + XkbDescPtr xkb @@ -4649,10 +4681,11 @@ match those in the changed keyboard description. - - + + + - + Bool XkbChangeControls @@ -4661,14 +4694,14 @@ dpy, xkb, changes ) - + Display * dpy ; /* connection to X server */ - + XkbDescPtr xkb @@ -4677,7 +4710,7 @@ xkb->ctrls */ - + XkbControlsChangesPtr changes @@ -4863,10 +4896,11 @@ XkbNoteControlsChanges - - + + + - + void XkbNoteControlsChanges @@ -4879,21 +4913,21 @@ changes ) - + XkbControlsChangesPtr changes ; /* records changes indicated by new */ - + XkbControlsNotifyEvent * new ; /* tells which things have changed */ - + unsigned int wanted @@ -4932,10 +4966,11 @@ XkbNoteControlsChanges. - - + + + - + Status XkbGetControlsChanges @@ -4948,14 +4983,14 @@ dpy ) - + Display * dpy ; /* connection to X server */ - + XkbDescPtr xkb @@ -4964,7 +4999,7 @@ xkb->ctrls will be updated */ - + XkbNameChangesPtr changes @@ -5037,10 +5072,11 @@ XkbAllocControls - - + + + - + Status XkbAllocControls @@ -5049,14 +5085,14 @@ xkb, which ) - + XkbDescPtr xkb ; /* Xkb description in which to allocate ctrls rec */ - + unsigned int which @@ -5124,10 +5160,11 @@ XkbFreeControls: - - + + + - + void XkbFreeControls @@ -5136,14 +5173,14 @@ xkb, which, free_all ) - + XkbDescPtr xkb ; /* Xkb description in which to free controls components */ - + unsigned int which @@ -5152,7 +5189,7 @@ ctrls to free */ - + Bool free_all @@ -5227,10 +5264,11 @@ XkbGetPerClientControls - - + + + - + Bool XkbGetPerClientControls @@ -5241,14 +5279,14 @@ ctrls ) - + Display * dpy ; /* connection to X server */ - + unsigned int * ctrls @@ -5283,10 +5321,11 @@ XkbSetPerClientControls. - - + + + - + Bool XkbSetPerClientControls @@ -5297,21 +5336,21 @@ ctrls ) - + Display * dpy ; /* connection to X server */ - + unsigned int change ; /* 1 bit => change control */ - + unsigned int * value diff --git a/libX11/specs/XKB/ch11.xml b/libX11/specs/XKB/ch11.xml index 1d8d1dc2a..52f089775 100644 --- a/libX11/specs/XKB/ch11.xml +++ b/libX11/specs/XKB/ch11.xml @@ -370,47 +370,48 @@ indicate which controls to manipulate. The controls are identified by the masks defined in Table 11.1. -
+
Library Control Masks - - - + + + + - + Library Control Mask Value - + XkbLC_ForceLatin1Lookup (1 << 0) - + XkbLC_ConsumeLookupMods (1 << 1) - + XkbLC_AlwaysConsumeShiftAndLock (1 << 2) - + XkbLC_IgnoreNewKeyboards (1 << 3) - + XkbLC_ConsumeKeysOnComposeFail (1 << 29) - + XkbLC_ComposeLED (1 << 30) - + XkbLC_BeepOnComposeFail (1 << 31) - + XkbLC_AllControls (0xc0000007) @@ -427,10 +428,11 @@ implemented, use XkbXlibControlsImplemented. - - + + + - + unsigned int XkbXlibControlsImplemented @@ -439,7 +441,7 @@ display ) - + Display * display @@ -469,10 +471,11 @@ XkbGetXlibControls - - + + + - + unsigned int XkbGetXlibControls @@ -481,7 +484,7 @@ display ) - + Display * display @@ -511,10 +514,11 @@ To change the state of the Library Controls, use - - + + + - + Bool XkbSetXlibControls @@ -523,21 +527,21 @@ display, bits_to_change, values_for_bits ) - + Display * display ; /* connection to X server */ - + unsigned long bits_to_change ; /* selects controls to be modified */ - + unsigned long values_for_bits diff --git a/libX11/specs/XKB/ch12.xml b/libX11/specs/XKB/ch12.xml index 928d83828..1a062014e 100644 --- a/libX11/specs/XKB/ch12.xml +++ b/libX11/specs/XKB/ch12.xml @@ -237,10 +237,11 @@ level, use XkbKeycodeToKeysym. - - + + + - + KeySym XkbKeycodeToKeysym @@ -249,22 +250,22 @@ dpy, kc, group, level ) - + Display * dpy; /* connection to X server */ - + KeyCode kc; /* key of interest */ - + unsigned int group; /* group of interest */ - + unsigned int level; /* shift level of interest */ @@ -300,10 +301,11 @@ XkbKeysymToModifiers - - + + + - + unsigned @@ -316,14 +318,14 @@ dpy ) - + Display * dpy ; /* connection to X server */ - + KeySym ks @@ -373,10 +375,11 @@ XkbLookupKeySym - - + + + - + Bool XkbLookupKeySym @@ -393,35 +396,35 @@ dpy ) - + Display * dpy ; /* connection to X server */ - + KeyCode key ; /* key for which symbols are to be found */ - + unsigned int state ; /* state for which symbol should be found */ - + unsigned int * mods_rtrn ; /* backfilled with unconsumed modifiers */ - + KeySym * sym_rtrn @@ -475,10 +478,11 @@ XLookupString - - + + + - + int XkbLookupKeyBinding @@ -497,42 +501,42 @@ dpy ) - + Display * dpy ; /* connection to server */ - + KeySym sym ; /* symbol to be looked up */ - + unsigned int state ; /* state for which string is to be looked up */ - + char * buf ; /* buffer into which returned string is written */ - + int nbytes ; /* size of buffer in bytes */ - + int * extra_rtrn @@ -581,10 +585,11 @@ XkbTranslateKeySym - - + + + - + int XkbTranslateKeySym @@ -603,21 +608,21 @@ extra_rtrn ) - + Display * dpy ; /* connection to X server */ - + KeySym * sym_inout ; /* symbol to be translated; result of translation */ - + unsigned int mods @@ -626,21 +631,21 @@ sym_inout */ - + char * buf ; /* buffer into which returned string is written */ - + int nbytes ; /* size of buffer in bytes */ - + int * extra_rtrn @@ -685,10 +690,11 @@ XkbRefreshKeyboardMapping - - + + + - + Status XkbRefreshKeyboardMapping @@ -696,7 +702,7 @@ XkbRefreshKeyboardMapping event) - + XkbMapNotifyEvent * event @@ -749,10 +755,11 @@ XkbTranslateKeyCode - - + + + - + Booll XkbTranslateKeyCode @@ -760,21 +767,21 @@ XkbTranslateKeyCode xkb, key, mods, mods_rtrn, keysym_rtrn) - + XkbDescPtr xkb ; /* keyboard description to use for translation */ - + KeyCode key ; /* keycode to translate */ - + unsigned int mods @@ -783,14 +790,14 @@ key */ - + unsigned int * mods_rtrn ; /* backfilled with unconsumed modifiers */ - + KeySym * keysym_rtrn diff --git a/libX11/specs/XKB/ch13.xml b/libX11/specs/XKB/ch13.xml index 101003817..ed6066d10 100644 --- a/libX11/specs/XKB/ch13.xml +++ b/libX11/specs/XKB/ch13.xml @@ -557,19 +557,22 @@ type fields are shown in Table 13.1. -
+
Doodad Types - - + + + + + - + Doodad Structure Type - + indicator doodad @@ -580,7 +583,7 @@ XkbIndicatorDoodadRec XkbIndicatorDoodad - + outline doodad @@ -591,7 +594,7 @@ XkbShapeDoodadRec XkbOutlineDoodad - + solid doodad @@ -602,7 +605,7 @@ XkbShapeDoodadRec XkbSolidDoodad - + text doodad @@ -613,7 +616,7 @@ XkbTextDoodadRec XkbTextDoodad - + logo doodad @@ -1091,10 +1094,11 @@ To load a keyboard geometry if you already have the keyboard description, use - - + + + - + Status XkbGetGeometry @@ -1105,14 +1109,14 @@ dpy ) - + Display * dpy ; /* connection to the X server */ - + XkbDescPtr xkb @@ -1150,10 +1154,11 @@ XkbGetNamedGeometry. - - + + + - + Status XkbGetNamedGeometry @@ -1166,21 +1171,21 @@ dpy ) - + Display * dpy ; /* connection to the X server */ - + XkbDescPtr xkb ; /* keyboard description into which the geometry should be loaded */ - + Atom name @@ -1235,10 +1240,11 @@ XkbComputeShapeTop. - - + + + - + Bool XkbComputeShapeTop @@ -1249,14 +1255,14 @@ shape ) - + XkbShapePtr shape ; /* shape to be examined */ - + XkbBoundsPtr bounds_rtrn @@ -1312,10 +1318,11 @@ shape, use XkbComputeShapeBounds. - - + + + - + Bool XkbComputeShapeBounds @@ -1324,7 +1331,7 @@ shape ) - + XkbShapePtr shape @@ -1365,10 +1372,11 @@ To update the bounding box of a row, use XkbComputeRowBounds - - + + + - + Bool XkbComputeRowBounds @@ -1381,7 +1389,7 @@ geom ) - + XkbGeometryPtr geom @@ -1390,14 +1398,14 @@ section */ - + XkbSectionPtr section ; /* section that contains the row */ - + XkbRowPtr row @@ -1432,10 +1440,11 @@ that section. To update the bounding box of a section, use - - + + + - + Bool XkbComputeSectionBounds @@ -1446,7 +1455,7 @@ geom ) - + XkbGeometryPtr geom @@ -1455,7 +1464,7 @@ section */ - + XkbSectionPtr section @@ -1491,10 +1500,11 @@ XkbFindOverlayForKey. - - + + + - + char * XkbFindOverlayForKey @@ -1507,7 +1517,7 @@ geom ) - + XkbGeometryPtr geom @@ -1516,14 +1526,14 @@ section */ - + XkbSectionPtr section ; /* section to be searched for matching keys */ - + char * under @@ -1581,10 +1591,11 @@ XkbAddGeomProperty - - + + + - + XkbPropertyPtr XkbAddGeomProperty @@ -1597,21 +1608,21 @@ geom ) - + XkbGeometryPtr geom ; /* geometry to be updated */ - + char * name ; /* name of the new property */ - + char * value @@ -1650,10 +1661,11 @@ XkbAddGeomKeyAlias - - + + + - + XkbKeyAliasPtr XkbAddGeomKeyAlias @@ -1664,21 +1676,21 @@ geom ) - + XkbGeometryPtr geom ; /* geometry to be updated */ - + char * alias ; /* alias to be added */ - + char * real @@ -1712,10 +1724,11 @@ XkbAddGeomColor - - + + + - + XkbColorPtr XkbAddGeomColor @@ -1728,21 +1741,21 @@ geom ) - + XkbGeometryPtr geom ; /* geometry to be updated */ - + char * spec ; /* color to be added */ - + unsigned int pixel @@ -1790,10 +1803,11 @@ XkbAddGeomOutline. - - + + + - + XkbOutlinePtr XkbAddGeomOutline @@ -1804,14 +1818,14 @@ shape ) - + XkbShapePtr shape ; /* shape to be updated */ - + int sz_points @@ -1847,10 +1861,11 @@ XkbAddGeomShape - - + + + - + XkbShapePtr XkbAddGeomShape @@ -1863,21 +1878,21 @@ geom ) - + XkbGeometryPtr geom ; /* geometry to be updated */ - + Atom name ; /* name of the new shape */ - + int sz_outlines @@ -1919,10 +1934,11 @@ XkbAddGeomKey - - + + + - + XkbKeyPtr XkbAddGeomKey @@ -1931,7 +1947,7 @@ row ) - + XkbRowPtr row @@ -1966,10 +1982,11 @@ XkbAddGeomSection - - + + + - + XkbSectionPtr XkbAddGeomSection @@ -1986,35 +2003,35 @@ geom ) - + XkbGeometryPtr geom ; /* geometry to be updated */ - + Atom name ; /* name of the new section */ - + int sz_rows ; /* number of rows to reserve in the section */ - + int sz_doodads ; /* number of doodads to reserve in the section */ - + int sz_overlays @@ -2061,10 +2078,11 @@ XkbAddGeomRow - - + + + - + XkbRowPtr XkbAddGeomRow @@ -2075,14 +2093,14 @@ section ) - + XkbSectionPtr section ; /* section to be updated */ - + int sz_keys @@ -2121,10 +2139,11 @@ XkbAddGeomDoodad - - + + + - + XkbDoodadPtr XkbAddGeomDoodad @@ -2137,21 +2156,21 @@ geom ) - + XkbGeometryPtr geom ; /* geometry to which the doodad is added */ - + XkbSectionPtr section ; /* section, if any, to which the doodad is added */ - + Atom name @@ -2206,10 +2225,11 @@ XkbAddGeomOverlay - - + + + - + XkbOverlayPtr XkbAddGeomOverlay @@ -2222,21 +2242,21 @@ section ) - + XkbSectionPtr section ; /* section to which an overlay will be added */ - + Atom name ; /* name of the overlay */ - + int sz_rows @@ -2274,10 +2294,11 @@ XkbAddGeomOverlayRow - - + + + - + XkbOverlayRowPtr XkbAddGeomOverlayRow @@ -2288,14 +2309,14 @@ overlay ) - + XkbOverlayPtr overlay ; /* overlay to be updated */ - + XkbRowPtr row_under @@ -2304,7 +2325,7 @@ overlay overlays */ - + int sz_keys @@ -2345,10 +2366,11 @@ XkbAddGeomOverlayKey - - + + + - + XkbOverlayKeyPtr XkbAddGeomOverlayKey @@ -2359,21 +2381,21 @@ overlay ) - + XkbOverlayPtr overlay ; /* overlay to be updated */ - + XkbRowPtr row ; /* row in overlay to be updated */ - + char * under @@ -2443,10 +2465,11 @@ XkbAllocGeomOutlines. - - + + + - + Status XkbAllocGeomOutlines @@ -2457,14 +2480,14 @@ shape ) - + XkbShapePtr shape ; /* shape for which outlines should be allocated */ - + int num_needed @@ -2494,10 +2517,11 @@ XkbFreeGeomOutlines - - + + + - + void XkbFreeGeomOutlines @@ -2512,28 +2536,28 @@ shape ) - + XkbShapePtr shape ; /* shape in which outlines should be freed */ - + int first ; /* first outline to be freed */ - + int count ; /* number of outlines to be freed */ - + Bool free_all; @@ -2561,10 +2585,11 @@ XkbAllocGeomKeys. - - + + + - + Status XkbAllocGeomKeys @@ -2575,14 +2600,14 @@ row ) - + XkbRowPtr row ; /* row to which keys should be allocated */ - + int num_needed @@ -2609,10 +2634,11 @@ XkbFreeGeomKeys - - + + + - + void XkbFreeGeomKeys @@ -2627,28 +2653,28 @@ row ) - + XkbRowPtr row ; /* row in which keys should be freed */ - + int first ; /* first key to be freed */ - + int count ; /* number of keys to be freed */ - + Bool free_all; @@ -2677,10 +2703,11 @@ XkbAllocGeomProps - - + + + - + Status XkbAllocGeomProps @@ -2691,14 +2718,14 @@ geom ) - + XkbGeometryPtr geom ; /* geometry for which properties should be allocated */ - + int num_needed @@ -2731,10 +2758,11 @@ XkbFreeGeomProperties - - + + + - + void XkbFreeGeomProperties @@ -2749,28 +2777,28 @@ geom ) - + XkbGeometryPtr geom ; /* geometry in which properties should be freed */ - + int first ; /* first property to be freed */ - + int count ; /* number of properties to be freed */ - + Bool free_all; @@ -2799,10 +2827,11 @@ XkbAllocGeomKeyAliases - - + + + - + Status XkbAllocGeomKeyAliases @@ -2813,14 +2842,14 @@ geom ) - + XkbGeometryPtr geom ; /* geometry for which key aliases should be allocated */ - + int num_needed @@ -2850,10 +2879,11 @@ XkbFreeGeomKeyAliases - - + + + - + void XkbFreeGeomKeyAliases @@ -2868,28 +2898,28 @@ free_all ) - + XkbGeometryPtr geom ; /* geometry in which key aliases should be freed */ - + int first ; /* first key alias to be freed */ - + int count ; /* number of key aliases to be freed */ - + Bool free_all; @@ -2922,10 +2952,11 @@ XkbAllocGeomColors - - + + + - + Status XkbAllocGeomColors @@ -2936,14 +2967,14 @@ geom ) - + XkbGeometryPtr geom ; /* geometry for which colors should be allocated */ - + int num_needed @@ -2974,10 +3005,11 @@ XkbFreeGeomColors - - + + + - + void XkbFreeGeomColors @@ -2992,28 +3024,28 @@ geom ) - + XkbGeometryPtr geom ; /* geometry in which colors should be freed */ - + int first ; /* first color to be freed */ - + int count ; /* number of colors to be freed */ - + Bool free_all; @@ -3042,10 +3074,11 @@ XkbAllocGeomPoints - - + + + - + Status XkbAllocGeomPoints @@ -3056,14 +3089,14 @@ outline ) - + XkbOutlinePtr outline ; /* outline for which points should be allocated */ - + int num_needed @@ -3093,10 +3126,11 @@ XkbFreeGeomPoints - - + + + - + void XkbFreeGeomPoints @@ -3111,28 +3145,28 @@ outline ) - + XkbOutlinePtr outline ; /* outline in which points should be freed */ - + int first ; /* first point to be freed. */ - + int count ; /* number of points to be freed */ - + Bool free_all; @@ -3162,10 +3196,11 @@ XkbAllocGeomShapes - - + + + - + Status XkbAllocGeomShapes @@ -3176,14 +3211,14 @@ geom ) - + XkbGeometryPtr geom ; /* geometry for which shapes should be allocated */ - + int num_needed @@ -3213,10 +3248,11 @@ XkbFreeGeomShapes - - + + + - + void XkbFreeGeomShapes @@ -3231,28 +3267,28 @@ geom ) - + XkbGeometryPtr geom ; /* geometry in which shapes should be freed */ - + int first ; /* first shape to be freed */ - + int count ; /* number of shapes to be freed */ - + Bool free_all; @@ -3282,10 +3318,11 @@ XkbAllocGeomSections - - + + + - + Status XkbAllocGeomSections @@ -3296,14 +3333,14 @@ geom ) - + XkbGeometryPtr geom ; /*geometry for which sections should be allocated */ - + int num_needed @@ -3330,10 +3367,11 @@ XkbFreeGeomSections - - + + + - + void XkbFreeGeomSections @@ -3348,28 +3386,28 @@ geom ) - + XkbGeometryPtr geom ; /* geometry in which sections should be freed */ - + int first ; /* first section to be freed. */ - + int count ; /* number of sections to be freed */ - + Bool free_all; @@ -3399,10 +3437,11 @@ XkbAllocGeomRows - - + + + - + Status XkbAllocGeomRows @@ -3413,14 +3452,14 @@ section ) - + XkbSectionPtr section ; /* section for which rows should be allocated */ - + int num_needed @@ -3447,10 +3486,11 @@ XkbFreeGeomRows - - + + + - + void XkbFreeGeomRows @@ -3465,28 +3505,28 @@ section ) - + XkbSectionPtr section ; /* section in which rows should be freed */ - + int first ; /* first row to be freed. */ - + int count ; /* number of rows to be freed */ - + Bool free_all; @@ -3516,10 +3556,11 @@ XkbAllocGeomOverlays - - + + + - + Status XkbAllocGeomOverlays @@ -3530,14 +3571,14 @@ section ) - + XkbSectionPtr section ; /* section for which overlays should be allocated */ - + int num_needed @@ -3564,10 +3605,11 @@ XkbFreeGeomOverlays - - + + + - + void XkbFreeGeomOverlays @@ -3582,28 +3624,28 @@ section ) - + XkbSectionPtr section ; /* section in which overlays should be freed */ - + int first ; /* first overlay to be freed. */ - + int count ; /* number of overlays to be freed */ - + Bool free_all; @@ -3633,10 +3675,11 @@ XkbAllocGeomOverlayRows - - + + + - + Status XkbAllocGeomOverlayRows @@ -3647,14 +3690,14 @@ overlay ) - + XkbSectionPtr overlay ; /* section for which rows should be allocated */ - + int num_needed @@ -3681,10 +3724,11 @@ XkbFreeGeomOverlayRows - - + + + - + void XkbFreeGeomOverlayRows @@ -3699,28 +3743,28 @@ overlay ) - + XkbSectionPtr overlay ; /* section in which rows should be freed */ - + int first ; /* first row to be freed. */ - + int count ; /* number of rows to be freed */ - + Bool free_all; @@ -3750,10 +3794,11 @@ XkbAllocGeomOverlayKeys - - + + + - + Status XkbAllocGeomOverlayKeys @@ -3764,14 +3809,14 @@ row ) - + XkbRowPtr row ; /* section for which rows should be allocated */ - + int num_needed @@ -3798,10 +3843,11 @@ XkbFreeGeomOverlayKeys - - + + + - + void XkbFreeGeomOverlayKeys @@ -3816,28 +3862,28 @@ row ) - + XkbRowPtr row ; /* row in which keys should be freed */ - + int first ; /* first key to be freed. */ - + int count ; /* number of keys to be freed */ - + Bool free_all; @@ -3867,10 +3913,11 @@ XkbAllocGeomDoodads - - + + + - + Status XkbAllocGeomDoodads @@ -3881,14 +3928,14 @@ geom ) - + XkbGeometryPtr geom ; /* geometry for which doodads should be allocated */ - + int num_needed @@ -3916,10 +3963,11 @@ XkbAllocGeomSectionDoodads - - + + + - + Status XkbAllocGeomSectionDoodads @@ -3930,14 +3978,14 @@ section ) - + XkbSectionPtr section ; /* section for which doodads should be allocated */ - + int num_needed @@ -3965,10 +4013,11 @@ XkbFreeGeomDoodads - - + + + - + void XkbFreeGeomDoodads @@ -3981,21 +4030,21 @@ doodads ) - + XkbDoodadPtr doodads ; /* doodads to be freed */ - + int count ; /* number of doodads to be freed */ - + Bool free_all; @@ -4026,10 +4075,11 @@ XkbAllocGeometry - - + + + - + Status XkbAllocGeometry @@ -4040,14 +4090,14 @@ xkb ) - + XkbDescPtr xkb ; /* keyboard description for which geometry is to be allocated */ - + XkbGeometrySizesPtr sizes @@ -4078,10 +4128,11 @@ XkbFreeGeometry - - + + + - + void XkbFreeGeometry @@ -4094,21 +4145,21 @@ geom ) - + XkbGeometryPtr geom ; /* geometry to be freed */ - + unsigned int which ; /* mask of geometry components to be freed */ - + Bool free_all; diff --git a/libX11/specs/XKB/ch14.xml b/libX11/specs/XKB/ch14.xml index 518e1aca4..1fcc76800 100644 --- a/libX11/specs/XKB/ch14.xml +++ b/libX11/specs/XKB/ch14.xml @@ -249,10 +249,11 @@ XkbGetMap - - + + + - + XkbDescPtr XkbGetMap @@ -261,21 +262,21 @@ display, which, device_spec ) - + Display * display ; /* connection to X server */ - + unsigned int which ; /* mask selecting subcomponents to populate */ - + unsigned int device_spec @@ -354,12 +355,18 @@ column in Table 14.1. Refer to the sections listed in the table for more information on these functions. -
+
Xkb Mapping Component Masks and Convenience Functions - - + + + + + + + + - + Mask Value Map @@ -369,7 +376,7 @@ information on these functions. - + XkbKeyTypesMask (1<<0) client @@ -386,7 +393,7 @@ information on these functions. 15.2 - + XkbKeySymsMask (1<<1) client @@ -399,27 +406,27 @@ information on these functions. XkbGetKeySyms XkbResizeKeySyms - XkbChangeTypesOfKey + XkbChangeTypes­OfKey 15.3 - + XkbModifierMapMask (1<<2) client modmap - XkbGetKeyModifierMap + XkbGetKeyModifier­Map 15.4 - + XkbExplicitComponentsMask (1<<3) server explicit - XkbGetKeyExplicitComponents + XkbGetKeyExplicit­Components 16.3 - + XkbKeyActionsMask (1<<4) server @@ -431,19 +438,19 @@ information on these functions. XkbGetKeyActions - XkbResizeKeyActions + XkbResizeKey­Actions 16.1 - + XkbKeyBehaviorsMask (1<<5) server behaviors - XkbGetKeyBehaviors + XkbGetKey­Behaviors 16.2 - + XkbVirtualModsMask (1<<6) server @@ -451,12 +458,12 @@ information on these functions. XkbGetVirtualMods 16.4 - + XkbVirtualModMapMask (1<<7) server vmodmap - XkbGetVirtualModMap + XkbGetVirtualMod­Map 16.4 @@ -491,10 +498,11 @@ description, use XkbGetUpdatedMap. - - + + + - + Status XkbGetUpdatedMap @@ -503,21 +511,21 @@ display, which, xkb ) - + Display * display ; /* connection to X server */ - + unsigned int which ; /* mask selecting subcomponents to populate */ - + XkbDescPtr xkb @@ -585,10 +593,11 @@ an - - + + + - + Bool XkbSetMap @@ -601,21 +610,21 @@ dpy ) - + Display * dpy ; /* connection to X server */ - + unsigned int which ; /* mask selecting subcomponents to update */ - + XkbDescPtr xkb @@ -751,19 +760,22 @@ XkbMapChangesRec . -
+
XkbMapChangesRec Masks - - + + + + + - + Mask Valid XkbMapChangesRec Fields XkbDescRec Field Containing Changed Data - + XkbKeyTypesMask first_type, @@ -774,7 +786,7 @@ XkbMapChangesRec map->type[first_type + num_types - 1] - + XkbKeySymsMask first_key_sym, @@ -785,7 +797,7 @@ XkbMapChangesRec map->key_sym_map[first_key_sym + num_key_syms - 1] - + XkbModifierMapMask first_modmap_key, @@ -796,7 +808,7 @@ XkbMapChangesRec map->modmap[first_modmap_key + num_modmap_keys-1] - + XkbExplicitComponentsMask first_key_explicit, @@ -807,7 +819,7 @@ XkbMapChangesRec server->explicit[first_key_explicit + num_key_explicit - 1] - + XkbKeyActionsMask first_key_act, @@ -818,7 +830,7 @@ XkbMapChangesRec server->key_acts[first_key_act + num_key_acts - 1] - + XkbKeyBehaviorsMask first_key_behavior, @@ -829,12 +841,12 @@ XkbMapChangesRec server->behaviors[first_key_behavior + num_key_behaviors - 1] - + XkbVirtuawModsMask vmods server->vmods[*] - + XkbVirtualModMapMask first_vmodmap_key, @@ -860,10 +872,11 @@ XkbMapChangesRec - - + + + - + Bool XkbChangeMap @@ -876,21 +889,21 @@ dpy ) - + Display * dpy ; /* connection to X server */ - + XkbDescPtr xkb ; /* description from which new values are taken */ - + XkbMapChangesPtr changes @@ -1092,10 +1105,11 @@ XkbAllocClientMap. - - + + + - + Status XkbAllocClientMap @@ -1104,21 +1118,21 @@ xkb, which, type_count ) - + XkbDescPtr xkb ; /* keyboard description in which to allocate client map */ - + unsigned int which ; /* mask selecting map components to allocate */ - + unsigned int type_count @@ -1145,18 +1159,20 @@ allocate and is a mask composed by a bitwise inclusive OR of one or more of the masks shown in Table 14.3. -
+
XkbAllocClientMap Masks - - + + + + - + Mask Effect - + XkbKeyTypesMask The @@ -1171,7 +1187,7 @@ XkbNumRequiredTypes BadValue. - + XkbKeySymsMask The @@ -1192,7 +1208,7 @@ min_key_code + 1 keys. - + XkbModifierMapMask The @@ -1282,10 +1298,11 @@ XkbFreeClientMap. - - + + + - + void XkbFreeClientMap @@ -1294,21 +1311,21 @@ xkb, which, free_all ) - + XkbDescPtr xkb ; /* keyboard description containing client map to free */ - + unsigned int which ; /* mask identifying components of map to free */ - + Bool free_all @@ -1373,10 +1390,11 @@ XkbAllocServerMap. - - + + + - + Status XkbAllocServerMap @@ -1385,21 +1403,21 @@ xkb, which, count_acts ) - + XkbDescPtr xkb ; /* keyboard description in which to allocate server map */ - + unsigned int which ; /* mask selecting map components to allocate */ - + unsigned int count_acts @@ -1425,18 +1443,20 @@ which allocate, as specified in Table 14.4. -
+
XkbAllocServerMap Masks - - + + + + - + Mask Effect - + XkbExplicitComponentsMask The @@ -1450,7 +1470,7 @@ explicit field of the server map. - + XkbKeyActionsMask The @@ -1468,7 +1488,7 @@ acts field of the server map. - + XkbKeyBehaviorsMask The @@ -1482,7 +1502,7 @@ behaviors field of the server map. - + XkbVirtualModMapMask The @@ -1559,10 +1579,11 @@ XkbFreeServerMap. - - + + + - + void XkbFreeServerMap @@ -1571,21 +1592,21 @@ xkb, which, free_all ) - + XkbDescPtr xkb ; /* keyboard description containing server map to free */ - + unsigned int which ; /* mask identifying components of map to free */ - + Bool free_all diff --git a/libX11/specs/XKB/ch15.xml b/libX11/specs/XKB/ch15.xml index 5ab96ae13..b12bc8cf3 100644 --- a/libX11/specs/XKB/ch15.xml +++ b/libX11/specs/XKB/ch15.xml @@ -238,79 +238,80 @@ keyboard mappings in the server database is not specified by the Xkb extension, although this format is one possible example): -
+
Example Key Type - - - + + + + - + Symbolic Description Key Type Data Structure - + type "ALPHATHREE" { Xkb->map->types[i].name - + modifiers = Shift+Lock+LevelThree; Xkb->map->types[i].mods - + map[None]= Level1; Xkb->map->types[i].map[0] - + map[Lock]= Level1; Xkb->map->types[i].map[1] - + map[Shift]= Level2; Xkb->map->types[i].map[2] - + map[LevelThree]= Level3; Xkb->map->types[i].map[3] - + map[Shift+LevelThree]= Level3; Xkb->map->types[i].map[4] - + preserve[None]= None; Xkb->map->types[i].perserve[0] - + preserve[Lock]= Lock; Xkb->map->types[i].preserve[1] - + preserve[Shift]= None; Xkb->map->types[i].preserve[2] - + preserve[LevelThree]= None; Xkb->map->types[i].preserve[3] - + preserve[Shift+Level3]= None; Xkb->map->types[i].preserve[4] - + level_name[Level1]= "Base"; Xkb->map->types[i].level_names[0] - + level_name[Level2]= "Caps"; Xkb->map->types[i].level_names[1] - + level_name[Level3]= "Level3"; Xkb->map->types[i].level_names[2] - + }; @@ -645,10 +646,11 @@ XkbInitCanonicalKeyTypes. - - + + + - + Status XkbInitCanonicalKeyTypes @@ -657,21 +659,21 @@ xkb, which, keypadVMod ) - + XkbDescPtr xkb ; /* keyboard description containing client map to initialize */ - + unsigned int which ; /* mask of types to initialize */ - + int keypadVMod @@ -751,10 +753,11 @@ XkbGetKeyTypes - - + + + - + Status XkbGetKeyTypes @@ -769,28 +772,28 @@ dpy ) - + Display * dpy ; /* connection to X server */ - + unsigned int first ; /* index to first type to get, 0 => 1st type */ - + unsigned int num ; /* number of key types to be returned */ - + XkbDescPtr xkb @@ -844,10 +847,11 @@ XkbResizeKeyType - - + + + - + Status XkbResizeKeyType @@ -864,28 +868,28 @@ xkb ) - + XkbDescPtr xkb ; /* keyboard description containing client map to update */ - + int type_ndx ; /* index in xkb->map->types of type to change */ - + int map_count ; /* total # of map entries needed for the type */ - + Bool want_preserve @@ -894,7 +898,7 @@ True => list of preserved modifiers is necessary */ - + int new_num_lvls @@ -1018,10 +1022,11 @@ XkbKeyTypeRec - - + + + - + Status XkbCopyKeyType @@ -1032,14 +1037,14 @@ from ) - + XkbKeyTypePtr from ; /* pointer to XkbKeyTypeRec to be copied */ - + XkbKeyTypePtr into @@ -1094,10 +1099,11 @@ Success - - + + + - + Status XkbCopyKeyTypes @@ -1110,21 +1116,21 @@ num_types ) - + XkbKeyTypePtr from ; /* pointer to array of XkbKeyTypeRecs to copy */ - + XkbKeyTypePtr into ; /* pointer to array of XkbKeyTypeRecs to change */ - + int num_types @@ -1286,10 +1292,11 @@ XkbNumKbdGroups groups, the extra key types are reported but ignored. - - + + + - + int XkbKeyTypeIndex @@ -1298,21 +1305,21 @@ xkb, keycode, group ) /* macro*/ - + XkbDescPtr xkb ; /* Xkb description of interest */ - + KeyCode keycode ; /* keycode of interest */ - + int group @@ -1339,10 +1346,11 @@ group - - + + + - + XkbKeyTypePtr XkbKeyType @@ -1351,21 +1359,21 @@ xkb, keycode, group ) /* macro */ - + XkbDescPtr xkb ; /* Xkb description of interest */ - + KeyCode keycode ; /* keycode of interest */ - + int group @@ -1453,27 +1461,28 @@ group_info normalization methods in this table. -
+
group_info Range Normalization - - - + + + + - + Bits set in group_info Normalization method - + XkbRedirectIntoRange XkbRedirectIntoRange - + XkbClampIntoRange XkbClampIntoRange - + none of the above XkbWrapIntoRange @@ -1486,10 +1495,11 @@ Xkb provides the following macros to access group information: - - + + + - + int XkbKeyNumGroups @@ -1498,14 +1508,14 @@ xkb, keycode ) /* macro */ - + XkbDescPtr xkb ; /* Xkb description of interest */ - + KeyCode keycode @@ -1527,10 +1537,11 @@ keycode - - + + + - + unsigned char XkbKeyGroupInfo @@ -1539,14 +1550,14 @@ xkb, keycode ) /*macro */ - + XkbDescPtr xkb ; /* Xkb description of interest */ - + KeyCode keycode @@ -1571,10 +1582,11 @@ keycode - - + + + - + unsigned char XkbOutOfRangeGroupInfo @@ -1583,7 +1595,7 @@ grp_inf ) /* macro */ - + unsigned char grp_inf @@ -1608,10 +1620,11 @@ XkbSymMapRec - - + + + - + unsigned char XkbOutOfRangeGroupNumber @@ -1620,7 +1633,7 @@ grp_inf ) /* macro */ - + unsigned char grp_inf @@ -1703,10 +1716,11 @@ of symbols bound to the key: - - + + + - + int XkbKeyGroupsWidth @@ -1715,14 +1729,14 @@ xkb, keycode ) /* macro */ - + XkbDescPtr xkb ; /* Xkb description of interest */ - + KeyCode keycode @@ -1743,10 +1757,11 @@ keycode - - + + + - + int XkbKeyGroupWidth @@ -1755,21 +1770,21 @@ xkb, keycode, grp ) /* macro */ - + XkbDescPtr xkb ; /* Xkb description of interest */ - + KeyCode keycode ; /* keycode of interest */ - + int grp @@ -1792,10 +1807,11 @@ keycode - - + + + - + int XkbKeySymsOffset @@ -1804,14 +1820,14 @@ xkb, keycode ) /* macro */ - + XkbDescPtr xkb ; /* Xkb description of interest */ - + KeyCode keycode @@ -1833,10 +1849,11 @@ keycode - - + + + - + int XkbKeyNumSyms @@ -1845,14 +1862,14 @@ xkb, keycode ) /* macro */ - + XkbDescPtr xkb ; /* Xkb description of interest */ - + KeyCode keycode @@ -1873,10 +1890,11 @@ keycode - - + + + - + KeySym * XkbKeySymsPtr @@ -1885,14 +1903,14 @@ xkb, keycode ) /* macro */ - + XkbDescPtr xkb ; /* Xkb description of interest */ - + KeyCode keycode @@ -1914,10 +1932,11 @@ keycode - - + + + - + KeySym XkbKeySymEntry @@ -1926,28 +1945,28 @@ xkb, keycode, shift, grp ) /* macro */ - + XkbDescPtr xkb ; /* Xkb description of interest */ - + KeyCode keycode ; /* keycode of interest */ - + int shift ; /* shift level of interest */ - + int grp @@ -1985,10 +2004,11 @@ XkbGetKeySyms - - + + + - + Status XkbGetKeySyms @@ -2003,28 +2023,28 @@ num ) - + Display * dpy ; /* connection to X server */ - + unsigned int first ; /* keycode of first key to get */ - + unsigned int num ; /* number of keycodes for which syms desired */ - + XkbDescPtr xkb @@ -2119,38 +2139,39 @@ xkb - - + + + - + XkbDescPtr xkb ; /* keyboard description to be changed */ - + int key ; /* keycode for key of interest */ - + int n_groups ; /* new number of groups for key */ - + unsigned int groups ; /* mask indicating groups to change */ - + int * new_types_in @@ -2159,7 +2180,7 @@ groups */ - + XkbMapChangesPtr p_changes @@ -2265,31 +2286,32 @@ For convenience, Xkb provides the following constants to use as indices to the groups: -
+
Group Index Constants - - - + + + + - + Constant Name Value - + XkbGroup1Index 0 - + XkbGroup2Index 1 - + XkbGroup3Index 2 - + XkbGroup4Index 3 @@ -2342,10 +2364,11 @@ XkbResizeKeySyms - - + + + - + KeySym * XkbResizeKeySyms @@ -2358,21 +2381,21 @@ xkb ) - + XkbDescRec * xkb ; /* keyboard description to be changed */ - + int key ; /* keycode for key to modify */ - + int needed @@ -2507,10 +2530,11 @@ XkbGetKeyModifierMap - - + + + - + Status XkbGetKeyModifierMap @@ -2525,28 +2549,28 @@ dpy ) - + Display * dpy ; /* connection to X server */ - + unsigned int first ; /* keycode of first key to get */ - + unsigned int num ; /* number of keys for which information is desired */ - + XkbDescPtr xkb 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 diff --git a/libX11/specs/XKB/ch17.xml b/libX11/specs/XKB/ch17.xml index 2bf30275b..32a1c8cb6 100644 --- a/libX11/specs/XKB/ch17.xml +++ b/libX11/specs/XKB/ch17.xml @@ -205,30 +205,31 @@ ButtonPress event, encoded as follows: - - - - + + + + + - + bits meaning - + 15 0 - + 13-14 Group index - + 8-12 Pointer Buttons - + 0-7 Modifiers @@ -470,10 +471,13 @@ modifiers specified in mods are to be interpreted. -
+
Symbol Interpretation Match Criteria - - + + + + + Match Criteria @@ -482,7 +486,7 @@ are to be interpreted. - + XkbSI_NoneOf (0) @@ -490,7 +494,7 @@ None of the bits that are on in mods can be set, but other bits can be. - + XkbSI_AnyOfOrNone (1) @@ -499,7 +503,7 @@ mods can be set, as well as others. - + XkbSI_AnyOf (2) @@ -508,7 +512,7 @@ mods can be set, as well as any others. - + XkbSI_AllOf (3) @@ -517,7 +521,7 @@ mods must be set, but others may be set as well. - + XkbSI_Exactly (4) @@ -559,31 +563,32 @@ interpretation where: - - - + + + + - + sym = 0 - + flags = XkbSI_AutoRepeat - + match = XkbSI_AnyOfOrNone - + mods = 0 - + virtual_mod = XkbNoModifier - + act = SA_NoAction @@ -756,10 +761,11 @@ compatibility map may be used to reconfigure other servers. explicit override components of the server state. - - + + + - + Status XkbGetCompatMap @@ -768,21 +774,21 @@ display, which, xkb ) - + Display * display ; /* connection to server */ - + unsigned int which ; /* mask of compatibility map components to fetch */ - + XkbDescRec * xkb @@ -809,29 +815,32 @@ which are an inclusive OR of the values shown in Table 17.2. -
+
Compatibility Map Component Masks - - + + + + + - + Mask Value Affecting - + XkbSymInterpMask (1<<0) Symbol interpretations - + XkbGroupCompatMask (1<<1) Group maps - + XkbAllCompatMask (0x3) All compatibility map components @@ -903,10 +912,11 @@ XkbUpdateMapFromCore - - + + + - + Bool XkbUpdateMapFromCore @@ -925,42 +935,42 @@ xkb ) - + XkbDescPtr xkb ; /* keyboard description to update */ - + KeyCode first_key ; /* keycode of first key description to update */ - + int num_keys ; /* number of key descriptions to update */ - + int map_width ; /* width of core protocol keymap */ - + KeySym * core_keysyms ; /* symbols in core protocol keymap */ - + XkbChangesPtr changes @@ -1044,10 +1054,11 @@ XkbKeyTypesForCoreSymbols - - + + + - + int XkbKeyTypesForCoreSymbols @@ -1060,14 +1071,14 @@ map_width ) - + XkbDescPtr xkb ; /* keyboard description in which to place symbols*/ - + int map_width @@ -1076,21 +1087,21 @@ xkb_syms_rtrn */ - + KeySym * core_syms ; /* core protocol format array of KeySyms */ - + unsigned int protected ; /* explicit key types */ - + int * types_inout; @@ -1098,7 +1109,7 @@ int * for the key */ - + KeySym * xkb_syms_rtrn @@ -1190,10 +1201,11 @@ XkbApplyCompatMapToKey - - + + + - + Bool XkbApplyCompatMapToKey @@ -1206,21 +1218,21 @@ xkb ) - + XkbDescPtr xkb; /* keyboard description to be updated */ - + KeyCode key ; /* key to be updated */ - + XkbChangesPtr changes @@ -1264,10 +1276,11 @@ XkbSymInterpretRec - - + + + - + Bool XkbSetCompatMap @@ -1276,28 +1289,28 @@ display, which, xkb, update_actions ) - + Display * display ; /* connection to server */ - + unsigned int which ; /* mask of compat map components to set */ - + XkbDescPtr xkb ; /* source for compat map components */ - + Bool update_actions @@ -1380,10 +1393,11 @@ XkbAddSymInterpret - - + + + - + XkbSymInterpretPtr XkbAddSymInterpret @@ -1392,21 +1406,21 @@ xkb, si, updateMap, changes ) - + XkbDescPtr xkb ; /* keyboard description to be updated */ - + XkbSymInterpretPtr si ; /* symbol interpretation to be added */ - + Bool updateMap @@ -1415,7 +1429,7 @@ True =>apply compatibility map to keys */ - + XkbChangesPtr changes @@ -1597,10 +1611,11 @@ XkbAllocCompatMap - - + + + - + Status XkbAllocCompatMap @@ -1609,21 +1624,21 @@ xkb, which, num_si ) - + XkbDescPtr xkb ; /* keyboard description in which to allocate compat map */ - + unsigned int which ; /* mask of compatibility map components to allocate */ - + unsigned int num_si @@ -1709,10 +1724,11 @@ XkbFreeCompatMap - - + + + - + void XkbFreeCompatMap @@ -1721,21 +1737,21 @@ xkb, which, free_map ) - + XkbDescPtr xkb ; /* Xkb description in which to free compatibility map */ - + unsigned int which ; /* mask of compatibility map components to free */ - + Bool free_map diff --git a/libX11/specs/XKB/ch18.xml b/libX11/specs/XKB/ch18.xml index 98239bf2f..806b09a45 100644 --- a/libX11/specs/XKB/ch18.xml +++ b/libX11/specs/XKB/ch18.xml @@ -237,15 +237,16 @@ above. These masks and their relationships to the fields in a keyboard description are shown in Table 18.1. -
+
Symbolic Names Masks - - - - - + + + + + + - + Mask Bit Value Keyboard Component @@ -253,91 +254,91 @@ description are shown in Table 18.1. - + XkbKeycodesNameMask (1<<0) Xkb->names keycodes - + XkbGeometryNameMask (1<<1) Xkb->names geometry - + XkbSymbolsNameMask (1<<2) Xkb->names symbols - + XkbPhysSymbolsNameMask (1<<3) Xkb->names phys_symbols - + XkbTypesNameMask (1<<4) Xkb->names type - + XkbCompatNameMask (1<<5) Xkb->names compat - + XkbKeyTypeNamesMask (1<<6) Xkb->map type[*].name - + XkbKTLevelNamesMask (1<<7) Xkb->map type[*].lvl_names[*] - + XkbIndicatorNamesMask (1<<8) Xkb->names indicators[*] - + XkbKeyNamesMask (1<<9) Xkb->names keys[*], num_keys - + 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 @@ -350,7 +351,7 @@ description are shown in Table 18.1. compatibility map - + XkbAllNamesMask (0x3fff) Xkb->names @@ -371,10 +372,11 @@ XkbGetNames - - + + + - + Status XkbGetNames @@ -383,21 +385,21 @@ dpy, which, Xkb ) - + Display * dpy ; /* connection to the X server */ - + unsigned int which ; /* mask of names or map components to be updated */ - + XkbDescPtr xkb @@ -524,10 +526,11 @@ BadImplementation - - + + + - + Bool XkbSetNames @@ -536,35 +539,35 @@ dpy, which, first_type, num_types, xkb ) - + Display * dpy ; /* connection to the X server */ - + unsigned int which ; /* mask of names or map components to be changed */ - + unsigned int first_type ; /* first type whose name is to be changed */ - + unsigned int num_types ; /* number of types for which names are to be changed */ - + XkbDescPtr xkb @@ -668,15 +671,16 @@ the fields in the structure specify the ranges that have changed for the various kinds of symbolic names, as shown in Table 18.2. -
+
XkbNameChanges Fields - - - - - + + + + + + - + Mask Fields Component @@ -684,7 +688,7 @@ various kinds of symbolic names, as shown in Table 18.2. - + XkbKeyTypeNamesMask first_type, @@ -693,7 +697,7 @@ various kinds of symbolic names, as shown in Table 18.2. Xkb->map type[*].name - + XkbKTLevelNamesMask first_lvl, @@ -702,19 +706,19 @@ various kinds of symbolic names, as shown in Table 18.2. Xkb->map type[*].lvl_names[*] - + XkbKeyAliasesMask num_aliases Xkb->names key_aliases[*] - + XkbRGNamesMask num_rg Xkb->names radio_groups[*] - + XkbKeyNamesMask first_key, @@ -723,19 +727,19 @@ various kinds of symbolic names, as shown in Table 18.2. Xkb->names keys[*] - + XkbVirtualModNamesMask changed_vmods Xkb->names vmods[*] - + XkbIndicatorNamesMask changed_indicators Xkb->names indicators[*] - + XkbGroupNamesMask changed_groups Xkb->names @@ -756,10 +760,11 @@ XkbNameChangesRec - - + + + - + Bool XkbChangeNames @@ -768,21 +773,21 @@ dpy, xkb, changes ) - + Display * dpy ; /* connection to the X server */ - + XkbDescPtr xkb ; /* keyboard description from which names are to be taken */ - + XkbNameChangesPtr changes @@ -907,10 +912,11 @@ XkbNoteNameChanges - - + + + - + void XkbNoteNameChanges @@ -923,7 +929,7 @@ old ) - + XkbNameChangesPtr old @@ -932,14 +938,14 @@ XkbNameChanges structure to be updated */ - + XkbNamesNotifyEvent * new ; /* event from which changes are to be copied */ - + unsigned int wanted @@ -977,10 +983,11 @@ XkbNoteNameChanges - - + + + - + Status XkbGetNameChanges @@ -993,21 +1000,21 @@ dpy ) - + Display * dpy ; /* connection to the X server */ - + XkbDescPtr xkb ; /* keyboard description to which names are copied */ - + XkbNameChangesPtr changes @@ -1061,10 +1068,11 @@ XkbAllocNames - - + + + - + Status XkbAllocNames @@ -1072,28 +1080,28 @@ XkbAllocNames xkb, which, num_rg, num_key_aliases) - + XkbDescPtr xkb; /* keyboard description for which names are to be allocated */ - + unsigned int which; /* mask of names to be allocated */ - + int num_rg; /* total number of radio group names needed */ - + int num_key_aliases; @@ -1134,10 +1142,11 @@ XkbFreeNames - - + + + - + void XkbFreeNames @@ -1145,21 +1154,21 @@ XkbFreeNames xkb, which, free_map) - + XkbDescPtr xkb ; /* keyboard description for which names are to be freed */ - + unsigned int which ; /* mask of names components to be freed */ - + Bool free_map diff --git a/libX11/specs/XKB/ch19.xml b/libX11/specs/XKB/ch19.xml index b00afc34b..4b4b0a023 100644 --- a/libX11/specs/XKB/ch19.xml +++ b/libX11/specs/XKB/ch19.xml @@ -208,12 +208,13 @@ and detail parameter to a mask composed of a bitwise OR of masks in Table 19.1. -
+
XkbNewKeyboardNotifyEvent Details - - - - + + + + + XkbNewKeyboardNotify Event Details @@ -222,22 +223,22 @@ and - + XkbNKN_KeycodesMask (1L<<0) Notification of keycode range changes wanted - + XkbNKN_GeometryMask (1L<<1) Notification of geometry changes wanted - + XkbNKN_DeviceIDMask (1L<<2) Notification of device ID changes wanted - + XkbNKN_AllChangesMask (0x7) Includes all of the above masks diff --git a/libX11/specs/XKB/ch20.xml b/libX11/specs/XKB/ch20.xml index 20d5b27d4..6067b5b8f 100644 --- a/libX11/specs/XKB/ch20.xml +++ b/libX11/specs/XKB/ch20.xml @@ -9,21 +9,22 @@ partial descriptions. Table 20.1 identifies the component types and the type of information they contain. -
+
Server Database Keyboard Components - - - - + + + + + - + Component Type Component Primary Contents May also contain - + Keymap Complete keyboard description @@ -31,7 +32,7 @@ information they contain. - + Keycodes Symbolic name for each key @@ -43,14 +44,14 @@ information they contain. Description of indicators physically present - + Types Key types Real modifier bindings and symbolic names for some virtual modifiers - + Compatibility Rules used to assign actions to keysyms @@ -58,7 +59,7 @@ Real modifier bindings and symbolic names for some virtual modifiers Real modifier bindings and symbolic names for some virtual modifiers - + Symbols Symbol mapping for keyboard keys @@ -70,7 +71,7 @@ Real modifier bindings and symbolic names for some virtual modifiers Real modifier bindings and symbolic names for some virtual modifiers - + Geometry Layout of the keyboard @@ -164,10 +165,11 @@ XkbListComponents - - + + + - + XkbComponentListPtr XkbListComponents @@ -182,14 +184,14 @@ max_inout ) - + Display * dpy ; /* connection to X server */ - + unsigned int device_spec @@ -198,14 +200,14 @@ XkbUseCoreKbd */ - + XkbComponentNamesPtr ptrns ; /* namelist for components of interest */ - + int * max_inout @@ -366,17 +368,18 @@ XkbFreeComponentList - - + + + - + void XkbFreeComponentList (list) - + XkbComponentListPtr list; /* pointer to XkbComponentListRec @@ -424,15 +427,16 @@ XkbLC_AlternateGroup may be combined with any of the other flags). -
+
XkbComponentNameRec Flags Bits - - - - - + + + + + + - + Component Type Component Hints (flags) Meaning @@ -440,79 +444,79 @@ XkbLC_AlternateGroup - + All Components XkbLC_Hidden Do not present to user (1L<<0) - + XkbLC_Default Default member of class (1L<<1) - + XkbLC_Partial Partial component (1L<<2) - + Keymap none - + Keycodes none - + Types none - + Compatibility none - + Symbols XkbLC_AlphanumericKeys Bindings primarily for alphanumeric keyboard section (1L<<8) - + XkbLC_ModifierKeys Bindings primarily for modifier keys (1L<<9) - + XkbLC_KeypadKeys Bindings primarily for numeric keypad keys (1L<<10) - + XkbLC_FunctionKeys Bindings primarily for function keys (1L<<11) - + XkbLC_AlternateGroup Bindings for an alternate group (1L<<12) - + Geometry none @@ -549,10 +553,11 @@ XkbGetKeyboardByName - - + + + - + XkbDescPtr XkbGetKeyboardByName @@ -571,14 +576,14 @@ load ) - + Display * dpy ; /* connection to X server */ - + unsigned int device_spec @@ -587,28 +592,28 @@ XkbUseCoreKbd */ - + XkbComponentNamesPtr names ; /* names of components to fetch */ - + unsigned int want ; /* desired structures in returned record */ - + unsigned int need ; /* mandatory structures in returned record */ - + Bool load @@ -832,66 +837,67 @@ compat -
+
Want and Need Mask Bits and Required Names Components - - - - + + + + + - + want or need mask bit Required names Components value - + XkbGBN_TypesMask Types (1L<<0) - + XkbGBN_CompatMapMask Compat (1L<<1) - + XkbGBN_ClientSymbolsMask Types + Symbols + Keycodes (1L<<2) - + XkbGBN_ServerSymbolsMask Types + Symbols + Keycodes (1L<<3) - + XkbGBN_SymbolsMask Symbols (1L<<1) - + 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) @@ -988,51 +994,52 @@ XkbDescRec components that are filled in. -
+
XkbDescRec Components Returned for Values of Want & Needs - - - - + + + + + - + Request (want+need) Fills in Xkb components Equivalent Function Call - + XkbGBN_TypesMask map.types XkbGetUpdatedMap(dpy, XkbTypesMask, Xkb) - + XkbGBN_ServerSymbolsMask server XkbGetUpdatedMap(dpy, XkbAllClientInfoMask, Xkb) - + XkbGBN_ClientSymbolsMask map, including map.types XkbGetUpdatedMap(dpy, XkbAllServerInfoMask, Xkb) - + XkbGBN_IndicatorMaps indicators XkbGetIndicatorMap(dpy, XkbAllIndicators, Xkb) - + XkbGBN_CompatMapMask compat XkbGetCompatMap(dpy, XkbAllCompatMask, Xkb) - + XkbGBN_GeometryMask geom XkbGetGeometry(dpy, Xkb) - + XkbGBN_KeyNamesMask names.keys @@ -1042,7 +1049,7 @@ XkbDescRec XkbGetNames(dpy, XkbKeyNamesMask | XkbKeyAliasesMask, Xkb) - + XkbGBN_OtherNamesMask names.keycodes @@ -1113,10 +1120,11 @@ XkbGetKeyboard - - + + + - + XkbDescPtr XkbGetKeyboard @@ -1129,14 +1137,14 @@ device_spec ) - + Display * dpy ; /* connection to X server */ - + unsigned int which @@ -1145,7 +1153,7 @@ XkbDescRec of interest */ - + unsigned int device_spec diff --git a/libX11/specs/XKB/ch21.xml b/libX11/specs/XKB/ch21.xml index bd5738991..7b2c653ba 100644 --- a/libX11/specs/XKB/ch21.xml +++ b/libX11/specs/XKB/ch21.xml @@ -225,15 +225,16 @@ same bits are used to indicate the specific information desired in many of the functions described subsequently in this section. -
+
XkbDeviceInfoRec Mask Bits - - - - - + + + + + + - + Name XkbDeviceInfoRec Fields Effected Value @@ -241,7 +242,7 @@ functions described subsequently in this section. - + XkbXI_KeyboardsMask (1L << 0) @@ -251,7 +252,7 @@ Clients can use all Xkb requests and events with devices supported by the input device extension. - + XkbXI_ButtonActionsMask num_btns @@ -264,7 +265,7 @@ KeyClass input extension devices. - + XkbXI_IndicatorNamesMask leds->names (1L <<2) @@ -274,7 +275,7 @@ KeyClass input extension devices. - + XkbXI_IndicatorMapsMask leds->maps (1L <<3) @@ -284,7 +285,7 @@ KeyClass input extension devices. - + XkbXI_IndicatorStateMask leds->state (1L <<4) @@ -294,7 +295,7 @@ KeyClass input extension devices. - + XkbXI_IndicatorsMask sz_leds @@ -303,42 +304,42 @@ KeyClass (0x1c) -XkbXI_IndicatorNamesMask | -XkbXI_IndicatorMapsMask | -XkbXI_IndicatorStateMask +XkbXI_IndicatorNames­Mask | +XkbXI_IndicatorMaps­Mask | +XkbXI_IndicatorState­Mask - + XkbXI_UnsupportedFeaturesMask unsupported (1L <<15) - + XkbXI_AllDeviceFeaturesMask Those selected by Value column masks (0x1e) -XkbXI_IndicatorsMask | -XkbSI_ButtonActionsMask +XkbXI_Indicators­Mask | +XkbSI_ButtonActions­Mask - + XkbXI_AllFeaturesMask Those selected by Value column masks (0x1f) -XkbSI_AllDeviceFeaturesMask | -XkbSI_KeyboardsMask +XkbSI_AllDevice­FeaturesMask | +XkbSI_Keyboards­Mask - + XkbXI_AllDetailsMask Those selected by Value column masks (0x801f) -XkbXI_AllFeaturesMask | -XkbXI_UnsupportedFeaturesMask +XkbXI_AllFeatures­Mask | +XkbXI_Unsupported­FeaturesMask @@ -376,10 +377,11 @@ KeyClass - - + + + - + XkbDeviceInfoPtr XkbGetDeviceInfo @@ -388,20 +390,20 @@ dpy , which, device_spec, ind_class, ind_id) - + Display * dpy ; /* connection to X server */ - + unsigned int which; /* mask indicating information to return */ - + unsigned int device_spec @@ -410,14 +412,14 @@ XkbUseCoreKbd */ - + unsigned int ind_class ; /* feedback class for indicator requests */ - + unsigned int ind_id @@ -613,10 +615,11 @@ XkbGetDeviceButtonActions. - - + + + - + Status XkbGetDeviceButtonActions @@ -625,20 +628,20 @@ dpy, device_info, all_buttons, first_button, num_buttons ) - + Display * dpy ; /* connection to X server */ - + XkbDeviceInfoPtr device_info; /* structure to update with results */ - + Bool all_buttons @@ -647,13 +650,13 @@ True => get information for all buttons */ - + unsigned int first_button; /* number of first button for which info is desired */ - + unsigned int num_buttons; /* number of buttons for which info is desired */ @@ -746,10 +749,11 @@ of an input extension device, use XkbGetDeviceLedInfo. - - + + + - + Status XkbGetDeviceLedInfo @@ -758,33 +762,33 @@ dpy, device_i nfo, led_class, led_id, which) - + Display * dpy ; /* connection to X server */ - + XkbDeviceInfoPtr device_info; /* structure to update with results */ - + unsigned int led_class ; /* LED feedback class assigned by input extension */ - + unsigned int led_id; /* LED feedback ID assigned by input extension */ - + unsigned int which; /* mask indicating desired information */ @@ -934,30 +938,31 @@ XkbDeviceInfoRec - - + + + - + XkbDeviceInfoPtr XkbAllocDeviceInfo (device_spec, n_buttons, sz_leds) - + unsigned int device_spec; /* device ID with which structure will be used */ - + unsigned int n_buttons ; /* number of button actions to allocate space for*/ - + unsigned int sz_leds @@ -1004,24 +1009,25 @@ XkbDeviceLedInfoRec - - + + + - + Status XkbAllocDeviceLedInfo (devi, num_needed) - + XkbDeviceInfoPtr device_info ; /* structure in which to allocate LED space */ - + int num_needed @@ -1060,30 +1066,31 @@ XkbDeviceLedInfoRec - - + + + - + XkbDeviceLedInfoPtr XkbAddDeviceLedInfo (device_info, led_class, led_id) - + XkbDeviceInfoPtr device_info; /* structure in which to add LED info */ - + unsigned int led_class ; /* input extension class for LED device of interest */ - + unsigned int led_id @@ -1154,23 +1161,24 @@ XkbDeviceInfoRec - - + + + - + Status XkbResizeDeviceButtonActions (device_info, new_total) - + XkbDeviceInfoPtr device_info; /* structure in which to allocate button actions */ - + unsigned int new_total @@ -1217,24 +1225,25 @@ XkbDeviceInfoRec - - + + + - + void XkbFreeDeviceInfo (device_info, which, free_all) - + XkbDeviceInfoPtr device_info; /* pointer to XkbDeviceInfoRec in which to free items */ - + unsigned int which @@ -1243,7 +1252,7 @@ device_info to free */ - + Bool free_all @@ -1379,10 +1388,11 @@ use XkbSetDeviceInfo. - - + + + - + Bool XkbSetDeviceInfo @@ -1391,21 +1401,21 @@ dpy , which, device_info) - + Display * dpy ; /* connection to X server */ - + unsigned int which ; /* mask indicating characteristics to modify */ - + XkbDeviceInfoPtr device_info; /* structure defining the device and modifications */ @@ -1577,10 +1587,11 @@ XkbSetDeviceButtonActions. - - + + + - + Bool XkbSetDeviceButtonActions @@ -1589,26 +1600,26 @@ dpy , device, first_button, num_buttons, actions) - + Display * dpy ; /* connection to X server */ - + XkbDeviceInfoPtr device_info; /* structure defining the device and modifications */ - + unsigned int first_button; /* number of first button to update, 0 relative */ - + unsigned int num_buttons; /* number of buttons to update */ @@ -1842,10 +1853,11 @@ XkbExtensionDeviceNotify - - + + + - + void XkbNoteDeviceChanges @@ -1854,21 +1866,21 @@ old, new, wanted ) - + XkbDeviceChangesPtr old ; /* structure tracking state changes */ - + XkbExtensionDeviceNotifyEvent * new ; /* event indicating state changes */ - + unsigned int wanted @@ -1921,10 +1933,11 @@ XkbGetDeviceInfoChanges. - - + + + - + Status XkbGetDeviceInfoChanges @@ -1935,20 +1948,20 @@ device_info , changes) - + Display * dpy ; /* connection to X server */ - + XkbDeviceInfoPtr device_info; /* structure to update with results */ - + XkbDeviceChangesPtr changes @@ -1985,10 +1998,11 @@ XkbDeviceChangesRec, use XkbChangeDeviceInfo. - - + + + - + Bool XkbChangeDeviceInfo @@ -1997,21 +2011,21 @@ dpy, device_info, changes ) - + Display * dpy ; /* connection to X server */ - + XkbDeviceInfoPtr device_info ; /* local copy of device state and configuration */ - + XkbDeviceChangesPtr changes diff --git a/libX11/specs/XKB/ch22.xml b/libX11/specs/XKB/ch22.xml index 8a509b7d4..4dea73387 100644 --- a/libX11/specs/XKB/ch22.xml +++ b/libX11/specs/XKB/ch22.xml @@ -21,10 +21,11 @@ XkbSetDebuggingFlags - - + + + - + Bool XkbSetDebuggingFlags @@ -33,21 +34,21 @@ display, mask, flags, msg, ctrls_mask, ctrls, ret_flags, ret_ctrls ) - + Display * display ; /* connection to X server */ - + unsigned int mask ; /* mask selecting debug output flags to change */ - + unsigned int flags @@ -56,21 +57,21 @@ mask */ - + char * msg ; /* message to print right now */ - + unsigned int ctrls_mask ; /* mask selecting debug controls to change */ - + unsigned int ctrls @@ -79,14 +80,14 @@ ctrls_mask */ - + unsigned int * ret_flags ; /* resulting state of all debug output flags */ - + unsigned int * ret_ctrls @@ -160,21 +161,22 @@ flags are. The valid controls bits are defined in Table 22.1. -
+
Debug Control Masks - - - - + + + + + - + Debug Control Mask Value Meaning - + XkbDF_DisableLocks (1 << 0) Disable actions that lock modifiers diff --git a/libX11/specs/i18n/framework/framework.xml b/libX11/specs/i18n/framework/framework.xml index 79688e712..632430181 100644 --- a/libX11/specs/i18n/framework/framework.xml +++ b/libX11/specs/i18n/framework/framework.xml @@ -350,50 +350,51 @@ The following values are defined as standard arguments. Other values are implementation dependent. - - - - - + + + + + + - + Name Type Description - + XlcNCodeset char* codeset part of locale name - + XlcNDefaultString char* XDefaultString() - + XlcNEncodingName char* encoding name - + XlcNLanguage char* language part of locale name - + XlcNMbCurMax int ANSI C MB_CUR_MAX - + XlcNStateDependentEncoding Bool is state-dependent encoding or not - + XlcNTerritory char* territory part of locale name @@ -465,130 +466,131 @@ returns NULL, if no XlcCharSet bound to specified "name - - - - + + + + + - + Name Description - + ISO8859-1:GL 7-bit ASCII graphics (ANSI X3.4-1968), - + Left half of ISO 8859 sets - + JISX0201.1976-0:GL Left half of JIS X0201-1976 (reaffirmed 1984), - + 8-Bit Alphanumeric-Katakana Code - + ISO8859-1:GR Right half of ISO 8859-1, Latin alphabet No. 1 - + ISO8859-2:GR Right half of ISO 8859-2, Latin alphabet No. 2 - + ISO8859-3:GR Right half of ISO 8859-3, Latin alphabet No. 3 - + ISO8859-4:GR Right half of ISO 8859-4, Latin alphabet No. 4 - + ISO8859-7:GR Right half of ISO 8859-7, Latin/Greek alphabet - + ISO8859-6:GR Right half of ISO 8859-6, Latin/Arabic alphabet - + ISO8859-8:GR Right half of ISO 8859-8, Latin/Hebrew alphabet - + ISO8859-5:GR Right half of ISO 8859-5, Latin/Cyrillic alphabet - + ISO8859-9:GR Right half of ISO 8859-9, Latin alphabet No. 5 - + JISX0201.1976-0:GR Right half of JIS X0201-1976 (reaffirmed 1984), - + 8-Bit Alphanumeric-Katakana Code - + GB2312.1980-0:GL GB2312-1980, China (PRC) Hanzi defined as GL - + GB2312.1980-0:GR GB2312-1980, China (PRC) Hanzi defined as GR - + JISX0208.1983-0:GL JIS X0208-1983, Japanese Graphic Character Set - + defined as GL - + JISX0208.1983-0:GR JIS X0208-1983, Japanese Graphic Character Set - + defined as GR - + KSC5601.1987-0:GL KS C5601-1987, Korean Graphic Character Set - + defined as GL - + KSC5601.1987-0:GR KS C5601-1987, Korean Graphic Character Set - + defined as GR - + JISX0212.1990-0:GL JIS X0212-1990, Japanese Graphic Character Set - + defined as GL - + JISX0212.1990-0:GR JIS X0212-1990, Japanese Graphic Character Set - + defined as GR @@ -636,45 +638,46 @@ be obtained. The following values are defined as standard arguments. Other values are implementation dependent. - - - - - + + + + + + - + Name Type Description - + XlcNName char* charset name - + XlcNEncodingName char* XLFD CharSet Registry and Encoding - + XlcNSide XlcSide charset side (GL, GR, ...) - + XlcNCharSize int number of octets per character - + XlcNSetSize int number of character sets - + XlcNControlSequence char* control sequence of Compound Text @@ -750,14 +753,15 @@ The following types are pre-defined. Other types are implementation dependent. - - - - - - + + + + + + + - + Name Type Description @@ -765,37 +769,37 @@ dependent. - + XlcNMultiByte char * multibyte - - + XlcNWideChar wchar_t * wide character - - + XlcNCompoundText char * COMPOUND_TEXT - - + XlcNString char * STRING - - + XlcNCharSet char * per charset XlcCharSet - + XlcNChar char * per character @@ -863,25 +867,26 @@ The following 2 converters prepared by locale returns appropriate charset (XlcCharSet) in an area pointed by args[0]. - - - - - + + + + + + - + From To Description - + XlcNMultiByte XlcNCharSet Segmentation (Decomposing) - + XlcNWideChar XlcNCharSet Segmentation (Decomposing) diff --git a/libX11/specs/i18n/localedb/localedb.xml b/libX11/specs/i18n/localedb/localedb.xml index c08516125..caacd82d5 100644 --- a/libX11/specs/i18n/localedb/localedb.xml +++ b/libX11/specs/i18n/localedb/localedb.xml @@ -155,127 +155,128 @@ The format of category definition is; - - - - + + + + + - + CategoryDefinition ::= CategoryHeader CategorySpec CategoryTrailer - + CategoryHeader ::= CategoryName NL - + CategorySpec ::= { ClassSpec } - + CategoryTrailer ::= "END" Delimiter CategoryName NL - + CategoryName ::= String - + ClassSpec ::= ClassName Delimiter ClassValue NL - + ClassName ::= String - + ClassValue ::= ValueList | "{" NL { ClassSpec } "}" - + ValueList ::= Value | Value ";" ValueList - + Value ::= ValuePiece | ValuePiece Value - + ValuePiece ::= String | QuotedString | NumericString - + String ::= Char { Char } - + QuotedString ::= """ QuotedChar { QuotedChar } """ - + NumericString ::= "\\o" OctDigit { OctDigit } - + | "\\d" DecDigit { DecDigit } - + | "\\x" HexDigit { HexDigit } - + Char ::= <XPCS except NL, Space or unescaped reserved symbols> - + QuotedChar ::= <XPCS except unescaped """> - + OctDigit ::= <character in the range of "0" - "7"> - + DecDigit ::= <character in the range of "0" - "9"> - + HexDigit ::= <character in the range of "0" - "9", "a" - "f", "A" - "F"> - + Delimiter ::= Space { Space } - + Space ::= <space> | <horizontal tab> - + NL ::= <newline> @@ -317,14 +318,14 @@ In current sample implementation, categories listed below are available. - - - + + + - + XLC_FONTSET:XFontSet relative information - + XLC_XLOCALE:Character classification and conversion information @@ -340,30 +341,31 @@ It contains the CHARSET_REGISTRY-CHARSET_ENCODING name and character mapping side (GL, GR, etc), and is used in Output Method (OM). - - + + + - - - - + + + + class super class description - + fsN Nth fontset (N=0,1,2, ...) - + charset fsN list of encoding name - + font fsN list of font encoding name @@ -393,22 +395,23 @@ Specifies an encoding information to be used internally in Xlib for this fontset. The format of value is; - - - - + + + + + - + EncodingInfo ::= EncodingName [ ":" EncodingSide ] - + EncodingName ::= CHARSET_REGISTRY-CHARSET_ENCODING - + EncodingSide ::= "GL" | "GR" @@ -447,70 +450,71 @@ The XLC_XLOCALE category defines character classification, conversion and other character attributes. - - - - - + + + + + + - + class super class description - + encoding_name codeset name - + mb_cur_max MB_CUR_MAX - + state_depend_encoding state dependent or not - + wc_encoding_mask for parsing wc string - + wc_shift_bits for conversion between wc and mb - + csN Nth charset (N=0,1,2,...) - + side csN mapping side (GL, etc) - + length csN length of a character - + mb_encoding csN for parsing mb string - + wc_encoding csN for parsing wc string - + ct_encoding csN list of encoding name for ct @@ -610,32 +614,33 @@ Specifies a list of shift sequence for parsing multi-byte string. The format of this value is; - - - - + + + + + - + MBEncoding ::= ShiftType ShiftSequence - + | ShiftType ShiftSequence ";" MBEncoding - + ShiftType ::= "<SS>"|"<LSL>"|"<LSR>" - + ShiftSequence ::= SequenceValue|SequenceValue ShiftSequence - + SequenceValue ::= NumericString diff --git a/libX11/specs/i18n/trans/trans.xml b/libX11/specs/i18n/trans/trans.xml index afbc69403..68611ea34 100644 --- a/libX11/specs/i18n/trans/trans.xml +++ b/libX11/specs/i18n/trans/trans.xml @@ -152,15 +152,16 @@ typedef struct { - - - + + + + - + transport_name name of transportRefer to "The Input Method Protocol: Appendix B - + config initial configuration function @@ -276,16 +277,17 @@ Following functions are used for the transport interface.
+ The Transport Layer Functions - - - - + + + + - Alternate Entry (Interface Layer) - XimProto member (Transport Layer) - Section + Alternate Entry (Interface Layer) + XimProto member (Transport Layer) + Section @@ -1105,66 +1107,67 @@ window of XIM_SERVER selection, which the IM Server has created. Refer to "The Input Method Protocol" for the XIM_SERVER atom. -
+
+ The ClientMessage sent to the IMS window. - - - - - + + + + + - - Structure Member - Contents + + Structure Member + Contents - + int type ClientMessage - + u_long serial Set by the X Window System - + Bool send_event Set by the X Window System - + Display *display The display to which connects - + Window window IMS Window ID - + Atom message_type XInternAtom(display, "_XIM_CONNECT", false) - + int format 32 - + long data.1[0] client communication window ID - + long data.1[1] client-major-transport-version(*1) - + long data.1[2] client-major-transport-version(*1) @@ -1179,71 +1182,72 @@ window), the IM Server sends a ClientMessage in the following event's format to the client communication window. -
+
+ The ClientMessage sent by IM Server. - - - - - + + + + + - - Structure Member - Contents + + Structure Member + Contents - + int type ClientMessage - + u_long serial Set by the X Window System - + Bool send_event Set by the X Window System - + Display *display The display to which connects - + Window window IMS Window ID - + Atom message_type XInternAtom(display, "_XIM_CONNECT", false) - + int format 32 - + long data.1[0] client communication window ID - + long data.1[1] client-major-transport-version(*1) - + long data.1[2] client-major-transport-version(*1) - + long data.1[3] dividing size between ClientMessage and Property(*2) @@ -1262,11 +1266,12 @@ major/minor-transport-version, as follows:
-The read/write method and the major/minor-transport-version - - - - + + The read/write method and the major/minor-transport-version + + + + @@ -1280,25 +1285,25 @@ major/minor-transport-version, as follows: - + 0 0 only-CM & Property-with-CM - + 1 only-CM & multi-CM - + 2 only-CM & multi-CM & Property-with-CM - + 1 0 PropertyNotify - + 2 0 only-CM & PropertyNotify @@ -1380,56 +1385,57 @@ the X Window System. If data is sent via ClientMessage event, the format is as follows: -
+
+ The ClientMessage event's format (first or middle) - - - - - + + + + + - - Structure Member - Contents + + Structure Member + Contents - + int type ClientMessage - + u_long serial Set by the X Window System - + Bool send_event Set by the X Window System - + Display *display The display to which connects - + Window window IMS Window ID - + Atom message_type XInternAtom(display, "_XIM_MOREDATA", False) - + int format 8 - + char data.b[20] (read/write DATA : 20 byte) @@ -1440,56 +1446,57 @@ If data is sent via ClientMessage event, the format is as follows: -
+
+ The ClientMessage event's format (only or last) - - - - - + + + + + - - Structure Member - Contents + + Structure Member + Contents - + int type ClientMessage - + u_long serial Set by the X Window System - + Bool send_event Set by the X Window System - + Display *display The display to which connects - + Window window IMS Window ID - + Atom message_type XInternAtom(display, "_XIM_PROTOCOL", False) - + int format 8 - + char data.b[20] (read/write DATA : MAX 20 byte) @@ -1534,51 +1541,52 @@ The arguments of the XChangeProperty are as follows: -
+
+ The XChangeProperty event's format - - - - + + + + - - Argument - Contents + + Argument + Contents - + Display *display The display to which connects - + Window window IMS communication window ID - + Atom property read/write property Atom (*1) - + int format 8 - + int mode PropModeAppend - + u_char *data read/write DATA - + int nelements length of DATA @@ -1603,61 +1611,62 @@ If Atom is notified via ClientMessage event, the format of the ClientMessage is as follows: -
+
+ The ClientMessage event's format to send Atom of property - - - - - + + + + + - - Structure Member - Contents + + Structure Member + Contents - + int type ClientMessage - + u_long serial Set by the X Window System - + Bool send_event Set by the X Window System - + Display *display The display to which connects - + Window window IMS Window ID - + Atom message_type XInternAtom(display, "_XIM_PROTOCOL", False) - + int format 8 - + long data.1[0] length of read/write property Atom - + long data.1[1] read/write property Atom @@ -1677,56 +1686,57 @@ is as follows: The format of the ClientMessage is as follows: -
+
+ The ClientMessage event's format (first or middle) - - - - - + + + + + - - Structure Member - Contents + + Structure Member + Contents - + int type ClientMessage - + u_long serial Set by the X Window System - + Bool send_event Set by the X Window System - + Display *display The display to which connects - + Window window IMS Window ID - + Atom message_type XInternAtom(display, "_XIM_MOREDATA", False) - + int format 8 - + char data.b[20] (read/write DATA : 20 byte) @@ -1739,56 +1749,57 @@ The format of the ClientMessage is as follows: -
+
+ The ClientMessage event's format (only or last) - - - - - + + + + + - - Structure Member - Contents + + Structure Member + Contents - + int type ClientMessage - + u_long serial Set by the X Window System - + Bool send_event Set by the X Window System - + Display *display The display to which connects - + Window window IMS Window ID - + Atom message_type XInternAtom(display, "_XIM_PROTOCOL", False) - + int format 8 - + char data.b[20] (read/write DATA : MAX 20 byte) (*1) @@ -1833,51 +1844,52 @@ PropertyNotify event. The arguments of the XChangeProperty are as follows: -
+
+ The XChangeProperty event's format - - - - + + + + - - Argument - Contents + + Argument + Contents - + Display *display The display to which connects - + Window window IMS communication window ID - + Atom property read/write property Atom (*1) - + int format 8 - + int mode PropModeAppend - + u_char *data read/write DATA - + int nelements length of DATA @@ -1901,61 +1913,62 @@ If Atom is notified via ClientMessage event, the format of the ClientMessage is as follows: -
+
+ The ClientMessage event's format to send Atom of property - - - - - + + + + + - - Structure Member - Contents + + Structure Member + Contents - + int type ClientMessage - + u_long serial Set by the X Window System - + Bool send_event Set by the X Window System - + Display *display The display to which connects - + Window window IMS Window ID - + Atom message_type XInternAtom(display, "_XIM_PROTOCOL", False) - + int format 8 - + long data.1[0] length of read/write property Atom - + long data.1[1] read/write property Atom diff --git a/libX11/specs/libX11/AppA.xml b/libX11/specs/libX11/AppA.xml index 6e168ac88..3ac6e86fd 100644 --- a/libX11/specs/libX11/AppA.xml +++ b/libX11/specs/libX11/AppA.xml @@ -9,13 +9,16 @@ and the X protocol. The following table lists each Xlib function (in alphabetical order) and the corresponding protocol request that it generates. -
+
+ Protocol requests made by each Xlib function - + + + - - Xlib Function - Protocol Request + + Xlib Function + Protocol Request @@ -1057,13 +1060,16 @@ and the corresponding protocol request that it generates. The following table lists each X protocol request (in alphabetical order) and the Xlib functions that reference it. -
+
+ Xlib functions which use each Protocol Request - + + + - - Protocol Request - Xlib Function + + Protocol Request + Xlib Function diff --git a/libX11/specs/libX11/CH03.xml b/libX11/specs/libX11/CH03.xml index a16a3bb77..e2468580d 100644 --- a/libX11/specs/libX11/CH03.xml +++ b/libX11/specs/libX11/CH03.xml @@ -425,14 +425,15 @@ and InputOnly windows: - - - - - - + + + + + + + - + Attribute Default InputOutput @@ -757,12 +758,13 @@ change of width and height, the (x, y) pairs are defined: - - - - + + + + + - + Gravity Direction Coordinates @@ -2438,9 +2440,10 @@ If a sibling and a stack_mode are specified, the window is restacked as follows: - - - + + + + Above @@ -2477,9 +2480,10 @@ the window is restacked as follows: - - - + + + + Above diff --git a/libX11/specs/libX11/CH06.xml b/libX11/specs/libX11/CH06.xml index da19f7a09..1a6709cd7 100644 --- a/libX11/specs/libX11/CH06.xml +++ b/libX11/specs/libX11/CH06.xml @@ -6995,16 +6995,17 @@ Conversion functions are available globally for use by other color spaces. The conversion functions provided by Xlib are: - - - - - + + + + + + - - Function - Converts from - Converts to + + Function + Converts from + Converts to diff --git a/libX11/specs/libX11/CH07.xml b/libX11/specs/libX11/CH07.xml index 4941db32f..b50dc8363 100644 --- a/libX11/specs/libX11/CH07.xml +++ b/libX11/specs/libX11/CH07.xml @@ -136,14 +136,15 @@ typedef struct { The default GC values are: - - - - + + + + + - - Component - Default + + Component + Default @@ -278,16 +279,17 @@ are: - - - - - + + + + + + - - Function Name - Value - Operation + + Function Name + Value + Operation @@ -626,11 +628,12 @@ when the cap-style is applied to both endpoints, the semantics depends on the line-width and the cap-style: - - - - - + + + + + + CapNotLast @@ -741,10 +744,11 @@ or the following apply: - - - - + + + + + FillSolid @@ -775,10 +779,11 @@ When drawing lines with line-style the odd dashes are controlled by the fill-style in the following manner: - - - - + + + + + FillSolid diff --git a/libX11/specs/libX11/CH10.xml b/libX11/specs/libX11/CH10.xml index 0230549d4..2024592b5 100644 --- a/libX11/specs/libX11/CH10.xml +++ b/libX11/specs/libX11/CH10.xml @@ -79,14 +79,15 @@ The processing associated with these events is discussed in section 10.5. - - - - + + + + + - - Event Category - Event Type + + Event Category + Event Type @@ -369,14 +370,15 @@ event mask: - - - - + + + + + - - Event Mask - Circumstances + + Event Mask + Circumstances @@ -557,18 +559,19 @@ Note that N.A. appears in columns for which the information is not applicable. - - - - - - + + + + + + + - - Event Mask - Event Type - Structure - Generic Structure + + Event Mask + Event Type + Structure + Generic Structure @@ -890,14 +893,15 @@ The effect is essentially equivalent to an with these client passed arguments: - - - - + + + + + - - Argument - Value + + Argument + Value @@ -1287,14 +1291,15 @@ or Some of the symbols mentioned in this section have fixed values, as follows: - - - - + + + + + - - Symbol - Value + + Symbol + Value diff --git a/libX11/specs/libX11/CH11.xml b/libX11/specs/libX11/CH11.xml index 9795c3220..001e05d8f 100644 --- a/libX11/specs/libX11/CH11.xml +++ b/libX11/specs/libX11/CH11.xml @@ -2049,14 +2049,15 @@ chapter: BadFontBadGCBadIDChoice - - - - + + + + + - - Error Code - Description + + Error Code + Description diff --git a/libX11/specs/libX11/CH12.xml b/libX11/specs/libX11/CH12.xml index e65bebc0c..ae8017b2b 100644 --- a/libX11/specs/libX11/CH12.xml +++ b/libX11/specs/libX11/CH12.xml @@ -1573,9 +1573,10 @@ is later than the current X server time. Depending on the event_mode argument, the following occurs: - - - + + + + AsyncPointer diff --git a/libX11/specs/libX11/CH13.xml b/libX11/specs/libX11/CH13.xml index 3a53f1f62..e710414c8 100644 --- a/libX11/specs/libX11/CH13.xml +++ b/libX11/specs/libX11/CH13.xml @@ -286,16 +286,17 @@ For each locale-dependent function, the following table describes the locale (and modifiers) dependency: - - - - - + + + + + + - - Locale from - Affects the Function - In + + Locale from + Affects the Function + In @@ -1028,14 +1029,15 @@ how each of the XOM values are treated by a particular output The following key applies to this table. - - - - + + + + + - - Key - Explanation + + Key + Explanation @@ -1049,14 +1051,15 @@ The following key applies to this table. - - - - + + + + + - - XOM Value - Key + + XOM Value + Key @@ -1639,14 +1642,15 @@ The third column indicates how each of the XOC values is trea The following keys apply to this table. - - - - + + + + + - - Key - Explanation + + Key + Explanation @@ -1673,13 +1677,14 @@ The following keys apply to this table. - - - - - + + + + + + - + XOC Value Alternative Interface Key @@ -5001,10 +5006,11 @@ Such customization may be desired without restarting the entire client. To support management of input methods in these cases, the following functions are provided: - - - - + + + + + @@ -5743,14 +5749,15 @@ are treated by that input style. The following keys apply to this table. - - - - + + + + + - - Key - Explanation + + Key + Explanation @@ -5775,14 +5782,15 @@ The following keys apply to this table. - - - - + + + + + - - XIM Value - Key + + XIM Value + Key @@ -5930,10 +5938,11 @@ by the input method for preedit information. XIMPreeditCallbacksXIMPreeditNothingXIMPreeditNone - - - - + + + + + XIMPreeditArea @@ -5988,10 +5997,11 @@ by the input method for status information. XIMStatusCallbacks XIMStatusNothing XIMStatusNone - - - - + + + + + XIMStatusArea @@ -6831,12 +6841,13 @@ are treated by that input style. The following keys apply to these tables. - - - - + + + + + - + Key Explanation @@ -6895,17 +6906,18 @@ The following keys apply to these tables. - - - - - - - - - + + + + + + + + + + - + XIC Value Geometry Mangement Preedit Callback @@ -7160,16 +7172,17 @@ The following keys apply to these tables. - - - - - - - - + + + + + + + + + - + XIC Value Geomentry Management Status Callback @@ -7815,13 +7828,14 @@ When a modifier_mask bit is set to 0, the state of the associated modifier is ignored when evaluating whether the key is hot or not. - - - - - + + + + + + - + Modifier Bit Mask Bit Meaning @@ -8382,10 +8396,11 @@ The set of preedit callbacks is as follows: XNPreeditDoneCallback XNPreeditDrawCallback XNPreeditCaretCallback - - - - + + + + + XNPreeditStartCallback @@ -8418,10 +8433,11 @@ The set of status callbacks is as follows: XNStatusStartCallback XNStatusDoneCallback XNStatusDrawCallback - - - - + + + + + XNStatusStartCallback @@ -9520,10 +9536,11 @@ These values are defined as follows: XIMBackwardWord XIMCaretUp XIMCaretDown - - - - + + + + + XIMForwardChar @@ -10104,10 +10121,11 @@ that indicates what has been returned in the other arguments. The possible values returned are: - - - - + + + + + XBufferOverflow diff --git a/libX11/specs/libX11/CH14.xml b/libX11/specs/libX11/CH14.xml index 5e6f72da7..ee14b95ee 100644 --- a/libX11/specs/libX11/CH14.xml +++ b/libX11/specs/libX11/CH14.xml @@ -30,18 +30,19 @@ The standard properties that are of special interest for communicating with wind managers are: - - - - - - + + + + + + + - - Name - Type - Format - Description + + Name + Type + Format + Description -- cgit v1.2.3