From 27581fc1919c5078a5cd3afe0ac4841bd2990877 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Peter=20=C3=85strand?= Date: Mon, 7 Mar 2011 12:52:37 +0000 Subject: [PATCH] Avoid intersecting screen with empty clipList in vncHooksCopyArea. The result would be empty, which means that we are not sending CopyRect updates even though we can. Improves vertical scrolling with Firefox and Adobe reader. git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4324 3789f03b-4d11-0410-bbf8-ca57d06f2519 --- unix/xserver/hw/vnc/vncHooks.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/unix/xserver/hw/vnc/vncHooks.cc b/unix/xserver/hw/vnc/vncHooks.cc index 1bf61a38..75191112 100644 --- a/unix/xserver/hw/vnc/vncHooks.cc +++ b/unix/xserver/hw/vnc/vncHooks.cc @@ -816,7 +816,9 @@ static RegionPtr vncHooksCopyArea(DrawablePtr pSrc, DrawablePtr pDst, box.y2 = box.y1 + h; src.init(&box, 0); - REGION_INTERSECT(pScreen, src.reg, src.reg, &((WindowPtr)pSrc)->clipList); + if (REGION_NOTEMPTY(pScreen, &((WindowPtr)pSrc)->clipList)) { + REGION_INTERSECT(pScreen, src.reg, src.reg, &((WindowPtr)pSrc)->clipList); + } REGION_TRANSLATE(pScreen, src.reg, dstx + pDst->x - srcx - pSrc->x, dsty + pDst->y - srcy - pSrc->y); -- 2.39.5