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

composite: Add GetImage wrapper 

When GetImage is performed on a window, 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:07 +02:00 committed by Keith Packard
parent a5dc3531e1
commit 84154954db
3 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composite/compalloc.c
View File

@ -47,7 +47,7 @@
#include "compint.h" #include "compint.h"
static void void
compScreenUpdate (ScreenPtr pScreen) compScreenUpdate (ScreenPtr pScreen)
{ {
compCheckTree (pScreen); compCheckTree (pScreen);

24
composite/compinit.c
View File

@ -77,6 +77,8 @@ compCloseScreen (int index, ScreenPtr pScreen)
pScreen->CopyWindow = cs->CopyWindow; pScreen->CopyWindow = cs->CopyWindow;
pScreen->PositionWindow = cs->PositionWindow; pScreen->PositionWindow = cs->PositionWindow;
pScreen->GetImage = cs->GetImage;
free(cs); free(cs);
dixSetPrivate(&pScreen->devPrivates, CompScreenPrivateKey, NULL); dixSetPrivate(&pScreen->devPrivates, CompScreenPrivateKey, NULL);
ret = (*pScreen->CloseScreen) (index, pScreen); ret = (*pScreen->CloseScreen) (index, pScreen);
@ -129,6 +131,25 @@ compChangeWindowAttributes(WindowPtr pWin, unsigned long mask)
return ret; return ret;
} }
static void
compGetImage (DrawablePtr pDrawable,
int sx, int sy,
int w, int h,
unsigned int format,
unsigned long planemask,
char *pdstLine)
{
ScreenPtr pScreen = pDrawable->pScreen;
CompScreenPtr cs = GetCompScreen (pScreen);
pScreen->GetImage = cs->GetImage;
if (pDrawable->type == DRAWABLE_WINDOW)
compScreenUpdate (pScreen);
(*pScreen->GetImage) (pDrawable, sx, sy, w, h, format, planemask, pdstLine);
cs->GetImage = pScreen->GetImage;
pScreen->GetImage = compGetImage;
}
/* /*
* Add alternate visuals -- always expose an ARGB32 and RGB24 visual * Add alternate visuals -- always expose an ARGB32 and RGB24 visual
*/ */
@ -361,6 +382,9 @@ compScreenInit (ScreenPtr pScreen)
cs->CloseScreen = pScreen->CloseScreen; cs->CloseScreen = pScreen->CloseScreen;
pScreen->CloseScreen = compCloseScreen; pScreen->CloseScreen = compCloseScreen;
cs->GetImage = pScreen->GetImage;
pScreen->GetImage = compGetImage;
dixSetPrivate(&pScreen->devPrivates, CompScreenPrivateKey, cs); dixSetPrivate(&pScreen->devPrivates, CompScreenPrivateKey, cs);
RegisterRealChildHeadProc(CompositeRealChildHead); RegisterRealChildHeadProc(CompositeRealChildHead);

4
composite/compint.h
View File

@ -159,6 +159,7 @@ typedef struct _CompScreen {
Window overlayWid; Window overlayWid;
CompOverlayClientPtr pOverlayClients; CompOverlayClientPtr pOverlayClients;
GetImageProcPtr GetImage;
} CompScreenRec, *CompScreenPtr; } CompScreenRec, *CompScreenPtr;
extern DevPrivateKeyRec CompScreenPrivateKeyRec; extern DevPrivateKeyRec CompScreenPrivateKeyRec;
@ -315,6 +316,9 @@ compCopyWindow (WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc);
void void
compWindowUpdate (WindowPtr pWin); compWindowUpdate (WindowPtr pWin);
void
compScreenUpdate (ScreenPtr pScreen);
WindowPtr WindowPtr
CompositeRealChildHead (WindowPtr pWin); CompositeRealChildHead (WindowPtr pWin);