Update to damageproto 1.2.0

6 files changed, 230 insertions, 19 deletions

diff --git a/proto/damageproto/ChangeLog b/proto/damageproto/ChangeLog
index 508952f8a..7790e48e1 100644
--- a/proto/damageproto/ChangeLog
+++ b/proto/damageproto/ChangeLog
@@ -1,9 +1,146 @@
-2005-12-20  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 1950869c1640590b2ce7a96e2a97746b308093f8
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Thu Aug 27 15:43:27 2009 +1000
 
-	* configure.ac:
-	Update package version for X11R7 release.
+    damageproto 1.2.0
 
-2005-12-14  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit d25f083ba38d796e9a91de468fc8bec33545e400
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Tue Aug 25 17:48:20 2009 +1000
 
-	* configure.ac:
-	Update package version number for final X11R7 release candidate.
+    Remove RCS tags
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 12b708a2fe5cb538c87239b35822ccc318f98b12
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Wed Jul 8 10:11:26 2009 -0400
+
+    damageproto: use XORG_CHANGELOG macro to create ChangeLog. #22611
+    
+    Build break: Makefile.am: command not found: git-log
+    Adding the macro in configure.ac and use it in Makefile.am
+    Refer to: https://bugs.freedesktop.org/show_bug.cgi?id=22611
+    Tested: running autogen.sh, make and 'make dist'
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit c25bdf1cce48ad1b2bb33ba45969572e6e4d385f
+Author: Owen Taylor <otaylor@fishsoup.net>
+Date:   Fri Sep 19 09:52:07 2008 -0400
+
+    Document that 'parts' may be None for DamageSubtract
+    
+    The server code has handled parts == None since at least 2004.
+
+commit ad1a35b351012a347c49246f986655e3a91431df
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Thu Dec 6 16:38:57 2007 -0500
+
+    Replace static ChangeLog with dist-hook to generate from git log
+
+commit 63881a6b3f5571ba4c4b3614ea9346c733eb471b
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Mon Sep 3 05:54:00 2007 -0400
+
+    Add *~ to .gitignore to skip patch/emacs droppings
+
+commit cff2b116eb2a6a7827b866910a84f8357c299be0
+Author: Eric Anholt <eric@anholt.net>
+Date:   Tue Jan 9 16:19:30 2007 -0800
+
+    Rename DamagePost to DamageAdd per suggestion from keithp.
+
+commit 97c47fc81f0dc152e1d32800ce5022d2d25c3c43
+Author: Eric Anholt <eric@anholt.net>
+Date:   Mon Jan 8 13:45:10 2007 -0800
+
+    Install the protocol doc as damageproto.txt in its canonical doc dir.
+
+commit 7a6e37818a6854ec4d74f80ce5053e04b7ae75ba
+Author: Eric Anholt <eric@anholt.net>
+Date:   Mon Jan 8 13:41:20 2007 -0800
+
+    Documentation and copyright updates for 1.1 protocol (and other fixes).
+
+commit df33455a4506362eff4d393dc7d58c9d73ddf870
+Author: Eric Anholt <eric@anholt.net>
+Date:   Fri Jan 5 17:52:49 2007 -0800
+
+    Add a request to report a region of damage to a drawable.
+    
+    This bumps the protocol (and package) version to 1.1.
+
+commit 03e7a652b1674530e0d06ca8e2f869c0ba473f9f
+Author: Keith Packard <keithp@evo.keithp.com>
+Date:   Fri Feb 24 02:15:53 2006 +0100
+
+    reflect filename change to .gitignore
+
+commit e6392f4199532cfd61195e45b784a252879e4750
+Author: Keith Packard <keithp@evo.keithp.com>
+Date:   Fri Feb 24 02:15:27 2006 +0100
+
+    Import changes from X.org repository
+
+commit 1a28d9a791ed918172286110e0dcffe458489b1a
+Author: Keith Packard <keithp@evo.keithp.com>
+Date:   Fri Feb 24 02:09:04 2006 +0100
+
+    rename damageext.pc.in to damageproto.pc.in as per xorg
+
+commit 44c98d231588b6bdc1884ba7e6999b706238ecd7
+Author: Chris Larson <kergoth@handhelds.org>
+Date:   Sun Jan 16 17:30:53 2005 +0000
+
+    Fix to work with automake 1.9.x.
+
+commit e86de666f5c9629cd98ed2b0460033da5d89a55b
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Mon Jan 3 05:16:14 2005 +0000
+
+    New autogen.sh from Thomas Fitzsimmons that works with srcdir != objdir.
+
+commit 648b14e2d0c1222cbe7571443ba00bb777fee2d4
+Author: Jim Gettys <jg@freedesktop.org>
+Date:   Tue Feb 3 20:44:42 2004 +0000
+
+    add author to AUTHOR's file.
+
+commit 513adccc0f3db333c4b946e7173e0f286cc5b58e
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Thu Jan 15 03:40:44 2004 +0000
+
+    Tag release 1.0 for first freedesktop.org clientside lib release.
+
+commit d3ba8ef49c46fc691458ae319b80a85ccc25c121
+Author: Chris Lee <clee@c133.org>
+Date:   Wed Nov 26 03:47:58 2003 +0000
+
+    Fixes to make these work on Debian's libtool (which seems to still be buggy).
+    -clee
+
+commit b5f3d0fe86af6e077cda237fcb1b2f34ab9c1eea
+Author: Keith Packard <keithp@keithp.com>
+Date:   Tue Nov 4 03:30:32 2003 +0000
+
+    Mark document revision Credit Havoc the Tolerant for his earlier design and implementation
+
+commit 4abd06d76008abede31086fccb7c0136732241a9
+Author: Keith Packard <keithp@keithp.com>
+Date:   Fri Oct 24 06:39:35 2003 +0000
+
+    Add .cvsignore
+
+commit a4b351053662f4db4a165117cb18555dc4fabd33
+Author: Keith Packard <keithp@keithp.com>
+Date:   Fri Oct 24 06:16:46 2003 +0000
+
+    Initial working version -- added DamageDestroy and damage objects
+
+commit 1b3ffaa1a673418fab22383bf509040924d177d3
+Author: Keith Packard <keithp@keithp.com>
+Date:   Sun Oct 19 04:55:31 2003 +0000
+
+    Initial revision
diff --git a/proto/damageproto/Makefile.am b/proto/damageproto/Makefile.am
index f44f5364b..02065244d 100644
--- a/proto/damageproto/Makefile.am
+++ b/proto/damageproto/Makefile.am
@@ -1,3 +1,24 @@
+# 
+#  Copyright © 2003 Keith Packard, Noah Levitt
+# 
+#  Permission to use, copy, modify, distribute, and sell this software and its
+#  documentation for any purpose is hereby granted without fee, provided that
+#  the above copyright notice appear in all copies and that both that
+#  copyright notice and this permission notice appear in supporting
+#  documentation, and that the name of Keith Packard not be used in
+#  advertising or publicity pertaining to distribution of the software without
+#  specific, written prior permission.  Keith Packard makes no
+#  representations about the suitability of this software for any purpose.  It
+#  is provided "as is" without express or implied warranty.
+# 
+#  KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+#  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+#  EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+#  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+#  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+#  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+#  PERFORMANCE OF THIS SOFTWARE.
+
 damagedir = $(includedir)/X11/extensions
 damage_HEADERS = \
 	damageproto.h \
@@ -6,4 +27,18 @@ damage_HEADERS = \
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = damageproto.pc
 
-EXTRA_DIST = autogen.sh damageproto.pc.in
+damagedocdir = $(datadir)/doc/$(PACKAGE)
+damagedoc_DATA = damageproto.txt
+
+EXTRA_DIST = autogen.sh damageproto.pc.in $(damagedoc_DATA)
+
+
+EXTRA_DIST += ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+	$(CHANGELOG_CMD)
+
+dist-hook: ChangeLog
diff --git a/proto/damageproto/configure.ac b/proto/damageproto/configure.ac
index b7cc423dc..fa48ad598 100644
--- a/proto/damageproto/configure.ac
+++ b/proto/damageproto/configure.ac
@@ -1,8 +1,38 @@
+dnl 
+dnl  Copyright © 2003 Keith Packard, Noah Levitt
+dnl 
+dnl  Permission to use, copy, modify, distribute, and sell this software and its
+dnl  documentation for any purpose is hereby granted without fee, provided that
+dnl  the above copyright notice appear in all copies and that both that
+dnl  copyright notice and this permission notice appear in supporting
+dnl  documentation, and that the name of Keith Packard not be used in
+dnl  advertising or publicity pertaining to distribution of the software without
+dnl  specific, written prior permission.  Keith Packard makes no
+dnl  representations about the suitability of this software for any purpose.  It
+dnl  is provided "as is" without express or implied warranty.
+dnl 
+dnl  KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+dnl  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+dnl  EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+dnl  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+dnl  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+dnl  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+dnl  PERFORMANCE OF THIS SOFTWARE.
+dnl
+dnl Process this file with autoconf to create configure.
+
 AC_PREREQ([2.57])
-AC_INIT([DamageProto], [1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([DamageProto], [1.2.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AM_MAINTAINER_MODE
+
+# Require xorg-macros: XORG_RELEASE_VERSION XORG_CHANGELOG
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.2)
 
 XORG_RELEASE_VERSION
+XORG_CHANGELOG
 
 AC_OUTPUT([Makefile
            damageproto.pc])
+
diff --git a/proto/damageproto/damageproto.h b/proto/damageproto/damageproto.h
index 1b263c912..107e19271 100644
--- a/proto/damageproto/damageproto.h
+++ b/proto/damageproto/damageproto.h
@@ -1,7 +1,6 @@
 /*
- * $Id: damageproto.h,v 1.1 2006/11/25 15:44:45 matthieu Exp $
- *
  * Copyright © 2003 Keith Packard
+ * Copyright © 2007 Eric Anholt
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -115,6 +114,16 @@ typedef struct {
 
 #define sz_xDamageSubtractReq		16
 
+typedef struct {
+    CARD8	reqType;
+    CARD8	damageReqType;
+    CARD16	length B16;
+    Drawable	drawable B32;
+    Region	region B32;
+} xDamageAddReq;
+
+#define sz_xDamageAddReq		12
+
 /* Events */
 
 #define DamageNotifyMore    0x80
diff --git a/proto/damageproto/damageproto.txt b/proto/damageproto/damageproto.txt
index 54910adc5..1f254d4a3 100644
--- a/proto/damageproto/damageproto.txt
+++ b/proto/damageproto/damageproto.txt
@@ -191,20 +191,21 @@ DamageSubtract
 
 		damage:				DAMAGE
 		repair:				Region or None
-		parts:				Region
+		parts:				Region or None
 
 	Synchronously modifies the regions in the following manner:
 
 	    If repair is None:
 
-		1)	parts = damage
+		1)	if parts is not None, parts = damage
 		2)	damage = <empty>
 		
 	    Otherwise:
 	
-		1)	parts = damage INTERSECT repair
-		2)	damage = damage - parts
-		3)	Generate DamageNotify for remaining damage areas
+		1)	tmp = damage INTERSECT repair
+		2)	damage = damage - tmp
+		3)	if parts is not None, parts = tmp
+		4)	Generate DamageNotify for remaining damage areas
 
 DamageAdd
 
diff --git a/proto/damageproto/damagewire.h b/proto/damageproto/damagewire.h
index 82baa736a..d90a0dd7c 100644
--- a/proto/damageproto/damagewire.h
+++ b/proto/damageproto/damagewire.h
@@ -1,6 +1,4 @@
 /*
- * $Id: damagewire.h,v 1.1 2006/11/25 15:44:45 matthieu Exp $
- *
  * Copyright © 2003 Keith Packard
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
@@ -27,7 +25,7 @@
 
 #define	DAMAGE_NAME	"DAMAGE"
 #define DAMAGE_MAJOR	1
-#define DAMAGE_MINOR	0
+#define DAMAGE_MINOR	1
 
 /************* Version 1 ****************/
 
@@ -42,8 +40,9 @@
 #define X_DamageCreate			1
 #define X_DamageDestroy			2
 #define X_DamageSubtract		3
+#define X_DamageAdd			4
 
-#define XDamageNumberRequests		(X_DamageSubtract + 1)
+#define XDamageNumberRequests		(X_DamageAdd + 1)
 
 /* Events */
 #define XDamageNotify			0