summaryrefslogtreecommitdiff
path: root/protocol
diff options
context:
space:
mode:
authorJonas Ådahl <jadahl@gmail.com>2014-05-10 10:43:34 +0200
committerKristian Høgsberg <krh@bitplanet.net>2014-05-12 10:05:28 -0700
commit9b059099542253c916c032d5df642c7691ff4cab (patch)
tree6f35fbf007f548e00cc198d6446407ca60071f0b /protocol
parentc991513483ec448408be47dbf806c5b300de2b07 (diff)
downloadweston-9b059099542253c916c032d5df642c7691ff4cab.tar.gz
desktop-shell: Fix order of desktop_shell messages
There was a bug in wayland-scanner that failed to detect when an message with implicitly set version (i.e. version 1) came after a message with a newer version. This patch fixes the weston desktop shell protocol to pass again. Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
Diffstat (limited to 'protocol')
-rw-r--r--protocol/desktop-shell.xml25
1 files changed, 14 insertions, 11 deletions
diff --git a/protocol/desktop-shell.xml b/protocol/desktop-shell.xml
index 65e44a73..fdcb17ba 100644
--- a/protocol/desktop-shell.xml
+++ b/protocol/desktop-shell.xml
@@ -33,17 +33,6 @@
<arg name="surface" type="object" interface="wl_surface"/>
</request>
- <request name="desktop_ready" since="2">
- <description summary="desktop is ready to be shown">
- Tell the server, that enough desktop elements have been drawn
- to make the desktop look ready for use. During start-up, the
- server can wait for this request with a black screen before
- starting to fade in the desktop, for instance. If the client
- parts of a desktop take a long time to initialize, we avoid
- showing temporary garbage.
- </description>
- </request>
-
<!-- We'll fold most of wl_shell into this interface and then
they'll share the configure event. -->
<event name="configure">
@@ -91,6 +80,20 @@
<entry name="busy" value="11"/>
</enum>
+
+ <!-- Version 2 additions -->
+
+ <request name="desktop_ready" since="2">
+ <description summary="desktop is ready to be shown">
+ Tell the server, that enough desktop elements have been drawn
+ to make the desktop look ready for use. During start-up, the
+ server can wait for this request with a black screen before
+ starting to fade in the desktop, for instance. If the client
+ parts of a desktop take a long time to initialize, we avoid
+ showing temporary garbage.
+ </description>
+ </request>
+
</interface>
<interface name="screensaver" version="1">