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

composite: Add SourceValidate wrapper 

When SourceValidate is performed on a window with IncludeInferiors
sub-window mode, force an immediate update of all the automatically
redirected windows, so that the current window contents will be up
to date.

Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Ville Syrjälä 2011-01-05 20:41:08 +02:00 committed by Keith Packard
parent 84154954db
commit b89e6dbdfb
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
composite/compinit.c
View File

@ -78,6 +78,7 @@ compCloseScreen (int index, ScreenPtr pScreen)
pScreen->PositionWindow = cs->PositionWindow; pScreen->PositionWindow = cs->PositionWindow;
pScreen->GetImage = cs->GetImage; pScreen->GetImage = cs->GetImage;
pScreen->SourceValidate = cs->SourceValidate;
free(cs); free(cs);
dixSetPrivate(&pScreen->devPrivates, CompScreenPrivateKey, NULL); dixSetPrivate(&pScreen->devPrivates, CompScreenPrivateKey, NULL);
@ -150,6 +151,24 @@ compGetImage (DrawablePtr pDrawable,
pScreen->GetImage = compGetImage; pScreen->GetImage = compGetImage;
} }
static void compSourceValidate(DrawablePtr pDrawable,
int x, int y,
int width, int height,
unsigned int subWindowMode)
{
ScreenPtr pScreen = pDrawable->pScreen;
CompScreenPtr cs = GetCompScreen (pScreen);
pScreen->SourceValidate = cs->SourceValidate;
if (pDrawable->type == DRAWABLE_WINDOW && subWindowMode == IncludeInferiors)
compScreenUpdate (pScreen);
if (pScreen->SourceValidate)
(*pScreen->SourceValidate) (pDrawable, x, y, width, height,
subWindowMode);
cs->SourceValidate = pScreen->SourceValidate;
pScreen->SourceValidate = compSourceValidate;
}
/* /*
* Add alternate visuals -- always expose an ARGB32 and RGB24 visual * Add alternate visuals -- always expose an ARGB32 and RGB24 visual
*/ */
@ -385,6 +404,9 @@ compScreenInit (ScreenPtr pScreen)
cs->GetImage = pScreen->GetImage; cs->GetImage = pScreen->GetImage;
pScreen->GetImage = compGetImage; pScreen->GetImage = compGetImage;
cs->SourceValidate = pScreen->SourceValidate;
pScreen->SourceValidate = compSourceValidate;
dixSetPrivate(&pScreen->devPrivates, CompScreenPrivateKey, cs); dixSetPrivate(&pScreen->devPrivates, CompScreenPrivateKey, cs);
RegisterRealChildHeadProc(CompositeRealChildHead); RegisterRealChildHeadProc(CompositeRealChildHead);

1
composite/compint.h
View File

@ -160,6 +160,7 @@ typedef struct _CompScreen {
CompOverlayClientPtr pOverlayClients; CompOverlayClientPtr pOverlayClients;
GetImageProcPtr GetImage; GetImageProcPtr GetImage;
SourceValidateProcPtr SourceValidate;
} CompScreenRec, *CompScreenPtr; } CompScreenRec, *CompScreenPtr;
extern DevPrivateKeyRec CompScreenPrivateKeyRec; extern DevPrivateKeyRec CompScreenPrivateKeyRec;