frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make Composite manual redirect windows not clip their parent. 

This patch changes the semantics of manual redirect windows so that they no
longer affect the clip list of their parent. Doing this means the parent can
draw to the area covered by the child without using IncludeInferiors. More
importantly, this also means that the parent receives expose events when
that region is damaged by other actions.
This commit is contained in:
Keith Packard 2007-07-03 14:29:11 -07:00
parent 2a75c77497
commit 866f092ca0
6 changed files with 87 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
composite/compalloc.c
View File

@ -204,7 +204,7 @@ compFreeClientWindow (WindowPtr pWin, XID id)
EnableMapUnmapEvents (pWin); EnableMapUnmapEvents (pWin);
} }
if (pWin->redirectDraw) if (pWin->redirectDraw != RedirectDrawNone)
compFreePixmap (pWin); compFreePixmap (pWin);
if (cw->damage) if (cw->damage)
@ -216,7 +216,7 @@ compFreeClientWindow (WindowPtr pWin, XID id)
xfree (cw); xfree (cw);
} }
else if (cw->update == CompositeRedirectAutomatic && else if (cw->update == CompositeRedirectAutomatic &&
!cw->damageRegistered && pWin->redirectDraw) !cw->damageRegistered && pWin->redirectDraw != RedirectDrawNone)
{ {
DamageRegister (&pWin->drawable, cw->damage); DamageRegister (&pWin->drawable, cw->damage);
cw->damageRegistered = TRUE; cw->damageRegistered = TRUE;
@ -506,7 +506,11 @@ compAllocPixmap (WindowPtr pWin)
if (!pPixmap) if (!pPixmap)
return FALSE; return FALSE;
pWin->redirectDraw = TRUE; if (cw->update == CompositeRedirectAutomatic)
pWin->redirectDraw = RedirectDrawAutomatic;
else
pWin->redirectDraw = RedirectDrawManual;
compSetPixmap (pWin, pPixmap); compSetPixmap (pWin, pPixmap);
cw->oldx = COMP_ORIGIN_INVALID; cw->oldx = COMP_ORIGIN_INVALID;
cw->oldy = COMP_ORIGIN_INVALID; cw->oldy = COMP_ORIGIN_INVALID;
@ -541,7 +545,7 @@ compFreePixmap (WindowPtr pWin)
REGION_COPY (pScreen, &pWin->borderClip, &cw->borderClip); REGION_COPY (pScreen, &pWin->borderClip, &cw->borderClip);
pRedirectPixmap = (*pScreen->GetWindowPixmap) (pWin); pRedirectPixmap = (*pScreen->GetWindowPixmap) (pWin);
pParentPixmap = (*pScreen->GetWindowPixmap) (pWin->parent); pParentPixmap = (*pScreen->GetWindowPixmap) (pWin->parent);
pWin->redirectDraw = FALSE; pWin->redirectDraw = RedirectDrawNone;
compSetPixmap (pWin, pParentPixmap); compSetPixmap (pWin, pParentPixmap);
(*pScreen->DestroyPixmap) (pRedirectPixmap); (*pScreen->DestroyPixmap) (pRedirectPixmap);
} }
@ -562,7 +566,7 @@ compReallocPixmap (WindowPtr pWin, int draw_x, int draw_y,
int pix_x, pix_y; int pix_x, pix_y;
int pix_w, pix_h; int pix_w, pix_h;
assert (cw && pWin->redirectDraw); assert (cw && pWin->redirectDraw != RedirectDrawNone);
cw->oldx = pOld->screen_x; cw->oldx = pOld->screen_x;
cw->oldy = pOld->screen_y; cw->oldy = pOld->screen_y;
pix_x = draw_x - bw; pix_x = draw_x - bw;

33
composite/compwindow.c
View File

@ -57,10 +57,10 @@ compCheckWindow (WindowPtr pWin, pointer data)
if (!pWin->parent) if (!pWin->parent)
{ {
assert (!pWin->redirectDraw); assert (pWin->redirectDraw == RedirectDrawNone);
assert (pWinPixmap == pScreenPixmap); assert (pWinPixmap == pScreenPixmap);
} }
else if (pWin->redirectDraw) else if (pWin->redirectDraw != RedirectDrawNone)
{ {
assert (pWinPixmap != pParentPixmap); assert (pWinPixmap != pParentPixmap);
assert (pWinPixmap != pScreenPixmap); assert (pWinPixmap != pScreenPixmap);
@ -111,7 +111,7 @@ compSetPixmapVisitWindow (WindowPtr pWindow, pointer data)
CompPixmapVisitPtr pVisit = (CompPixmapVisitPtr) data; CompPixmapVisitPtr pVisit = (CompPixmapVisitPtr) data;
ScreenPtr pScreen = pWindow->drawable.pScreen; ScreenPtr pScreen = pWindow->drawable.pScreen;
if (pWindow != pVisit->pWindow && pWindow->redirectDraw) if (pWindow != pVisit->pWindow && pWindow->redirectDraw != RedirectDrawNone)
return WT_DONTWALKCHILDREN; return WT_DONTWALKCHILDREN;
(*pScreen->SetWindowPixmap) (pWindow, pVisit->pPixmap); (*pScreen->SetWindowPixmap) (pWindow, pVisit->pPixmap);
/* /*
@ -155,7 +155,7 @@ compCheckRedirect (WindowPtr pWin)
} }
} }
if (should != pWin->redirectDraw) if (should != (pWin->redirectDraw != RedirectDrawNone))
{ {
if (should) if (should)
return compAllocPixmap (pWin); return compAllocPixmap (pWin);
@ -179,10 +179,11 @@ compPositionWindow (WindowPtr pWin, int x, int y)
compCheckRedirect (pWin); compCheckRedirect (pWin);
*/ */
#ifdef COMPOSITE_DEBUG #ifdef COMPOSITE_DEBUG
if (pWin->redirectDraw != (pWin->viewable && (GetCompWindow(pWin) != NULL))) if ((pWin->redirectDraw != RedirectDrawNone) !=
(pWin->viewable && (GetCompWindow(pWin) != NULL)))
abort (); abort ();
#endif #endif
if (pWin->redirectDraw) if (pWin->redirectDraw != RedirectDrawNone)
{ {
PixmapPtr pPixmap = (*pScreen->GetWindowPixmap) (pWin); PixmapPtr pPixmap = (*pScreen->GetWindowPixmap) (pWin);
int bw = wBorderWidth (pWin); int bw = wBorderWidth (pWin);
@ -329,7 +330,7 @@ compMoveWindow (WindowPtr pWin, int x, int y, WindowPtr pSib, VTKind kind)
CompScreenPtr cs = GetCompScreen (pScreen); CompScreenPtr cs = GetCompScreen (pScreen);
compCheckTree (pScreen); compCheckTree (pScreen);
if (pWin->redirectDraw) if (pWin->redirectDraw != RedirectDrawNone)
{ {
WindowPtr pParent; WindowPtr pParent;
int draw_x, draw_y; int draw_x, draw_y;
@ -353,7 +354,7 @@ compMoveWindow (WindowPtr pWin, int x, int y, WindowPtr pSib, VTKind kind)
cs->MoveWindow = pScreen->MoveWindow; cs->MoveWindow = pScreen->MoveWindow;
pScreen->MoveWindow = compMoveWindow; pScreen->MoveWindow = compMoveWindow;
if (pWin->redirectDraw) if (pWin->redirectDraw != RedirectDrawNone)
{ {
CompWindowPtr cw = GetCompWindow (pWin); CompWindowPtr cw = GetCompWindow (pWin);
if (cw->pOldPixmap) if (cw->pOldPixmap)
@ -374,7 +375,7 @@ compResizeWindow (WindowPtr pWin, int x, int y,
CompScreenPtr cs = GetCompScreen (pScreen); CompScreenPtr cs = GetCompScreen (pScreen);
compCheckTree (pScreen); compCheckTree (pScreen);
if (pWin->redirectDraw) if (pWin->redirectDraw != RedirectDrawNone)
{ {
WindowPtr pParent; WindowPtr pParent;
int draw_x, draw_y; int draw_x, draw_y;
@ -395,7 +396,7 @@ compResizeWindow (WindowPtr pWin, int x, int y,
(*pScreen->ResizeWindow) (pWin, x, y, w, h, pSib); (*pScreen->ResizeWindow) (pWin, x, y, w, h, pSib);
cs->ResizeWindow = pScreen->ResizeWindow; cs->ResizeWindow = pScreen->ResizeWindow;
pScreen->ResizeWindow = compResizeWindow; pScreen->ResizeWindow = compResizeWindow;
if (pWin->redirectDraw) if (pWin->redirectDraw != RedirectDrawNone)
{ {
CompWindowPtr cw = GetCompWindow (pWin); CompWindowPtr cw = GetCompWindow (pWin);
if (cw->pOldPixmap) if (cw->pOldPixmap)
@ -414,7 +415,7 @@ compChangeBorderWidth (WindowPtr pWin, unsigned int bw)
CompScreenPtr cs = GetCompScreen (pScreen); CompScreenPtr cs = GetCompScreen (pScreen);
compCheckTree (pScreen); compCheckTree (pScreen);
if (pWin->redirectDraw) if (pWin->redirectDraw != RedirectDrawNone)
{ {
WindowPtr pParent; WindowPtr pParent;
int draw_x, draw_y; int draw_x, draw_y;
@ -436,7 +437,7 @@ compChangeBorderWidth (WindowPtr pWin, unsigned int bw)
(*pScreen->ChangeBorderWidth) (pWin, bw); (*pScreen->ChangeBorderWidth) (pWin, bw);
cs->ChangeBorderWidth = pScreen->ChangeBorderWidth; cs->ChangeBorderWidth = pScreen->ChangeBorderWidth;
pScreen->ChangeBorderWidth = compChangeBorderWidth; pScreen->ChangeBorderWidth = compChangeBorderWidth;
if (pWin->redirectDraw) if (pWin->redirectDraw != RedirectDrawNone)
{ {
CompWindowPtr cw = GetCompWindow (pWin); CompWindowPtr cw = GetCompWindow (pWin);
if (cw->pOldPixmap) if (cw->pOldPixmap)
@ -480,7 +481,7 @@ compReparentWindow (WindowPtr pWin, WindowPtr pPriorParent)
/* /*
* Reset pixmap pointers as appropriate * Reset pixmap pointers as appropriate
*/ */
if (pWin->parent && !pWin->redirectDraw) if (pWin->parent && pWin->redirectDraw != RedirectDrawNone)
compSetPixmap (pWin, (*pScreen->GetWindowPixmap) (pWin->parent)); compSetPixmap (pWin, (*pScreen->GetWindowPixmap) (pWin->parent));
/* /*
* Call down to next function * Call down to next function
@ -499,7 +500,7 @@ compCopyWindow (WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
CompScreenPtr cs = GetCompScreen (pScreen); CompScreenPtr cs = GetCompScreen (pScreen);
int dx = 0, dy = 0; int dx = 0, dy = 0;
if (pWin->redirectDraw) if (pWin->redirectDraw != RedirectDrawNone)
{ {
PixmapPtr pPixmap = (*pScreen->GetWindowPixmap) (pWin); PixmapPtr pPixmap = (*pScreen->GetWindowPixmap) (pWin);
CompWindowPtr cw = GetCompWindow (pWin); CompWindowPtr cw = GetCompWindow (pWin);
@ -624,7 +625,7 @@ compDestroyWindow (WindowPtr pWin)
while ((csw = GetCompSubwindows (pWin))) while ((csw = GetCompSubwindows (pWin)))
FreeResource (csw->clients->id, RT_NONE); FreeResource (csw->clients->id, RT_NONE);
if (pWin->redirectDraw) if (pWin->redirectDraw != RedirectDrawNone)
compFreePixmap (pWin); compFreePixmap (pWin);
ret = (*pScreen->DestroyWindow) (pWin); ret = (*pScreen->DestroyWindow) (pWin);
cs->DestroyWindow = pScreen->DestroyWindow; cs->DestroyWindow = pScreen->DestroyWindow;
@ -768,7 +769,7 @@ compWindowUpdate (WindowPtr pWin)
for (pChild = pWin->lastChild; pChild; pChild = pChild->prevSib) for (pChild = pWin->lastChild; pChild; pChild = pChild->prevSib)
compWindowUpdate (pChild); compWindowUpdate (pChild);
if (pWin->redirectDraw) if (pWin->redirectDraw != RedirectDrawNone)
{ {
CompWindowPtr cw = GetCompWindow(pWin); CompWindowPtr cw = GetCompWindow(pWin);

2
configure.ac
View File

@ -649,7 +649,7 @@ fi
AM_CONDITIONAL(COMPOSITE, [test "x$COMPOSITE" = xyes]) AM_CONDITIONAL(COMPOSITE, [test "x$COMPOSITE" = xyes])
if test "x$COMPOSITE" = xyes; then if test "x$COMPOSITE" = xyes; then
AC_DEFINE(COMPOSITE, 1, [Support Composite Extension]) AC_DEFINE(COMPOSITE, 1, [Support Composite Extension])
REQUIRED_MODULES="$REQUIRED_MODULES [compositeproto >= 0.3]" REQUIRED_MODULES="$REQUIRED_MODULES [compositeproto >= 0.4]"
COMPOSITE_LIB='$(top_builddir)/composite/libcomposite.la' COMPOSITE_LIB='$(top_builddir)/composite/libcomposite.la'
COMPOSITE_INC='-I$(top_srcdir)/composite' COMPOSITE_INC='-I$(top_srcdir)/composite'
fi fi

14
dix/window.c
View File

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

29
include/windowstr.h
View File

@ -94,6 +94,33 @@ typedef struct _WindowOpt {
#define BackgroundPixel 2L #define BackgroundPixel 2L
#define BackgroundPixmap 3L #define BackgroundPixmap 3L
/*
* The redirectDraw field can have one of three values:
*
* RedirectDrawNone
* A normal window; painted into the same pixmap as the parent
* and clipping parent and siblings to its geometry. These
* windows get a clip list equal to the intersection of their
* geometry with the parent geometry, minus the geometry
* of overlapping None and Clipped siblings.
* RedirectDrawAutomatic
* A redirected window which clips parent and sibling drawing.
* Contents for these windows are manage inside the server.
* These windows get an internal clip list equal to their
* geometry.
* RedirectDrawManual
* A redirected window which does not clip parent and sibling
* drawing; the window must be represented within the parent
* geometry by the client performing the redirection management.
* Contents for these windows are managed outside the server.
* These windows get an internal clip list equal to their
* geometry.
*/
#define RedirectDrawNone 0
#define RedirectDrawAutomatic 1
#define RedirectDrawManual 2
typedef struct _Window { typedef struct _Window {
DrawableRec drawable; DrawableRec drawable;
WindowPtr parent; /* ancestor chain */ WindowPtr parent; /* ancestor chain */
@ -130,7 +157,7 @@ typedef struct _Window {
unsigned dontPropagate:3;/* index into DontPropagateMasks */ unsigned dontPropagate:3;/* index into DontPropagateMasks */
unsigned forcedBS:1; /* system-supplied backingStore */ unsigned forcedBS:1; /* system-supplied backingStore */
#ifdef COMPOSITE #ifdef COMPOSITE
unsigned redirectDraw:1; /* rendering is redirected from here */ unsigned redirectDraw:2; /* rendering is redirected from here */
#endif #endif
DevUnion *devPrivates; DevUnion *devPrivates;
} WindowRec; } WindowRec;

31
mi/mivaltree.c
View File

@ -179,6 +179,17 @@ miRegisterRedirectBorderClipProc (SetRedirectBorderClipProcPtr setBorderClip,
miGetRedirectBorderClipProc = getBorderClip; miGetRedirectBorderClipProc = getBorderClip;
} }
/*
* Manual redirected windows are treated as transparent; they do not obscure
* siblings or parent windows
*/
#ifdef COMPOSITE
#define TreatAsTransparent(w) ((w)->redirectDraw == RedirectDrawManual)
#else
#define TreatAsTransparent(w) FALSE
#endif
#define HasParentRelativeBorder(w) (!(w)->borderIsPixel && \ #define HasParentRelativeBorder(w) (!(w)->borderIsPixel && \
HasBorder(w) && \ HasBorder(w) && \
(w)->backgroundState == ParentRelative) (w)->backgroundState == ParentRelative)
@ -241,7 +252,7 @@ miComputeClips (
/* /*
* In redirected drawing case, reset universe to borderSize * In redirected drawing case, reset universe to borderSize
*/ */
if (pParent->redirectDraw) if (pParent->redirectDraw != RedirectDrawNone)
{ {
if (miSetRedirectBorderClipProc) if (miSetRedirectBorderClipProc)
(*miSetRedirectBorderClipProc) (pParent, universe); (*miSetRedirectBorderClipProc) (pParent, universe);
@ -432,7 +443,7 @@ miComputeClips (
{ {
for (; pChild; pChild = pChild->nextSib) for (; pChild; pChild = pChild->nextSib)
{ {
if (pChild->viewable) if (pChild->viewable && !TreatAsTransparent(pChild))
REGION_APPEND( pScreen, &childUnion, &pChild->borderSize); REGION_APPEND( pScreen, &childUnion, &pChild->borderSize);
} }
} }
@ -440,7 +451,7 @@ miComputeClips (
{ {
for (pChild = pParent->lastChild; pChild; pChild = pChild->prevSib) for (pChild = pParent->lastChild; pChild; pChild = pChild->prevSib)
{ {
if (pChild->viewable) if (pChild->viewable && !TreatAsTransparent(pChild))
REGION_APPEND( pScreen, &childUnion, &pChild->borderSize); REGION_APPEND( pScreen, &childUnion, &pChild->borderSize);
} }
} }
@ -472,7 +483,7 @@ miComputeClips (
* from the current universe, thus denying its space to any * from the current universe, thus denying its space to any
* other sibling. * other sibling.
*/ */
if (overlap) if (overlap && !TreatAsTransparent (pChild))
REGION_SUBTRACT( pScreen, universe, universe, REGION_SUBTRACT( pScreen, universe, universe,
&pChild->borderSize); &pChild->borderSize);
} }
@ -644,7 +655,7 @@ miValidateTree (pParent, pChild, kind)
for (pWin = pParent->firstChild; pWin != pChild; pWin = pWin->nextSib) for (pWin = pParent->firstChild; pWin != pChild; pWin = pWin->nextSib)
{ {
if (pWin->viewable) if (pWin->viewable && !TreatAsTransparent (pWin))
REGION_SUBTRACT (pScreen, &totalClip, &totalClip, &pWin->borderSize); REGION_SUBTRACT (pScreen, &totalClip, &totalClip, &pWin->borderSize);
} }
for (pWin = pChild; pWin; pWin = pWin->nextSib) for (pWin = pChild; pWin; pWin = pWin->nextSib)
@ -666,7 +677,7 @@ miValidateTree (pParent, pChild, kind)
{ {
RegionPtr pBorderClip = &pWin->borderClip; RegionPtr pBorderClip = &pWin->borderClip;
#ifdef COMPOSITE #ifdef COMPOSITE
if (pWin->redirectDraw && miGetRedirectBorderClipProc) if (pWin->redirectDraw != RedirectDrawNone && miGetRedirectBorderClipProc)
pBorderClip = (*miGetRedirectBorderClipProc)(pWin); pBorderClip = (*miGetRedirectBorderClipProc)(pWin);
#endif #endif
REGION_APPEND( pScreen, &totalClip, pBorderClip ); REGION_APPEND( pScreen, &totalClip, pBorderClip );
@ -685,7 +696,7 @@ miValidateTree (pParent, pChild, kind)
{ {
RegionPtr pBorderClip = &pWin->borderClip; RegionPtr pBorderClip = &pWin->borderClip;
#ifdef COMPOSITE #ifdef COMPOSITE
if (pWin->redirectDraw && miGetRedirectBorderClipProc) if (pWin->redirectDraw != RedirectDrawNone && miGetRedirectBorderClipProc)
pBorderClip = (*miGetRedirectBorderClipProc)(pWin); pBorderClip = (*miGetRedirectBorderClipProc)(pWin);
#endif #endif
REGION_APPEND( pScreen, &totalClip, pBorderClip ); REGION_APPEND( pScreen, &totalClip, pBorderClip );
@ -724,7 +735,7 @@ miValidateTree (pParent, pChild, kind)
if (forward) if (forward)
{ {
for (pWin = pChild; pWin; pWin = pWin->nextSib) for (pWin = pChild; pWin; pWin = pWin->nextSib)
if (pWin->valdata && pWin->viewable) if (pWin->valdata && pWin->viewable && !TreatAsTransparent (pWin))
REGION_APPEND( pScreen, &childUnion, REGION_APPEND( pScreen, &childUnion,
&pWin->borderSize); &pWin->borderSize);
} }
@ -733,7 +744,7 @@ miValidateTree (pParent, pChild, kind)
pWin = pParent->lastChild; pWin = pParent->lastChild;
while (1) while (1)
{ {
if (pWin->valdata && pWin->viewable) if (pWin->valdata && pWin->viewable && !TreatAsTransparent (pWin))
REGION_APPEND( pScreen, &childUnion, REGION_APPEND( pScreen, &childUnion,
&pWin->borderSize); &pWin->borderSize);
if (pWin == pChild) if (pWin == pChild)
@ -757,7 +768,7 @@ miValidateTree (pParent, pChild, kind)
&totalClip, &totalClip,
&pWin->borderSize); &pWin->borderSize);
miComputeClips (pWin, pScreen, &childClip, kind, &exposed); miComputeClips (pWin, pScreen, &childClip, kind, &exposed);
if (overlap) if (overlap && !TreatAsTransparent (pWin))
{ {
REGION_SUBTRACT( pScreen, &totalClip, REGION_SUBTRACT( pScreen, &totalClip,
&totalClip, &totalClip,