diff --git a/specs/fsproto.xml b/specs/fsproto.xml index aa23d3a..677c7e8 100644 --- a/specs/fsproto.xml +++ b/specs/fsproto.xml @@ -605,7 +605,7 @@ BITMAPFORMATs are byte-swapped as CARD32s. All unspecified bits must be zero. -Use of an invalid BITMAPFORMAT causes a Format error to +Use of an invalid BITMAPFORMAT causes a Format error to be returned. @@ -625,7 +625,7 @@ This is a mask of bits representing the fields in a BITMAPFORMAT: ScanlineUnitMask (1 << 4) -Unspecified bits are required to be zero or else a Format error +Unspecified bits are required to be zero or else a Format error is returned. @@ -738,7 +738,7 @@ for which this EVENTMASK is intended (according to the EXTENSION- OPCODE given in the SetEventMask request), an -EventMask +EventMask error is generated. This value is swapped as a CARD32. @@ -1152,17 +1152,18 @@ otherwise specified, unused bytes are not required to be zero. If a request packet contains too little or too much data, the server returns -a Length error. If the server runs out of internal resources (such as -memory) while processing a request, it returns an Alloc error. If a server is +a Length error. If the server runs out of internal +resources (such as memory) while processing a request, it returns an +Alloc error. If a server is deficient (and therefore non-compliant) and is unable to process a request, it -may return an Implementation error. If a client uses an extension request -without previously having issued a +may return an Implementation error. +If a client uses an extension request without previously having issued a QueryExtension request for that extension, the server responds with a -Request +Request error. If the server encounters a request with an unknown MAJOR-OPCODE or MINOR-OPCODE, it responds with a -Request +Request error. At most one error is generated per request. If more than one error condition is encountered in processing a requests, the choice of which error is returned @@ -1378,7 +1379,8 @@ the remaining data to be transmitted to the client. The MAXIMUM-REQUEST-LENGTH specifies the largest request size in 4-byte units that is accepted by the server and must have a value of at least 4096. Requests with a length field larger -than this value are ignored and a Length error is returned. +than this value are ignored and a Length +error is returned. The VENDOR string specifies the name of the manufacturer of the font server. The RELEASE-NUMBER specifies the particular release of the server in a manufacturer-dependent manner. @@ -1395,7 +1397,7 @@ exchanged, the client may issue any of requests described below: NoOp -Errors: Alloc +Errors: Alloc This request does nothing. It is typically used in response @@ -1419,7 +1421,7 @@ event. names: LISTofSTRING8 -Errors: Alloc +Errors: Alloc This request returns the names of the extension packages @@ -1469,7 +1471,7 @@ case-sensitive and are encoded in ISO 8859-1. Errors: -Alloc +Alloc This request determines whether or not the extension package @@ -1501,7 +1503,7 @@ issuing any of the requests in the named extension package or using the SetEventMask request to express interest in any of this extension's events. Otherwise, a -Request +Request error is returned. @@ -1533,7 +1535,7 @@ error is returned. Errors: -Alloc +Alloc This request returns a list of at most MAX-NAMES names @@ -1582,8 +1584,8 @@ is set to zero. Errors: -Alloc, -Name +Alloc, +Name This request sets the list of catalogues whose fonts should be @@ -1602,7 +1604,7 @@ server-dependent default. If any of the catalogue names are invalid, a -Name +Name error is returned and the request is ignored. @@ -1623,7 +1625,7 @@ error is returned and the request is ignored. Errors: -Alloc +Alloc This request returns the current list of catalogue names @@ -1655,8 +1657,8 @@ returned in mixed case. Errors: -EventMask, -Request +EventMask, +Request This request specifies the set of maskable events that the @@ -1680,12 +1682,12 @@ If EXTENSION-OPCODE is not a valid extension opcode previously returned by QueryExtension or zero, a -Request +Request error is returned. If EVENT-MASK contains any bits that do not correspond to valid events for the specified extension (or core), an -EventMask +EventMask error is returned and the request is ignored. @@ -1711,7 +1713,7 @@ ignored. Errors: -Request +Request This request returns the set of maskable core events the @@ -1724,7 +1726,7 @@ If EXTENSION-OPCODE is not a valid extension opcode previously returned by QueryExtension or zero, a -Request +Request error is returned. @@ -1759,7 +1761,7 @@ error is returned. Errors: -IDChoice +IDChoice This request creates a new @@ -1813,7 +1815,7 @@ the request is complete. If AC is not in the range [1..2^29-1] or is already associated -with an access context, an IDChoice error is returned. +with an access context, an IDChoice error is returned. @@ -1829,8 +1831,8 @@ with an access context, an IDChoice error is returned. Errors: -AccessContext, -Alloc +AccessContext, +Alloc This request indicates that the specified AC should no longer @@ -1855,7 +1857,7 @@ request. If AC isn't associated with any valid authorization previously created by CreateAC, an -AccessContext +AccessContext error is returned. @@ -1872,7 +1874,7 @@ error is returned. Errors: -AccessContext +AccessContext This request sets the @@ -1903,7 +1905,7 @@ If AC is neither None nor a value associated with a valid previously created by CreateAC, an -AccessContext +AccessContext error is returned. @@ -1920,8 +1922,8 @@ error is returned. Errors: -Resolution, -Alloc +Resolution, +Alloc This request provides a hint as to the resolution and @@ -1940,7 +1942,7 @@ elements of all of the specified RESOLUTIONS are non-zero, the default resolutions for this client are changed. -If a RESOLUTION entry contains a zero, a Resolution error is +If a RESOLUTION entry contains a zero, a Resolution error is returned and the default resolutions are not changed. @@ -1958,7 +1960,7 @@ returned and the default resolutions are not changed. Errors: -Alloc +Alloc This request returns the current list of default resolutions. @@ -1995,7 +1997,7 @@ a server-dependent default value is returned. Errors: -Alloc +Alloc This request returns a list of at most MAX-NAMES font names @@ -2073,7 +2075,7 @@ is set to zero. Errors: -Alloc +Alloc This request is similar to @@ -2136,11 +2138,11 @@ client with the server. Errors: -IDChoice, -Name, -Format, -AccessContext, -Alloc +IDChoice, +Name, +Format, +AccessContext, +Alloc This request looks for a server-dependent choice of the @@ -2148,7 +2150,7 @@ font names that match the specified PATTERN according to the rules described for ListFonts. If no matches are found, a -Name +Name error is returned. Otherwise, the server attempts to open the font associated with the chosen name. @@ -2244,17 +2246,17 @@ with a non-wildcarded font name. If FONTID is not in the range [1..2^29-1] or if it is already associated with an open font, an -IDChoice +IDChoice error is returned. If no font is available that matches the specified PATTERN, a -Name +Name error is returned. If the font is present but the client is not permitted access, an -AccessContext +AccessContext error is returned. If FORMAT-MASK has any unspecified bits set or if any of the fields in FORMAT-HINT indicated by FORMAT-MASK are invalid, a -Format +Format error is returned. @@ -2279,8 +2281,8 @@ error is returned. Errors: -Font, -Alloc +Font, +Alloc This request returns the font header and property information @@ -2289,7 +2291,7 @@ for the open font associated with FONTID. If FONTID is not associated with any open fonts, a -Font +Font error is returned. @@ -2322,9 +2324,9 @@ is returned. Errors: -Font, -Range, -Alloc +Font, +Range, +Alloc This request is equivalent to @@ -2361,9 +2363,9 @@ uses 1-byte character codes. Errors: -Font, -Range, -Alloc +Font, +Range, +Alloc This request returns a list of glyph extents from the open @@ -2378,7 +2380,7 @@ returned. If CHARS contains an odd number of elements, the font's XFONTINFO.CHAR-RANGE.MAX-CHAR is implicitly appended to the list. If CHARS contains no elements, the list is implicitly replaced with the font's XFONTINFO.CHAR-RANGE. If -any of the resulting character ranges are invalid, a Range +any of the resulting character ranges are invalid, a Range error is returned. Otherwise, the character ranges are concatenated in the order given by CHARS to produce a set of character codes for which extents are returned. @@ -2403,11 +2405,11 @@ with non-zero but equal left and right bearings. If FONTID is not associated with any open fonts, a -Font +Font error is returned. If RANGE is True and CHARS contains any invalid ranges, a -Range +Range error is returned. @@ -2450,10 +2452,10 @@ error is returned. Errors: -Font, -Range, -Format, -Alloc +Font, +Range, +Format, +Alloc This request is equivalent to @@ -2502,10 +2504,10 @@ uses 1-byte character codes. Errors: -Font, -Range, -Format, -Alloc +Font, +Range, +Format, +Alloc This request returns a list of glyph bitmaps from the open @@ -2520,7 +2522,7 @@ returned. If CHARS contains an odd number of elements, the font's XFONTINFO.CHAR-RANGE.MAX-CHAR is implicitly appended to the list. If CHARS contains no elements, the list is implicitly replaced with the font's XFONTINFO.CHAR-RANGE. If -any of the resulting character ranges are invalid, a Range +any of the resulting character ranges are invalid, a Range error is returned. Otherwise, the character ranges are concatenated in the order given by CHARS to produce a set of character codes for which bitmaps are returned. @@ -2534,7 +2536,7 @@ offsets and bitmaps is returned. -If any of the resulting character ranges are invalid, a Range +If any of the resulting character ranges are invalid, a Range error is returned. Otherwise, the resulting character ranges are concatenated in the order given by CHARS to produce a set of character codes for which bitmaps are returned. @@ -2604,10 +2606,10 @@ this field is set to zero. -If FONTID is not associated with any open fonts, a Font error -is returned. If RANGE is True and CHARS contains any invalid -ranges, a Range error is returned. If FORMAT is invalid, a -Format error is returned. +If FONTID is not associated with any open fonts, a Font +error is returned. If RANGE is True and CHARS contains any invalid +ranges, a Range error is returned. +If FORMAT is invalid, a Format error is returned. @@ -2622,8 +2624,8 @@ Format error is returned. Errors: -Font, -Alloc +Font, +Alloc This request indicates that the specified FONTID should no @@ -2637,7 +2639,7 @@ request. If FONTID is not associated with any open fonts, a -Font +Font error is returned. @@ -2721,8 +2723,8 @@ The following errors are defined for the core protocol: - Error CodesRequest -Request + Error CodesRequest +Request
@@ -2740,8 +2742,8 @@ of that extension. - Error CodesFormat -Format + Error CodesFormat +Format
@@ -2764,8 +2766,8 @@ The value that caused the error is included as extra data. - Error CodesFont -Font + Error CodesFont +Font
@@ -2790,8 +2792,8 @@ the error is included as extra data. - Error CodesRange -Range + Error CodesRange +Range
@@ -2814,8 +2816,8 @@ value that caused the error is included as extra data.
- Error CodesEventMask -EventMask + Error CodesEventMask +EventMask
@@ -2836,7 +2838,7 @@ included as extra data. Error CodesAccessContext -AccessContext +AccessContext
@@ -2862,8 +2864,8 @@ ACCESSCONTEXT is returned as extra data.
- Error CodesIDChoice -IDChoice + Error CodesIDChoice +IDChoice
@@ -2886,8 +2888,8 @@ is included as extra data.
- Error CodesName -Name + Error CodesName +Name
@@ -2906,8 +2908,8 @@ request. - Error CodesResolution -Resolution + Error CodesResolution +Resolution
@@ -2933,8 +2935,8 @@ error is included in the DATA-OR-UNUSED field and as extra data. - Error CodesAlloc -Alloc + Error CodesAlloc +Alloc
@@ -2949,8 +2951,8 @@ lacks sufficient resources (especially memory). - Error CodesLength -Length + Error CodesLength +Length
@@ -2968,8 +2970,8 @@ caused the error is included as extra data.
- Error CodesImplementation -Implementation + Error CodesImplementation +Implementation
@@ -3777,7 +3779,7 @@ p unused, p=pad(m) Request 1 1 type error -1 0 Request +1 0 Request 2 CARD16 sequence-number 4 4 length 4 TIMESTAMP timestamp @@ -3787,7 +3789,7 @@ p unused, p=pad(m) Format 1 1 type error -1 1 Format +1 1 Format 2 CARD16 sequence-number 4 5 length 4 TIMESTAMP timestamp @@ -3798,7 +3800,7 @@ p unused, p=pad(m) Font 1 1 type error -1 2 Font +1 2 Font 2 CARD16 sequence-number 4 5 length 4 TIMESTAMP timestamp @@ -3809,7 +3811,7 @@ p unused, p=pad(m) Range 1 1 type error -1 3 Range +1 3 Range 2 CARD16 sequence-number 4 5 length 4 TIMESTAMP timestamp @@ -3820,7 +3822,7 @@ p unused, p=pad(m) EventMask 1 1 type error -1 4 EventMask +1 4 EventMask 2 CARD16 sequence-number 4 5 length 4 TIMESTAMP timestamp @@ -3831,7 +3833,7 @@ p unused, p=pad(m) AccessContext 1 1 type error -1 5 AccessContext +1 5 AccessContext 2 CARD16 sequence-number 4 5 length 4 TIMESTAMP timestamp @@ -3842,7 +3844,7 @@ p unused, p=pad(m) IDChoice 1 1 type error -1 6 IDChoice +1 6 IDChoice 2 CARD16 sequence-number 4 5 length 4 TIMESTAMP timestamp @@ -3853,7 +3855,7 @@ p unused, p=pad(m) Name 1 1 type error -1 7 Name +1 7 Name 2 CARD16 sequence-number 4 4 length 4 TIMESTAMP timestamp @@ -3863,7 +3865,7 @@ p unused, p=pad(m) Resolution 1 1 type error -1 8 Resolution +1 8 Resolution 2 CARD16 sequence-number 4 5 length 4 TIMESTAMP timestamp @@ -3873,7 +3875,7 @@ p unused, p=pad(m) Alloc 1 1 type error -1 9 Alloc +1 9 Alloc 2 CARD16 sequence-number 4 4 length 4 TIMESTAMP timestamp @@ -3883,7 +3885,7 @@ p unused, p=pad(m) Length 1 1 type error -1 10 Length +1 10 Length 2 CARD16 sequence-number 4 5 length 4 TIMESTAMP timestamp @@ -3894,7 +3896,7 @@ p unused, p=pad(m) Implementation 1 1 type error -1 11 Implementation +1 11 Implementation 2 CARD16 sequence-number 4 4 length 4 TIMESTAMP timestamp @@ -4004,8 +4006,8 @@ policies might include, but are not limited to, combinations of the following: No restrictions -anyone may access any fonts. The server neither -refuses any connections nor generates AccessContext errors on any +anyone may access any fonts. The server neither refuses any connections +nor generates AccessContext errors on any fonts. For environments without specially-licensed fonts, this is sufficient. @@ -4036,8 +4038,8 @@ and then look in a list of allowed users. Simultaneous Use -only a certain number of clients may use a given -font at any one time. Additional clients would receive AccessContext +only a certain number of clients may use a given font at any one time. +Additional clients would receive AccessContext errors if they attempt to open the font. This is only effective if the initial clients keep the font open for the entire time that it is being used (even if all of the data has been transmitted and is @@ -4053,7 +4055,7 @@ a particular font may only be accessed a limited number of times before its license must be renewed. Each time the font is opened, the server decrements a counter. When the counter reaches zero, all further attempts to open the font -return an AccessContext error. +return an AccessContext error.