diff options
| author | marha <marha@users.sourceforge.net> | 2011-04-28 11:14:32 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-04-28 11:14:32 +0000 |
| commit | 1840c5631682e0a69ed11487a23a43d45f2d15e1 (patch) | |
| tree | fe954636044c0057b9f08e76d19489493ff09745 /xorg-server/miext/rootless | |
| parent | 2ab09dc03e4ecc726ee7b5528306b0fe3e5b1837 (diff) | |
| parent | 57a879849643e79d9674198a3a77c59532fb79b4 (diff) | |
| download | vcxsrv-1840c5631682e0a69ed11487a23a43d45f2d15e1.tar.gz vcxsrv-1840c5631682e0a69ed11487a23a43d45f2d15e1.tar.bz2 vcxsrv-1840c5631682e0a69ed11487a23a43d45f2d15e1.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/miext/rootless')
| -rw-r--r-- | xorg-server/miext/rootless/rootlessScreen.c | 1 | ||||
| -rw-r--r-- | xorg-server/miext/rootless/rootlessValTree.c | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/xorg-server/miext/rootless/rootlessScreen.c b/xorg-server/miext/rootless/rootlessScreen.c index 9263df1fd..03e3278d3 100644 --- a/xorg-server/miext/rootless/rootlessScreen.c +++ b/xorg-server/miext/rootless/rootlessScreen.c @@ -453,7 +453,6 @@ RootlessMarkOverlappedWindows(WindowPtr pWin, WindowPtr pFirst, pChild = pChild->nextSib;
}
anyMarked = TRUE;
- pFirst = pFirst->nextSib;
}
if (anyMarked)
(* MarkWindow)(pWin->parent);
diff --git a/xorg-server/miext/rootless/rootlessValTree.c b/xorg-server/miext/rootless/rootlessValTree.c index 23527ff2e..95bf20bad 100644 --- a/xorg-server/miext/rootless/rootlessValTree.c +++ b/xorg-server/miext/rootless/rootlessValTree.c @@ -200,7 +200,6 @@ RootlessComputeClips (WindowPtr pParent, ScreenPtr pScreen, RegionRec childUnion;
Bool overlap;
RegionPtr borderVisible;
- Bool resized;
/*
* Figure out the new visibility of this window.
* The extent of the universe should be the same as the extent of
@@ -340,7 +339,6 @@ RootlessComputeClips (WindowPtr pParent, ScreenPtr pScreen, }
borderVisible = pParent->valdata->before.borderVisible;
- resized = pParent->valdata->before.resized;
RegionNull(&pParent->valdata->after.borderExposed);
RegionNull(&pParent->valdata->after.exposed);
|