Magellan Linux

Contents of /trunk/vnc/patches/vnc-module-crash.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 153 - (show annotations) (download)
Tue May 8 20:52:56 2007 UTC (17 years ago) by niro
File size: 1063 byte(s)
-import

1 --- unix/xc/programs/Xserver/vnc/vncHooks.cc.module_crash 2007-03-26 20:00:49.000000000 +0200
2 +++ unix/xc/programs/Xserver/vnc/vncHooks.cc 2007-03-26 20:05:20.000000000 +0200
3 @@ -509,7 +509,12 @@
4 BoxRec box;
5 PictureScreenPtr ps = GetPictureScreen(pScreen);
6
7 - if ((xDst >= 0) && (yDst >= 0)) {
8 + ps->Composite = vncHooksScreen->Composite;
9 + (*ps->Composite)(op, pSrc, pMask, pDst, xSrc, ySrc,
10 + xMask, yMask, xDst, yDst, width, height);
11 + ps->Composite = vncHooksComposite;
12 +
13 + if((xDst >= 0) && (yDst >= 0) && pDst->pDrawable->type == DRAWABLE_WINDOW) {
14 box.x1 = pDst->pDrawable->x + xDst;
15 box.y1 = pDst->pDrawable->y + yDst;
16 box.x2 = box.x1 + width;
17 @@ -518,11 +523,6 @@
18 RegionHelper changed(pScreen, &box, 0);
19 vncHooksScreen->desktop->add_changed(changed.reg);
20 }
21 -
22 - ps->Composite = vncHooksScreen->Composite;
23 - (*ps->Composite)(op, pSrc, pMask, pDst, xSrc, ySrc,
24 - xMask, yMask, xDst, yDst, width, height);
25 - ps->Composite = vncHooksComposite;
26 }
27
28 #endif /* RENDER */