Moved DC_SetupGC functions to graphics/x11drv/graphics.c.
diff --git a/graphics/painting.c b/graphics/painting.c
index 03c529c..abb8f8c 100644
--- a/graphics/painting.c
+++ b/graphics/painting.c
@@ -21,7 +21,6 @@
#include "metafile.h"
#include "palette.h"
#include "cache.h"
-#include "color.h"
#include "region.h"
#include "path.h"
#include "debug.h"
@@ -331,17 +330,15 @@
if ( (right <= left) || (bottom <= top) ) return 0;
if (!(prevBrush = SelectObject16( hdc, hbrush ))) return 0;
- if (DC_SetupGCForBrush( dc ))
- {
- PatBlt32( hdc, rect->left, rect->top, 1,
- rect->bottom - rect->top, PATCOPY );
- PatBlt32( hdc, rect->right - 1, rect->top, 1,
- rect->bottom - rect->top, PATCOPY );
- PatBlt32( hdc, rect->left, rect->top,
- rect->right - rect->left, 1, PATCOPY );
- PatBlt32( hdc, rect->left, rect->bottom - 1,
- rect->right - rect->left, 1, PATCOPY );
- }
+ PatBlt32( hdc, rect->left, rect->top, 1,
+ rect->bottom - rect->top, PATCOPY );
+ PatBlt32( hdc, rect->right - 1, rect->top, 1,
+ rect->bottom - rect->top, PATCOPY );
+ PatBlt32( hdc, rect->left, rect->top,
+ rect->right - rect->left, 1, PATCOPY );
+ PatBlt32( hdc, rect->left, rect->bottom - 1,
+ rect->right - rect->left, 1, PATCOPY );
+
SelectObject16( hdc, prevBrush );
return 1;
}
@@ -646,7 +643,7 @@
/* Hack: make sure the XORPEN operation has an effect */
dc->u.x.pen.pixel = (1 << screenDepth) - 1;
- if (DC_SetupGCForPen( dc ))
+ if (X11DRV_SetupGCForPen( dc ))
TSXDrawRectangle( display, dc->u.x.drawable, dc->u.x.gc,
dc->w.DCOrgX + left, dc->w.DCOrgY + top,
right-left-1, bottom-top-1 );
diff --git a/graphics/x11drv/bitblt.c b/graphics/x11drv/bitblt.c
index 922d023..80e5243 100644
--- a/graphics/x11drv/bitblt.c
+++ b/graphics/x11drv/bitblt.c
@@ -1207,7 +1207,7 @@
case PATINVERT: /* 0x5a */
if (Options.perfectGraphics) break;
- if (DC_SetupGCForBrush( dcDst ))
+ if (X11DRV_SetupGCForBrush( dcDst ))
{
XSetFunction( display, dcDst->u.x.gc, GXxor );
XFillRectangle( display, dcDst->u.x.drawable, dcDst->u.x.gc,
@@ -1217,7 +1217,7 @@
case 0xa50065:
if (Options.perfectGraphics) break;
- if (DC_SetupGCForBrush( dcDst ))
+ if (X11DRV_SetupGCForBrush( dcDst ))
{
XSetFunction( display, dcDst->u.x.gc, GXequiv );
XFillRectangle( display, dcDst->u.x.drawable, dcDst->u.x.gc,
@@ -1253,7 +1253,7 @@
break;
case PATCOPY: /* 0xf0 */
- if (!DC_SetupGCForBrush( dcDst )) return TRUE;
+ if (!X11DRV_SetupGCForBrush( dcDst )) return TRUE;
XSetFunction( display, dcDst->u.x.gc, GXcopy );
XFillRectangle( display, dcDst->u.x.drawable, dcDst->u.x.gc,
visRectDst.left, visRectDst.top, width, height );
@@ -1291,7 +1291,7 @@
xSrc, ySrc, &visRectSrc );
}
if (useDst) BITBLT_GetDstArea( dcDst, pixmaps[DST], tmpGC, &visRectDst );
- if (usePat) fNullBrush = !DC_SetupGCForPatBlt( dcDst, tmpGC, TRUE );
+ if (usePat) fNullBrush = !X11DRV_SetupGCForPatBlt( dcDst, tmpGC, TRUE );
else fNullBrush = FALSE;
destUsed = FALSE;
diff --git a/graphics/x11drv/dib.c b/graphics/x11drv/dib.c
index 9b8103a..848bc9c 100644
--- a/graphics/x11drv/dib.c
+++ b/graphics/x11drv/dib.c
@@ -1114,8 +1114,8 @@
if (xSrc + cx >= width) cx = width - xSrc;
if (!cx || !cy) return 0;
- DC_SetupGCForText( dc ); /* To have the correct colors */
- TSXSetFunction( display, dc->u.x.gc, DC_XROPfunction[dc->w.ROPmode-1] );
+ X11DRV_SetupGCForText( dc ); /* To have the correct colors */
+ TSXSetFunction(display, dc->u.x.gc, X11DRV_XROPfunction[dc->w.ROPmode-1]);
if (descr.infoBpp <= 8)
{
diff --git a/graphics/x11drv/graphics.c b/graphics/x11drv/graphics.c
index 45f9864..8304a80 100644
--- a/graphics/x11drv/graphics.c
+++ b/graphics/x11drv/graphics.c
@@ -24,6 +24,7 @@
#include <string.h>
#include "x11drv.h"
+#include "x11font.h"
#include "bitmap.h"
#include "gdi.h"
#include "graphics.h"
@@ -39,6 +40,254 @@
#include "xmalloc.h"
#define ABS(x) ((x)<0?(-(x)):(x))
+
+ /* ROP code to GC function conversion */
+const int X11DRV_XROPfunction[16] =
+{
+ GXclear, /* R2_BLACK */
+ GXnor, /* R2_NOTMERGEPEN */
+ GXandInverted, /* R2_MASKNOTPEN */
+ GXcopyInverted, /* R2_NOTCOPYPEN */
+ GXandReverse, /* R2_MASKPENNOT */
+ GXinvert, /* R2_NOT */
+ GXxor, /* R2_XORPEN */
+ GXnand, /* R2_NOTMASKPEN */
+ GXand, /* R2_MASKPEN */
+ GXequiv, /* R2_NOTXORPEN */
+ GXnoop, /* R2_NOP */
+ GXorInverted, /* R2_MERGENOTPEN */
+ GXcopy, /* R2_COPYPEN */
+ GXorReverse, /* R2_MERGEPENNOT */
+ GXor, /* R2_MERGEPEN */
+ GXset /* R2_WHITE */
+};
+
+
+/***********************************************************************
+ * X11DRV_SetupGCForPatBlt
+ *
+ * Setup the GC for a PatBlt operation using current brush.
+ * If fMapColors is TRUE, X pixels are mapped to Windows colors.
+ * Return FALSE if brush is BS_NULL, TRUE otherwise.
+ */
+BOOL32 X11DRV_SetupGCForPatBlt( DC * dc, GC gc, BOOL32 fMapColors )
+{
+ XGCValues val;
+ unsigned long mask;
+ Pixmap pixmap = 0;
+
+ if (dc->u.x.brush.style == BS_NULL) return FALSE;
+ if (dc->u.x.brush.pixel == -1)
+ {
+ /* Special case used for monochrome pattern brushes.
+ * We need to swap foreground and background because
+ * Windows does it the wrong way...
+ */
+ val.foreground = dc->u.x.backgroundPixel;
+ val.background = dc->u.x.textPixel;
+ }
+ else
+ {
+ val.foreground = dc->u.x.brush.pixel;
+ val.background = dc->u.x.backgroundPixel;
+ }
+ if (fMapColors && COLOR_PixelToPalette)
+ {
+ val.foreground = COLOR_PixelToPalette[val.foreground];
+ val.background = COLOR_PixelToPalette[val.background];
+ }
+
+ if (dc->w.flags & DC_DIRTY) CLIPPING_UpdateGCRegion(dc);
+
+ val.function = X11DRV_XROPfunction[dc->w.ROPmode-1];
+ /*
+ ** Let's replace GXinvert by GXxor with (black xor white)
+ ** This solves the selection color and leak problems in excel
+ ** FIXME : Let's do that only if we work with X-pixels, not with Win-pixels
+ */
+ if (val.function == GXinvert)
+ {
+ val.foreground = BlackPixelOfScreen(screen) ^ WhitePixelOfScreen(screen);
+ val.function = GXxor;
+ }
+ val.fill_style = dc->u.x.brush.fillStyle;
+ switch(val.fill_style)
+ {
+ case FillStippled:
+ case FillOpaqueStippled:
+ if (dc->w.backgroundMode==OPAQUE) val.fill_style = FillOpaqueStippled;
+ val.stipple = dc->u.x.brush.pixmap;
+ mask = GCStipple;
+ break;
+
+ case FillTiled:
+ if (fMapColors && COLOR_PixelToPalette)
+ {
+ register int x, y;
+ XImage *image;
+ EnterCriticalSection( &X11DRV_CritSection );
+ pixmap = XCreatePixmap( display, rootWindow, 8, 8, screenDepth );
+ image = XGetImage( display, dc->u.x.brush.pixmap, 0, 0, 8, 8,
+ AllPlanes, ZPixmap );
+ for (y = 0; y < 8; y++)
+ for (x = 0; x < 8; x++)
+ XPutPixel( image, x, y,
+ COLOR_PixelToPalette[XGetPixel( image, x, y)] );
+ XPutImage( display, pixmap, gc, image, 0, 0, 0, 0, 8, 8 );
+ XDestroyImage( image );
+ LeaveCriticalSection( &X11DRV_CritSection );
+ val.tile = pixmap;
+ }
+ else val.tile = dc->u.x.brush.pixmap;
+ mask = GCTile;
+ break;
+
+ default:
+ mask = 0;
+ break;
+ }
+ val.ts_x_origin = dc->w.DCOrgX + dc->w.brushOrgX;
+ val.ts_y_origin = dc->w.DCOrgY + dc->w.brushOrgY;
+ val.fill_rule = (dc->w.polyFillMode==WINDING) ? WindingRule : EvenOddRule;
+ TSXChangeGC( display, gc,
+ GCFunction | GCForeground | GCBackground | GCFillStyle |
+ GCFillRule | GCTileStipXOrigin | GCTileStipYOrigin | mask,
+ &val );
+ if (pixmap) TSXFreePixmap( display, pixmap );
+ return TRUE;
+}
+
+
+/***********************************************************************
+ * X11DRV_SetupGCForBrush
+ *
+ * Setup dc->u.x.gc for drawing operations using current brush.
+ * Return FALSE if brush is BS_NULL, TRUE otherwise.
+ */
+BOOL32 X11DRV_SetupGCForBrush( DC * dc )
+{
+ return X11DRV_SetupGCForPatBlt( dc, dc->u.x.gc, FALSE );
+}
+
+
+/***********************************************************************
+ * X11DRV_SetupGCForPen
+ *
+ * Setup dc->u.x.gc for drawing operations using current pen.
+ * Return FALSE if pen is PS_NULL, TRUE otherwise.
+ */
+BOOL32 X11DRV_SetupGCForPen( DC * dc )
+{
+ XGCValues val;
+
+ if (dc->u.x.pen.style == PS_NULL) return FALSE;
+
+ if (dc->w.flags & DC_DIRTY) CLIPPING_UpdateGCRegion(dc);
+
+ switch (dc->w.ROPmode)
+ {
+ case R2_BLACK :
+ val.foreground = BlackPixelOfScreen( screen );
+ val.function = GXcopy;
+ break;
+ case R2_WHITE :
+ val.foreground = WhitePixelOfScreen( screen );
+ val.function = GXcopy;
+ break;
+ case R2_XORPEN :
+ val.foreground = dc->u.x.pen.pixel;
+ /* It is very unlikely someone wants to XOR with 0 */
+ /* This fixes the rubber-drawings in paintbrush */
+ if (val.foreground == 0)
+ val.foreground = BlackPixelOfScreen( screen )
+ ^ WhitePixelOfScreen( screen );
+ val.function = GXxor;
+ break;
+ default :
+ val.foreground = dc->u.x.pen.pixel;
+ val.function = X11DRV_XROPfunction[dc->w.ROPmode-1];
+ }
+ val.background = dc->u.x.backgroundPixel;
+ val.fill_style = FillSolid;
+ if ((dc->u.x.pen.style!=PS_SOLID) && (dc->u.x.pen.style!=PS_INSIDEFRAME))
+ {
+ TSXSetDashes( display, dc->u.x.gc, 0,
+ dc->u.x.pen.dashes, dc->u.x.pen.dash_len );
+ val.line_style = (dc->w.backgroundMode == OPAQUE) ?
+ LineDoubleDash : LineOnOffDash;
+ }
+ else val.line_style = LineSolid;
+ val.line_width = dc->u.x.pen.width;
+ if (val.line_width <= 1) {
+ val.cap_style = CapNotLast;
+ } else {
+ switch (dc->u.x.pen.endcap)
+ {
+ case PS_ENDCAP_SQUARE:
+ val.cap_style = CapProjecting;
+ break;
+ case PS_ENDCAP_FLAT:
+ val.cap_style = CapButt;
+ break;
+ case PS_ENDCAP_ROUND:
+ default:
+ val.cap_style = CapRound;
+ }
+ }
+ switch (dc->u.x.pen.linejoin)
+ {
+ case PS_JOIN_BEVEL:
+ val.join_style = JoinBevel;
+ break;
+ case PS_JOIN_MITER:
+ val.join_style = JoinMiter;
+ break;
+ case PS_JOIN_ROUND:
+ default:
+ val.join_style = JoinRound;
+ }
+ TSXChangeGC( display, dc->u.x.gc,
+ GCFunction | GCForeground | GCBackground | GCLineWidth |
+ GCLineStyle | GCCapStyle | GCJoinStyle | GCFillStyle, &val );
+ return TRUE;
+}
+
+
+/***********************************************************************
+ * X11DRV_SetupGCForText
+ *
+ * Setup dc->u.x.gc for text drawing operations.
+ * Return FALSE if the font is null, TRUE otherwise.
+ */
+BOOL32 X11DRV_SetupGCForText( DC * dc )
+{
+ XFontStruct* xfs = XFONT_GetFontStruct( dc->u.x.font );
+
+ if( xfs )
+ {
+ XGCValues val;
+
+ if (dc->w.flags & DC_DIRTY) CLIPPING_UpdateGCRegion(dc);
+
+ val.function = GXcopy; /* Text is always GXcopy */
+ val.foreground = dc->u.x.textPixel;
+ val.background = dc->u.x.backgroundPixel;
+ val.fill_style = FillSolid;
+ val.font = xfs->fid;
+
+ TSXChangeGC( display, dc->u.x.gc,
+ GCFunction | GCForeground | GCBackground | GCFillStyle |
+ GCFont, &val );
+ return TRUE;
+ }
+ WARN(dc, "Physical font failure\n" );
+ return FALSE;
+}
+
+
+
+
+
/**********************************************************************
* X11DRV_MoveToEx
*/
@@ -60,7 +309,7 @@
BOOL32
X11DRV_LineTo( DC *dc, INT32 x, INT32 y )
{
- if (DC_SetupGCForPen( dc ))
+ if (X11DRV_SetupGCForPen( dc ))
TSXDrawLine(display, dc->u.x.drawable, dc->u.x.gc,
dc->w.DCOrgX + XLPTODP( dc, dc->w.CursPosX ),
dc->w.DCOrgY + YLPTODP( dc, dc->w.CursPosY ),
@@ -145,7 +394,7 @@
/* Fill arc with brush if Chord() or Pie() */
- if ((lines > 0) && DC_SetupGCForBrush( dc )) {
+ if ((lines > 0) && X11DRV_SetupGCForBrush( dc )) {
TSXSetArcMode( display, dc->u.x.gc, (lines==1) ? ArcChord : ArcPieSlice);
TSXFillArc( display, dc->u.x.drawable, dc->u.x.gc,
dc->w.DCOrgX + left, dc->w.DCOrgY + top,
@@ -154,7 +403,7 @@
/* Draw arc and lines */
- if (DC_SetupGCForPen( dc )){
+ if (X11DRV_SetupGCForPen( dc )){
TSXDrawArc( display, dc->u.x.drawable, dc->u.x.gc,
dc->w.DCOrgX + left, dc->w.DCOrgY + top,
right-left-1, bottom-top-1, istart_angle, idiff_angle );
@@ -288,11 +537,11 @@
if(width == 0) width=1; /* more accurate */
dc->u.x.pen.width=width;
- if (DC_SetupGCForBrush( dc ))
+ if (X11DRV_SetupGCForBrush( dc ))
TSXFillArc( display, dc->u.x.drawable, dc->u.x.gc,
dc->w.DCOrgX + left, dc->w.DCOrgY + top,
right-left-1, bottom-top-1, 0, 360*64 );
- if (DC_SetupGCForPen( dc ))
+ if (X11DRV_SetupGCForPen( dc ))
TSXDrawArc( display, dc->u.x.drawable, dc->u.x.gc,
dc->w.DCOrgX + left, dc->w.DCOrgY + top,
right-left-1, bottom-top-1, 0, 360*64 );
@@ -343,13 +592,13 @@
if ((right > left + width) && (bottom > top + width))
{
- if (DC_SetupGCForBrush( dc ))
+ if (X11DRV_SetupGCForBrush( dc ))
TSXFillRectangle( display, dc->u.x.drawable, dc->u.x.gc,
dc->w.DCOrgX + left + (width + 1) / 2,
dc->w.DCOrgY + top + (width + 1) / 2,
right-left-width-1, bottom-top-width-1);
}
- if (DC_SetupGCForPen( dc ))
+ if (X11DRV_SetupGCForPen( dc ))
TSXDrawRectangle( display, dc->u.x.drawable, dc->u.x.gc,
dc->w.DCOrgX + left, dc->w.DCOrgY + top,
right-left-1, bottom-top-1 );
@@ -407,7 +656,7 @@
dc->u.x.pen.width=width;
dc->u.x.pen.endcap=PS_ENDCAP_SQUARE;
- if (DC_SetupGCForBrush( dc ))
+ if (X11DRV_SetupGCForBrush( dc ))
{
if (ell_width > (right-left) )
if (ell_height > (bottom-top) )
@@ -479,7 +728,7 @@
* BTW this stuff is optimized for an Xfree86 server
* read the comments inside the X11DRV_DrawArc function
*/
- if (DC_SetupGCForPen(dc)) {
+ if (X11DRV_SetupGCForPen(dc)) {
if (ell_width > (right-left) )
if (ell_height > (bottom-top) )
TSXDrawArc( display, dc->u.x.drawable, dc->u.x.gc,
@@ -639,7 +888,7 @@
/* Fill the region */
GetRgnBox32( dc->w.hGCClipRgn, &box );
- if (DC_SetupGCForBrush( dc ))
+ if (X11DRV_SetupGCForBrush( dc ))
TSXFillRectangle( display, dc->u.x.drawable, dc->u.x.gc,
box.left, box.top,
box.right-box.left, box.bottom-box.top );
@@ -668,7 +917,7 @@
points[i].y = dc->w.DCOrgY + YLPTODP( dc, pt[i].y );
}
- if (DC_SetupGCForPen ( dc ))
+ if (X11DRV_SetupGCForPen ( dc ))
TSXDrawLines( display, dc->u.x.drawable, dc->u.x.gc,
points, count, CoordModeOrigin );
@@ -695,11 +944,11 @@
}
points[count] = points[0];
- if (DC_SetupGCForBrush( dc ))
+ if (X11DRV_SetupGCForBrush( dc ))
TSXFillPolygon( display, dc->u.x.drawable, dc->u.x.gc,
points, count+1, Complex, CoordModeOrigin);
- if (DC_SetupGCForPen ( dc ))
+ if (X11DRV_SetupGCForPen ( dc ))
TSXDrawLines( display, dc->u.x.drawable, dc->u.x.gc,
points, count+1, CoordModeOrigin );
@@ -726,7 +975,7 @@
/* Draw the outline of the polygons */
- if (DC_SetupGCForPen ( dc ))
+ if (X11DRV_SetupGCForPen ( dc ))
{
int i, j, max = 0;
XPoint *points;
@@ -758,7 +1007,7 @@
BOOL32
X11DRV_PolyPolyline( DC *dc, const POINT32* pt, const DWORD* counts, DWORD polylines )
{
- if (DC_SetupGCForPen ( dc ))
+ if (X11DRV_SetupGCForPen ( dc ))
{
int i, j, max = 0;
XPoint *points;
@@ -885,7 +1134,7 @@
rect.bottom - rect.top,
AllPlanes, ZPixmap ))) return FALSE;
- if (DC_SetupGCForBrush( dc ))
+ if (X11DRV_SetupGCForBrush( dc ))
{
/* ROP mode is always GXcopy for flood-fill */
XSetFunction( display, dc->u.x.gc, GXcopy );
diff --git a/graphics/x11drv/text.c b/graphics/x11drv/text.c
index 068b4cc..ba65559 100644
--- a/graphics/x11drv/text.c
+++ b/graphics/x11drv/text.c
@@ -36,7 +36,7 @@
char dfBreakChar, lfUnderline, lfStrikeOut;
BOOL32 rotated = FALSE;
- if (!DC_SetupGCForText( dc )) return TRUE;
+ if (!X11DRV_SetupGCForText( dc )) return TRUE;
pfo = XFONT_GetFontObject( dc->u.x.font );
font = pfo->fs;
diff --git a/include/dc.h b/include/dc.h
index 74eadcd..a422ce9 100644
--- a/include/dc.h
+++ b/include/dc.h
@@ -17,13 +17,8 @@
extern DC * DC_AllocDC( const DC_FUNCTIONS *funcs );
extern DC * DC_GetDCPtr( HDC32 hdc );
extern void DC_InitDC( DC * dc );
-extern BOOL32 DC_SetupGCForPatBlt( DC * dc, GC gc, BOOL32 fMapColors );
-extern BOOL32 DC_SetupGCForBrush( DC * dc );
-extern BOOL32 DC_SetupGCForPen( DC * dc );
-extern BOOL32 DC_SetupGCForText( DC * dc );
extern void DC_UpdateXforms( DC * dc );
-extern const int DC_XROPfunction[];
/* objects/clipping.c */
INT32 CLIPPING_IntersectClipRect( DC * dc, INT32 left, INT32 top,
diff --git a/include/x11drv.h b/include/x11drv.h
index bd22e08..1f7aef2 100644
--- a/include/x11drv.h
+++ b/include/x11drv.h
@@ -150,6 +150,14 @@
extern BOOL32 X11DRV_DIB_Init(void);
extern X11DRV_PHYSBITMAP *X11DRV_AllocBitmap( struct tagBITMAPOBJ *bmp );
+extern BOOL32 X11DRV_SetupGCForPatBlt( struct tagDC *dc, GC gc,
+ BOOL32 fMapColors );
+extern BOOL32 X11DRV_SetupGCForBrush( struct tagDC *dc );
+extern BOOL32 X11DRV_SetupGCForPen( struct tagDC *dc );
+extern BOOL32 X11DRV_SetupGCForText( struct tagDC *dc );
+
+extern const int X11DRV_XROPfunction[];
+
/* Xlib critical section */
extern CRITICAL_SECTION X11DRV_CritSection;
diff --git a/objects/brush.c b/objects/brush.c
index 6f93738..c3eb4d9 100644
--- a/objects/brush.c
+++ b/objects/brush.c
@@ -7,8 +7,6 @@
#include <stdlib.h>
#include "brush.h"
#include "bitmap.h"
-#include "metafile.h"
-#include "color.h"
#include "debug.h"
@@ -25,6 +23,7 @@
brushPtr->logbrush.lbColor = brush->lbColor;
brushPtr->logbrush.lbHatch = brush->lbHatch;
GDI_HEAP_UNLOCK( hbrush );
+ TRACE(gdi, "%04x\n", hbrush);
return hbrush;
}
@@ -42,6 +41,7 @@
brushPtr->logbrush.lbColor = brush->lbColor;
brushPtr->logbrush.lbHatch = brush->lbHatch;
GDI_HEAP_UNLOCK( hbrush );
+ TRACE(gdi, "%08x\n", hbrush);
return hbrush;
}
diff --git a/objects/dc.c b/objects/dc.c
index 1976dc2..10532c2 100644
--- a/objects/dc.c
+++ b/objects/dc.c
@@ -11,84 +11,9 @@
#include "gdi.h"
#include "heap.h"
#include "metafile.h"
-#include "color.h"
#include "debug.h"
#include "font.h"
#include "winerror.h"
-#include "x11font.h"
-
- /* ROP code to GC function conversion */
-const int DC_XROPfunction[16] =
-{
- GXclear, /* R2_BLACK */
- GXnor, /* R2_NOTMERGEPEN */
- GXandInverted, /* R2_MASKNOTPEN */
- GXcopyInverted, /* R2_NOTCOPYPEN */
- GXandReverse, /* R2_MASKPENNOT */
- GXinvert, /* R2_NOT */
- GXxor, /* R2_XORPEN */
- GXnand, /* R2_NOTMASKPEN */
- GXand, /* R2_MASKPEN */
- GXequiv, /* R2_NOTXORPEN */
- GXnoop, /* R2_NOP */
- GXorInverted, /* R2_MERGENOTPEN */
- GXcopy, /* R2_COPYPEN */
- GXorReverse, /* R2_MERGEPENNOT */
- GXor, /* R2_MERGEPEN */
- GXset /* R2_WHITE */
-};
-
-
-/***********************************************************************
- * DC_FillDevCaps
- *
- * Fill the device caps structure.
- */
-void DC_FillDevCaps( DeviceCaps * caps )
-{
- caps->version = 0x300;
- caps->technology = DT_RASDISPLAY;
- caps->horzSize = WidthMMOfScreen(screen) * screenWidth / WidthOfScreen(screen);
- caps->vertSize = HeightMMOfScreen(screen) * screenHeight / HeightOfScreen(screen);
- caps->horzRes = screenWidth;
- caps->vertRes = screenHeight;
- caps->bitsPixel = screenDepth;
- caps->planes = 1;
- caps->numBrushes = 16+6; /* 16 solid + 6 hatched brushes */
- caps->numPens = 16; /* 16 solid pens */
- caps->numMarkers = 0;
- caps->numFonts = 0;
- caps->numColors = 100;
- caps->pdeviceSize = 0;
- caps->curveCaps = CC_CIRCLES | CC_PIE | CC_CHORD | CC_ELLIPSES |
- CC_WIDE | CC_STYLED | CC_WIDESTYLED |
- CC_INTERIORS | CC_ROUNDRECT;
- caps->lineCaps = LC_POLYLINE | LC_MARKER | LC_POLYMARKER | LC_WIDE |
- LC_STYLED | LC_WIDESTYLED | LC_INTERIORS;
- caps->polygonalCaps = PC_POLYGON | PC_RECTANGLE | PC_WINDPOLYGON |
- PC_SCANLINE | PC_WIDE | PC_STYLED |
- PC_WIDESTYLED | PC_INTERIORS;
- caps->textCaps = TC_OP_CHARACTER | TC_OP_STROKE | TC_CP_STROKE |
- TC_IA_ABLE | TC_UA_ABLE | TC_SO_ABLE | TC_RA_ABLE;
- caps->clipCaps = CP_REGION;
- caps->rasterCaps = RC_BITBLT | RC_BANDING | RC_SCALING | RC_BITMAP64 |
- RC_DI_BITMAP | RC_DIBTODEV | RC_BIGFONT|
- RC_STRETCHBLT | RC_STRETCHDIB | RC_DEVBITS;
-
- if( !(COLOR_GetSystemPaletteFlags() & COLOR_VIRTUAL) )
- caps->rasterCaps |= RC_PALETTE;
-
- caps->aspectX = 36; /* ?? */
- caps->aspectY = 36; /* ?? */
- caps->aspectXY = 51;
- caps->logPixelsX = (int)(caps->horzRes * 25.4 / caps->horzSize);
- caps->logPixelsY = (int)(caps->vertRes * 25.4 / caps->vertSize);
- caps->sizePalette = (caps->rasterCaps & RC_PALETTE)
- ? DefaultVisual(display,DefaultScreen(display))->map_entries
- : 0;
- caps->numReserved = 0;
- caps->colorRes = 0;
-}
/***********************************************************************
@@ -213,228 +138,6 @@
/***********************************************************************
- * DC_SetupGCForPatBlt
- *
- * Setup the GC for a PatBlt operation using current brush.
- * If fMapColors is TRUE, X pixels are mapped to Windows colors.
- * Return FALSE if brush is BS_NULL, TRUE otherwise.
- */
-BOOL32 DC_SetupGCForPatBlt( DC * dc, GC gc, BOOL32 fMapColors )
-{
- XGCValues val;
- unsigned long mask;
- Pixmap pixmap = 0;
-
- if (dc->u.x.brush.style == BS_NULL) return FALSE;
- if (dc->u.x.brush.pixel == -1)
- {
- /* Special case used for monochrome pattern brushes.
- * We need to swap foreground and background because
- * Windows does it the wrong way...
- */
- val.foreground = dc->u.x.backgroundPixel;
- val.background = dc->u.x.textPixel;
- }
- else
- {
- val.foreground = dc->u.x.brush.pixel;
- val.background = dc->u.x.backgroundPixel;
- }
- if (fMapColors && COLOR_PixelToPalette)
- {
- val.foreground = COLOR_PixelToPalette[val.foreground];
- val.background = COLOR_PixelToPalette[val.background];
- }
-
- if (dc->w.flags & DC_DIRTY) CLIPPING_UpdateGCRegion(dc);
-
- val.function = DC_XROPfunction[dc->w.ROPmode-1];
- /*
- ** Let's replace GXinvert by GXxor with (black xor white)
- ** This solves the selection color and leak problems in excel
- ** FIXME : Let's do that only if we work with X-pixels, not with Win-pixels
- */
- if (val.function == GXinvert)
- {
- val.foreground = BlackPixelOfScreen(screen) ^ WhitePixelOfScreen(screen);
- val.function = GXxor;
- }
- val.fill_style = dc->u.x.brush.fillStyle;
- switch(val.fill_style)
- {
- case FillStippled:
- case FillOpaqueStippled:
- if (dc->w.backgroundMode==OPAQUE) val.fill_style = FillOpaqueStippled;
- val.stipple = dc->u.x.brush.pixmap;
- mask = GCStipple;
- break;
-
- case FillTiled:
- if (fMapColors && COLOR_PixelToPalette)
- {
- register int x, y;
- XImage *image;
- EnterCriticalSection( &X11DRV_CritSection );
- pixmap = XCreatePixmap( display, rootWindow, 8, 8, screenDepth );
- image = XGetImage( display, dc->u.x.brush.pixmap, 0, 0, 8, 8,
- AllPlanes, ZPixmap );
- for (y = 0; y < 8; y++)
- for (x = 0; x < 8; x++)
- XPutPixel( image, x, y,
- COLOR_PixelToPalette[XGetPixel( image, x, y)] );
- XPutImage( display, pixmap, gc, image, 0, 0, 0, 0, 8, 8 );
- XDestroyImage( image );
- LeaveCriticalSection( &X11DRV_CritSection );
- val.tile = pixmap;
- }
- else val.tile = dc->u.x.brush.pixmap;
- mask = GCTile;
- break;
-
- default:
- mask = 0;
- break;
- }
- val.ts_x_origin = dc->w.DCOrgX + dc->w.brushOrgX;
- val.ts_y_origin = dc->w.DCOrgY + dc->w.brushOrgY;
- val.fill_rule = (dc->w.polyFillMode==WINDING) ? WindingRule : EvenOddRule;
- TSXChangeGC( display, gc,
- GCFunction | GCForeground | GCBackground | GCFillStyle |
- GCFillRule | GCTileStipXOrigin | GCTileStipYOrigin | mask,
- &val );
- if (pixmap) TSXFreePixmap( display, pixmap );
- return TRUE;
-}
-
-
-/***********************************************************************
- * DC_SetupGCForBrush
- *
- * Setup dc->u.x.gc for drawing operations using current brush.
- * Return FALSE if brush is BS_NULL, TRUE otherwise.
- */
-BOOL32 DC_SetupGCForBrush( DC * dc )
-{
- return DC_SetupGCForPatBlt( dc, dc->u.x.gc, FALSE );
-}
-
-
-/***********************************************************************
- * DC_SetupGCForPen
- *
- * Setup dc->u.x.gc for drawing operations using current pen.
- * Return FALSE if pen is PS_NULL, TRUE otherwise.
- */
-BOOL32 DC_SetupGCForPen( DC * dc )
-{
- XGCValues val;
-
- if (dc->u.x.pen.style == PS_NULL) return FALSE;
-
- if (dc->w.flags & DC_DIRTY) CLIPPING_UpdateGCRegion(dc);
-
- switch (dc->w.ROPmode)
- {
- case R2_BLACK :
- val.foreground = BlackPixelOfScreen( screen );
- val.function = GXcopy;
- break;
- case R2_WHITE :
- val.foreground = WhitePixelOfScreen( screen );
- val.function = GXcopy;
- break;
- case R2_XORPEN :
- val.foreground = dc->u.x.pen.pixel;
- /* It is very unlikely someone wants to XOR with 0 */
- /* This fixes the rubber-drawings in paintbrush */
- if (val.foreground == 0)
- val.foreground = BlackPixelOfScreen( screen )
- ^ WhitePixelOfScreen( screen );
- val.function = GXxor;
- break;
- default :
- val.foreground = dc->u.x.pen.pixel;
- val.function = DC_XROPfunction[dc->w.ROPmode-1];
- }
- val.background = dc->u.x.backgroundPixel;
- val.fill_style = FillSolid;
- if ((dc->u.x.pen.style!=PS_SOLID) && (dc->u.x.pen.style!=PS_INSIDEFRAME))
- {
- TSXSetDashes( display, dc->u.x.gc, 0,
- dc->u.x.pen.dashes, dc->u.x.pen.dash_len );
- val.line_style = (dc->w.backgroundMode == OPAQUE) ?
- LineDoubleDash : LineOnOffDash;
- }
- else val.line_style = LineSolid;
- val.line_width = dc->u.x.pen.width;
- if (val.line_width <= 1) {
- val.cap_style = CapNotLast;
- } else {
- switch (dc->u.x.pen.endcap)
- {
- case PS_ENDCAP_SQUARE:
- val.cap_style = CapProjecting;
- break;
- case PS_ENDCAP_FLAT:
- val.cap_style = CapButt;
- break;
- case PS_ENDCAP_ROUND:
- default:
- val.cap_style = CapRound;
- }
- }
- switch (dc->u.x.pen.linejoin)
- {
- case PS_JOIN_BEVEL:
- val.join_style = JoinBevel;
- break;
- case PS_JOIN_MITER:
- val.join_style = JoinMiter;
- break;
- case PS_JOIN_ROUND:
- default:
- val.join_style = JoinRound;
- }
- TSXChangeGC( display, dc->u.x.gc,
- GCFunction | GCForeground | GCBackground | GCLineWidth |
- GCLineStyle | GCCapStyle | GCJoinStyle | GCFillStyle, &val );
- return TRUE;
-}
-
-
-/***********************************************************************
- * DC_SetupGCForText
- *
- * Setup dc->u.x.gc for text drawing operations.
- * Return FALSE if the font is null, TRUE otherwise.
- */
-BOOL32 DC_SetupGCForText( DC * dc )
-{
- XFontStruct* xfs = XFONT_GetFontStruct( dc->u.x.font );
-
- if( xfs )
- {
- XGCValues val;
-
- if (dc->w.flags & DC_DIRTY) CLIPPING_UpdateGCRegion(dc);
-
- val.function = GXcopy; /* Text is always GXcopy */
- val.foreground = dc->u.x.textPixel;
- val.background = dc->u.x.backgroundPixel;
- val.fill_style = FillSolid;
- val.font = xfs->fid;
-
- TSXChangeGC( display, dc->u.x.gc,
- GCFunction | GCForeground | GCBackground | GCFillStyle |
- GCFont, &val );
- return TRUE;
- }
- WARN(dc, "Physical font failure\n" );
- return FALSE;
-}
-
-
-/***********************************************************************
* DC_InvertXform
*
* Computes the inverse of the transformation xformSrc and stores it to
diff --git a/objects/gdiobj.c b/objects/gdiobj.c
index a81408c..633bd83 100644
--- a/objects/gdiobj.c
+++ b/objects/gdiobj.c
@@ -5,7 +5,6 @@
*/
#include <stdlib.h>
-#include "color.h"
#include "bitmap.h"
#include "brush.h"
#include "dc.h"
diff --git a/objects/pen.c b/objects/pen.c
index e9ee9a8..a4825ad 100644
--- a/objects/pen.c
+++ b/objects/pen.c
@@ -5,8 +5,6 @@
*/
#include "pen.h"
-#include "metafile.h"
-#include "color.h"
#include "debug.h"
diff --git a/windows/graphics.c b/windows/graphics.c
index b1fa1a1..fe9a6b6 100644
--- a/windows/graphics.c
+++ b/windows/graphics.c
@@ -35,7 +35,7 @@
HPEN32 hPrevPen = 0;
if( hPen ) hPrevPen = SelectObject32( hdc, hPen );
- if( DC_SetupGCForPen( dc ) )
+ if( X11DRV_SetupGCForPen( dc ) )
{
XSegment l[MAX_DRAWLINES];
INT32 i, j;
@@ -178,7 +178,7 @@
hPrevBrush = SelectObject32(hdc, highlight);
- if ( DC_SetupGCForBrush( dc ) )
+ if ( X11DRV_SetupGCForBrush( dc ) )
{
INT32 i;
@@ -193,7 +193,7 @@
}
SelectObject32( hdc, shadow );
- if ( DC_SetupGCForBrush( dc ) )
+ if ( X11DRV_SetupGCForBrush( dc ) )
{
INT32 i;
@@ -226,7 +226,7 @@
HPEN32 hPrevPen = 0;
if( hPen ) hPrevPen = SelectObject32( hdc, hPen );
- if( DC_SetupGCForPen( dc ) )
+ if( X11DRV_SetupGCForPen( dc ) )
TSXDrawRectangle( 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 );
