fdo-mirrors/xorg-libx11
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/lib/libx11.git synced 2026-05-07 16:48:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

specs/XKB: Markup NULL as <symbol> instead of <emphasis>

Browse source 
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
This commit is contained in:
Alan Coopersmith 2014-07-08 22:26:56 -07:00
parent f10aa1e094
commit 33bef06568
15 changed files with 104 additions and 104 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
specs/XKB/ch02.xml
View file

@ -407,7 +407,7 @@ the X keyboard extension. In all cases, upon return
and
<parameter>minor_in_out</parameter>
are not
<emphasis>NULL</emphasis>,
<symbol>NULL</symbol>,
<function>XkbOpenDisplay</function>
first calls
<function>XkbLibraryVersion</function>
@ -424,7 +424,7 @@ If the library is incompatible,
<parameter>minor_in_out</parameter>
with the major and minor extension versions of the library being used and
returns
<emphasis>NULL</emphasis>.
<symbol>NULL</symbol>.
If the library is compatible,
<function>XkbOpenDisplay</function>
next calls
@ -432,7 +432,7 @@ next calls
with the
<parameter>display_name</parameter>.
If this fails, the function returns
<emphasis>NULL</emphasis>.
<symbol>NULL</symbol>.
If successful,
<function>XkbOpenDisplay</function>
calls
@ -446,7 +446,7 @@ If the server extension version is not compatible with the library extension
version or if the server extension is not present,
<function>XkbOpenDisplay</function>
closes the display and returns
<emphasis>NULL</emphasis>.
<symbol>NULL</symbol>.
When successful, the function returns the display connection.
</para>
@ -749,11 +749,11 @@ Where a connection to the server is passed as an argument (Display*) and an
field of the
<emphasis>XkbDescRec</emphasis>
must be
<emphasis>NULL</emphasis>.
<symbol>NULL</symbol>.
If they don’t match or the
<emphasis>dpy</emphasis>
field is not
<emphasis>NULL</emphasis>,
<symbol>NULL</symbol>,
a
<errorname>BadMatch</errorname>
error is returned (either in the return value or a backfilled

8
specs/XKB/ch06.xml
View file

@ -258,7 +258,7 @@ server for those components specified in the
and copies the results to the
<emphasis>XkbDescRec</emphasis>
it allocated. The remaining fields in the keyboard description are set to
<emphasis>NULL</emphasis>.
<symbol>NULL</symbol>.
The valid masks for
<parameter>which</parameter>
are those listed in <link linkend="table6.2">Table 6.2</link>.
@ -320,7 +320,7 @@ or
If
<function>XkbAllocKeyboard</function>
fails to allocate the keyboard description, it returns
<emphasis>NULL</emphasis>.
<symbol>NULL</symbol>.
Otherwise, it returns a pointer to an empty keyboard description structure.
The
<emphasis>device_spec</emphasis>
@ -392,14 +392,14 @@ To destroy either an entire an
specified by
<parameter>which</parameter>
and sets the corresponding values to
<emphasis>NULL</emphasis>.
<symbol>NULL</symbol>.
If
<parameter>free_all</parameter>
is
<symbol>True</symbol>,
<function>XkbFreeKeyboard</function>
frees every non-
<emphasis>NULL</emphasis>
<symbol>NULL</symbol>
component of
<parameter>xkb</parameter>
and then frees the

2
specs/XKB/ch07.xml
View file

@ -305,7 +305,7 @@ The
bit (0 relative) of the mask represents the i-th virtual modifier. If
<parameter>mask_rtrn</parameter>
is non-
<emphasis>NULL</emphasis>,
<symbol>NULL</symbol>,
<function>XkbVirtualModsToReal</function>
backfills it with the resulting real modifier mask. If the keyboard
description in

12
specs/XKB/ch08.xml
View file

@ -994,7 +994,7 @@ If the
field of the
<parameter>desc</parameter>
parameter is
<emphasis>NULL</emphasis>,
<symbol>NULL</symbol>,
<function>XkbGetIndicatorMap</function>
allocates and initializes it.
</para>
@ -1183,7 +1183,7 @@ indicator is mapped to a physical LED, the
Each of the "
<emphasis>_rtrn</emphasis>
" arguments is optional; you can pass
<emphasis>NULL</emphasis>
<symbol>NULL</symbol>
for any unneeded "
<emphasis>_rtrn</emphasis>
" arguments.
@ -1547,7 +1547,7 @@ If
and the optional parameter,
<parameter>state</parameter>,
is not
<emphasis>NULL</emphasis>,
<symbol>NULL</symbol>,
<function>XkbSetNamedIndicator</function>
tells the server to change the state of the named indicator to the value
specified by
@ -1574,7 +1574,7 @@ the name specified by
If the optional parameter,
<parameter>map</parameter>,
is not
<emphasis>NULL</emphasis>,
<symbol>NULL</symbol>,
<function>XkbSetNamedIndicator</function>
tells the server to change the indicator’s map to the values specified
in <parameter>map</parameter>.
@ -1989,7 +1989,7 @@ If the
field of
<parameter>xkb</parameter>
is
<emphasis>NULL</emphasis>,
<symbol>NULL</symbol>,
<function>XkbGetIndicatorChanges</function>
allocates and initializes it. To free the
<emphasis>indicators</emphasis>
@ -2103,7 +2103,7 @@ To free memory used by the
If the <emphasis>indicators</emphasis>
member of the keyboard description record
pointed to by <parameter>xkb</parameter>
is not <emphasis>NULL</emphasis>,
is not <symbol>NULL</symbol>,
<function>XkbFreeIndicatorMaps</function>
frees the memory associated with
the <emphasis>indicators</emphasis>

10
specs/XKB/ch09.xml
View file

@ -429,7 +429,7 @@ To ring the bell on an X input extension device or the default keyboard, use
</term>
<listitem>
<para>
a name for the bell, or <emphasis>NULL</emphasis>
a name for the bell, or <symbol>NULL</symbol>
</para>
</listitem>
</varlistentry>
@ -538,7 +538,7 @@ default keyboard:
</term>
<listitem>
<para>
a bell name, or <emphasis>NULL</emphasis>
a bell name, or <symbol>NULL</symbol>
</para>
</listitem>
</varlistentry>
@ -701,7 +701,7 @@ without ringing the corresponding bell, use
</term>
<listitem>
<para>
a bell name, or <emphasis>NULL</emphasis>
a bell name, or <symbol>NULL</symbol>
</para>
</listitem>
</varlistentry>
@ -796,7 +796,7 @@ the keyboard without ringing the bell:
</term>
<listitem>
<para>
a bell name, or <emphasis>NULL</emphasis>
a bell name, or <symbol>NULL</symbol>
</para>
</listitem>
</varlistentry>
@ -1033,7 +1033,7 @@ and
= None, and
<emphasis>name</emphasis>
=
<emphasis>NULL</emphasis>,
<symbol>NULL</symbol>,
and returns what
<function>XkbForceDeviceBell</function>
returns.

24
specs/XKB/ch10.xml
View file

@ -990,7 +990,7 @@ use
and waits for a reply. If
<parameter>supported_rtrn</parameter>
is not
<emphasis>NULL</emphasis>,
<symbol>NULL</symbol>,
it backfills supported_rtrn with
<symbol>True</symbol>
if the server supports
@ -1086,7 +1086,7 @@ and off it
; it then waits for a reply. If
<parameter>supported_rtrn</parameter>
is not
<emphasis>NULL</emphasis>,
<symbol>NULL</symbol>,
<function>XkbSetDetectableAutorepeat</function>
backfills
<parameter>supported_rtrn</parameter>
@ -4381,7 +4381,7 @@ If
-&gt;
<emphasis>ctrls</emphasis>
is
<emphasis>NULL</emphasis>,
<symbol>NULL</symbol>,
<function>XkbGetControls</function>
allocates and initializes it before obtaining the values specified by
<parameter>which</parameter>.
@ -4390,7 +4390,7 @@ If
-&gt;
<emphasis>ctrls</emphasis>
is not
<emphasis>NULL</emphasis>,
<symbol>NULL</symbol>,
<function>XkbGetControls</function>
modifies only those portions of
<parameter>xkb</parameter>
@ -4412,7 +4412,7 @@ If
if
<parameter>xkb</parameter>
is
<emphasis>NULL</emphasis>
<symbol>NULL</symbol>
or
<parameter>which</parameter>
is empty, or
@ -4533,7 +4533,7 @@ If
-&gt;
<emphasis>ctrls</emphasis>
is
<emphasis>NULL</emphasis>,
<symbol>NULL</symbol>,
the server does not support a compatible version of Xkb, or the Xkb extension
has not been properly initialized,
<function>XkbSetControls</function>
@ -4993,7 +4993,7 @@ results into the
field of
<parameter>xkb</parameter>
is
<emphasis>NULL</emphasis>,
<symbol>NULL</symbol>,
<function>XkbGetControlsChanges</function>
allocates and initializes it. To free the
<emphasis>ctrls</emphasis>
@ -5079,14 +5079,14 @@ allocate one by calling
If the
<emphasis>ctrls</emphasis>
field is not
<emphasis>NULL</emphasis>,
<symbol>NULL</symbol>,
<function>XkbAllocControls</function>
simply returns
<symbol>Success</symbol>.
If
<parameter>xkb</parameter>
is
<emphasis>NULL</emphasis>,
<symbol>NULL</symbol>,
<function>XkbAllocControls</function>
reports a
<errorname>BadMatch</errorname>
@ -5173,7 +5173,7 @@ structure, use
field in the
<parameter>xkb</parameter>
keyboard description and sets the corresponding structure component values to
<emphasis>NULL</emphasis>
<symbol>NULL</symbol>
or
<emphasis>zero</emphasis>.
The
@ -5192,7 +5192,7 @@ If
<symbol>True</symbol>,
<function>XkbFreeControls</function>
frees every non-
<emphasis>NULL</emphasis>
<symbol>NULL</symbol>
structure component in the controls, frees the
<emphasis>XkbControlsRec</emphasis>
structure referenced by the
@ -5202,7 +5202,7 @@ If
and sets
<emphasis>ctrls</emphasis>
to
<emphasis>NULL</emphasis>.
<symbol>NULL</symbol>.
</para>
</sect1>

2
specs/XKB/ch12.xml
View file

@ -588,7 +588,7 @@ being held down.
<parameter>state</parameter>.
<parameter>buf</parameter>
is
<emphasis>NULL</emphasis>
<symbol>NULL</symbol>
terminated unless there’s an overflow. If the string returned is larger than
<parameter>nbytes</parameter>,
a count of bytes that does not fit into the buffer is returned in extra_rtrn.

52
specs/XKB/ch13.xml
View file

@ -277,7 +277,7 @@ A list of one or more outlines (described below).
<para>
Optional pointers to a primary and an approximation outline (described below).
If either of these pointers is
<emphasis>NULL</emphasis>,
<symbol>NULL</symbol>,
the default primary/approximation outline is the first one in the list of
outlines for the shape.
</para>
@ -339,7 +339,7 @@ shape’s list of outlines. If the
field of the
<emphasis>XkbShapeRec</emphasis>
structure is not
<emphasis>NULL</emphasis>,
<symbol>NULL</symbol>,
it points to the primary outline. A rectangular
<emphasis>approximation</emphasis>
must be included for nonrectangular keys as one of the outlines associated
@ -846,7 +846,7 @@ If
and/or
<emphasis>primary</emphasis>
is
<emphasis>NULL</emphasis>,
<symbol>NULL</symbol>,
the default value is used. The default primary outline is the first element
in the outlines array, as is the default approximating outline.
</para>
@ -1289,11 +1289,11 @@ shape. The top surface is defined to be the approximating outline if the
field of
<parameter>shape</parameter>
is not
<emphasis>NULL</emphasis>.
<symbol>NULL</symbol>.
If
<emphasis>approx</emphasis>
is
<emphasis>NULL</emphasis>,
<symbol>NULL</symbol>,
the top surface is defined as the last outline in the
<parameter>shape</parameter>
’s array of outlines.
@ -1303,7 +1303,7 @@ the top surface is defined as the last outline in the
if
<parameter>shape</parameter>
is
<emphasis>NULL</emphasis>
<symbol>NULL</symbol>
or if there are no outlines for the shape; otherwise, it returns
<symbol>True</symbol>.
</para>
@ -1360,7 +1360,7 @@ those outlines.
if
<parameter>shape</parameter>
is
<emphasis>NULL</emphasis>
<symbol>NULL</symbol>
or if there are no outlines for the shape; otherwise, it returns
<symbol>True</symbol>.
</para>
@ -1428,7 +1428,7 @@ and updates the bounding box of the row if necessary.
returns
<symbol>False</symbol>
if any of the arguments is
<emphasis>NULL</emphasis>
<symbol>NULL</symbol>
; otherwise, it returns
<symbol>True</symbol>.
</para>
@ -1485,7 +1485,7 @@ that section. To update the bounding box of a section, use
returns
<symbol>False</symbol>
if any of the arguments is
<emphasis>NULL</emphasis>
<symbol>NULL</symbol>
; otherwise, it returns
<symbol>True</symbol>.
</para>
@ -1644,7 +1644,7 @@ To add one property to an existing keyboard geometry description, use
to the keyboard geometry specified by geom.
<function>XkbAddGeomProperty</function>
returns
<emphasis>NULL</emphasis>
<symbol>NULL</symbol>
if any of the parameters is empty or if it was not able to allocate space for
the property. To allocate space for an arbitrary number of properties, use the
XkbAllocGeomProps function.
@ -1710,7 +1710,7 @@ To add one key alias to an existing keyboard geometry description, use
it with the key whose real name is real.
<function>XkbAddGeomKeyAlias</function>
returns
<emphasis>NULL</emphasis>
<symbol>NULL</symbol>
if any of the parameters is empty or if it was not able to allocate space for
the alias. To allocate space for an arbitrary number of aliases, use the
XkbAllocGeomKeyAliases function.
@ -1791,7 +1791,7 @@ A color
using their indices in this global list or pointers to colors in this list.
<function>XkbAddGeomColor</function>
returns
<emphasis>NULL</emphasis>
<symbol>NULL</symbol>
if any of the parameters is empty or if it was not able to allocate space for
the color. To allocate space for an arbitrary number of colors to a geometry,
use the
@ -1850,7 +1850,7 @@ An outline consists of an arbitrary number of points.
points for it. The new outline is allocated and zeroed.
<function>XkbAddGeomOutline</function>
returns
<emphasis>NULL</emphasis>
<symbol>NULL</symbol>
if any of the parameters is empty or if it was not able to allocate space. To
allocate space for an arbitrary number of outlines to a shape, use
XkbAllocGeomOutlines.
@ -1924,7 +1924,7 @@ an arbitrary number of outlines.
already exists in the geometry, a pointer to the existing shape is returned.
<function>XkbAddGeomShape</function>
returns
<emphasis>NULL</emphasis>
<symbol>NULL</symbol>
if any of the parameters is empty or if it was not able to allocate space. To
allocate space for an arbitrary number of geometry shapes, use
<function>XkbAllocGeomShapes</function>.
@ -1969,7 +1969,7 @@ Keys are grouped into rows.
The key is allocated and zeroed.
<function>XkbAddGeomKey</function>
returns
<emphasis>NULL</emphasis>
<symbol>NULL</symbol>
if
<parameter>row</parameter>
is empty or if it was not able to allocate space for the key. To allocate
@ -2074,7 +2074,7 @@ If a section with name
returned.
<function>XkbAddGeomSection</function>
returns
<emphasis>NULL</emphasis>
<symbol>NULL</symbol>
if any of the parameters is empty or if it was not able to allocate space for
the section. To allocate space for an arbitrary number of sections to a
geometry, use XkbAllocGeomSections.
@ -2134,7 +2134,7 @@ The newly created row contains space for the number of keys specified in
They are allocated and zeroed, but otherwise uninitialized.
<function>XkbAddGeomRow</function>
returns
<emphasis>NULL</emphasis>
<symbol>NULL</symbol>
if any of the parameters is empty or if it was not able to allocate space for
the row. To allocate space for an arbitrary number of rows to a section, use
the XkbAllocGeomRows function.
@ -2205,25 +2205,25 @@ section.
adds a doodad with name specified by name to the geometry
<parameter>geom</parameter>
if section is
<emphasis>NULL</emphasis>
<symbol>NULL</symbol>
or to the section of the geometry specified by section if
<parameter>section</parameter>
is not
<emphasis>NULL</emphasis>.
<symbol>NULL</symbol>.
<function>XkbAddGeomDoodad</function>
returns
<emphasis>NULL</emphasis>
<symbol>NULL</symbol>
if any of the parameters is empty or if it was not able to allocate space for
the doodad. If there is already a doodad with the name
<parameter>name</parameter>
in the doodad array for the geometry (if
<parameter>section</parameter>
is
<emphasis>NULL</emphasis>
<symbol>NULL</symbol>
) or the section (if
<parameter>section</parameter>
is non-
<emphasis>NULL</emphasis>
<symbol>NULL</symbol>
), a pointer to that doodad is returned. To allocate space for an arbitrary
number of doodads to a section, use the XkbAllocGeomSectionDoodads function. To
allocate space for an arbitrary number of doodads to a keyboard geometry, use
@ -2296,7 +2296,7 @@ overlay with name
returned.
<function>XkbAddGeomOverlay</function>
returns
<emphasis>NULL</emphasis>
<symbol>NULL</symbol>
if any of the parameters is empty or if it was not able to allocate space for
the overlay. To allocate space for an arbitrary number of overlays to a
section, use the XkbAllocGeomOverlay function.
@ -2368,11 +2368,11 @@ The new row contains space for
specifies a row that doesn’t exist on the underlying section,
<function>XkbAddGeomOverlayRow</function>
returns
<emphasis>NULL</emphasis>
<symbol>NULL</symbol>
and doesn’t change the overlay.
<function>XkbAddGeomOverlayRow</function>
returns
<emphasis>NULL</emphasis>
<symbol>NULL</symbol>
if any of the parameters is empty or if it was not able to allocate space for
the overlay.
</para>
@ -2442,7 +2442,7 @@ If there is no key named
in the row of the underlying section,
<function>XkbAddGeomOverlayKey</function>
returns
<emphasis>NULL</emphasis>.
<symbol>NULL</symbol>.
</para>

18
specs/XKB/ch14.xml
View file

@ -328,7 +328,7 @@ reply, and then returns. If successful,
structure it allocated. If unsuccessful,
<function>XkbGetMap</function>
returns
<emphasis>NULL</emphasis>.
<symbol>NULL</symbol>.
When unsuccessful, one of the following protocol errors is also generated:
<errorname>BadAlloc</errorname>
(unable to allocate the
@ -1264,7 +1264,7 @@ of entries necessary for
<para>
If the client map of the keyboard description is not
<emphasis>NULL</emphasis>,
<symbol>NULL</symbol>,
and any fields are already allocated in the client map,
<function>XkbAllocClientMap</function>
does not overwrite the existing values; it simply ignores that part of the
@ -1365,7 +1365,7 @@ To free memory used by the client map member of an
structure specified by the
<parameter>xkb</parameter>
parameter and sets the corresponding structure component values to
<emphasis>NULL</emphasis>.
<symbol>NULL</symbol>.
The
<parameter>which</parameter>
parameter specifies a combination of the client map masks shown in
@ -1382,7 +1382,7 @@ If
is ignored;
<function>XkbFreeClientMap</function>
frees every non-
<emphasis>NULL</emphasis>
<symbol>NULL</symbol>
structure component in the client map, frees the
<emphasis>XkbClientMapRec</emphasis>
structure referenced by the
@ -1392,7 +1392,7 @@ If
parameter, and sets the
<emphasis>map</emphasis>
member to
<emphasis>NULL</emphasis>.
<symbol>NULL</symbol>.
</para>
@ -1554,7 +1554,7 @@ field of the server map.
<para>
If the server map of the keyboard description is not
<emphasis>NULL</emphasis>
<symbol>NULL</symbol>
and any fields are already allocated in the server map,
<function>XkbAllocServerMap</function>
does not overwrite the existing values. The only exception is with the
@ -1652,7 +1652,7 @@ The
structure specified by the
<parameter>xkb</parameter>
parameter and sets the corresponding structure component values to
<emphasis>NULL</emphasis>.
<symbol>NULL</symbol>.
The
<parameter>which</parameter>
parameter specifies a combination of the server map masks and is a bitwise
@ -1665,7 +1665,7 @@ inclusive OR of the masks listed in
is ignored and
<function>XkbFreeServerMap</function>
frees every non-
<emphasis>NULL</emphasis>
<symbol>NULL</symbol>
structure component in the server map, frees the
<emphasis>XkbServerMapRec</emphasis>
structure referenced by the
@ -1675,7 +1675,7 @@ inclusive OR of the masks listed in
parameter, and sets the
<emphasis>server</emphasis>
member to
<emphasis>NULL</emphasis>.
<symbol>NULL</symbol>.
</para>
</sect2>

16
specs/XKB/ch15.xml
View file

@ -83,7 +83,7 @@ typedef struct { /* Key Type */
modify directly */
unsigned char map_count; /* # entries in <emphasis>map</emphasis>,
<emphasis>preserve</emphasis>
(if non-<emphasis> NULL</emphasis>) */
(if non-<symbol>NULL</symbol>) */
XkbKTMapEntryPtr map; /* vector of modifiers for each
shift level */
XkbModsPtr preserve; /* mods to preserve for corresponding
@ -207,7 +207,7 @@ an optional
field. If a
<emphasis>preserve</emphasis>
member of a key type is not
<emphasis>NULL</emphasis>,
<symbol>NULL</symbol>,
it represents a list of modifiers where each entry corresponds directly to
one of the key type’s
<emphasis>map</emphasis>.
@ -364,7 +364,7 @@ Because the
modifier is to be preserved for further event processing, the
<emphasis>preserve</emphasis>
list is not
<emphasis>NULL</emphasis>
<symbol>NULL</symbol>
and parallels the
<emphasis>map</emphasis>
list. All
@ -955,7 +955,7 @@ can be zero or greater. If
and
<emphasis>preserve</emphasis>
entries for the type if they exist and sets them to
<emphasis>NULL</emphasis>.
<symbol>NULL</symbol>.
</para>
@ -979,7 +979,7 @@ the
the
<emphasis>preserve</emphasis>
field is freed if necessary and set to
<emphasis>NULL</emphasis>.
<symbol>NULL</symbol>.
</para>
@ -2242,7 +2242,7 @@ initializes any new symbols or actions to
as appropriate. If the
<parameter>p_changes</parameter>
parameter is not
<emphasis>NULL</emphasis>,
<symbol>NULL</symbol>,
<function>XkbChangeTypesOfKey</function>
adds the
<emphasis>XkbKeySymsMask</emphasis>
@ -2360,7 +2360,7 @@ If the Xkb extension has not been properly initialized,
If the
<parameter>xkb</parameter>
parameter it not valid (that is, it is
<emphasis>NULL</emphasis>
<symbol>NULL</symbol>
or it does not contain a valid client map),
<function>XkbChangeTypesOfKey</function>
returns
@ -2501,7 +2501,7 @@ If any allocation errors occur while resizing the number of symbols bound to
the key,
<function>XkbResizeKeySyms</function>
returns
<emphasis>NULL</emphasis>.
<symbol>NULL</symbol>.
</para>
<note><para>A change to the number of symbols bound to a key should be

6
specs/XKB/ch16.xml
View file

@ -3086,9 +3086,9 @@ keyboard focus. However, the
The
<emphasis>message</emphasis>
field is set to the message specified in the action and is guaranteed to be
<emphasis>NULL</emphasis>
<symbol>NULL</symbol>
-terminated; the Xkb extension forces a
<emphasis>NULL</emphasis>
<symbol>NULL</symbol>
into
<emphasis>message</emphasis>
[
@ -3940,7 +3940,7 @@ If any allocation errors occur while resizing the number of actions bound to
the key,
<function>XkbResizeKeyActions</function>
returns
<emphasis>NULL</emphasis>.
<symbol>NULL</symbol>.
</para>
<note><para>A change to the number of actions bound to a key should be

20
specs/XKB/ch17.xml
View file

@ -437,7 +437,7 @@ structure specifies a symbol interpretation:
<para><programlisting>
typedef struct {
KeySym sym; /* keysym of interest or <emphasis>NULL</emphasis> */
KeySym sym; /* keysym of interest or <symbol>NULL</symbol> */
unsigned char flags; /* <emphasis>XkbSI_AutoRepeat, XkbSI_LockingKey</emphasis> */
unsigned char match; /* specifies how mods is interpreted */
unsigned char mods; /* modifier bits, correspond to eight real modifiers */
@ -450,7 +450,7 @@ typedef struct {
If
<emphasis>sym</emphasis>
is not
<emphasis>NULL</emphasis>,
<symbol>NULL</symbol>,
it limits the symbol interpretation to keys on which that particular keysym
is selected by the modifiers matching the criteria specified by
<emphasis>mods</emphasis>
@ -459,7 +459,7 @@ is selected by the modifiers matching the criteria specified by
If
<emphasis>sym</emphasis>
is
<emphasis>NULL</emphasis>,
<symbol>NULL</symbol>,
the interpretation may be applied to any symbol selected on a key when the
modifiers match the criteria specified by
<emphasis>mods</emphasis>
@ -890,7 +890,7 @@ work space,
field of the
<parameter>xkb</parameter>
argument is non-
<emphasis>NULL</emphasis>
<symbol>NULL</symbol>
and does not match the
<parameter>display</parameter>
argument, and
@ -1162,7 +1162,7 @@ for groups 1 and 2 using the rules specified by the Xkb protocol and places
them in
<parameter>xkb_syms_rtrn</parameter>,
which will be non-
<emphasis>NULL</emphasis>.
<symbol>NULL</symbol>.
</para>
@ -1492,7 +1492,7 @@ If
it (re)applies the compatibility map to all of the keys on the keyboard. If
<parameter>changes</parameter>
is non-
<emphasis>NULL</emphasis>,
<symbol>NULL</symbol>,
it reports the parts of the keyboard that were affected (unless
<parameter>updateMap</parameter>
is
@ -1500,7 +1500,7 @@ it reports the parts of the keyboard that were affected (unless
not much changes).
<function>XkbAddSymInterpret</function>
returns a pointer to the actual new symbol interpretation in the list or
<emphasis>NULL</emphasis>
<symbol>NULL</symbol>
if it failed.
</para>
@ -1740,7 +1740,7 @@ added, use
if
<parameter>xkb</parameter>
is
<emphasis>NULL</emphasis>,
<symbol>NULL</symbol>,
or
<errorname>BadAlloc</errorname>
if errors are encountered when attempting to allocate storage.
@ -1821,7 +1821,7 @@ in <link linkend="Getting_Compatibility_Map_Components_From_the_Server">section
<symbol>True</symbol>,
<parameter>which</parameter>
is ignored, all non-
<emphasis>NULL</emphasis>
<symbol>NULL</symbol>
compatibility map components are freed, and the
<emphasis>compat</emphasis>
field in the
@ -1829,7 +1829,7 @@ in <link linkend="Getting_Compatibility_Map_Components_From_the_Server">section
referenced by
<parameter>xkb</parameter>
is set to
<emphasis>NULL</emphasis>.
<symbol>NULL</symbol>.
</para>
</sect1>

6
specs/XKB/ch18.xml
View file

@ -431,7 +431,7 @@ If the
field of the keyboard description
<parameter>xkb</parameter>
is
<emphasis>NULL</emphasis>,
<symbol>NULL</symbol>,
<function>XkbGetNames</function>
allocates and initializes the
<emphasis>names</emphasis>
@ -442,7 +442,7 @@ If the
field of
<parameter>xkb</parameter>
is not
<emphasis>NULL</emphasis>,
<symbol>NULL</symbol>,
<function>XkbGetNames</function>
obtains the values specified by
<parameter>which</parameter>
@ -457,7 +457,7 @@ If the
component of the
<parameter>xkb</parameter>
parameter is
<emphasis>NULL</emphasis>,
<symbol>NULL</symbol>,
<function>XkbGetNames</function>
does not retrieve type or shift level names, even if
<emphasis>XkbKeyTypeNamesMask</emphasis>

12
specs/XKB/ch20.xml
View file

@ -256,7 +256,7 @@ composed of characters from the ISO
<emphasis>*</emphasis>
’, and characters permitted in a component class or member name
(see <link linkend="Component_Names">section 20.1</link>). A pattern may be
<emphasis>NULL</emphasis>,
<symbol>NULL</symbol>,
in which case no components for that type is returned. Pattern matches with
component names are case sensitive. The ‘
<emphasis>?</emphasis>
@ -786,7 +786,7 @@ independent of any actual device.
<para>
The server parses all non-
<emphasis>NULL</emphasis>
<symbol>NULL</symbol>
fields in
<parameter>names</parameter>
and uses them to build a keyboard description. However, before parsing the
@ -807,7 +807,7 @@ possible bits in
If a required component has not been specified in the
<parameter>names</parameter>
structure (the corresponding field is
<emphasis>NULL</emphasis>
<symbol>NULL</symbol>
), the server substitutes the expression "
<emphasis>%</emphasis>
", resulting in the component values being taken from
@ -821,7 +821,7 @@ the server modifies
if necessary (again using a "
<emphasis>%</emphasis>
" entry) to ensure all of the following fields are non-
<emphasis>NULL</emphasis>
<symbol>NULL</symbol>
:
<emphasis>types</emphasis>,
<emphasis>keycodes</emphasis>,
@ -1092,7 +1092,7 @@ There is no way to determine which components specified in
<function>XkbGetKeyboardByName</function>
is synchronous; it sends the request to the server to build a new keyboard
description and waits for the reply. If successful, the return value is
non-<emphasis>NULL</emphasis>.
non-<symbol>NULL</symbol>.
<function>XkbGetKeyboardByName</function>
generates a <errorname>BadMatch</errorname>
protocol error if errors are encountered when building the keyboard
@ -1170,7 +1170,7 @@ keyboard device. It calls
(
<parameter>dpy</parameter>,
<parameter>device_spec</parameter>,
<emphasis>NULL</emphasis>,
<symbol>NULL</symbol>,
<parameter>which</parameter>,
<parameter>which</parameter>,
<symbol>False</symbol>

8
specs/XKB/ch21.xml
View file

@ -1183,7 +1183,7 @@ if
are inappropriate,
<function>XkbAddDeviceLedInfo</function>
returns
<emphasis>NULL</emphasis>.
<symbol>NULL</symbol>.
</para>
@ -1244,7 +1244,7 @@ To allocate additional space for button actions in an
-&gt;
<emphasis>btn_acts</emphasis>
is set to
<emphasis>NULL</emphasis>.
<symbol>NULL</symbol>.
If device_info is invalid or new_total is greater than 255,
<errorname>BadValue</errorname>
is returned. If a memory allocation failure occurs, a
@ -1328,7 +1328,7 @@ contains XkbXI_ButtonActionsMask, all button actions associated with
-&gt;
<emphasis>btn_acts</emphasis>
is set to
<emphasis>NULL</emphasis>,
<symbol>NULL</symbol>,
and
<parameter>device_info</parameter>
-&gt;
@ -1342,7 +1342,7 @@ and
-&gt;
<emphasis>leds</emphasis>
is set to
<emphasis>NULL</emphasis>,
<symbol>NULL</symbol>,
and
<parameter>device_info</parameter>
-&gt;