rpms/vnc/devel vnc-render.patch,1.6,1.7 vnc.spec,1.68,1.69

[fedora-cvs-commits at redhat.com]

Update of /cvs/dist/rpms/vnc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1130

Modified Files:
	vnc-render.patch vnc.spec 
Log Message:
* Fri Apr  1 2005 Tim Waugh <twaugh at redhat.com> 4.1.1-8
- Further render patch fix for Peter Ã…strand.


vnc-render.patch:
 Imakefile        |    2 -
 Xvnc/xvnc.cc     |   41 ++++++++++++++++++++++++++++++++++++++-
 module/Imakefile |    2 -
 vncHooks.cc      |   57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 99 insertions(+), 3 deletions(-)

Index: vnc-render.patch
===================================================================
RCS file: /cvs/dist/rpms/vnc/devel/vnc-render.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- vnc-render.patch	31 Mar 2005 11:44:52 -0000	1.6
+++ vnc-render.patch	1 Apr 2005 09:41:38 -0000	1.7
@@ -164,7 +164,7 @@
  
    return TRUE;
  }
-@@ -470,6 +495,39 @@
+@@ -470,6 +495,38 @@
    SCREEN_REWRAP(BlockHandler);
  }
  
@@ -182,16 +182,15 @@
 +  BoxRec box;
 +  PictureScreenPtr ps = GetPictureScreen(pScreen);
 +
-+  if ((xDst < 0) || (yDst < 0))
-+      return;
-+
-+  box.x1 = pDst->pDrawable->x + xDst;
-+  box.y1 = pDst->pDrawable->y + yDst;
-+  box.x2 = box.x1 + width;
-+  box.y2 = box.y1 + height;
-+
-+  RegionHelper changed(pScreen, &box, 0);
-+  vncHooksScreen->desktop->add_changed(changed.reg);
++  if ((xDst >= 0) && (yDst >= 0)) {
++      box.x1 = pDst->pDrawable->x + xDst;
++      box.y1 = pDst->pDrawable->y + yDst;
++      box.x2 = box.x1 + width;
++      box.y2 = box.y1 + height;
++
++      RegionHelper changed(pScreen, &box, 0);
++      vncHooksScreen->desktop->add_changed(changed.reg);
++  }
 +
 +  ps->Composite = vncHooksScreen->Composite;
 +  (*ps->Composite)(op, pSrc, pMask, pDst, xSrc, ySrc,


Index: vnc.spec
===================================================================
RCS file: /cvs/dist/rpms/vnc/devel/vnc.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- vnc.spec	31 Mar 2005 15:19:42 -0000	1.68
+++ vnc.spec	1 Apr 2005 09:41:38 -0000	1.69
@@ -212,9 +212,8 @@
 /usr/X11R6
 
 %changelog
-* Thu Mar 31 2005 Tim Waugh <twaugh at redhat.com> 4.1.1-8
-- Disable render by default (+render turns it back on).  Still doesn't
-  quite work right.
+* Fri Apr  1 2005 Tim Waugh <twaugh at redhat.com> 4.1.1-8
+- Further render patch fix for Peter Ã…strand.
 
 * Thu Mar 31 2005 Tim Waugh <twaugh at redhat.com> 4.1.1-7
 - Render patch fix from Peter Ã…strand.  Enabled render by default again.