devilhorns pushed a commit to branch devs/devilhorns/wayland.
commit 178e21c5ab61a803a5986e49aa4b5571af60529d
Author: Chris Michael <[email protected]>
Date: Thu Mar 7 08:48:53 2013 +0000
Update desktop_shell protocol definitions.
Signed-off-by: Chris Michael <[email protected]>
---
src/modules/wl_shell/desktop-shell.xml | 40 +++++++++++++++++++++++++++++-----
1 file changed, 34 insertions(+), 6 deletions(-)
diff --git a/src/modules/wl_shell/desktop-shell.xml
b/src/modules/wl_shell/desktop-shell.xml
index c40cf17..3df16ea 100644
--- a/src/modules/wl_shell/desktop-shell.xml
+++ b/src/modules/wl_shell/desktop-shell.xml
@@ -3,26 +3,29 @@
<interface name="desktop_shell" version="1">
<request name="set_background">
<arg name="output" type="object" interface="wl_output"/>
- <arg name="surface" type="object" interface="wl_shell_surface"/>
+ <arg name="surface" type="object" interface="wl_surface"/>
</request>
<request name="set_panel">
<arg name="output" type="object" interface="wl_output"/>
- <arg name="surface" type="object" interface="wl_shell_surface"/>
+ <arg name="surface" type="object" interface="wl_surface"/>
</request>
<request name="set_lock_surface">
- <arg name="surface" type="object" interface="wl_shell_surface"/>
+ <arg name="surface" type="object" interface="wl_surface"/>
</request>
<request name="unlock"/>
+ <request name="set_grab_surface">
+ <arg name="surface" type="object" interface="wl_surface"/>
+ </request>
+
<!-- We'll fold most of wl_shell into this interface and then
they'll share the configure event. -->
<event name="configure">
- <arg name="time" type="uint"/>
<arg name="edges" type="uint"/>
- <arg name="surface" type="object" interface="wl_shell_surface"/>
+ <arg name="surface" type="object" interface="wl_surface"/>
<arg name="width" type="int"/>
<arg name="height" type="int"/>
</event>
@@ -33,6 +36,31 @@
the shell actually implements locking, it MUST send 'unlock'
request to let the normal desktop resume. -->
<event name="prepare_lock_surface"/>
+ <event name="grab_cursor">
+ <arg name="cursor" type="uint"/>
+ </event>
+
+ <enum name="cursor">
+ <entry name="none" value="0"/>
+
+ <entry name="resize_top" value="1"/>
+ <entry name="resize_bottom" value="2"/>
+
+ <entry name="arrow" value="3"/>
+
+ <entry name="resize_left" value="4"/>
+ <entry name="resize_top_left" value="5"/>
+ <entry name="resize_bottom_left" value="6"/>
+
+ <entry name="move" value="7"/>
+
+ <entry name="resize_right" value="8"/>
+ <entry name="resize_top_right" value="9"/>
+ <entry name="resize_bottom_right" value="10"/>
+
+ <entry name="busy" value="11"/>
+ </enum>
+
</interface>
<!-- Only one client can bind this interface at a time. -->
@@ -42,7 +70,7 @@
A screensaver surface is normally hidden, and only visible after
an idle timeout. -->
<request name="set_surface">
- <arg name="surface" type="object" interface="wl_shell_surface"/>
+ <arg name="surface" type="object" interface="wl_surface"/>
<arg name="output" type="object" interface="wl_output"/>
</request>
--
------------------------------------------------------------------------------
Symantec Endpoint Protection 12 positioned as A LEADER in The Forrester
Wave(TM): Endpoint Security, Q1 2013 and "remains a good choice" in the
endpoint security space. For insight on selecting the right partner to
tackle endpoint security challenges, access the full report.
http://p.sf.net/sfu/symantec-dev2dev
