From 82da52b15b49da3f3c7b4bd85d334ddfaa375ebc Mon Sep 17 00:00:00 2001
From: Kristian Høgsberg <krh@bitplanet.net>
Date: Fri, 17 Dec 2010 09:53:12 -0500
Subject: Update surface.attach and change surface.map to surface.map_toplevel

The new map_toplevel() request no longer specifies a position and takes
the size from the attached buffer.  The attach request now takes a
position relative to the top-left corner of the old buffer to let
clients specify the relative position of the new buffer.
---
 protocol/wayland.xml | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

(limited to 'protocol')

diff --git a/protocol/wayland.xml b/protocol/wayland.xml
index 62d8a663..8799a64e 100644
--- a/protocol/wayland.xml
+++ b/protocol/wayland.xml
@@ -172,11 +172,8 @@
          received. -->
     <event name="configure">
       <arg name="time" type="uint"/>
-      <!-- Same as edges except also move (16) -->
-      <arg name="type" type="uint"/>
+      <arg name="edges" type="uint"/>
       <arg name="surface" type="object" interface="surface"/>
-      <arg name="x" type="int"/>
-      <arg name="y" type="int"/>
       <arg name="width" type="int"/>
       <arg name="height" type="int"/>
     </event>
@@ -281,20 +278,18 @@
     <!-- Deletes the surface and invalidates its object id. -->
     <request name="destroy" type="destructor"/>
 
-    <!-- Copy the contents of a buffer into this surface. -->
+    <!-- Copy the contents of a buffer into this surface. The x and y
+         arguments specify the location of the new buffers upper left
+         corner, relative to the old buffers upper left corner. -->
     <request name="attach">
       <arg name="buffer" type="object" interface="buffer"/>
-    </request>
-
-    <!-- Set the location on the screen that this surface will
-         be displayed. -->
-    <request name="map">
       <arg name="x" type="int"/>
       <arg name="y" type="int"/>
-      <arg name="width" type="int"/>
-      <arg name="height" type="int"/>
     </request>
 
+    <!-- Make the surface visible as a toplevel window. -->
+    <request name="map_toplevel"/>
+
     <!-- Notify the server that the attached buffer's contents have
          changed, and request a redraw. The arguments allow you to
          damage only a part of the surface, but the server may ignore
-- 
cgit v1.3.1