diff options
| author | Keith Packard <keithp@keithp.com> | 2004-08-15 21:13:11 +0000 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2004-08-15 21:13:11 +0000 |
| commit | 9da0c214ab5f4ee9c1610b4888f5c7c0dd2bcacc (patch) | |
| tree | 9c59f6aaab49c42e28ec871f0aed16b279abd506 /composite | |
| parent | a68f350195c1c54034f98e2b78c2c3da70044884 (diff) | |
Clip destination instead of source. Should be the same, but it looks nicer
to me.
Clean up transition between cheap and expensive GC wrappers by using the
prologue and epilogue macros. Before, the GC would be left unvalidated
sometimes which would cause all kinds of entertaining bugs against a
DDX which cares (XAA).
Diffstat (limited to 'composite')
| -rw-r--r-- | composite/compwindow.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/composite/compwindow.c b/composite/compwindow.c index f8945bdc4..c7ea98c13 100644 --- a/composite/compwindow.c +++ b/composite/compwindow.c @@ -702,15 +702,15 @@ compWindowUpdateAutomatic (WindowPtr pWin) REGION_INTERSECT (pScreen, pRegion, pRegion, &cw->borderClip); /* - * Now translate from screen to pixmap coordinates + * Now translate from screen to dest coordinates */ REGION_TRANSLATE (pScreen, pRegion, - -pSrcPixmap->screen_x, -pSrcPixmap->screen_y); + -pParent->drawable.x, -pParent->drawable.y); /* * Clip the picture */ - SetPictureClipRegion (pSrcPicture, 0, 0, pRegion); + SetPictureClipRegion (pDstPicture, 0, 0, pRegion); /* * And paint @@ -719,9 +719,8 @@ compWindowUpdateAutomatic (WindowPtr pWin) pSrcPicture, 0, pDstPicture, - 0, - 0, - 0, 0, + 0, 0, /* src_x, src_y */ + 0, 0, /* msk_x, msk_y */ pSrcPixmap->screen_x - pParent->drawable.x, pSrcPixmap->screen_y - pParent->drawable.y, pSrcPixmap->drawable.width, |