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

specs/XKB: Convert remaining error names to errorname tags

Browse source 
Most were caught by applying libX11 lists, but BadKeyboard & XKB*_Bad*
are XKB-specific.   (Plus some were badly split across tag boundaries.)

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
This commit is contained in:
Alan Coopersmith 2014-07-07 23:56:13 -07:00
parent 42b2f5388c
commit 79ba58cceb
5 changed files with 49 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
specs/XKB/ch01.xml
View file

@ -308,9 +308,9 @@ configuration.
<para>
The Xkb extension adds a single protocol error,
<emphasis>BadKeyboard</emphasis>,
<errorname>BadKeyboard</errorname>,
to the core protocol error set. See <link linkend="Protocol_Errors">section 2.6</link> for a discussion of the
<emphasis>BadKeyboard</emphasis>
<errorname>BadKeyboard</errorname>
protocol error.
</para>
@ -387,7 +387,7 @@ generated.
</row>
<row>
<entry>Status</entry>
<entry>BadAccess</entry>
<entry><errorname>BadAccess</errorname></entry>
</row>
</tbody>
</tgroup>

42
specs/XKB/ch02.xml
View file

@ -458,7 +458,7 @@ The possible values for
<itemizedlist>
<listitem>
<para>
<emphasis>XkbOD_BadLibraryVersion</emphasis>
<errorname>XkbOD_BadLibraryVersion</errorname>
indicates
<function>XkbLibraryVersion</function>
returned
@ -467,25 +467,25 @@ returned
</listitem>
<listitem>
<para>
<emphasis>XkbOD_ConnectionRefused</emphasis>
<errorname>XkbOD_ConnectionRefused</errorname>
indicates the display could not be opened.
</para>
</listitem>
<listitem>
<para>
<emphasis>XkbOD_BadServerVersion</emphasis>
<errorname>XkbOD_BadServerVersion</errorname>
indicates the library and the server have incompatible extension versions.
</para>
</listitem>
<listitem>
<para>
<emphasis>XkbOD_NonXkbServer</emphasis>
<errorname>XkbOD_NonXkbServer</errorname>
indicates the extension is not present in the X server.
</para>
</listitem>
<listitem>
<para>
<emphasis>XkbOD_Success</emphasis>
<errorname>XkbOD_Success</errorname>
indicates that the function succeeded.
</para>
</listitem>
@ -562,9 +562,9 @@ use Xkb on a connection for which it is disabled.
<para>
Many of the Xkb extension library functions described in this document can
cause the X server to report an error, referred to in this document as a
<emphasis>BadXxx</emphasis>
<errorname>Bad<replaceable>Xxx</replaceable></errorname>
protocol error, where
<emphasis>Xxx</emphasis>
<replaceable>Xxx</replaceable>
is some name. These errors are fielded in the normal manner, by the default
Xlib error handler or one replacing it. Note that X protocol errors are not
necessarily reported immediately because of the buffering of X protocol
@ -590,7 +590,7 @@ lists the protocol errors that can be generated, and their causes.
</thead>
<tbody>
<row>
<entry>BadAccess</entry>
<entry><errorname>BadAccess</errorname></entry>
<entry>
<para>
The Xkb extension has not been properly initialized
@ -598,7 +598,7 @@ The Xkb extension has not been properly initialized
</entry>
</row>
<row>
<entry>BadKeyboard</entry>
<entry><errorname>BadKeyboard</errorname></entry>
<entry>
<para>
The device specified was not a valid core or input extension device
@ -606,7 +606,7 @@ The device specified was not a valid core or input extension device
</entry>
</row>
<row>
<entry>BadImplementation</entry>
<entry><errorname>BadImplementation</errorname></entry>
<entry>
<para>
Invalid reply from server
@ -614,7 +614,7 @@ Invalid reply from server
</entry>
</row>
<row>
<entry>BadAlloc</entry>
<entry><errorname>BadAlloc</errorname></entry>
<entry>
<para>
Unable to allocate storage
@ -622,7 +622,7 @@ Unable to allocate storage
</entry>
</row>
<row>
<entry>BadMatch</entry>
<entry><errorname>BadMatch</errorname></entry>
<entry>
<para>
A compatible version of Xkb was not available in the server or an argument has
@ -631,7 +631,7 @@ correct type and range, but is otherwise invalid
</entry>
</row>
<row>
<entry>BadValue</entry>
<entry><errorname>BadValue</errorname></entry>
<entry>
<para>
An argument is out of range
@ -639,7 +639,7 @@ An argument is out of range
</entry>
</row>
<row>
<entry>BadAtom</entry>
<entry><errorname>BadAtom</errorname></entry>
<entry>
<para>
A name is neither a valid Atom or
@ -648,7 +648,7 @@ A name is neither a valid Atom or
</entry>
</row>
<row>
<entry>BadDevice</entry>
<entry><errorname>BadDevice</errorname></entry>
<entry>
<para>
Device, Feedback Class, or Feedback ID invalid
@ -661,13 +661,13 @@ Device, Feedback Class, or Feedback ID invalid
<para>
The Xkb extension adds a single protocol error,
<emphasis>BadKeyboard</emphasis>,
<errorname>BadKeyboard</errorname>,
to the core protocol error set. This error code will be reported as the
<emphasis>error_rtrn</emphasis>
when
<function>XkbQueryExtension</function>
is called. When a
<emphasis>BadKeyboard</emphasis>
<errorname>BadKeyboard</errorname>
error is reported in an
<structname>XErrorEvent</structname>,
additional information is reported in the
@ -681,7 +681,7 @@ the table.
</para>
<table id='table2.2' frame='topbot'>
<title>BadKeyboard Protocol Error resource_id Values</title>
<title><errorname>BadKeyboard</errorname> Protocol Error resource_id Values</title>
<?dbfo keep-together="always" ?>
<tgroup cols='4' align='left' colsep='0' rowsep='0'>
<colspec colname='c1' colwidth='2.0*'/>
@ -698,7 +698,7 @@ the table.
</thead>
<tbody>
<row>
<entry>XkbErr_BadDevice</entry>
<entry><errorname>XkbErr_BadDevice</errorname></entry>
<entry>0xff</entry>
<entry>
<para>
@ -708,7 +708,7 @@ device not found
<entry>device ID</entry>
</row>
<row>
<entry>XkbErr_BadClass</entry>
<entry><errorname>XkbErr_BadClass</errorname></entry>
<entry>0xfe</entry>
<entry>
<para>
@ -718,7 +718,7 @@ device found, but it is of the wrong class
<entry>class ID</entry>
</row>
<row>
<entry>XkbErr_BadId</entry>
<entry><errorname>XkbErr_BadId</errorname></entry>
<entry>0xfd</entry>
<entry>
<para>

4
specs/XKB/ch08.xml
View file

@ -2061,8 +2061,8 @@ The
<symbol>Success</symbol>.
If
<function>XkbAllocIndicatorMaps</function>
was unable to allocate the indicators record, it reports a Bad
<emphasis>Alloc</emphasis>
was unable to allocate the indicators record, it reports a
<errorname>BadAlloc</errorname>
error.
</para>

4
specs/XKB/ch15.xml
View file

@ -2364,8 +2364,8 @@ If the
or it does not contain a valid client map),
<function>XkbChangeTypesOfKey</function>
returns
<emphasis>Bad</emphasis>
Match. If the
<errorname>BadMatch</errorname>.
If the
<emphasis>key</emphasis>
is not a valid keycode,
<emphasis>n_groups</emphasis>

37
specs/XKB/ch21.xml
View file

@ -144,8 +144,7 @@ keyboard feedback and the core indicator feedback may be obtained by calling
If the server does not allow Xkb access to input extension
<emphasis>KeyClass</emphasis>
devices, attempts to use Xkb requests with those devices fail with a
Bad
<emphasis>Keyboard</emphasis>
<errorname>BadKeyboard</errorname>
error. Attempts to access non-
<emphasis>KeyClass</emphasis>
input extension devices via XkbGetDeviceInfo and XkbSetDeviceInfo fail
@ -737,15 +736,16 @@ If allocation errors occur, a
<emphasis>device_info</emphasis>
-&gt;
<emphasis>device_spec</emphasis>
) is invalid, a BadKeyboard status is returned. If the device has no buttons, a
Bad
<emphasis>Match</emphasis>
) is invalid, a
<errorname>BadKeyboard</errorname>
status is returned. If the device has no buttons, a
<errorname>BadMatch</errorname>
status is returned. If
<emphasis>first_button</emphasis>
and
<emphasis>num_buttons</emphasis>
specify illegal buttons, a Bad
<emphasis>Value</emphasis>
specify illegal buttons, a
<errorname>BadValue</errorname>
status is returned.
</para>
@ -932,16 +932,19 @@ extension has not been properly initialized,
<function>XkbGetDeviceLedInfo</function>
returns
<errorname>BadAccess</errorname>.
If allocation errors occur, a BadAlloc status is returned. If the device has
no indicators, a BadMatch error is returned. If
If allocation errors occur, a
<errorname>BadAlloc</errorname>
status is returned. If the device has no indicators, a
<errorname>BadMatch</errorname>
error is returned. If
<emphasis>ledClass</emphasis>
or
<emphasis>ledID</emphasis>
have illegal values, a Bad
<emphasis>Value</emphasis>
have illegal values, a
<errorname>BadValue</errorname>
error is returned. If they have legal values but do not specify a feedback
that contains LEDs and is associated with the specified device, a Bad
<emphasis>Match</emphasis>
that contains LEDs and is associated with the specified device, a
<errorname>BadMatch</errorname>
error is returned.
</para>
@ -1242,8 +1245,9 @@ To allocate additional space for button actions in an
<emphasis>btn_acts</emphasis>
is set to
<emphasis>NULL</emphasis>.
If device_info is invalid or new_total is greater than 255, BadValue is
returned. If a memory allocation failure occurs, a
If device_info is invalid or new_total is greater than 255,
<errorname>BadValue</errorname>
is returned. If a memory allocation failure occurs, a
<errorname>BadAlloc</errorname>
is returned.
</para>
@ -1723,7 +1727,8 @@ If the actual request sent to the server involved illegal button numbers, a
protocol error is generated. If an invalid device identifier is specified in
device_info-&gt;
<emphasis>device_spec</emphasis>,
a BadKeyboard protocol error results. If the actual device specified in
a <errorname>BadKeyboard</errorname>
protocol error results. If the actual device specified in
<emphasis>device_info</emphasis>
-&gt;
<emphasis>device_spec</emphasis>