From a14a7a0ccc9de76aeab0b2e4bbf58f1a79deedc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 3 Jul 2024 10:19:30 +0200 Subject: New upstream version 5.3.0GA --- app/wlib/mswlib/mswbitmap.c | 240 +++++++++++++++++++++++--------------------- 1 file changed, 125 insertions(+), 115 deletions(-) (limited to 'app/wlib/mswlib/mswbitmap.c') diff --git a/app/wlib/mswlib/mswbitmap.c b/app/wlib/mswlib/mswbitmap.c index d4ee83c..9069c35 100644 --- a/app/wlib/mswlib/mswbitmap.c +++ b/app/wlib/mswlib/mswbitmap.c @@ -18,12 +18,11 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include #include -#include #include #include #include @@ -33,24 +32,24 @@ #include "i18n.h" #if _MSC_VER > 1300 - #define stricmp _stricmp - #define strnicmp _strnicmp - #define strdup _strdup +#define stricmp _stricmp +#define strnicmp _strnicmp +#define strdup _strdup #endif struct wBitmap_t { - WOBJ_COMMON - }; + WOBJ_COMMON +}; HPALETTE hOldPal; HBITMAP mswCreateBitMap( - COLORREF fgCol1, - COLORREF fgCol2, - COLORREF bgCol, - int w, - int h, - const char * bits ) + COLORREF fgCol1, + COLORREF fgCol2, + COLORREF bgCol, + int w, + int h, + const char * bits ) { HDC hDc; HDC hButtDc; @@ -69,7 +68,7 @@ HBITMAP mswCreateBitMap( if (mswPalette) { hOldPal = SelectPalette( hButtDc, mswPalette, 0 ); } - + /*PatBlt( hButtDc, 0, 0, w, h, WHITENESS );*/ newBrush = CreateSolidBrush( bgCol ); oldBrush = SelectObject( hButtDc, newBrush ); @@ -84,8 +83,9 @@ HBITMAP mswCreateBitMap( for ( j = 0; j < h; j++ ) { byt = (0xFF & *byts_p++) | 0x100; for ( i = 0; i < w; i++ ) { - if (byt == 1) + if (byt == 1) { byt = (0xFF & *byts_p++) | 0x100; + } if ( byt & 0x1 ) { SetPixel( hButtDc, i, j, fgCol1 ); SetPixel( hButtDc, i+1, j+1, fgCol2 ); @@ -104,7 +104,7 @@ static dynArr_t bitmap_da; #define bitmap(N) DYNARR_N(HBITMAP,bitmap_da,N) void mswRegisterBitMap( - HBITMAP hBm ) + HBITMAP hBm ) { DYNARR_APPEND( HBITMAP, bitmap_da, 10 ); bitmap(bitmap_da.cnt-1) = hBm; @@ -113,14 +113,15 @@ void mswRegisterBitMap( void deleteBitmaps( void ) { int inx; - for ( inx=0; inxcolorcnt - 1) * sizeof( RGBQUAD )); - if( !bmiInfo ) { - fprintf( stderr, "could not allocate memory for bmiInfo\n" ); - abort(); - } - - /* initialize bitmap header from XPM information */ - bmiInfo->bmiHeader.biSize = sizeof( bmiInfo->bmiHeader ); - bmiInfo->bmiHeader.biWidth = bm->w; - bmiInfo->bmiHeader.biHeight = bm->h; - bmiInfo->bmiHeader.biPlanes = 1; - if( bm->type == mswIcon_bitmap ) - bmiInfo->bmiHeader.biBitCount = 1; - else - bmiInfo->bmiHeader.biBitCount = 8; /* up to 256 colors */ - bmiInfo->bmiHeader.biCompression = BI_RGB; /* no compression */ - bmiInfo->bmiHeader.biSizeImage = 0; - bmiInfo->bmiHeader.biXPelsPerMeter = 0; - bmiInfo->bmiHeader.biYPelsPerMeter = 0; - bmiInfo->bmiHeader.biClrUsed = bm->colorcnt; /* number of colors used */ - bmiInfo->bmiHeader.biClrImportant = bm->colorcnt; + bmiInfo = malloc( sizeof( BITMAPINFO ) + (bm->colorcnt - 1) * sizeof( + RGBQUAD )); + if( !bmiInfo ) { + fprintf( stderr, "could not allocate memory for bmiInfo\n" ); + abort(); + } + + /* initialize bitmap header from XPM information */ + bmiInfo->bmiHeader.biSize = sizeof( bmiInfo->bmiHeader ); + bmiInfo->bmiHeader.biWidth = bm->w; + bmiInfo->bmiHeader.biHeight = bm->h; + bmiInfo->bmiHeader.biPlanes = 1; + if( bm->type == mswIcon_bitmap ) { + bmiInfo->bmiHeader.biBitCount = 1; + } else { + bmiInfo->bmiHeader.biBitCount = 8; /* up to 256 colors */ + } + bmiInfo->bmiHeader.biCompression = BI_RGB; /* no compression */ + bmiInfo->bmiHeader.biSizeImage = 0; + bmiInfo->bmiHeader.biXPelsPerMeter = 0; + bmiInfo->bmiHeader.biYPelsPerMeter = 0; + bmiInfo->bmiHeader.biClrUsed = bm->colorcnt; /* number of colors used */ + bmiInfo->bmiHeader.biClrImportant = bm->colorcnt; /* * create a transparency mask and paint to screen - */ + */ if( bm->type == mswIcon_bitmap ) { memset( &bmiInfo->bmiColors[ 0 ], 0xFF, sizeof( RGBQUAD )); memset( &bmiInfo->bmiColors[ 1 ], 0, sizeof( RGBQUAD )); @@ -180,69 +183,71 @@ void mswDrawIcon( } StretchDIBits(hDc, offw, offh, - (int)ceil(bmiInfo->bmiHeader.biWidth*scaleIcon), - (int)ceil(bmiInfo->bmiHeader.biHeight*scaleIcon), + bmiInfo->bmiHeader.biWidth, + bmiInfo->bmiHeader.biHeight, 0, 0, bmiInfo->bmiHeader.biWidth, bmiInfo->bmiHeader.biHeight, bm->pixels, bmiInfo, DIB_RGB_COLORS, SRCAND); - + /* now paint the bitmap with transparent set to black */ if( bm->type == mswIcon_bitmap ) { - if( disabled ) { + if( disabled ) { col = color2; } else { col = color1; } memset( &bmiInfo->bmiColors[ 0 ], 0, sizeof( RGBQUAD )); - bmiInfo->bmiColors[ 1 ].rgbRed = GetRValue( col ); - bmiInfo->bmiColors[ 1 ].rgbGreen = GetGValue( col ); - bmiInfo->bmiColors[ 1 ].rgbBlue = GetBValue( col ); - } else { + bmiInfo->bmiColors[ 1 ].rgbRed = GetRValue( col ); + bmiInfo->bmiColors[ 1 ].rgbGreen = GetGValue( col ); + bmiInfo->bmiColors[ 1 ].rgbBlue = GetBValue( col ); + } else { if( disabled ) { /* create a gray scale palette */ for( i = 0; i < bm->colorcnt; i ++ ) { if (i != bm->transparent) { byt = (30 * bm->colormap[i].rgbRed + - 59 * bm->colormap[i].rgbGreen + - 11 * bm->colormap[i].rgbBlue) / 100; + 59 * bm->colormap[i].rgbGreen + + 11 * bm->colormap[i].rgbBlue) / 100; /* if totally black, use a dark gray */ - if (byt == 0) + if (byt == 0) { byt = 0x66; + } bmiInfo->bmiColors[i].rgbRed = byt; bmiInfo->bmiColors[i].rgbGreen = byt; bmiInfo->bmiColors[i].rgbBlue = byt; } } - } else { - /* copy the palette */ - memcpy( (void *)bmiInfo->bmiColors, (void *)bm->colormap, bm->colorcnt * sizeof( RGBQUAD )); - } + } else { + /* copy the palette */ + memcpy( (void *)bmiInfo->bmiColors, (void *)bm->colormap, + bm->colorcnt * sizeof( RGBQUAD )); + } memset( &bmiInfo->bmiColors[ bm->transparent ], 0, sizeof( RGBQUAD )); - } - - /* show the bitmap */ - StretchDIBits(hDc, offw, offh, - (int)ceil(bmiInfo->bmiHeader.biWidth*scaleIcon), - (int)ceil(bmiInfo->bmiHeader.biHeight*scaleIcon), - 0, 0, - bmiInfo->bmiHeader.biWidth, - bmiInfo->bmiHeader.biHeight, - bm->pixels, bmiInfo, - DIB_RGB_COLORS, SRCPAINT); - - /* forget the data */ - free( bmiInfo ); + } + + /* show the bitmap */ + StretchDIBits(hDc, offw, offh, + bmiInfo->bmiHeader.biWidth, + bmiInfo->bmiHeader.biHeight, + 0, 0, + bmiInfo->bmiHeader.biWidth, + bmiInfo->bmiHeader.biHeight, + bm->pixels, bmiInfo, + DIB_RGB_COLORS, SRCPAINT); + + /* forget the data */ + free( bmiInfo ); } /** - * Create a two color bitmap. This creates a two color icon. Pixels set to 1 are painted + * Create a two color bitmap. This creates a two color icon. Pixels set to 1 are painted * in the specified color, pixels set to 0 are transparent - * in order to convert the format, a lot of bit fiddling is necessary. The order of - * scanlines needs to be reversed and the bit order (high order - low order) is reversed + * in order to convert the format, a lot of bit fiddling is necessary. The order of + * scanlines needs to be reversed and the bit order (high order - low order) is reversed * as well. * \param w IN width in pixels * \param h IN height in pixels @@ -251,12 +256,13 @@ void mswDrawIcon( * \return pointer to icon */ -wIcon_p wIconCreateBitMap( wWinPix_t w, wWinPix_t h, const char * bits, wDrawColor color ) +wIcon_p wIconCreateBitMap( wWinPix_t w, wWinPix_t h, const char * bits, + wDrawColor color ) { int lineLength; int i, j; unsigned char *dest; - static unsigned char revbits[] = { 0, 0x08, 0x04, 0x0C, 0x02, 0x0A, 0x06, 0x0E, 0x01, 0x09, 0x05, 0x0D, 0x03, 0x0B, 0x07, 0x0F }; + static unsigned char revbits[] = { 0, 0x08, 0x04, 0x0C, 0x02, 0x0A, 0x06, 0x0E, 0x01, 0x09, 0x05, 0x0D, 0x03, 0x0B, 0x07, 0x0F }; unsigned long col = wDrawGetRGB( color ); wIcon_p ip; @@ -278,13 +284,13 @@ wIcon_p wIconCreateBitMap( wWinPix_t w, wWinPix_t h, const char * bits, wDrawCol ip->colormap[ 1 ].rgbBlue = col & 0xFF; ip->colormap[ 1 ].rgbRed = (col>>16) & 0xFF; ip->colormap[ 1 ].rgbGreen = (col>>8) & 0xFF; - ip->colormap[ 1 ].rgbReserved = 0; + ip->colormap[ 1 ].rgbReserved = 0; color = GetSysColor( COLOR_BTNFACE ); ip->colormap[ 0 ].rgbBlue = GetBValue( color ); ip->colormap[ 0 ].rgbRed = GetRValue( color ); ip->colormap[ 0 ].rgbGreen = GetGValue( color ); - ip->colormap[ 0 ].rgbReserved = 0; + ip->colormap[ 0 ].rgbReserved = 0; lineLength = (((( ip->w + 7 ) / 8 ) + 3 ) >> 2 ) << 2; ip->pixels = malloc( lineLength * ip->h ); @@ -293,19 +299,19 @@ wIcon_p wIconCreateBitMap( wWinPix_t w, wWinPix_t h, const char * bits, wDrawCol abort(); } - /* + /* * copy the bits from source to the buffer, at this time the order of * scanlines is reversed by starting with the last source line. */ for( i = 0; i < ip->h; i++ ) { dest = ip->pixels + i * lineLength; - memcpy( dest, bits + ( ip->h - i - 1 ) * (( ip->w + 7) / 8), ( ip->w + 7 ) / 8 ); + memcpy( dest, bits + ( ip->h - i - 1 ) * (( ip->w + 7) / 8), + ( ip->w + 7 ) / 8 ); /* * and now, the bit order is changed, this is done via a lookup table */ - for( j = 0; j < lineLength; j++ ) - { + for( j = 0; j < lineLength; j++ ) { unsigned byte = dest[ j ]; unsigned low = byte & 0x0F; unsigned high = (byte & 0xF0) >> 4; @@ -323,7 +329,7 @@ wIcon_p wIconCreateBitMap( wWinPix_t w, wWinPix_t h, const char * bits, wDrawCol * transparency, other symbolic names are not supported. * * \param pm IN XPM variable - * \return pointer to icon, call free() if not needed anymore. + * \return pointer to icon, call free() if not needed anymore. */ wIcon_p wIconCreatePixMap( char *pm[]) @@ -355,9 +361,9 @@ wIcon_p wIconCreatePixMap( char *pm[]) height = (int)strtol(cq, &cq, 10 ); /* height of image */ col = (int)strtol(cq, &cq, 10 ); /* number of colors used */ numchars = (int)strtol(cq, &cq, 10 ); /* get number of chars per pixel */ - + ip->colormap = malloc( col * sizeof( RGBQUAD )); - ip->w = width; + ip->w = width; ip->h = height; ip->colorcnt = col; /* number of colors used */ @@ -368,19 +374,19 @@ wIcon_p wIconCreatePixMap( char *pm[]) if( numchars == 1 ) { keys[ col ] = (unsigned)ptr[0]; + } else if( numchars == 2 ) { + keys[ col ] = (unsigned) ( ptr[ 0 ] + ptr[ 1 ] * 256 ); } - else if( numchars == 2 ) { - keys[ col ] = (unsigned) ( ptr[ 0 ] + ptr[ 1 ] * 256 ); - } - + cp = strtok( ptr + numchars, "\t " ); /* cp points to color type */ assert( *cp == 'c' ); /* should always be color */ - - cp = strtok( NULL, "\t " ); /* go to next token, the color definition itself */ + + cp = strtok( NULL, + "\t " ); /* go to next token, the color definition itself */ if( *cp == '#' ) { /* is this a hex RGB specification? */ len = strlen( cp+1 ) / 3; - assert( len == 4 || len == 2 ); /* expecting three 2 char or 4 char values */ + assert( len == 4 || len == 2 ); /* expecting three 2 char or 4 char values */ buff[2] = 0; /* if yes, extract the values */ memcpy( buff, cp + 1, 2 ); r = (int)strtol(buff, &cq, 16); @@ -397,9 +403,9 @@ wIcon_p wIconCreatePixMap( char *pm[]) } else { if( !stricmp( cp, "none" )) { /* special case transparency*/ ip->transparent = col; + } else { + assert( *cp == '#' ); /* if no, abort for the moment */ } - else - assert( *cp == '#' ); /* if no, abort for the moment */ } free( ptr ); } @@ -413,32 +419,34 @@ wIcon_p wIconCreatePixMap( char *pm[]) abort(); } - /* + /* convert the XPM pixel data to indexes into color table - at the same time the order of rows is reversed + at the same time the order of rows is reversed Win32 should be able to do that but I couldn't find out - how, so this is coded by hand. + how, so this is coded by hand. */ /* for all rows */ for( i = 0; i < ip->h; i++ ) { - + cq = ip->pixels + lineLength * i; /* get the next row */ cp = pm[ ip->h - i + ip->colorcnt ]; /* for all pixels in row */ for( j = 0; j < ip->w; j++ ) { /* get the pixel info */ - if( numchars == 1 ) + if( numchars == 1 ) { pixel = ( unsigned )*cp; - else + } else { pixel = (unsigned) (*cp + *(cp+1)*256); + } cp += numchars; /* look up pixel info in color table */ k = 0; - while(k < col && pixel != keys[ k ] ) + while(k < col && pixel != keys[ k ] ) { k++; + } if (pixel == keys[k]) { /* save the index into color table */ *(cq + j) = k; @@ -446,9 +454,9 @@ wIcon_p wIconCreatePixMap( char *pm[]) *(cq + j) = 0; } } - } + } free( keys ); - + return ip; } @@ -468,7 +476,7 @@ void wIconSetColor( wIcon_p ip, wDrawColor color ) * * \param d IN drawing area * \param bm IN bitmap to draw - * \param x IN x position + * \param x IN x position * \param y IN y position */ @@ -489,20 +497,22 @@ wIconDraw( wDraw_p d, wIcon_p bm, wWinPix_t x, wWinPix_t y ) */ wControl_p -wBitmapCreate( wWin_p parent, wWinPix_t x, wWinPix_t y, long option, const struct wIcon_t * iconP ) +wBitmapCreate( wWin_p parent, wWinPix_t x, wWinPix_t y, long option, + const struct wIcon_t * iconP ) { wBitmap_p control; int index; DWORD style = SS_OWNERDRAW | WS_VISIBLE | WS_CHILD; - control = mswAlloc( parent, B_BITMAP, NULL, sizeof( struct wBitmap_t ), NULL, &index ); + control = mswAlloc( parent, B_BITMAP, NULL, sizeof( struct wBitmap_t ), NULL, + &index ); mswComputePos( (wControl_p)control, x, y ); control->option = option; control->hWnd = CreateWindow( "STATIC", NULL, - style, control->x, control->y, - iconP->w, iconP->h, - ((wControl_p)parent)->hWnd, (HMENU)(UINT_PTR)index, mswHInst, NULL ); + style, control->x, control->y, + iconP->w, iconP->h, + ((wControl_p)parent)->hWnd, (HMENU)(UINT_PTR)index, mswHInst, NULL ); if (control->hWnd == NULL) { mswFail("CreateWindow(BITMAP)"); -- cgit v1.2.3