diff options
| author | Egbert Eich <eich@suse.de> | 2004-12-06 15:53:00 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-12-06 15:53:00 +0000 |
| commit | 9c94971617db11861aed82e16804fc14a9ca1260 (patch) | |
| tree | 619aed47e6046396e98a0919406a2f760b2bc5a2 /fb | |
| parent | 4945034792b28d1a222a615404bfceaf48a130c5 (diff) | |
Use the same method of finding the screen pixmap of COMPOSITE extension is
compiled in or not.
Removed stale make variable.
Updated xaaWrapper.c: Under certain circumstances the accel path was not
used when possible. Removed some debugging stuff and stale code that
had been commented out.
Check if maps are really installed before attempting to list them.
Diffstat (limited to 'fb')
| -rw-r--r-- | fb/fbwindow.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/fb/fbwindow.c b/fb/fbwindow.c index 67cfb41d4..d51c3676d 100644 --- a/fb/fbwindow.c +++ b/fb/fbwindow.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/fb/fbwindow.c,v 1.4 2004/08/13 08:16:14 keithp Exp $ */ +/* $XdotOrg: xc/programs/Xserver/fb/fbwindow.c,v 1.5 2004/12/04 00:42:50 kuhn Exp $ */ /* * Id: fbwindow.c,v 1.1 1999/11/02 03:54:45 keithp Exp $ * @@ -122,12 +122,9 @@ fbCopyWindow(WindowPtr pWin, { RegionRec rgnDst; int dx, dy; -#ifdef COMPOSITE + PixmapPtr pPixmap = fbGetWindowPixmap (pWin); DrawablePtr pDrawable = &pPixmap->drawable; -#else - DrawablePtr pDrawable = &WindowTable[pWin->drawable.pScreen->myNum]->drawable; -#endif dx = ptOldOrg.x - pWin->drawable.x; dy = ptOldOrg.y - pWin->drawable.y; |