ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winex11.drv: Abstract accesses to the palette color mapping.

This commit is contained in:
Alexandre Julliard 2006-11-17 14:36:34 +01:00
parent 385ceeb8bc
commit 719b7068a9
1 changed files with 67 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,6 +109,41 @@ static BOOL X11DRV_PALETTE_CheckSysColor( const PALETTEENTRY *sys_pal_template,
static int X11DRV_PALETTE_LookupSystemXPixel(COLORREF col); static int X11DRV_PALETTE_LookupSystemXPixel(COLORREF col);
/***********************************************************************
* palette_get_mapping
*/
static int *palette_get_mapping( HPALETTE hpal )
{
int *mapping = NULL;
PALETTEOBJ *ptr;
if ((ptr = GDI_GetObjPtr( hpal, PALETTE_MAGIC )))
{
mapping = ptr->mapping;
GDI_ReleaseObj( hpal );
}
return mapping;
}
/***********************************************************************
* palette_set_mapping
*/
static int *palette_set_mapping( HPALETTE hpal, int *mapping )
{
int *old_mapping = NULL;
PALETTEOBJ *ptr;
if ((ptr = GDI_GetObjPtr( hpal, PALETTE_MAGIC )))
{
old_mapping = ptr->mapping;
ptr->mapping = mapping;
GDI_ReleaseObj( hpal );
}
return old_mapping;
}
/*********************************************************************** /***********************************************************************
* COLOR_Init * COLOR_Init
* *
@ -828,10 +863,8 @@ int X11DRV_PALETTE_ToPhysical( X11DRV_PDEVICE *physDev, COLORREF color )
WORD index = 0; WORD index = 0;
HPALETTE hPal = physDev ? GetCurrentObject(physDev->hdc, OBJ_PAL ) : GetStockObject(DEFAULT_PALETTE); HPALETTE hPal = physDev ? GetCurrentObject(physDev->hdc, OBJ_PAL ) : GetStockObject(DEFAULT_PALETTE);
unsigned char spec_type = color >> 24; unsigned char spec_type = color >> 24;
PALETTEOBJ* palPtr = (PALETTEOBJ *) GDI_GetObjPtr( hPal, PALETTE_MAGIC ); int *mapping = palette_get_mapping( hPal );
PALETTEENTRY entry;
/* palPtr can be NULL when DC is being destroyed */
if( !palPtr ) return 0;
if ( X11DRV_PALETTE_PaletteFlags & X11DRV_PALETTE_FIXED ) if ( X11DRV_PALETTE_PaletteFlags & X11DRV_PALETTE_FIXED )
{ {
@ -848,31 +881,20 @@ int X11DRV_PALETTE_ToPhysical( X11DRV_PDEVICE *physDev, COLORREF color )
case 0x10: /* DIBINDEX */ case 0x10: /* DIBINDEX */
if( GetDIBColorTable( physDev->hdc, idx, 1, &quad ) != 1 ) { if( GetDIBColorTable( physDev->hdc, idx, 1, &quad ) != 1 ) {
WARN("DIBINDEX(%x) : idx %d is out of bounds, assuming black\n", color , idx); WARN("DIBINDEX(%x) : idx %d is out of bounds, assuming black\n", color , idx);
GDI_ReleaseObj( hPal );
return 0; return 0;
} }
color = RGB( quad.rgbRed, quad.rgbGreen, quad.rgbBlue ); color = RGB( quad.rgbRed, quad.rgbGreen, quad.rgbBlue );
break; break;
case 1: /* PALETTEINDEX */ case 1: /* PALETTEINDEX */
{
PALETTEENTRY entry;
if (!GetPaletteEntries( hPal, idx, 1, &entry )) if (!GetPaletteEntries( hPal, idx, 1, &entry ))
{ {
WARN("PALETTEINDEX(%x) : idx %d is out of bounds, assuming black\n", color, idx); WARN("PALETTEINDEX(%x) : idx %d is out of bounds, assuming black\n", color, idx);
GDI_ReleaseObj( hPal );
return 0; return 0;
} }
if (mapping) return mapping[idx];
if( palPtr->mapping )
{
int ret = palPtr->mapping[idx];
GDI_ReleaseObj( hPal );
return ret;
}
color = RGB( entry.peRed, entry.peGreen, entry.peBlue ); color = RGB( entry.peRed, entry.peGreen, entry.peBlue );
break; break;
}
default: default:
color &= 0xffffff; color &= 0xffffff;
@ -884,7 +906,6 @@ int X11DRV_PALETTE_ToPhysical( X11DRV_PDEVICE *physDev, COLORREF color )
int white = 1; int white = 1;
RGBQUAD table[2]; RGBQUAD table[2];
GDI_ReleaseObj( hPal );
if (GetDIBColorTable( physDev->hdc, 0, 2, table ) == 2) if (GetDIBColorTable( physDev->hdc, 0, 2, table ) == 2)
{ {
if(!colour_is_brighter(table[1], table[0])) white = 0; if(!colour_is_brighter(table[1], table[0])) white = 0;
@ -900,7 +921,6 @@ int X11DRV_PALETTE_ToPhysical( X11DRV_PDEVICE *physDev, COLORREF color )
if (X11DRV_PALETTE_Graymax) if (X11DRV_PALETTE_Graymax)
{ {
/* grayscale only; return scaled value */ /* grayscale only; return scaled value */
GDI_ReleaseObj( hPal );
return ( (red * 30 + green * 59 + blue * 11) * X11DRV_PALETTE_Graymax) / 25500; return ( (red * 30 + green * 59 + blue * 11) * X11DRV_PALETTE_Graymax) / 25500;
} }
else else
@ -922,14 +942,12 @@ int X11DRV_PALETTE_ToPhysical( X11DRV_PDEVICE *physDev, COLORREF color )
blue = blue << (X11DRV_PALETTE_PBlue.scale-8) | blue = blue << (X11DRV_PALETTE_PBlue.scale-8) |
blue >> (16-X11DRV_PALETTE_PBlue.scale); blue >> (16-X11DRV_PALETTE_PBlue.scale);
GDI_ReleaseObj( hPal );
return (red << X11DRV_PALETTE_PRed.shift) | (green << X11DRV_PALETTE_PGreen.shift) | (blue << X11DRV_PALETTE_PBlue.shift); return (red << X11DRV_PALETTE_PRed.shift) | (green << X11DRV_PALETTE_PGreen.shift) | (blue << X11DRV_PALETTE_PBlue.shift);
} }
} }
else else
{ {
if (!mapping)
if( !palPtr->mapping )
WARN("Palette %p is not realized\n", hPal); WARN("Palette %p is not realized\n", hPal);
switch(spec_type) /* we have to peruse DC and system palette */ switch(spec_type) /* we have to peruse DC and system palette */
@ -944,7 +962,6 @@ int X11DRV_PALETTE_ToPhysical( X11DRV_PDEVICE *physDev, COLORREF color )
int white = 1; int white = 1;
RGBQUAD table[2]; RGBQUAD table[2];
GDI_ReleaseObj( hPal );
if (GetDIBColorTable( physDev->hdc, 0, 2, table ) == 2) if (GetDIBColorTable( physDev->hdc, 0, 2, table ) == 2)
{ {
if(!colour_is_brighter(table[1], table[0])) if(!colour_is_brighter(table[1], table[0]))
@ -962,24 +979,21 @@ int X11DRV_PALETTE_ToPhysical( X11DRV_PDEVICE *physDev, COLORREF color )
break; break;
case 1: /* PALETTEINDEX */ case 1: /* PALETTEINDEX */
index = color & 0xffff; index = color & 0xffff;
if (!GetPaletteEntries( hPal, index, 1, &entry ))
if( index >= palPtr->logpalette.palNumEntries )
WARN("PALETTEINDEX(%x) : index %i is out of bounds\n", color, index); WARN("PALETTEINDEX(%x) : index %i is out of bounds\n", color, index);
else if( palPtr->mapping ) index = palPtr->mapping[index]; else if (mapping) index = mapping[index];
/* TRACE(palette,"PALETTEINDEX(%04x) -> pixel %i\n", (WORD)color, index); /* TRACE(palette,"PALETTEINDEX(%04x) -> pixel %i\n", (WORD)color, index);
*/ */
break; break;
case 2: /* PALETTERGB */ case 2: /* PALETTERGB */
index = GetNearestPaletteIndex( hPal, color ); index = GetNearestPaletteIndex( hPal, color );
if (palPtr->mapping) index = palPtr->mapping[index]; if (mapping) index = mapping[index];
/* TRACE(palette,"PALETTERGB(%lx) -> pixel %i\n", color, index); /* TRACE(palette,"PALETTERGB(%lx) -> pixel %i\n", color, index);
*/ */
break; break;
} }
} }
GDI_ReleaseObj( hPal );
return index; return index;
} }
@ -1066,31 +1080,30 @@ static int X11DRV_LookupSysPaletteExact( BYTE r, BYTE g, BYTE b )
/*********************************************************************** /***********************************************************************
* X11DRV_PALETTE_SetMapping * RealizePalette (X11DRV.@)
*
* Set the color-mapping table for selected palette.
* Return number of entries which mapping has changed.
*/ */
static UINT X11DRV_PALETTE_SetMapping( HPALETTE hpal, PALETTEOBJ* palPtr, BOOL mapOnly ) UINT X11DRV_RealizePalette( X11DRV_PDEVICE *physDev, HPALETTE hpal, BOOL primary )
{ {
char flag; char flag;
int prevMapping = (palPtr->mapping) ? 1 : 0;
int index; int index;
UINT i, iRemapped = 0; UINT i, iRemapped = 0;
int* mapping; int *prev_mapping, *mapping;
PALETTEENTRY entries[256]; PALETTEENTRY entries[256];
WORD num_entries; WORD num_entries;
if (X11DRV_PALETTE_PaletteFlags & X11DRV_PALETTE_VIRTUAL) return 0;
if (!GetObjectW( hpal, sizeof(num_entries), &num_entries )) return 0; if (!GetObjectW( hpal, sizeof(num_entries), &num_entries )) return 0;
/* reset dynamic system palette entries */ /* reset dynamic system palette entries */
if( !mapOnly && X11DRV_PALETTE_firstFree != -1) if( primary && X11DRV_PALETTE_firstFree != -1)
X11DRV_PALETTE_FormatSystemPalette(); X11DRV_PALETTE_FormatSystemPalette();
/* initialize palette mapping table */ /* initialize palette mapping table */
if (palPtr->mapping) prev_mapping = palette_get_mapping( hpal );
mapping = HeapReAlloc( GetProcessHeap(), 0, palPtr->mapping, sizeof(int)*num_entries); if (prev_mapping)
mapping = HeapReAlloc( GetProcessHeap(), 0, prev_mapping, sizeof(int)*num_entries);
else else
mapping = HeapAlloc( GetProcessHeap(), 0, sizeof(int)*num_entries); mapping = HeapAlloc( GetProcessHeap(), 0, sizeof(int)*num_entries);
@ -1098,7 +1111,7 @@ static UINT X11DRV_PALETTE_SetMapping( HPALETTE hpal, PALETTEOBJ* palPtr, BOOL m
ERR("Unable to allocate new mapping -- memory exhausted!\n"); ERR("Unable to allocate new mapping -- memory exhausted!\n");
return 0; return 0;
} }
palPtr->mapping = mapping; palette_set_mapping( hpal, mapping );
if (num_entries > 256) if (num_entries > 256)
{ {
@ -1173,8 +1186,8 @@ static UINT X11DRV_PALETTE_SetMapping( HPALETTE hpal, PALETTEOBJ* palPtr, BOOL m
if( X11DRV_PALETTE_PaletteToXPixel ) index = X11DRV_PALETTE_PaletteToXPixel[index]; if( X11DRV_PALETTE_PaletteToXPixel ) index = X11DRV_PALETTE_PaletteToXPixel[index];
} }
if( !prevMapping || palPtr->mapping[i] != index ) iRemapped++; if( !prev_mapping || mapping[i] != index ) iRemapped++;
palPtr->mapping[i] = index; mapping[i] = index;
TRACE("entry %i (%x) -> pixel %i\n", i, *(COLORREF*)&entries[i], index); TRACE("entry %i (%x) -> pixel %i\n", i, *(COLORREF*)&entries[i], index);
@ -1246,23 +1259,6 @@ COLORREF X11DRV_GetNearestColor( X11DRV_PDEVICE *physDev, COLORREF color )
} }
/***********************************************************************
* RealizePalette (X11DRV.@)
*/
UINT X11DRV_RealizePalette( X11DRV_PDEVICE *physDev, HPALETTE hpal, BOOL primary )
{
UINT ret;
PALETTEOBJ *palPtr;
if (X11DRV_PALETTE_PaletteFlags & X11DRV_PALETTE_VIRTUAL) return 0;
if (!(palPtr = GDI_GetObjPtr( hpal, PALETTE_MAGIC ))) return 0;
ret = X11DRV_PALETTE_SetMapping( hpal, palPtr, !primary );
GDI_ReleaseObj( hpal );
return ret;
}
/*********************************************************************** /***********************************************************************
* RealizeDefaultPalette (X11DRV.@) * RealizeDefaultPalette (X11DRV.@)
*/ */
@ -1272,27 +1268,22 @@ UINT X11DRV_RealizeDefaultPalette( X11DRV_PDEVICE *physDev )
if (palette_size && GetObjectType(physDev->hdc) != OBJ_MEMDC) if (palette_size && GetObjectType(physDev->hdc) != OBJ_MEMDC)
{ {
PALETTEOBJ* palPtr = GDI_GetObjPtr( GetStockObject(DEFAULT_PALETTE), PALETTE_MAGIC ); /* lookup is needed to account for SetSystemPaletteUse() stuff */
if (palPtr) int i, index, *mapping = palette_get_mapping( GetStockObject(DEFAULT_PALETTE) );
{ PALETTEENTRY entries[NB_RESERVED_COLORS];
/* lookup is needed to account for SetSystemPaletteUse() stuff */
int i, index;
PALETTEENTRY entries[NB_RESERVED_COLORS];
GetPaletteEntries( GetStockObject(DEFAULT_PALETTE), 0, NB_RESERVED_COLORS, entries ); GetPaletteEntries( GetStockObject(DEFAULT_PALETTE), 0, NB_RESERVED_COLORS, entries );
for( i = 0; i < NB_RESERVED_COLORS; i++ ) for( i = 0; i < NB_RESERVED_COLORS; i++ )
{
index = X11DRV_PALETTE_LookupSystemXPixel( RGB(entries[i].peRed,
entries[i].peGreen,
entries[i].peBlue) );
/* mapping is allocated in COLOR_InitPalette() */
if( index != mapping[i] )
{ {
index = X11DRV_PALETTE_LookupSystemXPixel( RGB(entries[i].peRed, mapping[i]=index;
entries[i].peGreen, ret++;
entries[i].peBlue) );
/* mapping is allocated in COLOR_InitPalette() */
if( index != palPtr->mapping[i] )
{
palPtr->mapping[i]=index;
ret++;
}
} }
GDI_ReleaseObj( GetStockObject(DEFAULT_PALETTE) );
} }
} }
return ret; return ret;