From 66a09d4776b8ae390d5aa51dbd678b694f2c81d6 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Fri, 11 Jan 2002 14:07:02 +0000 Subject: [PATCH] fixes for using non opaque structs under debug classic, support for ATSU and pixel pattern. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13504 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/app.cpp | 10 +- src/mac/carbon/app.cpp | 10 +- src/mac/carbon/clipbrd.cpp | 3 + src/mac/carbon/colordlg.cpp | 3 + src/mac/carbon/dc.cpp | 449 +++++++++++++++++++++--------------- src/mac/carbon/dcmemory.cpp | 2 + src/mac/carbon/dcprint.cpp | 3 + src/mac/carbon/font.cpp | 8 +- src/mac/carbon/printdlg.cpp | 3 + src/mac/carbon/scrolbar.cpp | 3 +- src/mac/carbon/textctrl.cpp | 4 + src/mac/carbon/thread.cpp | 3 + src/mac/carbon/timer.cpp | 3 + src/mac/carbon/tooltip.cpp | 4 +- src/mac/carbon/toplevel.cpp | 2 +- src/mac/carbon/uma.cpp | 11 + src/mac/carbon/utils.cpp | 5 + src/mac/carbon/wave.cpp | 3 + src/mac/carbon/window.cpp | 4 + src/mac/clipbrd.cpp | 3 + src/mac/colordlg.cpp | 3 + src/mac/dc.cpp | 449 +++++++++++++++++++++--------------- src/mac/dcmemory.cpp | 2 + src/mac/dcprint.cpp | 3 + src/mac/font.cpp | 8 +- src/mac/printdlg.cpp | 3 + src/mac/scrolbar.cpp | 3 +- src/mac/textctrl.cpp | 4 + src/mac/thread.cpp | 3 + src/mac/timer.cpp | 3 + src/mac/tooltip.cpp | 4 +- src/mac/toplevel.cpp | 2 +- src/mac/uma.cpp | 11 + src/mac/utils.cpp | 5 + src/mac/wave.cpp | 3 + src/mac/window.cpp | 4 + 36 files changed, 662 insertions(+), 384 deletions(-) diff --git a/src/mac/app.cpp b/src/mac/app.cpp index 0f813f16ab..dcd512fa87 100644 --- a/src/mac/app.cpp +++ b/src/mac/app.cpp @@ -56,6 +56,12 @@ #if wxUSE_SOCKETS #ifdef __DARWIN__ #include + #else + #include + #include + #include + #include + #include #endif #endif @@ -1160,7 +1166,7 @@ void wxApp::MacHandleMouseDownEvent( WXEVENTREF evr ) GrafPtr port ; GetPort( &port ) ; Point pt = { 0, 0 } ; - SetPort( GetWindowPort(window) ) ; + SetPortWindowPort(window) ; LocalToGlobal( &pt ) ; SetPort( port ) ; win->SetSize( pt.h , pt.v , -1 , @@ -1226,7 +1232,7 @@ void wxApp::MacHandleMouseDownEvent( WXEVENTREF evr ) { GrafPtr port ; GetPort( &port ) ; - SetPort( GetWindowPort(window) ) ; + SetPortWindowPort(window) ; SetPort( port ) ; } if ( window != frontWindow && wxTheApp->s_captureWindow == NULL ) diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp index 0f813f16ab..dcd512fa87 100644 --- a/src/mac/carbon/app.cpp +++ b/src/mac/carbon/app.cpp @@ -56,6 +56,12 @@ #if wxUSE_SOCKETS #ifdef __DARWIN__ #include + #else + #include + #include + #include + #include + #include #endif #endif @@ -1160,7 +1166,7 @@ void wxApp::MacHandleMouseDownEvent( WXEVENTREF evr ) GrafPtr port ; GetPort( &port ) ; Point pt = { 0, 0 } ; - SetPort( GetWindowPort(window) ) ; + SetPortWindowPort(window) ; LocalToGlobal( &pt ) ; SetPort( port ) ; win->SetSize( pt.h , pt.v , -1 , @@ -1226,7 +1232,7 @@ void wxApp::MacHandleMouseDownEvent( WXEVENTREF evr ) { GrafPtr port ; GetPort( &port ) ; - SetPort( GetWindowPort(window) ) ; + SetPortWindowPort(window) ; SetPort( port ) ; } if ( window != frontWindow && wxTheApp->s_captureWindow == NULL ) diff --git a/src/mac/carbon/clipbrd.cpp b/src/mac/carbon/clipbrd.cpp index 8e3cd77678..0aa8806e03 100644 --- a/src/mac/carbon/clipbrd.cpp +++ b/src/mac/carbon/clipbrd.cpp @@ -23,6 +23,9 @@ #include "wx/intl.h" #include "wx/mac/private.h" +#ifndef __DARWIN__ +#include +#endif #define wxUSE_DATAOBJ 1 diff --git a/src/mac/carbon/colordlg.cpp b/src/mac/carbon/colordlg.cpp index 90326e713d..b8df2bcc5a 100644 --- a/src/mac/carbon/colordlg.cpp +++ b/src/mac/carbon/colordlg.cpp @@ -21,6 +21,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog) #endif #include "wx/mac/private.h" +#ifndef __DARWIN__ +#include +#endif /* * wxColourDialog diff --git a/src/mac/carbon/dc.cpp b/src/mac/carbon/dc.cpp index 55578a324f..aaabc6607b 100644 --- a/src/mac/carbon/dc.cpp +++ b/src/mac/carbon/dc.cpp @@ -27,7 +27,9 @@ using namespace std ; #endif #include "wx/mac/private.h" - +#include "ATSUnicode.h" +#include "TextCommon.h" +#include "TextEncodingConverter.h" #if !USE_SHARED_LIBRARY IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject) @@ -52,6 +54,19 @@ const short kUnsupportedMode = -2 ; #define wxMAC_EXPERIMENTAL_PATTERN 0 +wxMacPortSetter::wxMacPortSetter( const wxDC* dc ) : + m_ph( (GrafPtr) dc->m_macPort ) +{ + wxASSERT( dc->Ok() ) ; + m_dc = dc ; + dc->MacSetupPort(&m_ph) ; +} + +wxMacPortSetter::~wxMacPortSetter() +{ + m_dc->MacCleanupPort(&m_ph) ; +} + //----------------------------------------------------------------------------- // Local functions //----------------------------------------------------------------------------- @@ -194,17 +209,11 @@ wxDC::wxDC() m_pen = *wxBLACK_PEN; m_font = *wxNORMAL_FONT; m_brush = *wxWHITE_BRUSH; -} -wxMacPortSetter::wxMacPortSetter( const wxDC* dc ) : - m_ph( (GrafPtr) dc->m_macPort ) -{ - wxASSERT( dc->Ok() ) ; - - dc->MacSetupPort(&m_ph) ; -} - -wxMacPortSetter::~wxMacPortSetter() -{ + m_macCurrentPortStateHelper = NULL ; + m_macATSUIStyle = NULL ; + m_macAliasWasEnabled = false; + m_macForegroundPixMap = NULL ; + m_macBackgroundPixMap = NULL ; } wxDC::~wxDC(void) @@ -214,6 +223,8 @@ wxDC::~wxDC(void) } void wxDC::MacSetupPort(wxMacPortStateHelper* help) const { + wxASSERT( m_macCurrentPortStateHelper == NULL ) ; + m_macCurrentPortStateHelper = help ; SetClip( (RgnHandle) m_macCurrentClipRgn); m_macFontInstalled = false ; @@ -221,6 +232,36 @@ void wxDC::MacSetupPort(wxMacPortStateHelper* help) const m_macPenInstalled = false ; } +void wxDC::MacCleanupPort(wxMacPortStateHelper* help) const +{ + wxASSERT( m_macCurrentPortStateHelper == help ) ; + m_macCurrentPortStateHelper = NULL ; + if( m_macATSUIStyle ) + { + ::ATSUDisposeStyle((ATSUStyle)m_macATSUIStyle); + m_macATSUIStyle = NULL ; + } + if ( m_macAliasWasEnabled ) + { + SetAntiAliasedTextEnabled(m_macFormerAliasState, m_macFormerAliasSize); + m_macAliasWasEnabled = false ; + } + if ( m_macForegroundPixMap ) + { + Pattern blackColor ; + ::PenPat(GetQDGlobalsBlack(&blackColor)); + DisposePixMap( (PixMapHandle) m_macForegroundPixMap ) ; + m_macForegroundPixMap = NULL ; + } + if ( m_macBackgroundPixMap ) + { + Pattern whiteColor ; + ::BackPat(GetQDGlobalsWhite(&whiteColor)); + DisposePixMap( (PixMapHandle) m_macBackgroundPixMap ) ; + m_macBackgroundPixMap = NULL ; + } +} + void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask ) { wxCHECK_RET( Ok(), wxT("invalid window dc") ); @@ -687,6 +728,10 @@ void wxDC::DoCrossHair( wxCoord x, wxCoord y ) ::LineTo( XLOG2DEVMAC(w), yy ); ::MoveTo( xx, YLOG2DEVMAC(0) ); ::LineTo( xx, YLOG2DEVMAC(h) ); + + CalcBoundingBox(x, y); + CalcBoundingBox(x+w, y+h); + } } @@ -1316,104 +1361,89 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, return TRUE; } -void wxDC::DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, +inline Fixed IntToFixed( int inInt ) + { + return (((SInt32) inInt) << 16); + } + + +void wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y, double angle) { wxCHECK_RET( Ok(), wxT("wxDC::DoDrawRotatedText Invalid window dc") ); if (angle == 0.0) { - DrawText(text, x, y); + DrawText(str, x, y); return; } - MacInstallFont(); - - // the size of the text - wxCoord w, h; - GetTextExtent(text, &w, &h); - - // draw the string normally - wxBitmap src(w, h); - 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); - dc.SelectObject(wxNullBitmap); - wxMacPortSetter helper(this) ; + MacInstallFont() ; + + wxString text ; + if ( wxApp::s_macDefaultEncodingIsPC ) + { + text = wxMacMakeMacStringFromPC( str ) ; + } + else + { + text = str ; + } - // Calculate the size of the rotated bounding box. - double rad = DegToRad(angle); - double dx = cos(rad); - double dy = sin(rad); - - // the rectngle vertices are counted clockwise with the first one being at - // (0, 0) (or, rather, at (x, y)) - double x2 = w * dx; - double y2 = -w * dy; // y axis points to the bottom, hence minus - double x4 = h * dy; - double y4 = h * dx; - double x3 = x4 + x2; - double y3 = y4 + y2; - - // calc max and min - wxCoord maxX = (wxCoord)(dmax(x2, dmax(x3, x4)) + 0.5); - wxCoord maxY = (wxCoord)(dmax(y2, dmax(y3, y4)) + 0.5); - wxCoord minX = (wxCoord)(dmin(x2, dmin(x3, x4)) - 0.5); - wxCoord minY = (wxCoord)(dmin(y2, dmin(y3, y4)) - 0.5); - - // prepare to blit-with-rotate the bitmap to the DC - wxImage image(src); - - RGBColor colText = MAC_WXCOLORREF( m_textForegroundColour.GetPixel() ); - RGBColor colBack = MAC_WXCOLORREF( m_textBackgroundColour.GetPixel() ); - - unsigned char *data = image.GetData(); - - wxCoord dstX, dstY; - double r, angleOrig; - bool textPixel; - - // paint pixel by pixel - for ( wxCoord srcX = 0; srcX < w; srcX++ ) - { - for ( wxCoord srcY = 0; srcY < h; srcY++ ) - { - // transform source coords to dest coords - r = sqrt( (double)(srcX * srcX + srcY * srcY) ); - angleOrig = atan2((double)srcY, (double)srcX) - rad; - dstX = (wxCoord)(r * cos(angleOrig) + 0.5); - dstY = (wxCoord)(r * sin(angleOrig) + 0.5); - - // black pixel? - textPixel = data[(srcY*w + srcX)*3] == 0; - if ( textPixel || (m_backgroundMode == wxSOLID) ) - { - SetCPixel(XLOG2DEVMAC(x + dstX), YLOG2DEVMAC(y + dstY), - textPixel ? &colText : &colBack); - } - } - } - - // it would be better to draw with non underlined font and draw the line - // manually here (it would be more straight...) -#if 0 - if ( m_font.GetUnderlined() ) + wxFontRefData * font = (wxFontRefData*) m_font.GetRefData() ; + if ( 0 ) { - ::MoveTo(XLOG2DEVMAC(x + x4), YLOG2DEVMAC(y + y4 + font->descent)); - ::LineTo(XLOG2DEVMAC(x + x3), YLOG2DEVMAC(y + y3 + font->descent)); + m_macFormerAliasState = IsAntiAliasedTextEnabled(&m_macFormerAliasSize); + SetAntiAliasedTextEnabled(true, m_scaleY * font->m_macFontSize); + m_macAliasWasEnabled = true ; } -#endif // 0 - - // update the bounding box - CalcBoundingBox(x + minX, y + minY); - CalcBoundingBox(x + maxX, y + maxY); + + OSStatus status = noErr ; + + TECObjectRef ec; + status = TECCreateConverter(&ec, kTextEncodingMacRoman, kTextEncodingUnicodeDefault); + wxASSERT_MSG( status == noErr , "couldn't start converter" ) ; + + ByteCount byteOutLen ; + ByteCount byteInLen = text.Length() ; + ByteCount byteBufferLen = byteInLen *2 ; + char* buf = new char[byteBufferLen] ; + + status = TECConvertText(ec, (ConstTextPtr)text.c_str() , byteInLen, &byteInLen, + (TextPtr)buf, byteBufferLen, &byteOutLen); + + wxASSERT_MSG( status == noErr , "couldn't convert text" ) ; + status = TECDisposeConverter(ec); + wxASSERT_MSG( status == noErr , "couldn't dispose converter" ) ; + + ATSUTextLayout atsuLayout ; + UniCharCount chars = byteOutLen / 2 ; + status = ::ATSUCreateTextLayoutWithTextPtr( (UniCharArrayPtr) buf , 0 , byteOutLen / 2 , byteOutLen / 2 , 1 , + &chars , (ATSUStyle*) &m_macATSUIStyle , &atsuLayout ) ; + wxASSERT_MSG( status == noErr , "couldn't create the layout of the rotated text" ); + + Fixed atsuAngle = IntToFixed( angle ) ; + ByteCount angleSize = sizeof(Fixed) ; + ATSUAttributeTag rotationTag = kATSULineRotationTag ; + ATSUAttributeValuePtr angleValue = &atsuAngle ; + status = ::ATSUSetLayoutControls(atsuLayout , 1 , &rotationTag , &angleSize , &angleValue ) ; + + status = ::ATSUDrawText( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd, + IntToFixed(XLOG2DEVMAC(x) ) , IntToFixed(YLOG2DEVMAC(y) ) ); + wxASSERT_MSG( status == noErr , "couldn't draw the rotated text" ); + Rect rect ; + status = ::ATSUMeasureTextImage( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd, + IntToFixed(XLOG2DEVMAC(x) ) , IntToFixed(YLOG2DEVMAC(y) ) , &rect ); + wxASSERT_MSG( status == noErr , "couldn't measure the rotated text" ); + + OffsetRect( &rect , -m_macLocalOrigin.x , -m_macLocalOrigin.y ) ; + CalcBoundingBox(XDEV2LOG(rect.left), YDEV2LOG(rect.top) ); + CalcBoundingBox(XDEV2LOG(rect.right), YDEV2LOG(rect.bottom) ); + ::ATSUDisposeTextLayout(atsuLayout); + delete[] buf ; } + void wxDC::DoDrawText(const wxString& strtext, wxCoord x, wxCoord y) { wxCHECK_RET(Ok(), wxT("wxDC::DoDrawText Invalid DC")); @@ -1422,64 +1452,62 @@ void wxDC::DoDrawText(const wxString& strtext, wxCoord x, wxCoord y) long xx = XLOG2DEVMAC(x); long yy = YLOG2DEVMAC(y); -// if (m_pen.GetStyle() != wxTRANSPARENT) + MacInstallFont() ; + if ( 0 ) + { + m_macFormerAliasState = IsAntiAliasedTextEnabled(&m_macFormerAliasSize); + SetAntiAliasedTextEnabled(true, 8); + m_macAliasWasEnabled = true ; + } + + FontInfo fi ; + ::GetFontInfo( &fi ) ; + + yy += fi.ascent ; + ::MoveTo( xx , yy ); + if ( m_backgroundMode == wxTRANSPARENT ) { - MacInstallFont() ; - /* - Rect clip = { -32000 , -32000 , 32000 , 32000 } ; - - ::ClipRect( &clip ) ; - */ - - FontInfo fi ; - ::GetFontInfo( &fi ) ; - - yy += fi.ascent ; - ::MoveTo( xx , yy ); - if ( m_backgroundMode == wxTRANSPARENT ) - { - ::TextMode( srcOr) ; - } - else - { - ::TextMode( srcCopy ) ; - } + ::TextMode( srcOr) ; + } + else + { + ::TextMode( srcCopy ) ; + } - const char *text = NULL ; - int length = 0 ; - wxString macText ; + const char *text = NULL ; + int length = 0 ; + wxString macText ; - if ( wxApp::s_macDefaultEncodingIsPC ) - { - macText = wxMacMakeMacStringFromPC( strtext ) ; - text = macText ; - length = macText.Length() ; - } - else + if ( wxApp::s_macDefaultEncodingIsPC ) + { + macText = wxMacMakeMacStringFromPC( strtext ) ; + text = macText ; + length = macText.Length() ; + } + else + { + text = strtext ; + length = strtext.Length() ; + } + + int laststop = 0 ; + int i = 0 ; + int line = 0 ; + + while( i < length ) + { + if( text[i] == 13 || text[i] == 10) { - text = strtext ; - length = strtext.Length() ; + ::DrawText( text , laststop , i - laststop ) ; + line++ ; + ::MoveTo( xx , yy + line*(fi.descent + fi.ascent + fi.leading) ); + laststop = i+1 ; } - - int laststop = 0 ; - int i = 0 ; - int line = 0 ; - - while( i < length ) - { - if( text[i] == 13 || text[i] == 10) - { - ::DrawText( text , laststop , i - laststop ) ; - line++ ; - ::MoveTo( xx , yy + line*(fi.descent + fi.ascent + fi.leading) ); - laststop = i+1 ; - } - i++ ; - } - - ::DrawText( text , laststop , i - laststop ) ; - ::TextMode( srcOr ) ; + i++ ; } + + ::DrawText( text , laststop , i - laststop ) ; + ::TextMode( srcOr ) ; } bool wxDC::CanGetTextExtent() const @@ -1602,12 +1630,13 @@ void wxDC::Clear(void) { wxCHECK_RET(Ok(), wxT("Invalid DC")); wxMacPortSetter helper(this) ; - Rect rect = { -32767 , -32767 , 32767 , 32767 } ; + Rect rect = { -32000 , -32000 , 32000 , 32000 } ; if (m_backgroundBrush.GetStyle() != wxTRANSPARENT) { + ::PenNormal() ; + //MacInstallBrush() ; MacSetupBackgroundForCurrentPort( m_backgroundBrush ) ; - ::EraseRect( &rect ) ; } } @@ -1698,6 +1727,63 @@ void wxDC::MacInstallFont() const break ; } ::PenMode( mode ) ; + + OSStatus status = noErr ; + + Fixed atsuSize = IntToFixed(m_scaleY * font->m_macFontSize) ; + + Style qdStyle = font->m_macFontStyle ; + ATSUFontID atsuFont = font->m_macATSUFontID ; + + status = ::ATSUCreateStyle(&(ATSUStyle)m_macATSUIStyle) ; + wxASSERT_MSG( status == noErr , "couldn't create ATSU style" ) ; + + ATSUAttributeTag atsuTags[] = + { + kATSUFontTag , + kATSUSizeTag , + kATSUColorTag , + + kATSUQDBoldfaceTag , + kATSUQDItalicTag , + kATSUQDUnderlineTag , + kATSUQDCondensedTag , + kATSUQDExtendedTag , + + } ; + + ByteCount atsuSizes[sizeof(atsuTags)/sizeof(ATSUAttributeTag)] = + { + sizeof( ATSUFontID ) , + sizeof( Fixed ) , + sizeof( RGBColor ) , + sizeof( Boolean ) , + sizeof( Boolean ) , + sizeof( Boolean ) , + sizeof( Boolean ) , + sizeof( Boolean ) , + } ; + + Boolean kTrue = true ; + Boolean kFalse = false ; + + ATSUAttributeValuePtr atsuValues[sizeof(atsuTags)/sizeof(ATSUAttributeTag)] = + { + &atsuFont , + &atsuSize , + &MAC_WXCOLORREF( m_textForegroundColour.GetPixel() ) , + + (qdStyle & bold) ? &kTrue : &kFalse , + (qdStyle & italic) ? &kTrue : &kFalse , + (qdStyle & underline) ? &kTrue : &kFalse , + (qdStyle & condense) ? &kTrue : &kFalse , + (qdStyle & extend) ? &kTrue : &kFalse , + } ; + + status = ::ATSUSetAttributes((ATSUStyle)m_macATSUIStyle, sizeof(atsuTags)/sizeof(ATSUAttributeTag), + atsuTags, atsuSizes, atsuValues); + wxASSERT_MSG( status == noErr , "couldn't set create ATSU style" ) ; + } static void wxMacGetHatchPattern(int hatchStyle, Pattern *pattern) @@ -1875,7 +1961,7 @@ void wxDC::MacSetupBackgroundForCurrentPort(const wxBrush& background ) } case kwxMacBrushColour : { - ::RGBBackColor( &MAC_WXCOLORREF( background.GetColour().GetPixel()) ); + ::RGBBackColor( &MAC_WXCOLORREF( background.GetColour().GetPixel()) ); int brushStyle = background.GetStyle(); if (brushStyle == wxSOLID) ::BackPat(GetQDGlobalsWhite(&whiteColor)); @@ -1946,42 +2032,38 @@ void wxDC::MacInstallBrush() const isMonochrome = true ; } - - if ( isMonochrome ) + if ( isMonochrome && width == 8 && height == 8 ) { ::RGBForeColor( &MAC_WXCOLORREF( m_textForegroundColour.GetPixel()) ); ::RGBForeColor( &MAC_WXCOLORREF( m_textBackgroundColour.GetPixel()) ); - BitMap* gwbitmap = (BitMap*) *gwpixmaphandle ; // since the color depth is 1 it is a BitMap UInt8 *gwbits = (UInt8*) gwbitmap->baseAddr ; int alignment = gwbitmap->rowBytes & 0x7FFF ; - - if( width == 8 && height == 8 ) - { - Pattern pat ; - for ( int i = 0 ; i < 8 ; ++i ) - { - pat.pat[i] = gwbits[i*alignment+0] ; - } - UnlockPixels( GetGWorldPixMap( gw ) ) ; - ::PenPat( &pat ) ; - } - else - { - #if wxMAC_EXPERIMENTAL_PATTERN + Pattern pat ; + for ( int i = 0 ; i < 8 ; ++i ) + { + pat.pat[i] = gwbits[i*alignment+0] ; + } + UnlockPixels( GetGWorldPixMap( gw ) ) ; + ::PenPat( &pat ) ; + } + else + { // this will be the code to handle power of 2 patterns, we will have to arrive at a nice // caching scheme before putting this into production - Handle image; - long imageSize; - PixPatHandle pixpat = NewPixPat() ; - - CopyPixMap(gwpixmaphandle, (**pixpat).patMap); - imageSize = GetPixRowBytes((**pixpat).patMap) * - ((**(**pixpat).patMap).bounds.bottom - - (**(**pixpat).patMap).bounds.top); - - PtrToHand( (**gwpixmaphandle).baseAddr, &image, imageSize ); - (**pixpat).patData = image; + Handle image; + long imageSize; + PixPatHandle pixpat = NewPixPat() ; + + CopyPixMap(gwpixmaphandle, (**pixpat).patMap); + imageSize = GetPixRowBytes((**pixpat).patMap) * + ((**(**pixpat).patMap).bounds.bottom - + (**(**pixpat).patMap).bounds.top); + + PtrToHand( (**gwpixmaphandle).baseAddr, &image, imageSize ); + (**pixpat).patData = image; + if ( isMonochrome ) + { CTabHandle ctable = ((**((**pixpat).patMap)).pmTable) ; ColorSpecPtr ctspec = (ColorSpecPtr) &(**ctable).ctTable ; if ( ctspec[0].rgb.red == 0x0000 ) @@ -1995,12 +2077,9 @@ void wxDC::MacInstallBrush() const ctspec[1].rgb = MAC_WXCOLORREF( m_textForegroundColour.GetPixel()) ; } ::CTabChanged( ctable ) ; - ::PenPixPat(pixpat); -#endif - } - } - else - { + } + ::PenPixPat(pixpat); + m_macForegroundPixMap = pixpat ; } UnlockPixels( gwpixmaphandle ) ; } diff --git a/src/mac/carbon/dcmemory.cpp b/src/mac/carbon/dcmemory.cpp index ad67ca77c0..9985a00b9e 100644 --- a/src/mac/carbon/dcmemory.cpp +++ b/src/mac/carbon/dcmemory.cpp @@ -66,6 +66,8 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap ) { m_macMask = mask->GetMaskBitmap() ; } + SetRectRgn( (RgnHandle) m_macBoundaryClipRgn , 0 , 0 , m_selected.GetWidth() , m_selected.GetHeight() ) ; + CopyRgn( (RgnHandle) m_macBoundaryClipRgn ,(RgnHandle) m_macCurrentClipRgn ) ; m_ok = TRUE ; } else diff --git a/src/mac/carbon/dcprint.cpp b/src/mac/carbon/dcprint.cpp index d50e8b3933..7f093c6e71 100644 --- a/src/mac/carbon/dcprint.cpp +++ b/src/mac/carbon/dcprint.cpp @@ -27,6 +27,9 @@ #include "wx/msgdlg.h" #include #include "wx/mac/uma.h" +#ifndef __DARWIN__ +#include "Printing.h" +#endif #if defined(TARGET_CARBON) && !defined(__DARWIN__) # if PM_USE_SESSION_APIS diff --git a/src/mac/carbon/font.cpp b/src/mac/carbon/font.cpp index 2335e5d262..ab906cad67 100644 --- a/src/mac/carbon/font.cpp +++ b/src/mac/carbon/font.cpp @@ -23,7 +23,7 @@ #include "wx/fontutil.h" #include "wx/mac/private.h" - +#include "ATSUnicode.h" #if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject) @@ -116,6 +116,12 @@ void wxFontRefData::MacFindFont() if (m_underlined) m_macFontStyle |= underline; m_macFontSize = m_pointSize ; + + //TODO:if we supply the style as an additional parameter we must make a testing + //sequence in order to degrade gracefully while trying to maintain most of the style + //information, meanwhile we just take the normal font and apply the features after + OSStatus status = ::ATSUFONDtoFontID(m_macFontNum, normal /*qdStyle*/, (UInt32*)&m_macATSUFontID); + wxASSERT_MSG( status == noErr , "couldn't retrieve font identifier" ) ; } // ---------------------------------------------------------------------------- diff --git a/src/mac/carbon/printdlg.cpp b/src/mac/carbon/printdlg.cpp index 8f59b0d2e3..adb620e76f 100644 --- a/src/mac/carbon/printdlg.cpp +++ b/src/mac/carbon/printdlg.cpp @@ -18,6 +18,9 @@ #include "wx/dcprint.h" #include "wx/msgdlg.h" #include "wx/mac/uma.h" +#ifndef __DARWIN__ + #include "Printing.h" +#endif #if defined(TARGET_CARBON) && !defined(__DARWIN__) # if PM_USE_SESSION_APIS diff --git a/src/mac/carbon/scrolbar.cpp b/src/mac/carbon/scrolbar.cpp index 07fb9476df..a38962776d 100644 --- a/src/mac/carbon/scrolbar.cpp +++ b/src/mac/carbon/scrolbar.cpp @@ -89,7 +89,8 @@ void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageS SetControlViewSize( (ControlHandle) m_macControl , m_pageSize ) ; } } - Refresh() ; + if ( refresh ) + MacRedrawControl() ; } diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp index ce7177ffec..0c742d3719 100644 --- a/src/mac/carbon/textctrl.cpp +++ b/src/mac/carbon/textctrl.cpp @@ -42,6 +42,10 @@ #include #endif +#ifndef __DARWIN__ +#include +#include +#endif #include "wx/mac/uma.h" #define wxUSE_MLTE 0 diff --git a/src/mac/carbon/thread.cpp b/src/mac/carbon/thread.cpp index 26e1b0517d..dce44db526 100644 --- a/src/mac/carbon/thread.cpp +++ b/src/mac/carbon/thread.cpp @@ -35,6 +35,9 @@ #include "wx/thread.h" #ifdef __WXMAC__ +#ifndef __DARWIN__ +#include +#endif #include "wx/mac/uma.h" #endif diff --git a/src/mac/carbon/timer.cpp b/src/mac/carbon/timer.cpp index e2693c3e8a..d485c86b8c 100644 --- a/src/mac/carbon/timer.cpp +++ b/src/mac/carbon/timer.cpp @@ -22,6 +22,9 @@ IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject) #ifdef __WXMAC__ #include "wx/mac/private.h" #endif +#ifndef __DARWIN__ +#include +#endif typedef struct MacTimerInfo { diff --git a/src/mac/carbon/tooltip.cpp b/src/mac/carbon/tooltip.cpp index 5ddf8b92e2..0d1e1ce955 100644 --- a/src/mac/carbon/tooltip.cpp +++ b/src/mac/carbon/tooltip.cpp @@ -225,7 +225,7 @@ void wxMacToolTip::Draw() */ #endif { - wxMacPortStateHelper help( GetWindowPort( m_window ) ); + wxMacPortStateHelper help( (GrafPtr) GetWindowPort( m_window ) ); m_shown = true ; @@ -333,7 +333,7 @@ void wxMacToolTip::Clear() if ( m_window == s_ToolTipWindowRef && m_backpict ) { - wxMacPortStateHelper help( GetWindowPort(m_window) ) ; + wxMacPortStateHelper help( (GrafPtr) GetWindowPort(m_window) ) ; m_shown = false ; diff --git a/src/mac/carbon/toplevel.cpp b/src/mac/carbon/toplevel.cpp index 83b905c227..baeb703641 100644 --- a/src/mac/carbon/toplevel.cpp +++ b/src/mac/carbon/toplevel.cpp @@ -306,7 +306,7 @@ WXWidget wxTopLevelWindowMac::MacGetContainerForEmbedding() void wxTopLevelWindowMac::MacUpdate( long timestamp) { - wxMacPortStateHelper help( GetWindowPort( (WindowRef) m_macWindow) ) ; + wxMacPortStateHelper help( (GrafPtr) GetWindowPort( (WindowRef) m_macWindow) ) ; BeginUpdate( (WindowRef)m_macWindow ) ; diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp index c899f87471..2ca3e8cc2b 100644 --- a/src/mac/carbon/uma.cpp +++ b/src/mac/carbon/uma.cpp @@ -10,6 +10,8 @@ # include # endif # include +# else +# include # endif #endif @@ -121,8 +123,17 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls ) if ( menuMgrAttr & gestaltMenuMgrAquaLayoutMask ) sUMAHasAquaLayout = true ; sUMASystemInitialized = true ; + } +/* +Boolean CanUseATSUI() + { + long result; + OSErr err = Gestalt(gestaltATSUVersion, &result); + return (err == noErr); + } +*/ // process manager long UMAGetProcessMode() { diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp index 41da489e3b..066f36c368 100644 --- a/src/mac/carbon/utils.cpp +++ b/src/mac/carbon/utils.cpp @@ -29,6 +29,11 @@ #include "MoreFiles.h" #include "MoreFilesExtras.h" +#ifndef __DARWIN__ +#include +#include +#endif + #ifndef __DARWIN__ // defined in unix/utilsunx.cpp for Mac OS X diff --git a/src/mac/carbon/wave.cpp b/src/mac/carbon/wave.cpp index d06eee4838..205c5d5ceb 100644 --- a/src/mac/carbon/wave.cpp +++ b/src/mac/carbon/wave.cpp @@ -19,6 +19,9 @@ #ifdef __WXMAC__ #include "wx/mac/private.h" +#ifndef __DARWIN__ +#include +#endif #endif wxWave::wxWave() diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp index 78b3c56ba7..61286ac4ec 100644 --- a/src/mac/carbon/window.cpp +++ b/src/mac/carbon/window.cpp @@ -46,6 +46,10 @@ #define MAC_SCROLLBAR_SIZE 16 #include "wx/mac/uma.h" +#ifndef __DARWIN__ +#include +#include +#endif #if wxUSE_DRAG_AND_DROP #include "wx/dnd.h" diff --git a/src/mac/clipbrd.cpp b/src/mac/clipbrd.cpp index 8e3cd77678..0aa8806e03 100644 --- a/src/mac/clipbrd.cpp +++ b/src/mac/clipbrd.cpp @@ -23,6 +23,9 @@ #include "wx/intl.h" #include "wx/mac/private.h" +#ifndef __DARWIN__ +#include +#endif #define wxUSE_DATAOBJ 1 diff --git a/src/mac/colordlg.cpp b/src/mac/colordlg.cpp index 90326e713d..b8df2bcc5a 100644 --- a/src/mac/colordlg.cpp +++ b/src/mac/colordlg.cpp @@ -21,6 +21,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog) #endif #include "wx/mac/private.h" +#ifndef __DARWIN__ +#include +#endif /* * wxColourDialog diff --git a/src/mac/dc.cpp b/src/mac/dc.cpp index 55578a324f..aaabc6607b 100644 --- a/src/mac/dc.cpp +++ b/src/mac/dc.cpp @@ -27,7 +27,9 @@ using namespace std ; #endif #include "wx/mac/private.h" - +#include "ATSUnicode.h" +#include "TextCommon.h" +#include "TextEncodingConverter.h" #if !USE_SHARED_LIBRARY IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject) @@ -52,6 +54,19 @@ const short kUnsupportedMode = -2 ; #define wxMAC_EXPERIMENTAL_PATTERN 0 +wxMacPortSetter::wxMacPortSetter( const wxDC* dc ) : + m_ph( (GrafPtr) dc->m_macPort ) +{ + wxASSERT( dc->Ok() ) ; + m_dc = dc ; + dc->MacSetupPort(&m_ph) ; +} + +wxMacPortSetter::~wxMacPortSetter() +{ + m_dc->MacCleanupPort(&m_ph) ; +} + //----------------------------------------------------------------------------- // Local functions //----------------------------------------------------------------------------- @@ -194,17 +209,11 @@ wxDC::wxDC() m_pen = *wxBLACK_PEN; m_font = *wxNORMAL_FONT; m_brush = *wxWHITE_BRUSH; -} -wxMacPortSetter::wxMacPortSetter( const wxDC* dc ) : - m_ph( (GrafPtr) dc->m_macPort ) -{ - wxASSERT( dc->Ok() ) ; - - dc->MacSetupPort(&m_ph) ; -} - -wxMacPortSetter::~wxMacPortSetter() -{ + m_macCurrentPortStateHelper = NULL ; + m_macATSUIStyle = NULL ; + m_macAliasWasEnabled = false; + m_macForegroundPixMap = NULL ; + m_macBackgroundPixMap = NULL ; } wxDC::~wxDC(void) @@ -214,6 +223,8 @@ wxDC::~wxDC(void) } void wxDC::MacSetupPort(wxMacPortStateHelper* help) const { + wxASSERT( m_macCurrentPortStateHelper == NULL ) ; + m_macCurrentPortStateHelper = help ; SetClip( (RgnHandle) m_macCurrentClipRgn); m_macFontInstalled = false ; @@ -221,6 +232,36 @@ void wxDC::MacSetupPort(wxMacPortStateHelper* help) const m_macPenInstalled = false ; } +void wxDC::MacCleanupPort(wxMacPortStateHelper* help) const +{ + wxASSERT( m_macCurrentPortStateHelper == help ) ; + m_macCurrentPortStateHelper = NULL ; + if( m_macATSUIStyle ) + { + ::ATSUDisposeStyle((ATSUStyle)m_macATSUIStyle); + m_macATSUIStyle = NULL ; + } + if ( m_macAliasWasEnabled ) + { + SetAntiAliasedTextEnabled(m_macFormerAliasState, m_macFormerAliasSize); + m_macAliasWasEnabled = false ; + } + if ( m_macForegroundPixMap ) + { + Pattern blackColor ; + ::PenPat(GetQDGlobalsBlack(&blackColor)); + DisposePixMap( (PixMapHandle) m_macForegroundPixMap ) ; + m_macForegroundPixMap = NULL ; + } + if ( m_macBackgroundPixMap ) + { + Pattern whiteColor ; + ::BackPat(GetQDGlobalsWhite(&whiteColor)); + DisposePixMap( (PixMapHandle) m_macBackgroundPixMap ) ; + m_macBackgroundPixMap = NULL ; + } +} + void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask ) { wxCHECK_RET( Ok(), wxT("invalid window dc") ); @@ -687,6 +728,10 @@ void wxDC::DoCrossHair( wxCoord x, wxCoord y ) ::LineTo( XLOG2DEVMAC(w), yy ); ::MoveTo( xx, YLOG2DEVMAC(0) ); ::LineTo( xx, YLOG2DEVMAC(h) ); + + CalcBoundingBox(x, y); + CalcBoundingBox(x+w, y+h); + } } @@ -1316,104 +1361,89 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, return TRUE; } -void wxDC::DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, +inline Fixed IntToFixed( int inInt ) + { + return (((SInt32) inInt) << 16); + } + + +void wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y, double angle) { wxCHECK_RET( Ok(), wxT("wxDC::DoDrawRotatedText Invalid window dc") ); if (angle == 0.0) { - DrawText(text, x, y); + DrawText(str, x, y); return; } - MacInstallFont(); - - // the size of the text - wxCoord w, h; - GetTextExtent(text, &w, &h); - - // draw the string normally - wxBitmap src(w, h); - 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); - dc.SelectObject(wxNullBitmap); - wxMacPortSetter helper(this) ; + MacInstallFont() ; + + wxString text ; + if ( wxApp::s_macDefaultEncodingIsPC ) + { + text = wxMacMakeMacStringFromPC( str ) ; + } + else + { + text = str ; + } - // Calculate the size of the rotated bounding box. - double rad = DegToRad(angle); - double dx = cos(rad); - double dy = sin(rad); - - // the rectngle vertices are counted clockwise with the first one being at - // (0, 0) (or, rather, at (x, y)) - double x2 = w * dx; - double y2 = -w * dy; // y axis points to the bottom, hence minus - double x4 = h * dy; - double y4 = h * dx; - double x3 = x4 + x2; - double y3 = y4 + y2; - - // calc max and min - wxCoord maxX = (wxCoord)(dmax(x2, dmax(x3, x4)) + 0.5); - wxCoord maxY = (wxCoord)(dmax(y2, dmax(y3, y4)) + 0.5); - wxCoord minX = (wxCoord)(dmin(x2, dmin(x3, x4)) - 0.5); - wxCoord minY = (wxCoord)(dmin(y2, dmin(y3, y4)) - 0.5); - - // prepare to blit-with-rotate the bitmap to the DC - wxImage image(src); - - RGBColor colText = MAC_WXCOLORREF( m_textForegroundColour.GetPixel() ); - RGBColor colBack = MAC_WXCOLORREF( m_textBackgroundColour.GetPixel() ); - - unsigned char *data = image.GetData(); - - wxCoord dstX, dstY; - double r, angleOrig; - bool textPixel; - - // paint pixel by pixel - for ( wxCoord srcX = 0; srcX < w; srcX++ ) - { - for ( wxCoord srcY = 0; srcY < h; srcY++ ) - { - // transform source coords to dest coords - r = sqrt( (double)(srcX * srcX + srcY * srcY) ); - angleOrig = atan2((double)srcY, (double)srcX) - rad; - dstX = (wxCoord)(r * cos(angleOrig) + 0.5); - dstY = (wxCoord)(r * sin(angleOrig) + 0.5); - - // black pixel? - textPixel = data[(srcY*w + srcX)*3] == 0; - if ( textPixel || (m_backgroundMode == wxSOLID) ) - { - SetCPixel(XLOG2DEVMAC(x + dstX), YLOG2DEVMAC(y + dstY), - textPixel ? &colText : &colBack); - } - } - } - - // it would be better to draw with non underlined font and draw the line - // manually here (it would be more straight...) -#if 0 - if ( m_font.GetUnderlined() ) + wxFontRefData * font = (wxFontRefData*) m_font.GetRefData() ; + if ( 0 ) { - ::MoveTo(XLOG2DEVMAC(x + x4), YLOG2DEVMAC(y + y4 + font->descent)); - ::LineTo(XLOG2DEVMAC(x + x3), YLOG2DEVMAC(y + y3 + font->descent)); + m_macFormerAliasState = IsAntiAliasedTextEnabled(&m_macFormerAliasSize); + SetAntiAliasedTextEnabled(true, m_scaleY * font->m_macFontSize); + m_macAliasWasEnabled = true ; } -#endif // 0 - - // update the bounding box - CalcBoundingBox(x + minX, y + minY); - CalcBoundingBox(x + maxX, y + maxY); + + OSStatus status = noErr ; + + TECObjectRef ec; + status = TECCreateConverter(&ec, kTextEncodingMacRoman, kTextEncodingUnicodeDefault); + wxASSERT_MSG( status == noErr , "couldn't start converter" ) ; + + ByteCount byteOutLen ; + ByteCount byteInLen = text.Length() ; + ByteCount byteBufferLen = byteInLen *2 ; + char* buf = new char[byteBufferLen] ; + + status = TECConvertText(ec, (ConstTextPtr)text.c_str() , byteInLen, &byteInLen, + (TextPtr)buf, byteBufferLen, &byteOutLen); + + wxASSERT_MSG( status == noErr , "couldn't convert text" ) ; + status = TECDisposeConverter(ec); + wxASSERT_MSG( status == noErr , "couldn't dispose converter" ) ; + + ATSUTextLayout atsuLayout ; + UniCharCount chars = byteOutLen / 2 ; + status = ::ATSUCreateTextLayoutWithTextPtr( (UniCharArrayPtr) buf , 0 , byteOutLen / 2 , byteOutLen / 2 , 1 , + &chars , (ATSUStyle*) &m_macATSUIStyle , &atsuLayout ) ; + wxASSERT_MSG( status == noErr , "couldn't create the layout of the rotated text" ); + + Fixed atsuAngle = IntToFixed( angle ) ; + ByteCount angleSize = sizeof(Fixed) ; + ATSUAttributeTag rotationTag = kATSULineRotationTag ; + ATSUAttributeValuePtr angleValue = &atsuAngle ; + status = ::ATSUSetLayoutControls(atsuLayout , 1 , &rotationTag , &angleSize , &angleValue ) ; + + status = ::ATSUDrawText( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd, + IntToFixed(XLOG2DEVMAC(x) ) , IntToFixed(YLOG2DEVMAC(y) ) ); + wxASSERT_MSG( status == noErr , "couldn't draw the rotated text" ); + Rect rect ; + status = ::ATSUMeasureTextImage( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd, + IntToFixed(XLOG2DEVMAC(x) ) , IntToFixed(YLOG2DEVMAC(y) ) , &rect ); + wxASSERT_MSG( status == noErr , "couldn't measure the rotated text" ); + + OffsetRect( &rect , -m_macLocalOrigin.x , -m_macLocalOrigin.y ) ; + CalcBoundingBox(XDEV2LOG(rect.left), YDEV2LOG(rect.top) ); + CalcBoundingBox(XDEV2LOG(rect.right), YDEV2LOG(rect.bottom) ); + ::ATSUDisposeTextLayout(atsuLayout); + delete[] buf ; } + void wxDC::DoDrawText(const wxString& strtext, wxCoord x, wxCoord y) { wxCHECK_RET(Ok(), wxT("wxDC::DoDrawText Invalid DC")); @@ -1422,64 +1452,62 @@ void wxDC::DoDrawText(const wxString& strtext, wxCoord x, wxCoord y) long xx = XLOG2DEVMAC(x); long yy = YLOG2DEVMAC(y); -// if (m_pen.GetStyle() != wxTRANSPARENT) + MacInstallFont() ; + if ( 0 ) + { + m_macFormerAliasState = IsAntiAliasedTextEnabled(&m_macFormerAliasSize); + SetAntiAliasedTextEnabled(true, 8); + m_macAliasWasEnabled = true ; + } + + FontInfo fi ; + ::GetFontInfo( &fi ) ; + + yy += fi.ascent ; + ::MoveTo( xx , yy ); + if ( m_backgroundMode == wxTRANSPARENT ) { - MacInstallFont() ; - /* - Rect clip = { -32000 , -32000 , 32000 , 32000 } ; - - ::ClipRect( &clip ) ; - */ - - FontInfo fi ; - ::GetFontInfo( &fi ) ; - - yy += fi.ascent ; - ::MoveTo( xx , yy ); - if ( m_backgroundMode == wxTRANSPARENT ) - { - ::TextMode( srcOr) ; - } - else - { - ::TextMode( srcCopy ) ; - } + ::TextMode( srcOr) ; + } + else + { + ::TextMode( srcCopy ) ; + } - const char *text = NULL ; - int length = 0 ; - wxString macText ; + const char *text = NULL ; + int length = 0 ; + wxString macText ; - if ( wxApp::s_macDefaultEncodingIsPC ) - { - macText = wxMacMakeMacStringFromPC( strtext ) ; - text = macText ; - length = macText.Length() ; - } - else + if ( wxApp::s_macDefaultEncodingIsPC ) + { + macText = wxMacMakeMacStringFromPC( strtext ) ; + text = macText ; + length = macText.Length() ; + } + else + { + text = strtext ; + length = strtext.Length() ; + } + + int laststop = 0 ; + int i = 0 ; + int line = 0 ; + + while( i < length ) + { + if( text[i] == 13 || text[i] == 10) { - text = strtext ; - length = strtext.Length() ; + ::DrawText( text , laststop , i - laststop ) ; + line++ ; + ::MoveTo( xx , yy + line*(fi.descent + fi.ascent + fi.leading) ); + laststop = i+1 ; } - - int laststop = 0 ; - int i = 0 ; - int line = 0 ; - - while( i < length ) - { - if( text[i] == 13 || text[i] == 10) - { - ::DrawText( text , laststop , i - laststop ) ; - line++ ; - ::MoveTo( xx , yy + line*(fi.descent + fi.ascent + fi.leading) ); - laststop = i+1 ; - } - i++ ; - } - - ::DrawText( text , laststop , i - laststop ) ; - ::TextMode( srcOr ) ; + i++ ; } + + ::DrawText( text , laststop , i - laststop ) ; + ::TextMode( srcOr ) ; } bool wxDC::CanGetTextExtent() const @@ -1602,12 +1630,13 @@ void wxDC::Clear(void) { wxCHECK_RET(Ok(), wxT("Invalid DC")); wxMacPortSetter helper(this) ; - Rect rect = { -32767 , -32767 , 32767 , 32767 } ; + Rect rect = { -32000 , -32000 , 32000 , 32000 } ; if (m_backgroundBrush.GetStyle() != wxTRANSPARENT) { + ::PenNormal() ; + //MacInstallBrush() ; MacSetupBackgroundForCurrentPort( m_backgroundBrush ) ; - ::EraseRect( &rect ) ; } } @@ -1698,6 +1727,63 @@ void wxDC::MacInstallFont() const break ; } ::PenMode( mode ) ; + + OSStatus status = noErr ; + + Fixed atsuSize = IntToFixed(m_scaleY * font->m_macFontSize) ; + + Style qdStyle = font->m_macFontStyle ; + ATSUFontID atsuFont = font->m_macATSUFontID ; + + status = ::ATSUCreateStyle(&(ATSUStyle)m_macATSUIStyle) ; + wxASSERT_MSG( status == noErr , "couldn't create ATSU style" ) ; + + ATSUAttributeTag atsuTags[] = + { + kATSUFontTag , + kATSUSizeTag , + kATSUColorTag , + + kATSUQDBoldfaceTag , + kATSUQDItalicTag , + kATSUQDUnderlineTag , + kATSUQDCondensedTag , + kATSUQDExtendedTag , + + } ; + + ByteCount atsuSizes[sizeof(atsuTags)/sizeof(ATSUAttributeTag)] = + { + sizeof( ATSUFontID ) , + sizeof( Fixed ) , + sizeof( RGBColor ) , + sizeof( Boolean ) , + sizeof( Boolean ) , + sizeof( Boolean ) , + sizeof( Boolean ) , + sizeof( Boolean ) , + } ; + + Boolean kTrue = true ; + Boolean kFalse = false ; + + ATSUAttributeValuePtr atsuValues[sizeof(atsuTags)/sizeof(ATSUAttributeTag)] = + { + &atsuFont , + &atsuSize , + &MAC_WXCOLORREF( m_textForegroundColour.GetPixel() ) , + + (qdStyle & bold) ? &kTrue : &kFalse , + (qdStyle & italic) ? &kTrue : &kFalse , + (qdStyle & underline) ? &kTrue : &kFalse , + (qdStyle & condense) ? &kTrue : &kFalse , + (qdStyle & extend) ? &kTrue : &kFalse , + } ; + + status = ::ATSUSetAttributes((ATSUStyle)m_macATSUIStyle, sizeof(atsuTags)/sizeof(ATSUAttributeTag), + atsuTags, atsuSizes, atsuValues); + wxASSERT_MSG( status == noErr , "couldn't set create ATSU style" ) ; + } static void wxMacGetHatchPattern(int hatchStyle, Pattern *pattern) @@ -1875,7 +1961,7 @@ void wxDC::MacSetupBackgroundForCurrentPort(const wxBrush& background ) } case kwxMacBrushColour : { - ::RGBBackColor( &MAC_WXCOLORREF( background.GetColour().GetPixel()) ); + ::RGBBackColor( &MAC_WXCOLORREF( background.GetColour().GetPixel()) ); int brushStyle = background.GetStyle(); if (brushStyle == wxSOLID) ::BackPat(GetQDGlobalsWhite(&whiteColor)); @@ -1946,42 +2032,38 @@ void wxDC::MacInstallBrush() const isMonochrome = true ; } - - if ( isMonochrome ) + if ( isMonochrome && width == 8 && height == 8 ) { ::RGBForeColor( &MAC_WXCOLORREF( m_textForegroundColour.GetPixel()) ); ::RGBForeColor( &MAC_WXCOLORREF( m_textBackgroundColour.GetPixel()) ); - BitMap* gwbitmap = (BitMap*) *gwpixmaphandle ; // since the color depth is 1 it is a BitMap UInt8 *gwbits = (UInt8*) gwbitmap->baseAddr ; int alignment = gwbitmap->rowBytes & 0x7FFF ; - - if( width == 8 && height == 8 ) - { - Pattern pat ; - for ( int i = 0 ; i < 8 ; ++i ) - { - pat.pat[i] = gwbits[i*alignment+0] ; - } - UnlockPixels( GetGWorldPixMap( gw ) ) ; - ::PenPat( &pat ) ; - } - else - { - #if wxMAC_EXPERIMENTAL_PATTERN + Pattern pat ; + for ( int i = 0 ; i < 8 ; ++i ) + { + pat.pat[i] = gwbits[i*alignment+0] ; + } + UnlockPixels( GetGWorldPixMap( gw ) ) ; + ::PenPat( &pat ) ; + } + else + { // this will be the code to handle power of 2 patterns, we will have to arrive at a nice // caching scheme before putting this into production - Handle image; - long imageSize; - PixPatHandle pixpat = NewPixPat() ; - - CopyPixMap(gwpixmaphandle, (**pixpat).patMap); - imageSize = GetPixRowBytes((**pixpat).patMap) * - ((**(**pixpat).patMap).bounds.bottom - - (**(**pixpat).patMap).bounds.top); - - PtrToHand( (**gwpixmaphandle).baseAddr, &image, imageSize ); - (**pixpat).patData = image; + Handle image; + long imageSize; + PixPatHandle pixpat = NewPixPat() ; + + CopyPixMap(gwpixmaphandle, (**pixpat).patMap); + imageSize = GetPixRowBytes((**pixpat).patMap) * + ((**(**pixpat).patMap).bounds.bottom - + (**(**pixpat).patMap).bounds.top); + + PtrToHand( (**gwpixmaphandle).baseAddr, &image, imageSize ); + (**pixpat).patData = image; + if ( isMonochrome ) + { CTabHandle ctable = ((**((**pixpat).patMap)).pmTable) ; ColorSpecPtr ctspec = (ColorSpecPtr) &(**ctable).ctTable ; if ( ctspec[0].rgb.red == 0x0000 ) @@ -1995,12 +2077,9 @@ void wxDC::MacInstallBrush() const ctspec[1].rgb = MAC_WXCOLORREF( m_textForegroundColour.GetPixel()) ; } ::CTabChanged( ctable ) ; - ::PenPixPat(pixpat); -#endif - } - } - else - { + } + ::PenPixPat(pixpat); + m_macForegroundPixMap = pixpat ; } UnlockPixels( gwpixmaphandle ) ; } diff --git a/src/mac/dcmemory.cpp b/src/mac/dcmemory.cpp index ad67ca77c0..9985a00b9e 100644 --- a/src/mac/dcmemory.cpp +++ b/src/mac/dcmemory.cpp @@ -66,6 +66,8 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap ) { m_macMask = mask->GetMaskBitmap() ; } + SetRectRgn( (RgnHandle) m_macBoundaryClipRgn , 0 , 0 , m_selected.GetWidth() , m_selected.GetHeight() ) ; + CopyRgn( (RgnHandle) m_macBoundaryClipRgn ,(RgnHandle) m_macCurrentClipRgn ) ; m_ok = TRUE ; } else diff --git a/src/mac/dcprint.cpp b/src/mac/dcprint.cpp index d50e8b3933..7f093c6e71 100644 --- a/src/mac/dcprint.cpp +++ b/src/mac/dcprint.cpp @@ -27,6 +27,9 @@ #include "wx/msgdlg.h" #include #include "wx/mac/uma.h" +#ifndef __DARWIN__ +#include "Printing.h" +#endif #if defined(TARGET_CARBON) && !defined(__DARWIN__) # if PM_USE_SESSION_APIS diff --git a/src/mac/font.cpp b/src/mac/font.cpp index 2335e5d262..ab906cad67 100644 --- a/src/mac/font.cpp +++ b/src/mac/font.cpp @@ -23,7 +23,7 @@ #include "wx/fontutil.h" #include "wx/mac/private.h" - +#include "ATSUnicode.h" #if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject) @@ -116,6 +116,12 @@ void wxFontRefData::MacFindFont() if (m_underlined) m_macFontStyle |= underline; m_macFontSize = m_pointSize ; + + //TODO:if we supply the style as an additional parameter we must make a testing + //sequence in order to degrade gracefully while trying to maintain most of the style + //information, meanwhile we just take the normal font and apply the features after + OSStatus status = ::ATSUFONDtoFontID(m_macFontNum, normal /*qdStyle*/, (UInt32*)&m_macATSUFontID); + wxASSERT_MSG( status == noErr , "couldn't retrieve font identifier" ) ; } // ---------------------------------------------------------------------------- diff --git a/src/mac/printdlg.cpp b/src/mac/printdlg.cpp index 8f59b0d2e3..adb620e76f 100644 --- a/src/mac/printdlg.cpp +++ b/src/mac/printdlg.cpp @@ -18,6 +18,9 @@ #include "wx/dcprint.h" #include "wx/msgdlg.h" #include "wx/mac/uma.h" +#ifndef __DARWIN__ + #include "Printing.h" +#endif #if defined(TARGET_CARBON) && !defined(__DARWIN__) # if PM_USE_SESSION_APIS diff --git a/src/mac/scrolbar.cpp b/src/mac/scrolbar.cpp index 07fb9476df..a38962776d 100644 --- a/src/mac/scrolbar.cpp +++ b/src/mac/scrolbar.cpp @@ -89,7 +89,8 @@ void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageS SetControlViewSize( (ControlHandle) m_macControl , m_pageSize ) ; } } - Refresh() ; + if ( refresh ) + MacRedrawControl() ; } diff --git a/src/mac/textctrl.cpp b/src/mac/textctrl.cpp index ce7177ffec..0c742d3719 100644 --- a/src/mac/textctrl.cpp +++ b/src/mac/textctrl.cpp @@ -42,6 +42,10 @@ #include #endif +#ifndef __DARWIN__ +#include +#include +#endif #include "wx/mac/uma.h" #define wxUSE_MLTE 0 diff --git a/src/mac/thread.cpp b/src/mac/thread.cpp index 26e1b0517d..dce44db526 100644 --- a/src/mac/thread.cpp +++ b/src/mac/thread.cpp @@ -35,6 +35,9 @@ #include "wx/thread.h" #ifdef __WXMAC__ +#ifndef __DARWIN__ +#include +#endif #include "wx/mac/uma.h" #endif diff --git a/src/mac/timer.cpp b/src/mac/timer.cpp index e2693c3e8a..d485c86b8c 100644 --- a/src/mac/timer.cpp +++ b/src/mac/timer.cpp @@ -22,6 +22,9 @@ IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject) #ifdef __WXMAC__ #include "wx/mac/private.h" #endif +#ifndef __DARWIN__ +#include +#endif typedef struct MacTimerInfo { diff --git a/src/mac/tooltip.cpp b/src/mac/tooltip.cpp index 5ddf8b92e2..0d1e1ce955 100644 --- a/src/mac/tooltip.cpp +++ b/src/mac/tooltip.cpp @@ -225,7 +225,7 @@ void wxMacToolTip::Draw() */ #endif { - wxMacPortStateHelper help( GetWindowPort( m_window ) ); + wxMacPortStateHelper help( (GrafPtr) GetWindowPort( m_window ) ); m_shown = true ; @@ -333,7 +333,7 @@ void wxMacToolTip::Clear() if ( m_window == s_ToolTipWindowRef && m_backpict ) { - wxMacPortStateHelper help( GetWindowPort(m_window) ) ; + wxMacPortStateHelper help( (GrafPtr) GetWindowPort(m_window) ) ; m_shown = false ; diff --git a/src/mac/toplevel.cpp b/src/mac/toplevel.cpp index 83b905c227..baeb703641 100644 --- a/src/mac/toplevel.cpp +++ b/src/mac/toplevel.cpp @@ -306,7 +306,7 @@ WXWidget wxTopLevelWindowMac::MacGetContainerForEmbedding() void wxTopLevelWindowMac::MacUpdate( long timestamp) { - wxMacPortStateHelper help( GetWindowPort( (WindowRef) m_macWindow) ) ; + wxMacPortStateHelper help( (GrafPtr) GetWindowPort( (WindowRef) m_macWindow) ) ; BeginUpdate( (WindowRef)m_macWindow ) ; diff --git a/src/mac/uma.cpp b/src/mac/uma.cpp index c899f87471..2ca3e8cc2b 100644 --- a/src/mac/uma.cpp +++ b/src/mac/uma.cpp @@ -10,6 +10,8 @@ # include # endif # include +# else +# include # endif #endif @@ -121,8 +123,17 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls ) if ( menuMgrAttr & gestaltMenuMgrAquaLayoutMask ) sUMAHasAquaLayout = true ; sUMASystemInitialized = true ; + } +/* +Boolean CanUseATSUI() + { + long result; + OSErr err = Gestalt(gestaltATSUVersion, &result); + return (err == noErr); + } +*/ // process manager long UMAGetProcessMode() { diff --git a/src/mac/utils.cpp b/src/mac/utils.cpp index 41da489e3b..066f36c368 100644 --- a/src/mac/utils.cpp +++ b/src/mac/utils.cpp @@ -29,6 +29,11 @@ #include "MoreFiles.h" #include "MoreFilesExtras.h" +#ifndef __DARWIN__ +#include +#include +#endif + #ifndef __DARWIN__ // defined in unix/utilsunx.cpp for Mac OS X diff --git a/src/mac/wave.cpp b/src/mac/wave.cpp index d06eee4838..205c5d5ceb 100644 --- a/src/mac/wave.cpp +++ b/src/mac/wave.cpp @@ -19,6 +19,9 @@ #ifdef __WXMAC__ #include "wx/mac/private.h" +#ifndef __DARWIN__ +#include +#endif #endif wxWave::wxWave() diff --git a/src/mac/window.cpp b/src/mac/window.cpp index 78b3c56ba7..61286ac4ec 100644 --- a/src/mac/window.cpp +++ b/src/mac/window.cpp @@ -46,6 +46,10 @@ #define MAC_SCROLLBAR_SIZE 16 #include "wx/mac/uma.h" +#ifndef __DARWIN__ +#include +#include +#endif #if wxUSE_DRAG_AND_DROP #include "wx/dnd.h" -- 2.45.2