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

fb: cleanup fbChangeWindowAttributes 

This cleans up the duplication in fbChangeWindowAttributes,
and fixes a bug if the fb24_32ReformatTile ever failed,
since the old code would happily dereference it in the fbEvenTile
call a few lines later.

Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
This commit is contained in:
Dave Airlie 2011-03-31 15:33:46 +10:00
parent 36c7158133
commit f9834d312e
1 changed files with 20 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
fb/fbwindow.c
View File

@ -146,51 +146,36 @@ fbCopyWindow(WindowPtr pWin,
fbValidateDrawable (&pWin->drawable); fbValidateDrawable (&pWin->drawable);
} }
Bool static void
fbChangeWindowAttributes(WindowPtr pWin, unsigned long mask) fbFixupWindowPixmap(DrawablePtr pDrawable, PixmapPtr *ppPixmap)
{ {
PixmapPtr pPixmap; PixmapPtr pPixmap = *ppPixmap;
if (mask & CWBackPixmap) if (pPixmap->drawable.bitsPerPixel != pDrawable->bitsPerPixel)
{ {
if (pWin->backgroundState == BackgroundPixmap) pPixmap = fb24_32ReformatTile (pPixmap, pDrawable->bitsPerPixel);
{ if (!pPixmap)
pPixmap = pWin->background.pixmap; return;
if (pPixmap->drawable.bitsPerPixel != pWin->drawable.bitsPerPixel) (*pDrawable->pScreen->DestroyPixmap) (*ppPixmap);
{ *ppPixmap = pPixmap;
pPixmap = fb24_32ReformatTile (pPixmap,
pWin->drawable.bitsPerPixel);
if (pPixmap)
{
(*pWin->drawable.pScreen->DestroyPixmap) (pWin->background.pixmap);
pWin->background.pixmap = pPixmap;
}
} }
if (FbEvenTile (pPixmap->drawable.width * if (FbEvenTile (pPixmap->drawable.width *
pPixmap->drawable.bitsPerPixel)) pPixmap->drawable.bitsPerPixel))
fbPadPixmap (pPixmap); fbPadPixmap (pPixmap);
} }
Bool
fbChangeWindowAttributes(WindowPtr pWin, unsigned long mask)
{
if (mask & CWBackPixmap)
{
if (pWin->backgroundState == BackgroundPixmap)
fbFixupWindowPixmap(&pWin->drawable, &pWin->background.pixmap);
} }
if (mask & CWBorderPixmap) if (mask & CWBorderPixmap)
{ {
if (pWin->borderIsPixel == FALSE) if (pWin->borderIsPixel == FALSE)
{ fbFixupWindowPixmap(&pWin->drawable, &pWin->border.pixmap);
pPixmap = pWin->border.pixmap;
if (pPixmap->drawable.bitsPerPixel !=
pWin->drawable.bitsPerPixel)
{
pPixmap = fb24_32ReformatTile (pPixmap,
pWin->drawable.bitsPerPixel);
if (pPixmap)
{
(*pWin->drawable.pScreen->DestroyPixmap) (pWin->border.pixmap);
pWin->border.pixmap = pPixmap;
}
}
if (FbEvenTile (pPixmap->drawable.width *
pPixmap->drawable.bitsPerPixel))
fbPadPixmap (pPixmap);
}
} }
return TRUE; return TRUE;
} }