mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

desktop-shell: Fix order of desktop_shell messages

Browse Source 
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>
This commit is contained in:
Jonas Ådahl 2014-05-10 10:43:34 +02:00 committed by Kristian Høgsberg
parent c991513483
commit 9b05909954
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
protocol/desktop-shell.xml
View File

@ -33,17 +33,6 @@
<arg name="surface" type="object" interface="wl_surface"/> <arg name="surface" type="object" interface="wl_surface"/>
</request> </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 <!-- We'll fold most of wl_shell into this interface and then
they'll share the configure event. --> they'll share the configure event. -->
<event name="configure"> <event name="configure">
@ -91,6 +80,20 @@
<entry name="busy" value="11"/> <entry name="busy" value="11"/>
</enum> </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>
<interface name="screensaver" version="1"> <interface name="screensaver" version="1">