1993-09-04 12:09:32 +02:00
|
|
|
/*
|
|
|
|
* GDI region objects
|
|
|
|
*
|
1995-01-24 17:21:01 +01:00
|
|
|
* Copyright 1993, 1994, 1995 Alexandre Julliard
|
1994-12-10 14:02:28 +01:00
|
|
|
*
|
1995-01-24 17:21:01 +01:00
|
|
|
*/
|
|
|
|
|
1993-09-04 12:09:32 +02:00
|
|
|
#include <stdlib.h>
|
|
|
|
#include <stdio.h>
|
1994-09-16 11:24:37 +02:00
|
|
|
|
1995-01-09 19:21:16 +01:00
|
|
|
#include "region.h"
|
1994-10-17 19:12:41 +01:00
|
|
|
#include "stddebug.h"
|
1994-12-10 14:02:28 +01:00
|
|
|
/* #define DEBUG_REGION */
|
1994-10-17 19:12:41 +01:00
|
|
|
#include "debug.h"
|
1993-09-04 12:09:32 +02:00
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* REGION_DeleteObject
|
|
|
|
*/
|
|
|
|
BOOL REGION_DeleteObject( HRGN hrgn, RGNOBJ * obj )
|
|
|
|
{
|
1995-01-24 17:21:01 +01:00
|
|
|
dprintf_region(stddeb, "DeleteRegion: %x\n", hrgn );
|
|
|
|
if (obj->xrgn) XDestroyRegion( obj->xrgn );
|
1993-09-04 12:09:32 +02:00
|
|
|
return GDI_FreeObject( hrgn );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* OffsetRgn (GDI.101)
|
|
|
|
*/
|
|
|
|
int OffsetRgn( HRGN hrgn, short x, short y )
|
|
|
|
{
|
|
|
|
RGNOBJ * obj = (RGNOBJ *) GDI_GetObjPtr( hrgn, REGION_MAGIC );
|
|
|
|
if (!obj) return ERROR;
|
1994-10-17 19:12:41 +01:00
|
|
|
dprintf_region(stddeb, "OffsetRgn: %d %d,%d\n", hrgn, x, y );
|
1995-01-24 17:21:01 +01:00
|
|
|
if (!obj->xrgn) return NULLREGION;
|
|
|
|
XOffsetRegion( obj->xrgn, x, y );
|
|
|
|
return COMPLEXREGION;
|
1993-09-04 12:09:32 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* GetRgnBox (GDI.134)
|
|
|
|
*/
|
|
|
|
int GetRgnBox( HRGN hrgn, LPRECT rect )
|
|
|
|
{
|
|
|
|
RGNOBJ * obj = (RGNOBJ *) GDI_GetObjPtr( hrgn, REGION_MAGIC );
|
|
|
|
if (!obj) return ERROR;
|
1994-10-17 19:12:41 +01:00
|
|
|
dprintf_region(stddeb, "GetRgnBox: %d\n", hrgn );
|
1995-01-24 17:21:01 +01:00
|
|
|
if (!obj->xrgn)
|
|
|
|
{
|
|
|
|
SetRectEmpty( rect );
|
|
|
|
return NULLREGION;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
XRectangle xrect;
|
|
|
|
XClipBox( obj->xrgn, &xrect );
|
|
|
|
SetRect( rect, xrect.x, xrect.y,
|
|
|
|
xrect.x + xrect.width, xrect.y + xrect.height);
|
|
|
|
return COMPLEXREGION;
|
|
|
|
}
|
1993-09-04 12:09:32 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* CreateRectRgn (GDI.64)
|
|
|
|
*/
|
|
|
|
HRGN CreateRectRgn( short left, short top, short right, short bottom )
|
|
|
|
{
|
1995-01-24 17:21:01 +01:00
|
|
|
HRGN hrgn;
|
|
|
|
RGNOBJ *obj;
|
|
|
|
|
|
|
|
if (!(hrgn = GDI_AllocObject( sizeof(RGNOBJ), REGION_MAGIC ))) return 0;
|
1995-03-19 18:39:39 +01:00
|
|
|
obj = (RGNOBJ *) GDI_HEAP_LIN_ADDR( hrgn );
|
1995-01-24 17:21:01 +01:00
|
|
|
if ((right > left) && (bottom > top))
|
|
|
|
{
|
|
|
|
XRectangle rect = { left, top, right - left, bottom - top };
|
|
|
|
if (!(obj->xrgn = XCreateRegion()))
|
|
|
|
{
|
|
|
|
GDI_FreeObject( hrgn );
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
XUnionRectWithRegion( &rect, obj->xrgn, obj->xrgn );
|
|
|
|
}
|
|
|
|
else obj->xrgn = 0;
|
|
|
|
dprintf_region( stddeb, "CreateRectRgn(%d,%d-%d,%d): returning %x\n",
|
|
|
|
left, top, right, bottom, hrgn );
|
|
|
|
return hrgn;
|
1993-09-04 12:09:32 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* CreateRectRgnIndirect (GDI.65)
|
|
|
|
*/
|
|
|
|
HRGN CreateRectRgnIndirect( LPRECT rect )
|
|
|
|
{
|
1995-01-24 17:21:01 +01:00
|
|
|
return CreateRectRgn( rect->left, rect->top, rect->right, rect->bottom );
|
|
|
|
}
|
1993-09-04 12:09:32 +02:00
|
|
|
|
|
|
|
|
1995-01-24 17:21:01 +01:00
|
|
|
/***********************************************************************
|
|
|
|
* SetRectRgn (GDI.172)
|
|
|
|
*/
|
|
|
|
void SetRectRgn( HRGN hrgn, short left, short top, short right, short bottom )
|
|
|
|
{
|
|
|
|
RGNOBJ * obj;
|
|
|
|
|
|
|
|
dprintf_region(stddeb, "SetRectRgn: %x %d,%d-%d,%d\n",
|
|
|
|
hrgn, left, top, right, bottom );
|
|
|
|
|
|
|
|
if (!(obj = (RGNOBJ *) GDI_GetObjPtr( hrgn, REGION_MAGIC ))) return;
|
|
|
|
if (obj->xrgn) XDestroyRegion( obj->xrgn );
|
|
|
|
if ((right > left) && (bottom > top))
|
1993-09-04 12:09:32 +02:00
|
|
|
{
|
1995-01-24 17:21:01 +01:00
|
|
|
XRectangle rect = { left, top, right - left, bottom - top };
|
|
|
|
if ((obj->xrgn = XCreateRegion()) != 0)
|
|
|
|
XUnionRectWithRegion( &rect, obj->xrgn, obj->xrgn );
|
1993-09-04 12:09:32 +02:00
|
|
|
}
|
1995-01-24 17:21:01 +01:00
|
|
|
else obj->xrgn = 0;
|
1993-09-04 12:09:32 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* CreateRoundRectRgn (GDI.444)
|
|
|
|
*/
|
|
|
|
HRGN CreateRoundRectRgn( short left, short top, short right, short bottom,
|
|
|
|
short ellipse_width, short ellipse_height )
|
|
|
|
{
|
1995-01-24 17:21:01 +01:00
|
|
|
RGNOBJ * obj;
|
1993-09-04 12:09:32 +02:00
|
|
|
HRGN hrgn;
|
1995-01-24 17:21:01 +01:00
|
|
|
XRectangle rect;
|
|
|
|
int asq, bsq, d, xd, yd;
|
|
|
|
|
|
|
|
/* Check if we can do a normal rectangle instead */
|
|
|
|
|
|
|
|
if ((right <= left) || (bottom <= top) ||
|
|
|
|
(ellipse_width <= 0) || (ellipse_height <= 0))
|
|
|
|
return CreateRectRgn( left, top, right, bottom );
|
1993-09-04 12:09:32 +02:00
|
|
|
|
|
|
|
/* Create region */
|
|
|
|
|
|
|
|
if (!(hrgn = GDI_AllocObject( sizeof(RGNOBJ), REGION_MAGIC ))) return 0;
|
1995-03-19 18:39:39 +01:00
|
|
|
obj = (RGNOBJ *) GDI_HEAP_LIN_ADDR( hrgn );
|
1995-01-24 17:21:01 +01:00
|
|
|
obj->xrgn = XCreateRegion();
|
|
|
|
dprintf_region(stddeb,"CreateRoundRectRgn(%d,%d-%d,%d %dx%d): return=%x\n",
|
|
|
|
left, top, right, bottom, ellipse_width, ellipse_height, hrgn );
|
|
|
|
|
|
|
|
/* Check parameters */
|
|
|
|
|
|
|
|
if (ellipse_width > right-left) ellipse_width = right-left;
|
|
|
|
if (ellipse_height > bottom-top) ellipse_height = bottom-top;
|
|
|
|
|
|
|
|
/* Ellipse algorithm, based on an article by K. Porter */
|
|
|
|
/* in DDJ Graphics Programming Column, 8/89 */
|
|
|
|
|
|
|
|
asq = ellipse_width * ellipse_width / 4; /* a^2 */
|
|
|
|
bsq = ellipse_height * ellipse_height / 4; /* b^2 */
|
|
|
|
d = bsq - asq * ellipse_height / 2 + asq / 4; /* b^2 - a^2b + a^2/4 */
|
|
|
|
xd = 0;
|
|
|
|
yd = asq * ellipse_height; /* 2a^2b */
|
|
|
|
|
|
|
|
rect.x = left + ellipse_width / 2;
|
|
|
|
rect.width = right - left - ellipse_width;
|
|
|
|
rect.height = 1;
|
|
|
|
|
|
|
|
/* Loop to draw first half of quadrant */
|
|
|
|
|
|
|
|
while (xd < yd)
|
1993-09-04 12:09:32 +02:00
|
|
|
{
|
1995-01-24 17:21:01 +01:00
|
|
|
if (d > 0) /* if nearest pixel is toward the center */
|
|
|
|
{
|
|
|
|
/* move toward center */
|
|
|
|
rect.y = top++;
|
|
|
|
XUnionRectWithRegion( &rect, obj->xrgn, obj->xrgn );
|
|
|
|
rect.y = --bottom;
|
|
|
|
XUnionRectWithRegion( &rect, obj->xrgn, obj->xrgn );
|
|
|
|
yd -= 2*asq;
|
|
|
|
d -= yd;
|
|
|
|
}
|
|
|
|
rect.x--; /* next horiz point */
|
|
|
|
rect.width += 2;
|
|
|
|
xd += 2*bsq;
|
|
|
|
d += bsq + xd;
|
1993-09-04 12:09:32 +02:00
|
|
|
}
|
|
|
|
|
1995-01-24 17:21:01 +01:00
|
|
|
/* Loop to draw second half of quadrant */
|
|
|
|
|
|
|
|
d += (3 * (asq-bsq) / 2 - (xd+yd)) / 2;
|
|
|
|
while (yd >= 0)
|
1993-09-04 12:09:32 +02:00
|
|
|
{
|
1995-01-24 17:21:01 +01:00
|
|
|
/* next vertical point */
|
|
|
|
rect.y = top++;
|
|
|
|
XUnionRectWithRegion( &rect, obj->xrgn, obj->xrgn );
|
|
|
|
rect.y = --bottom;
|
|
|
|
XUnionRectWithRegion( &rect, obj->xrgn, obj->xrgn );
|
|
|
|
if (d < 0) /* if nearest pixel is outside ellipse */
|
|
|
|
{
|
|
|
|
rect.x--; /* move away from center */
|
|
|
|
rect.width += 2;
|
|
|
|
xd += 2*bsq;
|
|
|
|
d += xd;
|
|
|
|
}
|
|
|
|
yd -= 2*asq;
|
|
|
|
d += asq - yd;
|
1993-09-04 12:09:32 +02:00
|
|
|
}
|
|
|
|
|
1995-01-24 17:21:01 +01:00
|
|
|
/* Add the inside rectangle */
|
1993-09-04 12:09:32 +02:00
|
|
|
|
1995-01-24 17:21:01 +01:00
|
|
|
if (top <= bottom)
|
|
|
|
{
|
|
|
|
rect.y = top;
|
|
|
|
rect.height = bottom - top + 1;
|
|
|
|
XUnionRectWithRegion( &rect, obj->xrgn, obj->xrgn );
|
|
|
|
}
|
|
|
|
return hrgn;
|
1993-09-04 12:09:32 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* CreateEllipticRgn (GDI.54)
|
|
|
|
*/
|
|
|
|
HRGN CreateEllipticRgn( short left, short top, short right, short bottom )
|
|
|
|
{
|
1995-01-24 17:21:01 +01:00
|
|
|
return CreateRoundRectRgn( left, top, right, bottom,
|
|
|
|
right-left, bottom-top );
|
1993-09-04 12:09:32 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* CreateEllipticRgnIndirect (GDI.55)
|
|
|
|
*/
|
|
|
|
HRGN CreateEllipticRgnIndirect( LPRECT rect )
|
|
|
|
{
|
1995-01-24 17:21:01 +01:00
|
|
|
return CreateRoundRectRgn(rect->left, rect->top, rect->right, rect->bottom,
|
|
|
|
rect->right-rect->left, rect->bottom-rect->top );
|
1993-09-04 12:09:32 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* CreatePolygonRgn (GDI.63)
|
|
|
|
*/
|
|
|
|
HRGN CreatePolygonRgn( POINT * points, short count, short mode )
|
|
|
|
{
|
|
|
|
return CreatePolyPolygonRgn( points, &count, 1, mode );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* CreatePolyPolygonRgn (GDI.451)
|
|
|
|
*/
|
|
|
|
HRGN CreatePolyPolygonRgn( POINT * points, short * count,
|
|
|
|
short nbpolygons, short mode )
|
|
|
|
{
|
1995-01-24 17:21:01 +01:00
|
|
|
RGNOBJ * obj;
|
1993-09-04 12:09:32 +02:00
|
|
|
HRGN hrgn;
|
1994-09-16 11:24:37 +02:00
|
|
|
int i, j, maxPoints;
|
|
|
|
XPoint *xpoints, *pt;
|
|
|
|
Region xrgn;
|
|
|
|
|
|
|
|
/* Allocate points array */
|
1993-09-04 12:09:32 +02:00
|
|
|
|
1994-09-16 11:24:37 +02:00
|
|
|
if (!nbpolygons) return 0;
|
|
|
|
for (i = maxPoints = 0; i < nbpolygons; i++)
|
|
|
|
if (maxPoints < count[i]) maxPoints = count[i];
|
|
|
|
if (!maxPoints) return 0;
|
|
|
|
if (!(xpoints = (XPoint *) malloc( sizeof(XPoint) * maxPoints )))
|
|
|
|
return 0;
|
1993-09-04 12:09:32 +02:00
|
|
|
|
1994-09-16 11:24:37 +02:00
|
|
|
/* Allocate region */
|
1993-09-04 12:09:32 +02:00
|
|
|
|
1994-09-16 11:24:37 +02:00
|
|
|
if (!(hrgn = GDI_AllocObject( sizeof(RGNOBJ), REGION_MAGIC )))
|
1993-09-04 12:09:32 +02:00
|
|
|
{
|
|
|
|
free( xpoints );
|
|
|
|
return 0;
|
|
|
|
}
|
1995-03-19 18:39:39 +01:00
|
|
|
obj = (RGNOBJ *) GDI_HEAP_LIN_ADDR( hrgn );
|
1995-01-24 17:21:01 +01:00
|
|
|
obj->xrgn = 0;
|
|
|
|
dprintf_region(stddeb, "CreatePolyPolygonRgn: %d polygons, returning %x\n",
|
|
|
|
nbpolygons, hrgn );
|
1993-09-04 12:09:32 +02:00
|
|
|
|
1994-09-16 11:24:37 +02:00
|
|
|
/* Create X region */
|
1993-09-04 12:09:32 +02:00
|
|
|
|
1994-09-16 11:24:37 +02:00
|
|
|
for (i = 0; i < nbpolygons; i++, count++)
|
1993-09-04 12:09:32 +02:00
|
|
|
{
|
1994-09-16 11:24:37 +02:00
|
|
|
for (j = *count, pt = xpoints; j > 0; j--, points++, pt++)
|
|
|
|
{
|
|
|
|
pt->x = points->x;
|
|
|
|
pt->y = points->y;
|
|
|
|
}
|
|
|
|
xrgn = XPolygonRegion( xpoints, *count,
|
|
|
|
(mode == WINDING) ? WindingRule : EvenOddRule );
|
1995-01-09 19:21:16 +01:00
|
|
|
if (!xrgn)
|
|
|
|
{
|
1995-01-24 17:21:01 +01:00
|
|
|
if (obj->xrgn) XDestroyRegion( obj->xrgn );
|
1995-01-09 19:21:16 +01:00
|
|
|
free( xpoints );
|
|
|
|
GDI_FreeObject( hrgn );
|
|
|
|
return 0;
|
|
|
|
}
|
1994-09-16 11:24:37 +02:00
|
|
|
if (i > 0)
|
1993-09-04 12:09:32 +02:00
|
|
|
{
|
1994-09-16 11:24:37 +02:00
|
|
|
Region tmprgn = XCreateRegion();
|
1995-01-24 17:21:01 +01:00
|
|
|
if (mode == WINDING) XUnionRegion( xrgn, obj->xrgn, tmprgn );
|
|
|
|
else XXorRegion( xrgn, obj->xrgn, tmprgn );
|
|
|
|
XDestroyRegion( obj->xrgn );
|
|
|
|
obj->xrgn = tmprgn;
|
1993-09-04 12:09:32 +02:00
|
|
|
}
|
1995-01-24 17:21:01 +01:00
|
|
|
else obj->xrgn = xrgn;
|
1993-09-04 12:09:32 +02:00
|
|
|
}
|
1994-09-16 11:24:37 +02:00
|
|
|
|
1993-09-04 12:09:32 +02:00
|
|
|
free( xpoints );
|
|
|
|
return hrgn;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* PtInRegion (GDI.161)
|
|
|
|
*/
|
|
|
|
BOOL PtInRegion( HRGN hrgn, short x, short y )
|
|
|
|
{
|
|
|
|
RGNOBJ * obj;
|
|
|
|
|
|
|
|
if (!(obj = (RGNOBJ *) GDI_GetObjPtr( hrgn, REGION_MAGIC ))) return FALSE;
|
1995-01-24 17:21:01 +01:00
|
|
|
if (!obj->xrgn) return FALSE;
|
|
|
|
return XPointInRegion( obj->xrgn, x, y );
|
1993-09-04 12:09:32 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* RectInRegion (GDI.181)
|
|
|
|
*/
|
|
|
|
BOOL RectInRegion( HRGN hrgn, LPRECT rect )
|
|
|
|
{
|
|
|
|
RGNOBJ * obj;
|
|
|
|
|
|
|
|
if (!(obj = (RGNOBJ *) GDI_GetObjPtr( hrgn, REGION_MAGIC ))) return FALSE;
|
1995-01-24 17:21:01 +01:00
|
|
|
if (!obj->xrgn) return FALSE;
|
|
|
|
return (XRectInRegion( obj->xrgn, rect->left, rect->top,
|
|
|
|
rect->right-rect->left,
|
|
|
|
rect->bottom-rect->top ) != RectangleOut);
|
1993-09-04 12:09:32 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* EqualRgn (GDI.72)
|
|
|
|
*/
|
|
|
|
BOOL EqualRgn( HRGN rgn1, HRGN rgn2 )
|
|
|
|
{
|
|
|
|
RGNOBJ *obj1, *obj2;
|
|
|
|
if (!(obj1 = (RGNOBJ *) GDI_GetObjPtr( rgn1, REGION_MAGIC ))) return FALSE;
|
|
|
|
if (!(obj2 = (RGNOBJ *) GDI_GetObjPtr( rgn2, REGION_MAGIC ))) return FALSE;
|
1995-01-24 17:21:01 +01:00
|
|
|
if (!obj1->xrgn || !obj2->xrgn) return (!obj1->xrgn && !obj2->xrgn);
|
|
|
|
return XEqualRegion( obj1->xrgn, obj2->xrgn );
|
1993-09-04 12:09:32 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
1994-10-17 19:12:41 +01:00
|
|
|
/***********************************************************************
|
|
|
|
* REGION_CopyRegion
|
|
|
|
*
|
|
|
|
* Copy region src into dest.
|
|
|
|
*/
|
|
|
|
static int REGION_CopyRegion( RGNOBJ *src, RGNOBJ *dest )
|
|
|
|
{
|
1995-01-24 17:21:01 +01:00
|
|
|
if (src->xrgn)
|
1994-10-17 19:12:41 +01:00
|
|
|
{
|
|
|
|
Region tmprgn = XCreateRegion();
|
1995-01-24 17:21:01 +01:00
|
|
|
if (!dest->xrgn) dest->xrgn = XCreateRegion();
|
|
|
|
XUnionRegion( tmprgn, src->xrgn, dest->xrgn );
|
1994-10-17 19:12:41 +01:00
|
|
|
XDestroyRegion( tmprgn );
|
1995-01-24 17:21:01 +01:00
|
|
|
return COMPLEXREGION;
|
1994-10-17 19:12:41 +01:00
|
|
|
}
|
1995-01-24 17:21:01 +01:00
|
|
|
else
|
1994-10-17 19:12:41 +01:00
|
|
|
{
|
1995-01-24 17:21:01 +01:00
|
|
|
if (dest->xrgn) XDestroyRegion( dest->xrgn );
|
|
|
|
dest->xrgn = 0;
|
|
|
|
return NULLREGION;
|
1994-10-17 19:12:41 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
1993-09-04 12:09:32 +02:00
|
|
|
/***********************************************************************
|
|
|
|
* CombineRgn (GDI.451)
|
|
|
|
*/
|
|
|
|
int CombineRgn( HRGN hDest, HRGN hSrc1, HRGN hSrc2, short mode )
|
|
|
|
{
|
|
|
|
RGNOBJ *destObj, *src1Obj, *src2Obj;
|
|
|
|
|
1995-01-24 17:21:01 +01:00
|
|
|
dprintf_region(stddeb, "CombineRgn: %x,%x -> %x mode=%x\n",
|
|
|
|
hSrc1, hSrc2, hDest, mode );
|
1993-09-04 12:09:32 +02:00
|
|
|
|
|
|
|
if (!(destObj = (RGNOBJ *) GDI_GetObjPtr( hDest, REGION_MAGIC )))
|
|
|
|
return ERROR;
|
|
|
|
if (!(src1Obj = (RGNOBJ *) GDI_GetObjPtr( hSrc1, REGION_MAGIC )))
|
|
|
|
return ERROR;
|
1994-10-17 19:12:41 +01:00
|
|
|
if (mode == RGN_COPY) return REGION_CopyRegion( src1Obj, destObj );
|
|
|
|
|
|
|
|
if (!(src2Obj = (RGNOBJ *) GDI_GetObjPtr( hSrc2, REGION_MAGIC )))
|
|
|
|
return ERROR;
|
1993-09-04 12:09:32 +02:00
|
|
|
|
1994-12-27 15:11:53 +01:00
|
|
|
/* Some optimizations for null regions */
|
|
|
|
|
1995-01-24 17:21:01 +01:00
|
|
|
if (!src1Obj->xrgn || !src2Obj->xrgn)
|
1994-12-27 15:11:53 +01:00
|
|
|
{
|
|
|
|
switch(mode)
|
|
|
|
{
|
|
|
|
case RGN_DIFF:
|
1995-01-24 17:21:01 +01:00
|
|
|
if (src1Obj->xrgn)
|
|
|
|
return REGION_CopyRegion( src1Obj, destObj );
|
|
|
|
/* else fall through */
|
1994-12-27 15:11:53 +01:00
|
|
|
case RGN_AND:
|
1995-01-24 17:21:01 +01:00
|
|
|
if (destObj->xrgn) XDestroyRegion( destObj->xrgn );
|
|
|
|
destObj->xrgn = 0;
|
1994-12-27 15:11:53 +01:00
|
|
|
return NULLREGION;
|
|
|
|
case RGN_OR:
|
|
|
|
case RGN_XOR:
|
1995-01-24 17:21:01 +01:00
|
|
|
if (src1Obj->xrgn)
|
|
|
|
return REGION_CopyRegion( src1Obj, destObj );
|
|
|
|
else
|
|
|
|
return REGION_CopyRegion( src2Obj, destObj );
|
1994-12-27 15:11:53 +01:00
|
|
|
default:
|
|
|
|
return ERROR;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1995-01-24 17:21:01 +01:00
|
|
|
/* Perform the operation with the two X regions */
|
1994-09-16 11:24:37 +02:00
|
|
|
|
1995-01-24 17:21:01 +01:00
|
|
|
if (!destObj->xrgn) destObj->xrgn = XCreateRegion();
|
1993-09-04 12:09:32 +02:00
|
|
|
switch(mode)
|
|
|
|
{
|
1995-01-24 17:21:01 +01:00
|
|
|
case RGN_AND:
|
|
|
|
XIntersectRegion( src1Obj->xrgn, src2Obj->xrgn, destObj->xrgn );
|
|
|
|
break;
|
|
|
|
case RGN_OR:
|
|
|
|
XUnionRegion( src1Obj->xrgn, src2Obj->xrgn, destObj->xrgn );
|
|
|
|
break;
|
|
|
|
case RGN_XOR:
|
|
|
|
XXorRegion( src1Obj->xrgn, src2Obj->xrgn, destObj->xrgn );
|
|
|
|
break;
|
|
|
|
case RGN_DIFF:
|
|
|
|
XSubtractRegion( src1Obj->xrgn, src2Obj->xrgn, destObj->xrgn );
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return ERROR;
|
Release 940405
Tue Apr 5 14:36:59 1994 Bob Amstadt (bob@pooh)
* [include/mdi.h] [windows/mdi.c]
Use WM_PARENTNOTIFY messages to activate children.
Generate WM_CHILDACTIVATE messages.
Beginnings handler for maxmized child window.
Clean up when children are destroyed.
* [windows/message.c] [windows/nonclient.c] [windows/winpos.c]
Removed code add 94/03/26.
Apr 4, 94 martin2@trgcorp.solucorp.qc.ca (Martin Ayotte)
* [control/menu.c]
Make mouse menu navigation working again. :-))
(be carefull, clicking outside menus (ie.: clientrect)
not resolved yet)
* [windows/nonclient.c] [controls/scroll.c]
Bugs fix in NCTrackScrollBars().
* [misc/dos_fs.c]
Bug fix in 'ToDos()' in conversion for '/',
(example: '/window/' was translated to 'WINDOWs').
* [miscemu/int21.c]
Function ChangeDir() extract possible drive before DOS_ChangeDir().
* [loader/library.c] [loader/wine.c]
Playing around moving function GetProcAddress() and put some code in.
Mon Apr 4 21:39:07 1994 Alexandre Julliard (julliard@lamisun.epfl.ch)
* [misc/main.c]
Better explanation of command-line options.
* [objects/dib.c]
Implemented SetDIBitsToDevice().
* [windows/dc.c]
Bug fix in SetDCState().
* [windows/event.c]
Removed WS_DISABLED handling (now done in message.c).
* [windows/message.c]
Added sending a WM_PARENTNOTIFY message in MSG_TranslateMouseMsg().
Use WindowFromPoint() to find the window for mouse events, taking
into account disabled windows.
* [windows/painting.c]
Bug fix in BeginPaint() to allow calling it at other times than
on WM_PAINT (Solitaire needs it...)
* [windows/win.c]
Implemented FindWindow().
Rewritten EnableWindow() to behave more like Windows.
* [windows/winpos.c]
Rewritten WindowFromPoint() to also search child windows.
Mon Apr 4 17:36:32 1994 Erik Bos (erik@trashcan.hacktic.nl)
* [include/int21.h] -> [msdos.h]
renamed.
* [miscemu/int10.h] [miscemu/int25.h] [miscemu/int26.h]
new, added for int 10, 25 and 26.
* [miscemu/ioports.c]
new, added to allow win apps to use ioports.
* [loader/signal.c]
Added support for in, inb, out, outb instructions.
Sun Mar 27 13:40:25 1994 Bob Amstadt (bob@pooh)
* controls/menu.c (InsertMenu): Changed to use FindMenuItem().
Sat Mar 26 21:23:55 1994 Bob Amstadt (bob@pooh)
* [windows/mdi.c]
Window list properly updated.
* [windows/message.c]
Call WINPOS_ChildActivate() when mouse pressed.
* [windows/nonclient.c]
Use WINPOS_IsAnActiveWindow() instead of GetActiveWindow() in
NC_HandleNCPaint().
* [windows/winpos.c]
Created functions WINPOS_IsAnActiveWindow() and WINPOS_ActivateChild()
Thu Mar 24 14:49:17 1994 Bob Amstadt (bob@pooh)
* controls/menu.c (DeleteMenu): Changed to use FindMenuItem
(DeleteMenu): Many bug fixes.
* [controls/menu.c]
Created function FindMenuItem().
Thu Mar 24 14:17:24 1994 Bob Amstadt (bob@pooh)
* [windows/win.c]
Removed incorrect MDI handling code from CreateWindowEx().
* [controls/menu.c]
MF_STRING items needed to allocate a private copy of string.
* [controls/menu.c]
Fixed buggy calls to GlobalFree().
* [memory/global.c]
Eliminated some redundant code with function call.
Wed Mar 23 1994 Pentti Moilanen (pentti.moilanen@ntc.nokia.com)
* [windows/timer.c]
timer list pointers looped in InsertTimer
Tue Mar 29 13:32:08 MET DST 1994 julliard@di.epfl.ch (Alexandre Julliard)
* [misc/cursor.c]
A few changes for desktop window support.
* [misc/main.c]
Added -depth option.
* [misc/rect.c]
Yet another bug fix in SubtractRect().
* [objects/bitmap.c]
Changes to use only one depth (specified with -depth)
for color bitmaps.
* [objects/brush.c]
Added support for dithered solid brushes.
* [objects/color.c]
Use the same 20 system colors as in Windows.
System palette initialisation now done in COLOR_InitPalette().
Added support for a color mapping table to map logical color
indexes to X colormap entries.
Implemented GetNearestColor() and RealizeDefaultPalette().
* [objects/dib.c]
Added support for color mapping table.
* [objects/dither.c] (New file)
Implemented solid color dithering.
* [objects/palette.c]
Implemented GetSystemPaletteEntries() and SelectPalette().
* [windows/class.c]
Make a copy of the menu name in RegisterClass().
* [windows/dc.c]
Fixed device caps when using a desktop window.
Added support for the color mapping table in DCs.
* [windows/event.c]
Added ConfigureNotify handler on desktop window.
* [windows/message.c]
Removed call to XTranslateCoordinates() on every mouse motion
New function MSG_Synchronize() to synchronize with the X server.
* [windows/syscolor.c]
Rewritten SYSCOLOR_Init() to read the system colors from WIN.INI.
* [windows/winpos.c]
Added synchronization on window mapping. Solves the double redraw
problem when starting Solitaire.
Mar 27, 94 martin2@trgcorp.solucorp.qc.ca (Martin Ayotte)
* [control/menu.c] * [windows/defwnd.c]
Make keyboard navigation working with menubar,
but temporarely inserted a bug in menubar mouse handling ... :-((
(it will be fix next week !)
* [windows/defwnd.c]
Connect VK_MENU to menubar navigation.
* [loader/library.c]
GetModuleHandle() return 'fictive 0xF000+ handles' for built-in DLLs.
Sun Mar 20 22:32:13 1994 Erik Bos (erik@trashcan.hacktic.nl)
* [misc/main.c]
Added Copy(). Added a check for `-h' to show usage.
* [misc/dos_fs.c]
Fixed bug in FindFile(), to load directories as dlls.
* [misc/dos_fs.c]
Fixed ToUnix() and ToDos() again, as my previous patch
didn't make it.
* [misc/dos_fs.c] [miscemu/int21.c]
Bug fixes, should be able to handle all winfile and progman int21
requests now except for a few small things.
Tue Mar 29 06:25:54 1994 crw@harris.mlb.semi.harris.com (Carl Williams)
* [memory/heap.c]
Implemented GetFreeSystemResources().
Mon Mar 21 17:32:25 1994 Bob Amstadt (bob@pooh)
* controls/menu.c (GetSubMenu): Function did not return correct value
* [windows/mdi.c]
Beginnings of menu handling.
Thu Mar 10 11:32:06 1994 Stefan (SAM) Muenzel (muenzel@tat.physik.uni-tuebingen.de)
* [objects/font.c]
if font.width equals zero use asterix instead.
Mon Mar 21 17:23:37 MET 1994 julliard@di.epfl.ch (Alexandre Julliard)
* [objects/bitmap.c]
Rewritten bitmap code to use exclusively X pixmaps; *much* faster.
* [objects/brush.c]
Some changes with pattern brushes because of the new bitmap code.
* [objects/color.c]
Added function COLOR_ToPhysical for better color mapping.
* [objects/dib.c]
Heavily optimized SetDIBits().
* [windows/dc.c]
Opimized SetDCState() and DC_SetupGC*() functions.
Added stub for CreateIC().
Mar 20, 94 martin2@trgcorp.solucorp.qc.ca (Martin Ayotte)
* [misc/message.c]
Call SetFocus() after closing box to give back focus to previous owner.
* [misc/files.c]
Small bug fix in GetTempFilename() : replace a '\' to '\\'.
* [control/scroll.c]
Calls to BitBlt() replace by StretchBlt().
* [control/menu.c]
Call SetFocus() to previous owner after closing Popups.
Fill stub DeleteMenu().
* [control/listbox.c]
* [control/combo.c]
Use SetFocus() in WM_LBUTTONDOWN.
Close ComboBox List upon WM_KILLFOCUS.
Early development of WM_MEASUREITEM mecanism.
* [windows/defwnd.c]
Early development of WM_MEASUREITEM mecanism.
Tue Mar 22 10:44:57 1994 Miguel de Icaza (miguel@xochitl)
* [misc/atom.c]
Fixed sintaxis problem when building the library.
Tue Mar 15 13:11:56 1994 Bob Amstadt (bob@pooh)
* [include/windows.h]
Added message types and structures for MDI
* [include/mdi.h]
Created internal structures for handling MDI
* [windows/mdi.c]
Began creating MDI support
Thu Mar 10 16:51:46 1994 Bob Amstadt (bob@pooh)
* [loader/wine.c] [include/wine.h]
Added new field to "struct w_files" to hold the "name table"
resource for Windows 3.0 programs
* [loader/resource.c]
Added code to handle programs with a "name table" resource.
LoadResourceByName() modified to check for the existence of
this resource.
Mon Mar 14 22:31:42 MET 1994 julliard@di.epfl.ch (Alexandre Julliard)
* [objects/color.c]
Added installing the private colormap on the desktop window.
* [windows/event.c]
Cleaned up focus event handling (see focus.c).
Use GetFocus() to direct key events to the correct window.
* [windows/focus.c]
Rewritten SetFocus() to:
- only set X focus on top-level windows
- send WM_SETFOCUS and WM_KILLFOCUS messages (was done in event.c)
- prevent setting focus to disabled windows
- install private colormap so -privatemap option works again
* [windows/message.c] [windows/timer.c]
Changed timer management to no longer use PostMessage(), but
to generate timer messages on the fly. Also fixed a related bug
in GetMessage() which could cause busy-waiting.
* [windows/win.c]
Only select focus events on top-level windows.
* [windows/winpos.c]
Added some sanity checks for desktop window.
Fri Mar 4 20:42:01 1994 Erik Bos (erik@trashcan.hacktic.nl)
* [misc/dos_fs.c]
bug fixes in ToUnix(), WinIniFileName(), GetUnixFileName().
Support for tilde symbol added for rootdirectories in [drives]
section of wine's configfile.
* [misc/file.c]
hread(), hwrite() added.
* [misc/main.c]
hmemcpy() added.
* [if1632/stress.spec] [include/stress.h] [misc/stress.c]
Added STRESS.DLL, an useless dll used to stress a windows system.
* [*/*]
Added missing #includes, fixed prototypes for prototype checking.
* [include/prototypes.h]
Added prototypes for loader/*c, if1632/*c.
Tue Mar 8 09:54:34 1994 Bob Amstadt (bob@pooh)
* [Configure]
Added reminder to set WINEPATH, if it is not set.
* [Imakefile]
Removed #elif's
* [controls/button.c]
Added BN_CLICKED notification for owner-draw buttons.
* [if1632/kernel.spec] [memory/heap.c]
Changed Local* functions to WIN16_Local* to prevent unconcious use
of these functions.
* [if1632/relay.c]
Push old Stack16Frame on stack before setting.
* [include/atom.h] [misc/atom.c] [include/heap.h] [memory/local.c]
Added multiple local heap handling in Atom* functions.
* [include/regfunc.h] [miscemu/int21.c]
Rewrote DOS3Call() use context frame that is already on the stack.
* [misc/profile.c]
Fixed to allow leading ";" to mark comments.
* [misc/spy.c]
Fixed bugs and added support for "include" and "exclude" filters.
* [misc/user.c]
Rearranged calls in InitApp().
* [misc/font.c]
Fixed font handling to create system fonts, if they are used.
* [windows/dc.c]
If text drawn on window with no font specified, then default the
font to the system font.
Mon Mar 7 20:32:09 MET 1994 julliard@di.epfl.ch (Alexandre Julliard)
* [controls/desktop.c]
Added handling of WM_NCCREATE and WM_ERASEBKGND functions.
Implemented SetDeskPattern().
* [misc/main.c]
Added -desktop option to get a large desktop window with
everything inside it.
Added -name option.
* [misc/rect.c]
Bug fix in SubtractRect().
* [objects/*.c]
Replaced the DefaultRootWindow() macro by the rootWindow variable.
* [windows/event.c] [windows/message.c]
[windows/nonclient.c] [windows/win.c]
A few changes to accomodate the new desktop window.
Tue Mar 8 11:13:03 1994 Miguel de Icaza (miguel@xochitl.nuclecu.unam.mx)
* [toolkit/arch.c] --New file--
Routines for converting little endian data structures to
big-endian data structures, currently only BITMAP structures are
converted.
* [misc/atom.c]
When used as part of the WineLib, the code is much simpler.
Doesn't depend on alignement.
* [loader/wine.c]
Ifdefed Emulator dependent code if compiling WineLib.
* [loader/resource.c]
Moved misc/resource.c to loader/resource.c.
* [loader/dump.c,ldt.c,ldtlib.c,library,c,selector.c,signal.c]
Ifdefed whole code if compiling WINELIB.
* [include/winsock.h]
Added compilation define to allow compilation on SunOS.
* [include/wine.h]
Removed load_typeinfo and load_nameinfo prototypes, they belong
to neexe.h
* [include/neexe.h]
Added load_typeinfo and load_nameinfo prototypes.
* [include/arch.h]
Fixed some bugs in the conversion routines.
Added macros for Bitmap loading.
Tue Mar 8 12:52:05 1994 crw@maniac.mlb.semi.harris.com (Carl Williams)
* [if1632/kernel.spec] [memory/global.c]
Implemented GetFreeSpace()
* [if1632/user.spec] [loader/resource.c]
Implemented CreateIcon()
1994-04-05 23:42:43 +02:00
|
|
|
}
|
1995-01-24 17:21:01 +01:00
|
|
|
if (XEmptyRegion(destObj->xrgn))
|
1993-09-04 12:09:32 +02:00
|
|
|
{
|
1995-01-24 17:21:01 +01:00
|
|
|
XDestroyRegion( destObj->xrgn );
|
|
|
|
destObj->xrgn = 0;
|
|
|
|
return NULLREGION;
|
1993-09-04 12:09:32 +02:00
|
|
|
}
|
1995-01-24 17:21:01 +01:00
|
|
|
else return COMPLEXREGION;
|
1993-09-04 12:09:32 +02:00
|
|
|
}
|