reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2025-02-12 07:32:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

winex11: Introduce a new function for looking up the physical color of a pixel for use with colormap generation-like functions.

Browse Source 
This prepares to a rewrite of X11DRV_PALETTE_ToPhysical which requires
the physDev for retrieving the color shifts.
This commit is contained in:
Roderick Colenbrander 2009-09-01 20:10:32 +02:00 committed by Alexandre Julliard
parent a9221d7688
commit 3878b4810e
3 changed files with 68 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/winex11.drv/dib.c
View File

@ -371,7 +371,7 @@ static int *X11DRV_DIB_GenColorMap( X11DRV_PDEVICE *physDev, int *colorMapping,
}
else
for (i = start; i < end; i++, rgb++)
colorMapping[i] = X11DRV_PALETTE_ToPhysical( NULL, RGB(rgb->rgbRed,
colorMapping[i] = X11DRV_PALETTE_LookupPixel(RGB(rgb->rgbRed,
rgb->rgbGreen,
rgb->rgbBlue));
}
@ -395,7 +395,7 @@ static int *X11DRV_DIB_GenColorMap( X11DRV_PDEVICE *physDev, int *colorMapping,
}
else
for (i = start; i < end; i++, rgb++)
colorMapping[i] = X11DRV_PALETTE_ToPhysical( NULL, RGB(rgb->rgbtRed,
colorMapping[i] = X11DRV_PALETTE_LookupPixel(RGB(rgb->rgbtRed,
rgb->rgbtGreen,
rgb->rgbtBlue));
}

67
dlls/winex11.drv/palette.c
View File

@ -1015,6 +1015,70 @@ int X11DRV_PALETTE_ToPhysical( X11DRV_PDEVICE *physDev, COLORREF color )
return index;
}
/***********************************************************************
* X11DRV_PALETTE_LookupPixel
*/
int X11DRV_PALETTE_LookupPixel(COLORREF color )
{
unsigned char spec_type = color >> 24;
/* Only accept RGB which has spec_type = 0 */
if(spec_type)
return 0;
color &= 0xffffff;
if ( X11DRV_PALETTE_PaletteFlags & X11DRV_PALETTE_FIXED )
{
unsigned long red, green, blue;
red = GetRValue(color); green = GetGValue(color); blue = GetBValue(color);
if (X11DRV_PALETTE_Graymax)
{
/* grayscale only; return scaled value */
return ( (red * 30 + green * 59 + blue * 11) * X11DRV_PALETTE_Graymax) / 25500;
}
else
{
/* scale each individually and construct the TrueColor pixel value */
if (X11DRV_PALETTE_PRed.scale < 8)
red = red >> (8-X11DRV_PALETTE_PRed.scale);
else if (X11DRV_PALETTE_PRed.scale > 8)
red = red << (X11DRV_PALETTE_PRed.scale-8) |
red >> (16-X11DRV_PALETTE_PRed.scale);
if (X11DRV_PALETTE_PGreen.scale < 8)
green = green >> (8-X11DRV_PALETTE_PGreen.scale);
else if (X11DRV_PALETTE_PGreen.scale > 8)
green = green << (X11DRV_PALETTE_PGreen.scale-8) |
green >> (16-X11DRV_PALETTE_PGreen.scale);
if (X11DRV_PALETTE_PBlue.scale < 8)
blue = blue >> (8-X11DRV_PALETTE_PBlue.scale);
else if (X11DRV_PALETTE_PBlue.scale > 8)
blue = blue << (X11DRV_PALETTE_PBlue.scale-8) |
blue >> (16-X11DRV_PALETTE_PBlue.scale);
return (red << X11DRV_PALETTE_PRed.shift) | (green << X11DRV_PALETTE_PGreen.shift) | (blue << X11DRV_PALETTE_PBlue.shift);
}
}
else
{
WORD index;
HPALETTE hPal = GetStockObject(DEFAULT_PALETTE);
int *mapping = palette_get_mapping( hPal );
if (!mapping)
WARN("Palette %p is not realized\n", hPal);
EnterCriticalSection( &palette_cs );
index = X11DRV_SysPaletteLookupPixel( color, FALSE);
if (X11DRV_PALETTE_PaletteToXPixel)
index = X11DRV_PALETTE_PaletteToXPixel[index];
LeaveCriticalSection( &palette_cs );
return index;
}
}
/***********************************************************************
* X11DRV_PALETTE_LookupSystemXPixel
*/
@ -1192,8 +1256,7 @@ UINT X11DRV_RealizePalette( X11DRV_PDEVICE *physDev, HPALETTE hpal, BOOL primary
}
else if ( X11DRV_PALETTE_PaletteFlags & X11DRV_PALETTE_VIRTUAL )
{
index = X11DRV_PALETTE_ToPhysical( NULL,
RGB( entries[i].peRed, entries[i].peGreen, entries[i].peBlue ));
index = X11DRV_PALETTE_LookupPixel( RGB( entries[i].peRed, entries[i].peGreen, entries[i].peBlue ));
}
/* we have to map to existing entry in the system palette */

1
dlls/winex11.drv/x11drv.h
View File

@ -477,6 +477,7 @@ extern BOOL X11DRV_IsSolidColor(COLORREF color);
extern COLORREF X11DRV_PALETTE_ToLogical(int pixel);
extern int X11DRV_PALETTE_ToPhysical(X11DRV_PDEVICE *physDev, COLORREF color);
extern int X11DRV_PALETTE_LookupPixel(COLORREF color);
extern unsigned int depth_to_bpp( unsigned int depth );