aboutsummaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authorPeter Åstrand <astrand@cendio.se>2011-03-07 12:52:37 +0000
committerPeter Åstrand <astrand@cendio.se>2011-03-07 12:52:37 +0000
commit27581fc1919c5078a5cd3afe0ac4841bd2990877 (patch)
treef8a423bdae3ed5d74873e5f644e3dd86f6bec43b /unix
parent20dea4620c23eafaad7e55902c6973cf95047e92 (diff)
downloadtigervnc-27581fc1919c5078a5cd3afe0ac4841bd2990877.tar.gz
tigervnc-27581fc1919c5078a5cd3afe0ac4841bd2990877.zip
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
Diffstat (limited to 'unix')
-rw-r--r--unix/xserver/hw/vnc/vncHooks.cc4
1 files changed, 3 insertions, 1 deletions
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);