Sat Jul 19 13:03:01 1997 Alexandre Julliard <julliard@lrc.epfl.ch> * [tools/build.c] [include/stackframe.h] Save the complete %ebp register in CallFrom16; fixes a crash with LabView reported by Andreas Mohr. * [loader/main.c] Avoid executing a built-in DLL. * [controls/static.c] Converted static window procedure to Win32. * [windows/message.c] [windows/queue.c] [include/queue.h] Hacked SendMessage functions to support inter-task messages with SendMessage32A/W. Sun Jul 13 16:55:35 1997 Bernhard Rosenkraenzer <bero@bero-online.ml.org> * [ipc/bit_array.c] Don't use bitops.h in Linux 2.1.x (these versions do not return the previous state for clear_bit and set_bit) * [ipc/shm_main_blk.c] Adapt to GLIBC's ipc_perm structure. * [memory/ldt.c] Include <asm/unistd.h> on Linux/GLIBC systems (required for _syscall3). Wed Jul 9 23:53:19 1997 David A. Cuthbert <dacut@henry.ece.cmu.edu> * [include/options.h] [files/profile.c] Added PROFILE_GetWineIniBool and PROFILE_EnumerateWineIniSection. * [include/sysmetrics.h] [include/windows.h] [windows/sysmetrics.c] All sysmetrics moved to array (no more constant macros). Added MOUSEWHEELPRESENT metric. * [include/bitmap.h] [objects/oembitmap.c] Added OBM_Init() (see also loader/main.c) and more support for Win95 bitmaps; added size info to OEM bitmaps. * [include/graphics.h] [windows/graphics.h] Added GRAPH_DrawGenericReliefRect. * [loader/main.c] Added TWEAK_Init() and TWEAK_CheckConfiguration() calls (the latter checks for invalid entries in wine.conf). * [include/debug.h] [include/stddebug.h] [include/nonclient.h] [include/tweak.h] [controls/menu.c] [misc/tweak.c] [objects/gdiobj.c] [windows/syscolor.c] [windows/nonclient.c] [BUGS] [documentation/win95look] Added tweaks for Windows 95 interface support. See documentation/win95look for more information. * [controls/edit.c] Fixed EDIT_MoveHome bug. * [misc/ver.c] Changed name of dprintf_ver_string to ver_dstring to fix problem with tools/make_debug utility. Wed Jul 9 21:31:54 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de> * [objects/dib.c] Don't use palettes with dibs with biBitCount > 8. * [misc/ole2nls.c][misc/ver.c] IsValidLocale, EnumSystemLocales fixed (winhlp32.exe works) Some VerLanguage coded moved to ole2nls.c, some cleanups. * [multimedia/mcistring.c] Fixed "capabilities <dev> device type" crash (cool.exe). * [misc/main.c] SystemParametersInfo*: added stub option 41 (GETNONCLIENTMETRICS), duplicated some stuff away from SPI16 that writes 32bit vars.(one COMCTL32.DLL crash, freecell.exe) Tue Jul 8 22:40:53 1997 Morten Welinder <terra@diku.dk> * [if1632/shell32.spec] Use Windows 95's ordinals. Help wanted, inquire within. Mon Jul 7 11:20:36 1997 Philippe De Muyter <phdm@info.ucl.ac.be> * [if1632/relay.c] [if1632/user.spec] [if1632/kernel.spec] [tools/build-spec.txt] [tools/build.c] Added type 'segstr' (segmented pointer to null-terminated string) to .spec files. * [windows/user.c] [if1632/user.spec] ExitWindowsExec stub function added. Mon Jul 7 01:18:25 1997 U. Bonnes <bon@elektron.ikp.physik.th-darmstadt.de> * [files/file.c] [include/winbase.h] [if1632/kernel32.spec] Implement MoveFileEx32, some enhancement for Movefile32. Sat Jul 5 18:13:48 1997 Bruce Milner <Bruce.Milner@genetics.utah.edu. * [files/file.c] [if1632/kernel32.spec] [include/winerror.h] [msdos/int21.c] [win32/file.c] Add LockFile/UnlockFile implementation. Add back in int21 func(0x5c) Record locking functions. * [files/file.c] Fixed bug with OF_REOPEN in FILE_DoOpenFile. Fri Jul 4 12:00:00 1997 Henrik Olsen <Henrik.Olsen@iaeste.dk> * [misc/ole2nls.c] [programs/progman/Da.rc] [programs/winhelp/Da.rc] [resources/sysres_Da.rc] Added/updated Danish language support. Thu Jul 3 13:04:20 1997 Claus Fischer <fischer@iue.tuwien.ac.at> * [files/dos_fs.c] Properly implemented DOSFS_UnixTimeToFileTime and DOSFS_FileTimeToUnixTime. * [documentation/wine.texinfo] First version of texinfo documentation.
239 lines
6.5 KiB
C
239 lines
6.5 KiB
C
/*
|
|
* X-specific shortcuts to speed up WM code.
|
|
* No coordinate transformations except origin translation.
|
|
*
|
|
* Copyright 1993, 1994 Alexandre Julliard
|
|
*/
|
|
|
|
#include <assert.h>
|
|
#include <stdlib.h>
|
|
#include <X11/Xlib.h>
|
|
#include <X11/Xutil.h>
|
|
#include <X11/Intrinsic.h>
|
|
#include "graphics.h"
|
|
#include "color.h"
|
|
#include "bitmap.h"
|
|
#include "gdi.h"
|
|
#include "dc.h"
|
|
#include "syscolor.h"
|
|
|
|
#define MAX_DRAWLINES 8
|
|
|
|
|
|
/**********************************************************************
|
|
* GRAPH_DrawLines
|
|
*
|
|
* Draw multiple unconnected lines (limited by MAX_DRAWLINES).
|
|
*/
|
|
BOOL32 GRAPH_DrawLines( HDC32 hdc, LPPOINT32 pXY, INT32 N, HPEN32 hPen )
|
|
{
|
|
BOOL32 bRet = FALSE;
|
|
DC* dc;
|
|
|
|
assert( N <= MAX_DRAWLINES );
|
|
if( (dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC )) )
|
|
{
|
|
HPEN32 hPrevPen = 0;
|
|
|
|
if( hPen ) hPrevPen = SelectObject32( hdc, hPen );
|
|
if( DC_SetupGCForPen( dc ) )
|
|
{
|
|
XSegment l[MAX_DRAWLINES];
|
|
INT32 i, j;
|
|
|
|
for( i = 0; i < N; i++ )
|
|
{
|
|
j = 2 * i;
|
|
l[i].x1 = pXY[j].x + dc->w.DCOrgX;
|
|
l[i].x2 = pXY[j + 1].x + dc->w.DCOrgX;
|
|
l[i].y1 = pXY[j].y + dc->w.DCOrgY;
|
|
l[i].y2 = pXY[j + 1].y + dc->w.DCOrgY;
|
|
}
|
|
XDrawSegments( display, dc->u.x.drawable, dc->u.x.gc, l, N );
|
|
bRet = TRUE;
|
|
}
|
|
if( hPrevPen ) SelectObject32( hdc, hPrevPen );
|
|
}
|
|
return bRet;
|
|
}
|
|
|
|
/**********************************************************************
|
|
*
|
|
* GRAPH_DrawBitmap
|
|
*
|
|
* Short-cut function to blit a bitmap into a device.
|
|
* Faster than CreateCompatibleDC() + SelectBitmap() + BitBlt() + DeleteDC().
|
|
*/
|
|
BOOL32 GRAPH_DrawBitmap( HDC32 hdc, HBITMAP32 hbitmap,
|
|
INT32 xdest, INT32 ydest, INT32 xsrc, INT32 ysrc,
|
|
INT32 width, INT32 height, BOOL32 bMono )
|
|
{
|
|
BITMAPOBJ *bmp;
|
|
DC *dc;
|
|
|
|
if (!(dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC ))) return FALSE;
|
|
if (!(bmp = (BITMAPOBJ *) GDI_GetObjPtr( hbitmap, BITMAP_MAGIC )))
|
|
return FALSE;
|
|
|
|
xdest += dc->w.DCOrgX; ydest += dc->w.DCOrgY;
|
|
|
|
XSetFunction( display, dc->u.x.gc, GXcopy );
|
|
if (bmp->bitmap.bmBitsPixel == 1)
|
|
{
|
|
XSetForeground( display, dc->u.x.gc, dc->w.backgroundPixel );
|
|
XSetBackground( display, dc->u.x.gc, dc->w.textPixel );
|
|
XCopyPlane( display, bmp->pixmap, dc->u.x.drawable, dc->u.x.gc,
|
|
xsrc, ysrc, width, height, xdest, ydest, 1 );
|
|
}
|
|
else if (bmp->bitmap.bmBitsPixel == dc->w.bitsPerPixel)
|
|
{
|
|
if( bMono )
|
|
{
|
|
INT32 plane;
|
|
|
|
if( COLOR_GetMonoPlane(&plane) )
|
|
{
|
|
XSetForeground( display, dc->u.x.gc, dc->w.backgroundPixel );
|
|
XSetBackground( display, dc->u.x.gc, dc->w.textPixel );
|
|
}
|
|
else
|
|
{
|
|
XSetForeground( display, dc->u.x.gc, dc->w.textPixel );
|
|
XSetBackground( display, dc->u.x.gc, dc->w.backgroundPixel );
|
|
}
|
|
XCopyPlane( display, bmp->pixmap, dc->u.x.drawable, dc->u.x.gc,
|
|
xsrc, ysrc, width, height, xdest, ydest, plane );
|
|
}
|
|
else
|
|
XCopyArea( display, bmp->pixmap, dc->u.x.drawable,
|
|
dc->u.x.gc, xsrc, ysrc, width, height, xdest, ydest );
|
|
}
|
|
else return FALSE;
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
|
|
/**********************************************************************
|
|
* GRAPH_DrawReliefRect
|
|
*
|
|
* Used in the standard control code for button edge drawing.
|
|
*/
|
|
void GRAPH_DrawReliefRect( HDC32 hdc, const RECT32 *rect, INT32 highlight_size,
|
|
INT32 shadow_size, BOOL32 pressed )
|
|
{
|
|
if(pressed)
|
|
GRAPH_DrawGenericReliefRect(hdc, rect, highlight_size, shadow_size,
|
|
sysColorObjects.hbrushBtnShadow,
|
|
sysColorObjects.hbrushBtnHighlight);
|
|
else
|
|
GRAPH_DrawGenericReliefRect(hdc, rect, highlight_size, shadow_size,
|
|
sysColorObjects.hbrushBtnHighlight,
|
|
sysColorObjects.hbrushBtnShadow);
|
|
|
|
return;
|
|
}
|
|
|
|
|
|
/******************************************************************************
|
|
* GRAPH_DrawGenericReliefRect
|
|
*
|
|
* Creates a rectangle with the specified highlight and shadow colors.
|
|
* Adapted from DrawReliefRect (which is somewhat misnamed).
|
|
*/
|
|
void GRAPH_DrawGenericReliefRect(
|
|
HDC32 hdc,
|
|
const RECT32 *rect,
|
|
INT32 highlight_size,
|
|
INT32 shadow_size,
|
|
HBRUSH32 highlight,
|
|
HBRUSH32 shadow )
|
|
{
|
|
DC* dc;
|
|
HBRUSH32 hPrevBrush;
|
|
INT32 w, h;
|
|
RECT32 r = *rect;
|
|
|
|
if (!(dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC ))) return;
|
|
|
|
OffsetRect32( &r, dc->w.DCOrgX, dc->w.DCOrgY);
|
|
h = rect->bottom - rect->top; w = rect->right - rect->left;
|
|
|
|
hPrevBrush = SelectObject32(hdc, highlight);
|
|
|
|
if ( DC_SetupGCForBrush( dc ) )
|
|
{
|
|
INT32 i;
|
|
|
|
XSetFunction( display, dc->u.x.gc, GXcopy );
|
|
for (i = 0; i < highlight_size; i++)
|
|
{
|
|
XFillRectangle( display, dc->u.x.drawable, dc->u.x.gc,
|
|
r.left + i, r.top, 1, h - i );
|
|
XFillRectangle( display, dc->u.x.drawable, dc->u.x.gc,
|
|
r.left, r.top + i, w - i, 1 );
|
|
}
|
|
}
|
|
|
|
SelectObject32( hdc, shadow );
|
|
if ( DC_SetupGCForBrush( dc ) )
|
|
{
|
|
INT32 i;
|
|
|
|
XSetFunction( display, dc->u.x.gc, GXcopy );
|
|
for (i = 0; i < shadow_size; i++)
|
|
{
|
|
XFillRectangle( display, dc->u.x.drawable, dc->u.x.gc,
|
|
r.right - i - 1, r.top + i, 1, h - i );
|
|
XFillRectangle( display, dc->u.x.drawable, dc->u.x.gc,
|
|
r.left + i, r.bottom - i - 1, w - i, 1 );
|
|
}
|
|
}
|
|
|
|
SelectObject32( hdc, hPrevBrush );
|
|
}
|
|
|
|
|
|
|
|
/**********************************************************************
|
|
* GRAPH_DrawRectangle
|
|
*/
|
|
void GRAPH_DrawRectangle( HDC32 hdc, INT32 x, INT32 y,
|
|
INT32 w, INT32 h, HPEN32 hPen )
|
|
{
|
|
DC* dc;
|
|
|
|
if( (dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC )) )
|
|
{
|
|
HPEN32 hPrevPen = 0;
|
|
|
|
if( hPen ) hPrevPen = SelectObject32( hdc, hPen );
|
|
if( DC_SetupGCForPen( dc ) )
|
|
XDrawRectangle( display, dc->u.x.drawable, dc->u.x.gc,
|
|
x + dc->w.DCOrgX, y + dc->w.DCOrgY, w - 1, h - 1);
|
|
if( hPrevPen ) SelectObject32( hdc, hPrevPen );
|
|
}
|
|
}
|
|
|
|
/**********************************************************************
|
|
* GRAPH_SelectClipMask
|
|
*/
|
|
BOOL32 GRAPH_SelectClipMask( HDC32 hdc, HBITMAP32 hMonoBitmap, INT32 x, INT32 y)
|
|
{
|
|
BITMAPOBJ *bmp = NULL;
|
|
DC *dc;
|
|
|
|
if (!(dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC ))) return FALSE;
|
|
if ( hMonoBitmap )
|
|
{
|
|
if ( !(bmp = (BITMAPOBJ *) GDI_GetObjPtr( hMonoBitmap, BITMAP_MAGIC))
|
|
|| bmp->bitmap.bmBitsPixel != 1 ) return FALSE;
|
|
|
|
XSetClipOrigin( display, dc->u.x.gc, dc->w.DCOrgX + x, dc->w.DCOrgY + y);
|
|
}
|
|
|
|
XSetClipMask( display, dc->u.x.gc, (bmp) ? bmp->pixmap : None );
|
|
|
|
return TRUE;
|
|
}
|
|
|