rpms/xorg-x11-server/devel xorg-server-1.0.99.2-spiffiffity.patch, 1.1, 1.2 xorg-x11-server.spec, 1.55, 1.56

[fedora-cvs-commits at redhat.com]

Author: krh

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30255

Modified Files:
	xorg-server-1.0.99.2-spiffiffity.patch xorg-x11-server.spec 
Log Message:
* Thu Apr 13 2006 Kristian Høgsberg <krh at redhat.com> 1.0.99.901-5
- Update spiffiffity patch to only suppress move damage events for
  manually redirected windows.


xorg-server-1.0.99.2-spiffiffity.patch:
 compalloc.c  |    2 ++
 compwindow.c |    8 ++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

Index: xorg-server-1.0.99.2-spiffiffity.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-server-1.0.99.2-spiffiffity.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xorg-server-1.0.99.2-spiffiffity.patch	4 Apr 2006 22:17:58 -0000	1.1
+++ xorg-server-1.0.99.2-spiffiffity.patch	14 Apr 2006 03:21:31 -0000	1.2
@@ -1,19 +1,6 @@
-This patch add two optimizations to speed up the metacity compositing
-manager (spiffiffity):
-
- - Don't generate damage on moves
- - Don't initialize bg=none windows by copying from the framebuffer.
-
-krh at redhat.com, Tue Apr  4 18:10:40 EDT 2006
-
-Index: composite/compalloc.c
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/composite/compalloc.c,v
-retrieving revision 1.9
-diff -u -p -u -r1.9 compalloc.c
---- composite/compalloc.c	13 Mar 2006 21:59:55 -0000	1.9
-+++ composite/compalloc.c	30 Mar 2006 16:54:00 -0000
-@@ -478,6 +478,7 @@ compNewPixmap (WindowPtr pWin, int x, in
+--- ./composite/compalloc.c.spiffiffity	2006-03-13 16:59:55.000000000 -0500
++++ ./composite/compalloc.c	2006-04-12 16:37:50.000000000 -0400
+@@ -478,6 +478,7 @@
       * Copy bits from the parent into the new pixmap so that it will
       * have "reasonable" contents in case for background None areas.
       */
@@ -21,7 +8,7 @@
      if (pGC)
      {
  	XID val = IncludeInferiors;
-@@ -492,6 +493,7 @@ compNewPixmap (WindowPtr pWin, int x, in
+@@ -492,6 +493,7 @@
  			       w, h, 0, 0);
  	FreeScratchGC (pGC);
      }
@@ -29,30 +16,32 @@
      return pPixmap;
  }
  
-Index: composite/compwindow.c
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/composite/compwindow.c,v
-retrieving revision 1.13
-diff -u -p -u -r1.13 compwindow.c
---- composite/compwindow.c	29 Mar 2006 17:51:53 -0000	1.13
-+++ composite/compwindow.c	30 Mar 2006 16:54:00 -0000
-@@ -576,7 +576,9 @@ compCopyWindow (WindowPtr pWin, DDXPoint
+--- ./composite/compwindow.c.spiffiffity	2006-03-29 12:51:53.000000000 -0500
++++ ./composite/compwindow.c	2006-04-13 23:18:42.000000000 -0400
+@@ -571,12 +571,15 @@
+     }
+     else
+     {
++	CompWindowPtr	cw = GetCompWindow (pWin);
++
+ 	ptOldOrg.x -= dx;
+ 	ptOldOrg.y -= dy;
  	REGION_TRANSLATE (prgnSrc, prgnSrc,
  			  pWin->drawable.x - ptOldOrg.x,
  			  pWin->drawable.y - ptOldOrg.y);
-+#if 0
- 	DamageDamageRegion (&pWin->drawable, prgnSrc);
-+#endif
+-	DamageDamageRegion (&pWin->drawable, prgnSrc);
++	if (pWin->redirectDraw && cw->update == CompositeRedirectAutomatic)
++	  DamageDamageRegion (&pWin->drawable, prgnSrc);
      }
      cs->CopyWindow = pScreen->CopyWindow;
      pScreen->CopyWindow = compCopyWindow;
-@@ -655,7 +657,9 @@ compSetRedirectBorderClip (WindowPtr pWi
+@@ -655,7 +658,8 @@
      /*
       * Report that as damaged so it will be redrawn
       */
-+#if 0
-     DamageDamageRegion (&pWin->drawable, &damage);
-+#endif
+-    DamageDamageRegion (&pWin->drawable, &damage);
++    if (cw->update == CompositeRedirectAutomatic)
++      DamageDamageRegion (&pWin->drawable, &damage);
      REGION_UNINIT (pScreen, &damage);
      /*
       * Save the new border clip region


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- xorg-x11-server.spec	12 Apr 2006 20:52:30 -0000	1.55
+++ xorg-x11-server.spec	14 Apr 2006 03:21:31 -0000	1.56
@@ -4,7 +4,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.0.99.901
-Release:   4
+Release:   5
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -566,6 +566,10 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Thu Apr 13 2006 Kristian Høgsberg <krh at redhat.com> 1.0.99.901-5
+- Update spiffiffity patch to only suppress move damage events for
+  manually redirected windows.
+
 * Wed Apr 12 2006 Kristian Høgsberg <krh at redhat.com> 1.0.99.901-4
 - Bump for rawhide build.