rpms/vnc/devel vnc-render.patch,1.9,1.10 vnc.spec,1.79,1.80

[fedora-cvs-commits redhat com]

Author: twaugh

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

Modified Files:
	vnc-render.patch vnc.spec 
Log Message:
* Wed Jul 13 2005 Tim Waugh <twaugh redhat com>
- RENDER clipping fix from Mark McLoughlin.


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

Index: vnc-render.patch
===================================================================
RCS file: /cvs/dist/rpms/vnc/devel/vnc-render.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- vnc-render.patch	21 Jun 2005 11:47:05 -0000	1.9
+++ vnc-render.patch	14 Jul 2005 08:46:52 -0000	1.10
@@ -1,4 +1,3 @@
-unchanged:
 --- vnc-4_1_1-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc.render	2005-03-17 09:57:08.000000000 +0000
 +++ vnc-4_1_1-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc	2005-03-17 10:31:39.000000000 +0000
 @@ -135,6 +135,9 @@
@@ -77,7 +76,6 @@
    for (i = 1; i <= 32; i++)
    {
      if (vfbPixmapDepths[i])
-unchanged:
 --- vnc-4_1_1-unixsrc/unix/xc/programs/Xserver/vnc/module/Imakefile.render	2005-03-17 09:57:09.000000000 +0000
 +++ vnc-4_1_1-unixsrc/unix/xc/programs/Xserver/vnc/module/Imakefile	2005-03-17 09:57:09.000000000 +0000
 @@ -13,7 +13,7 @@
@@ -89,7 +87,6 @@
   DEFINES = $(STD_DEFINES) -DGC_HAS_COMPOSITE_CLIP -DXFree86LOADER
  
  LinkSourceFile(vncExtInit.cc,..)
-unchanged:
 --- vnc-4_1_1-unixsrc/unix/xc/programs/Xserver/vnc/Imakefile.render	2005-03-17 09:57:09.000000000 +0000
 +++ vnc-4_1_1-unixsrc/unix/xc/programs/Xserver/vnc/Imakefile	2005-03-17 09:57:09.000000000 +0000
 @@ -19,7 +19,7 @@
@@ -101,9 +98,8 @@
  #if defined(XFree86Version) && XFree86Version >= 4000
     VNCDEFINES = -DGC_HAS_COMPOSITE_CLIP
  #endif
-diff -u vnc-4_1_1-unixsrc/unix/xc/programs/Xserver/vnc/vncHooks.cc vnc-4_1_1-unixsrc/unix/xc/programs/Xserver/vnc/vncHooks.cc
---- vnc-4_1_1-unixsrc/unix/xc/programs/Xserver/vnc/vncHooks.cc	2005-03-17 09:57:09.000000000 +0000
-+++ vnc-4_1_1-unixsrc/unix/xc/programs/Xserver/vnc/vncHooks.cc	2005-03-31 12:43:05.000000000 +0100
+--- vnc-4_1_1-unixsrc/unix/xc/programs/Xserver/vnc/vncHooks.cc	2005-07-13 17:24:26.000000000 +0100
++++ vnc-4_1_1-unixsrc/unix/xc/programs/Xserver/vnc/vncHooks.cc	2005-07-13 17:46:42.000000000 +0100
 @@ -29,6 +29,9 @@
  #include "regionstr.h"
  #include "dixfontstr.h"
@@ -164,7 +160,7 @@
  
    return TRUE;
  }
-@@ -470,6 +495,38 @@
+@@ -470,6 +495,42 @@
    SCREEN_REWRAP(BlockHandler);
  }
  
@@ -182,15 +178,19 @@
 +  BoxRec box;
 +  PictureScreenPtr ps = GetPictureScreen(pScreen);
 +
-+  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;
++  box.x1 = pDst->pDrawable->x + xDst;
++  box.y1 = pDst->pDrawable->y + yDst;
++  box.x2 = box.x1 + width;
++  box.y2 = box.y1 + height;
++
++  BoxPtr extents = &pDst->pCompositeClip->extents;
++  if (box.x1 < extents->x1) box.x1 = extents->x1;
++  if (box.x2 > extents->x2) box.x2 = extents->x2;
++  if (box.y1 < extents->y1) box.y1 = extents->y1;
++  if (box.y2 > extents->y2) box.y2 = extents->y2;
 +
-+      RegionHelper changed(pScreen, &box, 0);
-+      vncHooksScreen->desktop->add_changed(changed.reg);
-+  }
++  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.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- vnc.spec	27 Jun 2005 16:23:54 -0000	1.79
+++ vnc.spec	14 Jul 2005 08:46:52 -0000	1.80
@@ -210,6 +210,9 @@
 /usr/X11R6
 
 %changelog
+* Wed Jul 13 2005 Tim Waugh <twaugh redhat com>
+- RENDER clipping fix from Mark McLoughlin.
+
 * Mon Jun 27 2005 Tim Waugh <twaugh redhat com> 4.1.1-12
 - Fixed vncpasswd crash (bug #160471).