XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-04-14 17:18:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into XACE-SELINUX

Browse Source 
Conflicts:

	dix/devices.c
	dix/property.c
	include/dix.h
This commit is contained in:
Eamon Walsh
2007-08-02 14:27:03 -04:00
committed by Eamon Walsh
parent 32c0dcc8c0 f3955c0a02
commit e34fcd2bf4
755 changed files with 15815 additions and 5800 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
dix/window.c
View File

@@ -299,7 +299,7 @@ SetWindowToDefaults(WindowPtr pWin)
pWin->dontPropagate = 0;
pWin->forcedBS = FALSE;
#ifdef COMPOSITE
pWin->redirectDraw = 0;
pWin->redirectDraw = RedirectDrawNone;
#endif
}
@@ -1693,10 +1693,14 @@ _X_EXPORT void
SetWinSize (WindowPtr pWin)
{
#ifdef COMPOSITE
if (pWin->redirectDraw)
if (pWin->redirectDraw != RedirectDrawNone)
{
BoxRec box;
/*
* Redirected clients get clip list equal to their
* own geometry, not clipped to their parent
*/
box.x1 = pWin->drawable.x;
box.y1 = pWin->drawable.y;
box.x2 = pWin->drawable.x + pWin->drawable.width;
@@ -1736,10 +1740,14 @@ SetBorderSize (WindowPtr pWin)
if (HasBorder (pWin)) {
bw = wBorderWidth (pWin);
#ifdef COMPOSITE
if (pWin->redirectDraw)
if (pWin->redirectDraw != RedirectDrawNone)
{
BoxRec box;
/*
* Redirected clients get clip list equal to their
* own geometry, not clipped to their parent
*/
box.x1 = pWin->drawable.x - bw;
box.y1 = pWin->drawable.y - bw;
box.x2 = pWin->drawable.x + pWin->drawable.width + bw;