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

mi: Fix up alpha channel if needed in miPaintWindow 

See also the previous commit log.

Fixes the issues with xterm & xcalc described in the GitLab issue below.

Issue: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1564
This commit is contained in:
Michel Dänzer 2023-07-19 10:43:56 +02:00 committed by Michel Dänzer
parent 3e044b1e64
commit 2de50de563
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mi/miexpose.c
View File

@ -405,6 +405,9 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
BoxPtr pbox;
xRectangle *prect;
int numRects, regionnumrects;
#ifdef COMPOSITE
WindowPtr orig_pWin = pWin;
#endif
/*
* Distance from screen to destination drawable, use this
@ -488,6 +491,27 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
gcval[1].val =
fill.pixel | RootlessAlphaMask(pWin->drawable.bitsPerPixel);
#else
#ifdef COMPOSITE
/* Make sure alpha will sample as 1.0 for opaque windows */
if (drawable->depth == 32) {
int effective_depth = orig_pWin->drawable.depth;
if (effective_depth == 32) {
orig_pWin = orig_pWin->parent;
while (orig_pWin && orig_pWin->parent) {
if (orig_pWin->drawable.depth == 24) {
effective_depth = 24;
break;
}
orig_pWin = orig_pWin->parent;
}
}
if (effective_depth == 24)
fill.pixel |= 0xff000000;
}
#endif
gcval[1].val = fill.pixel;
#endif
gcval[2].val = FillSolid;