/*
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
m_currentPenWidth = 1;
m_currentPenJoin = -1;
m_currentPenDashCount = -1;
- m_currentPenDash = (wxMOTIFDash*) NULL;
+ m_currentPenDash = (wxX11Dash*) NULL;
m_currentStyle = -1;
m_currentFill = -1;
// m_currentBkMode = wxTRANSPARENT;
m_currentPenWidth = 1;
m_currentPenJoin = -1;
m_currentPenDashCount = -1;
- m_currentPenDash = (wxMOTIFDash*) NULL;
+ m_currentPenDash = (wxX11Dash*) NULL;
m_currentStyle = -1;
m_currentFill = -1;
// m_currentBkMode = wxTRANSPARENT;
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;
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);
}
+ // 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 )
+void wxWindowDC::DoDrawRotatedText( const wxString &text, wxCoord x, wxCoord y,
+ double angle )
{
if (angle == 0.0)
{
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;
-
- slen = strlen(text);
+ int slen = text.length();
if (m_font.Ok())
{
// Calculate text extent.
- WXFontStructPtr pFontStruct = m_font.GetFontStruct(m_userScaleY*m_logicalScaleY, m_display);
+ 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,
+ (void)XTextExtents16((XFontStruct*) pFontStruct,
+ (XChar2b *)(const char*) text,
+ slen, &direction,
&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;
// 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 x4 = cy * dy;
double y4 = cy * dx;
double x3 = cx * dx;
- double y3 = cx * dy;
+ double y3 = -cx * dy;
double x2 = x3 + x4;
double y2 = y3 + y4;
double x1 = x;
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);
+ 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 (image.GetRed(sx, sy) == 0)
+ if (textPixel && !lastFore)
{
- DrawPoint((wxCoord) (x1 + maxx - rx), (wxCoord) (cy + y1 - ry));
+ XSetForeground ((Display*) m_display, (GC) m_gc,
+ foregroundPixel);
+ lastFore = true;
+ lastBack = false;
}
- else
+ else if (!textPixel && !lastBack)
{
- // Background
- //DrawPoint(x1 + maxx - rx, cy + y1 + maxy - ry);
+ XSetForeground ((Display*) m_display, (GC) m_gc,
+ backgroundPixel);
+ lastFore = false;
+ lastBack = true;
}
- }
- }
- }
-#if 0
- // First draw a rectangle representing the text background, if a text
- // background is specified
- if (m_textBackgroundColour.Ok () && (m_backgroundMode != wxTRANSPARENT))
- {
- wxColour oldPenColour = m_currentColour;
- m_currentColour = m_textBackgroundColour;
- bool sameColour = (oldPenColour.Ok () && m_textBackgroundColour.Ok () &&
- (oldPenColour.Red () == m_textBackgroundColour.Red ()) &&
- (oldPenColour.Blue () == m_textBackgroundColour.Blue ()) &&
- (oldPenColour.Green () == m_textBackgroundColour.Green ()));
-
- // This separation of the big && test required for gcc2.7/HP UX 9.02
- // or pixel value can be corrupted!
- sameColour = (sameColour &&
- (oldPenColour.GetPixel() == m_textBackgroundColour.GetPixel()));
-
- if (!sameColour || !GetOptimization())
- {
- int pixel = m_textBackgroundColour.AllocColour(m_display);
- m_currentColour = m_textBackgroundColour;
-
- // Set the GC to the required colour
- if (pixel > -1)
- {
- XSetForeground ((Display*) m_display, (GC) m_gc, pixel);
+ XDrawPoint ((Display*) m_display, (Pixmap) m_pixmap,
+ (GC) m_gc, XLOG2DEV (ox), YLOG2DEV (oy));
if (m_window && m_window->GetBackingPixmap())
- XSetForeground ((Display*) m_display,(GC) m_gcBacking, pixel);
+ XDrawPoint ((Display*) m_display,
+ (Pixmap) m_window->GetBackingPixmap(),
+ (GC) m_gcBacking,
+ XLOG2DEV_2 (ox), YLOG2DEV_2 (oy));
}
}
- else
- m_textBackgroundColour = oldPenColour ;
+ }
- XFillRectangle ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, XLOG2DEV (x), YLOG2DEV (y), cx, cy);
+ if (oldBackgroundPixel > -1)
+ {
+ XSetBackground ((Display*) m_display, (GC) m_gc, oldBackgroundPixel);
if (m_window && m_window->GetBackingPixmap())
- XFillRectangle ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking,
- XLOG2DEV_2 (x), YLOG2DEV_2 (y), cx, cy);
+ 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);
}
-#endif
- long w, h;
- // XXX use pixmap size
- GetTextExtent (text, &w, &h);
- CalcBoundingBox (x + w, y + h);
- CalcBoundingBox (x, y);
+ CalcBoundingBox (minx, miny);
+ CalcBoundingBox (maxx, maxy);
}
bool wxWindowDC::CanGetTextExtent() const
&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);
if (width) *width = XDEV2LOGREL (overall.width);
int old_pen_join = m_currentPenJoin;
int old_pen_cap = m_currentPenCap;
int old_pen_nb_dash = m_currentPenDashCount;
- wxMOTIFDash *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 = (wxMOTIFDash*)m_pen.GetDash();
+ m_currentPenDash = (wxX11Dash*)m_pen.GetDash();
if (m_currentStyle == wxSTIPPLE)
m_currentStipple = * m_pen.GetStipple ();
int style;
int join;
int cap;
- static const wxMOTIFDash dotted[] = {2, 5};
- static const wxMOTIFDash short_dashed[] = {4, 4};
- static const wxMOTIFDash long_dashed[] = {4, 8};
- static const wxMOTIFDash 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 wxMOTIFDash *req_dash;
+ const wxX11Dash *req_dash;
switch (m_pen.GetStyle ())
{
case wxTRANSPARENT:
default:
style = LineSolid;
- req_dash = (wxMOTIFDash*)NULL;
+ req_dash = (wxX11Dash*)NULL;
req_nb_dash = 0;
}
if (req_dash && req_nb_dash)
{
- wxMOTIFDash *real_req_dash = new wxMOTIFDash[req_nb_dash];
+ wxX11Dash *real_req_dash = new wxX11Dash[req_nb_dash];
if (real_req_dash)
{
int factor = scaled_width == 0 ? 1 : scaled_width;
(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.GetPixmap());
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.GetPixmap());
+ }
+ else
+ {
+ XSetTile ((Display*) m_display, (GC) m_gc,
+ (Pixmap) m_currentStipple.GetPixmap());
+ if (m_window && m_window->GetBackingPixmap())
+ XSetTile ((Display*) m_display,(GC) m_gcBacking,
+ (Pixmap) m_currentStipple.GetPixmap());
+ }
}
// must test m_logicalFunction, because it involves background!
projects / wxWidgets.git / blobdiff