Sun Nov 6 18:52:04 1994 Alexandre Julliard (julliard@lamisun.epfl.ch) * [objects/oembitmap.c] (New file) Added possibility to use .xpm files for OEM bitmaps. * [include/bitmaps/obm*] (New files) Redrawn all OEM bitmaps in xpm format. * [objects/font.c] Add space for internal leading when using a negative font height. Stubs for AddFontResource() and RemoveFontResource(). Fix in FONT_Init() for uninitialised default font. * [windows/dialog.c] Make font height negative as it is really a point size and not a pixel size; dialogs using 8-point fonts look better now. * [windows/graphics.c] Fixed the fix :-) for Pie() to make it work for Arc() and Chord() also. * [windows/nonclient.c] A few changes for new OEM bitmaps. Sun Nov 6 18:22:18 1994 Michael Patra <micky@marie.physik.tu-berlin.de> * [windows/class.c] The names of local classes have to be stored using GlobalAtom*. Otherwise they couldn't be accessed from other modules (e.g. BWCC) * [if1632/call.S] CallTo16(cx): It's possible to set the contents of the cx-register. * [loader/ne_image.c] InitNEDLL(): The size of the local heap is now passed in the cx- register when initializing a DLL. * [memory/heap.c] LocalInit(): The case start==0 is now handled in the way it should. * [windows/win.c] GetWindowLong(): If the adress of the windows function is requested it's no longer returned if it's within the Wine code (and therefore unreachable by a windows program). This makes Borland's OWL happy. * [controls/edit.c] EDIT_GetStr(): Added handling for off<0. Sun Nov 6 17:37:14 1994 Chris Jones <chrisj@ichips.intel.com> * [loader/library.c] Fixed infinite loop bug when two DLLs refer to each other (fixes hangup of Quicken during loading). Thu Nov 04 12:00:00 1994 Jan Willamowius (jan@janhh.sh.sub.de) * [misc/dos_fs.c] Bug fix: The size of a disk an the available space is now returned in bytes instead of (incorrectly) KBytes. Thu Nov 03 12:00:00 1994 Jan Willamowius (jan@janhh.sh.sub.de) * [windows/graphics.c] Bug fix: Pie segments are now filled with correct brush. Thu Nov 3 10:40:09 1994 Martin von Loewis (martin@cs.csufresno.edu) * [Imakefile] generate rc.o before loader.o * [controls/menu.c] CopySysMenu: generate SYSMENU on the fly, eliminate hSysMenu * [include/resource.h] Add struct ResourceTable * [loader/bitmap.h] Load system bitmaps from sysresbmTable * [misc/clipboard.c] [windows/event.c] IsClipboardFormatAvailable,EVENT_SelectionRequest: bug fixes * [rc/Imakefile] generate rc.o from sysres.o and sysresbm.o. Added -lfl * [rc/rc.y] change style handling to allow ( S1 | S2 ) | S3 * [rc/sysres.rc] [rc/sysresbm.rc] Put bitmaps and icons to sysresbm, everything else to sysres * [rc/winerc.c] [rc/winerc.h] Added -o, -c flags. New function set_out_file. Output to files. * [windows/dialog.c] DialogBoxIndirectPtr, DialogBoxIndirectParamPtr: New functions * [windows/nonclient.c] Create AboutWine dialog from template pointer
307 lines
8.4 KiB
C
307 lines
8.4 KiB
C
/*
|
|
* GDI brush objects
|
|
*
|
|
* Copyright 1993 Alexandre Julliard
|
|
*/
|
|
|
|
static char Copyright[] = "Copyright Alexandre Julliard, 1993";
|
|
|
|
#include "gdi.h"
|
|
#include "bitmap.h"
|
|
#include "prototypes.h"
|
|
#include "metafile.h"
|
|
#include "stddebug.h"
|
|
/* #define DEBUG_GDI /* */
|
|
/* #undef DEBUG_GDI /* */
|
|
#include "debug.h"
|
|
|
|
#define NB_HATCH_STYLES 6
|
|
|
|
static char HatchBrushes[NB_HATCH_STYLES][8] =
|
|
{
|
|
{ 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00 }, /* HS_HORIZONTAL */
|
|
{ 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08 }, /* HS_VERTICAL */
|
|
{ 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80 }, /* HS_FDIAGONAL */
|
|
{ 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 }, /* HS_BDIAGONAL */
|
|
{ 0x08, 0x08, 0x08, 0xff, 0x08, 0x08, 0x08, 0x08 }, /* HS_CROSS */
|
|
{ 0x81, 0x42, 0x24, 0x18, 0x18, 0x24, 0x42, 0x81 } /* HS_DIAGCROSS */
|
|
};
|
|
|
|
extern WORD COLOR_ToPhysical( DC *dc, COLORREF color );
|
|
|
|
|
|
/***********************************************************************
|
|
* CreateBrushIndirect (GDI.50)
|
|
*/
|
|
HBRUSH CreateBrushIndirect( LOGBRUSH * brush )
|
|
{
|
|
BRUSHOBJ * brushPtr;
|
|
HBRUSH hbrush = GDI_AllocObject( sizeof(BRUSHOBJ), BRUSH_MAGIC );
|
|
if (!hbrush) return 0;
|
|
brushPtr = (BRUSHOBJ *) GDI_HEAP_ADDR( hbrush );
|
|
memcpy( &brushPtr->logbrush, brush, sizeof(LOGBRUSH) );
|
|
return hbrush;
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* CreateHatchBrush (GDI.58)
|
|
*/
|
|
HBRUSH CreateHatchBrush( short style, COLORREF color )
|
|
{
|
|
LOGBRUSH logbrush = { BS_HATCHED, color, style };
|
|
dprintf_gdi(stddeb, "CreateHatchBrush: %d %06lx\n", style, color );
|
|
if ((style < 0) || (style >= NB_HATCH_STYLES)) return 0;
|
|
return CreateBrushIndirect( &logbrush );
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* CreatePatternBrush (GDI.60)
|
|
*/
|
|
HBRUSH CreatePatternBrush( HBITMAP hbitmap )
|
|
{
|
|
LOGBRUSH logbrush = { BS_PATTERN, 0, 0 };
|
|
BITMAPOBJ *bmp, *newbmp;
|
|
|
|
dprintf_gdi(stddeb, "CreatePatternBrush: %d\n", hbitmap );
|
|
|
|
/* Make a copy of the bitmap */
|
|
|
|
if (!(bmp = (BITMAPOBJ *) GDI_GetObjPtr( hbitmap, BITMAP_MAGIC )))
|
|
return 0;
|
|
logbrush.lbHatch = CreateBitmapIndirect( &bmp->bitmap );
|
|
newbmp = (BITMAPOBJ *) GDI_GetObjPtr( logbrush.lbHatch, BITMAP_MAGIC );
|
|
if (!newbmp) return 0;
|
|
XCopyArea( display, bmp->pixmap, newbmp->pixmap, BITMAP_GC(bmp),
|
|
0, 0, bmp->bitmap.bmWidth, bmp->bitmap.bmHeight, 0, 0 );
|
|
return CreateBrushIndirect( &logbrush );
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* CreateDIBPatternBrush (GDI.445)
|
|
*/
|
|
HBRUSH CreateDIBPatternBrush( HANDLE hbitmap, WORD coloruse )
|
|
{
|
|
LOGBRUSH logbrush = { BS_DIBPATTERN, coloruse, 0 };
|
|
BITMAPINFO *info, *newInfo;
|
|
int size;
|
|
|
|
dprintf_gdi(stddeb, "CreateDIBPatternBrush: %d\n", hbitmap );
|
|
|
|
/* Make a copy of the bitmap */
|
|
|
|
if (!(info = (BITMAPINFO *) GlobalLock( hbitmap ))) return 0;
|
|
|
|
size = info->bmiHeader.biSizeImage;
|
|
if (!size)
|
|
size = (info->bmiHeader.biWidth * info->bmiHeader.biBitCount + 31) / 32
|
|
* 8 * info->bmiHeader.biHeight;
|
|
size += DIB_BitmapInfoSize( info, coloruse );
|
|
|
|
if (!(logbrush.lbHatch = GlobalAlloc( GMEM_MOVEABLE, size )))
|
|
{
|
|
GlobalUnlock( hbitmap );
|
|
return 0;
|
|
}
|
|
newInfo = (BITMAPINFO *) GlobalLock( logbrush.lbHatch );
|
|
memcpy( newInfo, info, size );
|
|
GlobalUnlock( logbrush.lbHatch );
|
|
GlobalUnlock( hbitmap );
|
|
return CreateBrushIndirect( &logbrush );
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* CreateSolidBrush (GDI.66)
|
|
*/
|
|
HBRUSH CreateSolidBrush( COLORREF color )
|
|
{
|
|
LOGBRUSH logbrush = { BS_SOLID, color, 0 };
|
|
dprintf_gdi(stddeb, "CreateSolidBrush: %06lx\n", color );
|
|
return CreateBrushIndirect( &logbrush );
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* SetBrushOrg (GDI.148)
|
|
*/
|
|
DWORD SetBrushOrg( HDC hdc, short x, short y )
|
|
{
|
|
DWORD retval;
|
|
DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
|
|
if (!dc) return FALSE;
|
|
retval = dc->w.brushOrgX | (dc->w.brushOrgY << 16);
|
|
dc->w.brushOrgX = x;
|
|
dc->w.brushOrgY = y;
|
|
return retval;
|
|
}
|
|
|
|
/***********************************************************************
|
|
* GetSysColorBrush (USER.281)
|
|
*/
|
|
WORD GetSysColorBrush(WORD x)
|
|
{
|
|
return GetStockObject(GRAY_BRUSH);
|
|
}
|
|
|
|
/***********************************************************************
|
|
* BRUSH_DeleteObject
|
|
*/
|
|
BOOL BRUSH_DeleteObject( HBRUSH hbrush, BRUSHOBJ * brush )
|
|
{
|
|
switch(brush->logbrush.lbStyle)
|
|
{
|
|
case BS_PATTERN:
|
|
DeleteObject( brush->logbrush.lbHatch );
|
|
break;
|
|
case BS_DIBPATTERN:
|
|
GlobalFree( brush->logbrush.lbHatch );
|
|
break;
|
|
}
|
|
return GDI_FreeObject( hbrush );
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* BRUSH_GetObject
|
|
*/
|
|
int BRUSH_GetObject( BRUSHOBJ * brush, int count, LPSTR buffer )
|
|
{
|
|
if (count > sizeof(LOGBRUSH)) count = sizeof(LOGBRUSH);
|
|
memcpy( buffer, &brush->logbrush, count );
|
|
return count;
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* BRUSH_MakeSolidBrush
|
|
*/
|
|
static void BRUSH_SelectSolidBrush( DC *dc, COLORREF color )
|
|
{
|
|
if ((dc->w.bitsPerPixel > 1) && !COLOR_IsSolid( color ))
|
|
{
|
|
/* Dithered brush */
|
|
dc->u.x.brush.pixmap = DITHER_DitherColor( dc, color );
|
|
dc->u.x.brush.fillStyle = FillTiled;
|
|
dc->u.x.brush.pixel = 0;
|
|
}
|
|
else
|
|
{
|
|
/* Solid brush */
|
|
dc->u.x.brush.pixel = COLOR_ToPhysical( dc, color );
|
|
dc->u.x.brush.fillStyle = FillSolid;
|
|
}
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* BRUSH_SelectPatternBrush
|
|
*/
|
|
static BOOL BRUSH_SelectPatternBrush( DC * dc, HBITMAP hbitmap )
|
|
{
|
|
BITMAPOBJ * bmp = (BITMAPOBJ *) GDI_GetObjPtr( hbitmap, BITMAP_MAGIC );
|
|
if (!bmp) return FALSE;
|
|
dc->u.x.brush.pixmap = XCreatePixmap( display, rootWindow,
|
|
8, 8, bmp->bitmap.bmBitsPixel );
|
|
XCopyArea( display, bmp->pixmap, dc->u.x.brush.pixmap,
|
|
BITMAP_GC(bmp), 0, 0, 8, 8, 0, 0 );
|
|
|
|
if (bmp->bitmap.bmBitsPixel > 1)
|
|
{
|
|
dc->u.x.brush.fillStyle = FillTiled;
|
|
dc->u.x.brush.pixel = 0; /* Ignored */
|
|
}
|
|
else
|
|
{
|
|
dc->u.x.brush.fillStyle = FillOpaqueStippled;
|
|
dc->u.x.brush.pixel = -1; /* Special case (see DC_SetupGCForBrush) */
|
|
}
|
|
return TRUE;
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
* BRUSH_SelectObject
|
|
*/
|
|
HBRUSH BRUSH_SelectObject( HDC hdc, DC * dc, HBRUSH hbrush, BRUSHOBJ * brush )
|
|
{
|
|
HBITMAP hBitmap;
|
|
BITMAPINFO * bmpInfo;
|
|
HBRUSH prevHandle = dc->w.hBrush;
|
|
|
|
dprintf_gdi(stddeb, "Brush_SelectObject hdc=%04x hbrush=%04x\n",
|
|
hdc,hbrush);
|
|
if (dc->header.wMagic == METAFILE_DC_MAGIC)
|
|
{
|
|
switch (brush->logbrush.lbStyle)
|
|
{
|
|
case BS_SOLID:
|
|
case BS_HATCHED:
|
|
case BS_HOLLOW:
|
|
if (!MF_CreateBrushIndirect(dc, hbrush, &(brush->logbrush)))
|
|
return 0;
|
|
break;
|
|
|
|
case BS_PATTERN:
|
|
case BS_DIBPATTERN:
|
|
if (!MF_CreatePatternBrush(dc, hbrush, &(brush->logbrush)))
|
|
return 0;
|
|
break;
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
dc->w.hBrush = hbrush;
|
|
|
|
if (dc->u.x.brush.pixmap)
|
|
{
|
|
XFreePixmap( display, dc->u.x.brush.pixmap );
|
|
dc->u.x.brush.pixmap = 0;
|
|
}
|
|
dc->u.x.brush.style = brush->logbrush.lbStyle;
|
|
|
|
switch(brush->logbrush.lbStyle)
|
|
{
|
|
case BS_NULL:
|
|
dprintf_gdi( stddeb,"BS_NULL\n" );
|
|
break;
|
|
|
|
case BS_SOLID:
|
|
dprintf_gdi( stddeb,"BS_SOLID\n" );
|
|
BRUSH_SelectSolidBrush( dc, brush->logbrush.lbColor );
|
|
break;
|
|
|
|
case BS_HATCHED:
|
|
dprintf_gdi( stddeb, "BS_HATCHED\n" );
|
|
dc->u.x.brush.pixel = COLOR_ToPhysical( dc, brush->logbrush.lbColor );
|
|
dc->u.x.brush.pixmap = XCreateBitmapFromData( display, rootWindow,
|
|
HatchBrushes[brush->logbrush.lbHatch], 8, 8 );
|
|
dc->u.x.brush.fillStyle = FillStippled;
|
|
break;
|
|
|
|
case BS_PATTERN:
|
|
dprintf_gdi( stddeb, "BS_PATTERN\n");
|
|
BRUSH_SelectPatternBrush( dc, brush->logbrush.lbHatch );
|
|
break;
|
|
|
|
case BS_DIBPATTERN:
|
|
dprintf_gdi( stddeb, "BS_DIBPATTERN\n");
|
|
if ((bmpInfo = (BITMAPINFO *) GlobalLock( brush->logbrush.lbHatch )))
|
|
{
|
|
int size = DIB_BitmapInfoSize( bmpInfo, brush->logbrush.lbColor );
|
|
hBitmap = CreateDIBitmap( hdc, &bmpInfo->bmiHeader, CBM_INIT,
|
|
((char *)bmpInfo) + size, bmpInfo,
|
|
(WORD) brush->logbrush.lbColor );
|
|
BRUSH_SelectPatternBrush( dc, hBitmap );
|
|
DeleteObject( hBitmap );
|
|
GlobalUnlock( brush->logbrush.lbHatch );
|
|
}
|
|
|
|
break;
|
|
}
|
|
|
|
return prevHandle;
|
|
}
|