X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/355b4d3de54b76db87439fa2142c7334a6e48f85..19984725d5e943c8f212a80451ec1b1dc1eac8cd:/src/motif/dcclient.cpp diff --git a/src/motif/dcclient.cpp b/src/motif/dcclient.cpp index 2c22186df2..fa5f8beb89 100644 --- a/src/motif/dcclient.cpp +++ b/src/motif/dcclient.cpp @@ -40,12 +40,15 @@ #include "wx/wxprec.h" #include "wx/dcclient.h" -#include "wx/dcmemory.h" -#include "wx/window.h" -#include "wx/app.h" -#include "wx/image.h" -#include "wx/log.h" -#include "wx/math.h" + +#ifndef WX_PRECOMP + #include "wx/log.h" + #include "wx/app.h" + #include "wx/window.h" + #include "wx/dcmemory.h" + #include "wx/math.h" + #include "wx/image.h" +#endif #ifdef __VMS__ #pragma message disable nosimpint @@ -85,11 +88,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC) IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC) IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC) -#ifndef IS_HATCH - // IS_HATCH exists for WXWIN_COMPATIBILITY_2_4 only - // but wxMotif needs it for its internals here - #define IS_HATCH(s) ((s)>=wxFIRST_HATCH && (s)<=wxLAST_HATCH) -#endif +#define IS_HATCH(s) ((s)>=wxFIRST_HATCH && (s)<=wxLAST_HATCH) // FIXME: left over after removal of wxDC::GetOptimization() #define GET_OPTIMIZATION false @@ -180,8 +179,16 @@ wxWindowDC::wxWindowDC( wxWindow *window ) gcvalues.graphics_exposures = False; gcvalues.subwindow_mode = IncludeInferiors; gcvalues.line_width = 1; +#if !wxMOTIF_NEW_FONT_HANDLING + WXFontStructPtr pFontStruct = m_font.GetFontStruct(m_userScaleY*m_logicalScaleY, m_display); + gcvalues.font = ((XFontStruct*)pFontStruct)->fid; +#endif m_gc = (WXGC) XCreateGC (display, RootWindow (display, DefaultScreen (display)), - GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth | GCSubwindowMode, + GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth | GCSubwindowMode +#if !wxMOTIF_NEW_FONT_HANDLING + | GCFont +#endif + , &gcvalues); if (m_window->GetBackingPixmap()) @@ -192,7 +199,7 @@ wxWindowDC::wxWindowDC( wxWindow *window ) &gcvalues); } - m_backgroundPixel = (int) gcvalues.background; + m_backgroundPixel = gcvalues.background; SetBackground(wxBrush(m_window->GetBackgroundColour(), wxSOLID)); } @@ -794,13 +801,13 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest, // 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; + WXPixel oldBackgroundPixel = -1; + WXPixel oldForegroundPixel = -1; if (m_textBackgroundColour.Ok()) { oldBackgroundPixel = m_backgroundPixel; - int pixel = m_textBackgroundColour.AllocColour(m_display); + WXPixel pixel = m_textBackgroundColour.AllocColour(m_display); XSetBackground ((Display*) m_display, (GC) m_gc, pixel); if (m_window && m_window->GetBackingPixmap()) @@ -815,7 +822,7 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest, CalculatePixel( m_textForegroundColour, m_textForegroundColour, true); - int pixel = m_textForegroundColour.GetPixel(); + WXPixel pixel = m_textForegroundColour.GetPixel(); if (pixel > -1) SetForegroundPixelWithLogicalFunction(pixel); } @@ -1053,7 +1060,7 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y ) if (!sameColour || !GET_OPTIMIZATION) { - int pixel = m_textBackgroundColour.AllocColour(m_display); + WXPixel pixel = m_textBackgroundColour.AllocColour(m_display); m_currentColour = m_textBackgroundColour; // Set the GC to the required colour @@ -1086,8 +1093,8 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y ) if (!sameColour || !GET_OPTIMIZATION) { - int pixel = CalculatePixel(m_textForegroundColour, - m_currentColour, false); + WXPixel pixel = CalculatePixel(m_textForegroundColour, + m_currentColour, false); // Set the GC to the required colour if (pixel > -1) @@ -1127,11 +1134,11 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y ) #if wxMOTIF_NEW_FONT_HANDLING XmbDrawString((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(), fset, (GC) m_gcBacking, XLOG2DEV_2 (x), YLOG2DEV_2 (y) + ascent, - wxConstCast(text.c_str(), char), slen); + wxConstCast(text.mb_str(), char), slen); #else XDrawString((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(), (GC) m_gcBacking, XLOG2DEV_2 (x), YLOG2DEV_2 (y) + ascent, - wxConstCast(text.c_str(), char), slen); + wxConstCast(text.mb_str(), char), slen); #endif } @@ -1158,10 +1165,10 @@ void wxWindowDC::DoDrawRotatedText( const wxString &text, wxCoord x, wxCoord y, wxCHECK_RET( Ok(), "invalid dc" ); - int oldBackgroundPixel = -1; - int oldForegroundPixel = -1; - int foregroundPixel = -1; - int backgroundPixel = -1; + WXPixel oldBackgroundPixel = -1; + WXPixel oldForegroundPixel = -1; + WXPixel foregroundPixel = -1; + WXPixel backgroundPixel = -1; if (m_textBackgroundColour.Ok()) { @@ -1290,7 +1297,7 @@ bool wxWindowDC::CanGetTextExtent() const void wxWindowDC::DoGetTextExtent( const wxString &string, wxCoord *width, wxCoord *height, wxCoord *descent, wxCoord *externalLeading, - wxFont *font ) const + const wxFont *font ) const { wxCHECK_RET( Ok(), "invalid dc" ); @@ -1411,7 +1418,7 @@ void wxWindowDC::SetFont( const wxFont &font ) #endif } -void wxWindowDC::SetForegroundPixelWithLogicalFunction(int pixel) +void wxWindowDC::SetForegroundPixelWithLogicalFunction(WXPixel pixel) { if (m_logicalFunction == wxXOR) { @@ -1431,12 +1438,12 @@ void wxWindowDC::SetForegroundPixelWithLogicalFunction(int pixel) } } -int wxWindowDC::CalculatePixel(wxColour& colour, wxColour& curCol, +WXPixel wxWindowDC::CalculatePixel(wxColour& colour, wxColour& curCol, bool roundToWhite) const { const unsigned char wp = (unsigned char)255; - int pixel = -1; + WXPixel pixel = -1; if(!m_colour) // Mono display { unsigned char red = colour.Red (); @@ -1448,16 +1455,16 @@ int wxWindowDC::CalculatePixel(wxColour& colour, wxColour& curCol, ((red != 0 || blue != 0 || green != 0) && roundToWhite)) { curCol = *wxWHITE; - pixel = (int)WhitePixel((Display*) m_display, - DefaultScreen((Display*) m_display)); + pixel = 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)); + pixel = BlackPixel((Display*) m_display, + DefaultScreen((Display*) m_display)); curCol.SetPixel(pixel); colour.SetPixel(pixel); } @@ -1686,8 +1693,8 @@ void wxWindowDC::SetPen( const wxPen &pen ) if (m_window && m_window->GetBackingPixmap()) XSetStipple ((Display*) m_display,(GC) m_gcBacking, myStipple); } - else if (m_currentStipple.Ok() - && ((m_currentStipple != oldStipple) || !GET_OPTIMIZATION)) + else if (m_currentStyle == wxSTIPPLE && m_currentStipple.Ok() + && ((!m_currentStipple.IsSameAs(oldStipple)) || !GET_OPTIMIZATION)) { XSetStipple ((Display*) m_display, (GC) m_gc, (Pixmap) m_currentStipple.GetDrawable()); @@ -1714,7 +1721,7 @@ void wxWindowDC::SetPen( const wxPen &pen ) if (!sameColour || !GET_OPTIMIZATION || ((m_logicalFunction == wxXOR) || (m_autoSetting & 0x2))) { - int pixel = -1; + WXPixel pixel = -1; if (m_pen.GetStyle () == wxTRANSPARENT) pixel = m_backgroundPixel; else @@ -1881,7 +1888,7 @@ void wxWindowDC::SetBrush( const wxBrush &brush ) // must test m_logicalFunction, because it involves background! if (!sameColour || !GET_OPTIMIZATION || m_logicalFunction == wxXOR) { - int pixel = CalculatePixel(m_brush.GetColour(), m_currentColour, true); + WXPixel pixel = CalculatePixel(m_brush.GetColour(), m_currentColour, true); if (pixel > -1) SetForegroundPixelWithLogicalFunction(pixel); @@ -2063,7 +2070,8 @@ void wxWindowDC::DoSetClippingRegion( wxCoord x, wxCoord y, { wxDC::DoSetClippingRegion( x, y, width, height ); - wxRegion temp(x, y, width, height); + wxRegion temp(XLOG2DEV(x), YLOG2DEV(y), + XLOG2DEVREL(width), YLOG2DEVREL(height)); SetDCClipping(temp.GetX11Region()); @@ -2083,16 +2091,14 @@ void wxWindowDC::DoSetClippingRegion( wxCoord x, wxCoord y, void wxWindowDC::DoSetClippingRegionAsRegion( const wxRegion& region ) { - wxRect box = region.GetBox(); - - wxDC::DoSetClippingRegion( box.x, box.y, box.width, box.height ); - SetDCClipping(region.GetX11Region()); // Needs to work differently for Pixmap: without this, // there's a nasty (Display*) m_display bug. 8/12/94 if (m_window && m_window->GetBackingPixmap()) { + wxRect box = region.GetBox(); + XRectangle rects[1]; rects[0].x = (short)XLOG2DEV_2(box.x); rects[0].y = (short)YLOG2DEV_2(box.y); @@ -2169,7 +2175,7 @@ static void XCopyRemote(Display *src_display, Display *dest_display, static const int CACHE_SIZE = 256; unsigned int i, j; - unsigned long cachesrc[CACHE_SIZE], cachedest[CACHE_SIZE]; + Pixel cachesrc[CACHE_SIZE], cachedest[CACHE_SIZE]; int k, cache_pos, all_cache; if (!cache || !*cache) @@ -2187,7 +2193,7 @@ static void XCopyRemote(Display *src_display, Display *dest_display, for (i = 0; i < w; i++) for (j = 0; j < h; j++) { - unsigned long pixel; + Pixel pixel; XColor xcol; pixel = XGetPixel(image, i, j); @@ -2221,7 +2227,7 @@ install: XPutImage(dest_display, dest, destgc, destimage, 0, 0, destx, desty, w, h); XDestroyImage(destimage); - if (more) + if (more && cache) *cache = image; else XDestroyImage(image);