1997-02-02 19:01:52 +00:00
|
|
|
/*
|
1998-11-25 12:36:03 +00:00
|
|
|
* X11DRV brush objects
|
1997-02-02 19:01:52 +00:00
|
|
|
*
|
|
|
|
|
* Copyright 1993, 1994 Alexandre Julliard
|
2002-03-09 23:29:33 +00:00
|
|
|
*
|
|
|
|
|
* This library is free software; you can redistribute it and/or
|
|
|
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
|
|
|
* License as published by the Free Software Foundation; either
|
|
|
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
|
|
|
*
|
|
|
|
|
* This library is distributed in the hope that it will be useful,
|
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
|
* Lesser General Public License for more details.
|
|
|
|
|
*
|
|
|
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
|
|
|
* License along with this library; if not, write to the Free Software
|
2006-05-18 12:49:52 +00:00
|
|
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
1997-02-02 19:01:52 +00:00
|
|
|
*/
|
|
|
|
|
|
1999-02-04 11:11:01 +00:00
|
|
|
#include "config.h"
|
|
|
|
|
|
1997-02-02 19:01:52 +00:00
|
|
|
#include <stdlib.h>
|
2003-11-21 21:50:59 +00:00
|
|
|
|
2005-04-11 18:54:30 +00:00
|
|
|
#include "wine/winbase16.h"
|
1997-02-02 19:01:52 +00:00
|
|
|
#include "x11drv.h"
|
2002-03-09 23:29:33 +00:00
|
|
|
#include "wine/debug.h"
|
1997-02-02 19:01:52 +00:00
|
|
|
|
2002-03-09 23:29:33 +00:00
|
|
|
WINE_DEFAULT_DEBUG_CHANNEL(gdi);
|
1999-04-19 14:56:29 +00:00
|
|
|
|
2005-04-20 12:52:46 +00:00
|
|
|
static const char HatchBrushes[][8] =
|
1997-02-02 19:01:52 +00:00
|
|
|
{
|
|
|
|
|
{ 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 */
|
1997-06-29 18:08:02 +00:00
|
|
|
{ 0x81, 0x42, 0x24, 0x18, 0x18, 0x24, 0x42, 0x81 }, /* HS_DIAGCROSS */
|
1997-02-02 19:01:52 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Levels of each primary for dithering */
|
2002-05-31 23:06:46 +00:00
|
|
|
#define PRIMARY_LEVELS 3
|
1997-02-02 19:01:52 +00:00
|
|
|
#define TOTAL_LEVELS (PRIMARY_LEVELS*PRIMARY_LEVELS*PRIMARY_LEVELS)
|
|
|
|
|
|
|
|
|
|
/* Dithering matrix size */
|
|
|
|
|
#define MATRIX_SIZE 8
|
|
|
|
|
#define MATRIX_SIZE_2 (MATRIX_SIZE*MATRIX_SIZE)
|
|
|
|
|
|
|
|
|
|
/* Total number of possible levels for a dithered primary color */
|
|
|
|
|
#define DITHER_LEVELS (MATRIX_SIZE_2 * (PRIMARY_LEVELS-1) + 1)
|
|
|
|
|
|
|
|
|
|
/* Dithering matrix */
|
|
|
|
|
static const int dither_matrix[MATRIX_SIZE_2] =
|
|
|
|
|
{
|
|
|
|
|
0, 32, 8, 40, 2, 34, 10, 42,
|
|
|
|
|
48, 16, 56, 24, 50, 18, 58, 26,
|
|
|
|
|
12, 44, 4, 36, 14, 46, 6, 38,
|
|
|
|
|
60, 28, 52, 20, 62, 30, 54, 22,
|
|
|
|
|
3, 35, 11, 43, 1, 33, 9, 41,
|
|
|
|
|
51, 19, 59, 27, 49, 17, 57, 25,
|
|
|
|
|
15, 47, 7, 39, 13, 45, 5, 37,
|
|
|
|
|
63, 31, 55, 23, 61, 29, 53, 21
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Mapping between (R,G,B) triples and EGA colors */
|
|
|
|
|
static const int EGAmapping[TOTAL_LEVELS] =
|
|
|
|
|
{
|
|
|
|
|
0, /* 000000 -> 000000 */
|
|
|
|
|
4, /* 00007f -> 000080 */
|
|
|
|
|
12, /* 0000ff -> 0000ff */
|
|
|
|
|
2, /* 007f00 -> 008000 */
|
|
|
|
|
6, /* 007f7f -> 008080 */
|
|
|
|
|
6, /* 007fff -> 008080 */
|
|
|
|
|
10, /* 00ff00 -> 00ff00 */
|
|
|
|
|
6, /* 00ff7f -> 008080 */
|
|
|
|
|
14, /* 00ffff -> 00ffff */
|
|
|
|
|
1, /* 7f0000 -> 800000 */
|
|
|
|
|
5, /* 7f007f -> 800080 */
|
|
|
|
|
5, /* 7f00ff -> 800080 */
|
|
|
|
|
3, /* 7f7f00 -> 808000 */
|
|
|
|
|
8, /* 7f7f7f -> 808080 */
|
|
|
|
|
7, /* 7f7fff -> c0c0c0 */
|
|
|
|
|
3, /* 7fff00 -> 808000 */
|
|
|
|
|
7, /* 7fff7f -> c0c0c0 */
|
|
|
|
|
7, /* 7fffff -> c0c0c0 */
|
|
|
|
|
9, /* ff0000 -> ff0000 */
|
|
|
|
|
5, /* ff007f -> 800080 */
|
|
|
|
|
13, /* ff00ff -> ff00ff */
|
|
|
|
|
3, /* ff7f00 -> 808000 */
|
|
|
|
|
7, /* ff7f7f -> c0c0c0 */
|
|
|
|
|
7, /* ff7fff -> c0c0c0 */
|
|
|
|
|
11, /* ffff00 -> ffff00 */
|
|
|
|
|
7, /* ffff7f -> c0c0c0 */
|
|
|
|
|
15 /* ffffff -> ffffff */
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
#define PIXEL_VALUE(r,g,b) \
|
1999-04-01 08:16:08 +00:00
|
|
|
X11DRV_PALETTE_mapEGAPixel[EGAmapping[((r)*PRIMARY_LEVELS+(g))*PRIMARY_LEVELS+(b)]]
|
1997-02-02 19:01:52 +00:00
|
|
|
|
2005-04-20 12:52:46 +00:00
|
|
|
static const COLORREF BLACK = RGB(0, 0, 0);
|
|
|
|
|
static const COLORREF WHITE = RGB(0xff, 0xff, 0xff);
|
1997-02-02 19:01:52 +00:00
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
|
* BRUSH_DitherColor
|
|
|
|
|
*/
|
2004-01-18 22:20:17 +00:00
|
|
|
static Pixmap BRUSH_DitherColor( COLORREF color )
|
1997-02-02 19:01:52 +00:00
|
|
|
{
|
2005-04-20 12:52:46 +00:00
|
|
|
/* X image for building dithered pixmap */
|
|
|
|
|
static XImage *ditherImage = NULL;
|
1997-02-02 19:01:52 +00:00
|
|
|
static COLORREF prevColor = 0xffffffff;
|
|
|
|
|
unsigned int x, y;
|
|
|
|
|
Pixmap pixmap;
|
|
|
|
|
|
2001-05-11 00:17:47 +00:00
|
|
|
if (!ditherImage)
|
|
|
|
|
{
|
|
|
|
|
ditherImage = X11DRV_DIB_CreateXImage( MATRIX_SIZE, MATRIX_SIZE, screen_depth );
|
2005-04-20 12:52:46 +00:00
|
|
|
if (!ditherImage)
|
|
|
|
|
{
|
|
|
|
|
ERR("Could not create dither image\n");
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2001-05-11 00:17:47 +00:00
|
|
|
}
|
|
|
|
|
|
2001-01-15 22:31:24 +00:00
|
|
|
wine_tsx11_lock();
|
1997-02-02 19:01:52 +00:00
|
|
|
if (color != prevColor)
|
|
|
|
|
{
|
|
|
|
|
int r = GetRValue( color ) * DITHER_LEVELS;
|
|
|
|
|
int g = GetGValue( color ) * DITHER_LEVELS;
|
|
|
|
|
int b = GetBValue( color ) * DITHER_LEVELS;
|
|
|
|
|
const int *pmatrix = dither_matrix;
|
|
|
|
|
|
|
|
|
|
for (y = 0; y < MATRIX_SIZE; y++)
|
|
|
|
|
{
|
|
|
|
|
for (x = 0; x < MATRIX_SIZE; x++)
|
|
|
|
|
{
|
|
|
|
|
int d = *pmatrix++ * 256;
|
|
|
|
|
int dr = ((r + d) / MATRIX_SIZE_2) / 256;
|
|
|
|
|
int dg = ((g + d) / MATRIX_SIZE_2) / 256;
|
|
|
|
|
int db = ((b + d) / MATRIX_SIZE_2) / 256;
|
1998-02-15 19:40:49 +00:00
|
|
|
XPutPixel( ditherImage, x, y, PIXEL_VALUE(dr,dg,db) );
|
1997-02-02 19:01:52 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
prevColor = color;
|
|
|
|
|
}
|
2002-05-31 23:06:46 +00:00
|
|
|
|
2001-05-11 00:17:47 +00:00
|
|
|
pixmap = XCreatePixmap( gdi_display, root_window, MATRIX_SIZE, MATRIX_SIZE, screen_depth );
|
|
|
|
|
XPutImage( gdi_display, pixmap, BITMAP_colorGC, ditherImage, 0, 0,
|
2005-04-20 12:52:46 +00:00
|
|
|
0, 0, MATRIX_SIZE, MATRIX_SIZE );
|
2001-01-15 22:31:24 +00:00
|
|
|
wine_tsx11_unlock();
|
2005-04-20 12:52:46 +00:00
|
|
|
|
1997-02-02 19:01:52 +00:00
|
|
|
return pixmap;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2005-04-20 12:52:46 +00:00
|
|
|
/***********************************************************************
|
|
|
|
|
* BRUSH_DitherMono
|
|
|
|
|
*/
|
|
|
|
|
static Pixmap BRUSH_DitherMono( COLORREF color )
|
|
|
|
|
{
|
|
|
|
|
/* This makes the spray work in Win 3.11 pbrush.exe */
|
|
|
|
|
/* FIXME. Extend this basic selection of dither patterns */
|
|
|
|
|
static const char gray_dither[][2] = {{ 0x1, 0x0 }, /* DKGRAY */
|
|
|
|
|
{ 0x2, 0x1 }, /* GRAY */
|
|
|
|
|
{ 0x1, 0x3 }, /* LTGRAY */
|
|
|
|
|
};
|
|
|
|
|
int gray = (30 * GetRValue(color) + 59 * GetGValue(color) + 11 * GetBValue(color)) / 100;
|
|
|
|
|
int idx = gray * (sizeof gray_dither/sizeof gray_dither[0] + 1)/256 - 1;
|
|
|
|
|
Pixmap pixmap;
|
|
|
|
|
|
2006-10-07 23:34:01 +00:00
|
|
|
TRACE("color=%06x -> gray=%x\n", color, gray);
|
2005-04-20 12:52:46 +00:00
|
|
|
|
|
|
|
|
wine_tsx11_lock();
|
|
|
|
|
pixmap = XCreateBitmapFromData( gdi_display, root_window,
|
|
|
|
|
gray_dither[idx],
|
|
|
|
|
2, 2 );
|
|
|
|
|
wine_tsx11_unlock();
|
|
|
|
|
return pixmap;
|
|
|
|
|
}
|
|
|
|
|
|
1997-02-02 19:01:52 +00:00
|
|
|
/***********************************************************************
|
|
|
|
|
* BRUSH_SelectSolidBrush
|
|
|
|
|
*/
|
2002-03-28 22:22:05 +00:00
|
|
|
static void BRUSH_SelectSolidBrush( X11DRV_PDEVICE *physDev, COLORREF color )
|
1997-02-02 19:01:52 +00:00
|
|
|
{
|
2004-01-18 22:20:17 +00:00
|
|
|
if ((physDev->depth > 1) && (screen_depth <= 8) && !X11DRV_IsSolidColor( color ))
|
1997-02-02 19:01:52 +00:00
|
|
|
{
|
|
|
|
|
/* Dithered brush */
|
2004-01-18 22:20:17 +00:00
|
|
|
physDev->brush.pixmap = BRUSH_DitherColor( color );
|
1998-11-25 12:36:03 +00:00
|
|
|
physDev->brush.fillStyle = FillTiled;
|
|
|
|
|
physDev->brush.pixel = 0;
|
1997-02-02 19:01:52 +00:00
|
|
|
}
|
2005-04-20 12:52:46 +00:00
|
|
|
else if (physDev->depth == 1 && color != WHITE && color != BLACK)
|
|
|
|
|
{
|
|
|
|
|
physDev->brush.pixel = 0;
|
|
|
|
|
physDev->brush.pixmap = BRUSH_DitherMono( color );
|
|
|
|
|
physDev->brush.fillStyle = FillTiled;
|
|
|
|
|
}
|
1997-02-02 19:01:52 +00:00
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* Solid brush */
|
2002-03-28 22:22:05 +00:00
|
|
|
physDev->brush.pixel = X11DRV_PALETTE_ToPhysical( physDev, color );
|
1998-11-25 12:36:03 +00:00
|
|
|
physDev->brush.fillStyle = FillSolid;
|
1997-02-02 19:01:52 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
|
* BRUSH_SelectPatternBrush
|
|
|
|
|
*/
|
2002-03-28 22:22:05 +00:00
|
|
|
static BOOL BRUSH_SelectPatternBrush( X11DRV_PDEVICE *physDev, HBITMAP hbitmap )
|
1997-02-02 19:01:52 +00:00
|
|
|
{
|
2005-04-11 18:54:30 +00:00
|
|
|
BITMAP bitmap;
|
|
|
|
|
X_PHYSBITMAP *physBitmap = X11DRV_get_phys_bitmap( hbitmap );
|
Release 980104
Sat Jan 3 17:15:56 1998 Alexandre Julliard <julliard@lrc.epfl.ch>
* [debugger/db_disasm.c]
Added cpuid and cmpxchg instructions.
* [if1632/builtin.c] [relay32/builtin32.c]
Fixed broken -dll option with Win32 DLLs.
* [include/heap.h]
Added SYSTEM_LOCK/SYSTEM_UNLOCK macros.
* [configure.in] [misc/lstr.c]
Added check for wctype.h.
Commented out --enable-ipc option (IPC code has been broken for a
long time anyway).
* [scheduler/critsection.c] [scheduler/event.c]
[scheduler/mutex.c] [scheduler/semaphore.c]
Implemented Win32 synchronization objects.
* [scheduler/synchro.c]
Implemented WaitForMultipleObjects and related functions.
* [scheduler/thread.c]
If possible, use clone() in CreateThread().
* [scheduler/thread.c] [scheduler/process.c]
Made thread and process waitable objects.
Thread and process id values are now different from the pointers
they represent.
* [win32/k32obj.c]
Moved to scheduler directory.
Added function table for waiting operations on objects.
* [files/file.c] [memory/virtual.c]
Added new K32OBJ function table.
Sun Jan 1 16:48:23 1997 Andreas Mohr <100.30936@germany.net>
* [files/file.c]
Fixed my patch for GetTempFileName16() as needed.
It was ...Name32A() that didn't work properly, not ...Name16().
* [graphics/x11drv/brush.c]
Fixed a BadMatch error.
* [msdos/int21.c]
Fixed INT21_FindNextFCB() to get correct volume labels e.g.
in "file open" dialog.
* [multimedia/joystick.c] [relay32/winmm.spec]
Stub JoyGetPosEx().
* [scheduler/process.c] [relay32/kernel32.spec]
Implemented RegisterServiceProcess().
Wed Dec 31 11:14:43 1997 Lawson Whitney <lawson_whitney@juno.com>
* [if1632/kernel.spec] [if1632/relay.c]
Define CallProcEx32w - Thanks to Marcus Meissner for his excellent
CallProc32W.
* [loader/module.c]
Take a shot at defining FreeLibrary32W.
Sun Dec 28 12:44:04 1997 Kai Morich <kai.morich@rhein-neckar.netsurf.de>
* [controls/menu.c]
Menu modification from WM_INITMENUPOPUP message fixed.
Menu items now can have different wID and hSubMenu (Win95 behavior).
* [misc/cpu.c]
Improved IsProcessorFeaturePresent.
Sun Dec 28 03:21:08 1997 Ove Kaaven <ovek@main.arcticnet.no>
* [include/winsock.h] [misc/winsock.c]
Fixed WS_SOL_SOCKET for setsockopt(), and made select() return
empty fd_sets if timeout.
* [objects/palette.c]
AnimatePalette() bailed out if entire palette is animated. Fixed.
* [objects/dib.c]
Added some code to SetDIBitsToDevice() and its helpers to fix
some offseting problems.
* [objects/cursoricon.c]
Made CreateCursor32() convert the instance handle properly. Made
DestroyCursor() return correct success status.
Wed Dec 24 17:56:34 1997 Dimitrie O. Paun <dimi@cs.toronto.edu>
* [windows/syscolor.c]
Added definition of GetSysColorPen16/32. This function does not
exist in the Win32 API but is a very close (and natural) relative
to GetSysColorBrush function. Moreover, it is *very* much used
within Wine since there are a lot of places where we need to draw
lines with the standard colors.
* [controls/button.c] [controls/combo.c] [controls/icontitle.c]
[controls/menu.c] [controls/progress.c] [controls/scroll.c]
[controls/updown.c] [graphics/painting.c] [misc/tweak.c]
[windows/defwnd.c] [windows/graphics.c] [windows/nonclient.c]
Replaced references to sysColorObjects with the appropriate
call to GetSysColorBrush32/GetSysColorPen32. There is no need to
expose the implementation of these functions, even within Wine.
This makes the code easier to understand, debug, maintain.
* [controls/uitools.c]
Modified most of the functions in this file to use the now
standard pens (i.e. GetSysColorPen32). These functions made
*heavy* use of standard pens so I expect a lot less
CreatePen/DeleteObject calls can do only good...:)
Plus some minor modifications (*no* functional changes though).
* [controls/updown.c]
Used the new DrawFrameControl32 function to paint the control.
I also deleted UDDOWN_DrawArrow since it was no longer required.
Tue Dec 23 00:03:33 1997 Steinar Hamre <steinarh@stud.fim.ntnu.no>
* [configure.in]
Added check for -lw.
* [include/wintypes.h] [tools/build.c]
Changes to make the assembly understandable for even sun as.
".ascii" -> ".string", "call %foo" -> "call *%foo",
"pushw/popw %[cdes]s" written out to ".byte 0x66\npushl/popl %[cdes]s".
* [memory/ldt.c]
#ifdef added so <sys/seg.h> will not be included on Solaris.
Mon Dec 22 18:55:19 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [configure.in]
Added XF86DGA check.
* [multimedia/dsound.c][relay32/dsound.spec][include/dsound.h]
Started DirectSound. Only stubs for now.
* [graphics/ddraw.c][include/ddraw.h][relay32/ddraw.spec]
Started to implement DirectDraw. Mostly stubs, some
testcases work. Requires the XF86DGA extension to XFree86.
(check demo/blizdemo.exe from the Diablo CD-ROM).
* [files/drive.c]
Return correct "CDFS" fsname so Diablo is a bit happier.
Sun Dec 21 21:45:48 1997 Kevin Cozens <kcozens@interlog.com>
* [misc/registry.c]
Fixed bugs in the routines which read the Windows '95 registry
files. Added extra information regarding the format of the Windows
'95 registry files.
1998-01-04 17:49:09 +00:00
|
|
|
|
2005-04-11 18:54:30 +00:00
|
|
|
if (!physBitmap || !GetObjectW( hbitmap, sizeof(bitmap), &bitmap )) return FALSE;
|
1998-10-28 09:53:53 +00:00
|
|
|
|
2003-11-21 00:17:33 +00:00
|
|
|
wine_tsx11_lock();
|
2005-04-11 18:54:30 +00:00
|
|
|
if ((physDev->depth == 1) && (physBitmap->pixmap_depth != 1))
|
Release 980104
Sat Jan 3 17:15:56 1998 Alexandre Julliard <julliard@lrc.epfl.ch>
* [debugger/db_disasm.c]
Added cpuid and cmpxchg instructions.
* [if1632/builtin.c] [relay32/builtin32.c]
Fixed broken -dll option with Win32 DLLs.
* [include/heap.h]
Added SYSTEM_LOCK/SYSTEM_UNLOCK macros.
* [configure.in] [misc/lstr.c]
Added check for wctype.h.
Commented out --enable-ipc option (IPC code has been broken for a
long time anyway).
* [scheduler/critsection.c] [scheduler/event.c]
[scheduler/mutex.c] [scheduler/semaphore.c]
Implemented Win32 synchronization objects.
* [scheduler/synchro.c]
Implemented WaitForMultipleObjects and related functions.
* [scheduler/thread.c]
If possible, use clone() in CreateThread().
* [scheduler/thread.c] [scheduler/process.c]
Made thread and process waitable objects.
Thread and process id values are now different from the pointers
they represent.
* [win32/k32obj.c]
Moved to scheduler directory.
Added function table for waiting operations on objects.
* [files/file.c] [memory/virtual.c]
Added new K32OBJ function table.
Sun Jan 1 16:48:23 1997 Andreas Mohr <100.30936@germany.net>
* [files/file.c]
Fixed my patch for GetTempFileName16() as needed.
It was ...Name32A() that didn't work properly, not ...Name16().
* [graphics/x11drv/brush.c]
Fixed a BadMatch error.
* [msdos/int21.c]
Fixed INT21_FindNextFCB() to get correct volume labels e.g.
in "file open" dialog.
* [multimedia/joystick.c] [relay32/winmm.spec]
Stub JoyGetPosEx().
* [scheduler/process.c] [relay32/kernel32.spec]
Implemented RegisterServiceProcess().
Wed Dec 31 11:14:43 1997 Lawson Whitney <lawson_whitney@juno.com>
* [if1632/kernel.spec] [if1632/relay.c]
Define CallProcEx32w - Thanks to Marcus Meissner for his excellent
CallProc32W.
* [loader/module.c]
Take a shot at defining FreeLibrary32W.
Sun Dec 28 12:44:04 1997 Kai Morich <kai.morich@rhein-neckar.netsurf.de>
* [controls/menu.c]
Menu modification from WM_INITMENUPOPUP message fixed.
Menu items now can have different wID and hSubMenu (Win95 behavior).
* [misc/cpu.c]
Improved IsProcessorFeaturePresent.
Sun Dec 28 03:21:08 1997 Ove Kaaven <ovek@main.arcticnet.no>
* [include/winsock.h] [misc/winsock.c]
Fixed WS_SOL_SOCKET for setsockopt(), and made select() return
empty fd_sets if timeout.
* [objects/palette.c]
AnimatePalette() bailed out if entire palette is animated. Fixed.
* [objects/dib.c]
Added some code to SetDIBitsToDevice() and its helpers to fix
some offseting problems.
* [objects/cursoricon.c]
Made CreateCursor32() convert the instance handle properly. Made
DestroyCursor() return correct success status.
Wed Dec 24 17:56:34 1997 Dimitrie O. Paun <dimi@cs.toronto.edu>
* [windows/syscolor.c]
Added definition of GetSysColorPen16/32. This function does not
exist in the Win32 API but is a very close (and natural) relative
to GetSysColorBrush function. Moreover, it is *very* much used
within Wine since there are a lot of places where we need to draw
lines with the standard colors.
* [controls/button.c] [controls/combo.c] [controls/icontitle.c]
[controls/menu.c] [controls/progress.c] [controls/scroll.c]
[controls/updown.c] [graphics/painting.c] [misc/tweak.c]
[windows/defwnd.c] [windows/graphics.c] [windows/nonclient.c]
Replaced references to sysColorObjects with the appropriate
call to GetSysColorBrush32/GetSysColorPen32. There is no need to
expose the implementation of these functions, even within Wine.
This makes the code easier to understand, debug, maintain.
* [controls/uitools.c]
Modified most of the functions in this file to use the now
standard pens (i.e. GetSysColorPen32). These functions made
*heavy* use of standard pens so I expect a lot less
CreatePen/DeleteObject calls can do only good...:)
Plus some minor modifications (*no* functional changes though).
* [controls/updown.c]
Used the new DrawFrameControl32 function to paint the control.
I also deleted UDDOWN_DrawArrow since it was no longer required.
Tue Dec 23 00:03:33 1997 Steinar Hamre <steinarh@stud.fim.ntnu.no>
* [configure.in]
Added check for -lw.
* [include/wintypes.h] [tools/build.c]
Changes to make the assembly understandable for even sun as.
".ascii" -> ".string", "call %foo" -> "call *%foo",
"pushw/popw %[cdes]s" written out to ".byte 0x66\npushl/popl %[cdes]s".
* [memory/ldt.c]
#ifdef added so <sys/seg.h> will not be included on Solaris.
Mon Dec 22 18:55:19 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [configure.in]
Added XF86DGA check.
* [multimedia/dsound.c][relay32/dsound.spec][include/dsound.h]
Started DirectSound. Only stubs for now.
* [graphics/ddraw.c][include/ddraw.h][relay32/ddraw.spec]
Started to implement DirectDraw. Mostly stubs, some
testcases work. Requires the XF86DGA extension to XFree86.
(check demo/blizdemo.exe from the Diablo CD-ROM).
* [files/drive.c]
Return correct "CDFS" fsname so Diablo is a bit happier.
Sun Dec 21 21:45:48 1997 Kevin Cozens <kcozens@interlog.com>
* [misc/registry.c]
Fixed bugs in the routines which read the Windows '95 registry
files. Added extra information regarding the format of the Windows
'95 registry files.
1998-01-04 17:49:09 +00:00
|
|
|
{
|
|
|
|
|
/* Special case: a color pattern on a monochrome DC */
|
2004-08-11 18:50:52 +00:00
|
|
|
physDev->brush.pixmap = XCreatePixmap( gdi_display, root_window,
|
2005-04-11 18:54:30 +00:00
|
|
|
bitmap.bmWidth, bitmap.bmHeight, 1);
|
Release 980104
Sat Jan 3 17:15:56 1998 Alexandre Julliard <julliard@lrc.epfl.ch>
* [debugger/db_disasm.c]
Added cpuid and cmpxchg instructions.
* [if1632/builtin.c] [relay32/builtin32.c]
Fixed broken -dll option with Win32 DLLs.
* [include/heap.h]
Added SYSTEM_LOCK/SYSTEM_UNLOCK macros.
* [configure.in] [misc/lstr.c]
Added check for wctype.h.
Commented out --enable-ipc option (IPC code has been broken for a
long time anyway).
* [scheduler/critsection.c] [scheduler/event.c]
[scheduler/mutex.c] [scheduler/semaphore.c]
Implemented Win32 synchronization objects.
* [scheduler/synchro.c]
Implemented WaitForMultipleObjects and related functions.
* [scheduler/thread.c]
If possible, use clone() in CreateThread().
* [scheduler/thread.c] [scheduler/process.c]
Made thread and process waitable objects.
Thread and process id values are now different from the pointers
they represent.
* [win32/k32obj.c]
Moved to scheduler directory.
Added function table for waiting operations on objects.
* [files/file.c] [memory/virtual.c]
Added new K32OBJ function table.
Sun Jan 1 16:48:23 1997 Andreas Mohr <100.30936@germany.net>
* [files/file.c]
Fixed my patch for GetTempFileName16() as needed.
It was ...Name32A() that didn't work properly, not ...Name16().
* [graphics/x11drv/brush.c]
Fixed a BadMatch error.
* [msdos/int21.c]
Fixed INT21_FindNextFCB() to get correct volume labels e.g.
in "file open" dialog.
* [multimedia/joystick.c] [relay32/winmm.spec]
Stub JoyGetPosEx().
* [scheduler/process.c] [relay32/kernel32.spec]
Implemented RegisterServiceProcess().
Wed Dec 31 11:14:43 1997 Lawson Whitney <lawson_whitney@juno.com>
* [if1632/kernel.spec] [if1632/relay.c]
Define CallProcEx32w - Thanks to Marcus Meissner for his excellent
CallProc32W.
* [loader/module.c]
Take a shot at defining FreeLibrary32W.
Sun Dec 28 12:44:04 1997 Kai Morich <kai.morich@rhein-neckar.netsurf.de>
* [controls/menu.c]
Menu modification from WM_INITMENUPOPUP message fixed.
Menu items now can have different wID and hSubMenu (Win95 behavior).
* [misc/cpu.c]
Improved IsProcessorFeaturePresent.
Sun Dec 28 03:21:08 1997 Ove Kaaven <ovek@main.arcticnet.no>
* [include/winsock.h] [misc/winsock.c]
Fixed WS_SOL_SOCKET for setsockopt(), and made select() return
empty fd_sets if timeout.
* [objects/palette.c]
AnimatePalette() bailed out if entire palette is animated. Fixed.
* [objects/dib.c]
Added some code to SetDIBitsToDevice() and its helpers to fix
some offseting problems.
* [objects/cursoricon.c]
Made CreateCursor32() convert the instance handle properly. Made
DestroyCursor() return correct success status.
Wed Dec 24 17:56:34 1997 Dimitrie O. Paun <dimi@cs.toronto.edu>
* [windows/syscolor.c]
Added definition of GetSysColorPen16/32. This function does not
exist in the Win32 API but is a very close (and natural) relative
to GetSysColorBrush function. Moreover, it is *very* much used
within Wine since there are a lot of places where we need to draw
lines with the standard colors.
* [controls/button.c] [controls/combo.c] [controls/icontitle.c]
[controls/menu.c] [controls/progress.c] [controls/scroll.c]
[controls/updown.c] [graphics/painting.c] [misc/tweak.c]
[windows/defwnd.c] [windows/graphics.c] [windows/nonclient.c]
Replaced references to sysColorObjects with the appropriate
call to GetSysColorBrush32/GetSysColorPen32. There is no need to
expose the implementation of these functions, even within Wine.
This makes the code easier to understand, debug, maintain.
* [controls/uitools.c]
Modified most of the functions in this file to use the now
standard pens (i.e. GetSysColorPen32). These functions made
*heavy* use of standard pens so I expect a lot less
CreatePen/DeleteObject calls can do only good...:)
Plus some minor modifications (*no* functional changes though).
* [controls/updown.c]
Used the new DrawFrameControl32 function to paint the control.
I also deleted UDDOWN_DrawArrow since it was no longer required.
Tue Dec 23 00:03:33 1997 Steinar Hamre <steinarh@stud.fim.ntnu.no>
* [configure.in]
Added check for -lw.
* [include/wintypes.h] [tools/build.c]
Changes to make the assembly understandable for even sun as.
".ascii" -> ".string", "call %foo" -> "call *%foo",
"pushw/popw %[cdes]s" written out to ".byte 0x66\npushl/popl %[cdes]s".
* [memory/ldt.c]
#ifdef added so <sys/seg.h> will not be included on Solaris.
Mon Dec 22 18:55:19 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [configure.in]
Added XF86DGA check.
* [multimedia/dsound.c][relay32/dsound.spec][include/dsound.h]
Started DirectSound. Only stubs for now.
* [graphics/ddraw.c][include/ddraw.h][relay32/ddraw.spec]
Started to implement DirectDraw. Mostly stubs, some
testcases work. Requires the XF86DGA extension to XFree86.
(check demo/blizdemo.exe from the Diablo CD-ROM).
* [files/drive.c]
Return correct "CDFS" fsname so Diablo is a bit happier.
Sun Dec 21 21:45:48 1997 Kevin Cozens <kcozens@interlog.com>
* [misc/registry.c]
Fixed bugs in the routines which read the Windows '95 registry
files. Added extra information regarding the format of the Windows
'95 registry files.
1998-01-04 17:49:09 +00:00
|
|
|
/* FIXME: should probably convert to monochrome instead */
|
2005-04-11 18:54:30 +00:00
|
|
|
XCopyPlane( gdi_display, physBitmap->pixmap, physDev->brush.pixmap,
|
|
|
|
|
BITMAP_monoGC, 0, 0, bitmap.bmWidth, bitmap.bmHeight, 0, 0, 1 );
|
Release 980104
Sat Jan 3 17:15:56 1998 Alexandre Julliard <julliard@lrc.epfl.ch>
* [debugger/db_disasm.c]
Added cpuid and cmpxchg instructions.
* [if1632/builtin.c] [relay32/builtin32.c]
Fixed broken -dll option with Win32 DLLs.
* [include/heap.h]
Added SYSTEM_LOCK/SYSTEM_UNLOCK macros.
* [configure.in] [misc/lstr.c]
Added check for wctype.h.
Commented out --enable-ipc option (IPC code has been broken for a
long time anyway).
* [scheduler/critsection.c] [scheduler/event.c]
[scheduler/mutex.c] [scheduler/semaphore.c]
Implemented Win32 synchronization objects.
* [scheduler/synchro.c]
Implemented WaitForMultipleObjects and related functions.
* [scheduler/thread.c]
If possible, use clone() in CreateThread().
* [scheduler/thread.c] [scheduler/process.c]
Made thread and process waitable objects.
Thread and process id values are now different from the pointers
they represent.
* [win32/k32obj.c]
Moved to scheduler directory.
Added function table for waiting operations on objects.
* [files/file.c] [memory/virtual.c]
Added new K32OBJ function table.
Sun Jan 1 16:48:23 1997 Andreas Mohr <100.30936@germany.net>
* [files/file.c]
Fixed my patch for GetTempFileName16() as needed.
It was ...Name32A() that didn't work properly, not ...Name16().
* [graphics/x11drv/brush.c]
Fixed a BadMatch error.
* [msdos/int21.c]
Fixed INT21_FindNextFCB() to get correct volume labels e.g.
in "file open" dialog.
* [multimedia/joystick.c] [relay32/winmm.spec]
Stub JoyGetPosEx().
* [scheduler/process.c] [relay32/kernel32.spec]
Implemented RegisterServiceProcess().
Wed Dec 31 11:14:43 1997 Lawson Whitney <lawson_whitney@juno.com>
* [if1632/kernel.spec] [if1632/relay.c]
Define CallProcEx32w - Thanks to Marcus Meissner for his excellent
CallProc32W.
* [loader/module.c]
Take a shot at defining FreeLibrary32W.
Sun Dec 28 12:44:04 1997 Kai Morich <kai.morich@rhein-neckar.netsurf.de>
* [controls/menu.c]
Menu modification from WM_INITMENUPOPUP message fixed.
Menu items now can have different wID and hSubMenu (Win95 behavior).
* [misc/cpu.c]
Improved IsProcessorFeaturePresent.
Sun Dec 28 03:21:08 1997 Ove Kaaven <ovek@main.arcticnet.no>
* [include/winsock.h] [misc/winsock.c]
Fixed WS_SOL_SOCKET for setsockopt(), and made select() return
empty fd_sets if timeout.
* [objects/palette.c]
AnimatePalette() bailed out if entire palette is animated. Fixed.
* [objects/dib.c]
Added some code to SetDIBitsToDevice() and its helpers to fix
some offseting problems.
* [objects/cursoricon.c]
Made CreateCursor32() convert the instance handle properly. Made
DestroyCursor() return correct success status.
Wed Dec 24 17:56:34 1997 Dimitrie O. Paun <dimi@cs.toronto.edu>
* [windows/syscolor.c]
Added definition of GetSysColorPen16/32. This function does not
exist in the Win32 API but is a very close (and natural) relative
to GetSysColorBrush function. Moreover, it is *very* much used
within Wine since there are a lot of places where we need to draw
lines with the standard colors.
* [controls/button.c] [controls/combo.c] [controls/icontitle.c]
[controls/menu.c] [controls/progress.c] [controls/scroll.c]
[controls/updown.c] [graphics/painting.c] [misc/tweak.c]
[windows/defwnd.c] [windows/graphics.c] [windows/nonclient.c]
Replaced references to sysColorObjects with the appropriate
call to GetSysColorBrush32/GetSysColorPen32. There is no need to
expose the implementation of these functions, even within Wine.
This makes the code easier to understand, debug, maintain.
* [controls/uitools.c]
Modified most of the functions in this file to use the now
standard pens (i.e. GetSysColorPen32). These functions made
*heavy* use of standard pens so I expect a lot less
CreatePen/DeleteObject calls can do only good...:)
Plus some minor modifications (*no* functional changes though).
* [controls/updown.c]
Used the new DrawFrameControl32 function to paint the control.
I also deleted UDDOWN_DrawArrow since it was no longer required.
Tue Dec 23 00:03:33 1997 Steinar Hamre <steinarh@stud.fim.ntnu.no>
* [configure.in]
Added check for -lw.
* [include/wintypes.h] [tools/build.c]
Changes to make the assembly understandable for even sun as.
".ascii" -> ".string", "call %foo" -> "call *%foo",
"pushw/popw %[cdes]s" written out to ".byte 0x66\npushl/popl %[cdes]s".
* [memory/ldt.c]
#ifdef added so <sys/seg.h> will not be included on Solaris.
Mon Dec 22 18:55:19 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [configure.in]
Added XF86DGA check.
* [multimedia/dsound.c][relay32/dsound.spec][include/dsound.h]
Started DirectSound. Only stubs for now.
* [graphics/ddraw.c][include/ddraw.h][relay32/ddraw.spec]
Started to implement DirectDraw. Mostly stubs, some
testcases work. Requires the XF86DGA extension to XFree86.
(check demo/blizdemo.exe from the Diablo CD-ROM).
* [files/drive.c]
Return correct "CDFS" fsname so Diablo is a bit happier.
Sun Dec 21 21:45:48 1997 Kevin Cozens <kcozens@interlog.com>
* [misc/registry.c]
Fixed bugs in the routines which read the Windows '95 registry
files. Added extra information regarding the format of the Windows
'95 registry files.
1998-01-04 17:49:09 +00:00
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2003-11-21 00:17:33 +00:00
|
|
|
physDev->brush.pixmap = XCreatePixmap( gdi_display, root_window,
|
2005-04-11 18:54:30 +00:00
|
|
|
bitmap.bmWidth, bitmap.bmHeight,
|
|
|
|
|
physBitmap->pixmap_depth );
|
|
|
|
|
XCopyArea( gdi_display, physBitmap->pixmap, physDev->brush.pixmap,
|
|
|
|
|
BITMAP_GC(physBitmap), 0, 0, bitmap.bmWidth, bitmap.bmHeight, 0, 0 );
|
Release 980104
Sat Jan 3 17:15:56 1998 Alexandre Julliard <julliard@lrc.epfl.ch>
* [debugger/db_disasm.c]
Added cpuid and cmpxchg instructions.
* [if1632/builtin.c] [relay32/builtin32.c]
Fixed broken -dll option with Win32 DLLs.
* [include/heap.h]
Added SYSTEM_LOCK/SYSTEM_UNLOCK macros.
* [configure.in] [misc/lstr.c]
Added check for wctype.h.
Commented out --enable-ipc option (IPC code has been broken for a
long time anyway).
* [scheduler/critsection.c] [scheduler/event.c]
[scheduler/mutex.c] [scheduler/semaphore.c]
Implemented Win32 synchronization objects.
* [scheduler/synchro.c]
Implemented WaitForMultipleObjects and related functions.
* [scheduler/thread.c]
If possible, use clone() in CreateThread().
* [scheduler/thread.c] [scheduler/process.c]
Made thread and process waitable objects.
Thread and process id values are now different from the pointers
they represent.
* [win32/k32obj.c]
Moved to scheduler directory.
Added function table for waiting operations on objects.
* [files/file.c] [memory/virtual.c]
Added new K32OBJ function table.
Sun Jan 1 16:48:23 1997 Andreas Mohr <100.30936@germany.net>
* [files/file.c]
Fixed my patch for GetTempFileName16() as needed.
It was ...Name32A() that didn't work properly, not ...Name16().
* [graphics/x11drv/brush.c]
Fixed a BadMatch error.
* [msdos/int21.c]
Fixed INT21_FindNextFCB() to get correct volume labels e.g.
in "file open" dialog.
* [multimedia/joystick.c] [relay32/winmm.spec]
Stub JoyGetPosEx().
* [scheduler/process.c] [relay32/kernel32.spec]
Implemented RegisterServiceProcess().
Wed Dec 31 11:14:43 1997 Lawson Whitney <lawson_whitney@juno.com>
* [if1632/kernel.spec] [if1632/relay.c]
Define CallProcEx32w - Thanks to Marcus Meissner for his excellent
CallProc32W.
* [loader/module.c]
Take a shot at defining FreeLibrary32W.
Sun Dec 28 12:44:04 1997 Kai Morich <kai.morich@rhein-neckar.netsurf.de>
* [controls/menu.c]
Menu modification from WM_INITMENUPOPUP message fixed.
Menu items now can have different wID and hSubMenu (Win95 behavior).
* [misc/cpu.c]
Improved IsProcessorFeaturePresent.
Sun Dec 28 03:21:08 1997 Ove Kaaven <ovek@main.arcticnet.no>
* [include/winsock.h] [misc/winsock.c]
Fixed WS_SOL_SOCKET for setsockopt(), and made select() return
empty fd_sets if timeout.
* [objects/palette.c]
AnimatePalette() bailed out if entire palette is animated. Fixed.
* [objects/dib.c]
Added some code to SetDIBitsToDevice() and its helpers to fix
some offseting problems.
* [objects/cursoricon.c]
Made CreateCursor32() convert the instance handle properly. Made
DestroyCursor() return correct success status.
Wed Dec 24 17:56:34 1997 Dimitrie O. Paun <dimi@cs.toronto.edu>
* [windows/syscolor.c]
Added definition of GetSysColorPen16/32. This function does not
exist in the Win32 API but is a very close (and natural) relative
to GetSysColorBrush function. Moreover, it is *very* much used
within Wine since there are a lot of places where we need to draw
lines with the standard colors.
* [controls/button.c] [controls/combo.c] [controls/icontitle.c]
[controls/menu.c] [controls/progress.c] [controls/scroll.c]
[controls/updown.c] [graphics/painting.c] [misc/tweak.c]
[windows/defwnd.c] [windows/graphics.c] [windows/nonclient.c]
Replaced references to sysColorObjects with the appropriate
call to GetSysColorBrush32/GetSysColorPen32. There is no need to
expose the implementation of these functions, even within Wine.
This makes the code easier to understand, debug, maintain.
* [controls/uitools.c]
Modified most of the functions in this file to use the now
standard pens (i.e. GetSysColorPen32). These functions made
*heavy* use of standard pens so I expect a lot less
CreatePen/DeleteObject calls can do only good...:)
Plus some minor modifications (*no* functional changes though).
* [controls/updown.c]
Used the new DrawFrameControl32 function to paint the control.
I also deleted UDDOWN_DrawArrow since it was no longer required.
Tue Dec 23 00:03:33 1997 Steinar Hamre <steinarh@stud.fim.ntnu.no>
* [configure.in]
Added check for -lw.
* [include/wintypes.h] [tools/build.c]
Changes to make the assembly understandable for even sun as.
".ascii" -> ".string", "call %foo" -> "call *%foo",
"pushw/popw %[cdes]s" written out to ".byte 0x66\npushl/popl %[cdes]s".
* [memory/ldt.c]
#ifdef added so <sys/seg.h> will not be included on Solaris.
Mon Dec 22 18:55:19 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [configure.in]
Added XF86DGA check.
* [multimedia/dsound.c][relay32/dsound.spec][include/dsound.h]
Started DirectSound. Only stubs for now.
* [graphics/ddraw.c][include/ddraw.h][relay32/ddraw.spec]
Started to implement DirectDraw. Mostly stubs, some
testcases work. Requires the XF86DGA extension to XFree86.
(check demo/blizdemo.exe from the Diablo CD-ROM).
* [files/drive.c]
Return correct "CDFS" fsname so Diablo is a bit happier.
Sun Dec 21 21:45:48 1997 Kevin Cozens <kcozens@interlog.com>
* [misc/registry.c]
Fixed bugs in the routines which read the Windows '95 registry
files. Added extra information regarding the format of the Windows
'95 registry files.
1998-01-04 17:49:09 +00:00
|
|
|
}
|
2003-11-21 00:17:33 +00:00
|
|
|
wine_tsx11_unlock();
|
2002-05-31 23:06:46 +00:00
|
|
|
|
2005-04-11 18:54:30 +00:00
|
|
|
if (physBitmap->pixmap_depth > 1)
|
1997-02-02 19:01:52 +00:00
|
|
|
{
|
1998-11-25 12:36:03 +00:00
|
|
|
physDev->brush.fillStyle = FillTiled;
|
|
|
|
|
physDev->brush.pixel = 0; /* Ignored */
|
1997-02-02 19:01:52 +00:00
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
1998-11-25 12:36:03 +00:00
|
|
|
physDev->brush.fillStyle = FillOpaqueStippled;
|
|
|
|
|
physDev->brush.pixel = -1; /* Special case (see DC_SetupGCForBrush) */
|
1997-02-02 19:01:52 +00:00
|
|
|
}
|
2005-04-11 18:54:30 +00:00
|
|
|
return TRUE;
|
1997-02-02 19:01:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
2002-04-03 02:37:09 +00:00
|
|
|
* SelectBrush (X11DRV.@)
|
1997-02-02 19:01:52 +00:00
|
|
|
*/
|
2002-03-28 22:22:05 +00:00
|
|
|
HBRUSH X11DRV_SelectBrush( X11DRV_PDEVICE *physDev, HBRUSH hbrush )
|
1997-02-02 19:01:52 +00:00
|
|
|
{
|
2001-08-16 19:13:52 +00:00
|
|
|
LOGBRUSH logbrush;
|
2002-10-31 02:12:18 +00:00
|
|
|
HBITMAP hBitmap;
|
1997-02-02 19:01:52 +00:00
|
|
|
BITMAPINFO * bmpInfo;
|
2001-08-16 19:13:52 +00:00
|
|
|
|
|
|
|
|
if (!GetObjectA( hbrush, sizeof(logbrush), &logbrush )) return 0;
|
|
|
|
|
|
2002-10-31 02:38:20 +00:00
|
|
|
TRACE("hdc=%p hbrush=%p\n", physDev->hdc,hbrush);
|
1997-02-02 19:01:52 +00:00
|
|
|
|
1998-11-25 12:36:03 +00:00
|
|
|
if (physDev->brush.pixmap)
|
1997-02-02 19:01:52 +00:00
|
|
|
{
|
2003-11-21 05:41:56 +00:00
|
|
|
wine_tsx11_lock();
|
|
|
|
|
XFreePixmap( gdi_display, physDev->brush.pixmap );
|
|
|
|
|
wine_tsx11_unlock();
|
|
|
|
|
physDev->brush.pixmap = 0;
|
1997-02-02 19:01:52 +00:00
|
|
|
}
|
2001-08-16 19:13:52 +00:00
|
|
|
physDev->brush.style = logbrush.lbStyle;
|
2003-11-05 01:43:57 +00:00
|
|
|
if (hbrush == GetStockObject( DC_BRUSH ))
|
2004-01-18 22:20:17 +00:00
|
|
|
logbrush.lbColor = GetDCBrushColor( physDev->hdc );
|
2002-05-31 23:06:46 +00:00
|
|
|
|
2001-08-16 19:13:52 +00:00
|
|
|
switch(logbrush.lbStyle)
|
1997-02-02 19:01:52 +00:00
|
|
|
{
|
|
|
|
|
case BS_NULL:
|
1999-06-26 19:09:08 +00:00
|
|
|
TRACE("BS_NULL\n" );
|
1997-02-02 19:01:52 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case BS_SOLID:
|
1999-06-26 19:09:08 +00:00
|
|
|
TRACE("BS_SOLID\n" );
|
2002-03-28 22:22:05 +00:00
|
|
|
BRUSH_SelectSolidBrush( physDev, logbrush.lbColor );
|
1997-02-02 19:01:52 +00:00
|
|
|
break;
|
2002-05-31 23:06:46 +00:00
|
|
|
|
1997-02-02 19:01:52 +00:00
|
|
|
case BS_HATCHED:
|
1999-06-26 19:09:08 +00:00
|
|
|
TRACE("BS_HATCHED\n" );
|
2002-03-28 22:22:05 +00:00
|
|
|
physDev->brush.pixel = X11DRV_PALETTE_ToPhysical( physDev, logbrush.lbColor );
|
2003-11-21 00:17:33 +00:00
|
|
|
wine_tsx11_lock();
|
|
|
|
|
physDev->brush.pixmap = XCreateBitmapFromData( gdi_display, root_window,
|
|
|
|
|
HatchBrushes[logbrush.lbHatch], 8, 8 );
|
|
|
|
|
wine_tsx11_unlock();
|
1998-11-25 12:36:03 +00:00
|
|
|
physDev->brush.fillStyle = FillStippled;
|
1997-02-02 19:01:52 +00:00
|
|
|
break;
|
2002-05-31 23:06:46 +00:00
|
|
|
|
1997-02-02 19:01:52 +00:00
|
|
|
case BS_PATTERN:
|
1999-06-26 19:09:08 +00:00
|
|
|
TRACE("BS_PATTERN\n");
|
2002-05-31 18:43:22 +00:00
|
|
|
if (!BRUSH_SelectPatternBrush( physDev, (HBITMAP)logbrush.lbHatch )) return 0;
|
1997-02-02 19:01:52 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case BS_DIBPATTERN:
|
1999-06-26 19:09:08 +00:00
|
|
|
TRACE("BS_DIBPATTERN\n");
|
2001-08-16 19:13:52 +00:00
|
|
|
if ((bmpInfo = (BITMAPINFO *) GlobalLock16( (HGLOBAL16)logbrush.lbHatch )))
|
1997-02-02 19:01:52 +00:00
|
|
|
{
|
2004-01-13 23:31:46 +00:00
|
|
|
int size = X11DRV_DIB_BitmapInfoSize( bmpInfo, logbrush.lbColor );
|
2002-03-28 22:22:05 +00:00
|
|
|
hBitmap = CreateDIBitmap( physDev->hdc, &bmpInfo->bmiHeader,
|
1997-02-02 19:01:52 +00:00
|
|
|
CBM_INIT, ((char *)bmpInfo) + size,
|
|
|
|
|
bmpInfo,
|
2001-08-16 19:13:52 +00:00
|
|
|
(WORD)logbrush.lbColor );
|
2002-03-28 22:22:05 +00:00
|
|
|
BRUSH_SelectPatternBrush( physDev, hBitmap );
|
2001-06-25 20:08:44 +00:00
|
|
|
DeleteObject( hBitmap );
|
2002-05-31 23:06:46 +00:00
|
|
|
GlobalUnlock16( (HGLOBAL16)logbrush.lbHatch );
|
1997-02-02 19:01:52 +00:00
|
|
|
}
|
2002-05-31 23:06:46 +00:00
|
|
|
|
1997-02-02 19:01:52 +00:00
|
|
|
break;
|
|
|
|
|
}
|
2002-03-28 22:22:05 +00:00
|
|
|
return hbrush;
|
1997-02-02 19:01:52 +00:00
|
|
|
}
|
2003-11-05 01:43:57 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
|
* SetDCBrushColor (X11DRV.@)
|
|
|
|
|
*/
|
|
|
|
|
COLORREF X11DRV_SetDCBrushColor( X11DRV_PDEVICE *physDev, COLORREF crColor )
|
|
|
|
|
{
|
|
|
|
|
if (GetCurrentObject(physDev->hdc, OBJ_BRUSH) == GetStockObject( DC_BRUSH ))
|
|
|
|
|
BRUSH_SelectSolidBrush( physDev, crColor );
|
|
|
|
|
|
|
|
|
|
return crColor;
|
|
|
|
|
}
|