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/i18n/framework/framework.xml | 165 ++++++------ libX11/specs/i18n/localedb/localedb.xml | 155 ++++++------ libX11/specs/i18n/trans/trans.xml | 403 +++++++++++++++--------------- 3 files changed, 373 insertions(+), 350 deletions(-) (limited to 'libX11/specs/i18n') 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 -- cgit v1.2.3