diff options
| author | marha <marha@users.sourceforge.net> | 2014-04-13 14:28:06 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-04-13 14:28:06 +0200 |
| commit | 0bd141efd4832e01c8b269b8566dd5749e30ed55 (patch) | |
| tree | cdad95c688236c6e2e36f13a3495c498393dabc8 /xorg-server/composite/compwindow.c | |
| parent | feab85024204c7db3ad243697fe06bf3960349a9 (diff) | |
| parent | d2ad10d03be8e6d4b150bbdf2a28ea3d5a18a2ed (diff) | |
| download | vcxsrv-0bd141efd4832e01c8b269b8566dd5749e30ed55.tar.gz vcxsrv-0bd141efd4832e01c8b269b8566dd5749e30ed55.tar.bz2 vcxsrv-0bd141efd4832e01c8b269b8566dd5749e30ed55.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'xorg-server/composite/compwindow.c')
| -rw-r--r-- | xorg-server/composite/compwindow.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/xorg-server/composite/compwindow.c b/xorg-server/composite/compwindow.c index 6c2434959..882429414 100644 --- a/xorg-server/composite/compwindow.c +++ b/xorg-server/composite/compwindow.c @@ -336,6 +336,21 @@ compIsAlternateVisual(ScreenPtr pScreen, XID visual) } static Bool +compIsImplicitRedirectException(ScreenPtr pScreen, + XID parentVisual, XID winVisual) +{ + CompScreenPtr cs = GetCompScreen(pScreen); + int i; + + for (i = 0; i < cs->numImplicitRedirectExceptions; i++) + if (cs->implicitRedirectExceptions[i].parentVisual == parentVisual && + cs->implicitRedirectExceptions[i].winVisual == winVisual) + return TRUE; + + return FALSE; +} + +static Bool compImplicitRedirect(WindowPtr pWin, WindowPtr pParent) { if (pParent) { @@ -343,6 +358,9 @@ compImplicitRedirect(WindowPtr pWin, WindowPtr pParent) XID winVisual = wVisual(pWin); XID parentVisual = wVisual(pParent); + if (compIsImplicitRedirectException(pScreen, parentVisual, winVisual)) + return FALSE; + if (winVisual != parentVisual && (compIsAlternateVisual(pScreen, winVisual) || compIsAlternateVisual(pScreen, parentVisual))) |