diff options
| author | Kristian Høgsberg <krh@bitplanet.net> | 2011-05-11 10:57:06 -0400 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2011-05-11 11:02:34 -0400 |
| commit | 1db05255728c7a9a7e1460acff0651f6f5ea3f4e (patch) | |
| tree | ad47c499d880a4b27089a34b020555451fd658cf /protocol | |
| parent | 2d27f3b6e9001d4fae4a4de7a19db76b5174f9d7 (diff) | |
Unify error events
Consolidate the different error events into one. This event will also be
usable for other interaces.
Diffstat (limited to 'protocol')
| -rw-r--r-- | protocol/wayland.xml | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/protocol/wayland.xml b/protocol/wayland.xml index 11976fa..aef8385 100644 --- a/protocol/wayland.xml +++ b/protocol/wayland.xml @@ -28,21 +28,18 @@ <arg name="key" type="uint"/> </request> - <!-- A request addressed a non-existent object id. This is - tyipcally a fatal error. --> - <event name="invalid_object"> - <arg name="object_id" type="uint"/> + <!-- A fatal error has occurred. --> + <event name="error"> + <arg name="object_id" type="object" interface="wl_object"/> + <arg name="code" type="uint"/> + <arg name="message" type="string"/> </event> - <!-- A request tried to invoke an opcode out of range. This is - typically a fatal error. --> - <event name="invalid_method"> - <arg name="object_id" type="uint"/> - <arg name="opcode" type="uint"/> - </event> - - <!-- A request has failed due to an out of memory error. --> - <event name="no_memory"/> + <enum name="error"> + <entry name="invalid_object" value="0"/> + <entry name="invalid_method" value="1"/> + <entry name="no_memory" value="2"/> + </enum> <!-- Notify the client of global objects. These are objects that are created by the server. Globals are published on the @@ -88,7 +85,6 @@ </request> </interface> - <!-- Shared memory support --> <interface name="wl_shm" version="1"> <!-- Transfer a shm buffer to the server. The allocated buffer |