rpms/vnc/devel vnc-render.patch,1.10,1.11 vnc.spec,1.81,1.82

[fedora-cvs-commits at redhat.com]

Author: twaugh

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

Modified Files:
	vnc-render.patch vnc.spec 
Log Message:
* Wed Jul 13 2005 Tim Waugh <twaugh at redhat.com> 4.1.1-14
- Added debugging messages so track down remaining RENDER glitches.


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

Index: vnc-render.patch
===================================================================
RCS file: /cvs/dist/rpms/vnc/devel/vnc-render.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- vnc-render.patch	14 Jul 2005 08:46:52 -0000	1.10
+++ vnc-render.patch	14 Jul 2005 11:56:17 -0000	1.11
@@ -98,8 +98,8 @@
  #if defined(XFree86Version) && XFree86Version >= 4000
     VNCDEFINES = -DGC_HAS_COMPOSITE_CLIP
  #endif
---- 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
+--- vnc-4_1_1-unixsrc/unix/xc/programs/Xserver/vnc/vncHooks.cc	2005-07-13 17:46:42.000000000 +0100
++++ vnc-4_1_1-unixsrc/unix/xc/programs/Xserver/vnc/vncHooks.cc	2005-07-14 11:16:54.000000000 +0100
 @@ -29,6 +29,9 @@
  #include "regionstr.h"
  #include "dixfontstr.h"
@@ -160,7 +160,7 @@
  
    return TRUE;
  }
-@@ -470,6 +495,42 @@
+@@ -470,6 +495,57 @@
    SCREEN_REWRAP(BlockHandler);
  }
  
@@ -175,22 +175,37 @@
 +  ScreenPtr pScreen = pDst->pDrawable->pScreen;
 +  vncHooksScreenPtr vncHooksScreen = \
 +    ((vncHooksScreenPtr)pScreen->devPrivates[vncHooksScreenIndex].ptr);
-+  BoxRec box;
 +  PictureScreenPtr ps = GetPictureScreen(pScreen);
 +
-+  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;
++  if (pDst->pDrawable->type == DRAWABLE_WINDOW) {
++    BoxRec box;
++    BoxPtr extents;
++
++    box.x1 = pDst->pDrawable->x + xDst;
++    box.y1 = pDst->pDrawable->y + yDst;
++    box.x2 = box.x1 + width;
++    box.y2 = box.y1 + height;
++
++    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;
++
++    if (box.x1 < 0) {
++      fprintf (stderr, "pDst->pDrawable->x=%d, xDst=%d, extents->x1=%d\n",
++	       pDst->pDrawable->x, xDst, extents->x1);
++      box.x1 = 0;
++    }
++    if (box.y1 < 0) {
++      fprintf (stderr, "pDst->pDrawable->y=%d, yDst=%d, extents->y1=%d\n",
++	       pDst->pDrawable->y, yDst, extents->y1);
++      box.y1 = 0;
++    }    
 +
-+  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.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- vnc.spec	14 Jul 2005 08:47:11 -0000	1.81
+++ vnc.spec	14 Jul 2005 11:56:17 -0000	1.82
@@ -5,7 +5,7 @@
 Summary:   A remote display system.
 Name:      vnc
 Version:   4.1.1
-Release: 13
+Release: 14
 URL:       http://www.realvnc.com
 Source0:   http://www.realvnc.com/dist/vnc-%{vnc_version}-unixsrc.tar.gz
 Source1:   http://www.realvnc.com/dist/vnc-%{java_vnc_version}-javasrc.tar.gz
@@ -210,6 +210,9 @@
 /usr/X11R6
 
 %changelog
+* Wed Jul 13 2005 Tim Waugh <twaugh at redhat.com> 4.1.1-14
+- Added debugging messages so track down remaining RENDER glitches.
+
 * Wed Jul 13 2005 Tim Waugh <twaugh at redhat.com> 4.1.1-13
 - RENDER clipping fix from Mark McLoughlin.