xorgproto: Branch 'master'

[GitLab Mirror]

 compositeproto.txt |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 50dc5f453acec4e5f90320fa292bf29112c022f9
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Feb 21 14:17:43 2019 -0500

    composite: Fix the documentation for the unredirection requests
    
    We didn't document the 'update' parameter, which has to match what the
    client previously requested. Also, the server, client library, and
    protocol header call it UnredirectSubwindows, not UnredirectWindows.
    
    Fixes: xorg/proto/xorgproto#15

diff --git a/compositeproto.txt b/compositeproto.txt
index 3b85fac..c1a7878 100644
--- a/compositeproto.txt
+++ b/compositeproto.txt
@@ -214,22 +214,28 @@ operations other than QueryVersion.
     UnredirectWindow:
 
 		window:				Window
+		update:				UPDATETYPE
 
 		errors: Window, Value
 
 	Redirection of the specified window will be terminated. If
 	the specified window was not selected for redirection by the
-	current client, a 'Value' error results.
+	current client, or if the update type does not match the
+	current client's previously requested update type, a 'Value'
+	error results.
 
-    UnredirectWindows:
+    UnredirectSubwindows:
 
 		window:				Window
+		update:				UPDATETYPE
 
 		errors: Window, Value
 
 	Redirection of all children of window will be terminated. If
 	the specified window was not selected for sub-redirection by the
-	current client, a 'Value' error results.
+	current client, or if the update type does not match the
+	current client's previously requested update type, a 'Value'
+	error results.
 
 9. Clip lists