summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPekka Paalanen <pekka.paalanen@collabora.co.uk>2014-10-01 14:01:59 +0300
committerPekka Paalanen <pekka.paalanen@collabora.co.uk>2014-10-08 13:15:45 +0300
commitd7cd1480d4c75cfdeb28b34202707bfe3595b0ea (patch)
tree34a4b89214622528a3c877c09d702634ae783cb9
parente972b27f34e78c55d6f1b23a3c54bc14f2945287 (diff)
protocol: add role error code to xdg_shell
Needed for properly reporting role violations from xdg_shell.get_xdg_surface and .get_xdg_popup. Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net> Acked-by: Jason Ekstrand <jason.ekstrand@intel.com>
-rw-r--r--protocol/xdg-shell.xml9
1 files changed, 9 insertions, 0 deletions
diff --git a/protocol/xdg-shell.xml b/protocol/xdg-shell.xml
index 275837f3..776438be 100644
--- a/protocol/xdg-shell.xml
+++ b/protocol/xdg-shell.xml
@@ -48,6 +48,9 @@
<entry name="current" value="4" summary="Always the latest version"/>
</enum>
+ <enum name="error">
+ <entry name="role" value="0" summary="given wl_surface has another role"/>
+ </enum>
<request name="use_unstable_version">
<description summary="enable use of this unstable version">
@@ -64,6 +67,9 @@
<description summary="create a shell surface from a surface">
Create a shell surface for an existing surface.
+ This request gives the surface the role of xdg_surface. If the
+ surface already has another role, it raises a protocol error.
+
Only one shell or popup surface can be associated with a given
surface.
</description>
@@ -75,6 +81,9 @@
<description summary="create a shell surface from a surface">
Create a popup surface for an existing surface.
+ This request gives the surface the role of xdg_popup. If the
+ surface already has another role, it raises a protocol error.
+
Only one shell or popup surface can be associated with a given
surface.
</description>