1993-09-04 10:09:32 +00:00
|
|
|
/*
|
|
|
|
* GDI graphics operations
|
|
|
|
*
|
|
|
|
* Copyright 1993 Alexandre Julliard
|
|
|
|
*/
|
|
|
|
|
|
|
|
static char Copyright[] = "Copyright Alexandre Julliard, 1993";
|
|
|
|
|
|
|
|
#include <math.h>
|
|
|
|
#include <X11/Xlib.h>
|
Release 0.4.0
Mon Sep 13 05:00:11 1993 Eric Youngdale
* [Makefile] [if1632/relay.c] [include/dlls.h] [selector.c]
[loader/wine.c] [tools/build.c]
Added ability to generate missing functions statistics.
Mon Sep 13 12:09:47 1993 Scott A. Laird (scott@curly)
* [WIN31-APPLETS]
Added new file.
* [if1632/kernel.spec]
Added definitions for GetProfile{Int,String} and SetHandleCount.
* [if1632/keyboard.spec]
Created interface specification for Keyboard driver DLL.
* [if1632/relay.c]
Added keyboard.dll to list of included DLLs.
* [if1632/user.spec]
Added LoadAccelerators definition.
* [loader/resource.c]
Added LoadAccelerators stub.
* [misc/file.c]
Changed OpenFile, and added SetHandleCount (for winfile.exe)
* [misc/keyboard.c]
Added keyboard code.
* [misc/profile.c] [misc/xt.c]
Moved GetPrivateProfile* commands here, and added GetProfile*
commands.
Mon Sep 13 10:24:37 1993 Andrew Bulhak
* [windows/utility.c]
Implemented MulDiv(), OutputDebugString() and wvsprintf()
Fri Sep 10 09:13:30 1993 John Brezak
* [*/Makefile]
Created patch to allow BSD make to build wine.
* [windows/win.c]
Fixed NULL pointer reference.
* [windows/message.c] [misc/xt.c]
Defined HZ to handle system specific timing.
* [windows/graphics.c]
Use M_PI is PI
* [objects/pallete.c]
NetBSD does not have /usr/include/values.h and MAXINT is INT_MAX.
* [dump.c] [ldt.c] [wine.c]
ifdef'ed linux headers for linux compile.
* [loader/ldtlib.c]
Add NetBSD system calls when compiled on that system.
* [loader/selector.c]
Use mmap(MAP_ANON, ...) for NetBSD.
* [if1632/call.S]
Fixed selector assumptions.
Thu Sep 9 20:01:37 1993 David Metcalfe
* [controls/WinButton*] [controls/button.c] [controls/widget.c]
[windows/win.c] [windows/class.c]
Added 3D button control and tied into CreateWindow()
Thu Sep 9 07:35:24 1993 Scott Laird
* [if1632/sound.spec]
Created interface specification for SOUND DLL.
* [if1632/win87em.spec]
Added more functions to the WIN87EM DLL interface specification
* [misc/emulate.c]
Created stubs for the new math emulation functions.
* [misc/sound.c]
Created stubs for the SOUND DLL.
Sun Sep 5 21:02:10 1993 John Burton
* [if1632/kernel.spec]
Added interface specifications for OpenFile, _lclose, _lread, _lopen,
and _lwrite.
* [include/windows.h]
Added OF_ macros
* [misc/file.c]
Implemented OpenFile, _lclose, _lread, _lopen and _lwrite.
Fri Sep 3 18:47:03 1993 Alexandre Julliard
* [windows/dc.c]
Bug fix
* [objects/text.c]
Bug fix
Fri Sep 3 18:47:03 1993 Bob Amstadt
* [objects/linedda.c]
Finished LineDDA().
1993-09-14 16:47:10 +00:00
|
|
|
#ifndef PI
|
|
|
|
#define PI M_PI
|
|
|
|
#endif
|
1993-09-04 10:09:32 +00:00
|
|
|
|
|
|
|
#include "gdi.h"
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* LineTo (GDI.19)
|
|
|
|
*/
|
|
|
|
BOOL LineTo( HDC hdc, short x, short y )
|
|
|
|
{
|
|
|
|
DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
|
|
|
|
if (!dc) return FALSE;
|
|
|
|
if (DC_SetupGCForPen( dc ))
|
|
|
|
XDrawLine(XT_display, dc->u.x.drawable, dc->u.x.gc,
|
|
|
|
XLPTODP( dc, dc->w.CursPosX ), YLPTODP( dc, dc->w.CursPosY ),
|
|
|
|
XLPTODP( dc, x ), YLPTODP( dc, y ) );
|
|
|
|
dc->w.CursPosX = x;
|
|
|
|
dc->w.CursPosY = y;
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* MoveTo (GDI.20)
|
|
|
|
*/
|
|
|
|
DWORD MoveTo( HDC hdc, short x, short y )
|
|
|
|
{
|
|
|
|
POINT pt;
|
|
|
|
if (MoveToEx( hdc, x, y, &pt )) return pt.x | (pt.y << 16);
|
|
|
|
else return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* MoveToEx (GDI.483)
|
|
|
|
*/
|
|
|
|
BOOL MoveToEx( HDC hdc, short x, short y, LPPOINT pt )
|
|
|
|
{
|
|
|
|
DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
|
|
|
|
if (!dc) return FALSE;
|
|
|
|
if (pt)
|
|
|
|
{
|
|
|
|
pt->x = dc->w.CursPosX;
|
|
|
|
pt->y = dc->w.CursPosY;
|
|
|
|
}
|
|
|
|
dc->w.CursPosX = x;
|
|
|
|
dc->w.CursPosY = y;
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* GRAPH_DrawArc
|
|
|
|
*
|
|
|
|
* Helper functions for Arc(), Chord() and Pie().
|
|
|
|
* 'lines' is the number of lines to draw: 0 for Arc, 1 for Chord, 2 for Pie.
|
|
|
|
*/
|
|
|
|
BOOL GRAPH_DrawArc( HDC hdc, int left, int top, int right, int bottom,
|
|
|
|
int xstart, int ystart, int xend, int yend, int lines )
|
|
|
|
{
|
|
|
|
int xcenter, ycenter;
|
|
|
|
double start_angle, end_angle, diff_angle;
|
|
|
|
XPoint points[3];
|
|
|
|
DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
|
|
|
|
if (!dc) return FALSE;
|
|
|
|
|
|
|
|
left = XLPTODP( dc, left );
|
|
|
|
top = YLPTODP( dc, top );
|
|
|
|
right = XLPTODP( dc, right );
|
|
|
|
bottom = YLPTODP( dc, bottom );
|
|
|
|
xstart = XLPTODP( dc, xstart );
|
|
|
|
ystart = YLPTODP( dc, ystart );
|
|
|
|
xend = XLPTODP( dc, xend );
|
|
|
|
yend = YLPTODP( dc, yend );
|
|
|
|
if ((left == right) || (top == bottom)) return FALSE;
|
|
|
|
|
|
|
|
if (!DC_SetupGCForPen( dc )) return TRUE;
|
|
|
|
|
|
|
|
xcenter = (right + left) / 2;
|
|
|
|
ycenter = (bottom + top) / 2;
|
|
|
|
start_angle = atan2( (double)(ycenter-ystart)*(right-left),
|
|
|
|
(double)(xstart-xcenter)*(bottom-top) );
|
|
|
|
end_angle = atan2( (double)(ycenter-yend)*(right-left),
|
|
|
|
(double)(xend-xcenter)*(bottom-top) );
|
|
|
|
diff_angle = end_angle - start_angle;
|
|
|
|
if (diff_angle < 0.0) diff_angle += 2*PI;
|
|
|
|
|
|
|
|
XDrawArc( XT_display, dc->u.x.drawable, dc->u.x.gc,
|
|
|
|
left, top, right-left-1, bottom-top-1,
|
|
|
|
(int)(start_angle * 180 * 64 / PI),
|
|
|
|
(int)(diff_angle * 180 * 64 / PI) );
|
|
|
|
if (!lines) return TRUE;
|
|
|
|
|
|
|
|
points[0].x = xcenter + (int)(cos(start_angle) * (right-left) / 2);
|
|
|
|
points[0].y = ycenter - (int)(sin(start_angle) * (bottom-top) / 2);
|
|
|
|
points[1].x = xcenter + (int)(cos(end_angle) * (right-left) / 2);
|
|
|
|
points[1].y = ycenter - (int)(sin(end_angle) * (bottom-top) / 2);
|
|
|
|
if (lines == 2)
|
|
|
|
{
|
|
|
|
points[2] = points[1];
|
|
|
|
points[1].x = xcenter;
|
|
|
|
points[1].y = ycenter;
|
|
|
|
}
|
|
|
|
XDrawLines( XT_display, dc->u.x.drawable, dc->u.x.gc,
|
|
|
|
points, lines+1, CoordModeOrigin );
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* Arc (GDI.23)
|
|
|
|
*/
|
|
|
|
BOOL Arc( HDC hdc, int left, int top, int right, int bottom,
|
|
|
|
int xstart, int ystart, int xend, int yend )
|
|
|
|
{
|
|
|
|
return GRAPH_DrawArc( hdc, left, top, right, bottom,
|
|
|
|
xstart, ystart, xend, yend, 0 );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* Pie (GDI.26)
|
|
|
|
*/
|
|
|
|
BOOL Pie( HDC hdc, int left, int top, int right, int bottom,
|
|
|
|
int xstart, int ystart, int xend, int yend )
|
|
|
|
{
|
|
|
|
return GRAPH_DrawArc( hdc, left, top, right, bottom,
|
|
|
|
xstart, ystart, xend, yend, 2 );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* Chord (GDI.348)
|
|
|
|
*/
|
|
|
|
BOOL Chord( HDC hdc, int left, int top, int right, int bottom,
|
|
|
|
int xstart, int ystart, int xend, int yend )
|
|
|
|
{
|
|
|
|
return GRAPH_DrawArc( hdc, left, top, right, bottom,
|
|
|
|
xstart, ystart, xend, yend, 1 );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* Ellipse (GDI.24)
|
|
|
|
*/
|
|
|
|
BOOL Ellipse( HDC hdc, int left, int top, int right, int bottom )
|
|
|
|
{
|
|
|
|
DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
|
|
|
|
if (!dc) return FALSE;
|
|
|
|
|
|
|
|
left = XLPTODP( dc, left );
|
|
|
|
top = YLPTODP( dc, top );
|
|
|
|
right = XLPTODP( dc, right );
|
|
|
|
bottom = YLPTODP( dc, bottom );
|
|
|
|
if ((left == right) || (top == bottom)) return FALSE;
|
|
|
|
|
|
|
|
if (DC_SetupGCForBrush( dc ))
|
|
|
|
XFillArc( XT_display, dc->u.x.drawable, dc->u.x.gc,
|
|
|
|
left, top, right-left-1, bottom-top-1, 0, 360*64 );
|
|
|
|
if (DC_SetupGCForPen( dc ))
|
|
|
|
XDrawArc( XT_display, dc->u.x.drawable, dc->u.x.gc,
|
|
|
|
left, top, right-left-1, bottom-top-1, 0, 360*64 );
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* Rectangle (GDI.27)
|
|
|
|
*/
|
|
|
|
BOOL Rectangle( HDC hdc, int left, int top, int right, int bottom )
|
|
|
|
{
|
|
|
|
DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
|
|
|
|
if (!dc) return FALSE;
|
|
|
|
|
|
|
|
left = XLPTODP( dc, left );
|
|
|
|
top = YLPTODP( dc, top );
|
|
|
|
right = XLPTODP( dc, right );
|
|
|
|
bottom = YLPTODP( dc, bottom );
|
|
|
|
|
|
|
|
if (DC_SetupGCForBrush( dc ))
|
|
|
|
XFillRectangle( XT_display, dc->u.x.drawable, dc->u.x.gc,
|
|
|
|
left, top, right-left-1, bottom-top-1 );
|
|
|
|
if (DC_SetupGCForPen( dc ))
|
|
|
|
XDrawRectangle( XT_display, dc->u.x.drawable, dc->u.x.gc,
|
|
|
|
left, top, right-left-1, bottom-top-1 );
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* FillRect (USER.81)
|
|
|
|
*/
|
|
|
|
int FillRect( HDC hdc, LPRECT rect, HBRUSH hbrush )
|
|
|
|
{
|
|
|
|
HBRUSH prevBrush;
|
|
|
|
|
|
|
|
if ((rect->right <= rect->left) || (rect->bottom <= rect->top)) return 0;
|
|
|
|
if (!(prevBrush = SelectObject( hdc, hbrush ))) return 0;
|
|
|
|
PatBlt( hdc, rect->left, rect->top,
|
|
|
|
rect->right - rect->left, rect->bottom - rect->top, PATCOPY );
|
|
|
|
SelectObject( hdc, prevBrush );
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* InvertRect (USER.82)
|
|
|
|
*/
|
|
|
|
void InvertRect( HDC hdc, LPRECT rect )
|
|
|
|
{
|
|
|
|
if ((rect->right <= rect->left) || (rect->bottom <= rect->top)) return;
|
|
|
|
PatBlt( hdc, rect->left, rect->top,
|
|
|
|
rect->right - rect->left, rect->bottom - rect->top, DSTINVERT );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
1993-09-29 12:21:49 +00:00
|
|
|
/***********************************************************************
|
|
|
|
* FrameRect (USER.83)
|
|
|
|
*/
|
|
|
|
int FrameRect( HDC hdc, LPRECT rect, HBRUSH hbrush )
|
|
|
|
{
|
|
|
|
HBRUSH prevBrush;
|
|
|
|
int left, top, right, bottom;
|
|
|
|
|
|
|
|
DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
|
|
|
|
if (!dc) return FALSE;
|
|
|
|
|
|
|
|
if ((rect->right <= rect->left) || (rect->bottom <= rect->top)) return 0;
|
|
|
|
if (!(prevBrush = SelectObject( hdc, hbrush ))) return 0;
|
|
|
|
|
|
|
|
left = XLPTODP( dc, rect->left );
|
|
|
|
top = YLPTODP( dc, rect->top );
|
|
|
|
right = XLPTODP( dc, rect->right );
|
|
|
|
bottom = YLPTODP( dc, rect->bottom );
|
|
|
|
|
|
|
|
if (DC_SetupGCForBrush( dc ))
|
|
|
|
XDrawRectangle( XT_display, dc->u.x.drawable, dc->u.x.gc,
|
|
|
|
left, top, right-left-1, bottom-top-1 );
|
|
|
|
|
|
|
|
SelectObject( hdc, prevBrush );
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
1993-09-04 10:09:32 +00:00
|
|
|
/***********************************************************************
|
|
|
|
* SetPixel (GDI.31)
|
|
|
|
*/
|
|
|
|
COLORREF SetPixel( HDC hdc, short x, short y, COLORREF color )
|
|
|
|
{
|
|
|
|
int pixel;
|
|
|
|
PALETTEENTRY entry;
|
|
|
|
|
|
|
|
DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
|
|
|
|
if (!dc) return 0;
|
|
|
|
|
|
|
|
x = XLPTODP( dc, x );
|
|
|
|
y = YLPTODP( dc, y );
|
|
|
|
pixel = GetNearestPaletteIndex( dc->w.hPalette, color );
|
|
|
|
GetPaletteEntries( dc->w.hPalette, pixel, 1, &entry );
|
|
|
|
|
|
|
|
XSetForeground( XT_display, dc->u.x.gc, pixel );
|
1993-09-29 12:21:49 +00:00
|
|
|
XSetFunction( XT_display, dc->u.x.gc, GXcopy );
|
1993-09-04 10:09:32 +00:00
|
|
|
XDrawPoint( XT_display, dc->u.x.drawable, dc->u.x.gc, x, y );
|
|
|
|
|
|
|
|
return RGB( entry.peRed, entry.peGreen, entry.peBlue );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* GetPixel (GDI.83)
|
|
|
|
*/
|
|
|
|
COLORREF GetPixel( HDC hdc, short x, short y )
|
|
|
|
{
|
|
|
|
PALETTEENTRY entry;
|
|
|
|
XImage * image;
|
|
|
|
|
|
|
|
DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
|
|
|
|
if (!dc) return 0;
|
|
|
|
|
|
|
|
x = XLPTODP( dc, x );
|
|
|
|
y = YLPTODP( dc, y );
|
|
|
|
if ((x < 0) || (y < 0)) return 0;
|
|
|
|
|
|
|
|
if (dc->u.x.widget)
|
|
|
|
{
|
|
|
|
XWindowAttributes win_attr;
|
|
|
|
|
|
|
|
if (!XtIsRealized(dc->u.x.widget)) return 0;
|
|
|
|
if (!XGetWindowAttributes( XT_display, dc->u.x.drawable, &win_attr ))
|
|
|
|
return 0;
|
|
|
|
if (win_attr.map_state != IsViewable) return 0;
|
|
|
|
if ((x >= win_attr.width) || (y >= win_attr.height)) return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
image = XGetImage( XT_display, dc->u.x.drawable, x, y,
|
|
|
|
1, 1, AllPlanes, ZPixmap );
|
|
|
|
GetPaletteEntries( dc->w.hPalette, XGetPixel( image, 0, 0 ), 1, &entry );
|
|
|
|
XDestroyImage( image );
|
|
|
|
return RGB( entry.peRed, entry.peGreen, entry.peBlue );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* PaintRgn (GDI.43)
|
|
|
|
*/
|
|
|
|
BOOL PaintRgn( HDC hdc, HRGN hrgn )
|
|
|
|
{
|
|
|
|
RECT box;
|
|
|
|
HRGN tmpVisRgn, prevVisRgn;
|
|
|
|
DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
|
|
|
|
if (!dc) return FALSE;
|
|
|
|
|
|
|
|
/* Modify visible region */
|
|
|
|
|
|
|
|
prevVisRgn = SaveVisRgn( hdc );
|
|
|
|
if (prevVisRgn)
|
|
|
|
{
|
|
|
|
if (!(tmpVisRgn = CreateRectRgn( 0, 0, 0, 0 )))
|
|
|
|
{
|
|
|
|
RestoreVisRgn( hdc );
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
CombineRgn( tmpVisRgn, prevVisRgn, hrgn, RGN_AND );
|
|
|
|
SelectVisRgn( hdc, tmpVisRgn );
|
|
|
|
DeleteObject( tmpVisRgn );
|
|
|
|
}
|
|
|
|
else SelectVisRgn( hdc, hrgn );
|
|
|
|
|
|
|
|
/* Fill the region */
|
|
|
|
|
|
|
|
GetClipBox( hdc, &box );
|
|
|
|
if (DC_SetupGCForBrush( dc ))
|
|
|
|
XFillRectangle( XT_display, dc->u.x.drawable, dc->u.x.gc,
|
|
|
|
box.left, box.top,
|
|
|
|
box.right-box.left, box.bottom-box.top );
|
|
|
|
|
|
|
|
/* Restore the visible region */
|
|
|
|
|
|
|
|
if (prevVisRgn) RestoreVisRgn( hdc );
|
|
|
|
else SelectVisRgn( hdc, 0 );
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* FillRgn (GDI.40)
|
|
|
|
*/
|
|
|
|
BOOL FillRgn( HDC hdc, HRGN hrgn, HBRUSH hbrush )
|
|
|
|
{
|
|
|
|
BOOL retval;
|
|
|
|
HBRUSH prevBrush = SelectObject( hdc, hbrush );
|
|
|
|
if (!prevBrush) return FALSE;
|
|
|
|
retval = PaintRgn( hdc, hrgn );
|
|
|
|
SelectObject( hdc, prevBrush );
|
|
|
|
return retval;
|
|
|
|
}
|
Release 0.4.7
Mon Nov 1 14:40:21 1993 julliard@di.epfl.ch (Alexandre Julliard)
* [if1632/user.spec]
Removed some duplicate entries.
* [include/dialog.h] [windows/dialog.c]
Implemented dialog units and fonts.
Added preliminary loading of dialog resources.
Preliminary implementation of DialogBox().
Implemented Get/SetDlgItem* functions.
* [windows/win.c]
Implemented WM_PARENTNOTIFY message.
Implemented CreateWindowEx() and GetWindow().
Completed DestroyWindow().
Mon Nov 1 18:19:34 1993 Erik Bos
* [loader/signal.c]
Added support for int 0x11 & 0x12.
* [loader/int21.c]
Improved function handling.
Sun Oct 31 12:38:09 1993 David Metcalfe <david@prism.demon.co.uk>
* [objects/font.c]
Implemented GetCharWidth().
Wed Oct 27 09:56:06 1993 John Brezak <brezak@ch.hp.com>
* [Makefile]
Use GNU malloc.
* [include/int21.h include/wine.h]
Change sc_eflags to sc_efl .
* [include/wine.h]
Fix misplaced #endif
Include <signal.h> for NetBSD
* [loader/int21.c]
Don't include <sys/vfs.h> in NetBSD
Do include <sys/mount.h> in NetBSD
Cleanup some lint.
Mon Oct 26 17:59:01 1993 Erik Bos
* [include/int21.h]
Added.
* [loader/int21.c]
Added support for many dos ints.
* [misc/file.c] [include/files.h]
Moved OPEN_MAX and DosDriveStruct to files.h.
Sun Oct 24 13:36:50 1993 David Metcalfe <david@prism.demon.co.uk>
* [controls/button.c]
Implemented CHECKBOX, AUTOCHECKBOX, 3STATE, AUTO3STATE,
RADIOBUTTON, AUTORADIOBUTTON, GROUPBOX controls, together with
a preliminary USERBUTTON control.
* [objects/text.c]
Corrected bugs in TEXT_NextLine() and added handling of prefix
character.
* [controls/button.c]
Disabled focus handling by commenting out SetFocus() calls until
serious bug can be found.
Oct 20, 93 martin2@trgcorp.solucorp.qc.ca (Martin Ayotte)
* [controls/listbox.c]
Listbox control window
Painting cleanup, new messages processed.
* [controls/scroll.c]
Scroll bar control window
Painting cleanup.
* [controls/combo.c]
Combo box control window
Painting cleanup.
Tue Oct 12 17:50:11 1993 julliard@di.epfl.ch (Alexandre Julliard)
* [objects/color.c] [objects/palette.c] [windows/syscolor.c]
Better support for the private color map.
Using a private map is now the default.
* [windows/win.c]
Bug fix.
* [include/dialog.h] [windows/dialog.c]
Implemented CreateDialog*() and IsDialogMessage().
* [misc/xt.c] [windows/defwnd.c]
Moved DefWindowProc() to defwnd.c.
Added WM_NCCREATE, WM_NCDESTROY and WM_CTLCOLOR handling.
* [windows/defdlg.c]
Started the implementation of DefDlgProc().
* [windows/win.c]
Added WM_NCCREATE and WM_NCDESTROY messages.
Implemented IsChild().
Tue Oct 12 17:50:20 1993 David Metcalfe <david@prism.demon.co.uk>
* [windows/focus.c]
Implemented GetFocus() and SetFocus().
* [windows/event.c]
Added processing of FocusIn and FocusOut events.
* [windows/graphics.c]
Added DrawFocusRect().
Sat Oct 9 14:36:57 1993 Erik Bos
* [loader/int1a.c]
Added more function handling.
Wed Oct 6 12:21:22 1993 Erik Bos
* [loader/signal.c]
Split signal.c into int1a.c, int21.c and signal.c.
Tue Oct 5 22:12:40 1993 David Metcalfe
* [controls/static.c] [control/widgets.c]
Static control class.
* [objects/text.c]
Added processing of additional DT_ flags to DrawText().
* [windows/win.c] [misc/xt.c]
Added SetWindowText() and WM_SETTEXT processing.
Tue Oct 5 22:12:40 1993 Martin Ayotte
* [controls/listbox.c]
Listbox control window
* [controls/scroll.c]
Scroll bar control window
* [controls/combo.c]
Combo box control window
* [include/combo.h]
Combo box definitions
* [include/listbox.h]
Listbox definitions
* [include/scroll.h]
Scroll bar definitions
Sat Oct 2 09:35:54 1993 Bob Amstadt (bob at pooh)
* [if1632/callback.c]
Fixed bug in MakeProcInstance().
* [debugger/info.c]
Changed x/w and x/b to display in hex.
* [debugger/i386-pinsn.c]
Added code to properly unassemble 16-bit indexing.
Fri Oct 1 08:29:05 1993 Bob Amstadt (bob at pooh)
* [loader/files.c] [misc/profile.c]
System initialization file is now called "wine.ini" and can
be located in the current directory, the user's home directory,
or any directories specified in the WINEPATH environment variable.
* [tools/build.c] [if1632/call.S] [include/regfunc.h]
Changed register function stack to match sigcontext structure.
Thu Sep 30 22:30:21 1993 Bob Amstadt (bob at pooh)
* [loader/files.c]
Created function to search a path for files to load.
* [loader/wine.c]
Modified exe and dll file loading to search through path
specified by the environment variable WINEPATH.
Thu Sep 30 22:30:21 1993 Eric Youngdale
* [loader/signal.c]
Bug fix.
Thu Sep 30 22:30:21 1993 John Brezak
* [debugger/dbg.y] [debugger/debug.l] [debugger/dtest.c]
[debugger/obstack.h]
Updates to allow debugger to function under NetBSD.
1993-11-03 19:23:37 +00:00
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* DrawFocusRect (GDI.466)
|
|
|
|
*/
|
|
|
|
void DrawFocusRect( HDC hdc, LPRECT rc )
|
|
|
|
{
|
|
|
|
HPEN hPen, hOldPen;
|
|
|
|
int oldDrawMode, oldBkMode;
|
|
|
|
int left, top, right, bottom;
|
|
|
|
DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
|
|
|
|
if (!dc) return;
|
|
|
|
|
|
|
|
left = XLPTODP( dc, rc->left );
|
|
|
|
top = YLPTODP( dc, rc->top );
|
|
|
|
right = XLPTODP( dc, rc->right );
|
|
|
|
bottom = YLPTODP( dc, rc->bottom );
|
|
|
|
|
|
|
|
hPen = CreatePen(PS_DOT, 1, GetSysColor(COLOR_WINDOWTEXT));
|
|
|
|
hOldPen = (HPEN)SelectObject(hdc, (HANDLE)hPen);
|
|
|
|
/* oldDrawMode = SetROP2(hdc, R2_XORPEN); */
|
|
|
|
oldBkMode = SetBkMode(hdc, TRANSPARENT);
|
|
|
|
|
|
|
|
if (DC_SetupGCForPen( dc ))
|
|
|
|
XDrawRectangle( XT_display, dc->u.x.drawable, dc->u.x.gc,
|
|
|
|
left, top, right-left-1, bottom-top-1 );
|
|
|
|
|
|
|
|
SetBkMode(hdc, oldBkMode);
|
|
|
|
/* SetROP2(hdc, oldDrawMode); */
|
|
|
|
SelectObject(hdc, (HANDLE)hOldPen);
|
|
|
|
DeleteObject((HANDLE)hPen);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**********************************************************************
|
|
|
|
* Line (Not a MSWin Call)
|
|
|
|
*/
|
|
|
|
void Line(HDC hDC, int X1, int Y1, int X2, int Y2)
|
|
|
|
{
|
|
|
|
MoveTo(hDC, X1, Y1);
|
|
|
|
LineTo(hDC, X2, Y2);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**********************************************************************
|
|
|
|
* DrawReliefRect (Not a MSWin Call)
|
|
|
|
*/
|
|
|
|
void DrawReliefRect(HDC hDC, RECT rect, int ThickNess, int Mode)
|
|
|
|
{
|
|
|
|
HPEN hWHITEPen;
|
|
|
|
HPEN hDKGRAYPen;
|
|
|
|
HPEN hOldPen;
|
|
|
|
int OldColor;
|
|
|
|
rect.right--; rect.bottom--;
|
|
|
|
hDKGRAYPen = CreatePen(PS_SOLID, 1, 0x00808080L);
|
|
|
|
hWHITEPen = GetStockObject(WHITE_PEN);
|
|
|
|
hOldPen = SelectObject(hDC, hWHITEPen);
|
|
|
|
while(ThickNess > 0) {
|
|
|
|
if (Mode == 0)
|
|
|
|
SelectObject(hDC, hWHITEPen);
|
|
|
|
else
|
|
|
|
SelectObject(hDC, hDKGRAYPen);
|
|
|
|
Line(hDC, rect.left, rect.top, rect.right, rect.top);
|
|
|
|
Line(hDC, rect.left, rect.top, rect.left, rect.bottom + 1);
|
|
|
|
if (Mode == 0)
|
|
|
|
SelectObject(hDC, hDKGRAYPen);
|
|
|
|
else
|
|
|
|
SelectObject(hDC, hWHITEPen);
|
|
|
|
Line(hDC, rect.right, rect.bottom, rect.left, rect.bottom);
|
|
|
|
Line(hDC, rect.right, rect.bottom, rect.right, rect.top - 1);
|
|
|
|
InflateRect(&rect, -1, -1);
|
|
|
|
ThickNess--;
|
|
|
|
}
|
|
|
|
SelectObject(hDC, hOldPen);
|
|
|
|
DeleteObject(hDKGRAYPen);
|
|
|
|
}
|