diff options
| author | Keith Packard <keithp@keithp.com> | 2004-08-13 08:16:14 +0000 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2004-08-13 08:16:14 +0000 |
| commit | a29bfbd3d0a5d39ccee5b83ac1ba632091b031bb (patch) | |
| tree | b087d11fa09d5f36f7a3b34e6333bfa8b0e6d50c /fb | |
| parent | 24bed5cff908a6f8b1857e3dadac22d6db54c69e (diff) | |
Empty damage object when freeing pixmap.
Wrap InstallColormap so that the DDX doesn't see colormaps from our ARGB
visual (avoids lovely green tint to screen). Also, set visual->nplanes
of ARGB visual to all used (including alpha) planes so DIX can set
pixel values correctly.
Translate automatic update regions correctly to account for borders
When nplanes == 32 (ARGB visuals), mask in all ones for alpha values to
allocated pixel values.
Remove redundant fbAddTraps declaration
Fix fbCopyWindow to work on non-screen pixmaps (not needed yet)
Replace broken clipping code with that from modular tree.
Respect subWindowMode.
Diffstat (limited to 'fb')
| -rw-r--r-- | fb/fbpict.h | 9 | ||||
| -rw-r--r-- | fb/fbwindow.c | 10 |
2 files changed, 5 insertions, 14 deletions
diff --git a/fb/fbpict.h b/fb/fbpict.h index 4b09bc881..82f722c41 100644 --- a/fb/fbpict.h +++ b/fb/fbpict.h @@ -201,15 +201,6 @@ typedef struct _FbAccessMap { */ extern FbAccessMap fbAccessMap[]; -/* fbaddtrap.c */ - -void -fbAddTraps (PicturePtr pPicture, - INT16 xOff, - INT16 yOff, - int ntrap, - xTrap *traps); - /* fbcompose.c */ typedef struct _fbCompSrc { diff --git a/fb/fbwindow.c b/fb/fbwindow.c index 1666dfe16..afc7e510a 100644 --- a/fb/fbwindow.c +++ b/fb/fbwindow.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/fb/fbwindow.c,v 1.2 2004/04/23 19:05:14 eich Exp $ */ +/* $XdotOrg: xc/programs/Xserver/fb/fbwindow.c,v 1.3 2004/08/11 22:40:14 keithp Exp $ */ /* * Id: fbwindow.c,v 1.1 1999/11/02 03:54:45 keithp Exp $ * @@ -122,13 +122,13 @@ fbCopyWindow(WindowPtr pWin, { RegionRec rgnDst; int dx, dy; - WindowPtr pwinRoot; #ifdef COMPOSITE PixmapPtr pPixmap = fbGetWindowPixmap (pWin); + DrawablePtr pDrawable = &pPixmap->drawable; +#else + DrawablePtr pDrawable = &WindowTable[pWin->drawable.pScreen->myNum]->drawable; #endif - pwinRoot = WindowTable[pWin->drawable.pScreen->myNum]; - dx = ptOldOrg.x - pWin->drawable.x; dy = ptOldOrg.y - pWin->drawable.y; REGION_TRANSLATE(pWin->drawable.pScreen, prgnSrc, -dx, -dy); @@ -143,7 +143,7 @@ fbCopyWindow(WindowPtr pWin, -pPixmap->screen_x, -pPixmap->screen_y); #endif - fbCopyRegion ((DrawablePtr)pwinRoot, (DrawablePtr)pwinRoot, + fbCopyRegion (pDrawable, pDrawable, 0, &rgnDst, dx, dy, fbCopyWindowProc, 0, 0); |