X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cabb99da6db328dd673ed0068dbc1316a9930c61..d2b23b67301bd2d286366d4326a21da3132558fa:/src/mac/carbon/dc.cpp diff --git a/src/mac/carbon/dc.cpp b/src/mac/carbon/dc.cpp index b3e3ef106a..fbd3f8f89a 100644 --- a/src/mac/carbon/dc.cpp +++ b/src/mac/carbon/dc.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dc.cpp +// Name: src/mac/carbon/dc.cpp // Purpose: wxDC class // Author: Stefan Csomor // Modified by: @@ -14,13 +14,17 @@ #include "wx/dc.h" #if !wxMAC_USE_CORE_GRAPHICS -#include "wx/app.h" + +#ifndef WX_PRECOMP + #include "wx/log.h" + #include "wx/app.h" + #include "wx/dcmemory.h" + #include "wx/dcprint.h" + #include "wx/region.h" + #include "wx/image.h" +#endif + #include "wx/mac/uma.h" -#include "wx/dcmemory.h" -#include "wx/dcprint.h" -#include "wx/region.h" -#include "wx/image.h" -#include "wx/log.h" #ifdef __MSL__ #if __MSL__ >= 0x6000 @@ -51,9 +55,6 @@ const double RAD2DEG = 180.0 / M_PI; const short kEmulatedMode = -1 ; const short kUnsupportedMode = -2 ; -extern TECObjectRef s_TECNativeCToUnicode ; - - wxMacPortSetter::wxMacPortSetter( const wxDC* dc ) : m_ph( (GrafPtr) dc->m_macPort ) { @@ -150,13 +151,6 @@ wxMacWindowStateSaver::~wxMacWindowStateSaver() SetThemeDrawingState( m_themeDrawingState , true ) ; } -//----------------------------------------------------------------------------- -// Local functions -//----------------------------------------------------------------------------- -static inline double dmin(double a, double b) { return a < b ? a : b; } -static inline double dmax(double a, double b) { return a > b ? a : b; } -static inline double DegToRad(double deg) { return (deg * M_PI) / 180.0; } - //----------------------------------------------------------------------------- // wxDC //----------------------------------------------------------------------------- @@ -752,7 +746,7 @@ bool wxDC::DoGetPixel( wxCoord x, wxCoord y, wxColour *col ) const GetCPixel( XLOG2DEVMAC(x), YLOG2DEVMAC(y), &colour ); // convert from Mac colour to wx - col->Set( colour.red >> 8, colour.green >> 8, colour.blue >> 8); + *col = colour; return true ; } @@ -1008,7 +1002,7 @@ void wxDC::DoDrawPolygon(int n, wxPoint points[], if ( m_brush.GetStyle() == wxTRANSPARENT && m_pen.GetStyle() == wxTRANSPARENT ) return ; - + wxMacFastPortSetter helper(this) ; wxCoord x1, x2 , y1 , y2 ; @@ -1147,7 +1141,7 @@ void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) // CMB: draw nothing if transformed w or h is 0 if (ww == 0 || hh == 0) return; - + // CMB: handle -ve width and/or height if (ww < 0) { @@ -1181,12 +1175,26 @@ bool wxDC::CanDrawBitmap(void) const return true ; } -bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, +bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord dstWidth, wxCoord dstHeight, wxDC *source, wxCoord xsrc, wxCoord ysrc, int logical_func , bool useMask, wxCoord xsrcMask, wxCoord ysrcMask ) { - wxCHECK_MSG(Ok(), false, wxT("wxDC::DoBlit - invalid DC")); - wxCHECK_MSG(source->Ok(), false, wxT("wxDC::DoBlit - invalid source DC")); + return DoStretchBlit( xdest, ydest, dstWidth, dstHeight, + source, xsrc, ysrc, dstWidth, dstHeight, + logical_func, useMask, + xsrcMask, ysrcMask ); +} + +bool wxDC::DoStretchBlit(wxCoord xdest, wxCoord ydest, + wxCoord dstWidth, wxCoord dstHeight, + wxDC *source, + wxCoord xsrc, wxCoord ysrc, + wxCoord srcWidth, wxCoord srcHeight, + int logical_func, bool useMask, + wxCoord xsrcMask, wxCoord ysrcMask) +{ + wxCHECK_MSG(Ok(), false, wxT("wxDC::DoStretchBlit - invalid DC")); + wxCHECK_MSG(source->Ok(), false, wxT("wxDC::DoStretchBlit - invalid source DC")); if ( logical_func == wxNO_OP ) return true ; @@ -1204,12 +1212,12 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, Rect srcrect , dstrect ; srcrect.top = source->YLOG2DEVMAC(ysrc) ; srcrect.left = source->XLOG2DEVMAC(xsrc) ; - srcrect.right = source->XLOG2DEVMAC(xsrc + width ) ; - srcrect.bottom = source->YLOG2DEVMAC(ysrc + height) ; + srcrect.right = source->XLOG2DEVMAC(xsrc + srcWidth ) ; + srcrect.bottom = source->YLOG2DEVMAC(ysrc + srcHeight) ; dstrect.top = YLOG2DEVMAC(ydest) ; dstrect.left = XLOG2DEVMAC(xdest) ; - dstrect.bottom = YLOG2DEVMAC(ydest + height ) ; - dstrect.right = XLOG2DEVMAC(xdest + width ) ; + dstrect.bottom = YLOG2DEVMAC(ydest + dstHeight ) ; + dstrect.right = XLOG2DEVMAC(xdest + dstWidth ) ; short mode = kUnsupportedMode ; bool invertDestinationFirst = false ; @@ -1470,53 +1478,21 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, void wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y, double angle) { - // TODO: support text background color (only possible by hand, ATSUI does not support it) wxCHECK_RET( Ok(), wxT("wxDC::DoDrawRotatedText - invalid DC") ); - if ( str.Length() == 0 ) + if ( str.empty() ) return ; wxMacFastPortSetter helper(this) ; MacInstallFont() ; -#if 0 - if ( 0 ) - { - m_macFormerAliasState = IsAntiAliasedTextEnabled(&m_macFormerAliasSize); - SetAntiAliasedTextEnabled(true, SInt16(m_scaleY * m_font.MacGetFontSize())); - m_macAliasWasEnabled = true ; - } -#endif - OSStatus status = noErr ; ATSUTextLayout atsuLayout ; - UniCharCount chars = str.Length() ; - UniChar* ubuf = NULL ; - -#if SIZEOF_WCHAR_T == 4 - wxMBConvUTF16 converter ; -#if wxUSE_UNICODE - size_t unicharlen = converter.WC2MB( NULL , str.wc_str() , 0 ) ; - ubuf = (UniChar*) malloc( unicharlen + 2 ) ; - converter.WC2MB( (char*) ubuf , str.wc_str(), unicharlen + 2 ) ; -#else - const wxWCharBuffer wchar = str.wc_str( wxConvLocal ) ; - size_t unicharlen = converter.WC2MB( NULL , wchar.data() , 0 ) ; - ubuf = (UniChar*) malloc( unicharlen + 2 ) ; - converter.WC2MB( (char*) ubuf , wchar.data() , unicharlen + 2 ) ; -#endif - chars = unicharlen / 2 ; -#else -#if wxUSE_UNICODE - ubuf = (UniChar*) str.wc_str() ; -#else - wxWCharBuffer wchar = str.wc_str( wxConvLocal ) ; - chars = wxWcslen( wchar.data() ) ; - ubuf = (UniChar*) wchar.data() ; -#endif -#endif - status = ::ATSUCreateTextLayoutWithTextPtr( (UniCharArrayPtr) ubuf , 0 , chars , chars , 1 , + wxMacUniCharBuffer unibuf( str ) ; + UniCharCount chars = unibuf.GetChars() ; + + status = ::ATSUCreateTextLayoutWithTextPtr( unibuf.GetBuffer() , 0 , chars , chars , 1 , &chars , (ATSUStyle*) &m_macATSUIStyle , &atsuLayout ) ; wxASSERT_MSG( status == noErr , wxT("couldn't create the layout of the rotated text") ); @@ -1531,29 +1507,66 @@ void wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y, ATSUTextMeasurement textBefore, textAfter ; ATSUTextMeasurement ascent, descent ; - if ( abs(iAngle) > 0 ) + ATSLineLayoutOptions layoutOptions = kATSLineNoLayoutOptions ; + + if (m_font.GetNoAntiAliasing()) { - Fixed atsuAngle = IntToFixed( iAngle ) ; + layoutOptions |= kATSLineNoAntiAliasing ; + } - ATSUAttributeTag atsuTags[] = - { - kATSULineRotationTag , - } ; - ByteCount atsuSizes[sizeof(atsuTags)/sizeof(ATSUAttributeTag)] = - { - sizeof( Fixed ) , - } ; - ATSUAttributeValuePtr atsuValues[sizeof(atsuTags)/sizeof(ATSUAttributeTag)] = - { - &atsuAngle , - } ; + Fixed atsuAngle = IntToFixed( iAngle ) ; + + ATSUAttributeTag atsuTags[] = + { + kATSULineLayoutOptionsTag , + kATSULineRotationTag , + } ; + + ByteCount atsuSizes[sizeof(atsuTags)/sizeof(ATSUAttributeTag)] = + { + sizeof( ATSLineLayoutOptions ) , + sizeof( Fixed ) , + } ; - status = ::ATSUSetLayoutControls(atsuLayout , sizeof(atsuTags)/sizeof(ATSUAttributeTag), + ATSUAttributeValuePtr atsuValues[sizeof(atsuTags)/sizeof(ATSUAttributeTag)] = + { + &layoutOptions , + &atsuAngle , + } ; + + status = ::ATSUSetLayoutControls(atsuLayout , sizeof(atsuTags)/sizeof(ATSUAttributeTag) - ( abs(iAngle) > 0.001 ? 0 : 1), atsuTags, atsuSizes, atsuValues ) ; - } status = ::ATSUMeasureText( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd, &textBefore , &textAfter, &ascent , &descent ); + wxASSERT_MSG( status == noErr , wxT("couldn't measure the rotated text") ); + + if ( m_backgroundMode == wxSOLID ) + { + // background painting must be done by hand, cannot be done by ATSUI + wxCoord x2 , y2 ; + PolyHandle polygon = OpenPoly(); + + ::MoveTo(drawX, drawY); + + x2 = (int) (drawX + sin(angle / RAD2DEG) * FixedToInt(ascent + descent)) ; + y2 = (int) (drawY + cos(angle / RAD2DEG) * FixedToInt(ascent + descent)) ; + ::LineTo(x2, y2); + + x2 = (int) (drawX + sin(angle / RAD2DEG) * FixedToInt(ascent + descent ) + cos(angle / RAD2DEG) * FixedToInt(textAfter)) ; + y2 = (int) (drawY + cos(angle / RAD2DEG) * FixedToInt(ascent + descent) - sin(angle / RAD2DEG) * FixedToInt(textAfter)) ; + ::LineTo(x2, y2); + + x2 = (int) (drawX + cos(angle / RAD2DEG) * FixedToInt(textAfter)) ; + y2 = (int) (drawY - sin(angle / RAD2DEG) * FixedToInt(textAfter)) ; + ::LineTo(x2, y2); + + ::LineTo( drawX, drawY) ; + ClosePoly(); + + ::ErasePoly( polygon ); + KillPoly( polygon ); + } drawX += (int)(sin(angle / RAD2DEG) * FixedToInt(ascent)); drawY += (int)(cos(angle / RAD2DEG) * FixedToInt(ascent)); @@ -1571,86 +1584,11 @@ void wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y, CalcBoundingBox(XDEV2LOG(rect.left), YDEV2LOG(rect.top) ); CalcBoundingBox(XDEV2LOG(rect.right), YDEV2LOG(rect.bottom) ); ::ATSUDisposeTextLayout(atsuLayout); - -#if SIZEOF_WCHAR_T == 4 - free( ubuf ) ; -#endif } void wxDC::DoDrawText(const wxString& strtext, wxCoord x, wxCoord y) { - wxCHECK_RET(Ok(), wxT("wxDC::DoDrawText - invalid DC")); - - wxMacFastPortSetter helper(this) ; - long xx = XLOG2DEVMAC(x); - long yy = YLOG2DEVMAC(y); - -#if TARGET_CARBON - bool useDrawThemeText = ( DrawThemeTextBox != (void*) kUnresolvedCFragSymbolAddress ) ; - if ( UMAGetSystemVersion() < 0x1000 || IsKindOf(CLASSINFO( wxPrinterDC ) ) || m_font.GetNoAntiAliasing() ) - useDrawThemeText = false ; -#endif - - MacInstallFont() ; - - FontInfo fi ; - ::GetFontInfo( &fi ) ; - -#if TARGET_CARBON - if ( !useDrawThemeText ) - yy += fi.ascent ; -#else - yy += fi.ascent ; -#endif - - ::TextMode( (m_backgroundMode == wxTRANSPARENT) ? srcOr : srcCopy ) ; - ::MoveTo( xx , yy ); - - int line = 0 ; - { - wxString linetext = strtext ; - -#if TARGET_CARBON - if ( useDrawThemeText ) - { - Rect frame = { - yy + line*(fi.descent + fi.ascent + fi.leading), xx , - yy + (line+1)*(fi.descent + fi.ascent + fi.leading) , xx + 10000 } ; - wxMacCFStringHolder mString( linetext , m_font.GetEncoding()) ; - - if ( m_backgroundMode != wxTRANSPARENT ) - { - Point bounds = {0, 0} ; - Rect background = frame ; - SInt16 baseline ; - ::GetThemeTextDimensions( mString, - m_font.MacGetThemeFontID() , - kThemeStateActive, - false, - &bounds, - &baseline ); - background.right = background.left + bounds.h ; - background.bottom = background.top + bounds.v ; - ::EraseRect( &background ) ; - } - - ::DrawThemeTextBox( mString, - m_font.MacGetThemeFontID() , - kThemeStateActive, - false, - &frame, - teJustLeft, - NULL ); - } - else -#endif - { - wxCharBuffer text = linetext.mb_str(wxConvLocal) ; - ::DrawText( text , 0 , strlen(text) ) ; - } - } - - ::TextMode( srcOr ) ; + DoDrawRotatedText( strtext , x , y , 0) ; } bool wxDC::CanGetTextExtent() const @@ -1660,7 +1598,8 @@ bool wxDC::CanGetTextExtent() const return true ; } -void wxDC::DoGetTextExtent( const wxString &strtext, wxCoord *width, wxCoord *height, + +void wxDC::DoGetTextExtent( const wxString &str, wxCoord *width, wxCoord *height, wxCoord *descent, wxCoord *externalLeading , wxFont *theFont ) const { @@ -1675,51 +1614,63 @@ void wxDC::DoGetTextExtent( const wxString &strtext, wxCoord *width, wxCoord *he } MacInstallFont() ; - FontInfo fi ; - ::GetFontInfo( &fi ) ; -#if TARGET_CARBON - bool useGetThemeText = ( GetThemeTextDimensions != (void*) kUnresolvedCFragSymbolAddress ) ; - if ( UMAGetSystemVersion() < 0x1000 || IsKindOf(CLASSINFO( wxPrinterDC ) ) || ((wxFont*)&m_font)->GetNoAntiAliasing() ) - useGetThemeText = false ; -#endif + OSStatus status = noErr ; + ATSUTextLayout atsuLayout ; + + wxMacUniCharBuffer unibuf( str ) ; + UniCharCount chars = unibuf.GetChars() ; + + status = ::ATSUCreateTextLayoutWithTextPtr( unibuf.GetBuffer() , 0 , chars , chars , 1 , + &chars , (ATSUStyle*) &m_macATSUIStyle , &atsuLayout ) ; + + wxASSERT_MSG( status == noErr , wxT("couldn't create the layout of the text") ); + + status = ::ATSUSetTransientFontMatching( atsuLayout , true ) ; + wxASSERT_MSG( status == noErr , wxT("couldn't setup transient font matching") ); + + ATSLineLayoutOptions layoutOptions = kATSLineNoLayoutOptions ; + + if (m_font.GetNoAntiAliasing()) + { + layoutOptions |= kATSLineNoAntiAliasing ; + } + + ATSUAttributeTag atsuTags[] = + { + kATSULineLayoutOptionsTag , + } ; + + ByteCount atsuSizes[sizeof(atsuTags)/sizeof(ATSUAttributeTag)] = + { + sizeof( ATSLineLayoutOptions ) , + } ; + + ATSUAttributeValuePtr atsuValues[sizeof(atsuTags)/sizeof(ATSUAttributeTag)] = + { + &layoutOptions , + } ; + + status = ::ATSUSetLayoutControls(atsuLayout , sizeof(atsuTags)/sizeof(ATSUAttributeTag) , + atsuTags, atsuSizes, atsuValues ) ; + + ATSUTextMeasurement textBefore, textAfter ; + ATSUTextMeasurement textAscent, textDescent ; + + status = ::ATSUGetUnjustifiedBounds( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd, + &textBefore , &textAfter, &textAscent , &textDescent ); if ( height ) - *height = YDEV2LOGREL( fi.descent + fi.ascent ) ; + *height = YDEV2LOGREL( FixedToInt(textAscent + textDescent) ) ; if ( descent ) - *descent =YDEV2LOGREL( fi.descent ); + *descent =YDEV2LOGREL( FixedToInt(textDescent) ); if ( externalLeading ) - *externalLeading = YDEV2LOGREL( fi.leading ) ; - - int curwidth = 0 ; + *externalLeading = 0 ; if ( width ) - { - *width = 0 ; - wxString linetext = strtext ; + *width = XDEV2LOGREL( FixedToInt(textAfter - textBefore) ) ; - if ( useGetThemeText ) - { - Point bounds = {0, 0} ; - SInt16 baseline ; - wxMacCFStringHolder mString( linetext , m_font.GetEncoding() ) ; - ThemeFontID themeFont = m_font.MacGetThemeFontID() ; - ::GetThemeTextDimensions( mString, - themeFont , - kThemeStateActive, - false, - &bounds, - &baseline ); - curwidth = bounds.h ; - } - else - { - wxCharBuffer text = linetext.mb_str(wxConvLocal) ; - curwidth = ::TextWidth( text , 0 , strlen(text) ) ; - } + ::ATSUDisposeTextLayout(atsuLayout); - if ( curwidth > *width ) - *width = XDEV2LOGREL( curwidth ) ; - } if ( theFont ) { @@ -1734,110 +1685,85 @@ bool wxDC::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) con wxCHECK_MSG(Ok(), false, wxT("wxDC::DoGetPartialTextExtents - invalid DC")); widths.Empty(); - widths.Add(0, text.Length()); + widths.Add(0, text.length()); - if (text.Length() == 0) + if (text.length() == 0) return false; wxMacFastPortSetter helper(this) ; MacInstallFont() ; -#if TARGET_CARBON - bool useGetThemeText = ( GetThemeTextDimensions != (void*) kUnresolvedCFragSymbolAddress ) ; - if ( UMAGetSystemVersion() < 0x1000 || IsKindOf(CLASSINFO( wxPrinterDC ) ) || ((wxFont*)&m_font)->GetNoAntiAliasing() ) - useGetThemeText = false ; + OSStatus status = noErr ; + ATSUTextLayout atsuLayout ; + + wxMacUniCharBuffer unibuf( text ) ; + UniCharCount chars = unibuf.GetChars() ; + + status = ::ATSUCreateTextLayoutWithTextPtr( unibuf.GetBuffer() , 0 , chars , chars , 1 , + &chars , (ATSUStyle*) &m_macATSUIStyle , &atsuLayout ) ; + + wxASSERT_MSG( status == noErr , wxT("couldn't create the layout of the text") ); - if ( useGetThemeText ) + status = ::ATSUSetTransientFontMatching( atsuLayout , true ) ; + wxASSERT_MSG( status == noErr , wxT("couldn't setup transient font matching") ); + + ATSLineLayoutOptions layoutOptions = kATSLineNoLayoutOptions ; + + if (m_font.GetNoAntiAliasing()) { - // If anybody knows how to do this more efficiently yet still handle - // the fractional glyph widths that may be present when using AA - // fonts, please change it. Currently it is measuring from the - // beginning of the string for each succeeding substring, which is much - // slower than this should be. - for (size_t i=0; iGetNoAntiAliasing() ) - useGetThemeText = false ; - - if ( useGetThemeText ) - { - Point bounds = {0, 0} ; - SInt16 baseline ; - CFStringRef mString = CFStringCreateWithBytes( NULL , (UInt8*) text , 1 , CFStringGetSystemEncoding(), false ) ; - ::GetThemeTextDimensions( mString, - m_font.MacGetThemeFontID(), - kThemeStateActive, - false, - &bounds, - &baseline ); - CFRelease( mString ) ; - width = bounds.h ; - } - else -#endif - { - width = ::TextWidth( text , 0 , 1 ) ; - } - - return YDEV2LOGREL(width) ; + wxCoord width = 0 ; + DoGetTextExtent( wxT("g"), &width , NULL , NULL , NULL , NULL ) ; + return width ; } wxCoord wxDC::GetCharHeight(void) const { - wxCHECK_MSG(Ok(), 1, wxT("wxDC::GetCharHeight - invalid DC")); - - wxMacFastPortSetter helper(this) ; - MacInstallFont() ; - FontInfo fi ; - ::GetFontInfo( &fi ) ; - - return YDEV2LOGREL( fi.descent + fi.ascent ); + wxCoord height ; + DoGetTextExtent( wxT("g") , NULL , &height , NULL , NULL , NULL ) ; + return height ; } void wxDC::Clear(void) @@ -2162,13 +2088,13 @@ void wxDC::MacInstallBrush() const Pattern whiteColor ; ::BackPat(GetQDGlobalsWhite(&whiteColor)); ::SetThemePen( m_brush.MacGetTheme() , wxDisplayDepth() , true ) ; - } + } break ; - + default : ::PenPat(GetQDGlobalsBlack(&blackColor)); break ; - + } } else if (m_brush.IsHatch())