/*
About pens, brushes, and the autoSetting flag:
- Under X, pens and brushes control some of the same X drawing parameters.
- Therefore, it is impossible to independently maintain the current pen and the
- current brush. Also, some settings depend on the current logical function. The
- m_currentFill, etc. instance variables remember state across the brush and
- pen.
+ Under X, pens and brushes control some of the same X drawing
+ parameters. Therefore, it is impossible to independently maintain
+ the current pen and the current brush. Also, some settings depend on
+ the current logical function. The m_currentFill, etc. instance
+ variables remember state across the brush and pen.
Since pens are used more than brushes, the autoSetting flag is used to
indicate that a brush was recently used, and SetPen must be called to
#include "wx/window.h"
#include "wx/app.h"
#include "wx/image.h"
+#include "wx/log.h"
#include <math.h>
+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif
#include <Xm/Xm.h>
+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif
#include "wx/motif/private.h"
+#ifdef __EMX__
+ #include <float.h> // for M_PI
+#endif // __EMX__
+
#include "bdiag.xbm"
#include "fdiag.xbm"
#include "cdiag.xbm"
// constants
// ----------------------------------------------------------------------------
-#define RAD2DEG 57.2957795131
-
// Fudge factor (VZ: what??)
#define WX_GC_CF 1
// macros
// ----------------------------------------------------------------------------
-#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC)
IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC)
IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC)
-#endif
// ----------------------------------------------------------------------------
// prototypes
// implementation
// ============================================================================
+/*
+ * compare two doubles and return the larger rounded
+ * to the nearest int
+ */
+static int roundmax(double a, double b)
+{
+ return (int)((a > b ? a : b) + 0.5);
+}
+
+/*
+ * compare two doubles and return the smaller rounded
+ * to the nearest int
+ */
+static int roundmin(double a, double b)
+{
+ return (int)((a < b ? a : b) - 0.5);
+}
+
+
// ----------------------------------------------------------------------------
// wxWindowDC
// ----------------------------------------------------------------------------
m_currentPenWidth = 1;
m_currentPenJoin = -1;
m_currentPenDashCount = -1;
- m_currentPenDash = (char*) NULL;
+ m_currentPenDash = (wxX11Dash*) NULL;
m_currentStyle = -1;
m_currentFill = -1;
// m_currentBkMode = wxTRANSPARENT;
wxASSERT_MSG( (window != (wxWindow*) NULL), "You must pass a valid wxWindow to wxWindowDC/wxClientDC/wxPaintDC constructor." );
m_window = window;
+ m_font = window->GetFont();
m_gc = (WXGC) 0;
m_gcBacking = (WXGC) 0;
m_backgroundPixel = -1;
m_currentPenWidth = 1;
m_currentPenJoin = -1;
m_currentPenDashCount = -1;
- m_currentPenDash = (char*) NULL;
+ m_currentPenDash = (wxX11Dash*) NULL;
m_currentStyle = -1;
m_currentFill = -1;
// m_currentBkMode = wxTRANSPARENT;
gcvalues.foreground = BlackPixel (display, DefaultScreen (display));
gcvalues.background = WhitePixel (display, DefaultScreen (display));
gcvalues.graphics_exposures = False;
+ gcvalues.subwindow_mode = IncludeInferiors;
gcvalues.line_width = 1;
m_gc = (WXGC) XCreateGC (display, RootWindow (display, DefaultScreen (display)),
- GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth,
+ GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth | GCSubwindowMode,
&gcvalues);
if (m_window->GetBackingPixmap())
{
m_gcBacking = (WXGC) XCreateGC (display, RootWindow (display,
DefaultScreen (display)),
- GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth,
+ GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth | GCSubwindowMode,
&gcvalues);
}
m_userRegion = (WXRegion) 0;
}
-void wxWindowDC::DoFloodFill( long WXUNUSED(x1), long WXUNUSED(y1),
- const wxColour& WXUNUSED(col), int WXUNUSED(style) )
+extern bool wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y,
+ const wxColour & col, int style);
+
+bool wxWindowDC::DoFloodFill(wxCoord x, wxCoord y,
+ const wxColour& col, int style)
{
- wxFAIL_MSG("not implemented");
+ return wxDoFloodFill(this, x, y, col, style);
}
-
-bool wxWindowDC::DoGetPixel( long WXUNUSED(x1), long WXUNUSED(y1), wxColour *WXUNUSED(col) ) const
+
+bool wxWindowDC::DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const
{
- wxFAIL_MSG("not implemented");
-
- return FALSE;
+ // Generic (and therefore rather inefficient) method.
+ // Could be improved.
+ wxMemoryDC memdc;
+ wxBitmap bitmap(1, 1);
+ memdc.SelectObject(bitmap);
+ memdc.Blit(0, 0, 1, 1, (wxDC*) this, x1, y1);
+ memdc.SelectObject(wxNullBitmap);
+ wxImage image = bitmap.ConvertToImage();
+ col->Set(image.GetRed(0, 0), image.GetGreen(0, 0), image.GetBlue(0, 0));
+ return TRUE;
}
-void wxWindowDC::DoDrawLine( long x1, long y1, long x2, long y2 )
+void wxWindowDC::DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 )
{
wxCHECK_RET( Ok(), "invalid dc" );
CalcBoundingBox(x2, y2);
}
-void wxWindowDC::DoCrossHair( long x, long y )
+void wxWindowDC::DoCrossHair( wxCoord x, wxCoord y )
{
wxCHECK_RET( Ok(), "invalid dc" );
}
}
-void wxWindowDC::DoDrawArc( long x1, long y1, long x2, long y2, long xc, long yc )
+void wxWindowDC::DoDrawArc( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCoord xc, wxCoord yc )
{
wxCHECK_RET( Ok(), "invalid dc" );
int xxc_2 = XLOG2DEV_2 (xc);
int yyc_2 = YLOG2DEV_2 (yc);
- long dx = xx1 - xxc;
- long dy = yy1 - yyc;
- double radius = sqrt (dx * dx + dy * dy);
- long r = (long) radius;
+ wxCoord dx = xx1 - xxc;
+ wxCoord dy = yy1 - yyc;
+ double radius = sqrt ((double)(dx * dx + dy * dy));
+ wxCoord r = (wxCoord) radius;
double radius1, radius2;
CalcBoundingBox (x2, y2);
}
-void wxWindowDC::DoDrawEllipticArc( long x, long y, long width, long height, double sa, double ea )
+void wxWindowDC::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord width, wxCoord height, double sa, double ea )
{
wxCHECK_RET( Ok(), "invalid dc" );
CalcBoundingBox (x + width, y + height);
}
-void wxWindowDC::DoDrawPoint( long x, long y )
+void wxWindowDC::DoDrawPoint( wxCoord x, wxCoord y )
{
wxCHECK_RET( Ok(), "invalid dc" );
CalcBoundingBox (x, y);
}
-void wxWindowDC::DoDrawLines( int n, wxPoint points[], long xoffset, long yoffset )
+void wxWindowDC::DoDrawLines( int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset )
{
wxCHECK_RET( Ok(), "invalid dc" );
}
void wxWindowDC::DoDrawPolygon( int n, wxPoint points[],
- long xoffset, long yoffset, int fillStyle )
+ wxCoord xoffset, wxCoord yoffset, int fillStyle )
{
wxCHECK_RET( Ok(), "invalid dc" );
delete[]xpoints2;
}
-void wxWindowDC::DoDrawRectangle( long x, long y, long width, long height )
+void wxWindowDC::DoDrawRectangle( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
{
wxCHECK_RET( Ok(), "invalid dc" );
CalcBoundingBox (x + width, y + height);
}
-void wxWindowDC::DoDrawRoundedRectangle( long x, long y, long width, long height, double radius )
+void wxWindowDC::DoDrawRoundedRectangle( wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius )
{
wxCHECK_RET( Ok(), "invalid dc" );
}
-void wxWindowDC::DoDrawEllipse( long x, long y, long width, long height )
+void wxWindowDC::DoDrawEllipse( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
{
wxCHECK_RET( Ok(), "invalid dc" );
}
#if 0
-void wxWindowDC::DoDrawIcon( const wxIcon &icon, long x, long y)
+void wxWindowDC::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y)
{
// FreeGetPixelCache();
SetPen (m_pen);
int width, height;
- Pixmap iconPixmap = (Pixmap) icon.GetPixmap();
+ Pixmap iconPixmap = (Pixmap) icon.GetDrawable();
width = icon.GetWidth();
height = icon.GetHeight();
if (icon.GetDisplay() == m_display)
#endif // 0
// TODO: use scaled Blit e.g. as per John Price's implementation in Contrib/Utilities
-bool wxWindowDC::DoBlit( long xdest, long ydest, long width, long height,
- wxDC *source, long xsrc, long ysrc, int rop, bool useMask )
+bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
+ wxDC *source, wxCoord xsrc, wxCoord ysrc, int rop, bool useMask,
+ wxCoord xsrcMask, wxCoord ysrcMask )
{
wxCHECK_MSG( Ok(), FALSE, "invalid dc" );
// FreeGetPixelCache();
- // Be sure that foreground pixels (1) of the Icon will be painted with pen
- // colour. [m_pen.SetColour()] Background pixels (0) will be painted with
- // last selected background color. [::SetBackground]
- if (m_pen.Ok() && m_autoSetting)
- SetPen (m_pen);
+ // Be sure that foreground pixels (1) of the Icon will be painted with
+ // foreground colour. [m_textForegroundColour] Background pixels (0)
+ // will be painted with backgound colour (m_textBackgroundColour)
+ // Using ::SetPen is horribly slow, so avoid doing it
+ int oldBackgroundPixel = -1;
+ int oldForegroundPixel = -1;
+
+ if (m_textBackgroundColour.Ok())
+ {
+ oldBackgroundPixel = m_backgroundPixel;
+ int pixel = m_textBackgroundColour.AllocColour(m_display);
+
+ XSetBackground ((Display*) m_display, (GC) m_gc, pixel);
+ if (m_window && m_window->GetBackingPixmap())
+ XSetBackground ((Display*) m_display,(GC) m_gcBacking,
+ pixel);
+ }
+ if (m_textForegroundColour.Ok())
+ {
+ oldForegroundPixel = m_currentColour.GetPixel();
+
+ if( m_textForegroundColour.GetPixel() <= -1 )
+ CalculatePixel( m_textForegroundColour,
+ m_textForegroundColour, TRUE);
+
+ int pixel = m_textForegroundColour.GetPixel();
+ if (pixel > -1)
+ SetForegroundPixelWithLogicalFunction(pixel);
+ }
// Do bitmap scaling if necessary
Pixmap sourcePixmap = (Pixmap) NULL;
double scaleX, scaleY;
GetUserScale(& scaleX, & scaleY);
+ bool retVal = FALSE;
+
+ /* TODO: use the mask origin when drawing transparently */
+ if (xsrcMask == -1 && ysrcMask == -1)
+ {
+ xsrcMask = xsrc; ysrcMask = ysrc;
+ }
// Sorry, can't scale masks just yet
if (!useMask && (scaleX != 1.0 || scaleY != 1.0) && sourceDC->IsKindOf(CLASSINFO(wxMemoryDC)))
wxASSERT_MSG( (bitmap.Ok()), "Bad source bitmap in wxWindowDC::Blit");
- wxImage image(bitmap);
+ wxImage image = bitmap.ConvertToImage();
if (!image.Ok())
{
- sourcePixmap = (Pixmap) bitmap.GetPixmap();
+ sourcePixmap = (Pixmap) bitmap.GetDrawable();
}
else
{
int scaledH = (int) (bitmap.GetHeight() * scaleY);
image = image.Scale(scaledW, scaledH);
- scaledBitmap = new wxBitmap(image.ConvertToBitmap());
- sourcePixmap = (Pixmap) scaledBitmap->GetPixmap();
+ scaledBitmap = new wxBitmap(image);
+ sourcePixmap = (Pixmap) scaledBitmap->GetDrawable();
}
}
else
{
wxMemoryDC *memDC = (wxMemoryDC *)source;
wxBitmap& sel = memDC->GetBitmap();
- if ( sel.Ok() && sel.GetMask() && sel.GetMask()->GetPixmap() )
+ if ( sel.Ok() && sel.GetMask() && sel.GetMask()->GetBitmap() )
{
- XSetClipMask ((Display*) m_display, (GC) m_gc, (Pixmap) sel.GetMask()->GetPixmap());
+ XSetClipMask ((Display*) m_display, (GC) m_gc, (Pixmap) sel.GetMask()->GetBitmap());
XSetClipOrigin ((Display*) m_display, (GC) m_gc, XLOG2DEV (xdest), YLOG2DEV (ydest));
}
}
}
} else
- {
+ { //XGCValues values;
+ //XGetGCValues((Display*)m_display, (GC)m_gc, GCForeground, &values);
+
if (m_window && m_window->GetBackingPixmap())
{
// +++ MARKUS (mho@comnets.rwth-aachen): error on blitting bitmaps with depth 1
{
wxMemoryDC *memDC = (wxMemoryDC *)source;
wxBitmap& sel = memDC->GetBitmap();
- if ( sel.Ok() && sel.GetMask() && sel.GetMask()->GetPixmap() )
+ if ( sel.Ok() && sel.GetMask() && sel.GetMask()->GetBitmap() )
{
- XSetClipMask ((Display*) m_display, (GC) m_gc, (Pixmap) sel.GetMask()->GetPixmap());
+ XSetClipMask ((Display*) m_display, (GC) m_gc, (Pixmap) sel.GetMask()->GetBitmap());
XSetClipOrigin ((Display*) m_display, (GC) m_gc, XLOG2DEV (xdest), YLOG2DEV (ydest));
}
}
SetLogicalFunction(orig);
- if (scaledBitmap) delete scaledBitmap;
-
- return TRUE;
+ retVal = TRUE;
}
if (scaledBitmap) delete scaledBitmap;
- return FALSE;
+ if (oldBackgroundPixel > -1)
+ {
+ XSetBackground ((Display*) m_display, (GC) m_gc, oldBackgroundPixel);
+ if (m_window && m_window->GetBackingPixmap())
+ XSetBackground ((Display*) m_display,(GC) m_gcBacking,
+ oldBackgroundPixel);
+ }
+ if (oldForegroundPixel > -1)
+ {
+ XSetForeground ((Display*) m_display, (GC) m_gc, oldForegroundPixel);
+ if (m_window && m_window->GetBackingPixmap())
+ XSetForeground ((Display*) m_display,(GC) m_gcBacking,
+ oldForegroundPixel);
+ }
+
+ return retVal;
}
-void wxWindowDC::DoDrawText( const wxString &text, long x, long y )
+void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
{
wxCHECK_RET( Ok(), "invalid dc" );
int ascent = 0;
int slen;
+ // Set FillStyle, otherwise X will use current stipple!
+ XGCValues gcV, gcBackingV;
+
+ XGetGCValues ((Display*) m_display, (GC)m_gc, GCFillStyle, &gcV);
+ XSetFillStyle ((Display*) m_display, (GC) m_gc, FillSolid);
+ if (m_window && m_window->GetBackingPixmap())
+ {
+ XGetGCValues ((Display*) m_display, (GC)m_gcBacking, GCFillStyle,
+ &gcBackingV );
+ XSetFillStyle ((Display*) m_display, (GC) m_gcBacking, FillSolid);
+ }
+
slen = strlen(text);
if (m_font.Ok())
&ascent, &descent, &overall_return);
else
#endif // 0
- (void)XTextExtents((XFontStruct*) pFontStruct, (char*) (const char*) text, slen, &direction,
+ (void)XTextExtents((XFontStruct*) pFontStruct,
+ wxConstCast(text.c_str(), char),
+ slen, &direction,
&ascent, &descent, &overall_return);
cx = overall_return.width;
if (!sameColour || !GetOptimization())
{
- int pixel = -1;
- if (!m_colour) // Mono display
- {
- // Unless foreground is really white, draw it in black
- unsigned char red = m_textForegroundColour.Red ();
- unsigned char blue = m_textForegroundColour.Blue ();
- unsigned char green = m_textForegroundColour.Green ();
- if (red == (unsigned char) 255 && blue == (unsigned char) 255
- && green == (unsigned char) 255)
- {
- m_currentColour = *wxWHITE;
- pixel = (int) WhitePixel ((Display*) m_display, DefaultScreen ((Display*) m_display));
- m_currentColour.SetPixel(pixel);
- m_textForegroundColour.SetPixel(pixel);
- }
- else
- {
- m_currentColour = *wxBLACK;
- pixel = (int) BlackPixel ((Display*) m_display, DefaultScreen ((Display*) m_display));
- m_currentColour.SetPixel(pixel);
- m_textForegroundColour.SetPixel(pixel);
- }
- }
- else
- {
- pixel = m_textForegroundColour.AllocColour((Display*) m_display);
- m_currentColour.SetPixel(pixel);
- }
+ int pixel = CalculatePixel(m_textForegroundColour,
+ m_currentColour, FALSE);
// Set the GC to the required colour
if (pixel > -1)
else
#endif // 0
XDrawString((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(), (GC) m_gcBacking,
- XLOG2DEV_2 (x), YLOG2DEV_2 (y) + ascent, (char*) (const char*) text, slen);
+ XLOG2DEV_2 (x), YLOG2DEV_2 (y) + ascent,
+ wxConstCast(text.c_str(), char), slen);
}
- long w, h;
+ // restore fill style
+ XSetFillStyle ((Display*) m_display, (GC) m_gc, gcV.fill_style);
+ if (m_window && m_window->GetBackingPixmap())
+ XSetFillStyle ((Display*) m_display, (GC) m_gcBacking,
+ gcBackingV.fill_style);
+
+ wxCoord w, h;
GetTextExtent (text, &w, &h);
CalcBoundingBox (x + w, y + h);
CalcBoundingBox (x, y);
}
+void wxWindowDC::DoDrawRotatedText( const wxString &text, wxCoord x, wxCoord y,
+ double angle )
+{
+ if (angle == 0.0)
+ {
+ DrawText(text, x, y);
+ return;
+ }
+
+ wxCHECK_RET( Ok(), "invalid dc" );
+
+ int oldBackgroundPixel = -1;
+ int oldForegroundPixel = -1;
+ int foregroundPixel = -1;
+ int backgroundPixel = -1;
+
+ if (m_textBackgroundColour.Ok())
+ {
+ oldBackgroundPixel = m_backgroundPixel;
+ backgroundPixel = m_textBackgroundColour.AllocColour(m_display);
+ }
+ if (m_textForegroundColour.Ok())
+ {
+ oldForegroundPixel = m_currentColour.GetPixel();
+
+ if( m_textForegroundColour.GetPixel() <= -1 )
+ CalculatePixel( m_textForegroundColour,
+ m_textForegroundColour, TRUE);
+
+ foregroundPixel = m_textForegroundColour.GetPixel();
+ }
+
+ // Since X draws from the baseline of the text, must add the text height
+ int cx = 0;
+ int cy = 0;
+ int ascent = 0;
+ int slen = text.length();
+
+ if (m_font.Ok())
+ {
+ // Calculate text extent.
+ WXFontStructPtr pFontStruct =
+ m_font.GetFontStruct(m_userScaleY*m_logicalScaleY, m_display);
+ int direction, descent;
+ XCharStruct overall_return;
+#if 0
+ if (use16)
+ (void)XTextExtents16((XFontStruct*) pFontStruct,
+ (XChar2b *)(const char*) text,
+ slen, &direction,
+ &ascent, &descent, &overall_return);
+ else
+#endif // 0
+ (void)XTextExtents((XFontStruct*) pFontStruct,
+ wxConstCast(text.c_str(), char),
+ slen, &direction,
+ &ascent, &descent, &overall_return);
+
+ cx = overall_return.width;
+ cy = ascent + descent;
+ }
+
+ wxBitmap src(cx, cy);
+ wxMemoryDC dc;
+ dc.SelectObject(src);
+ dc.SetFont(GetFont());
+ dc.SetBackground(*wxWHITE_BRUSH);
+ dc.SetBrush(*wxBLACK_BRUSH);
+ dc.Clear();
+ dc.DrawText(text, 0, 0);
+ dc.SetFont(wxNullFont);
+
+ // Calculate the size of the rotated bounding box.
+ double dx = cos(angle / 180.0 * M_PI);
+ double dy = sin(angle / 180.0 * M_PI);
+ double x4 = cy * dy;
+ double y4 = cy * dx;
+ double x3 = cx * dx;
+ double y3 = -cx * dy;
+ double x2 = x3 + x4;
+ double y2 = y3 + y4;
+ double x1 = x;
+ double y1 = y;
+
+ // Create image from the source bitmap after writing the text into it.
+ wxImage image = src.ConvertToImage();
+
+ int minx = roundmin(0, roundmin(x4, roundmin(x2, x3)));
+ int miny = roundmin(0, roundmin(y4, roundmin(y2, y3)));
+ int maxx = roundmax(0, roundmax(x4, roundmax(x2, x3)));
+ int maxy = roundmax(0, roundmax(y4, roundmax(y2, y3)));
+
+ bool lastFore = false, lastBack = false;
+
+ // This rotates counterclockwise around the top left corner.
+ for (int rx = minx; rx < maxx; rx++)
+ {
+ for (int ry = miny; ry < maxy; ry++)
+ {
+ // transform dest coords to source coords
+ int sx = (int) (rx * dx - ry * dy + 0.5);
+ int sy = - (int) (-ry * dx - rx * dy + 0.5);
+ if (sx >= 0 && sx < cx && sy >= 0 && sy < cy)
+ {
+ bool textPixel = image.GetRed(sx, sy) == 0;
+
+ if (!textPixel && m_backgroundMode != wxSOLID)
+ continue;
+
+ wxCoord ox = (wxCoord) (x1 + rx),
+ oy = (wxCoord) (y1 + ry);
+ // draw black pixels, ignore white ones (i.e. transparent b/g)
+ if (textPixel && !lastFore)
+ {
+ XSetForeground ((Display*) m_display, (GC) m_gc,
+ foregroundPixel);
+ lastFore = true;
+ lastBack = false;
+ }
+ else if (!textPixel && !lastBack)
+ {
+ XSetForeground ((Display*) m_display, (GC) m_gc,
+ backgroundPixel);
+ lastFore = false;
+ lastBack = true;
+ }
+
+ XDrawPoint ((Display*) m_display, (Pixmap) m_pixmap,
+ (GC) m_gc, XLOG2DEV (ox), YLOG2DEV (oy));
+ if (m_window && m_window->GetBackingPixmap())
+ XDrawPoint ((Display*) m_display,
+ (Pixmap) m_window->GetBackingPixmap(),
+ (GC) m_gcBacking,
+ XLOG2DEV_2 (ox), YLOG2DEV_2 (oy));
+ }
+ }
+ }
+
+ if (oldBackgroundPixel > -1)
+ {
+ XSetBackground ((Display*) m_display, (GC) m_gc, oldBackgroundPixel);
+ if (m_window && m_window->GetBackingPixmap())
+ XSetBackground ((Display*) m_display,(GC) m_gcBacking,
+ oldBackgroundPixel);
+ }
+ if (oldForegroundPixel > -1)
+ {
+ XSetForeground ((Display*) m_display, (GC) m_gc, oldForegroundPixel);
+ if (m_window && m_window->GetBackingPixmap())
+ XSetForeground ((Display*) m_display,(GC) m_gcBacking,
+ oldForegroundPixel);
+ }
+
+ CalcBoundingBox (minx, miny);
+ CalcBoundingBox (maxx, maxy);
+}
+
bool wxWindowDC::CanGetTextExtent() const
{
return TRUE;
}
-void wxWindowDC::GetTextExtent( const wxString &string, long *width, long *height,
- long *descent, long *externalLeading,
+void wxWindowDC::DoGetTextExtent( const wxString &string, wxCoord *width, wxCoord *height,
+ wxCoord *descent, wxCoord *externalLeading,
wxFont *font ) const
{
wxCHECK_RET( Ok(), "invalid dc" );
// TODO: this should be an error log function
wxFAIL_MSG("set a valid font before calling GetTextExtent!");
- *width = -1;
- *height = -1;
+ if (width) *width = -1;
+ if (height) *height = -1;
return;
}
&ascent, &descent2, &overall);
else
#endif // 0
- XTextExtents((XFontStruct*) pFontStruct, (char*) (const char*) string, slen, &direction,
+ XTextExtents((XFontStruct*) pFontStruct,
+ wxConstCast(string.c_str(), char), slen, &direction,
&ascent, &descent2, &overall);
- *width = XDEV2LOGREL (overall.width);
- *height = YDEV2LOGREL (ascent + descent2);
+ if (width) *width = XDEV2LOGREL (overall.width);
+ if (height) *height = YDEV2LOGREL (ascent + descent2);
if (descent)
*descent = descent2;
if (externalLeading)
*externalLeading = 0;
}
-long wxWindowDC::GetCharWidth() const
+wxCoord wxWindowDC::GetCharWidth() const
{
wxCHECK_MSG( Ok(), 0, "invalid dc" );
wxCHECK_MSG( m_font.Ok(), 0, "invalid font" );
return XDEV2LOGREL(overall.width);
}
-long wxWindowDC::GetCharHeight() const
+wxCoord wxWindowDC::GetCharHeight() const
{
wxCHECK_MSG( Ok(), 0, "invalid dc" );
wxCHECK_MSG( m_font.Ok(), 0, "invalid font" );
if (!m_font.Ok())
{
- if ((m_oldFont != (WXFont) 0) && ((long) m_oldFont != -1))
+ if ((m_oldFont != (WXFont) 0) && ((wxCoord) m_oldFont != -1))
{
XSetFont ((Display*) m_display, (GC) m_gc, (Font) m_oldFont);
XSetFont ((Display*) m_display,(GC) m_gcBacking, fontId);
}
+void wxWindowDC::SetForegroundPixelWithLogicalFunction(int pixel)
+{
+ if (m_logicalFunction == wxXOR)
+ {
+ XGCValues values;
+ XGetGCValues ((Display*) m_display, (GC) m_gc, GCBackground, &values);
+ XSetForeground ((Display*) m_display, (GC) m_gc,
+ pixel ^ values.background);
+ if (m_window && m_window->GetBackingPixmap())
+ XSetForeground ((Display*) m_display,(GC) m_gcBacking,
+ pixel ^ values.background);
+ }
+ else
+ {
+ XSetForeground ((Display*) m_display, (GC) m_gc, pixel);
+ if (m_window && m_window->GetBackingPixmap())
+ XSetForeground ((Display*) m_display,(GC) m_gcBacking, pixel);
+ }
+}
+
+int wxWindowDC::CalculatePixel(wxColour& colour, wxColour& curCol,
+ bool roundToWhite) const
+{
+ const unsigned char wp = (unsigned char)255;
+
+ int pixel = -1;
+ if(!m_colour) // Mono display
+ {
+ unsigned char red = colour.Red ();
+ unsigned char blue = colour.Blue ();
+ unsigned char green = colour.Green ();
+ // white
+ if((red == wp && blue == wp && green == wp) ||
+ // not black and roundToWhite was specified
+ ((red != 0 || blue != 0 || green != 0) && roundToWhite))
+ {
+ curCol = *wxWHITE;
+ pixel = (int)WhitePixel((Display*) m_display,
+ DefaultScreen((Display*) m_display));
+ curCol.SetPixel(pixel);
+ colour.SetPixel(pixel);
+ }
+ else
+ {
+ curCol = *wxBLACK;
+ pixel = (int)BlackPixel((Display*) m_display,
+ DefaultScreen((Display*) m_display));
+ curCol.SetPixel(pixel);
+ colour.SetPixel(pixel);
+ }
+ }
+ else
+ {
+ curCol = colour;
+ pixel = colour.AllocColour((Display*) m_display);
+ curCol.SetPixel(pixel);
+ }
+
+ return pixel;
+}
+
void wxWindowDC::SetPen( const wxPen &pen )
{
wxCHECK_RET( Ok(), "invalid dc" );
int old_pen_join = m_currentPenJoin;
int old_pen_cap = m_currentPenCap;
int old_pen_nb_dash = m_currentPenDashCount;
- char *old_pen_dash = m_currentPenDash;
+ wxX11Dash *old_pen_dash = m_currentPenDash;
wxColour oldPenColour = m_currentColour;
m_currentColour = m_pen.GetColour ();
m_currentPenJoin = m_pen.GetJoin ();
m_currentPenCap = m_pen.GetCap ();
m_currentPenDashCount = m_pen.GetDashCount();
- m_currentPenDash = m_pen.GetDash();
+ m_currentPenDash = (wxX11Dash*)m_pen.GetDash();
if (m_currentStyle == wxSTIPPLE)
m_currentStipple = * m_pen.GetStipple ();
int style;
int join;
int cap;
- const static char dotted[] = {2, 5};
- const static char short_dashed[] = {4, 4};
- const static char long_dashed[] = {4, 8};
- const static char dotted_dashed[] = {6, 6, 2, 6};
+ static const wxX11Dash dotted[] = {2, 5};
+ static const wxX11Dash short_dashed[] = {4, 4};
+ static const wxX11Dash long_dashed[] = {4, 8};
+ static const wxX11Dash dotted_dashed[] = {6, 6, 2, 6};
// We express dash pattern in pen width unit, so we are
// independent of zoom factor and so on...
int req_nb_dash;
- const char *req_dash;
+ const wxX11Dash *req_dash;
switch (m_pen.GetStyle ())
{
case wxTRANSPARENT:
default:
style = LineSolid;
- req_dash = NULL;
+ req_dash = (wxX11Dash*)NULL;
req_nb_dash = 0;
}
if (req_dash && req_nb_dash)
{
- char *real_req_dash = new char[req_nb_dash];
+ wxX11Dash *real_req_dash = new wxX11Dash[req_nb_dash];
if (real_req_dash)
{
int factor = scaled_width == 0 ? 1 : scaled_width;
else if (m_currentStipple.Ok()
&& ((m_currentStipple != oldStipple) || !GetOptimization()))
{
- XSetStipple ((Display*) m_display, (GC) m_gc, (Pixmap) m_currentStipple.GetPixmap());
+ XSetStipple ((Display*) m_display, (GC) m_gc, (Pixmap) m_currentStipple.GetDrawable());
if (m_window && m_window->GetBackingPixmap())
- XSetStipple ((Display*) m_display,(GC) m_gcBacking, (Pixmap) m_currentStipple.GetPixmap());
+ XSetStipple ((Display*) m_display,(GC) m_gcBacking, (Pixmap) m_currentStipple.GetDrawable());
}
if ((m_currentFill != oldFill) || !GetOptimization())
int pixel = -1;
if (m_pen.GetStyle () == wxTRANSPARENT)
pixel = m_backgroundPixel;
- else if (!m_colour)
- {
- unsigned char red = m_pen.GetColour ().Red ();
- unsigned char blue = m_pen.GetColour ().Blue ();
- unsigned char green = m_pen.GetColour ().Green ();
- if (red == (unsigned char) 255 && blue == (unsigned char) 255
- && green == (unsigned char) 255)
- {
- pixel = (int) WhitePixel ((Display*) m_display, DefaultScreen ((Display*) m_display));
- m_currentColour = *wxWHITE;
- m_pen.GetColour().SetPixel(pixel);
- m_currentColour.SetPixel(pixel);
- }
- else
- {
- pixel = (int) BlackPixel ((Display*) m_display, DefaultScreen ((Display*) m_display));
- m_currentColour = *wxBLACK;
- m_pen.GetColour().SetPixel(pixel);
- }
- }
else
{
- pixel = m_pen.GetColour ().AllocColour(m_display);
- m_currentColour.SetPixel(pixel);
+ pixel = CalculatePixel(m_pen.GetColour(), m_currentColour, FALSE);
}
// Finally, set the GC to the required colour
if (pixel > -1)
- {
- if (m_logicalFunction == wxXOR)
- {
- XGCValues values;
- XGetGCValues ((Display*) m_display, (GC) m_gc, GCBackground, &values);
- XSetForeground ((Display*) m_display, (GC) m_gc, pixel ^ values.background);
- if (m_window && m_window->GetBackingPixmap())
- XSetForeground ((Display*) m_display,(GC) m_gcBacking, pixel ^ values.background);
- }
- else
- {
- XSetForeground ((Display*) m_display, (GC) m_gc, pixel);
- if (m_window && m_window->GetBackingPixmap())
- XSetForeground ((Display*) m_display,(GC) m_gcBacking, pixel);
- }
- }
+ SetForegroundPixelWithLogicalFunction(pixel);
}
else
m_pen.GetColour().SetPixel(oldPenColour.GetPixel());
(oldBrushColour.Green () == m_currentColour.Green ()) &&
(oldBrushColour.GetPixel() == m_currentColour.GetPixel()));
+ int stippleDepth = -1;
+
if ((oldFill != m_brush.GetStyle ()) || !GetOptimization())
{
switch (brush.GetStyle ())
{
case wxTRANSPARENT:
break;
+ case wxSTIPPLE:
+ stippleDepth = m_currentStipple.GetDepth();
+ // fall through!
case wxBDIAGONAL_HATCH:
case wxCROSSDIAG_HATCH:
case wxFDIAGONAL_HATCH:
case wxCROSS_HATCH:
case wxHORIZONTAL_HATCH:
case wxVERTICAL_HATCH:
- case wxSTIPPLE:
{
- // Chris Breeze 23/07/97: use background mode to determine whether
- // fill style should be solid or transparent
- int style = (m_backgroundMode == wxSOLID ? FillOpaqueStippled : FillStippled);
+ if (stippleDepth == -1) stippleDepth = 1;
+
+ // Chris Breeze 23/07/97: use background mode to
+ // determine whether fill style should be solid or
+ // transparent
+ int style = stippleDepth == 1 ?
+ (m_backgroundMode == wxSOLID ?
+ FillOpaqueStippled : FillStippled) :
+ FillTiled;
XSetFillStyle ((Display*) m_display, (GC) m_gc, style);
if (m_window && m_window->GetBackingPixmap())
XSetFillStyle ((Display*) m_display,(GC) m_gcBacking, style);
default:
XSetFillStyle ((Display*) m_display, (GC) m_gc, FillSolid);
if (m_window && m_window->GetBackingPixmap())
- XSetFillStyle ((Display*) m_display,(GC) m_gcBacking, FillSolid);
+ XSetFillStyle ((Display*) m_display,(GC) m_gcBacking,
+ FillSolid);
}
}
}
// X can forget the stipple value when resizing a window (apparently)
// so always set the stipple.
- else if (m_currentStipple.Ok()) // && m_currentStipple != oldStipple)
+ else if (m_currentFill != wxSOLID && m_currentFill != wxTRANSPARENT &&
+ m_currentStipple.Ok()) // && m_currentStipple != oldStipple)
{
- XSetStipple ((Display*) m_display, (GC) m_gc, (Pixmap) m_currentStipple.GetPixmap());
+ if (m_currentStipple.GetDepth() == 1)
+ {
+ XSetStipple ((Display*) m_display, (GC) m_gc,
+ (Pixmap) m_currentStipple.GetDrawable());
if (m_window && m_window->GetBackingPixmap())
- XSetStipple ((Display*) m_display,(GC) m_gcBacking, (Pixmap) m_currentStipple.GetPixmap());
+ XSetStipple ((Display*) m_display,(GC) m_gcBacking,
+ (Pixmap) m_currentStipple.GetDrawable());
+ }
+ else
+ {
+ XSetTile ((Display*) m_display, (GC) m_gc,
+ (Pixmap) m_currentStipple.GetDrawable());
+ if (m_window && m_window->GetBackingPixmap())
+ XSetTile ((Display*) m_display,(GC) m_gcBacking,
+ (Pixmap) m_currentStipple.GetDrawable());
+ }
}
// must test m_logicalFunction, because it involves background!
if (!sameColour || !GetOptimization() || m_logicalFunction == wxXOR)
{
- int pixel = -1;
- if (!m_colour)
- {
- // Policy - on a monochrome screen, all brushes are white,
- // except when they're REALLY black!!!
- unsigned char red = m_brush.GetColour ().Red ();
- unsigned char blue = m_brush.GetColour ().Blue ();
- unsigned char green = m_brush.GetColour ().Green ();
-
- if (red == (unsigned char) 0 && blue == (unsigned char) 0
- && green == (unsigned char) 0)
- {
- pixel = (int) BlackPixel ((Display*) m_display, DefaultScreen ((Display*) m_display));
- m_currentColour = *wxBLACK;
- m_brush.GetColour().SetPixel(pixel);
- m_currentColour.SetPixel(pixel);
- }
- else
- {
- pixel = (int) WhitePixel ((Display*) m_display, DefaultScreen ((Display*) m_display));
- m_currentColour = *wxWHITE;
- m_brush.GetColour().SetPixel(pixel);
- m_currentColour.SetPixel(pixel);
- }
-
- // N.B. comment out the above line and uncomment the following lines
- // if you want non-white colours to be black on a monochrome display.
- /*
- if (red == (unsigned char )255 && blue == (unsigned char)255
- && green == (unsigned char)255)
- pixel = (int)WhitePixel((Display*) m_display, DefaultScreen((Display*) m_display));
- else
- pixel = (int)BlackPixel((Display*) m_display, DefaultScreen((Display*) m_display));
- */
- }
- else if (m_brush.GetStyle () != wxTRANSPARENT)
- {
- pixel = m_brush.GetColour().AllocColour(m_display);
- m_currentColour.SetPixel(pixel);
- }
+ int pixel = CalculatePixel(m_brush.GetColour(), m_currentColour, TRUE);
+
if (pixel > -1)
- {
- // Finally, set the GC to the required colour
- if (m_logicalFunction == wxXOR)
- {
- XGCValues values;
- XGetGCValues ((Display*) m_display, (GC) m_gc, GCBackground, &values);
- XSetForeground ((Display*) m_display, (GC) m_gc, pixel ^ values.background);
- if (m_window && m_window->GetBackingPixmap())
- XSetForeground ((Display*) m_display,(GC) m_gcBacking, pixel ^ values.background);
- }
- else
- {
- XSetForeground ((Display*) m_display, (GC) m_gc, pixel);
- if (m_window && m_window->GetBackingPixmap())
- XSetForeground ((Display*) m_display,(GC) m_gcBacking, pixel);
- }
- }
+ SetForegroundPixelWithLogicalFunction(pixel);
}
else
m_brush.GetColour().SetPixel(oldBrushColour.GetPixel());
if (!m_backgroundBrush.Ok())
return;
- int pixel = m_backgroundBrush.GetColour().AllocColour(m_display);
+ m_backgroundPixel = m_backgroundBrush.GetColour().AllocColour(m_display);
// New behaviour, 10/2/99: setting the background brush of a DC
// doesn't affect the window background colour.
// Necessary for ::DrawIcon, which use fg/bg pixel or the GC.
// And Blit,... (Any fct that use XCopyPlane, in fact.)
- XSetBackground ((Display*) m_display, (GC) m_gc, pixel);
+ XSetBackground ((Display*) m_display, (GC) m_gc, m_backgroundPixel);
if (m_window && m_window->GetBackingPixmap())
- XSetBackground ((Display*) m_display,(GC) m_gcBacking, pixel);
+ XSetBackground ((Display*) m_display,(GC) m_gcBacking,
+ m_backgroundPixel);
}
void wxWindowDC::SetLogicalFunction( int function )
}
-void wxWindowDC::DoSetClippingRegion( long x, long y, long width, long height )
+void wxWindowDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
{
- wxDC::SetClippingRegion( x, y, width, height );
+ wxDC::DoSetClippingRegion( x, y, width, height );
if (m_userRegion)
XDestroyRegion ((Region) m_userRegion);
{
wxRect box = region.GetBox();
- wxDC::SetClippingRegion( box.x, box.y, box.width, box.height );
+ wxDC::DoSetClippingRegion( box.x, box.y, box.width, box.height );
if (m_userRegion)
XDestroyRegion ((Region) m_userRegion);
return 24;
}
+
+
+
// ----------------------------------------------------------------------------
// wxPaintDC
// ----------------------------------------------------------------------------
win->SetUpdateRegion(*region);
+ wxRegion& theRegion(win->GetUpdateRegion());
+ theRegion.SetRects(updateRects); // We also store in terms of rects, for iteration to work.
+
// Set the clipping region. Any user-defined region will be combined with this
// one in SetDCClipping.
XSetRegion ((Display*) m_display, (GC) m_gc, (Region) region->GetXRegion());
projects / wxWidgets.git / blobdiff